From 8f60a4a259b5530f3be2424783669d18046ac8b0 Mon Sep 17 00:00:00 2001
From: Katelyn Gigante <clockwork.singularity@gmail.com>
Date: Fri, 15 Nov 2024 07:51:05 +1100
Subject: [PATCH 001/381] Core: Detect and account for apworlds being
 downloaded with a (1) in their name (#4144)

* Core: Detect and account for apworlds being downloaded with a (1) in their name

* Reword comment

* Always use internal module name

* Requested changes from black-silver
---
 worlds/LauncherComponents.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index fe6e44bb308e..3c4c4477ef09 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -100,10 +100,16 @@ def _install_apworld(apworld_src: str = "") -> Optional[Tuple[pathlib.Path, path
 
     apworld_path = pathlib.Path(apworld_src)
 
-    module_name = pathlib.Path(apworld_path.name).stem
     try:
         import zipfile
-        zipfile.ZipFile(apworld_path).open(module_name + "/__init__.py")
+        zip = zipfile.ZipFile(apworld_path)
+        directories = [f.filename.strip('/') for f in zip.filelist if f.CRC == 0 and f.file_size == 0 and f.filename.count('/') == 1]
+        if len(directories) == 1 and directories[0] in apworld_path.stem:
+            module_name = directories[0]
+            apworld_name = module_name + ".apworld"
+        else:
+            raise Exception("APWorld appears to be invalid or damaged. (expected a single directory)")
+        zip.open(module_name + "/__init__.py")
     except ValueError as e:
         raise Exception("Archive appears invalid or damaged.") from e
     except KeyError as e:
@@ -122,7 +128,7 @@ def _install_apworld(apworld_src: str = "") -> Optional[Tuple[pathlib.Path, path
     # TODO: run generic test suite over the apworld.
     # TODO: have some kind of version system to tell from metadata if the apworld should be compatible.
 
-    target = pathlib.Path(worlds.user_folder) / apworld_path.name
+    target = pathlib.Path(worlds.user_folder) / apworld_name
     import shutil
     shutil.copyfile(apworld_path, target)
 

From c9e63a836a6bdc33f0c0bc2968a6f9dc70159f20 Mon Sep 17 00:00:00 2001
From: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com>
Date: Thu, 14 Nov 2024 17:40:39 -0500
Subject: [PATCH 002/381] CV64: Fix some textbox message truncation issues
 #4157

---
 worlds/cv64/client.py | 17 ++++++++++++++---
 worlds/cv64/rom.py    | 14 ++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/worlds/cv64/client.py b/worlds/cv64/client.py
index 2430cc5ffc67..cec5f551b9e5 100644
--- a/worlds/cv64/client.py
+++ b/worlds/cv64/client.py
@@ -66,8 +66,9 @@ def on_package(self, ctx: "BizHawkClientContext", cmd: str, args: dict) -> None:
             self.received_deathlinks += 1
             if "cause" in args["data"]:
                 cause = args["data"]["cause"]
-                if len(cause) > 88:
-                    cause = cause[0x00:0x89]
+                # Truncate the death cause message at 120 characters.
+                if len(cause) > 120:
+                    cause = cause[0:120]
             else:
                 cause = f"{args['data']['source']} killed you!"
             self.death_causes.append(cause)
@@ -146,8 +147,18 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
                         text_color = bytearray([0xA2, 0x0B])
                     else:
                         text_color = bytearray([0xA2, 0x02])
+
+                    # Get the item's player's name. If it's longer than 40 characters, truncate it at 40.
+                    # 35 should be the max number of characters in a server player name right now (16 for the original
+                    # name + 16 for the alias + 3 for the added parenthesis and space), but if it ever goes higher it
+                    # should be future-proofed now. No need to truncate CV64 items names because its longest item name
+                    # gets nowhere near the limit.
+                    player_name = ctx.player_names[next_item.player]
+                    if len(player_name) > 40:
+                        player_name = player_name[0:40]
+
                     received_text, num_lines = cv64_text_wrap(f"{ctx.item_names.lookup_in_game(next_item.item)}\n"
-                                                              f"from {ctx.player_names[next_item.player]}", 96)
+                                                              f"from {player_name}", 96)
                     await bizhawk.guarded_write(ctx.bizhawk_ctx,
                                                 [(0x389BE1, [next_item.item & 0xFF], "RDRAM"),
                                                  (0x18C0A8, text_color + cv64_string_to_bytearray(received_text, False),
diff --git a/worlds/cv64/rom.py b/worlds/cv64/rom.py
index ab4371b0ac12..8f069555343a 100644
--- a/worlds/cv64/rom.py
+++ b/worlds/cv64/rom.py
@@ -944,13 +944,19 @@ def write_patch(world: "CV64World", patch: CV64ProcedurePatch, offset_data: Dict
     for loc in active_locations:
         if loc.address is None or get_location_info(loc.name, "type") == "shop" or loc.item.player == world.player:
             continue
-        if len(loc.item.name) > 67:
-            item_name = loc.item.name[0x00:0x68]
+        # If the Item's name is longer than 104 characters, truncate the name to inject at 104.
+        if len(loc.item.name) > 104:
+            item_name = loc.item.name[0:104]
         else:
             item_name = loc.item.name
+        # Get the item's player's name. If it's longer than 16 characters (which can happen if it's an ItemLinked item),
+        # truncate it at 16.
+        player_name = world.multiworld.get_player_name(loc.item.player)
+        if len(player_name) > 16:
+            player_name = player_name[0:16]
+
         inject_address = 0xBB7164 + (256 * (loc.address & 0xFFF))
-        wrapped_name, num_lines = cv64_text_wrap(item_name + "\nfor " +
-                                                 world.multiworld.get_player_name(loc.item.player), 96)
+        wrapped_name, num_lines = cv64_text_wrap(item_name + "\nfor " + player_name, 96)
         patch.write_token(APTokenTypes.WRITE, inject_address, bytes(get_item_text_color(loc) +
                                                                     cv64_string_to_bytearray(wrapped_name)))
         patch.write_token(APTokenTypes.WRITE, inject_address + 255, bytes([num_lines]))

From 7916d1e67c76537d1aa7da03c99906ef65803b73 Mon Sep 17 00:00:00 2001
From: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com>
Date: Thu, 14 Nov 2024 17:41:57 -0500
Subject: [PATCH 003/381] CV64: Fix DeathLink Nitro explosions hitting you at
 times they shouldn't #4158

---
 worlds/cv64/data/patches.py | 17 +++++++++++++++++
 worlds/cv64/rom.py          |  6 +++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/worlds/cv64/data/patches.py b/worlds/cv64/data/patches.py
index 938b615b3213..6ef4eafb67d3 100644
--- a/worlds/cv64/data/patches.py
+++ b/worlds/cv64/data/patches.py
@@ -197,6 +197,23 @@
     0xA168FFFD,  # SB    T0, 0xFFFD (T3)
 ]
 
+deathlink_nitro_state_checker = [
+    # Checks to see if the player is in an alright state before exploding them. If not, then the Nitro explosion spawn
+    # code will be aborted, and they should eventually explode after getting out of that state.
+    #
+    # Invalid states so far include: interacting/going through a door, being grabbed by a vampire.
+    0x90880009,  # LBU   T0, 0x0009 (A0)
+    0x24090005,  # ADDIU T1, R0, 0x0005
+    0x11090005,  # BEQ   T0, T1, [forward 0x05]
+    0x24090002,  # ADDIU T1, R0, 0x0002
+    0x11090003,  # BEQ   T0, T1, [forward 0x03]
+    0x00000000,  # NOP
+    0x08000660,  # J     0x80001980
+    0x00000000,  # NOP
+    0x03E00008,  # JR    RA
+    0xAC400048   # SW    R0, 0x0048 (V0)
+]
+
 launch_fall_killer = [
     # Custom code to force the instant fall death if at a high enough falling speed after getting killed by something
     # that launches you (whether it be the Nitro explosion or a Big Toss hit). The game doesn't normally run the check
diff --git a/worlds/cv64/rom.py b/worlds/cv64/rom.py
index 8f069555343a..db621c7101d6 100644
--- a/worlds/cv64/rom.py
+++ b/worlds/cv64/rom.py
@@ -357,8 +357,12 @@ def apply_patches(caller: APProcedurePatch, rom: bytes, options_file: str) -> by
 
         # Make received DeathLinks blow you to smithereens instead of kill you normally.
         if options["death_link"] == DeathLink.option_explosive:
-            rom_data.write_int32(0x27A70, 0x10000008)  # B [forward 0x08]
             rom_data.write_int32s(0xBFC0D0, patches.deathlink_nitro_edition)
+            rom_data.write_int32(0x27A70, 0x10000008)  # B [forward 0x08]
+            rom_data.write_int32(0x27AA0, 0x0C0FFA78)  # JAL	0x803FE9E0
+            rom_data.write_int32s(0xBFE9E0, patches.deathlink_nitro_state_checker)
+            # NOP the function call to subtract Nitro from the inventory after exploding, just in case.
+            rom_data.write_int32(0x32DBC, 0x00000000)
 
         # Set the DeathLink ROM flag if it's on at all.
         if options["death_link"] != DeathLink.option_off:

From dd659de07942e822b93b1b909181c1cbaea746b3 Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Thu, 14 Nov 2024 22:43:34 +0000
Subject: [PATCH 004/381] DS3: List compatible static randomizer versions in
 slot data (#4178)

This will make it easier for players to understand when they have a
mismatch between their DS3 apworld and their local randomizer version,
mitigating a common source of confusion and support requests.
---
 worlds/dark_souls_3/__init__.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py
index 1aec6945eb8b..765ffb1fc544 100644
--- a/worlds/dark_souls_3/__init__.py
+++ b/worlds/dark_souls_3/__init__.py
@@ -1568,6 +1568,16 @@ def fill_slot_data(self) -> Dict[str, object]:
             "apIdsToItemIds": ap_ids_to_ds3_ids,
             "itemCounts": item_counts,
             "locationIdsToKeys": location_ids_to_keys,
+            # The range of versions of the static randomizer that are compatible
+            # with this slot data. Incompatible versions should have at least a
+            # minor version bump. Pre-release versions should generally only be
+            # compatible with a single version, except very close to a stable
+            # release when no changes are expected.
+            #
+            # This is checked by the static randomizer, which will surface an
+            # error to the user if its version doesn't fall into the allowed
+            # range.
+            "versions": ">=3.0.0-beta.24 <3.1.0",
         }
 
         return slot_data

From 6c9b7eca10686ad64cefd0307090b605e73d4844 Mon Sep 17 00:00:00 2001
From: gurglemurgle5 <95941332+gurglemurgle5@users.noreply.github.com>
Date: Thu, 14 Nov 2024 16:43:42 -0600
Subject: [PATCH 005/381] Core: Fix Template Yamls for games with colon in name
 (#4106)

* add quotes around strings containing {{ game }}

* do the actually correct thing instead of a hack

thanks berserker66 for pointing out to me that I was doing this the
completly wrong way, so I fixed it up

* Clean up filenames to prevent illegal chars

* Use %s substitution instead of concatenation

* whoops

somehow i removed a space from the comment for the regex, so this adds
it back

* Use pre-existing function in Utils.py

* Test: add test for option yaml with colon

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 Options.py                              |  4 +-
 data/options.yaml                       |  6 +--
 test/options/test_generate_templates.py | 55 +++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 test/options/test_generate_templates.py

diff --git a/Options.py b/Options.py
index aa6f175fa58d..992348cb546d 100644
--- a/Options.py
+++ b/Options.py
@@ -15,7 +15,7 @@
 from schema import And, Optional, Or, Schema
 from typing_extensions import Self
 
-from Utils import get_fuzzy_results, is_iterable_except_str, output_path
+from Utils import get_file_safe_name, get_fuzzy_results, is_iterable_except_str, output_path
 
 if typing.TYPE_CHECKING:
     from BaseClasses import MultiWorld, PlandoOptions
@@ -1531,7 +1531,7 @@ def yaml_dump_scalar(scalar) -> str:
 
             del file_data
 
-            with open(os.path.join(target_folder, game_name + ".yaml"), "w", encoding="utf-8-sig") as f:
+            with open(os.path.join(target_folder, get_file_safe_name(game_name) + ".yaml"), "w", encoding="utf-8-sig") as f:
                 f.write(res)
 
 
diff --git a/data/options.yaml b/data/options.yaml
index ee8866627d52..09bfcdcec1f6 100644
--- a/data/options.yaml
+++ b/data/options.yaml
@@ -28,9 +28,9 @@
 name: Player{number}
 
 # Used to describe your yaml. Useful if you have multiple files.
-description: Default {{ game }} Template
+description: {{ yaml_dump("Default %s Template" % game) }}
 
-game: {{ game }}
+game: {{ yaml_dump(game) }}
 requires:
   version: {{ __version__ }} # Version of Archipelago required for this yaml to work as expected.
 
@@ -44,7 +44,7 @@ requires:
     {%- endfor -%}
 {% endmacro %}
 
-{{ game }}:
+{{ yaml_dump(game) }}:
   {%- for group_name, group_options in option_groups.items() %}
   # {{ group_name }}
 
diff --git a/test/options/test_generate_templates.py b/test/options/test_generate_templates.py
new file mode 100644
index 000000000000..cab97c54b129
--- /dev/null
+++ b/test/options/test_generate_templates.py
@@ -0,0 +1,55 @@
+import unittest
+
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from typing import TYPE_CHECKING, Dict, Type
+from Utils import parse_yaml
+
+if TYPE_CHECKING:
+    from worlds.AutoWorld import World
+
+
+class TestGenerateYamlTemplates(unittest.TestCase):
+    old_world_types: Dict[str, Type["World"]]
+
+    def setUp(self) -> None:
+        import worlds.AutoWorld
+
+        self.old_world_types = worlds.AutoWorld.AutoWorldRegister.world_types
+
+    def tearDown(self) -> None:
+        import worlds.AutoWorld
+
+        worlds.AutoWorld.AutoWorldRegister.world_types = self.old_world_types
+
+        if "World: with colon" in worlds.AutoWorld.AutoWorldRegister.world_types:
+            del worlds.AutoWorld.AutoWorldRegister.world_types["World: with colon"]
+
+    def test_name_with_colon(self) -> None:
+        from Options import generate_yaml_templates
+        from worlds.AutoWorld import AutoWorldRegister
+        from worlds.AutoWorld import World
+
+        class WorldWithColon(World):
+            game = "World: with colon"
+            item_name_to_id = {}
+            location_name_to_id = {}
+
+        AutoWorldRegister.world_types = {WorldWithColon.game: WorldWithColon}
+        with TemporaryDirectory(f"archipelago_{__name__}") as temp_dir:
+            generate_yaml_templates(temp_dir)
+            path: Path
+            for path in Path(temp_dir).iterdir():
+                self.assertTrue(path.is_file())
+                self.assertTrue(path.suffix == ".yaml")
+                with path.open(encoding="utf-8") as f:
+                    try:
+                        data = parse_yaml(f)
+                    except:
+                        f.seek(0)
+                        print(f"Error in {path.name}:\n{f.read()}")
+                        raise
+                    self.assertIn("game", data)
+                    self.assertIn(":", data["game"])
+                    self.assertIn(data["game"], data)
+                    self.assertIsInstance(data[data["game"]], dict)

From 70b9b978413b5161074f24bda9ea4b44f7813e85 Mon Sep 17 00:00:00 2001
From: palex00 <32203971+palex00@users.noreply.github.com>
Date: Thu, 14 Nov 2024 23:50:36 +0100
Subject: [PATCH 006/381] [PKMN RB] Fixes faulty logic in Victory Road 1 #4191

---
 worlds/pokemon_rb/rules.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/worlds/pokemon_rb/rules.py b/worlds/pokemon_rb/rules.py
index ba4bfd471c52..3c1cdc57e99b 100644
--- a/worlds/pokemon_rb/rules.py
+++ b/worlds/pokemon_rb/rules.py
@@ -94,6 +94,9 @@ def prize_rule(i):
 
         "Route 22 - Trainer Parties": lambda state: state.has("Oak's Parcel", player),
 
+        "Victory Road 1F - Top Item": lambda state: logic.can_strength(state, world, player),
+        "Victory Road 1F - Left Item": lambda state: logic.can_strength(state, world, player),
+
         # # Rock Tunnel
         "Rock Tunnel 1F - PokeManiac": lambda state: logic.rock_tunnel(state, world, player),
         "Rock Tunnel 1F - Hiker 1": lambda state: logic.rock_tunnel(state, world, player),

From 2a850261b82fc2e5713faa5a6f133ef43f5858a8 Mon Sep 17 00:00:00 2001
From: Branden Wood <44546325+BrandenEK@users.noreply.github.com>
Date: Thu, 14 Nov 2024 17:57:49 -0500
Subject: [PATCH 007/381] docs: Add @BrandenEK as codeowner (#4177)

---
 docs/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index ee7fd7ed863b..a51cac37026b 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -143,7 +143,7 @@
 /worlds/shivers/ @GodlFire
 
 # A Short Hike
-/worlds/shorthike/ @chandler05
+/worlds/shorthike/ @chandler05 @BrandenEK
 
 # Sonic Adventure 2 Battle
 /worlds/sa2b/ @PoryGone @RaspberrySpace

From a734d25f66cfba6648a3865181a4d8488135aedc Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Thu, 14 Nov 2024 19:57:08 -0500
Subject: [PATCH 008/381] PKMN R/B: Don't change classification of items from
 other worlds #4192

---
 worlds/pokemon_rb/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
index 98b1a0c614b8..809179cbef74 100644
--- a/worlds/pokemon_rb/__init__.py
+++ b/worlds/pokemon_rb/__init__.py
@@ -528,8 +528,8 @@ def stage_post_fill(cls, multiworld):
         for sphere in multiworld.get_spheres():
             mon_locations_in_sphere = {}
             for location in sphere:
-                if (location.game == "Pokemon Red and Blue" and (location.item.name in poke_data.pokemon_data.keys()
-                                                                 or "Static " in location.item.name)
+                if (location.game == location.item.game == "Pokemon Red and Blue"
+                        and (location.item.name in poke_data.pokemon_data.keys() or "Static " in location.item.name)
                         and location.item.advancement):
                     key = (location.player, location.item.name)
                     if key in found_mons:

From f9c6ecc8b21f6a374f3d8441b6a95fa2f3d22e24 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 15 Nov 2024 17:31:03 +0100
Subject: [PATCH 009/381] Webhost: fix doc and yaml filenames / install paths
 (#4193)

* WebHost: use new safe yaml template filename

this mirrors the change in ArchipelagoMW/#4106 in WebHost

* WebHost: install docs into safe filename and require docs to be named safe

* Test: update doc test for safe name

* WebHost: fix import order to not break ModuleUpdate
---
 WebHost.py                                            |  3 ++-
 WebHostLib/__init__.py                                |  3 ++-
 WebHostLib/templates/gameInfo.html                    |  2 +-
 WebHostLib/templates/playerOptions/playerOptions.html |  2 +-
 WebHostLib/templates/tutorial.html                    |  2 +-
 test/webhost/test_docs.py                             | 10 ++++++++--
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/WebHost.py b/WebHost.py
index e597de24763d..3bf75eb35ae0 100644
--- a/WebHost.py
+++ b/WebHost.py
@@ -12,6 +12,7 @@
 # in case app gets imported by something like gunicorn
 import Utils
 import settings
+from Utils import get_file_safe_name
 
 if typing.TYPE_CHECKING:
     from flask import Flask
@@ -71,7 +72,7 @@ def create_ordered_tutorials_file() -> typing.List[typing.Dict[str, typing.Any]]
     shutil.rmtree(base_target_path, ignore_errors=True)
     for game, world in worlds.items():
         # copy files from world's docs folder to the generated folder
-        target_path = os.path.join(base_target_path, game)
+        target_path = os.path.join(base_target_path, get_file_safe_name(game))
         os.makedirs(target_path, exist_ok=True)
 
         if world.zip_path:
diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py
index fdf3037fe015..dbe2182b0747 100644
--- a/WebHostLib/__init__.py
+++ b/WebHostLib/__init__.py
@@ -9,7 +9,7 @@
 from pony.flask import Pony
 from werkzeug.routing import BaseConverter
 
-from Utils import title_sorted
+from Utils import title_sorted, get_file_safe_name
 
 UPLOAD_FOLDER = os.path.relpath('uploads')
 LOGS_FOLDER = os.path.relpath('logs')
@@ -20,6 +20,7 @@
 
 app.jinja_env.filters['any'] = any
 app.jinja_env.filters['all'] = all
+app.jinja_env.filters['get_file_safe_name'] = get_file_safe_name
 
 app.config["SELFHOST"] = True  # application process is in charge of running the websites
 app.config["GENERATORS"] = 8  # maximum concurrent world gens
diff --git a/WebHostLib/templates/gameInfo.html b/WebHostLib/templates/gameInfo.html
index c5ebba82848d..3b908004b1be 100644
--- a/WebHostLib/templates/gameInfo.html
+++ b/WebHostLib/templates/gameInfo.html
@@ -11,7 +11,7 @@
 
 {% block body %}
     {% include 'header/'+theme+'Header.html' %}
-    <div id="game-info" class="markdown" data-lang="{{ lang }}" data-game="{{ game }}">
+    <div id="game-info" class="markdown" data-lang="{{ lang }}" data-game="{{ game | get_file_safe_name }}">
         <!-- Populated my JS / MD -->
     </div>
 {% endblock %}
diff --git a/WebHostLib/templates/playerOptions/playerOptions.html b/WebHostLib/templates/playerOptions/playerOptions.html
index 73de5d56eb20..7e2f0ee11cb4 100644
--- a/WebHostLib/templates/playerOptions/playerOptions.html
+++ b/WebHostLib/templates/playerOptions/playerOptions.html
@@ -42,7 +42,7 @@ <h1>Player Options</h1>
             A list of all games you have generated can be found on the <a href="/user-content">User Content Page</a>.
             <br />
             You may also download the
-            <a href="/static/generated/configs/{{ world_name }}.yaml">template file for this game</a>.
+            <a href="/static/generated/configs/{{ world_name | get_file_safe_name }}.yaml">template file for this game</a>.
         </p>
 
         <form id="options-form" method="post" enctype="application/x-www-form-urlencoded" action="generate-yaml">
diff --git a/WebHostLib/templates/tutorial.html b/WebHostLib/templates/tutorial.html
index d3a7e0a05ecc..4b6622c31336 100644
--- a/WebHostLib/templates/tutorial.html
+++ b/WebHostLib/templates/tutorial.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block body %}
-    <div id="tutorial-wrapper" class="markdown" data-game="{{ game }}" data-file="{{ file }}" data-lang="{{ lang }}">
+    <div id="tutorial-wrapper" class="markdown" data-game="{{ game | get_file_safe_name }}" data-file="{{ file | get_file_safe_name }}" data-lang="{{ lang }}">
         <!-- Content generated by JavaScript -->
     </div>
 {%  endblock %}
diff --git a/test/webhost/test_docs.py b/test/webhost/test_docs.py
index 68aba05f9dcc..1e6c1b88f42c 100644
--- a/test/webhost/test_docs.py
+++ b/test/webhost/test_docs.py
@@ -30,10 +30,16 @@ def test_has_tutorial(self):
     def test_has_game_info(self):
         for game_name, world_type in AutoWorldRegister.world_types.items():
             if not world_type.hidden:
-                target_path = Utils.local_path("WebHostLib", "static", "generated", "docs", game_name)
+                safe_name = Utils.get_file_safe_name(game_name)
+                target_path = Utils.local_path("WebHostLib", "static", "generated", "docs", safe_name)
                 for game_info_lang in world_type.web.game_info_languages:
                     with self.subTest(game_name):
                         self.assertTrue(
-                            os.path.isfile(Utils.local_path(target_path, f'{game_info_lang}_{game_name}.md')),
+                            safe_name == game_name or
+                            not os.path.isfile(Utils.local_path(target_path, f'{game_info_lang}_{game_name}.md')),
+                            f'Info docs have be named <lang>_{safe_name}.md for {game_name}.'
+                        )
+                        self.assertTrue(
+                            os.path.isfile(Utils.local_path(target_path, f'{game_info_lang}_{safe_name}.md')),
                             f'{game_name} missing game info file for "{game_info_lang}" language.'
                         )

From 9ba613277e8b0be650295f9d7a3225561631ab9f Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Sat, 16 Nov 2024 03:00:34 +0100
Subject: [PATCH 010/381] Launcher: change import order to fix ModuleUpdate
 (#4194)

---
 Launcher.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 2620f786a54b..ea59e8beb500 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -22,16 +22,15 @@
 from shutil import which
 from typing import Callable, Optional, Sequence, Tuple, Union
 
-import Utils
-import settings
-from worlds.LauncherComponents import Component, components, Type, SuffixIdentifier, icon_paths
-
 if __name__ == "__main__":
     import ModuleUpdate
     ModuleUpdate.update()
 
-from Utils import is_frozen, user_path, local_path, init_logging, open_filename, messagebox, \
-    is_windows, is_macos, is_linux
+import settings
+import Utils
+from Utils import (init_logging, is_frozen, is_linux, is_macos, is_windows, local_path, messagebox, open_filename,
+                   user_path)
+from worlds.LauncherComponents import Component, components, icon_paths, SuffixIdentifier, Type
 
 
 def open_host_yaml():

From 5141f36e9578a918a65a59ee1147eb8c6248cf71 Mon Sep 17 00:00:00 2001
From: "Zach \"Phar\" Parks" <zach@alliware.com>
Date: Sat, 16 Nov 2024 16:16:09 +0000
Subject: [PATCH 011/381] WebHost: Fix 500 server errors for hints involving
 ItemLink slots on tracker pages (#4198)

* Also makes adjustments to the style for these slots by italicizing its names (including multi-tracker).
* Player-specific trackers do not link to ItemLink player trackers (they do not exist).
* Fixes a bug on Factorio multi-tracker when item links exist.
---
 WebHostLib/templates/genericTracker.html        |  4 ++++
 WebHostLib/templates/multitrackerHintTable.html | 16 ++++++++++++++--
 WebHostLib/tracker.py                           |  6 +++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/WebHostLib/templates/genericTracker.html b/WebHostLib/templates/genericTracker.html
index 947cf2837278..b92097ceea08 100644
--- a/WebHostLib/templates/genericTracker.html
+++ b/WebHostLib/templates/genericTracker.html
@@ -98,6 +98,8 @@
                             <td>
                                 {% if hint.finding_player == player %}
                                     <b>{{ player_names_with_alias[(team, hint.finding_player)] }}</b>
+                                {% elif get_slot_info(team, hint.finding_player).type == 2 %}
+                                    <i>{{ player_names_with_alias[(team, hint.finding_player)] }}</i>
                                 {% else %}
                                     <a href="{{ url_for("get_player_tracker", tracker=room.tracker, tracked_team=team, tracked_player=hint.finding_player) }}">
                                         {{ player_names_with_alias[(team, hint.finding_player)] }}
@@ -107,6 +109,8 @@
                             <td>
                                 {% if hint.receiving_player == player %}
                                     <b>{{ player_names_with_alias[(team, hint.receiving_player)] }}</b>
+                                {% elif get_slot_info(team, hint.receiving_player).type == 2 %}
+                                    <i>{{ player_names_with_alias[(team, hint.receiving_player)] }}</i>
                                 {% else %}
                                     <a href="{{ url_for("get_player_tracker", tracker=room.tracker, tracked_team=team, tracked_player=hint.receiving_player) }}">
                                         {{ player_names_with_alias[(team, hint.receiving_player)] }}
diff --git a/WebHostLib/templates/multitrackerHintTable.html b/WebHostLib/templates/multitrackerHintTable.html
index a931e9b04845..fcc15fb37a9f 100644
--- a/WebHostLib/templates/multitrackerHintTable.html
+++ b/WebHostLib/templates/multitrackerHintTable.html
@@ -21,8 +21,20 @@
                     )
                 -%}
                     <tr>
-                        <td>{{ player_names_with_alias[(team, hint.finding_player)] }}</td>
-                        <td>{{ player_names_with_alias[(team, hint.receiving_player)] }}</td>
+                        <td>
+                            {% if get_slot_info(team, hint.finding_player).type == 2 %}
+                                <i>{{ player_names_with_alias[(team, hint.finding_player)] }}</i>
+                            {% else %}
+                                {{ player_names_with_alias[(team, hint.finding_player)] }}
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if get_slot_info(team, hint.receiving_player).type == 2 %}
+                                <i>{{ player_names_with_alias[(team, hint.receiving_player)] }}</i>
+                            {% else %}
+                                {{ player_names_with_alias[(team, hint.receiving_player)] }}
+                            {% endif %}
+                        </td>
                         <td>{{ item_id_to_name[games[(team, hint.receiving_player)]][hint.item] }}</td>
                         <td>{{ location_id_to_name[games[(team, hint.finding_player)]][hint.location] }}</td>
                         <td>{{ games[(team, hint.finding_player)] }}</td>
diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py
index 5450ef510373..043764a53b08 100644
--- a/WebHostLib/tracker.py
+++ b/WebHostLib/tracker.py
@@ -423,6 +423,7 @@ def render_generic_tracker(tracker_data: TrackerData, team: int, player: int) ->
         template_name_or_list="genericTracker.html",
         game_specific_tracker=game in _player_trackers,
         room=tracker_data.room,
+        get_slot_info=tracker_data.get_slot_info,
         team=team,
         player=player,
         player_name=tracker_data.get_room_long_player_names()[team, player],
@@ -446,6 +447,7 @@ def render_generic_multiworld_tracker(tracker_data: TrackerData, enabled_tracker
         enabled_trackers=enabled_trackers,
         current_tracker="Generic",
         room=tracker_data.room,
+        get_slot_info=tracker_data.get_slot_info,
         all_slots=tracker_data.get_all_slots(),
         room_players=tracker_data.get_all_players(),
         locations=tracker_data.get_room_locations(),
@@ -497,7 +499,7 @@ def render_Factorio_multiworld_tracker(tracker_data: TrackerData, enabled_tracke
             (team, player): collections.Counter({
                 tracker_data.item_id_to_name["Factorio"][item_id]: count
                 for item_id, count in tracker_data.get_player_inventory_counts(team, player).items()
-            }) for team, players in tracker_data.get_all_slots().items() for player in players
+            }) for team, players in tracker_data.get_all_players().items() for player in players
             if tracker_data.get_player_game(team, player) == "Factorio"
         }
 
@@ -506,6 +508,7 @@ def render_Factorio_multiworld_tracker(tracker_data: TrackerData, enabled_tracke
             enabled_trackers=enabled_trackers,
             current_tracker="Factorio",
             room=tracker_data.room,
+            get_slot_info=tracker_data.get_slot_info,
             all_slots=tracker_data.get_all_slots(),
             room_players=tracker_data.get_all_players(),
             locations=tracker_data.get_room_locations(),
@@ -638,6 +641,7 @@ def render_ALinkToThePast_multiworld_tracker(tracker_data: TrackerData, enabled_
             enabled_trackers=enabled_trackers,
             current_tracker="A Link to the Past",
             room=tracker_data.room,
+            get_slot_info=tracker_data.get_slot_info,
             all_slots=tracker_data.get_all_slots(),
             room_players=tracker_data.get_all_players(),
             locations=tracker_data.get_room_locations(),

From 66314de965f7fd5f8df566c84a3cf0286ae43ab4 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun, 17 Nov 2024 00:55:18 +0100
Subject: [PATCH 012/381] Subnautica: compose DeathLink custom text instead of
 overwriting (#4172)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/subnautica/options.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/worlds/subnautica/options.py b/worlds/subnautica/options.py
index 4bdd9aafa53f..6cdcb33d8954 100644
--- a/worlds/subnautica/options.py
+++ b/worlds/subnautica/options.py
@@ -112,8 +112,7 @@ def get_pool(self) -> typing.List[str]:
 
 
 class SubnauticaDeathLink(DeathLink):
-    """When you die, everyone dies. Of course the reverse is true too.
-    Note: can be toggled via in-game console command "deathlink"."""
+    __doc__ = DeathLink.__doc__ + "\n\n    Note: can be toggled via in-game console command \"deathlink\"."
 
 
 class FillerItemsDistribution(ItemDict):

From 73146ef30ca7082b4351236fa5f76a6f092d6e1e Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sun, 17 Nov 2024 01:52:49 +0100
Subject: [PATCH 013/381] Tests: Use Option.from_any instead of Option() in
 test_pickle_dumps, which is currently preventing Range options from using
 default: "random" #4197

---
 test/general/test_options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/general/test_options.py b/test/general/test_options.py
index d6d5ce6da06b..7a3743e5a4e7 100644
--- a/test/general/test_options.py
+++ b/test/general/test_options.py
@@ -78,4 +78,4 @@ def test_pickle_dumps(self):
             if not world_type.hidden:
                 for option_key, option in world_type.options_dataclass.type_hints.items():
                     with self.subTest(game=gamename, option=option_key):
-                        pickle.dumps(option(option.default))
+                        pickle.dumps(option.from_any(option.default))

From 7eb12174b74ba566e7934b53686bc68a44861935 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Sun, 17 Nov 2024 15:55:42 +0000
Subject: [PATCH 014/381] Core: Fix empty rule comparisons with subclasses
 (#4201)

If a world uses a `Location` or `Entrance` subclass that overrides the
`item_rule`/`access_rule` class attribute, then
`spot.__class__.item_rule`/`spot.__class__.access_rule` will get the
overridden rule, which may not be an empty rule.

Uses of `spot.__class__` have been replaced with getting the class
attribute rule belonging to the `Location` or `Entrance` class.
---
 worlds/generic/Rules.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/worlds/generic/Rules.py b/worlds/generic/Rules.py
index e930c4b8d6e9..31d725bff722 100644
--- a/worlds/generic/Rules.py
+++ b/worlds/generic/Rules.py
@@ -69,7 +69,7 @@ def forbid(sender: int, receiver: int, items: typing.Set[str]):
             if (location.player, location.item_rule) in func_cache:
                 location.item_rule = func_cache[location.player, location.item_rule]
             # empty rule that just returns True, overwrite
-            elif location.item_rule is location.__class__.item_rule:
+            elif location.item_rule is Location.item_rule:
                 func_cache[location.player, location.item_rule] = location.item_rule = \
                     lambda i, sending_blockers = forbid_data[location.player], \
                                             old_rule = location.item_rule: \
@@ -103,7 +103,7 @@ def set_rule(spot: typing.Union["BaseClasses.Location", "BaseClasses.Entrance"],
 def add_rule(spot: typing.Union["BaseClasses.Location", "BaseClasses.Entrance"], rule: CollectionRule, combine="and"):
     old_rule = spot.access_rule
     # empty rule, replace instead of add
-    if old_rule is spot.__class__.access_rule:
+    if old_rule is Location.access_rule or old_rule is Entrance.access_rule:
         spot.access_rule = rule if combine == "and" else old_rule
     else:
         if combine == "and":
@@ -115,7 +115,7 @@ def add_rule(spot: typing.Union["BaseClasses.Location", "BaseClasses.Entrance"],
 def forbid_item(location: "BaseClasses.Location", item: str, player: int):
     old_rule = location.item_rule
     # empty rule
-    if old_rule is location.__class__.item_rule:
+    if old_rule is Location.item_rule:
         location.item_rule = lambda i: i.name != item or i.player != player
     else:
         location.item_rule = lambda i: (i.name != item or i.player != player) and old_rule(i)
@@ -135,7 +135,7 @@ def forbid_items(location: "BaseClasses.Location", items: typing.Set[str]):
 def add_item_rule(location: "BaseClasses.Location", rule: ItemRule, combine: str = "and"):
     old_rule = location.item_rule
     # empty rule, replace instead of add
-    if old_rule is location.__class__.item_rule:
+    if old_rule is Location.item_rule:
         location.item_rule = rule if combine == "and" else old_rule
     else:
         if combine == "and":

From a3d6036939bf0aa606808b5a51f2df8f303f2039 Mon Sep 17 00:00:00 2001
From: CaitSith2 <d_good@caitsith2.com>
Date: Sun, 17 Nov 2024 07:58:14 -0800
Subject: [PATCH 015/381] Factorio: energy link bridge improvements (#4182)

* improve energy link performance on large surfaces

* Add Energy link bridge storage table to initialization.

* Fix event based energy link for Factorio 2.0

* Adjust energy link bridge for quality.
---
 worlds/factorio/data/mod_template/control.lua | 91 +++++++++++++++----
 1 file changed, 74 insertions(+), 17 deletions(-)

diff --git a/worlds/factorio/data/mod_template/control.lua b/worlds/factorio/data/mod_template/control.lua
index 4383357546d9..b08608a60ae9 100644
--- a/worlds/factorio/data/mod_template/control.lua
+++ b/worlds/factorio/data/mod_template/control.lua
@@ -105,8 +105,8 @@ function on_player_changed_position(event)
     end
     local target_direction = exit_table[outbound_direction]
 
-	local target_position = {(CHUNK_OFFSET[target_direction][1] + last_x_chunk) * 32 + 16,
-							 (CHUNK_OFFSET[target_direction][2] + last_y_chunk) * 32 + 16}
+    local target_position = {(CHUNK_OFFSET[target_direction][1] + last_x_chunk) * 32 + 16,
+                             (CHUNK_OFFSET[target_direction][2] + last_y_chunk) * 32 + 16}
     target_position = character.surface.find_non_colliding_position(character.prototype.name,
                                                                     target_position, 32, 0.5)
     if target_position ~= nil then
@@ -134,40 +134,96 @@ end
 
 script.on_event(defines.events.on_player_changed_position, on_player_changed_position)
 {% endif %}
-
+function count_energy_bridges()
+    local count = 0
+    for i, bridge in pairs(storage.energy_link_bridges) do
+        if validate_energy_link_bridge(i, bridge) then
+            count = count + 1 + (bridge.quality.level * 0.3)
+        end
+    end
+    return count
+end
+function get_energy_increment(bridge)
+    return ENERGY_INCREMENT + (ENERGY_INCREMENT * 0.3 * bridge.quality.level)
+end
 function on_check_energy_link(event)
     --- assuming 1 MJ increment and 5MJ battery:
     --- first 2 MJ request fill, last 2 MJ push energy, middle 1 MJ does nothing
     if event.tick % 60 == 30 then
-        local surface = game.get_surface(1)
         local force = "player"
-        local bridges = surface.find_entities_filtered({name="ap-energy-bridge", force=force})
-        local bridgecount = table_size(bridges)
+        local bridges = storage.energy_link_bridges
+        local bridgecount = count_energy_bridges()
         storage.forcedata[force].energy_bridges = bridgecount
         if storage.forcedata[force].energy == nil then
             storage.forcedata[force].energy = 0
         end
         if storage.forcedata[force].energy < ENERGY_INCREMENT * bridgecount * 5 then
-            for i, bridge in ipairs(bridges) do
-                if bridge.energy > ENERGY_INCREMENT*3 then
-                    storage.forcedata[force].energy = storage.forcedata[force].energy + (ENERGY_INCREMENT * ENERGY_LINK_EFFICIENCY)
-                    bridge.energy = bridge.energy - ENERGY_INCREMENT
+            for i, bridge in pairs(bridges) do
+                if validate_energy_link_bridge(i, bridge) then
+                    energy_increment = get_energy_increment(bridge)
+                    if bridge.energy > energy_increment*3 then
+                        storage.forcedata[force].energy = storage.forcedata[force].energy + (energy_increment * ENERGY_LINK_EFFICIENCY)
+                        bridge.energy = bridge.energy - energy_increment
+                    end
                 end
             end
         end
-        for i, bridge in ipairs(bridges) do
-            if storage.forcedata[force].energy < ENERGY_INCREMENT then
-                break
-            end
-            if bridge.energy < ENERGY_INCREMENT*2 and storage.forcedata[force].energy > ENERGY_INCREMENT then
-                storage.forcedata[force].energy = storage.forcedata[force].energy - ENERGY_INCREMENT
-                bridge.energy = bridge.energy + ENERGY_INCREMENT
+        for i, bridge in pairs(bridges) do
+            if validate_energy_link_bridge(i, bridge) then
+                energy_increment = get_energy_increment(bridge)
+                if storage.forcedata[force].energy < energy_increment and bridge.quality.level == 0 then
+                    break
+                end
+                if bridge.energy < energy_increment*2 and storage.forcedata[force].energy > energy_increment then
+                    storage.forcedata[force].energy = storage.forcedata[force].energy - energy_increment
+                    bridge.energy = bridge.energy + energy_increment
+                end
             end
         end
     end
 end
+function string_starts_with(str, start)
+    return str:sub(1, #start) == start
+end
+function validate_energy_link_bridge(unit_number, entity)
+    if not entity then
+        if storage.energy_link_bridges[unit_number] == nil then return false end
+        storage.energy_link_bridges[unit_number] = nil
+        return false
+    end
+    if not entity.valid then
+        if storage.energy_link_bridges[unit_number] == nil then return false end
+        storage.energy_link_bridges[unit_number] = nil
+        return false
+    end
+    return true
+end
+function on_energy_bridge_constructed(entity)
+    if entity and entity.valid then
+        if string_starts_with(entity.prototype.name, "ap-energy-bridge") then
+            storage.energy_link_bridges[entity.unit_number] = entity
+        end
+    end
+end
+function on_energy_bridge_removed(entity)
+    if string_starts_with(entity.prototype.name, "ap-energy-bridge") then
+        if storage.energy_link_bridges[entity.unit_number] == nil then return end
+        storage.energy_link_bridges[entity.unit_number] = nil
+    end
+end
 if (ENERGY_INCREMENT) then
     script.on_event(defines.events.on_tick, on_check_energy_link)
+
+    script.on_event({defines.events.on_built_entity}, function(event) on_energy_bridge_constructed(event.entity) end)
+    script.on_event({defines.events.on_robot_built_entity}, function(event) on_energy_bridge_constructed(event.entity) end)
+    script.on_event({defines.events.on_entity_cloned}, function(event) on_energy_bridge_constructed(event.destination) end)
+
+    script.on_event({defines.events.script_raised_revive}, function(event) on_energy_bridge_constructed(event.entity) end)
+    script.on_event({defines.events.script_raised_built}, function(event) on_energy_bridge_constructed(event.entity) end)
+
+    script.on_event({defines.events.on_entity_died}, function(event) on_energy_bridge_removed(event.entity) end)
+    script.on_event({defines.events.on_player_mined_entity}, function(event) on_energy_bridge_removed(event.entity) end)
+    script.on_event({defines.events.on_robot_mined_entity}, function(event) on_energy_bridge_removed(event.entity) end)
 end
 
 {% if not imported_blueprints -%}
@@ -410,6 +466,7 @@ script.on_init(function()
     {% if not imported_blueprints %}set_permissions(){% endif %}
     storage.forcedata = {}
     storage.playerdata = {}
+    storage.energy_link_bridges = {}
     -- Fire dummy events for all currently existing forces.
     local e = {}
     for name, _ in pairs(game.forces) do

From 75e18e3cc98f1d95eb92568000a427d56c3eaf7b Mon Sep 17 00:00:00 2001
From: Louis M <prog@tioui.com>
Date: Sun, 17 Nov 2024 10:59:50 -0500
Subject: [PATCH 016/381] Aquaria: Fixing no progression bug (#4199)

---
 worlds/aquaria/Regions.py                     | 50 +++++++++----------
 ...st_no_progression_hard_hidden_locations.py |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/worlds/aquaria/Regions.py b/worlds/aquaria/Regions.py
index 792d7b73dfdb..7a41e0d0c864 100755
--- a/worlds/aquaria/Regions.py
+++ b/worlds/aquaria/Regions.py
@@ -1152,79 +1152,79 @@ def __adjusting_manual_rules(self) -> None:
     def __no_progression_hard_or_hidden_location(self) -> None:
         self.multiworld.get_location("Energy Temple boss area, Fallen God Tooth",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Mithalas boss area, beating Mithalan God",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Kelp Forest boss area, beating Drunian God",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Sun Temple boss area, beating Sun God",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Sunken City, bulb on top of the boss area",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Home Water, Nautilus Egg",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Energy Temple blaster room, Blaster Egg",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Mithalas City Castle, beating the Priests",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Mermog cave, Piranha Egg",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Octopus Cave, Dumbo Egg",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("King Jellyfish Cave, bulb in the right path from King Jelly",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("King Jellyfish Cave, Jellyfish Costume",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Final Boss area, bulb in the boss third form room",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Sun Worm path, first cliff bulb",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Sun Worm path, second cliff bulb",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("The Veil top right area, bulb at the top of the waterfall",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Bubble Cave, bulb in the left cave wall",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Bubble Cave, Verse Egg",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Kelp Forest bottom left area, bulb close to the spirit crystals",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Kelp Forest bottom left area, Walker Baby",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Sun Temple, Sun Key",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("The Body bottom area, Mutant Costume",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Sun Temple, bulb in the hidden room of the right part",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
         self.multiworld.get_location("Arnassi Ruins, Arnassi Armor",
                                      self.player).item_rule = \
-            lambda item: item.classification != ItemClassification.progression
+            lambda item: not item.advancement
 
     def adjusting_rules(self, options: AquariaOptions) -> None:
         """
diff --git a/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py b/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
index f015b26de10b..517af3028dd2 100644
--- a/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
+++ b/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
@@ -49,7 +49,7 @@ def test_unconfine_home_water_both_location_fillable(self) -> None:
         for location in self.unfillable_locations:
             for item_name in self.world.item_names:
                 item = self.get_item_by_name(item_name)
-                if item.classification == ItemClassification.progression:
+                if item.advancement:
                     self.assertFalse(
                         self.world.get_location(location).can_fill(self.multiworld.state, item, False),
                         "The location \"" + location + "\" can be filled with \"" + item_name + "\"")

From 9c102da901c33615b085a901bbf3102770befb87 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Mon, 18 Nov 2024 02:16:14 +0100
Subject: [PATCH 017/381] The Witness: Allow setting the puzzle randomization
 seed yourself (#4196)

* Allow setting the puzzle randomization seed yourself

* longer tooltip

* Oh

* Also actually have the correct values that the client will accept (lol, thanks Medic)

* Update worlds/witness/options.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/witness/__init__.py     |  2 +-
 worlds/witness/options.py      | 12 ++++++++++++
 worlds/witness/player_items.py |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
index a21a5bb3ca7e..ac9197bd92bb 100644
--- a/worlds/witness/__init__.py
+++ b/worlds/witness/__init__.py
@@ -80,7 +80,7 @@ class WitnessWorld(World):
 
     def _get_slot_data(self) -> Dict[str, Any]:
         return {
-            "seed": self.random.randrange(0, 1000000),
+            "seed": self.options.puzzle_randomization_seed.value,
             "victory_location": int(self.player_logic.VICTORY_LOCATION, 16),
             "panelhex_to_id": self.player_locations.CHECK_PANELHEX_TO_ID,
             "item_id_to_door_hexes": static_witness_items.get_item_to_door_mappings(),
diff --git a/worlds/witness/options.py b/worlds/witness/options.py
index 4de966abe96d..e1462cc37508 100644
--- a/worlds/witness/options.py
+++ b/worlds/witness/options.py
@@ -401,6 +401,16 @@ class DeathLinkAmnesty(Range):
     default = 1
 
 
+class PuzzleRandomizationSeed(Range):
+    """
+    Sigma Rando, which is the basis for all puzzle randomization in this randomizer, uses a seed from 1 to 9999999 for the puzzle randomization.
+    This option lets you set this seed yourself.
+    """
+    range_start = 1
+    range_end = 9999999
+    default = "random"
+
+
 @dataclass
 class TheWitnessOptions(PerGameCommonOptions):
     puzzle_randomization: PuzzleRandomization
@@ -435,6 +445,7 @@ class TheWitnessOptions(PerGameCommonOptions):
     laser_hints: LaserHints
     death_link: DeathLink
     death_link_amnesty: DeathLinkAmnesty
+    puzzle_randomization_seed: PuzzleRandomizationSeed
     shuffle_dog: ShuffleDog
 
 
@@ -483,6 +494,7 @@ class TheWitnessOptions(PerGameCommonOptions):
         ElevatorsComeToYou,
         DeathLink,
         DeathLinkAmnesty,
+        PuzzleRandomizationSeed,
     ]),
     OptionGroup("Silly Options", [
         ShuffleDog,
diff --git a/worlds/witness/player_items.py b/worlds/witness/player_items.py
index 4c98cb78495e..3be298ebccae 100644
--- a/worlds/witness/player_items.py
+++ b/worlds/witness/player_items.py
@@ -2,7 +2,7 @@
 Defines progression, junk and event items for The Witness
 """
 import copy
-from typing import TYPE_CHECKING, Dict, List, Set, cast
+from typing import TYPE_CHECKING, Dict, List, Set
 
 from BaseClasses import Item, ItemClassification, MultiWorld
 

From baf291d7a277bef4fd06ee5812fd7952b98bc5eb Mon Sep 17 00:00:00 2001
From: t3hf1gm3nt <59876300+t3hf1gm3nt@users.noreply.github.com>
Date: Sun, 17 Nov 2024 20:19:26 -0500
Subject: [PATCH 018/381] TLOZ: Assorted Logic Fixes (#4203)

* TLOZ: Assorded Logic Fixes

- Add needing arrows for Pols Voice rule. Not super necessary at the moment since wooden arrows are always accessible in one of the opening shops, but future proofing for future plans

- Create Gohma Locations and make sure all Gohma blocked locations have the required rule (was missing at least one location before)

- Remove the rule requiring Bow for all locations of level 8 (not sure why that was there, it's theoretically redundant now that Gohma and Pols Voice are properly marked)

- Make sure Digdogger locations properly require Recorder, and clean up redundant Level 7 rules as level 7 currently requires Recorder to access the entrance

* Update worlds/tloz/Rules.py

forgor that has_any exists

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Remove world = multiworld

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/tloz/Locations.py |   6 ++-
 worlds/tloz/Rules.py     | 102 ++++++++++++++++++---------------------
 2 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/worlds/tloz/Locations.py b/worlds/tloz/Locations.py
index 9715cc684291..f95e5d80443e 100644
--- a/worlds/tloz/Locations.py
+++ b/worlds/tloz/Locations.py
@@ -108,11 +108,15 @@
 ]
 
 food_locations = [
-    "Level 7 Map", "Level 7 Boss", "Level 7 Triforce", "Level 7 Key Drop (Goriyas)",
+    "Level 7 Item (Red Candle)", "Level 7 Map", "Level 7 Boss", "Level 7 Triforce", "Level 7 Key Drop (Goriyas)",
     "Level 7 Bomb Drop (Moldorms North)", "Level 7 Bomb Drop (Goriyas North)",
     "Level 7 Bomb Drop (Dodongos)", "Level 7 Rupee Drop (Goriyas North)"
 ]
 
+gohma_locations = [
+    "Level 6 Boss", "Level 6 Triforce", "Level 8 Item (Magical Key)", "Level 8 Bomb Drop (Darknuts North)"
+]
+
 gleeok_locations = [
     "Level 4 Boss", "Level 4 Triforce", "Level 8 Boss", "Level 8 Triforce"
 ]
diff --git a/worlds/tloz/Rules.py b/worlds/tloz/Rules.py
index 39c3b954f0d4..de627a533bd3 100644
--- a/worlds/tloz/Rules.py
+++ b/worlds/tloz/Rules.py
@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from worlds.generic.Rules import add_rule
-from .Locations import food_locations, shop_locations, gleeok_locations
+from .Locations import food_locations, shop_locations, gleeok_locations, gohma_locations
 from .ItemPool import dangerous_weapon_locations
 from .Options import StartingPosition
 
@@ -10,13 +10,12 @@
 
 def set_rules(tloz_world: "TLoZWorld"):
     player = tloz_world.player
-    world = tloz_world.multiworld
     options = tloz_world.options
 
     # Boss events for a nicer spoiler log play through
     for level in range(1, 9):
-        boss = world.get_location(f"Level {level} Boss", player)
-        boss_event = world.get_location(f"Level {level} Boss Status", player)
+        boss = tloz_world.get_location(f"Level {level} Boss")
+        boss_event = tloz_world.get_location(f"Level {level} Boss Status")
         status = tloz_world.create_event(f"Boss {level} Defeated")
         boss_event.place_locked_item(status)
         add_rule(boss_event, lambda state, b=boss: state.can_reach(b, "Location", player))
@@ -26,136 +25,131 @@ def set_rules(tloz_world: "TLoZWorld"):
         for location in level.locations:
             if options.StartingPosition < StartingPosition.option_dangerous \
                     or location.name not in dangerous_weapon_locations:
-                add_rule(world.get_location(location.name, player),
+                add_rule(tloz_world.get_location(location.name),
                          lambda state: state.has_group("weapons", player))
             #  This part of the loop sets up an expected amount of defense needed for each dungeon
             if i > 0:  # Don't need an extra heart for Level 1
-                add_rule(world.get_location(location.name, player),
+                add_rule(tloz_world.get_location(location.name),
                          lambda state, hearts=i: state.has("Heart Container", player, hearts) or
                                        (state.has("Blue Ring", player) and
                                         state.has("Heart Container", player, int(hearts / 2))) or
                                        (state.has("Red Ring", player) and
                                         state.has("Heart Container", player, int(hearts / 4))))
             if "Pols Voice" in location.name:  # This enemy needs specific weapons
-                add_rule(world.get_location(location.name, player),
-                         lambda state: state.has_group("swords", player) or state.has("Bow", player))
+                add_rule(tloz_world.get_location(location.name),
+                         lambda state: state.has_group("swords", player) or
+                                       (state.has("Bow", player) and state.has_group("arrows", player)))
 
     # No requiring anything in a shop until we can farm for money
     for location in shop_locations:
-        add_rule(world.get_location(location, player),
+        add_rule(tloz_world.get_location(location),
                  lambda state: state.has_group("weapons", player))
 
     # Everything from 4 on up has dark rooms
     for level in tloz_world.levels[4:]:
         for location in level.locations:
-            add_rule(world.get_location(location.name, player),
+            add_rule(tloz_world.get_location(location.name),
                      lambda state: state.has_group("candles", player)
                                    or (state.has("Magical Rod", player) and state.has("Book of Magic", player)))
 
     # Everything from 5 on up has gaps
     for level in tloz_world.levels[5:]:
         for location in level.locations:
-            add_rule(world.get_location(location.name, player),
+            add_rule(tloz_world.get_location(location.name),
                      lambda state: state.has("Stepladder", player))
 
-    add_rule(world.get_location("Level 5 Boss", player),
-             lambda state: state.has("Recorder", player))
-
-    add_rule(world.get_location("Level 6 Boss", player),
-             lambda state: state.has("Bow", player) and state.has_group("arrows", player))
+    # Level 4 Access
+    for location in tloz_world.levels[4].locations:
+        add_rule(tloz_world.get_location(location.name),
+                 lambda state: state.has_any(("Raft", "Recorder"), player))
 
-    add_rule(world.get_location("Level 7 Item (Red Candle)", player),
+    # Digdogger boss. Rework this once ER happens
+    add_rule(tloz_world.get_location("Level 5 Boss"),
              lambda state: state.has("Recorder", player))
-    add_rule(world.get_location("Level 7 Boss", player),
+    add_rule(tloz_world.get_location("Level 5 Triforce"),
              lambda state: state.has("Recorder", player))
-    if options.ExpandedPool:
-        add_rule(world.get_location("Level 7 Key Drop (Stalfos)", player),
-                 lambda state: state.has("Recorder", player))
-        add_rule(world.get_location("Level 7 Bomb Drop (Digdogger)", player),
-                 lambda state: state.has("Recorder", player))
-        add_rule(world.get_location("Level 7 Rupee Drop (Dodongos)", player),
+
+    for location in gohma_locations:
+        if options.ExpandedPool or "Drop" not in location:
+            add_rule(tloz_world.get_location(location),
+                     lambda state: state.has("Bow", player) and state.has_group("arrows", player))
+
+    # Recorder Access for Level 7
+    for location in tloz_world.levels[7].locations:
+        add_rule(tloz_world.get_location(location.name),
                  lambda state: state.has("Recorder", player))
 
     for location in food_locations:
         if options.ExpandedPool or "Drop" not in location:
-            add_rule(world.get_location(location, player),
+            add_rule(tloz_world.get_location(location),
                      lambda state: state.has("Food", player))
 
     for location in gleeok_locations:
-        add_rule(world.get_location(location, player),
+        add_rule(tloz_world.get_location(location),
                  lambda state: state.has_group("swords", player) or state.has("Magical Rod", player))
 
     # Candle access for Level 8
     for location in tloz_world.levels[8].locations:
-        add_rule(world.get_location(location.name, player),
+        add_rule(tloz_world.get_location(location.name),
             lambda state: state.has_group("candles", player))
 
-    add_rule(world.get_location("Level 8 Item (Magical Key)", player),
+    add_rule(tloz_world.get_location("Level 8 Item (Magical Key)"),
              lambda state: state.has("Bow", player) and state.has_group("arrows", player))
     if options.ExpandedPool:
-        add_rule(world.get_location("Level 8 Bomb Drop (Darknuts North)", player),
+        add_rule(tloz_world.get_location("Level 8 Bomb Drop (Darknuts North)"),
                  lambda state: state.has("Bow", player) and state.has_group("arrows", player))
 
     for location in tloz_world.levels[9].locations:
-        add_rule(world.get_location(location.name, player),
+        add_rule(tloz_world.get_location(location.name),
                  lambda state: state.has("Triforce Fragment", player, 8) and
                                state.has_group("swords", player))
 
     # Yes we are looping this range again for Triforce locations. No I can't add it to the boss event loop
     for level in range(1, 9):
-        add_rule(world.get_location(f"Level {level} Triforce", player),
+        add_rule(tloz_world.get_location(f"Level {level} Triforce"),
                  lambda state, l=level: state.has(f"Boss {l} Defeated", player))
 
     # Sword, raft, and ladder spots
-    add_rule(world.get_location("White Sword Pond", player),
+    add_rule(tloz_world.get_location("White Sword Pond"),
              lambda state: state.has("Heart Container", player, 2))
-    add_rule(world.get_location("Magical Sword Grave", player),
+    add_rule(tloz_world.get_location("Magical Sword Grave"),
              lambda state: state.has("Heart Container", player, 9))
 
     stepladder_locations = ["Ocean Heart Container", "Level 4 Triforce", "Level 4 Boss", "Level 4 Map"]
     stepladder_locations_expanded = ["Level 4 Key Drop (Keese North)"]
     for location in stepladder_locations:
-        add_rule(world.get_location(location, player),
+        add_rule(tloz_world.get_location(location),
                  lambda state: state.has("Stepladder", player))
     if options.ExpandedPool:
         for location in stepladder_locations_expanded:
-            add_rule(world.get_location(location, player),
+            add_rule(tloz_world.get_location(location),
                      lambda state: state.has("Stepladder", player))
 
     # Don't allow Take Any Items until we can actually get in one
     if options.ExpandedPool:
-        add_rule(world.get_location("Take Any Item Left", player),
+        add_rule(tloz_world.get_location("Take Any Item Left"),
                  lambda state: state.has_group("candles", player) or
                                state.has("Raft", player))
-        add_rule(world.get_location("Take Any Item Middle", player),
+        add_rule(tloz_world.get_location("Take Any Item Middle"),
                  lambda state: state.has_group("candles", player) or
                                state.has("Raft", player))
-        add_rule(world.get_location("Take Any Item Right", player),
+        add_rule(tloz_world.get_location("Take Any Item Right"),
                  lambda state: state.has_group("candles", player) or
                                state.has("Raft", player))
-    for location in tloz_world.levels[4].locations:
-        add_rule(world.get_location(location.name, player),
-                 lambda state: state.has("Raft", player) or state.has("Recorder", player))
-    for location in tloz_world.levels[7].locations:
-        add_rule(world.get_location(location.name, player),
-                 lambda state: state.has("Recorder", player))
-    for location in tloz_world.levels[8].locations:
-        add_rule(world.get_location(location.name, player),
-                 lambda state: state.has("Bow", player))
 
-    add_rule(world.get_location("Potion Shop Item Left", player),
+    add_rule(tloz_world.get_location("Potion Shop Item Left"),
              lambda state: state.has("Letter", player))
-    add_rule(world.get_location("Potion Shop Item Middle", player),
+    add_rule(tloz_world.get_location("Potion Shop Item Middle"),
              lambda state: state.has("Letter", player))
-    add_rule(world.get_location("Potion Shop Item Right", player),
+    add_rule(tloz_world.get_location("Potion Shop Item Right"),
              lambda state: state.has("Letter", player))
 
-    add_rule(world.get_location("Shield Shop Item Left", player),
+    add_rule(tloz_world.get_location("Shield Shop Item Left"),
              lambda state: state.has_group("candles", player) or
                            state.has("Bomb", player))
-    add_rule(world.get_location("Shield Shop Item Middle", player),
+    add_rule(tloz_world.get_location("Shield Shop Item Middle"),
              lambda state: state.has_group("candles", player) or
                            state.has("Bomb", player))
-    add_rule(world.get_location("Shield Shop Item Right", player),
+    add_rule(tloz_world.get_location("Shield Shop Item Right"),
              lambda state: state.has_group("candles", player) or
-                           state.has("Bomb", player))
\ No newline at end of file
+                           state.has("Bomb", player))

From bd5c8ec172b51397c8aac4f7f701d47e7ff8bbb2 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sun, 17 Nov 2024 19:22:25 -0600
Subject: [PATCH 019/381] MM2: minor bugfixes (#4190)

* move special cases to be outside strict

* Update text.py

* fix wily machine edge case, incorrect weapons, and time stopper failsafe

* bump world version

* weakness checking is inclusive

* Update __init__.py

* add air shooter to edge case validation
---
 worlds/mm2/__init__.py |  6 ++---
 worlds/mm2/rules.py    | 53 ++++++++++++++++++++++--------------------
 worlds/mm2/text.py     |  2 +-
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/worlds/mm2/__init__.py b/worlds/mm2/__init__.py
index 07e1823f9387..4a43ee8df0f0 100644
--- a/worlds/mm2/__init__.py
+++ b/worlds/mm2/__init__.py
@@ -96,13 +96,13 @@ class MM2World(World):
     location_name_groups = location_groups
     web = MM2WebWorld()
     rom_name: bytearray
-    world_version: Tuple[int, int, int] = (0, 3, 1)
+    world_version: Tuple[int, int, int] = (0, 3, 2)
     wily_5_weapons: Dict[int, List[int]]
 
-    def __init__(self, world: MultiWorld, player: int):
+    def __init__(self, multiworld: MultiWorld, player: int):
         self.rom_name = bytearray()
         self.rom_name_available_event = threading.Event()
-        super().__init__(world, player)
+        super().__init__(multiworld, player)
         self.weapon_damage = deepcopy(weapon_damage)
         self.wily_5_weapons = {}
 
diff --git a/worlds/mm2/rules.py b/worlds/mm2/rules.py
index eddd09927445..7e2ce1f3c752 100644
--- a/worlds/mm2/rules.py
+++ b/worlds/mm2/rules.py
@@ -133,28 +133,6 @@ def set_rules(world: "MM2World") -> None:
                         # 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]:
@@ -168,6 +146,28 @@ def set_rules(world: "MM2World") -> None:
                 world.weapon_damage[weapons_to_id[p_weapon]][bosses[p_boss]] \
                     = world.options.plando_weakness[p_boss][p_weapon]
 
+        # handle special cases
+        for boss in range(14):
+            for weapon in (1, 2, 3, 6, 8):
+                if (0 < world.weapon_damage[weapon][boss] < minimum_weakness_requirement[weapon] and
+                        not any(world.weapon_damage[i][boss] >= minimum_weakness_requirement[weapon]
+                                for i in range(9) if i != weapon)):
+                    # Weapon does not have enough possible ammo to kill the boss, raise the damage
+                    if boss == 9:
+                        if weapon in (1, 6):
+                            # 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]
+
         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]
 
@@ -209,11 +209,11 @@ def set_rules(world: "MM2World") -> None:
                     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
+                    used_weapons[boss].add(wp)
                 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
@@ -221,18 +221,21 @@ def set_rules(world: "MM2World") -> None:
                     # 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)
+                                       if weapon != 0 and (weapon != 8 or boss != 12))
+                    # Wily Machine cannot under any circumstances take damage from Time Stopper, prevent this
                     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]))
+                               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)
+                    used_weapons[boss].add(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)
+                    used_weapons[boss].add(wp)
 
         world.wily_5_weapons = {boss: sorted(used_weapons[boss]) for boss in used_weapons}
 
diff --git a/worlds/mm2/text.py b/worlds/mm2/text.py
index 32d665bf6c7f..7dda12ac0346 100644
--- a/worlds/mm2/text.py
+++ b/worlds/mm2/text.py
@@ -1,7 +1,7 @@
 from typing import DefaultDict
 from collections import defaultdict
 
-MM2_WEAPON_ENCODING: DefaultDict[str, int] = defaultdict(lambda x: 0x6F, {
+MM2_WEAPON_ENCODING: DefaultDict[str, int] = defaultdict(lambda: 0x6F, {
     ' ': 0x40,
     'A': 0x41,
     'B': 0x42,

From 4b80b786e23b118999a6746fa0e22f7c53e89b4f Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Mon, 18 Nov 2024 02:45:04 -0500
Subject: [PATCH 020/381] Stardew Valley: Removed Walnutsanity and Filler buffs
 from the all random preset (#4206)

---
 worlds/stardew_valley/presets.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/worlds/stardew_valley/presets.py b/worlds/stardew_valley/presets.py
index 1861a914235c..62672f29e424 100644
--- a/worlds/stardew_valley/presets.py
+++ b/worlds/stardew_valley/presets.py
@@ -41,9 +41,7 @@
     Friendsanity.internal_name:             "random",
     FriendsanityHeartSize.internal_name:    "random",
     Booksanity.internal_name:               "random",
-    Walnutsanity.internal_name:             "random",
     NumberOfMovementBuffs.internal_name:    "random",
-    EnabledFillerBuffs.internal_name:       "random",
     ExcludeGingerIsland.internal_name:      "random",
     TrapItems.internal_name:                "random",
     MultipleDaySleepEnabled.internal_name:  "random",

From 01c603756254d4c16383698bc00ac9227d1c480d Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Mon, 18 Nov 2024 08:39:58 -0500
Subject: [PATCH 021/381] TUNIC: Fix a few missing tricks in logic (#4132)

* Add missing connection to the furnace entry by west garden

* Add missing connection to the furnace entry by west garden

* Add missing hard ls for ruined passage door

* Allow shield for LS

* Split PR into two

* Split PR into two

* Split PR into two

* Add dark tomb ice grapple through the wall
---
 worlds/tunic/er_data.py             |  2 +-
 worlds/tunic/er_rules.py            | 11 +++++++----
 worlds/tunic/ladder_storage_data.py |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/worlds/tunic/er_data.py b/worlds/tunic/er_data.py
index 343bf3055378..1269f3b85e45 100644
--- a/worlds/tunic/er_data.py
+++ b/worlds/tunic/er_data.py
@@ -807,7 +807,7 @@ class DeadEnd(IntEnum):
             [],
         # drop a rudeling, icebolt or ice bomb
         "Overworld to West Garden from Furnace":
-            [["IG3"]],
+            [["IG3"], ["LS1"]],
     },
     "East Overworld": {
         "Above Ruined Passage":
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index 6f5eec020be6..3b111ad83488 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -501,9 +501,11 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Dark Tomb Upper"].connect(
         connecting_region=regions["Dark Tomb Entry Point"])
 
+    # ice grapple through the wall, get the little secret sound to trigger
     regions["Dark Tomb Upper"].connect(
         connecting_region=regions["Dark Tomb Main"],
-        rule=lambda state: has_ladder("Ladder in Dark Tomb", state, world))
+        rule=lambda state: has_ladder("Ladder in Dark Tomb", state, world)
+        or has_ice_grapple_logic(False, IceGrappling.option_hard, state, world))
     regions["Dark Tomb Main"].connect(
         connecting_region=regions["Dark Tomb Upper"],
         rule=lambda state: has_ladder("Ladder in Dark Tomb", state, world))
@@ -779,12 +781,10 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
 
     regions["Fortress East Shortcut Upper"].connect(
         connecting_region=regions["Fortress East Shortcut Lower"])
-    # nmg: can ice grapple upwards
     regions["Fortress East Shortcut Lower"].connect(
         connecting_region=regions["Fortress East Shortcut Upper"],
         rule=lambda state: has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
 
-    # nmg: ice grapple through the big gold door, can do it both ways
     regions["Eastern Vault Fortress"].connect(
         connecting_region=regions["Eastern Vault Fortress Gold Door"],
         rule=lambda state: state.has_all({"Activate Eastern Vault West Fuses",
@@ -807,7 +807,6 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Fortress Hero's Grave Region"].connect(
         connecting_region=regions["Fortress Grave Path"])
 
-    # nmg: ice grapple from upper grave path to lower
     regions["Fortress Grave Path Upper"].connect(
         connecting_region=regions["Fortress Grave Path"],
         rule=lambda state: has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
@@ -1139,6 +1138,9 @@ def ls_connect(origin_name: str, portal_sdt: str) -> None:
             for portal_dest in region_info.portals:
                 ls_connect(ladder_region, "Overworld Redux, " + portal_dest)
 
+        # convenient staircase means this one is easy difficulty, even though there's an elevation change
+        ls_connect("LS Elev 0", "Overworld Redux, Furnace_gyro_west")
+
         # connect ls elevation regions to regions where you can get an enemy to knock you down, also well rail
         if options.ladder_storage >= LadderStorage.option_medium:
             for ladder_region, region_info in ow_ladder_groups.items():
@@ -1154,6 +1156,7 @@ def ls_connect(origin_name: str, portal_sdt: str) -> None:
         if options.ladder_storage >= LadderStorage.option_hard:
             ls_connect("LS Elev 1", "Overworld Redux, EastFiligreeCache_")
             ls_connect("LS Elev 2", "Overworld Redux, Town_FiligreeRoom_")
+            ls_connect("LS Elev 2", "Overworld Redux, Ruins Passage_west")
             ls_connect("LS Elev 3", "Overworld Redux, Overworld Interiors_house")
             ls_connect("LS Elev 5", "Overworld Redux, Temple_main")
 
diff --git a/worlds/tunic/ladder_storage_data.py b/worlds/tunic/ladder_storage_data.py
index a29d50b4f455..c6dda42bca79 100644
--- a/worlds/tunic/ladder_storage_data.py
+++ b/worlds/tunic/ladder_storage_data.py
@@ -17,7 +17,7 @@ class OWLadderInfo(NamedTuple):
                               ["Overworld Beach"]),
     # also the east filigree room
     "LS Elev 1": OWLadderInfo({"Ladders near Weathervane", "Ladders in Overworld Town", "Ladder to Swamp"},
-                              ["Furnace_gyro_lower", "Swamp Redux 2_wall"],
+                              ["Furnace_gyro_lower", "Furnace_gyro_west", "Swamp Redux 2_wall"],
                               ["Overworld Tunnel Turret"]),
     # also the fountain filigree room and ruined passage door
     "LS Elev 2": OWLadderInfo({"Ladders near Weathervane", "Ladders to West Bell"},

From 3ae8992fb61d24104faa502cff275ba6a771cdbe Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:59:17 +0100
Subject: [PATCH 022/381] Clients: fix high CPU usage when launched via
 MultiProcessing (#4209)

* Core: make Utils.stream_input not consume all CPU for non-blocking streams

* Clients: ignore MultiProcessing pipe as input console
---
 CommonClient.py | 5 +++++
 Utils.py        | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/CommonClient.py b/CommonClient.py
index 77ed85b5c652..47100a7383ab 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -710,6 +710,11 @@ def run_gui(self):
 
     def run_cli(self):
         if sys.stdin:
+            if sys.stdin.fileno() != 0:
+                from multiprocessing import parent_process
+                if parent_process():
+                    return  # ignore MultiProcessing pipe
+
             # steam overlay breaks when starting console_loop
             if 'gameoverlayrenderer' in os.environ.get('LD_PRELOAD', ''):
                 logger.info("Skipping terminal input, due to conflicting Steam Overlay detected. Please use GUI only.")
diff --git a/Utils.py b/Utils.py
index 412011200f8a..2dfcd9d3e19a 100644
--- a/Utils.py
+++ b/Utils.py
@@ -18,6 +18,7 @@
 
 from argparse import Namespace
 from settings import Settings, get_settings
+from time import sleep
 from typing import BinaryIO, Coroutine, Optional, Set, Dict, Any, Union
 from typing_extensions import TypeGuard
 from yaml import load, load_all, dump
@@ -568,6 +569,8 @@ def queuer():
             else:
                 if text:
                     queue.put_nowait(text)
+                else:
+                    sleep(0.01)  # non-blocking stream
 
     from threading import Thread
     thread = Thread(target=queuer, name=f"Stream handler for {stream.name}", daemon=True)

From 85a713771b98aca84c900f809b0ccf41d1002d6d Mon Sep 17 00:00:00 2001
From: Aaron Wagener <mmmcheese158@gmail.com>
Date: Mon, 18 Nov 2024 11:09:27 -0600
Subject: [PATCH 023/381] Tests: have option preset validation test do full
 validation (#4208)

* Tests: have option preset validation test do full validation

* sum on an IntFlag is a thing apparently
---
 test/webhost/test_option_presets.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/webhost/test_option_presets.py b/test/webhost/test_option_presets.py
index b0af8a871183..7105c7f80593 100644
--- a/test/webhost/test_option_presets.py
+++ b/test/webhost/test_option_presets.py
@@ -1,5 +1,6 @@
 import unittest
 
+from BaseClasses import PlandoOptions
 from worlds import AutoWorldRegister
 from Options import ItemDict, NamedRange, NumericOption, OptionList, OptionSet
 
@@ -14,6 +15,10 @@ def test_option_presets_have_valid_options(self):
                     with self.subTest(game=game_name, preset=preset_name, option=option_name):
                         try:
                             option = world_type.options_dataclass.type_hints[option_name].from_any(option_value)
+                            # some options may need verification to ensure the provided option is actually valid
+                            # pass in all plando options in case a preset wants to require certain plando options
+                            # for some reason
+                            option.verify(world_type, "Test Player", PlandoOptions(sum(PlandoOptions)))
                             supported_types = [NumericOption, OptionSet, OptionList, ItemDict]
                             if not any([issubclass(option.__class__, t) for t in supported_types]):
                                 self.fail(f"'{option_name}' in preset '{preset_name}' for game '{game_name}' "

From 48ea274655223ea50bffaa21d395a8b5fef543cd Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Tue, 19 Nov 2024 15:16:10 -0500
Subject: [PATCH 024/381] MultiServer: persist hints even if previously found
 (#4214)

* change to persist all hints to ctx.hints regardless of found status

* remove if not found entirely as it seems like it was added to not double charge hint points
https://github.com/ArchipelagoMW/Archipelago/commit/9842399d8be082b757a140137706c12d84cda8c1
---
 MultiServer.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/MultiServer.py b/MultiServer.py
index 764b56362ecc..847a0b281c40 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -727,15 +727,15 @@ def notify_hints(self, team: int, hints: typing.List[NetUtils.Hint], only_new: b
             if not hint.local and data not in concerns[hint.finding_player]:
                 concerns[hint.finding_player].append(data)
             # remember hints in all cases
-            if not hint.found:
-                # since hints are bidirectional, finding player and receiving player,
-                # we can check once if hint already exists
-                if hint not in self.hints[team, hint.finding_player]:
-                    self.hints[team, hint.finding_player].add(hint)
-                    new_hint_events.add(hint.finding_player)
-                    for player in self.slot_set(hint.receiving_player):
-                        self.hints[team, player].add(hint)
-                        new_hint_events.add(player)
+
+            # since hints are bidirectional, finding player and receiving player,
+            # we can check once if hint already exists
+            if hint not in self.hints[team, hint.finding_player]:
+                self.hints[team, hint.finding_player].add(hint)
+                new_hint_events.add(hint.finding_player)
+                for player in self.slot_set(hint.receiving_player):
+                    self.hints[team, player].add(hint)
+                    new_hint_events.add(player)
 
             self.logger.info("Notice (Team #%d): %s" % (team + 1, format_hint(self, team, hint)))
         for slot in new_hint_events:

From 124ce13da75747be31da09358208d851ad8da3fb Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Wed, 20 Nov 2024 00:45:41 -0800
Subject: [PATCH 025/381] Core: improve error message for missing "game" entry
 in yaml (#4185)

---
 Generate.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Generate.py b/Generate.py
index bc359a203da7..8aba72abafe9 100644
--- a/Generate.py
+++ b/Generate.py
@@ -453,6 +453,10 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
             raise Exception(f"Option {option_key} has to be in a game's section, not on its own.")
 
     ret.game = get_choice("game", weights)
+    if not isinstance(ret.game, str):
+        if ret.game is None:
+            raise Exception('"game" not specified')
+        raise Exception(f"Invalid game: {ret.game}")
     if ret.game not in AutoWorldRegister.world_types:
         from worlds import failed_world_loads
         picks = Utils.get_fuzzy_results(ret.game, list(AutoWorldRegister.world_types) + failed_world_loads, limit=1)[0]

From 859ae87ec911c26c439767a65be0efe098f08357 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Thu, 21 Nov 2024 11:43:01 -0500
Subject: [PATCH 026/381] Launcher: ports the _stop fix in the Launcher kivy
 App to handle_url Popup App (#4213)

* fixes url launched popup so it can close cleanly after spawning another kivy app like text client

* whoops
---
 Launcher.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Launcher.py b/Launcher.py
index ea59e8beb500..f04d67a5aa0d 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -181,6 +181,11 @@ def update_label(self, dt):
                 App.get_running_app().stop()
                 Window.close()
 
+        def _stop(self, *largs):
+            # see run_gui Launcher _stop comment for details
+            self.root_window.close()
+            super()._stop(*largs)
+
     Popup().run()
 
 

From d4b1351c99f44f4d0444e5d8055572317f52218b Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:43:37 +0000
Subject: [PATCH 027/381] Aquaria: Remove BaseException handling from
 create_item (#4218)

* Aquaria: Remove BaseException handling from create_item

Catching `BaseException` without re-raising the exception should almost
never be done because `BaseException` includes exit exceptions, such as
`SystemExit` and `KeyboardInterrupt`.

Ideally, the caught exception types should be as narrow as possible to
not mask bugs from catching unexpected exceptions. Having narrow
exception types can also help indicate to other developers what
exceptions are expected to be raisable by the code within the `try`
clause.

Similarly, the `try` clause should ideally contain the minimum code
necessary, to avoid masking bugs in the case that code within the `try`
clause that is not expected to raise an exception does so.

In this case, the only expected exception that can occur appears to be
`item_table[name]` that can raise a `KeyError` when `create_item()` is
passed an unexpected `name` argument. So this patch moves the other code
out of the `try` clause and changes the caught exception types to only
`KeyError`.

* Remove try-except

The KeyError that would be raised will be propagated as-is rather than
raising a new exception in its place.

* Remove extra newline

The original code did not have this newline, so it has been removed.
---
 worlds/aquaria/__init__.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/worlds/aquaria/__init__.py b/worlds/aquaria/__init__.py
index f79978f25fc4..f620bf6d7306 100644
--- a/worlds/aquaria/__init__.py
+++ b/worlds/aquaria/__init__.py
@@ -117,16 +117,13 @@ def create_item(self, name: str) -> AquariaItem:
         Create an AquariaItem using 'name' as item name.
         """
         result: AquariaItem
-        try:
-            data = item_table[name]
-            classification: ItemClassification = ItemClassification.useful
-            if data.type == ItemType.JUNK:
-                classification = ItemClassification.filler
-            elif data.type == ItemType.PROGRESSION:
-                classification = ItemClassification.progression
-            result = AquariaItem(name, classification, data.id, self.player)
-        except BaseException:
-            raise Exception('The item ' + name + ' is not valid.')
+        data = item_table[name]
+        classification: ItemClassification = ItemClassification.useful
+        if data.type == ItemType.JUNK:
+            classification = ItemClassification.filler
+        elif data.type == ItemType.PROGRESSION:
+            classification = ItemClassification.progression
+        result = AquariaItem(name, classification, data.id, self.player)
 
         return result
 

From 2424b79626ee4e227ce3579c6c2d4a8cee7dca86 Mon Sep 17 00:00:00 2001
From: digiholic <digikun@gmail.com>
Date: Fri, 22 Nov 2024 08:33:27 -0700
Subject: [PATCH 028/381] OSRS: Fixes to Logic errors related to Max Skill
 Level determining when Regions are accessible (#4188)

* Removes explicit indirect conditions

* Changes special rules function add rule instead of setting, and call it unconditionally

* Fixes issues in rule generation that have been around but unused the whole time

* Finally moves rules out into a separate file. Fixes level-related logic

* Removes redundant max skill level checks on canoes, since they're in the skill training rules now

* For some reason, canoe logic assumed you could always walk from lumbridge to south varrock without farms. This has been fixed

* Apply suggestions from code review

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Quests now respect skill limits and can be excluded. Tasks that take multiple skills how actually check all skills

* Adds alternative route for cooking that doesn't require fishing

* Remove debug code

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 worlds/osrs/LogicCSV/locations_generated.py |   6 +-
 worlds/osrs/Names.py                        |   2 +-
 worlds/osrs/Rules.py                        | 337 +++++++++++++
 worlds/osrs/__init__.py                     | 503 +++-----------------
 4 files changed, 401 insertions(+), 447 deletions(-)
 create mode 100644 worlds/osrs/Rules.py

diff --git a/worlds/osrs/LogicCSV/locations_generated.py b/worlds/osrs/LogicCSV/locations_generated.py
index 073e505ad8f4..2d617a7038fe 100644
--- a/worlds/osrs/LogicCSV/locations_generated.py
+++ b/worlds/osrs/LogicCSV/locations_generated.py
@@ -57,11 +57,11 @@
 	LocationRow('Catch a Swordfish', 'fishing', ['Lobster Spot', ], [SkillRequirement('Fishing', 50), ], [], 12),
 	LocationRow('Bake a Redberry Pie', 'cooking', ['Redberry Bush', 'Wheat', 'Windmill', 'Pie Dish', ], [SkillRequirement('Cooking', 10), ], [], 0),
 	LocationRow('Cook some Stew', 'cooking', ['Bowl', 'Meat', 'Potato', ], [SkillRequirement('Cooking', 25), ], [], 0),
-	LocationRow('Bake an Apple Pie', 'cooking', ['Cooking Apple', 'Wheat', 'Windmill', 'Pie Dish', ], [SkillRequirement('Cooking', 30), ], [], 2),
+	LocationRow('Bake an Apple Pie', 'cooking', ['Cooking Apple', 'Wheat', 'Windmill', 'Pie Dish', ], [SkillRequirement('Cooking', 32), ], [], 2),
 	LocationRow('Bake a Cake', 'cooking', ['Wheat', 'Windmill', 'Egg', 'Milk', 'Cake Tin', ], [SkillRequirement('Cooking', 40), ], [], 6),
 	LocationRow('Bake a Meat Pizza', 'cooking', ['Wheat', 'Windmill', 'Cheese', 'Tomato', 'Meat', ], [SkillRequirement('Cooking', 45), ], [], 8),
-	LocationRow('Burn some Oak Logs', 'firemaking', ['Oak Tree', ], [SkillRequirement('Firemaking', 15), ], [], 0),
-	LocationRow('Burn some Willow Logs', 'firemaking', ['Willow Tree', ], [SkillRequirement('Firemaking', 30), ], [], 0),
+	LocationRow('Burn some Oak Logs', 'firemaking', ['Oak Tree', ], [SkillRequirement('Firemaking', 15), SkillRequirement('Woodcutting', 15), ], [], 0),
+	LocationRow('Burn some Willow Logs', 'firemaking', ['Willow Tree', ], [SkillRequirement('Firemaking', 30), SkillRequirement('Woodcutting', 30), ], [], 0),
 	LocationRow('Travel on a Canoe', 'woodcutting', ['Canoe Tree', ], [SkillRequirement('Woodcutting', 12), ], [], 0),
 	LocationRow('Cut an Oak Log', 'woodcutting', ['Oak Tree', ], [SkillRequirement('Woodcutting', 15), ], [], 0),
 	LocationRow('Cut a Willow Log', 'woodcutting', ['Willow Tree', ], [SkillRequirement('Woodcutting', 30), ], [], 0),
diff --git a/worlds/osrs/Names.py b/worlds/osrs/Names.py
index cc92439ef859..1a44aa389c6a 100644
--- a/worlds/osrs/Names.py
+++ b/worlds/osrs/Names.py
@@ -31,7 +31,7 @@ class RegionNames(str, Enum):
     Mudskipper_Point = "Mudskipper Point"
     Karamja = "Karamja"
     Corsair_Cove = "Corsair Cove"
-    Wilderness = "The Wilderness"
+    Wilderness = "Wilderness"
     Crandor = "Crandor"
     # Resource Regions
     Egg = "Egg"
diff --git a/worlds/osrs/Rules.py b/worlds/osrs/Rules.py
new file mode 100644
index 000000000000..22a19934c8e1
--- /dev/null
+++ b/worlds/osrs/Rules.py
@@ -0,0 +1,337 @@
+"""
+    Ensures a target level can be reached with available resources
+    """
+from worlds.generic.Rules import CollectionRule, add_rule
+from .Names import RegionNames, ItemNames
+
+
+def get_fishing_skill_rule(level, player, options) -> CollectionRule:
+    if options.max_fishing_level < level:
+        return lambda state: False
+
+    if options.brutal_grinds or level < 5:
+        return lambda state: state.can_reach_region(RegionNames.Shrimp, player)
+    if level < 20:
+        return lambda state: state.can_reach_region(RegionNames.Shrimp, player) and \
+                             state.can_reach_region(RegionNames.Port_Sarim, player)
+    else:
+        return lambda state: state.can_reach_region(RegionNames.Shrimp, player) and \
+                             state.can_reach_region(RegionNames.Port_Sarim, player) and \
+                             state.can_reach_region(RegionNames.Fly_Fish, player)
+
+
+def get_mining_skill_rule(level, player, options) -> CollectionRule:
+    if options.max_mining_level < level:
+        return lambda state: False
+
+    if options.brutal_grinds or level < 15:
+        return lambda state: state.can_reach_region(RegionNames.Bronze_Ores, player) or \
+                             state.can_reach_region(RegionNames.Clay_Rock, player)
+    else:
+        # Iron is the best way to train all the way to 99, so having access to iron is all you need to check for
+        return lambda state: (state.can_reach_region(RegionNames.Bronze_Ores, player) or
+                              state.can_reach_region(RegionNames.Clay_Rock, player)) and \
+                             state.can_reach_region(RegionNames.Iron_Rock, player)
+
+
+def get_woodcutting_skill_rule(level, player, options) -> CollectionRule:
+    if options.max_woodcutting_level < level:
+        return lambda state: False
+
+    if options.brutal_grinds or level < 15:
+        # I've checked. There is not a single chunk in the f2p that does not have at least one normal tree.
+        # Even the desert.
+        return lambda state: True
+    if level < 30:
+        return lambda state: state.can_reach_region(RegionNames.Oak_Tree, player)
+    else:
+        return lambda state: state.can_reach_region(RegionNames.Oak_Tree, player) and \
+                             state.can_reach_region(RegionNames.Willow_Tree, player)
+
+
+def get_smithing_skill_rule(level, player, options) -> CollectionRule:
+    if options.max_smithing_level < level:
+        return lambda state: False
+
+    if options.brutal_grinds:
+        return lambda state: state.can_reach_region(RegionNames.Bronze_Ores, player) and \
+                             state.can_reach_region(RegionNames.Furnace, player)
+    if level < 15:
+        # Lumbridge has a special bronze-only anvil. This is the only anvil of its type so it's not included
+        # in the "Anvil" resource region. We still need to check for it though.
+        return lambda state: state.can_reach_region(RegionNames.Bronze_Ores, player) and \
+                             state.can_reach_region(RegionNames.Furnace, player) and \
+                             (state.can_reach_region(RegionNames.Anvil, player) or
+                              state.can_reach_region(RegionNames.Lumbridge, player))
+    if level < 30:
+        # For levels between 15 and 30, the lumbridge anvil won't cut it. Only a real one will do
+        return lambda state: state.can_reach_region(RegionNames.Bronze_Ores, player) and \
+                             state.can_reach_region(RegionNames.Iron_Rock, player) and \
+                             state.can_reach_region(RegionNames.Furnace, player) and \
+                             state.can_reach_region(RegionNames.Anvil, player)
+    else:
+        return lambda state: state.can_reach_region(RegionNames.Bronze_Ores, player) and \
+                             state.can_reach_region(RegionNames.Iron_Rock, player) and \
+                             state.can_reach_region(RegionNames.Coal_Rock, player) and \
+                             state.can_reach_region(RegionNames.Furnace, player) and \
+                             state.can_reach_region(RegionNames.Anvil, player)
+
+
+def get_crafting_skill_rule(level, player, options):
+    if options.max_crafting_level < level:
+        return lambda state: False
+
+    # Crafting is really complex. Need a lot of sub-rules to make this even remotely readable
+    def can_spin(state):
+        return state.can_reach_region(RegionNames.Sheep, player) and \
+            state.can_reach_region(RegionNames.Spinning_Wheel, player)
+
+    def can_pot(state):
+        return state.can_reach_region(RegionNames.Clay_Rock, player) and \
+            state.can_reach_region(RegionNames.Barbarian_Village, player)
+
+    def can_tan(state):
+        return state.can_reach_region(RegionNames.Milk, player) and \
+            state.can_reach_region(RegionNames.Al_Kharid, player)
+
+    def mould_access(state):
+        return state.can_reach_region(RegionNames.Al_Kharid, player) or \
+            state.can_reach_region(RegionNames.Rimmington, player)
+
+    def can_silver(state):
+        return state.can_reach_region(RegionNames.Silver_Rock, player) and \
+            state.can_reach_region(RegionNames.Furnace, player) and mould_access(state)
+
+    def can_gold(state):
+        return state.can_reach_region(RegionNames.Gold_Rock, player) and \
+            state.can_reach_region(RegionNames.Furnace, player) and mould_access(state)
+
+    if options.brutal_grinds or level < 5:
+        return lambda state: can_spin(state) or can_pot(state) or can_tan(state)
+
+    can_smelt_gold = get_smithing_skill_rule(40, player, options)
+    can_smelt_silver = get_smithing_skill_rule(20, player, options)
+    if level < 16:
+        return lambda state: can_pot(state) or can_tan(state) or (can_gold(state) and can_smelt_gold(state))
+    else:
+        return lambda state: can_tan(state) or (can_silver(state) and can_smelt_silver(state)) or \
+                             (can_gold(state) and can_smelt_gold(state))
+
+
+def get_cooking_skill_rule(level, player, options) -> CollectionRule:
+    if options.max_cooking_level < level:
+        return lambda state: False
+
+    if options.brutal_grinds or level < 15:
+        return lambda state: state.can_reach_region(RegionNames.Milk, player) or \
+                             state.can_reach_region(RegionNames.Egg, player) or \
+                             state.can_reach_region(RegionNames.Shrimp, player) or \
+                             (state.can_reach_region(RegionNames.Wheat, player) and
+                              state.can_reach_region(RegionNames.Windmill, player))
+    else:
+        can_catch_fly_fish = get_fishing_skill_rule(20, player, options)
+
+        return lambda state: (
+                                 (state.can_reach_region(RegionNames.Fly_Fish, player) and can_catch_fly_fish(state)) or
+                                 (state.can_reach_region(RegionNames.Port_Sarim, player))
+                             ) and (
+                              state.can_reach_region(RegionNames.Milk, player) or
+                              state.can_reach_region(RegionNames.Egg, player) or
+                              state.can_reach_region(RegionNames.Shrimp, player) or
+                              (state.can_reach_region(RegionNames.Wheat, player) and
+                               state.can_reach_region(RegionNames.Windmill, player))
+                             )
+
+
+def get_runecraft_skill_rule(level, player, options) -> CollectionRule:
+    if options.max_runecraft_level < level:
+        return lambda state: False
+    if not options.brutal_grinds:
+        # Ensure access to the relevant altars
+        if level >= 5:
+            return lambda state: state.has(ItemNames.QP_Rune_Mysteries, player) and \
+                                 state.can_reach_region(RegionNames.Falador_Farm, player) and \
+                                 state.can_reach_region(RegionNames.Lumbridge_Swamp, player)
+        if level >= 9:
+            return lambda state: state.has(ItemNames.QP_Rune_Mysteries, player) and \
+                                 state.can_reach_region(RegionNames.Falador_Farm, player) and \
+                                 state.can_reach_region(RegionNames.Lumbridge_Swamp, player) and \
+                                 state.can_reach_region(RegionNames.East_Of_Varrock, player)
+        if level >= 14:
+            return lambda state: state.has(ItemNames.QP_Rune_Mysteries, player) and \
+                                 state.can_reach_region(RegionNames.Falador_Farm, player) and \
+                                 state.can_reach_region(RegionNames.Lumbridge_Swamp, player) and \
+                                 state.can_reach_region(RegionNames.East_Of_Varrock, player) and \
+                                 state.can_reach_region(RegionNames.Al_Kharid, player)
+
+    return lambda state: state.has(ItemNames.QP_Rune_Mysteries, player) and \
+                         state.can_reach_region(RegionNames.Falador_Farm, player)
+
+
+def get_magic_skill_rule(level, player, options) -> CollectionRule:
+    if options.max_magic_level < level:
+        return lambda state: False
+
+    return lambda state: state.can_reach_region(RegionNames.Mind_Runes, player)
+
+
+def get_firemaking_skill_rule(level, player, options) -> CollectionRule:
+    if options.max_firemaking_level < level:
+        return lambda state: False
+    if not options.brutal_grinds:
+        if level >= 30:
+            can_chop_willows = get_woodcutting_skill_rule(30, player, options)
+            return lambda state: state.can_reach_region(RegionNames.Willow_Tree, player) and can_chop_willows(state)
+        if level >= 15:
+            can_chop_oaks = get_woodcutting_skill_rule(15, player, options)
+            return lambda state: state.can_reach_region(RegionNames.Oak_Tree, player) and can_chop_oaks(state)
+    # If brutal grinds are on, or if the level is less than 15, you can train it.
+    return lambda state: True
+
+
+def get_skill_rule(skill, level, player, options) -> CollectionRule:
+    if skill.lower() == "fishing":
+        return get_fishing_skill_rule(level, player, options)
+    if skill.lower() == "mining":
+        return get_mining_skill_rule(level, player, options)
+    if skill.lower() == "woodcutting":
+        return get_woodcutting_skill_rule(level, player, options)
+    if skill.lower() == "smithing":
+        return get_smithing_skill_rule(level, player, options)
+    if skill.lower() == "crafting":
+        return get_crafting_skill_rule(level, player, options)
+    if skill.lower() == "cooking":
+        return get_cooking_skill_rule(level, player, options)
+    if skill.lower() == "runecraft":
+        return get_runecraft_skill_rule(level, player, options)
+    if skill.lower() == "magic":
+        return get_magic_skill_rule(level, player, options)
+    if skill.lower() == "firemaking":
+        return get_firemaking_skill_rule(level, player, options)
+
+    return lambda state: True
+
+
+def generate_special_rules_for(entrance, region_row, outbound_region_name, player, options):
+    if outbound_region_name == RegionNames.Cooks_Guild:
+        add_rule(entrance, get_cooking_skill_rule(32, player, options))
+    elif outbound_region_name == RegionNames.Crafting_Guild:
+        add_rule(entrance, get_crafting_skill_rule(40, player, options))
+    elif outbound_region_name == RegionNames.Corsair_Cove:
+        # Need to be able to start Corsair Curse in addition to having the item
+        add_rule(entrance, lambda state: state.can_reach(RegionNames.Falador_Farm, "Region", player))
+    elif outbound_region_name == "Camdozaal*":
+        add_rule(entrance, lambda state: state.has(ItemNames.QP_Below_Ice_Mountain, player))
+    elif region_row.name == "Dwarven Mountain Pass" and outbound_region_name == "Anvil*":
+        add_rule(entrance, lambda state: state.has(ItemNames.QP_Dorics_Quest, player))
+
+    # Special logic for canoes
+    canoe_regions = [RegionNames.Lumbridge, RegionNames.South_Of_Varrock, RegionNames.Barbarian_Village,
+                     RegionNames.Edgeville, RegionNames.Wilderness]
+    if region_row.name in canoe_regions:
+        # Skill rules for greater distances
+        woodcutting_rule_d1 = get_woodcutting_skill_rule(12, player, options)
+        woodcutting_rule_d2 = get_woodcutting_skill_rule(27, player, options)
+        woodcutting_rule_d3 = get_woodcutting_skill_rule(42, player, options)
+        woodcutting_rule_all = get_woodcutting_skill_rule(57, player, options)
+
+        if region_row.name == RegionNames.Lumbridge:
+            # Canoe Tree access for the Location
+            if outbound_region_name == RegionNames.Canoe_Tree:
+                add_rule(entrance,
+                    lambda state: (state.can_reach_region(RegionNames.South_Of_Varrock, player)
+                                   and woodcutting_rule_d1(state)) or
+                                  (state.can_reach_region(RegionNames.Barbarian_Village, player)
+                                   and woodcutting_rule_d2(state)) or
+                                  (state.can_reach_region(RegionNames.Edgeville, player)
+                                   and woodcutting_rule_d3(state)) or
+                                  (state.can_reach_region(RegionNames.Wilderness, player)
+                                   and woodcutting_rule_all(state)))
+
+            # Access to other chunks based on woodcutting settings
+            elif outbound_region_name == RegionNames.South_Of_Varrock:
+                add_rule(entrance, woodcutting_rule_d1)
+            elif outbound_region_name == RegionNames.Barbarian_Village:
+                add_rule(entrance, woodcutting_rule_d2)
+            elif outbound_region_name == RegionNames.Edgeville:
+                add_rule(entrance, woodcutting_rule_d3)
+            elif outbound_region_name == RegionNames.Wilderness:
+                add_rule(entrance, woodcutting_rule_all)
+
+        elif region_row.name == RegionNames.South_Of_Varrock:
+            if outbound_region_name == RegionNames.Canoe_Tree:
+                add_rule(entrance,
+                    lambda state: (state.can_reach_region(RegionNames.Lumbridge, player)
+                                   and woodcutting_rule_d1(state)) or
+                                  (state.can_reach_region(RegionNames.Barbarian_Village, player)
+                                   and woodcutting_rule_d1(state)) or
+                                  (state.can_reach_region(RegionNames.Edgeville, player)
+                                   and woodcutting_rule_d2(state)) or
+                                  (state.can_reach_region(RegionNames.Wilderness, player)
+                                   and woodcutting_rule_d3(state)))
+
+            # Access to other chunks based on woodcutting settings
+            elif outbound_region_name == RegionNames.Lumbridge:
+                add_rule(entrance, woodcutting_rule_d1)
+            elif outbound_region_name == RegionNames.Barbarian_Village:
+                add_rule(entrance, woodcutting_rule_d1)
+            elif outbound_region_name == RegionNames.Edgeville:
+                add_rule(entrance, woodcutting_rule_d3)
+            elif outbound_region_name == RegionNames.Wilderness:
+                add_rule(entrance, woodcutting_rule_all)
+        elif region_row.name == RegionNames.Barbarian_Village:
+            if outbound_region_name == RegionNames.Canoe_Tree:
+                add_rule(entrance,
+                    lambda state: (state.can_reach_region(RegionNames.Lumbridge, player)
+                                   and woodcutting_rule_d2(state)) or (state.can_reach_region(RegionNames.South_Of_Varrock, player)
+                                   and woodcutting_rule_d1(state)) or (state.can_reach_region(RegionNames.Edgeville, player)
+                                   and woodcutting_rule_d1(state)) or (state.can_reach_region(RegionNames.Wilderness, player)
+                                   and woodcutting_rule_d2(state)))
+
+            # Access to other chunks based on woodcutting settings
+            elif outbound_region_name == RegionNames.Lumbridge:
+                add_rule(entrance, woodcutting_rule_d2)
+            elif outbound_region_name == RegionNames.South_Of_Varrock:
+                add_rule(entrance, woodcutting_rule_d1)
+            # Edgeville does not need to be checked, because it's already adjacent
+            elif outbound_region_name == RegionNames.Wilderness:
+                add_rule(entrance, woodcutting_rule_d3)
+        elif region_row.name == RegionNames.Edgeville:
+            if outbound_region_name == RegionNames.Canoe_Tree:
+                add_rule(entrance,
+                    lambda state: (state.can_reach_region(RegionNames.Lumbridge, player)
+                                   and woodcutting_rule_d3(state)) or
+                                  (state.can_reach_region(RegionNames.South_Of_Varrock, player)
+                                   and woodcutting_rule_d2(state)) or
+                                  (state.can_reach_region(RegionNames.Barbarian_Village, player)
+                                   and woodcutting_rule_d1(state)) or
+                                  (state.can_reach_region(RegionNames.Wilderness, player)
+                                   and woodcutting_rule_d1(state)))
+
+            # Access to other chunks based on woodcutting settings
+            elif outbound_region_name == RegionNames.Lumbridge:
+                add_rule(entrance, woodcutting_rule_d3)
+            elif outbound_region_name == RegionNames.South_Of_Varrock:
+                add_rule(entrance, woodcutting_rule_d2)
+            # Barbarian Village does not need to be checked, because it's already adjacent
+            # Wilderness does not need to be checked, because it's already adjacent
+        elif region_row.name == RegionNames.Wilderness:
+            if outbound_region_name == RegionNames.Canoe_Tree:
+                add_rule(entrance,
+                    lambda state: (state.can_reach_region(RegionNames.Lumbridge, player)
+                                   and woodcutting_rule_all(state)) or
+                                  (state.can_reach_region(RegionNames.South_Of_Varrock, player)
+                                   and woodcutting_rule_d3(state)) or
+                                  (state.can_reach_region(RegionNames.Barbarian_Village, player)
+                                   and woodcutting_rule_d2(state)) or
+                                  (state.can_reach_region(RegionNames.Edgeville, player)
+                                   and woodcutting_rule_d1(state)))
+
+            # Access to other chunks based on woodcutting settings
+            elif outbound_region_name == RegionNames.Lumbridge:
+                add_rule(entrance, woodcutting_rule_all)
+            elif outbound_region_name == RegionNames.South_Of_Varrock:
+                add_rule(entrance, woodcutting_rule_d3)
+            elif outbound_region_name == RegionNames.Barbarian_Village:
+                add_rule(entrance, woodcutting_rule_d2)
+            # Edgeville does not need to be checked, because it's already adjacent
diff --git a/worlds/osrs/__init__.py b/worlds/osrs/__init__.py
index 58f23a2bc1d9..d6ddd63875f4 100644
--- a/worlds/osrs/__init__.py
+++ b/worlds/osrs/__init__.py
@@ -1,12 +1,12 @@
 import typing
 
-from BaseClasses import Item, Tutorial, ItemClassification, Region, MultiWorld
+from BaseClasses import Item, Tutorial, ItemClassification, Region, MultiWorld, CollectionState
+from Fill import fill_restrictive, FillError
 from worlds.AutoWorld import WebWorld, World
-from worlds.generic.Rules import add_rule, CollectionRule
 from .Items import OSRSItem, starting_area_dict, chunksanity_starting_chunks, QP_Items, ItemRow, \
     chunksanity_special_region_names
 from .Locations import OSRSLocation, LocationRow
-
+from .Rules import *
 from .Options import OSRSOptions, StartingArea
 from .Names import LocationNames, ItemNames, RegionNames
 
@@ -46,6 +46,7 @@ class OSRSWorld(World):
     web = OSRSWeb()
     base_id = 0x070000
     data_version = 1
+    explicit_indirect_conditions = False
 
     item_name_to_id = {item_rows[i].name: 0x070000 + i for i in range(len(item_rows))}
     location_name_to_id = {location_rows[i].name: 0x070000 + i for i in range(len(location_rows))}
@@ -61,6 +62,7 @@ class OSRSWorld(World):
     starting_area_item: str
 
     locations_by_category: typing.Dict[str, typing.List[LocationRow]]
+    available_QP_locations: typing.List[str]
 
     def __init__(self, multiworld: MultiWorld, player: int):
         super().__init__(multiworld, player)
@@ -75,6 +77,7 @@ def __init__(self, multiworld: MultiWorld, player: int):
         self.starting_area_item = ""
 
         self.locations_by_category = {}
+        self.available_QP_locations = []
 
     def generate_early(self) -> None:
         location_categories = [location_row.category for location_row in location_rows]
@@ -90,9 +93,9 @@ def generate_early(self) -> None:
 
         rnd = self.random
         starting_area = self.options.starting_area
-        
+
         #UT specific override, if we are in normal gen, resolve starting area, we will get it from slot_data in UT
-        if not hasattr(self.multiworld, "generation_is_fake"): 
+        if not hasattr(self.multiworld, "generation_is_fake"):
             if starting_area.value == StartingArea.option_any_bank:
                 self.starting_area_item = rnd.choice(starting_area_dict)
             elif starting_area.value < StartingArea.option_chunksanity:
@@ -127,7 +130,6 @@ def interpret_slot_data(self, slot_data: typing.Dict[str, typing.Any]) -> None:
             starting_entrance.access_rule = lambda state: state.has(self.starting_area_item, self.player)
             starting_entrance.connect(self.region_name_to_data[starting_area_region])
 
-
     def create_regions(self) -> None:
         """
         called to place player's regions into the MultiWorld's regions list. If it's hard to separate, this can be done
@@ -145,7 +147,8 @@ def create_regions(self) -> None:
 
         # Removes the word "Area: " from the item name to get the region it applies to.
         # I figured tacking "Area: " at the beginning would make it _easier_ to tell apart. Turns out it made it worse
-        if self.starting_area_item != "": #if area hasn't been set, then we shouldn't connect it
+        # if area hasn't been set, then we shouldn't connect it
+        if self.starting_area_item != "":
             if self.starting_area_item in chunksanity_special_region_names:
                 starting_area_region = chunksanity_special_region_names[self.starting_area_item]
             else:
@@ -164,11 +167,8 @@ def create_regions(self) -> None:
                 entrance.connect(self.region_name_to_data[parsed_outbound])
 
                 item_name = self.region_rows_by_name[parsed_outbound].itemReq
-                if "*" not in outbound_region_name and "*" not in item_name:
-                    entrance.access_rule = lambda state, item_name=item_name: state.has(item_name, self.player)
-                    continue
-
-                self.generate_special_rules_for(entrance, region_row, outbound_region_name)
+                entrance.access_rule = lambda state, item_name=item_name.replace("*",""): state.has(item_name, self.player)
+                generate_special_rules_for(entrance, region_row, outbound_region_name, self.player, self.options)
 
             for resource_region in region_row.resources:
                 if not resource_region:
@@ -178,321 +178,34 @@ def create_regions(self) -> None:
                 if "*" not in resource_region:
                     entrance.connect(self.region_name_to_data[resource_region])
                 else:
-                    self.generate_special_rules_for(entrance, region_row, resource_region)
                     entrance.connect(self.region_name_to_data[resource_region.replace('*', '')])
+                generate_special_rules_for(entrance, region_row, resource_region, self.player, self.options)
 
         self.roll_locations()
 
-    def generate_special_rules_for(self, entrance, region_row, outbound_region_name):
-        # print(f"Special rules required to access region {outbound_region_name} from {region_row.name}")
-        if outbound_region_name == RegionNames.Cooks_Guild:
-            item_name = self.region_rows_by_name[outbound_region_name].itemReq.replace('*', '')
-            cooking_level_rule = self.get_skill_rule("cooking", 32)
-            entrance.access_rule = lambda state: state.has(item_name, self.player) and \
-                                                 cooking_level_rule(state)
-            if self.options.brutal_grinds:
-                cooking_level_32_regions = {
-                    RegionNames.Milk,
-                    RegionNames.Egg,
-                    RegionNames.Shrimp,
-                    RegionNames.Wheat,
-                    RegionNames.Windmill,
-                }
-            else:
-                # Level 15 cooking and higher requires level 20 fishing.
-                fishing_level_20_regions = {
-                    RegionNames.Shrimp,
-                    RegionNames.Port_Sarim,
-                }
-                cooking_level_32_regions = {
-                    RegionNames.Milk,
-                    RegionNames.Egg,
-                    RegionNames.Shrimp,
-                    RegionNames.Wheat,
-                    RegionNames.Windmill,
-                    RegionNames.Fly_Fish,
-                    *fishing_level_20_regions,
-                }
-            for region_name in cooking_level_32_regions:
-                self.multiworld.register_indirect_condition(self.get_region(region_name), entrance)
-            return
-        if outbound_region_name == RegionNames.Crafting_Guild:
-            item_name = self.region_rows_by_name[outbound_region_name].itemReq.replace('*', '')
-            crafting_level_rule = self.get_skill_rule("crafting", 40)
-            entrance.access_rule = lambda state: state.has(item_name, self.player) and \
-                                                 crafting_level_rule(state)
-            if self.options.brutal_grinds:
-                crafting_level_40_regions = {
-                    # can_spin
-                    RegionNames.Sheep,
-                    RegionNames.Spinning_Wheel,
-                    # can_pot
-                    RegionNames.Clay_Rock,
-                    RegionNames.Barbarian_Village,
-                    # can_tan
-                    RegionNames.Milk,
-                    RegionNames.Al_Kharid,
-                }
-            else:
-                mould_access_regions = {
-                    RegionNames.Al_Kharid,
-                    RegionNames.Rimmington,
-                }
-                smithing_level_20_regions = {
-                    RegionNames.Bronze_Ores,
-                    RegionNames.Iron_Rock,
-                    RegionNames.Furnace,
-                    RegionNames.Anvil,
-                }
-                smithing_level_40_regions = {
-                    *smithing_level_20_regions,
-                    RegionNames.Coal_Rock,
-                }
-                crafting_level_40_regions = {
-                    # can_tan
-                    RegionNames.Milk,
-                    RegionNames.Al_Kharid,
-                    # can_silver
-                    RegionNames.Silver_Rock,
-                    RegionNames.Furnace,
-                    *mould_access_regions,
-                    # can_smelt_silver
-                    *smithing_level_20_regions,
-                    # can_gold
-                    RegionNames.Gold_Rock,
-                    RegionNames.Furnace,
-                    *mould_access_regions,
-                    # can_smelt_gold
-                    *smithing_level_40_regions,
-                }
-            for region_name in crafting_level_40_regions:
-                self.multiworld.register_indirect_condition(self.get_region(region_name), entrance)
-            return
-        if outbound_region_name == RegionNames.Corsair_Cove:
-            item_name = self.region_rows_by_name[outbound_region_name].itemReq.replace('*', '')
-            # Need to be able to start Corsair Curse in addition to having the item
-            entrance.access_rule = lambda state: state.has(item_name, self.player) and \
-                                                 state.can_reach(RegionNames.Falador_Farm, "Region", self.player)
-            self.multiworld.register_indirect_condition(
-                self.multiworld.get_region(RegionNames.Falador_Farm, self.player), entrance)
-
-            return
-        if outbound_region_name == "Camdozaal*":
-            item_name = self.region_rows_by_name[outbound_region_name.replace('*', '')].itemReq
-            entrance.access_rule = lambda state: state.has(item_name, self.player) and \
-                                                 state.has(ItemNames.QP_Below_Ice_Mountain, self.player)
-            return
-        if region_row.name == "Dwarven Mountain Pass" and outbound_region_name == "Anvil*":
-            entrance.access_rule = lambda state: state.has(ItemNames.QP_Dorics_Quest, self.player)
-            return
-        # Special logic for canoes
-        canoe_regions = [RegionNames.Lumbridge, RegionNames.South_Of_Varrock, RegionNames.Barbarian_Village,
-                         RegionNames.Edgeville, RegionNames.Wilderness]
-        if region_row.name in canoe_regions:
-            # Skill rules for greater distances
-            woodcutting_rule_d1 = self.get_skill_rule("woodcutting", 12)
-            woodcutting_rule_d2 = self.get_skill_rule("woodcutting", 27)
-            woodcutting_rule_d3 = self.get_skill_rule("woodcutting", 42)
-            woodcutting_rule_all = self.get_skill_rule("woodcutting", 57)
-
-            def add_indirect_conditions_for_woodcutting_levels(entrance, *levels: int):
-                if self.options.brutal_grinds:
-                    # No access to specific regions required.
-                    return
-                # Currently, each level requirement requires everything from the previous level requirements, so the
-                # maximum level requirement can be taken.
-                max_level = max(levels, default=0)
-                max_level = min(max_level, self.options.max_woodcutting_level.value)
-                if 15 <= max_level < 30:
-                    self.multiworld.register_indirect_condition(self.get_region(RegionNames.Oak_Tree), entrance)
-                elif 30 <= max_level:
-                    self.multiworld.register_indirect_condition(self.get_region(RegionNames.Oak_Tree), entrance)
-                    self.multiworld.register_indirect_condition(self.get_region(RegionNames.Willow_Tree), entrance)
-
-            if region_row.name == RegionNames.Lumbridge:
-                # Canoe Tree access for the Location
-                if outbound_region_name == RegionNames.Canoe_Tree:
-                    entrance.access_rule = \
-                        lambda state: (state.can_reach_region(RegionNames.South_Of_Varrock, self.player)
-                                       and woodcutting_rule_d1(state) and self.options.max_woodcutting_level >= 12) or \
-                                      (state.can_reach_region(RegionNames.Barbarian_Village)
-                                       and woodcutting_rule_d2(state) and self.options.max_woodcutting_level >= 27) or \
-                                      (state.can_reach_region(RegionNames.Edgeville)
-                                       and woodcutting_rule_d3(state) and self.options.max_woodcutting_level >= 42) or \
-                                      (state.can_reach_region(RegionNames.Wilderness)
-                                       and woodcutting_rule_all(state) and self.options.max_woodcutting_level >= 57)
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 12, 27, 42, 57)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.South_Of_Varrock, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Barbarian_Village, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Edgeville, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Wilderness, self.player), entrance)
-                # Access to other chunks based on woodcutting settings
-                # South of Varrock does not need to be checked, because it's already adjacent
-                if outbound_region_name == RegionNames.Barbarian_Village:
-                    entrance.access_rule = lambda state: woodcutting_rule_d2(state) \
-                                                         and self.options.max_woodcutting_level >= 27
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 27)
-                if outbound_region_name == RegionNames.Edgeville:
-                    entrance.access_rule = lambda state: woodcutting_rule_d3(state) \
-                                                         and self.options.max_woodcutting_level >= 42
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 42)
-                if outbound_region_name == RegionNames.Wilderness:
-                    entrance.access_rule = lambda state: woodcutting_rule_all(state) \
-                                                         and self.options.max_woodcutting_level >= 57
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 57)
-
-            if region_row.name == RegionNames.South_Of_Varrock:
-                if outbound_region_name == RegionNames.Canoe_Tree:
-                    entrance.access_rule = \
-                        lambda state: (state.can_reach_region(RegionNames.Lumbridge, self.player)
-                                       and woodcutting_rule_d1(state) and self.options.max_woodcutting_level >= 12) or \
-                                      (state.can_reach_region(RegionNames.Barbarian_Village)
-                                       and woodcutting_rule_d1(state) and self.options.max_woodcutting_level >= 12) or \
-                                      (state.can_reach_region(RegionNames.Edgeville)
-                                       and woodcutting_rule_d2(state) and self.options.max_woodcutting_level >= 27) or \
-                                      (state.can_reach_region(RegionNames.Wilderness)
-                                       and woodcutting_rule_d3(state) and self.options.max_woodcutting_level >= 42)
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 12, 27, 42)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Lumbridge, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Barbarian_Village, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Edgeville, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Wilderness, self.player), entrance)
-                # Access to other chunks based on woodcutting settings
-                # Lumbridge does not need to be checked, because it's already adjacent
-                if outbound_region_name == RegionNames.Barbarian_Village:
-                    entrance.access_rule = lambda state: woodcutting_rule_d1(state) \
-                                                         and self.options.max_woodcutting_level >= 12
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 12)
-                if outbound_region_name == RegionNames.Edgeville:
-                    entrance.access_rule = lambda state: woodcutting_rule_d3(state) \
-                                                         and self.options.max_woodcutting_level >= 27
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 27)
-                if outbound_region_name == RegionNames.Wilderness:
-                    entrance.access_rule = lambda state: woodcutting_rule_all(state) \
-                                                         and self.options.max_woodcutting_level >= 42
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 42)
-            if region_row.name == RegionNames.Barbarian_Village:
-                if outbound_region_name == RegionNames.Canoe_Tree:
-                    entrance.access_rule = \
-                        lambda state: (state.can_reach_region(RegionNames.Lumbridge, self.player)
-                                       and woodcutting_rule_d2(state) and self.options.max_woodcutting_level >= 27) or \
-                                      (state.can_reach_region(RegionNames.South_Of_Varrock)
-                                       and woodcutting_rule_d1(state) and self.options.max_woodcutting_level >= 12) or \
-                                      (state.can_reach_region(RegionNames.Edgeville)
-                                       and woodcutting_rule_d1(state) and self.options.max_woodcutting_level >= 12) or \
-                                      (state.can_reach_region(RegionNames.Wilderness)
-                                       and woodcutting_rule_d2(state) and self.options.max_woodcutting_level >= 27)
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 12, 27)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Lumbridge, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.South_Of_Varrock, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Edgeville, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Wilderness, self.player), entrance)
-                # Access to other chunks based on woodcutting settings
-                if outbound_region_name == RegionNames.Lumbridge:
-                    entrance.access_rule = lambda state: woodcutting_rule_d2(state) \
-                                                         and self.options.max_woodcutting_level >= 27
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 27)
-                if outbound_region_name == RegionNames.South_Of_Varrock:
-                    entrance.access_rule = lambda state: woodcutting_rule_d1(state) \
-                                                         and self.options.max_woodcutting_level >= 12
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 12)
-                # Edgeville does not need to be checked, because it's already adjacent
-                if outbound_region_name == RegionNames.Wilderness:
-                    entrance.access_rule = lambda state: woodcutting_rule_d3(state) \
-                                                         and self.options.max_woodcutting_level >= 42
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 42)
-            if region_row.name == RegionNames.Edgeville:
-                if outbound_region_name == RegionNames.Canoe_Tree:
-                    entrance.access_rule = \
-                        lambda state: (state.can_reach_region(RegionNames.Lumbridge, self.player)
-                                       and woodcutting_rule_d3(state) and self.options.max_woodcutting_level >= 42) or \
-                                      (state.can_reach_region(RegionNames.South_Of_Varrock)
-                                       and woodcutting_rule_d2(state) and self.options.max_woodcutting_level >= 27) or \
-                                      (state.can_reach_region(RegionNames.Barbarian_Village)
-                                       and woodcutting_rule_d1(state) and self.options.max_woodcutting_level >= 12) or \
-                                      (state.can_reach_region(RegionNames.Wilderness)
-                                       and woodcutting_rule_d1(state) and self.options.max_woodcutting_level >= 12)
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 12, 27, 42)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Lumbridge, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.South_Of_Varrock, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Barbarian_Village, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Wilderness, self.player), entrance)
-                # Access to other chunks based on woodcutting settings
-                if outbound_region_name == RegionNames.Lumbridge:
-                    entrance.access_rule = lambda state: woodcutting_rule_d3(state) \
-                                                         and self.options.max_woodcutting_level >= 42
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 42)
-                if outbound_region_name == RegionNames.South_Of_Varrock:
-                    entrance.access_rule = lambda state: woodcutting_rule_d2(state) \
-                                                         and self.options.max_woodcutting_level >= 27
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 27)
-                # Barbarian Village does not need to be checked, because it's already adjacent
-                # Wilderness does not need to be checked, because it's already adjacent
-            if region_row.name == RegionNames.Wilderness:
-                if outbound_region_name == RegionNames.Canoe_Tree:
-                    entrance.access_rule = \
-                        lambda state: (state.can_reach_region(RegionNames.Lumbridge, self.player)
-                                       and woodcutting_rule_all(state) and self.options.max_woodcutting_level >= 57) or \
-                                      (state.can_reach_region(RegionNames.South_Of_Varrock)
-                                       and woodcutting_rule_d3(state) and self.options.max_woodcutting_level >= 42) or \
-                                      (state.can_reach_region(RegionNames.Barbarian_Village)
-                                       and woodcutting_rule_d2(state) and self.options.max_woodcutting_level >= 27) or \
-                                      (state.can_reach_region(RegionNames.Edgeville)
-                                       and woodcutting_rule_d1(state) and self.options.max_woodcutting_level >= 12)
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 12, 27, 42, 57)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Lumbridge, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.South_Of_Varrock, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Barbarian_Village, self.player), entrance)
-                    self.multiworld.register_indirect_condition(
-                        self.multiworld.get_region(RegionNames.Edgeville, self.player), entrance)
-                # Access to other chunks based on woodcutting settings
-                if outbound_region_name == RegionNames.Lumbridge:
-                    entrance.access_rule = lambda state: woodcutting_rule_all(state) \
-                                                         and self.options.max_woodcutting_level >= 57
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 57)
-                if outbound_region_name == RegionNames.South_Of_Varrock:
-                    entrance.access_rule = lambda state: woodcutting_rule_d3(state) \
-                                                         and self.options.max_woodcutting_level >= 42
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 42)
-                if outbound_region_name == RegionNames.Barbarian_Village:
-                    entrance.access_rule = lambda state: woodcutting_rule_d2(state) \
-                                                         and self.options.max_woodcutting_level >= 27
-                    add_indirect_conditions_for_woodcutting_levels(entrance, 27)
-                # Edgeville does not need to be checked, because it's already adjacent
+    def task_within_skill_levels(self, skills_required):
+        # Loop through each required skill. If any of its requirements are out of the defined limit, return false
+        for skill in skills_required:
+            max_level_for_skill = getattr(self.options, f"max_{skill.skill.lower()}_level")
+            if skill.level > max_level_for_skill:
+                return False
+        return True
 
     def roll_locations(self):
-        locations_required = 0
         generation_is_fake = hasattr(self.multiworld, "generation_is_fake")  # UT specific override
+        locations_required = 0
         for item_row in item_rows:
             locations_required += item_row.amount
 
         locations_added = 1  # At this point we've already added the starting area, so we start at 1 instead of 0
 
-        # Quests are always added
+        # Quests are always added first, before anything else is rolled
         for i, location_row in enumerate(location_rows):
             if location_row.category in {"quest", "points", "goal"}:
-                self.create_and_add_location(i)
-                if location_row.category == "quest":
-                    locations_added += 1
+                if self.task_within_skill_levels(location_row.skills):
+                    self.create_and_add_location(i)
+                    if location_row.category == "quest":
+                        locations_added += 1
 
         # Build up the weighted Task Pool
         rnd = self.random
@@ -516,10 +229,9 @@ def roll_locations(self):
         task_types = ["prayer", "magic", "runecraft", "mining", "crafting",
                       "smithing", "fishing", "cooking", "firemaking", "woodcutting", "combat"]
         for task_type in task_types:
-            max_level_for_task_type = getattr(self.options, f"max_{task_type}_level")
             max_amount_for_task_type = getattr(self.options, f"max_{task_type}_tasks")
             tasks_for_this_type = [task for task in self.locations_by_category[task_type]
-                                   if task.skills[0].level <= max_level_for_task_type]
+                                   if self.task_within_skill_levels(task.skills)]
             if not self.options.progressive_tasks:
                 rnd.shuffle(tasks_for_this_type)
             else:
@@ -568,6 +280,7 @@ def roll_locations(self):
                 self.add_location(task)
                 locations_added += 1
 
+
     def add_location(self, location):
         index = [i for i in range(len(location_rows)) if location_rows[i].name == location.name][0]
         self.create_and_add_location(index)
@@ -586,11 +299,15 @@ def get_filler_item_name(self) -> str:
 
     def create_and_add_location(self, row_index) -> None:
         location_row = location_rows[row_index]
-        # print(f"Adding task {location_row.name}")
+
+        # Quest Points are handled differently now, but in case this gets fed an older version of the data sheet,
+        # the points might still be listed in a different row
+        if location_row.category == "points":
+            return
 
         # Create Location
         location_id = self.base_id + row_index
-        if location_row.category == "points" or location_row.category == "goal":
+        if location_row.category == "goal":
             location_id = None
         location = OSRSLocation(self.player, location_row.name, location_id)
         self.location_name_to_data[location_row.name] = location
@@ -602,6 +319,14 @@ def create_and_add_location(self, row_index) -> None:
         location.parent_region = region
         region.locations.append(location)
 
+        # If it's a quest, generate a "Points" location we'll add an event to
+        if location_row.category == "quest":
+            points_name = location_row.name.replace("Quest:", "Points:")
+            points_location = OSRSLocation(self.player, points_name)
+            self.location_name_to_data[points_name] = points_location
+            points_location.parent_region = region
+            region.locations.append(points_location)
+
     def set_rules(self) -> None:
         """
         called to set access and item rules on locations and entrances.
@@ -612,18 +337,26 @@ def set_rules(self) -> None:
                             "Witchs_Potion", "Knights_Sword", "Goblin_Diplomacy", "Pirates_Treasure",
                             "Rune_Mysteries", "Misthalin_Mystery", "Corsair_Curse", "X_Marks_the_Spot",
                             "Below_Ice_Mountain"]
-        for qp_attr_name in quest_attr_names:
-            loc_name = getattr(LocationNames, f"QP_{qp_attr_name}")
-            item_name = getattr(ItemNames, f"QP_{qp_attr_name}")
-            self.multiworld.get_location(loc_name, self.player) \
-                .place_locked_item(self.create_event(item_name))
 
         for quest_attr_name in quest_attr_names:
             qp_loc_name = getattr(LocationNames, f"QP_{quest_attr_name}")
+            qp_loc = self.location_name_to_data.get(qp_loc_name)
+
             q_loc_name = getattr(LocationNames, f"Q_{quest_attr_name}")
-            add_rule(self.multiworld.get_location(qp_loc_name, self.player), lambda state, q_loc_name=q_loc_name: (
-                self.multiworld.get_location(q_loc_name, self.player).can_reach(state)
-            ))
+            q_loc = self.location_name_to_data.get(q_loc_name)
+
+            # Checks to make sure the task is actually in the list before trying to create its rules
+            if qp_loc and q_loc:
+                # Create the QP Event Item
+                item_name = getattr(ItemNames, f"QP_{quest_attr_name}")
+                qp_loc.place_locked_item(self.create_event(item_name))
+
+                # If a quest is excluded, don't actually consider it for quest point progression
+                if q_loc_name not in self.options.exclude_locations:
+                    self.available_QP_locations.append(item_name)
+
+                # Set the access rule for the QP Location
+                add_rule(qp_loc, lambda state, loc=q_loc: (loc.can_reach(state)))
 
         # place "Victory" at "Dragon Slayer" and set collection as win condition
         self.multiworld.get_location(LocationNames.Q_Dragon_Slayer, self.player) \
@@ -639,7 +372,7 @@ def set_rules(self) -> None:
                          lambda state, region_required=region_required: state.can_reach(region_required, "Region",
                                                                                         self.player))
             for skill_req in location_row.skills:
-                add_rule(location, self.get_skill_rule(skill_req.skill, skill_req.level))
+                add_rule(location, get_skill_rule(skill_req.skill, skill_req.level, self.player, self.options))
             for item_req in location_row.items:
                 add_rule(location, lambda state, item_req=item_req: state.has(item_req, self.player))
             if location_row.qp:
@@ -664,124 +397,8 @@ def create_event(self, event: str):
 
     def quest_points(self, state):
         qp = 0
-        for qp_event in QP_Items:
+        for qp_event in self.available_QP_locations:
             if state.has(qp_event, self.player):
                 qp += int(qp_event[0])
         return qp
 
-    """
-    Ensures a target level can be reached with available resources
-    """
-
-    def get_skill_rule(self, skill, level) -> CollectionRule:
-        if skill.lower() == "fishing":
-            if self.options.brutal_grinds or level < 5:
-                return lambda state: state.can_reach(RegionNames.Shrimp, "Region", self.player)
-            if level < 20:
-                return lambda state: state.can_reach(RegionNames.Shrimp, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Port_Sarim, "Region", self.player)
-            else:
-                return lambda state: state.can_reach(RegionNames.Shrimp, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Port_Sarim, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Fly_Fish, "Region", self.player)
-        if skill.lower() == "mining":
-            if self.options.brutal_grinds or level < 15:
-                return lambda state: state.can_reach(RegionNames.Bronze_Ores, "Region", self.player) or \
-                                     state.can_reach(RegionNames.Clay_Rock, "Region", self.player)
-            else:
-                # Iron is the best way to train all the way to 99, so having access to iron is all you need to check for
-                return lambda state: (state.can_reach(RegionNames.Bronze_Ores, "Region", self.player) or
-                                      state.can_reach(RegionNames.Clay_Rock, "Region", self.player)) and \
-                                     state.can_reach(RegionNames.Iron_Rock, "Region", self.player)
-        if skill.lower() == "woodcutting":
-            if self.options.brutal_grinds or level < 15:
-                # I've checked. There is not a single chunk in the f2p that does not have at least one normal tree.
-                # Even the desert.
-                return lambda state: True
-            if level < 30:
-                return lambda state: state.can_reach(RegionNames.Oak_Tree, "Region", self.player)
-            else:
-                return lambda state: state.can_reach(RegionNames.Oak_Tree, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Willow_Tree, "Region", self.player)
-        if skill.lower() == "smithing":
-            if self.options.brutal_grinds:
-                return lambda state: state.can_reach(RegionNames.Bronze_Ores, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Furnace, "Region", self.player)
-            if level < 15:
-                # Lumbridge has a special bronze-only anvil. This is the only anvil of its type so it's not included
-                # in the "Anvil" resource region. We still need to check for it though.
-                return lambda state: state.can_reach(RegionNames.Bronze_Ores, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Furnace, "Region", self.player) and \
-                                     (state.can_reach(RegionNames.Anvil, "Region", self.player) or
-                                      state.can_reach(RegionNames.Lumbridge, "Region", self.player))
-            if level < 30:
-                # For levels between 15 and 30, the lumbridge anvil won't cut it. Only a real one will do
-                return lambda state: state.can_reach(RegionNames.Bronze_Ores, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Iron_Rock, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Furnace, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Anvil, "Region", self.player)
-            else:
-                return lambda state: state.can_reach(RegionNames.Bronze_Ores, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Iron_Rock, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Coal_Rock, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Furnace, "Region", self.player) and \
-                                     state.can_reach(RegionNames.Anvil, "Region", self.player)
-        if skill.lower() == "crafting":
-            # Crafting is really complex. Need a lot of sub-rules to make this even remotely readable
-            def can_spin(state):
-                return state.can_reach(RegionNames.Sheep, "Region", self.player) and \
-                    state.can_reach(RegionNames.Spinning_Wheel, "Region", self.player)
-
-            def can_pot(state):
-                return state.can_reach(RegionNames.Clay_Rock, "Region", self.player) and \
-                    state.can_reach(RegionNames.Barbarian_Village, "Region", self.player)
-
-            def can_tan(state):
-                return state.can_reach(RegionNames.Milk, "Region", self.player) and \
-                    state.can_reach(RegionNames.Al_Kharid, "Region", self.player)
-
-            def mould_access(state):
-                return state.can_reach(RegionNames.Al_Kharid, "Region", self.player) or \
-                    state.can_reach(RegionNames.Rimmington, "Region", self.player)
-
-            def can_silver(state):
-
-                return state.can_reach(RegionNames.Silver_Rock, "Region", self.player) and \
-                    state.can_reach(RegionNames.Furnace, "Region", self.player) and mould_access(state)
-
-            def can_gold(state):
-                return state.can_reach(RegionNames.Gold_Rock, "Region", self.player) and \
-                    state.can_reach(RegionNames.Furnace, "Region", self.player) and mould_access(state)
-
-            if self.options.brutal_grinds or level < 5:
-                return lambda state: can_spin(state) or can_pot(state) or can_tan(state)
-
-            can_smelt_gold = self.get_skill_rule("smithing", 40)
-            can_smelt_silver = self.get_skill_rule("smithing", 20)
-            if level < 16:
-                return lambda state: can_pot(state) or can_tan(state) or (can_gold(state) and can_smelt_gold(state))
-            else:
-                return lambda state: can_tan(state) or (can_silver(state) and can_smelt_silver(state)) or \
-                                     (can_gold(state) and can_smelt_gold(state))
-        if skill.lower() == "cooking":
-            if self.options.brutal_grinds or level < 15:
-                return lambda state: state.can_reach(RegionNames.Milk, "Region", self.player) or \
-                                     state.can_reach(RegionNames.Egg, "Region", self.player) or \
-                                     state.can_reach(RegionNames.Shrimp, "Region", self.player) or \
-                                     (state.can_reach(RegionNames.Wheat, "Region", self.player) and
-                                      state.can_reach(RegionNames.Windmill, "Region", self.player))
-            else:
-                can_catch_fly_fish = self.get_skill_rule("fishing", 20)
-                return lambda state: state.can_reach(RegionNames.Fly_Fish, "Region", self.player) and \
-                                     can_catch_fly_fish(state) and \
-                                     (state.can_reach(RegionNames.Milk, "Region", self.player) or
-                                      state.can_reach(RegionNames.Egg, "Region", self.player) or
-                                      state.can_reach(RegionNames.Shrimp, "Region", self.player) or
-                                      (state.can_reach(RegionNames.Wheat, "Region", self.player) and
-                                       state.can_reach(RegionNames.Windmill, "Region", self.player)))
-        if skill.lower() == "runecraft":
-            return lambda state: state.has(ItemNames.QP_Rune_Mysteries, self.player)
-        if skill.lower() == "magic":
-            return lambda state: state.can_reach(RegionNames.Mind_Runes, "Region", self.player)
-
-        return lambda state: True

From ba50c947bade7ec04a597a1b73b232a7af89da65 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Fri, 22 Nov 2024 23:13:57 +0000
Subject: [PATCH 029/381] AHiT: Fix reconnecting rift access regions for
 starting and plando acts (#4200)

Reconnecting an act in a telescope to a time rift removes the entrances
to the time rift from its access regions because it will be accessible
from the telescope instead.

By doing so early on, as a starting act with insanity act randomizer or
as a plando-ed act, this can happen before the time rift itself has been
reconnected to an act or other time rift. In which case, when later
attempting to connect that time rift to an act or other time rift, the
entrances from the rift access regions will no longer exist, so must be
re-created. The original code was mistakenly re-creating the entrances
from the time rift being reconnected, instead of from the rift access
regions.
---
 worlds/ahit/Regions.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py
index c70f08b475eb..31edf1d0b057 100644
--- a/worlds/ahit/Regions.py
+++ b/worlds/ahit/Regions.py
@@ -740,17 +740,20 @@ def is_valid_first_act(world: "HatInTimeWorld", act: Region) -> bool:
 
 
 def connect_time_rift(world: "HatInTimeWorld", time_rift: Region, exit_region: Region):
-    i = 1
-    while i <= len(rift_access_regions[time_rift.name]):
+    for i, access_region in enumerate(rift_access_regions[time_rift.name], start=1):
+        # Matches the naming convention and iteration order in `create_rift_connections()`.
         name = f"{time_rift.name} Portal - Entrance {i}"
         entrance: Entrance
         try:
-            entrance = world.multiworld.get_entrance(name, world.player)
+            entrance = world.get_entrance(name)
+            # Reconnect the rift access region to the new exit region.
             reconnect_regions(entrance, entrance.parent_region, exit_region)
         except KeyError:
-            time_rift.connect(exit_region, name)
-
-        i += 1
+            # The original entrance to the time rift has been deleted by already reconnecting a telescope act to the
+            # time rift, so create a new entrance from the original rift access region to the new exit region.
+            # Normally, acts and time rifts are sorted such that time rifts are reconnected to acts/rifts first, but
+            # starting acts/rifts and act-plando can reconnect acts to time rifts before this happens.
+            world.get_region(access_region).connect(exit_region, name)
 
 
 def get_shuffleable_act_regions(world: "HatInTimeWorld") -> List[Region]:

From 5729b785040e3b6f3d12444c934d988dfbbfcc71 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Fri, 22 Nov 2024 19:42:44 -0500
Subject: [PATCH 030/381] TUNIC: Fix it so item linked locations are correct in
 slot data (#4105)

* Fix it so item linked locations are correct in slot data

* List -> Set

* Cache the locations instead

* Just loop the multiworld once

* Move it all to fill slot data and pretend we're doing a stage

* Move groups up so it doesn't loop over the multiworld locations if no item links are present

* Update worlds/tunic/__init__.py

Co-authored-by: Mysteryem <Mysteryem@users.noreply.github.com>

---------

Co-authored-by: Mysteryem <Mysteryem@users.noreply.github.com>
---
 worlds/tunic/__init__.py | 43 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 6360ba493853..5a2847278bd5 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -83,6 +83,11 @@ class TunicWorld(World):
     shop_num: int = 1  # need to make it so that you can walk out of shops, but also that they aren't all connected
     er_regions: Dict[str, RegionInfo]  # absolutely needed so outlet regions work
 
+    # so we only loop the multiworld locations once
+    # if these are locations instead of their info, it gives a memory leak error
+    item_link_locations: Dict[int, Dict[str, List[Tuple[int, str]]]] = {}
+    player_item_link_locations: Dict[str, List[Location]]
+
     def generate_early(self) -> None:
         if self.options.logic_rules >= LogicRules.option_no_major_glitches:
             self.options.laurels_zips.value = LaurelsZips.option_true
@@ -387,6 +392,18 @@ def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]) -> None:
                 if hint_text:
                     hint_data[self.player][location.address] = hint_text
 
+    def get_real_location(self, location: Location) -> Tuple[str, int]:
+        # if it's not in a group, it's not in an item link
+        if location.player not in self.multiworld.groups or not location.item:
+            return location.name, location.player
+        try:
+            loc = self.player_item_link_locations[location.item.name].pop()
+            return loc.name, loc.player
+        except IndexError:
+            warning(f"TUNIC: Failed to parse item location for in-game hints for {self.player_name}. "
+                    f"Using a potentially incorrect location name instead.")
+            return location.name, location.player
+
     def fill_slot_data(self) -> Dict[str, Any]:
         slot_data: Dict[str, Any] = {
             "seed": self.random.randint(0, 2147483647),
@@ -412,12 +429,34 @@ def fill_slot_data(self) -> Dict[str, Any]:
             "disable_local_spoiler": int(self.settings.disable_local_spoiler or self.multiworld.is_race),
         }
 
+        # this would be in a stage if there was an appropriate stage for it
+        self.player_item_link_locations = {}
+        groups = self.multiworld.get_player_groups(self.player)
+        if groups:
+            if not self.item_link_locations:
+                tunic_worlds: Tuple[TunicWorld] = self.multiworld.get_game_worlds("TUNIC")
+                # figure out our groups and the items in them
+                for tunic in tunic_worlds:
+                    for group in self.multiworld.get_player_groups(tunic.player):
+                        self.item_link_locations.setdefault(group, {})
+                for location in self.multiworld.get_locations():
+                    if location.item and location.item.player in self.item_link_locations.keys():
+                        (self.item_link_locations[location.item.player].setdefault(location.item.name, [])
+                         .append((location.player, location.name)))
+
+            # if item links are on, set up the player's personal item link locations, so we can pop them as needed
+            for group, item_links in self.item_link_locations.items():
+                if group in groups:
+                    for item_name, locs in item_links.items():
+                        self.player_item_link_locations[item_name] = \
+                            [self.multiworld.get_location(location_name, player) for player, location_name in locs]
+
         for tunic_item in filter(lambda item: item.location is not None and item.code is not None, self.slot_data_items):
             if tunic_item.name not in slot_data:
                 slot_data[tunic_item.name] = []
             if tunic_item.name == gold_hexagon and len(slot_data[gold_hexagon]) >= 6:
                 continue
-            slot_data[tunic_item.name].extend([tunic_item.location.name, tunic_item.location.player])
+            slot_data[tunic_item.name].extend(self.get_real_location(tunic_item.location))
 
         for start_item in self.options.start_inventory_from_pool:
             if start_item in slot_data_item_names:
@@ -436,7 +475,7 @@ def fill_slot_data(self) -> Dict[str, Any]:
                     if item in slot_data_item_names:
                         slot_data[item] = []
                         for item_location in self.multiworld.find_item_locations(item, self.player):
-                            slot_data[item].extend([item_location.name, item_location.player])
+                            slot_data[item].extend(self.get_real_location(item_location))
 
         return slot_data
 

From 03b90cf39ba1d10952545c44fee91fd874837124 Mon Sep 17 00:00:00 2001
From: Jarno <jarnowesthof@gmail.com>
Date: Sun, 24 Nov 2024 15:57:39 +0100
Subject: [PATCH 031/381] =?UTF-8?q?Timespinner:=20Re-added=20missing=20enm?=
 =?UTF-8?q?emy=20rando=20option=C2=A0#4235?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worlds/timespinner/Options.py  | 6 ++++++
 worlds/timespinner/__init__.py | 1 +
 2 files changed, 7 insertions(+)

diff --git a/worlds/timespinner/Options.py b/worlds/timespinner/Options.py
index f6a3dba3e311..c06dd36797fd 100644
--- a/worlds/timespinner/Options.py
+++ b/worlds/timespinner/Options.py
@@ -379,6 +379,7 @@ class TimespinnerOptions(PerGameCommonOptions, DeathLinkMixin):
     cantoran: Cantoran
     lore_checks: LoreChecks
     boss_rando: BossRando
+    enemy_rando: EnemyRando
     damage_rando: DamageRando
     damage_rando_overrides: DamageRandoOverrides
     hp_cap: HpCap
@@ -445,6 +446,7 @@ class BackwardsCompatiableTimespinnerOptions(TimespinnerOptions):
     Cantoran: hidden(Cantoran) # type: ignore
     LoreChecks: hidden(LoreChecks) # type: ignore
     BossRando: hidden(BossRando) # type: ignore
+    EnemyRando: hidden(EnemyRando) # type: ignore
     DamageRando: hidden(DamageRando) # type: ignore
     DamageRandoOverrides: HiddenDamageRandoOverrides
     HpCap: hidden(HpCap) # type: ignore
@@ -516,6 +518,10 @@ def handle_backward_compatibility(self) -> None:
             self.boss_rando == BossRando.default:
             self.boss_rando.value = self.BossRando.value
             self.has_replaced_options.value = Toggle.option_true
+        if self.EnemyRando != EnemyRando.default and \
+            self.enemy_rando == EnemyRando.default:
+            self.enemy_rando.value = self.EnemyRando.value
+            self.has_replaced_options.value = Toggle.option_true
         if self.DamageRando != DamageRando.default and \
             self.damage_rando == DamageRando.default:
             self.damage_rando.value = self.DamageRando.value
diff --git a/worlds/timespinner/__init__.py b/worlds/timespinner/__init__.py
index f241d4468162..72903bd5ffea 100644
--- a/worlds/timespinner/__init__.py
+++ b/worlds/timespinner/__init__.py
@@ -98,6 +98,7 @@ def fill_slot_data(self) -> Dict[str, object]:
             "Cantoran": self.options.cantoran.value,
             "LoreChecks": self.options.lore_checks.value,
             "BossRando": self.options.boss_rando.value,
+            "EnemyRando": self.options.enemy_rando.value,
             "DamageRando": self.options.damage_rando.value,
             "DamageRandoOverrides": self.options.damage_rando_overrides.value,
             "HpCap": self.options.hp_cap.value,

From 36f17111bf5a9cd1027065422098e7b677640860 Mon Sep 17 00:00:00 2001
From: gaithern <36639398+gaithern@users.noreply.github.com>
Date: Sun, 24 Nov 2024 11:42:21 -0600
Subject: [PATCH 032/381] Kingdom Hearts: Minor Logic Fixes (#4236)

* Update Rules.py

* Update worlds/kh1/Rules.py

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update worlds/kh1/Rules.py

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---
 worlds/kh1/Rules.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/worlds/kh1/Rules.py b/worlds/kh1/Rules.py
index e1f72f5b3e54..130238e5048e 100644
--- a/worlds/kh1/Rules.py
+++ b/worlds/kh1/Rules.py
@@ -235,6 +235,11 @@ def set_rules(kh1world):
         lambda state: (
             state.has("Progressive Glide", player)
             or
+            (
+                state.has("High Jump", player, 2)
+                and state.has("Footprints", player)
+            )
+            or
             (
                 options.advanced_logic
                 and state.has_all({
@@ -246,6 +251,11 @@ def set_rules(kh1world):
         lambda state: (
             state.has("Progressive Glide", player)
             or
+            (
+                state.has("High Jump", player, 2)
+                and state.has("Footprints", player)
+            )
+            or
             (
                 options.advanced_logic
                 and state.has_all({
@@ -258,7 +268,6 @@ def set_rules(kh1world):
         
            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: (
@@ -376,7 +385,7 @@ def set_rules(kh1world):
         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)
+            state.has_all(("High Jump", "Progressive Glide"), 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"),
@@ -386,7 +395,7 @@ def set_rules(kh1world):
         ))
     add_rule(kh1world.get_location("Monstro Chamber 6 Raised Area Near Chamber 1 Entrance Chest"),
         lambda state: (
-            state.has("High Jump", player)
+            state.has_all(("High Jump", "Progressive Glide"), player)
             or (options.advanced_logic and state.has("Combo Master", player))
         ))
     add_rule(kh1world.get_location("Halloween Town Moonlight Hill White Trinity Chest"),
@@ -595,6 +604,7 @@ def set_rules(kh1world):
         lambda state: (
             state.has("Green Trinity", player)
             and has_all_magic_lvx(state, player, 2)
+            and has_defensive_tools(state, player)
         ))
     add_rule(kh1world.get_location("Neverland Hold Flight 2nd Chest"),
         lambda state: (
@@ -710,8 +720,7 @@ def set_rules(kh1world):
         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)
+            state.has("Progressive Glide", player)
         ))
     add_rule(kh1world.get_location("End of the World Giant Crevasse 1st Chest"),
         lambda state: (
@@ -1441,10 +1450,11 @@ def set_rules(kh1world):
                 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)
+                and state.has("Progressive Blizzard", player, 3)
             ))
         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)
+                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) and state.has("Progressive Blizzard", player, 3)
             ))
     if options.super_bosses or options.goal.current_key == "sephiroth":
         add_rule(kh1world.get_location("Olympus Coliseum Defeat Sephiroth Ansem's Report 12"),

From a650e90b576bb5ad791e9b6fb7c036cfe747ec97 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sun, 24 Nov 2024 12:43:28 -0500
Subject: [PATCH 033/381] =?UTF-8?q?TUNIC:=20Add=20clarifying=20comment=20t?=
 =?UTF-8?q?o=20item=20links=20handling=C2=A0#4233?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worlds/tunic/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 5a2847278bd5..d1430aac1895 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -432,6 +432,7 @@ def fill_slot_data(self) -> Dict[str, Any]:
         # this would be in a stage if there was an appropriate stage for it
         self.player_item_link_locations = {}
         groups = self.multiworld.get_player_groups(self.player)
+        # checking if groups so that this doesn't run if the player isn't in a group
         if groups:
             if not self.item_link_locations:
                 tunic_worlds: Tuple[TunicWorld] = self.multiworld.get_game_worlds("TUNIC")

From e6e31a27e688ecbb45fa9569e72d2a4db111e37f Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:25:00 -0500
Subject: [PATCH 034/381] SC2: Fix Nondeterministic Behavior (#4246)

* Add < for sorting

* Sorting for determinism

* id instead of value
---
 worlds/sc2/MissionTables.py | 3 +++
 worlds/sc2/Regions.py       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/worlds/sc2/MissionTables.py b/worlds/sc2/MissionTables.py
index 4dece46411bf..08e1f133deda 100644
--- a/worlds/sc2/MissionTables.py
+++ b/worlds/sc2/MissionTables.py
@@ -43,6 +43,9 @@ def __init__(self, campaign_id: int, name: str, goal_priority: SC2CampaignGoalPr
         self.goal_priority = goal_priority
         self.race = race
 
+    def __lt__(self, other: "SC2Campaign"):
+        return self.id < other.id
+
     GLOBAL = 0, "Global", SC2CampaignGoalPriority.NONE, SC2Race.ANY
     WOL = 1, "Wings of Liberty", SC2CampaignGoalPriority.VERY_HARD, SC2Race.TERRAN
     PROPHECY = 2, "Prophecy", SC2CampaignGoalPriority.MINI_CAMPAIGN, SC2Race.PROTOSS
diff --git a/worlds/sc2/Regions.py b/worlds/sc2/Regions.py
index 84830a9a32bd..273bc4a5e87c 100644
--- a/worlds/sc2/Regions.py
+++ b/worlds/sc2/Regions.py
@@ -50,7 +50,7 @@ def create_vanilla_regions(
     names: Dict[str, int] = {}
 
     # Generating all regions and locations for each enabled campaign
-    for campaign in enabled_campaigns:
+    for campaign in sorted(enabled_campaigns):
         for region_name in vanilla_mission_req_table[campaign].keys():
             regions.append(create_region(world, locations_per_region, location_cache, region_name))
     world.multiworld.regions += regions

From 0ad5b0ade891e7547d2af772e5b09e926daad2f8 Mon Sep 17 00:00:00 2001
From: wildham <64616385+wildham0@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:25:29 -0500
Subject: [PATCH 035/381] [FFMQ] Fix all checks sending on hard reset +
 stronger read validation check (#4242)

* Fix all checks sending on hard reset

* stronger validation

* Fix typo

* remove extraneous else

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* fix style

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/ffmq/Client.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/worlds/ffmq/Client.py b/worlds/ffmq/Client.py
index 93688a6116f6..401c240a46ba 100644
--- a/worlds/ffmq/Client.py
+++ b/worlds/ffmq/Client.py
@@ -47,6 +47,17 @@ def get_flag(data, flag):
     bit = int(0x80 / (2 ** (flag % 8)))
     return (data[byte] & bit) > 0
 
+def validate_read_state(data1, data2):
+    validation_array = bytes([0x01, 0x46, 0x46, 0x4D, 0x51, 0x52])
+
+    if data1 is None or data2 is None:
+        return False
+    for i in range(6):
+        if data1[i] != validation_array[i] or data2[i] != validation_array[i]:
+            return False;
+    return True
+    
+   
 
 class FFMQClient(SNIClient):
     game = "Final Fantasy Mystic Quest"
@@ -67,11 +78,11 @@ async def validate_rom(self, ctx):
     async def game_watcher(self, ctx):
         from SNIClient import snes_buffered_write, snes_flush_writes, snes_read
 
-        check_1 = await snes_read(ctx, 0xF53749, 1)
+        check_1 = await snes_read(ctx, 0xF53749, 6)
         received = await snes_read(ctx, RECEIVED_DATA[0], RECEIVED_DATA[1])
         data = await snes_read(ctx, READ_DATA_START, READ_DATA_END - READ_DATA_START)
-        check_2 = await snes_read(ctx, 0xF53749, 1)
-        if check_1 != b'\x01' or check_2 != b'\x01':
+        check_2 = await snes_read(ctx, 0xF53749, 6)
+        if not validate_read_state(check_1, check_2):
             return
 
         def get_range(data_range):

From d3a3c29bc9811970c423003d6550909bae0b7fb4 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:25:55 -0500
Subject: [PATCH 036/381]   Landstalker: Fix Nondeterministic Behavior #4245

---
 worlds/landstalker/Locations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/landstalker/Locations.py b/worlds/landstalker/Locations.py
index b0148269eab3..0fe63526c63b 100644
--- a/worlds/landstalker/Locations.py
+++ b/worlds/landstalker/Locations.py
@@ -34,7 +34,7 @@ def create_locations(player: int, regions_table: Dict[str, LandstalkerRegion], n
     for data in WORLD_PATHS_JSON:
         if "requiredNodes" in data:
             regions_with_entrance_checks.extend([region_id for region_id in data["requiredNodes"]])
-    regions_with_entrance_checks = list(set(regions_with_entrance_checks))
+    regions_with_entrance_checks = sorted(set(regions_with_entrance_checks))
     for region_id in regions_with_entrance_checks:
         region = regions_table[region_id]
         location = LandstalkerLocation(player, 'event_visited_' + region_id, None, region, "event")

From 41a7d7eeee67daef201a829a8ac7fed6224bfe6d Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:26:21 -0500
Subject: [PATCH 037/381] HK: Fix Nondeterministic Behavior #4244

---
 worlds/hk/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index 486aa164cd5d..aede8e59cca5 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -231,7 +231,7 @@ def create_regions(self):
             all_event_names.update(set(godhome_event_names))
 
         # Link regions
-        for event_name in all_event_names:
+        for event_name in sorted(all_event_names):
             #if event_name in wp_exclusions:
             #    continue
             loc = HKLocation(self.player, event_name, None, menu_region)

From 6073d5e37e722b6c1c0f3ce266158b9b83a6f52a Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:26:44 -0500
Subject: [PATCH 038/381] Lufia2: Fix Nondeterministic Behavior #4243

---
 worlds/lufia2ac/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/lufia2ac/__init__.py b/worlds/lufia2ac/__init__.py
index 6433452cefea..96de24a4b6a0 100644
--- a/worlds/lufia2ac/__init__.py
+++ b/worlds/lufia2ac/__init__.py
@@ -118,7 +118,7 @@ def create_regions(self) -> None:
                 L2ACItem("Progressive chest access", ItemClassification.progression, None, self.player))
             chest_access.show_in_spoiler = False
             ancient_dungeon.locations.append(chest_access)
-        for iris in self.item_name_groups["Iris treasures"]:
+        for iris in sorted(self.item_name_groups["Iris treasures"]):
             treasure_name: str = f"Iris treasure {self.item_name_to_id[iris] - self.item_name_to_id['Iris sword'] + 1}"
             iris_treasure: Location = \
                 L2ACLocation(self.player, treasure_name, self.location_name_to_id[treasure_name], ancient_dungeon)

From fcaba14b6273c487c42ab26f7ea3f188f57f3823 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:27:31 -0500
Subject: [PATCH 039/381] Zillion: Add display_name to ZillionSkill #4241

---
 worlds/zillion/options.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/zillion/options.py b/worlds/zillion/options.py
index 5de0b65c82f0..8df612654db4 100644
--- a/worlds/zillion/options.py
+++ b/worlds/zillion/options.py
@@ -233,6 +233,7 @@ class ZillionSkill(Range):
     range_start = 0
     range_end = 5
     default = 2
+    display_name = "skill"
 
 
 class ZillionStartingCards(NamedRange):

From 0dade05133932deb9603167cb1d9a7fef67a4340 Mon Sep 17 00:00:00 2001
From: Ziktofel <ziktofel@gmail.com>
Date: Tue, 26 Nov 2024 00:35:24 +0100
Subject: [PATCH 040/381] SC2: Fix wrongly classified location type (#4249)

---
 worlds/sc2/Locations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/sc2/Locations.py b/worlds/sc2/Locations.py
index 53f41f4e4c3d..b9c30bb70106 100644
--- a/worlds/sc2/Locations.py
+++ b/worlds/sc2/Locations.py
@@ -1387,7 +1387,7 @@ def get_locations(world: Optional[World]) -> Tuple[LocationData, ...]:
                      lambda state: logic.templars_return_requirement(state)),
         LocationData("The Host", "The Host: Victory", SC2LOTV_LOC_ID_OFFSET + 2100, LocationType.VICTORY,
                      lambda state: logic.the_host_requirement(state)),
-        LocationData("The Host", "The Host: Southeast Void Shard", SC2LOTV_LOC_ID_OFFSET + 2101, LocationType.VICTORY,
+        LocationData("The Host", "The Host: Southeast Void Shard", SC2LOTV_LOC_ID_OFFSET + 2101, LocationType.EXTRA,
                      lambda state: logic.the_host_requirement(state)),
         LocationData("The Host", "The Host: South Void Shard", SC2LOTV_LOC_ID_OFFSET + 2102, LocationType.EXTRA,
                      lambda state: logic.the_host_requirement(state)),

From 75624042f7a56b7c394b5a5e36936635cb45e0f8 Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Tue, 26 Nov 2024 18:44:33 -0500
Subject: [PATCH 041/381] Stardew Valley: Make progressive movie theater a
 progression trap (#3985)

---
 worlds/stardew_valley/__init__.py                  | 2 +-
 worlds/stardew_valley/data/items.csv               | 2 +-
 worlds/stardew_valley/items.py                     | 3 ++-
 worlds/stardew_valley/test/TestGeneration.py       | 4 ++--
 worlds/stardew_valley/test/__init__.py             | 2 +-
 worlds/stardew_valley/test/mods/TestMods.py        | 4 ++--
 worlds/stardew_valley/test/rules/TestStateRules.py | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index f9df8c292e37..44306011361c 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -319,7 +319,7 @@ def create_item(self, item: Union[str, ItemData], override_classification: ItemC
         if override_classification is None:
             override_classification = item.classification
 
-        if override_classification == ItemClassification.progression:
+        if override_classification & ItemClassification.progression:
             self.total_progression_items += 1
         return StardewItem(item.name, override_classification, item.code, self.player)
 
diff --git a/worlds/stardew_valley/data/items.csv b/worlds/stardew_valley/data/items.csv
index ffcae223e251..05af275ba472 100644
--- a/worlds/stardew_valley/data/items.csv
+++ b/worlds/stardew_valley/data/items.csv
@@ -7,7 +7,7 @@ id,name,classification,groups,mod_name
 19,Glittering Boulder Removed,progression,COMMUNITY_REWARD,
 20,Minecarts Repair,useful,COMMUNITY_REWARD,
 21,Bus Repair,progression,COMMUNITY_REWARD,
-22,Progressive Movie Theater,progression,COMMUNITY_REWARD,
+22,Progressive Movie Theater,"progression,trap",COMMUNITY_REWARD,
 23,Stardrop,progression,,
 24,Progressive Backpack,progression,,
 25,Rusty Sword,filler,"WEAPON,DEPRECATED",
diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py
index 31c7da5e3ade..730cb24ce6e3 100644
--- a/worlds/stardew_valley/items.py
+++ b/worlds/stardew_valley/items.py
@@ -2,6 +2,7 @@
 import enum
 import logging
 from dataclasses import dataclass, field
+from functools import reduce
 from pathlib import Path
 from random import Random
 from typing import Dict, List, Protocol, Union, Set, Optional
@@ -134,7 +135,7 @@ def load_item_csv():
         item_reader = csv.DictReader(file)
         for item in item_reader:
             id = int(item["id"]) if item["id"] else None
-            classification = ItemClassification[item["classification"]]
+            classification = reduce((lambda a, b: a | b), {ItemClassification[str_classification] for str_classification in item["classification"].split(",")})
             groups = {Group[group] for group in item["groups"].split(",") if group}
             mod_name = str(item["mod_name"]) if item["mod_name"] else None
             items.append(ItemData(id, item["name"], classification, mod_name, groups))
diff --git a/worlds/stardew_valley/test/TestGeneration.py b/worlds/stardew_valley/test/TestGeneration.py
index 8431e6857eaf..56f338fe8e11 100644
--- a/worlds/stardew_valley/test/TestGeneration.py
+++ b/worlds/stardew_valley/test/TestGeneration.py
@@ -35,7 +35,7 @@ def test_all_progression_items_are_added_to_the_pool(self):
         items_to_ignore.extend(baby.name for baby in items.items_by_group[Group.BABY])
         items_to_ignore.extend(resource_pack.name for resource_pack in items.items_by_group[Group.RESOURCE_PACK])
         items_to_ignore.append("The Gateway Gazette")
-        progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression and item.name not in items_to_ignore]
+        progression_items = [item for item in items.all_items if item.classification & ItemClassification.progression and item.name not in items_to_ignore]
         for progression_item in progression_items:
             with self.subTest(f"{progression_item.name}"):
                 self.assertIn(progression_item.name, all_created_items)
@@ -86,7 +86,7 @@ def test_all_progression_items_except_island_are_added_to_the_pool(self):
         items_to_ignore.extend(season.name for season in items.items_by_group[Group.WEAPON])
         items_to_ignore.extend(baby.name for baby in items.items_by_group[Group.BABY])
         items_to_ignore.append("The Gateway Gazette")
-        progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression and item.name not in items_to_ignore]
+        progression_items = [item for item in items.all_items if item.classification & ItemClassification.progression and item.name not in items_to_ignore]
         for progression_item in progression_items:
             with self.subTest(f"{progression_item.name}"):
                 if Group.GINGER_ISLAND in progression_item.groups:
diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py
index 3fe05d205ce0..8f4e5af28f84 100644
--- a/worlds/stardew_valley/test/__init__.py
+++ b/worlds/stardew_valley/test/__init__.py
@@ -306,7 +306,7 @@ def collect(self, item: Union[str, Item, Iterable[Item]], count: int = 1) -> Uni
 
     def create_item(self, item: str) -> StardewItem:
         created_item = self.world.create_item(item)
-        if created_item.classification == ItemClassification.progression:
+        if created_item.classification & ItemClassification.progression:
             self.multiworld.worlds[self.player].total_progression_items -= 1
         return created_item
 
diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index 97184b1338b8..07a75f21b1de 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -75,7 +75,7 @@ def test_all_progression_items_are_added_to_the_pool(self):
         items_to_ignore.extend(baby.name for baby in items.items_by_group[Group.BABY])
         items_to_ignore.extend(resource_pack.name for resource_pack in items.items_by_group[Group.RESOURCE_PACK])
         items_to_ignore.append("The Gateway Gazette")
-        progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression
+        progression_items = [item for item in items.all_items if item.classification & ItemClassification.progression
                              and item.name not in items_to_ignore]
         for progression_item in progression_items:
             with self.subTest(f"{progression_item.name}"):
@@ -105,7 +105,7 @@ def test_all_progression_items_except_island_are_added_to_the_pool(self):
         items_to_ignore.extend(baby.name for baby in items.items_by_group[Group.BABY])
         items_to_ignore.extend(resource_pack.name for resource_pack in items.items_by_group[Group.RESOURCE_PACK])
         items_to_ignore.append("The Gateway Gazette")
-        progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression
+        progression_items = [item for item in items.all_items if item.classification & ItemClassification.progression
                              and item.name not in items_to_ignore]
         for progression_item in progression_items:
             with self.subTest(f"{progression_item.name}"):
diff --git a/worlds/stardew_valley/test/rules/TestStateRules.py b/worlds/stardew_valley/test/rules/TestStateRules.py
index 4f53b9a7f536..7d10f4ceb1d3 100644
--- a/worlds/stardew_valley/test/rules/TestStateRules.py
+++ b/worlds/stardew_valley/test/rules/TestStateRules.py
@@ -8,5 +8,5 @@ class TestHasProgressionPercent(unittest.TestCase):
     def test_max_item_amount_is_full_collection(self):
         # Not caching because it fails too often for some reason
         with solo_multiworld(world_caching=False) as (multiworld, world):
-            progression_item_count = sum(1 for i in multiworld.get_items() if ItemClassification.progression in i.classification)
+            progression_item_count = sum(1 for i in multiworld.get_items() if i.classification & ItemClassification.progression)
             self.assertEqual(world.total_progression_items, progression_item_count - 1)  # -1 to skip Victory

From dbf284d4b27f8ac31460087863e0b5c341da1101 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:09:13 +0100
Subject: [PATCH 042/381] The Witness: Give an actual name to the new option
 (lol) #4238

---
 worlds/witness/options.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/witness/options.py b/worlds/witness/options.py
index e1462cc37508..fe039f9d47e3 100644
--- a/worlds/witness/options.py
+++ b/worlds/witness/options.py
@@ -406,6 +406,7 @@ class PuzzleRandomizationSeed(Range):
     Sigma Rando, which is the basis for all puzzle randomization in this randomizer, uses a seed from 1 to 9999999 for the puzzle randomization.
     This option lets you set this seed yourself.
     """
+    display_name = "Puzzle Randomization Seed"
     range_start = 1
     range_end = 9999999
     default = "random"

From e882c68277f9274848110807b2b177c03cfbf3d6 Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Tue, 26 Nov 2024 20:09:53 -0500
Subject: [PATCH 043/381] Stardew Valley - Update documentation 5.x.x links
 into 6.x.x links #4255

---
 worlds/stardew_valley/docs/en_Stardew Valley.md | 2 +-
 worlds/stardew_valley/docs/setup_en.md          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/stardew_valley/docs/en_Stardew Valley.md b/worlds/stardew_valley/docs/en_Stardew Valley.md
index 0ed693031b82..62755dad798d 100644
--- a/worlds/stardew_valley/docs/en_Stardew Valley.md	
+++ b/worlds/stardew_valley/docs/en_Stardew Valley.md	
@@ -138,7 +138,7 @@ This means that, for these specific mods, if you decide to include them in your
 with the assumption that you will install and play with these mods. The multiworld will contain related items and locations
 for these mods, the specifics will vary from mod to mod
 
-[Supported Mods Documentation](https://github.com/agilbert1412/StardewArchipelago/blob/5.x.x/Documentation/Supported%20Mods.md)
+[Supported Mods Documentation](https://github.com/agilbert1412/StardewArchipelago/blob/6.x.x/Documentation/Supported%20Mods.md)
 
 List of supported mods:
 
diff --git a/worlds/stardew_valley/docs/setup_en.md b/worlds/stardew_valley/docs/setup_en.md
index c672152543cf..801bf345e916 100644
--- a/worlds/stardew_valley/docs/setup_en.md
+++ b/worlds/stardew_valley/docs/setup_en.md
@@ -12,7 +12,7 @@
 - Archipelago from the [Archipelago Releases Page](https://github.com/ArchipelagoMW/Archipelago/releases)
     * (Only for the TextClient)
 - Other Stardew Valley Mods [Nexus Mods](https://www.nexusmods.com/stardewvalley)
-    * There are [supported mods](https://github.com/agilbert1412/StardewArchipelago/blob/5.x.x/Documentation/Supported%20Mods.md) 
+    * There are [supported mods](https://github.com/agilbert1412/StardewArchipelago/blob/6.x.x/Documentation/Supported%20Mods.md) 
   that you can add to your yaml to include them with the Archipelago randomization
 
     * It is **not** recommended to further mod Stardew Valley with unsupported mods, although it is possible to do so. 

From 6c939d2d594c2b282dbdd365cf9f6f5b170f22b4 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:49:18 +0100
Subject: [PATCH 044/381] The Witness: Rename "Panel Hunt Settings" to "Panel
 Hunt Options" (#4251)

Who let me get away with this lmao
---
 worlds/witness/options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/witness/options.py b/worlds/witness/options.py
index fe039f9d47e3..d1713e73c541 100644
--- a/worlds/witness/options.py
+++ b/worlds/witness/options.py
@@ -457,7 +457,7 @@ class TheWitnessOptions(PerGameCommonOptions):
         MountainLasers,
         ChallengeLasers,
     ]),
-    OptionGroup("Panel Hunt Settings", [
+    OptionGroup("Panel Hunt Options", [
         PanelHuntRequiredPercentage,
         PanelHuntTotal,
         PanelHuntPostgame,

From 334781e976e0b701841634cc155fccfc86ca7348 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Wed, 27 Nov 2024 03:28:00 +0100
Subject: [PATCH 045/381] Core: purge py3.8 and py3.9 (#3973)

Co-authored-by: Remy Jette <remy@remyjette.com>
Co-authored-by: Jouramie <16137441+Jouramie@users.noreply.github.com>
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
---
 .github/pyright-config.json                   |  2 +-
 .github/workflows/analyze-modified-files.yml  |  2 +-
 .github/workflows/build.yml                   |  4 +--
 .github/workflows/unittests.yml               |  4 +--
 BaseClasses.py                                | 12 ++++----
 ModuleUpdate.py                               |  4 +--
 Utils.py                                      |  5 ++--
 WebHost.py                                    |  2 +-
 WebHostLib/requirements.txt                   |  4 +--
 docs/contributing.md                          |  2 +-
 docs/running from source.md                   |  2 +-
 kvui.py                                       |  5 +---
 setup.py                                      |  2 +-
 worlds/AutoSNIClient.py                       |  4 +--
 worlds/__init__.py                            | 19 ++++--------
 worlds/hk/Extractor.py                        |  6 +---
 worlds/hk/requirements.txt                    |  1 -
 worlds/messenger/__init__.py                  | 30 +++++++++----------
 worlds/messenger/client_setup.py              |  5 ++--
 worlds/messenger/connections.py               |  8 ++---
 worlds/messenger/constants.py                 | 18 +++++------
 worlds/messenger/options.py                   |  3 +-
 worlds/messenger/portals.py                   | 12 ++++----
 worlds/messenger/regions.py                   | 13 ++++----
 worlds/messenger/rules.py                     |  8 ++---
 worlds/messenger/shop.py                      | 18 +++++------
 worlds/messenger/subclasses.py                | 10 +++----
 worlds/messenger/test/test_shop.py            |  2 +-
 worlds/stardew_valley/content/unpacking.py    |  6 +---
 worlds/stardew_valley/data/artisan.py         |  4 +--
 worlds/stardew_valley/data/game_item.py       | 18 +++--------
 worlds/stardew_valley/data/harvest.py         | 17 +++++------
 worlds/stardew_valley/data/shop.py            | 13 ++++----
 worlds/stardew_valley/data/skill.py           |  4 +--
 worlds/stardew_valley/items.py                |  5 +---
 worlds/stardew_valley/locations.py            |  5 +---
 worlds/stardew_valley/requirements.txt        |  2 --
 .../test/stability/TestStability.py           |  2 --
 worlds/zillion/options.py                     |  3 +-
 39 files changed, 113 insertions(+), 173 deletions(-)
 delete mode 100644 worlds/hk/requirements.txt
 delete mode 100644 worlds/stardew_valley/requirements.txt

diff --git a/.github/pyright-config.json b/.github/pyright-config.json
index 6ad7fa5f19b5..7d981778905f 100644
--- a/.github/pyright-config.json
+++ b/.github/pyright-config.json
@@ -16,7 +16,7 @@
   "reportMissingImports": true,
   "reportMissingTypeStubs": true,
 
-  "pythonVersion": "3.8",
+  "pythonVersion": "3.10",
   "pythonPlatform": "Windows",
 
   "executionEnvironments": [
diff --git a/.github/workflows/analyze-modified-files.yml b/.github/workflows/analyze-modified-files.yml
index c9995fa2d043..b59336fafe9b 100644
--- a/.github/workflows/analyze-modified-files.yml
+++ b/.github/workflows/analyze-modified-files.yml
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/setup-python@v5
         if: env.diff != ''
         with:
-          python-version: 3.8
+          python-version: '3.10'
 
       - name: "Install dependencies"
         if: env.diff != ''
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 23c463fb947a..c013172ea034 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,14 +24,14 @@ env:
 jobs:
   # build-release-macos: # LF volunteer
 
-  build-win-py38: # RCs will still be built and signed by hand
+  build-win-py310: # RCs will still be built and signed by hand
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
       - name: Install python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.8'
+          python-version: '3.10'
       - name: Download run-time dependencies
         run: |
           Invoke-WebRequest -Uri https://github.com/Ijwu/Enemizer/releases/download/${Env:ENEMIZER_VERSION}/win-x64.zip -OutFile enemizer.zip
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index a38fef8fda08..88b5d12987ad 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -33,13 +33,11 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         python:
-          - {version: '3.8'}
-          - {version: '3.9'}
           - {version: '3.10'}
           - {version: '3.11'}
           - {version: '3.12'}
         include:
-          - python: {version: '3.8'}  # win7 compat
+          - python: {version: '3.10'}  # old compat
             os: windows-latest
           - python: {version: '3.12'}  # current
             os: windows-latest
diff --git a/BaseClasses.py b/BaseClasses.py
index 46edeb5ea059..2e4efd606df9 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1,18 +1,16 @@
 from __future__ import annotations
 
 import collections
-import itertools
 import functools
 import logging
 import random
 import secrets
-import typing  # this can go away when Python 3.8 support is dropped
 from argparse import Namespace
 from collections import Counter, deque
 from collections.abc import Collection, MutableSequence
 from enum import IntEnum, IntFlag
 from typing import (AbstractSet, Any, Callable, ClassVar, Dict, Iterable, Iterator, List, Mapping, NamedTuple,
-                    Optional, Protocol, Set, Tuple, Union, Type)
+                    Optional, Protocol, Set, Tuple, Union, TYPE_CHECKING)
 
 from typing_extensions import NotRequired, TypedDict
 
@@ -20,7 +18,7 @@
 import Options
 import Utils
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from worlds import AutoWorld
 
 
@@ -231,7 +229,7 @@ def set_options(self, args: Namespace) -> None:
         for player in self.player_ids:
             world_type = AutoWorld.AutoWorldRegister.world_types[self.game[player]]
             self.worlds[player] = world_type(self, player)
-            options_dataclass: typing.Type[Options.PerGameCommonOptions] = world_type.options_dataclass
+            options_dataclass: type[Options.PerGameCommonOptions] = world_type.options_dataclass
             self.worlds[player].options = options_dataclass(**{option_key: getattr(args, option_key)[player]
                                                                for option_key in options_dataclass.type_hints})
 
@@ -975,7 +973,7 @@ class Region:
     entrances: List[Entrance]
     exits: List[Entrance]
     locations: List[Location]
-    entrance_type: ClassVar[Type[Entrance]] = Entrance
+    entrance_type: ClassVar[type[Entrance]] = Entrance
 
     class Register(MutableSequence):
         region_manager: MultiWorld.RegionManager
@@ -1075,7 +1073,7 @@ def get_connecting_entrance(self, is_main_entrance: Callable[[Entrance], bool])
             return entrance.parent_region.get_connecting_entrance(is_main_entrance)
 
     def add_locations(self, locations: Dict[str, Optional[int]],
-                      location_type: Optional[Type[Location]] = None) -> None:
+                      location_type: Optional[type[Location]] = None) -> None:
         """
         Adds locations to the Region object, where location_type is your Location class and locations is a dict of
         location names to address.
diff --git a/ModuleUpdate.py b/ModuleUpdate.py
index f49182bb7863..dada16cefcaf 100644
--- a/ModuleUpdate.py
+++ b/ModuleUpdate.py
@@ -5,8 +5,8 @@
 import warnings
 
 
-if sys.version_info < (3, 8, 6):
-    raise RuntimeError("Incompatible Python Version. 3.8.7+ is supported.")
+if sys.version_info < (3, 10, 11):
+    raise RuntimeError(f"Incompatible Python Version found: {sys.version_info}. 3.10.11+ is supported.")
 
 # don't run update if environment is frozen/compiled or if not the parent process (skip in subprocess)
 _skip_update = bool(getattr(sys, "frozen", False) or multiprocessing.parent_process())
diff --git a/Utils.py b/Utils.py
index 2dfcd9d3e19a..535933d815b1 100644
--- a/Utils.py
+++ b/Utils.py
@@ -19,8 +19,7 @@
 from argparse import Namespace
 from settings import Settings, get_settings
 from time import sleep
-from typing import BinaryIO, Coroutine, Optional, Set, Dict, Any, Union
-from typing_extensions import TypeGuard
+from typing import BinaryIO, Coroutine, Optional, Set, Dict, Any, Union, TypeGuard
 from yaml import load, load_all, dump
 
 try:
@@ -48,7 +47,7 @@ def as_simple_string(self) -> str:
         return ".".join(str(item) for item in self)
 
 
-__version__ = "0.5.1"
+__version__ = "0.6.0"
 version_tuple = tuplize_version(__version__)
 
 is_linux = sys.platform.startswith("linux")
diff --git a/WebHost.py b/WebHost.py
index 3bf75eb35ae0..3790a5f6f4d2 100644
--- a/WebHost.py
+++ b/WebHost.py
@@ -17,7 +17,7 @@
 if typing.TYPE_CHECKING:
     from flask import Flask
 
-Utils.local_path.cached_path = os.path.dirname(__file__) or "."  # py3.8 is not abs. remove "." when dropping 3.8
+Utils.local_path.cached_path = os.path.dirname(__file__)
 settings.no_gui = True
 configpath = os.path.abspath("config.yaml")
 if not os.path.exists(configpath):  # fall back to config.yaml in home
diff --git a/WebHostLib/requirements.txt b/WebHostLib/requirements.txt
index 5c79415312d4..b7b14dea1e6f 100644
--- a/WebHostLib/requirements.txt
+++ b/WebHostLib/requirements.txt
@@ -5,9 +5,7 @@ waitress>=3.0.0
 Flask-Caching>=2.3.0
 Flask-Compress>=1.15
 Flask-Limiter>=3.8.0
-bokeh>=3.1.1; python_version <= '3.8'
-bokeh>=3.4.3; python_version == '3.9'
-bokeh>=3.5.2; python_version >= '3.10'
+bokeh>=3.5.2
 markupsafe>=2.1.5
 Markdown>=3.7
 mdx-breakless-lists>=1.0.1
diff --git a/docs/contributing.md b/docs/contributing.md
index 9fd21408eb7b..96fc316be82c 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -16,7 +16,7 @@ game contributions:
 * **Do not introduce unit test failures/regressions.**
   Archipelago supports multiple versions of Python. You may need to download older Python versions to fully test
   your changes. Currently, the oldest supported version
-  is [Python 3.8](https://www.python.org/downloads/release/python-380/).
+  is [Python 3.10](https://www.python.org/downloads/release/python-31015/).
   It is recommended that automated github actions are turned on in your fork to have github run unit tests after
   pushing.
   You can turn them on here:  
diff --git a/docs/running from source.md b/docs/running from source.md
index ef1594da9588..66dd1925c897 100644
--- a/docs/running from source.md	
+++ b/docs/running from source.md	
@@ -7,7 +7,7 @@ use that version. These steps are for developers or platforms without compiled r
 ## General
 
 What you'll need:
- * [Python 3.8.7 or newer](https://www.python.org/downloads/), not the Windows Store version
+ * [Python 3.10.15 or newer](https://www.python.org/downloads/), not the Windows Store version
    * 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
diff --git a/kvui.py b/kvui.py
index 74d8ad06734a..2723654214c1 100644
--- a/kvui.py
+++ b/kvui.py
@@ -12,10 +12,7 @@
 
     # kivy 2.2.0 introduced DPI awareness on Windows, but it makes the UI enter an infinitely recursive re-layout
     # by setting the application to not DPI Aware, Windows handles scaling the entire window on its own, ignoring kivy's
-    try:
-        ctypes.windll.shcore.SetProcessDpiAwareness(0)
-    except FileNotFoundError:  # shcore may not be found on <= Windows 7
-        pass  # TODO: remove silent except when Python 3.8 is phased out.
+    ctypes.windll.shcore.SetProcessDpiAwareness(0)
 
 os.environ["KIVY_NO_CONSOLELOG"] = "1"
 os.environ["KIVY_NO_FILELOG"] = "1"
diff --git a/setup.py b/setup.py
index afbe17726df4..f075551d58b0 100644
--- a/setup.py
+++ b/setup.py
@@ -634,7 +634,7 @@ def find_lib(lib: str, arch: str, libc: str) -> Optional[str]:
             "excludes": ["numpy", "Cython", "PySide2", "PIL",
                          "pandas", "zstandard"],
             "zip_include_packages": ["*"],
-            "zip_exclude_packages": ["worlds", "sc2", "orjson"],  # TODO: remove orjson here once we drop py3.8 support
+            "zip_exclude_packages": ["worlds", "sc2"],
             "include_files": [],  # broken in cx 6.14.0, we use more special sauce now
             "include_msvcr": False,
             "replace_paths": ["*."],
diff --git a/worlds/AutoSNIClient.py b/worlds/AutoSNIClient.py
index b3f40be2958d..f9444eee73c6 100644
--- a/worlds/AutoSNIClient.py
+++ b/worlds/AutoSNIClient.py
@@ -2,9 +2,7 @@
 from __future__ import annotations
 import abc
 import logging
-from typing import TYPE_CHECKING, ClassVar, Dict, Iterable, Tuple, Any, Optional, Union
-
-from typing_extensions import TypeGuard
+from typing import TYPE_CHECKING, ClassVar, Dict, Iterable, Tuple, Any, Optional, Union, TypeGuard
 
 from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components
 
diff --git a/worlds/__init__.py b/worlds/__init__.py
index c277ac9ca1de..7db651bdd9e3 100644
--- a/worlds/__init__.py
+++ b/worlds/__init__.py
@@ -66,19 +66,12 @@ def load(self) -> bool:
             start = time.perf_counter()
             if self.is_zip:
                 importer = zipimport.zipimporter(self.resolved_path)
-                if hasattr(importer, "find_spec"):  # new in Python 3.10
-                    spec = importer.find_spec(os.path.basename(self.path).rsplit(".", 1)[0])
-                    assert spec, f"{self.path} is not a loadable module"
-                    mod = importlib.util.module_from_spec(spec)
-                else:  # TODO: remove with 3.8 support
-                    mod = importer.load_module(os.path.basename(self.path).rsplit(".", 1)[0])
-
-                if mod.__package__ is not None:
-                    mod.__package__ = f"worlds.{mod.__package__}"
-                else:
-                    # load_module does not populate package, we'll have to assume mod.__name__ is correct here
-                    # probably safe to remove with 3.8 support
-                    mod.__package__ = f"worlds.{mod.__name__}"
+                spec = importer.find_spec(os.path.basename(self.path).rsplit(".", 1)[0])
+                assert spec, f"{self.path} is not a loadable module"
+                mod = importlib.util.module_from_spec(spec)
+
+                mod.__package__ = f"worlds.{mod.__package__}"
+
                 mod.__name__ = f"worlds.{mod.__name__}"
                 sys.modules[mod.__name__] = mod
                 with warnings.catch_warnings():
diff --git a/worlds/hk/Extractor.py b/worlds/hk/Extractor.py
index 61fabc4da0d9..866608489ec2 100644
--- a/worlds/hk/Extractor.py
+++ b/worlds/hk/Extractor.py
@@ -9,11 +9,7 @@
 
 import jinja2
 
-try:
-    from ast import unparse
-except ImportError:
-    # Py 3.8 and earlier compatibility module
-    from astunparse import unparse
+from ast import unparse
 
 from Utils import get_text_between
 
diff --git a/worlds/hk/requirements.txt b/worlds/hk/requirements.txt
deleted file mode 100644
index 1b410ffb2aed..000000000000
--- a/worlds/hk/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-astunparse>=1.6.3; python_version <= '3.8'
\ No newline at end of file
diff --git a/worlds/messenger/__init__.py b/worlds/messenger/__init__.py
index 9a38953ffbdf..59e724d3fb7f 100644
--- a/worlds/messenger/__init__.py
+++ b/worlds/messenger/__init__.py
@@ -1,5 +1,5 @@
 import logging
-from typing import Any, ClassVar, Dict, List, Optional, Set, TextIO
+from typing import Any, ClassVar, TextIO
 
 from BaseClasses import CollectionState, Entrance, Item, ItemClassification, MultiWorld, Tutorial
 from Options import Accessibility
@@ -120,16 +120,16 @@ class MessengerWorld(World):
     required_seals: int = 0
     created_seals: int = 0
     total_shards: int = 0
-    shop_prices: Dict[str, int]
-    figurine_prices: Dict[str, int]
-    _filler_items: List[str]
-    starting_portals: List[str]
-    plando_portals: List[str]
-    spoiler_portal_mapping: Dict[str, str]
-    portal_mapping: List[int]
-    transitions: List[Entrance]
+    shop_prices: dict[str, int]
+    figurine_prices: dict[str, int]
+    _filler_items: list[str]
+    starting_portals: list[str]
+    plando_portals: list[str]
+    spoiler_portal_mapping: dict[str, str]
+    portal_mapping: list[int]
+    transitions: list[Entrance]
     reachable_locs: int = 0
-    filler: Dict[str, int]
+    filler: dict[str, int]
 
     def generate_early(self) -> None:
         if self.options.goal == Goal.option_power_seal_hunt:
@@ -178,7 +178,7 @@ def create_regions(self) -> None:
                            for reg_name in sub_region]
 
         for region in complex_regions:
-            region_name = region.name.replace(f"{region.parent} - ", "")
+            region_name = region.name.removeprefix(f"{region.parent} - ")
             connection_data = CONNECTIONS[region.parent][region_name]
             for exit_region in connection_data:
                 region.connect(self.multiworld.get_region(exit_region, self.player))
@@ -191,7 +191,7 @@ def create_items(self) -> None:
         # create items that are always in the item pool
         main_movement_items = ["Rope Dart", "Wingsuit"]
         precollected_names = [item.name for item in self.multiworld.precollected_items[self.player]]
-        itempool: List[MessengerItem] = [
+        itempool: list[MessengerItem] = [
             self.create_item(item)
             for item in self.item_name_to_id
             if item not in {
@@ -290,7 +290,7 @@ def write_spoiler_header(self, spoiler_handle: TextIO) -> None:
             for portal, output in portal_info:
                 spoiler.set_entrance(f"{portal} Portal", output, "I can write anything I want here lmao", self.player)
 
-    def fill_slot_data(self) -> Dict[str, Any]:
+    def fill_slot_data(self) -> dict[str, Any]:
         slot_data = {
             "shop": {SHOP_ITEMS[item].internal_name: price for item, price in self.shop_prices.items()},
             "figures": {FIGURINES[item].internal_name: price for item, price in self.figurine_prices.items()},
@@ -316,7 +316,7 @@ def get_filler_item_name(self) -> str:
         return self._filler_items.pop(0)
 
     def create_item(self, name: str) -> MessengerItem:
-        item_id: Optional[int] = self.item_name_to_id.get(name, None)
+        item_id: int | None = self.item_name_to_id.get(name, None)
         return MessengerItem(
             name,
             ItemClassification.progression if item_id is None else self.get_item_classification(name),
@@ -351,7 +351,7 @@ def get_item_classification(self, name: str) -> ItemClassification:
         return ItemClassification.filler
 
     @classmethod
-    def create_group(cls, multiworld: "MultiWorld", new_player_id: int, players: Set[int]) -> World:
+    def create_group(cls, multiworld: "MultiWorld", new_player_id: int, players: set[int]) -> World:
         group = super().create_group(multiworld, new_player_id, players)
         assert isinstance(group, MessengerWorld)
         
diff --git a/worlds/messenger/client_setup.py b/worlds/messenger/client_setup.py
index 77a0f634326c..6b98a1b44013 100644
--- a/worlds/messenger/client_setup.py
+++ b/worlds/messenger/client_setup.py
@@ -5,7 +5,7 @@
 import subprocess
 import urllib.request
 from shutil import which
-from typing import Any, Optional
+from typing import Any
 from zipfile import ZipFile
 from Utils import open_file
 
@@ -17,7 +17,7 @@
 MOD_URL = "https://api.github.com/repos/alwaysintreble/TheMessengerRandomizerModAP/releases/latest"
 
 
-def ask_yes_no_cancel(title: str, text: str) -> Optional[bool]:
+def ask_yes_no_cancel(title: str, text: str) -> bool | None:
     """
     Wrapper for tkinter.messagebox.askyesnocancel, that creates a popup dialog box with yes, no, and cancel buttons.
 
@@ -33,7 +33,6 @@ def ask_yes_no_cancel(title: str, text: str) -> Optional[bool]:
     return ret
 
 
-
 def launch_game(*args) -> None:
     """Check the game installation, then launch it"""
     def courier_installed() -> bool:
diff --git a/worlds/messenger/connections.py b/worlds/messenger/connections.py
index 69dd7aa7f286..79912a5688c2 100644
--- a/worlds/messenger/connections.py
+++ b/worlds/messenger/connections.py
@@ -1,6 +1,4 @@
-from typing import Dict, List
-
-CONNECTIONS: Dict[str, Dict[str, List[str]]] = {
+CONNECTIONS: dict[str, dict[str, list[str]]] = {
     "Ninja Village": {
         "Right": [
             "Autumn Hills - Left",
@@ -640,7 +638,7 @@
     },
 }
 
-RANDOMIZED_CONNECTIONS: Dict[str, str] = {
+RANDOMIZED_CONNECTIONS: dict[str, str] = {
     "Ninja Village - Right": "Autumn Hills - Left",
     "Autumn Hills - Left": "Ninja Village - Right",
     "Autumn Hills - Right": "Forlorn Temple - Left",
@@ -680,7 +678,7 @@
     "Sunken Shrine - Left": "Howling Grotto - Bottom",
 }
 
-TRANSITIONS: List[str] = [
+TRANSITIONS: list[str] = [
     "Ninja Village - Right",
     "Autumn Hills - Left",
     "Autumn Hills - Right",
diff --git a/worlds/messenger/constants.py b/worlds/messenger/constants.py
index ea15c71068db..47b5a1a85cff 100644
--- a/worlds/messenger/constants.py
+++ b/worlds/messenger/constants.py
@@ -2,7 +2,7 @@
 
 # items
 # listing individual groups first for easy lookup
-NOTES = [
+NOTES: list[str] = [
     "Key of Hope",
     "Key of Chaos",
     "Key of Courage",
@@ -11,7 +11,7 @@
     "Key of Symbiosis",
 ]
 
-PROG_ITEMS = [
+PROG_ITEMS: list[str] = [
     "Wingsuit",
     "Rope Dart",
     "Lightfoot Tabi",
@@ -28,18 +28,18 @@
     "Seashell",
 ]
 
-PHOBEKINS = [
+PHOBEKINS: list[str] = [
     "Necro",
     "Pyro",
     "Claustro",
     "Acro",
 ]
 
-USEFUL_ITEMS = [
+USEFUL_ITEMS: list[str] = [
     "Windmill Shuriken",
 ]
 
-FILLER = {
+FILLER: dict[str, int] = {
     "Time Shard": 5,
     "Time Shard (10)": 10,
     "Time Shard (50)": 20,
@@ -48,13 +48,13 @@
     "Time Shard (500)": 5,
 }
 
-TRAPS = {
+TRAPS: dict[str, int] = {
     "Teleport Trap": 5,
     "Prophecy Trap": 10,
 }
 
 # item_name_to_id needs to be deterministic and match upstream
-ALL_ITEMS = [
+ALL_ITEMS: list[str] = [
     *NOTES,
     "Windmill Shuriken",
     "Wingsuit",
@@ -83,7 +83,7 @@
 # locations
 # the names of these don't actually matter, but using the upstream's names for now
 # order must be exactly the same as upstream
-ALWAYS_LOCATIONS = [
+ALWAYS_LOCATIONS: list[str] = [
     # notes
     "Sunken Shrine - Key of Love",
     "Corrupted Future - Key of Courage",
@@ -160,7 +160,7 @@
     "Elemental Skylands Seal - Fire",
 ]
 
-BOSS_LOCATIONS = [
+BOSS_LOCATIONS: list[str] = [
     "Autumn Hills - Leaf Golem",
     "Catacombs - Ruxxtin",
     "Howling Grotto - Emerald Golem",
diff --git a/worlds/messenger/options.py b/worlds/messenger/options.py
index 59e694cd3963..8b61a9435422 100644
--- a/worlds/messenger/options.py
+++ b/worlds/messenger/options.py
@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Dict
 
 from schema import And, Optional, Or, Schema
 
@@ -167,7 +166,7 @@ class ShopPrices(Range):
     default = 100
 
 
-def planned_price(location: str) -> Dict[Optional, Or]:
+def planned_price(location: str) -> dict[Optional, Or]:
     return {
         Optional(location): Or(
             And(int, lambda n: n >= 0),
diff --git a/worlds/messenger/portals.py b/worlds/messenger/portals.py
index 17152a1a1538..896fefa686f1 100644
--- a/worlds/messenger/portals.py
+++ b/worlds/messenger/portals.py
@@ -1,5 +1,5 @@
 from copy import deepcopy
-from typing import List, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from BaseClasses import CollectionState, PlandoOptions
 from Options import PlandoConnection
@@ -8,7 +8,7 @@
     from . import MessengerWorld
 
 
-PORTALS = [
+PORTALS: list[str] = [
     "Autumn Hills",
     "Riviere Turquoise",
     "Howling Grotto",
@@ -18,7 +18,7 @@
 ]
 
 
-SHOP_POINTS = {
+SHOP_POINTS: dict[str, list[str]] = {
     "Autumn Hills": [
         "Climbing Claws",
         "Hope Path",
@@ -113,7 +113,7 @@
 }
 
 
-CHECKPOINTS = {
+CHECKPOINTS: dict[str, list[str]] = {
     "Autumn Hills": [
         "Hope Latch",
         "Key of Hope",
@@ -186,7 +186,7 @@
 }
 
 
-REGION_ORDER = [
+REGION_ORDER: list[str] = [
     "Autumn Hills",
     "Forlorn Temple",
     "Catacombs",
@@ -228,7 +228,7 @@ def create_mapping(in_portal: str, warp: str) -> str:
 
         return parent
 
-    def handle_planned_portals(plando_connections: List[PlandoConnection]) -> None:
+    def handle_planned_portals(plando_connections: list[PlandoConnection]) -> None:
         """checks the provided plando connections for portals and connects them"""
         nonlocal available_portals
 
diff --git a/worlds/messenger/regions.py b/worlds/messenger/regions.py
index 153f8510f1bd..d53b84fe3401 100644
--- a/worlds/messenger/regions.py
+++ b/worlds/messenger/regions.py
@@ -1,7 +1,4 @@
-from typing import Dict, List
-
-
-LOCATIONS: Dict[str, List[str]] = {
+LOCATIONS: dict[str, list[str]] = {
     "Ninja Village - Nest": [
         "Ninja Village - Candle",
         "Ninja Village - Astral Seed",
@@ -201,7 +198,7 @@
 }
 
 
-SUB_REGIONS: Dict[str, List[str]] = {
+SUB_REGIONS: dict[str, list[str]] = {
     "Ninja Village": [
         "Right",
     ],
@@ -385,7 +382,7 @@
 
 
 # order is slightly funky here for back compat
-MEGA_SHARDS: Dict[str, List[str]] = {
+MEGA_SHARDS: dict[str, list[str]] = {
     "Autumn Hills - Lakeside Checkpoint": ["Autumn Hills Mega Shard"],
     "Forlorn Temple - Outside Shop": ["Hidden Entrance Mega Shard"],
     "Catacombs - Top Left": ["Catacombs Mega Shard"],
@@ -414,7 +411,7 @@
 }
 
 
-REGION_CONNECTIONS: Dict[str, Dict[str, str]] = {
+REGION_CONNECTIONS: dict[str, dict[str, str]] = {
     "Menu": {"Tower HQ": "Start Game"},
     "Tower HQ": {
         "Autumn Hills - Portal": "ToTHQ Autumn Hills Portal",
@@ -436,7 +433,7 @@
 
 
 # regions that don't have sub-regions
-LEVELS: List[str] = [
+LEVELS: list[str] = [
     "Menu",
     "Tower HQ",
     "The Shop",
diff --git a/worlds/messenger/rules.py b/worlds/messenger/rules.py
index c354ad70aba6..f09025c7edce 100644
--- a/worlds/messenger/rules.py
+++ b/worlds/messenger/rules.py
@@ -1,4 +1,4 @@
-from typing import Dict, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from BaseClasses import CollectionState
 from worlds.generic.Rules import CollectionRule, add_rule, allow_self_locking_items
@@ -12,9 +12,9 @@
 class MessengerRules:
     player: int
     world: "MessengerWorld"
-    connection_rules: Dict[str, CollectionRule]
-    region_rules: Dict[str, CollectionRule]
-    location_rules: Dict[str, CollectionRule]
+    connection_rules: dict[str, CollectionRule]
+    region_rules: dict[str, CollectionRule]
+    location_rules: dict[str, CollectionRule]
     maximum_price: int
     required_seals: int
 
diff --git a/worlds/messenger/shop.py b/worlds/messenger/shop.py
index 3c8c7bf6f21e..6ab72f9765f3 100644
--- a/worlds/messenger/shop.py
+++ b/worlds/messenger/shop.py
@@ -1,11 +1,11 @@
-from typing import Dict, List, NamedTuple, Optional, Set, TYPE_CHECKING, Tuple, Union
+from typing import NamedTuple, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from . import MessengerWorld
 else:
     MessengerWorld = object
 
-PROG_SHOP_ITEMS: List[str] = [
+PROG_SHOP_ITEMS: list[str] = [
     "Path of Resilience",
     "Meditation",
     "Strike of the Ninja",
@@ -14,7 +14,7 @@
     "Aerobatics Warrior",
 ]
 
-USEFUL_SHOP_ITEMS: List[str] = [
+USEFUL_SHOP_ITEMS: list[str] = [
     "Karuta Plates",
     "Serendipitous Bodies",
     "Kusari Jacket",
@@ -29,10 +29,10 @@ class ShopData(NamedTuple):
     internal_name: str
     min_price: int
     max_price: int
-    prerequisite: Optional[Union[str, Set[str]]] = None
+    prerequisite: str | set[str] | None = None
 
 
-SHOP_ITEMS: Dict[str, ShopData] = {
+SHOP_ITEMS: dict[str, ShopData] = {
     "Karuta Plates":        ShopData("HP_UPGRADE_1", 20, 200),
     "Serendipitous Bodies": ShopData("ENEMY_DROP_HP", 20, 300, "The Shop - Karuta Plates"),
     "Path of Resilience":   ShopData("DAMAGE_REDUCTION", 100, 500, "The Shop - Serendipitous Bodies"),
@@ -56,7 +56,7 @@ class ShopData(NamedTuple):
     "Focused Power Sense":  ShopData("POWER_SEAL_WORLD_MAP", 300, 600, "The Shop - Power Sense"),
 }
 
-FIGURINES: Dict[str, ShopData] = {
+FIGURINES: dict[str, ShopData] = {
     "Green Kappa Figurine":         ShopData("GREEN_KAPPA", 100, 500),
     "Blue Kappa Figurine":          ShopData("BLUE_KAPPA", 100, 500),
     "Ountarde Figurine":            ShopData("OUNTARDE", 100, 500),
@@ -73,12 +73,12 @@ class ShopData(NamedTuple):
 }
 
 
-def shuffle_shop_prices(world: MessengerWorld) -> Tuple[Dict[str, int], Dict[str, int]]:
+def shuffle_shop_prices(world: MessengerWorld) -> tuple[dict[str, int], dict[str, int]]:
     shop_price_mod = world.options.shop_price.value
     shop_price_planned = world.options.shop_price_plan
 
-    shop_prices: Dict[str, int] = {}
-    figurine_prices: Dict[str, int] = {}
+    shop_prices: dict[str, int] = {}
+    figurine_prices: dict[str, int] = {}
     for item, price in shop_price_planned.value.items():
         if not isinstance(price, int):
             price = world.random.choices(list(price.keys()), weights=list(price.values()))[0]
diff --git a/worlds/messenger/subclasses.py b/worlds/messenger/subclasses.py
index b60aeb179feb..29e3ea8953ec 100644
--- a/worlds/messenger/subclasses.py
+++ b/worlds/messenger/subclasses.py
@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from BaseClasses import CollectionState, Entrance, Item, ItemClassification, Location, Region
 from .regions import LOCATIONS, MEGA_SHARDS
@@ -10,14 +10,14 @@
 
 
 class MessengerEntrance(Entrance):
-    world: Optional["MessengerWorld"] = None
+    world: "MessengerWorld | None" = None
 
 
 class MessengerRegion(Region):
     parent: str
     entrance_type = MessengerEntrance
 
-    def __init__(self, name: str, world: "MessengerWorld", parent: Optional[str] = None) -> None:
+    def __init__(self, name: str, world: "MessengerWorld", parent: str | None = None) -> None:
         super().__init__(name, world.player, world.multiworld)
         self.parent = parent
         locations = []
@@ -48,7 +48,7 @@ def __init__(self, name: str, world: "MessengerWorld", parent: Optional[str] = N
 class MessengerLocation(Location):
     game = "The Messenger"
 
-    def __init__(self, player: int, name: str, loc_id: Optional[int], parent: MessengerRegion) -> None:
+    def __init__(self, player: int, name: str, loc_id: int | None, parent: MessengerRegion) -> None:
         super().__init__(player, name, loc_id, parent)
         if loc_id is None:
             if name == "Rescue Phantom":
@@ -59,7 +59,7 @@ def __init__(self, player: int, name: str, loc_id: Optional[int], parent: Messen
 class MessengerShopLocation(MessengerLocation):
     @cached_property
     def cost(self) -> int:
-        name = self.name.replace("The Shop - ", "")  # TODO use `remove_prefix` when 3.8 finally gets dropped
+        name = self.name.removeprefix("The Shop - ")
         world = self.parent_region.multiworld.worlds[self.player]
         shop_data = SHOP_ITEMS[name]
         if shop_data.prerequisite:
diff --git a/worlds/messenger/test/test_shop.py b/worlds/messenger/test/test_shop.py
index ce6fd19e33c8..21a0c352bff4 100644
--- a/worlds/messenger/test/test_shop.py
+++ b/worlds/messenger/test/test_shop.py
@@ -77,7 +77,7 @@ def test_costs(self) -> None:
 
                 loc = f"The Shop - {loc}"
                 self.assertLessEqual(price, self.multiworld.get_location(loc, self.player).cost)
-                self.assertTrue(loc.replace("The Shop - ", "") in SHOP_ITEMS)
+                self.assertTrue(loc.removeprefix("The Shop - ") in SHOP_ITEMS)
         self.assertEqual(len(prices), len(SHOP_ITEMS))
 
         figures = self.world.figurine_prices
diff --git a/worlds/stardew_valley/content/unpacking.py b/worlds/stardew_valley/content/unpacking.py
index f069866d56cd..3c57f91afe3a 100644
--- a/worlds/stardew_valley/content/unpacking.py
+++ b/worlds/stardew_valley/content/unpacking.py
@@ -1,16 +1,12 @@
 from __future__ import annotations
 
+from graphlib import TopologicalSorter
 from typing import Iterable, Mapping, Callable
 
 from .game_content import StardewContent, ContentPack, StardewFeatures
 from .vanilla.base import base_game as base_game_content_pack
 from ..data.game_item import GameItem, ItemSource
 
-try:
-    from graphlib import TopologicalSorter
-except ImportError:
-    from graphlib_backport import TopologicalSorter  # noqa
-
 
 def unpack_content(features: StardewFeatures, packs: Iterable[ContentPack]) -> StardewContent:
     # Base game is always registered first.
diff --git a/worlds/stardew_valley/data/artisan.py b/worlds/stardew_valley/data/artisan.py
index 593ab6a3ddf0..90be5b1684f0 100644
--- a/worlds/stardew_valley/data/artisan.py
+++ b/worlds/stardew_valley/data/artisan.py
@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 
-from .game_item import kw_only, ItemSource
+from .game_item import ItemSource
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class MachineSource(ItemSource):
     item: str  # this should be optional (worm bin)
     machine: str
diff --git a/worlds/stardew_valley/data/game_item.py b/worlds/stardew_valley/data/game_item.py
index 6c8d30ed8e6f..c6e4717cd1e0 100644
--- a/worlds/stardew_valley/data/game_item.py
+++ b/worlds/stardew_valley/data/game_item.py
@@ -1,5 +1,4 @@
 import enum
-import sys
 from abc import ABC
 from dataclasses import dataclass, field
 from types import MappingProxyType
@@ -7,11 +6,6 @@
 
 from ..stardew_rule.protocol import StardewRule
 
-if sys.version_info >= (3, 10):
-    kw_only = {"kw_only": True}
-else:
-    kw_only = {}
-
 DEFAULT_REQUIREMENT_TAGS = MappingProxyType({})
 
 
@@ -36,21 +30,17 @@ class ItemTag(enum.Enum):
 class ItemSource(ABC):
     add_tags: ClassVar[Tuple[ItemTag]] = ()
 
+    other_requirements: Tuple[Requirement, ...] = field(kw_only=True, default_factory=tuple)
+
     @property
     def requirement_tags(self) -> Mapping[str, Tuple[ItemTag, ...]]:
         return DEFAULT_REQUIREMENT_TAGS
 
-    # FIXME this should just be an optional field, but kw_only requires python 3.10...
-    @property
-    def other_requirements(self) -> Iterable[Requirement]:
-        return ()
-
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class GenericSource(ItemSource):
     regions: Tuple[str, ...] = ()
     """No region means it's available everywhere."""
-    other_requirements: Tuple[Requirement, ...] = ()
 
 
 @dataclass(frozen=True)
@@ -59,7 +49,7 @@ class CustomRuleSource(ItemSource):
     create_rule: Callable[[Any], StardewRule]
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class CompoundSource(ItemSource):
     sources: Tuple[ItemSource, ...] = ()
 
diff --git a/worlds/stardew_valley/data/harvest.py b/worlds/stardew_valley/data/harvest.py
index 087d7c3fa86b..0fdae9549587 100644
--- a/worlds/stardew_valley/data/harvest.py
+++ b/worlds/stardew_valley/data/harvest.py
@@ -1,18 +1,17 @@
 from dataclasses import dataclass
 from typing import Tuple, Sequence, Mapping
 
-from .game_item import ItemSource, kw_only, ItemTag, Requirement
+from .game_item import ItemSource, ItemTag
 from ..strings.season_names import Season
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class ForagingSource(ItemSource):
     regions: Tuple[str, ...]
     seasons: Tuple[str, ...] = Season.all
-    other_requirements: Tuple[Requirement, ...] = ()
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class SeasonalForagingSource(ItemSource):
     season: str
     days: Sequence[int]
@@ -22,17 +21,17 @@ def as_foraging_source(self) -> ForagingSource:
         return ForagingSource(seasons=(self.season,), regions=self.regions)
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class FruitBatsSource(ItemSource):
     ...
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class MushroomCaveSource(ItemSource):
     ...
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class HarvestFruitTreeSource(ItemSource):
     add_tags = (ItemTag.CROPSANITY,)
 
@@ -46,7 +45,7 @@ def requirement_tags(self) -> Mapping[str, Tuple[ItemTag, ...]]:
         }
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class HarvestCropSource(ItemSource):
     add_tags = (ItemTag.CROPSANITY,)
 
@@ -61,6 +60,6 @@ def requirement_tags(self) -> Mapping[str, Tuple[ItemTag, ...]]:
         }
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class ArtifactSpotSource(ItemSource):
     amount: int
diff --git a/worlds/stardew_valley/data/shop.py b/worlds/stardew_valley/data/shop.py
index f14dbac82131..cc9506023f19 100644
--- a/worlds/stardew_valley/data/shop.py
+++ b/worlds/stardew_valley/data/shop.py
@@ -1,40 +1,39 @@
 from dataclasses import dataclass
 from typing import Tuple, Optional
 
-from .game_item import ItemSource, kw_only, Requirement
+from .game_item import ItemSource
 from ..strings.season_names import Season
 
 ItemPrice = Tuple[int, str]
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class ShopSource(ItemSource):
     shop_region: str
     money_price: Optional[int] = None
     items_price: Optional[Tuple[ItemPrice, ...]] = None
     seasons: Tuple[str, ...] = Season.all
-    other_requirements: Tuple[Requirement, ...] = ()
 
     def __post_init__(self):
         assert self.money_price is not None or self.items_price is not None, "At least money price or items price need to be defined."
         assert self.items_price is None or all(isinstance(p, tuple) for p in self.items_price), "Items price should be a tuple."
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class MysteryBoxSource(ItemSource):
     amount: int
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class ArtifactTroveSource(ItemSource):
     amount: int
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class PrizeMachineSource(ItemSource):
     amount: int
 
 
-@dataclass(frozen=True, **kw_only)
+@dataclass(frozen=True, kw_only=True)
 class FishingTreasureChestSource(ItemSource):
     amount: int
diff --git a/worlds/stardew_valley/data/skill.py b/worlds/stardew_valley/data/skill.py
index d0674f34c0e1..4c754ddd8716 100644
--- a/worlds/stardew_valley/data/skill.py
+++ b/worlds/stardew_valley/data/skill.py
@@ -1,9 +1,7 @@
 from dataclasses import dataclass, field
 
-from ..data.game_item import kw_only
-
 
 @dataclass(frozen=True)
 class Skill:
     name: str
-    has_mastery: bool = field(**kw_only)
+    has_mastery: bool = field(kw_only=True)
diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py
index 730cb24ce6e3..993863bf5bf5 100644
--- a/worlds/stardew_valley/items.py
+++ b/worlds/stardew_valley/items.py
@@ -125,10 +125,7 @@ def __call__(self, item: Item):
 
 
 def load_item_csv():
-    try:
-        from importlib.resources import files
-    except ImportError:
-        from importlib_resources import files  # noqa
+    from importlib.resources import files
 
     items = []
     with files(data).joinpath("items.csv").open() as file:
diff --git a/worlds/stardew_valley/locations.py b/worlds/stardew_valley/locations.py
index 43246a94a356..1d67d535ccee 100644
--- a/worlds/stardew_valley/locations.py
+++ b/worlds/stardew_valley/locations.py
@@ -130,10 +130,7 @@ def __call__(self, name: str, code: Optional[int], region: str) -> None:
 
 
 def load_location_csv() -> List[LocationData]:
-    try:
-        from importlib.resources import files
-    except ImportError:
-        from importlib_resources import files
+    from importlib.resources import files
 
     with files(data).joinpath("locations.csv").open() as file:
         reader = csv.DictReader(file)
diff --git a/worlds/stardew_valley/requirements.txt b/worlds/stardew_valley/requirements.txt
deleted file mode 100644
index 65e922a64483..000000000000
--- a/worlds/stardew_valley/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-importlib_resources; python_version <= '3.8'
-graphlib_backport; python_version <= '3.8'
diff --git a/worlds/stardew_valley/test/stability/TestStability.py b/worlds/stardew_valley/test/stability/TestStability.py
index 8bb904a56ea2..137a7172aff4 100644
--- a/worlds/stardew_valley/test/stability/TestStability.py
+++ b/worlds/stardew_valley/test/stability/TestStability.py
@@ -12,8 +12,6 @@
 
 # <function Location.<lambda> at 0x102ca98a0>
 lambda_regex = re.compile(r"^<function Location\.<lambda> at (.*)>$")
-# Python 3.10.2\r\n
-python_version_regex = re.compile(r"^Python (\d+)\.(\d+)\.(\d+)\s*$")
 
 
 class TestGenerationIsStable(SVTestCase):
diff --git a/worlds/zillion/options.py b/worlds/zillion/options.py
index 8df612654db4..ec0fdb0b22e1 100644
--- a/worlds/zillion/options.py
+++ b/worlds/zillion/options.py
@@ -1,7 +1,6 @@
 from collections import Counter
 from dataclasses import dataclass
-from typing import ClassVar, Dict, Literal, Tuple
-from typing_extensions import TypeGuard  # remove when Python >= 3.10
+from typing import ClassVar, Dict, Literal, Tuple, TypeGuard
 
 from Options import Choice, DefaultOnToggle, NamedRange, OptionGroup, PerGameCommonOptions, Range, Removed, Toggle
 

From e1f16c672183122dcbd40e60ae7b4c4f79096c4f Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:19:52 +0100
Subject: [PATCH 046/381] WebHost: Fix crash on advanced options when a Range
 option used "random" as its default (#4263)

---
 WebHostLib/templates/weightedOptions/macros.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebHostLib/templates/weightedOptions/macros.html b/WebHostLib/templates/weightedOptions/macros.html
index 68d3968a178a..d18d0f0b8957 100644
--- a/WebHostLib/templates/weightedOptions/macros.html
+++ b/WebHostLib/templates/weightedOptions/macros.html
@@ -53,7 +53,7 @@
     <table class="range-rows" data-option="{{ option_name }}">
         <tbody>
             {{ RangeRow(option_name, option, option.range_start, option.range_start, True) }}
-            {% if option.range_start < option.default < option.range_end %}
+            {% if option.default is number and option.range_start < option.default < option.range_end %}
                 {{ RangeRow(option_name, option, option.default, option.default, True) }}
             {% endif %}
             {{ RangeRow(option_name, option, option.range_end, option.range_end, True) }}

From 6656528d782d06a5714094a2cb255620e7de7769 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Wed, 27 Nov 2024 19:43:52 -0500
Subject: [PATCH 047/381] TUNIC: Fix missing ladder rule for library fuse #4271

---
 worlds/tunic/er_rules.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index 3b111ad83488..d5d6f16c57ec 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1446,7 +1446,7 @@ def set_er_location_rules(world: "TunicWorld") -> None:
     set_rule(world.get_location("West Garden Fuse"),
              lambda state: has_ability(prayer, state, world))
     set_rule(world.get_location("Library Fuse"),
-             lambda state: has_ability(prayer, state, world))
+             lambda state: has_ability(prayer, state, world) and has_ladder("Ladders in Library", state, world))
 
     # Bombable Walls
     for location_name in bomb_walls:

From a3711eb463c64dcd0b6070bb7d0c7ca796250f51 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Thu, 28 Nov 2024 01:46:06 +0100
Subject: [PATCH 048/381] Launcher: fix detection of valid .apworld (#4272)

---
 worlds/LauncherComponents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index 3c4c4477ef09..67806a7394c7 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -103,7 +103,7 @@ def _install_apworld(apworld_src: str = "") -> Optional[Tuple[pathlib.Path, path
     try:
         import zipfile
         zip = zipfile.ZipFile(apworld_path)
-        directories = [f.filename.strip('/') for f in zip.filelist if f.CRC == 0 and f.file_size == 0 and f.filename.count('/') == 1]
+        directories = [f.name for f in zipfile.Path(zip).iterdir() if f.is_dir()]
         if len(directories) == 1 and directories[0] in apworld_path.stem:
             module_name = directories[0]
             apworld_name = module_name + ".apworld"

From f4322242a1959f707cd6db088ae12f19d49ac214 Mon Sep 17 00:00:00 2001
From: nmorale5 <76963132+nmorale5@users.noreply.github.com>
Date: Wed, 27 Nov 2024 20:43:37 -0500
Subject: [PATCH 049/381] Pokemon RB - Fix Incorrect Item Location in Victory
 Road 2F (#4260)

---
 worlds/pokemon_rb/locations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py
index 5885183baa9c..943204ceaf75 100644
--- a/worlds/pokemon_rb/locations.py
+++ b/worlds/pokemon_rb/locations.py
@@ -223,7 +223,7 @@ def __init__(self, flag):
                  Missable(92)),
     LocationData("Victory Road 2F-C", "East Item", "Full Heal", rom_addresses["Missable_Victory_Road_2F_Item_2"],
                  Missable(93)),
-    LocationData("Victory Road 2F-W", "West Item", "TM05 Mega Kick", rom_addresses["Missable_Victory_Road_2F_Item_3"],
+    LocationData("Victory Road 2F-C", "West Item", "TM05 Mega Kick", rom_addresses["Missable_Victory_Road_2F_Item_3"],
                  Missable(94)),
     LocationData("Victory Road 2F-NW", "North Item Near Moltres", "Guard Spec", rom_addresses["Missable_Victory_Road_2F_Item_4"],
                  Missable(95)),

From 4395c608e80c6bdd2d219bdf32b5dc807c8a3779 Mon Sep 17 00:00:00 2001
From: Tim Mahan <60069210+Bicoloursnake@users.noreply.github.com>
Date: Thu, 28 Nov 2024 02:41:13 -0500
Subject: [PATCH 050/381] [Docs] Update the macOS guide to match changes in
 core (#4265)

* Update mac_en.md

Updated the minimum version recommended to a version actually supported by AP.

* 3.13 is not in fact, supported.

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 worlds/generic/docs/mac_en.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/generic/docs/mac_en.md b/worlds/generic/docs/mac_en.md
index 2904781862da..76b1ee4a3827 100644
--- a/worlds/generic/docs/mac_en.md
+++ b/worlds/generic/docs/mac_en.md
@@ -2,8 +2,8 @@
 Archipelago does not have a compiled release on macOS. However, it is possible to run from source code on macOS. This guide expects you to have some experience with running software from the terminal.
 ## Prerequisite Software
 Here is a list of software to install and source code to download.
-1. Python 3.9 "universal2" or newer from the [macOS Python downloads page](https://www.python.org/downloads/macos/).
-   **Python 3.11 is not supported yet.**
+1. Python 3.10 "universal2" or newer from the [macOS Python downloads page](https://www.python.org/downloads/macos/).
+   **Python 3.13 is not supported yet.**
 2. Xcode from the [macOS App Store](https://apps.apple.com/us/app/xcode/id497799835).
 3. The source code from the [Archipelago releases page](https://github.com/ArchipelagoMW/Archipelago/releases).
 4. The asset with darwin in the name from the [SNI Github releases page](https://github.com/alttpo/sni/releases).

From a07ddb4371334619e3ea909b6f50cb2dfbd351db Mon Sep 17 00:00:00 2001
From: Lolo <lowgau@gmail.com>
Date: Thu, 28 Nov 2024 17:13:14 +0100
Subject: [PATCH 051/381] Docs: (Re)write french alttp setup guide and game
 page (#2296)

---
 worlds/alttp/docs/fr_A Link to the Past.md    |  32 +++
 worlds/alttp/docs/multiworld_fr.md            | 204 +++++-------------
 .../docs/retroarch-network-commands-fr.png    | Bin 0 -> 20461 bytes
 3 files changed, 91 insertions(+), 145 deletions(-)
 create mode 100644 worlds/alttp/docs/fr_A Link to the Past.md
 create mode 100644 worlds/alttp/docs/retroarch-network-commands-fr.png

diff --git a/worlds/alttp/docs/fr_A Link to the Past.md b/worlds/alttp/docs/fr_A Link to the Past.md
new file mode 100644
index 000000000000..a9ff8646b3f2
--- /dev/null
+++ b/worlds/alttp/docs/fr_A Link to the Past.md	
@@ -0,0 +1,32 @@
+# A Link to the Past
+
+## Où se trouve la page des paramètres ?
+
+La [page des paramètres du joueur pour ce jeu](../player-options) contient tous les paramètres dont vous avez besoin 
+pour configurer et exporter le fichier.
+
+## Quel est l'effet de la randomisation sur ce jeu ?
+
+Les objets que le joueur devrait normalement obtenir au cours du jeu ont été déplacés. Il y a tout de même une logique
+pour que le jeu puisse être terminé, mais dû au mélange des objets, le joueur peut avoir besoin d'accéder à certaines
+zones plus tôt que dans le jeu original.
+
+## Quels sont les objets et endroits mélangés ?
+
+Tous les objets principaux, les collectibles et munitions peuvent être mélangés, et tous les endroits qui
+pourraient contenir un de ces objets peuvent avoir leur contenu modifié.
+
+## Quels objets peuvent être dans le monde d'un autre joueur ?
+
+Un objet pouvant être mélangé peut être aussi placé dans le monde d'un autre joueur. Il est possible de limiter certains
+objets à votre propre monde.
+
+## À quoi ressemble un objet d'un autre monde dans LttP ?
+
+Les objets appartenant à d'autres mondes sont représentés par une Étoile de Super Mario World.
+
+## Quand le joueur reçoit un objet, que ce passe-t-il ?
+
+Quand le joueur reçoit un objet, Link montrera l'objet au monde en le mettant au-dessus de sa tête. C'est bon pour
+les affaires !
+
diff --git a/worlds/alttp/docs/multiworld_fr.md b/worlds/alttp/docs/multiworld_fr.md
index 310f3a4f96c4..0638d843e810 100644
--- a/worlds/alttp/docs/multiworld_fr.md
+++ b/worlds/alttp/docs/multiworld_fr.md
@@ -1,41 +1,28 @@
 # Guide d'installation du MultiWorld de A Link to the Past Randomizer
 
-<div id="tutorial-video-container">
-    <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/mJKEHaiyR_Y" frameborder="0"
-      allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen>
-    </iframe>
-</div>
-
 ## Logiciels requis
 
-- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
-- [QUsb2Snes](https://github.com/Skarsnik/QUsb2snes/releases) (Inclus dans les utilitaires précédents)
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases).
+- [SNI](https://github.com/alttpo/sni/releases). Inclus avec l'installation d'Archipelago ci-dessus.
+   - SNI n'est pas compatible avec (Q)Usb2Snes.
 - Une solution logicielle ou matérielle capable de charger et de lancer des fichiers ROM de SNES
-    - Un émulateur capable d'éxécuter des scripts Lua
-      ([snes9x rr](https://github.com/gocha/snes9x-rr/releases),
-      [BizHawk](https://tasvideos.org/BizHawk))
-    - Un SD2SNES, [FXPak Pro](https://krikzz.com/store/home/54-fxpak-pro.html), ou une autre solution matérielle
-      compatible
-- Le fichier ROM de la v1.0 japonaise, sûrement nommé `Zelda no Densetsu - Kamigami no Triforce (Japan).sfc`
+    - Un émulateur capable de se connecter à SNI
+      [snes9x-nwa](https://github.com/Skarsnik/snes9x-emunwa/releases), ([snes9x rr](https://github.com/gocha/snes9x-rr/releases),
+      [BSNES-plus](https://github.com/black-sliver/bsnes-plus),
+      [BizHawk](https://tasvideos.org/BizHawk), ou
+      [RetroArch](https://retroarch.com?page=platforms) 1.10.1 ou plus récent). Ou,
+    - Un SD2SNES, [FXPak Pro](https://krikzz.com/store/home/54-fxpak-pro.html), ou une autre solution matérielle compatible. **À noter:
+    les SNES minis ne sont pas encore supportés par SNI. Certains utilisateurs rapportent avoir du succès avec QUsb2Snes pour ce système,
+    mais ce n'est pas supporté.**
+- Le fichier ROM de la v1.0 japonaise, habituellement nommé `Zelda no Densetsu - Kamigami no Triforce (Japan).sfc`
 
 ## Procédure d'installation
 
-### Installation sur Windows
-
-1. Téléchargez et installez les utilitaires du MultiWorld à l'aide du lien au-dessus, faites attention à bien installer
-   la version la plus récente.
-   **Le fichier se situe dans la section "assets" en bas des informations de version**. Si vous voulez jouer des parties
-   classiques de multiworld, téléchargez `Setup.BerserkerMultiWorld.exe`
-    - Si vous voulez jouer à la version alternative avec le mélangeur de portes dans les donjons, vous téléchargez le
-      fichier
-      `Setup.BerserkerMultiWorld.Doors.exe`.
-    - Durant le processus d'installation, il vous sera demandé de localiser votre ROM v1.0 japonaise. Si vous avez déjà
-      installé le logiciel auparavant et qu'il s'agit simplement d'une mise à jour, la localisation de la ROM originale
-      ne sera pas requise.
-    - Il vous sera peut-être également demandé d'installer Microsoft Visual C++. Si vous le possédez déjà (possiblement
-      parce qu'un jeu Steam l'a déjà installé), l'installateur ne reproposera pas de l'installer.
-
-2. Si vous utilisez un émulateur, il est recommandé d'assigner votre émulateur capable d'éxécuter des scripts Lua comme
+1. Téléchargez et installez [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases). **L'installateur se situe dans la section "assets" en bas des informations de version**.
+   
+2. Si c'est la première fois que vous faites une génération locale ou un patch, il vous sera demandé votre fichier ROM de base. Il s'agit de votre fichier ROM Link to the Past japonais. Cet étape n'a besoin d'être faite qu'une seule fois.
+
+3. Si vous utilisez un émulateur, il est recommandé d'assigner votre émulateur capable d'éxécuter des scripts Lua comme
    programme par défaut pour ouvrir vos ROMs.
     1. Extrayez votre dossier d'émulateur sur votre Bureau, ou à un endroit dont vous vous souviendrez.
     2. Faites un clic droit sur un fichier ROM et sélectionnez **Ouvrir avec...**
@@ -44,58 +31,6 @@
     5. Naviguez dans les dossiers jusqu'au fichier `.exe` de votre émulateur et choisissez **Ouvrir**. Ce fichier
        devrait se trouver dans le dossier que vous avez extrait à la première étape.
 
-### Installation sur Mac
-
-- Des volontaires sont recherchés pour remplir cette section ! Contactez **Farrak Kilhn** sur Discord si vous voulez
-  aider.
-
-## Configurer son fichier YAML
-
-### Qu'est-ce qu'un fichier YAML et pourquoi en ai-je besoin ?
-
-Votre fichier YAML contient un ensemble d'options de configuration qui fournissent au générateur des informations sur
-comment il devrait générer votre seed. Chaque joueur d'un multiwolrd devra fournir son propre fichier YAML. Cela permet
-à chaque joueur d'apprécier une expérience customisée selon ses goûts, et les différents joueurs d'un même multiworld
-peuvent avoir différentes options.
-
-### Où est-ce que j'obtiens un fichier YAML ?
-
-La page [Génération de partie](/games/A%20Link%20to%20the%20Past/player-options) vous permet de configurer vos
-paramètres personnels et de les exporter vers un fichier YAML.
-
-### Configuration avancée du fichier YAML
-
-Une version plus avancée du fichier YAML peut être créée en utilisant la page
-des [paramètres de pondération](/games/A Link to the Past/weighted-options), qui vous permet de configurer jusqu'à
-trois préréglages. Cette page a de nombreuses options qui sont essentiellement représentées avec des curseurs
-glissants. Cela vous permet de choisir quelles sont les chances qu'une certaine option apparaisse par rapport aux
-autres disponibles dans une même catégorie.
-
-Par exemple, imaginez que le générateur crée un seau étiqueté "Mélange des cartes", et qu'il place un morceau de papier
-pour chaque sous-option. Imaginez également que la valeur pour "On" est 20 et la valeur pour "Off" est 40.
-
-Dans cet exemple, il y a soixante morceaux de papier dans le seau : vingt pour "On" et quarante pour "Off". Quand le
-générateur décide s'il doit oui ou non activer le mélange des cartes pour votre partie, , il tire aléatoirement un
-papier dans le seau. Dans cet exemple, il y a de plus grandes chances d'avoir le mélange de cartes désactivé.
-
-S'il y a une option dont vous ne voulez jamais, mettez simplement sa valeur à zéro. N'oubliez pas qu'il faut que pour
-chaque paramètre il faut au moins une option qui soit paramétrée sur un nombre strictement positif.
-
-### Vérifier son fichier YAML
-
-Si vous voulez valider votre fichier YAML pour être sûr qu'il fonctionne, vous pouvez le vérifier sur la page du
-[Validateur de YAML](/check).
-
-## Générer une partie pour un joueur
-
-1. Aller sur la page [Génération de partie](/games/A%20Link%20to%20the%20Past/player-options), configurez vos options,
-   et cliquez sur le bouton "Generate Game".
-2. Il vous sera alors présenté une page d'informations sur la seed, où vous pourrez télécharger votre patch.
-3. Double-cliquez sur le patch et l'émulateur devrait se lancer automatiquement avec la seed. Etant donné que le client
-   n'est pas requis pour les parties à un joueur, vous pouvez le fermer ainsi que l'interface Web (WebUI).
-
-## Rejoindre un MultiWorld
-
 ### Obtenir son patch et créer sa ROM
 
 Quand vous rejoignez un multiworld, il vous sera demandé de fournir votre fichier YAML à celui qui héberge la partie ou
@@ -109,35 +44,58 @@ automatiquement le client, et devrait créer la ROM dans le même dossier que vo
 
 #### Avec un émulateur
 
-Quand le client se lance automatiquement, QUsb2Snes devrait se lancer automatiquement également en arrière-plan. Si
+Quand le client se lance automatiquement, SNI devrait se lancer automatiquement également en arrière-plan. Si
 c'est la première fois qu'il démarre, il vous sera peut-être demandé de l'autoriser à communiquer à travers le pare-feu
 Windows.
 
+#### snes9x-nwa
+
+1. Cliquez sur 'Network Menu' et cochez **Enable Emu Network Control**
+2. Chargez votre ROM si ce n'est pas déjà fait.
+
 ##### snes9x-rr
 
 1. Chargez votre ROM si ce n'est pas déjà fait.
 2. Cliquez sur le menu "File" et survolez l'option **Lua Scripting**
 3. Cliquez alors sur **New Lua Script Window...**
 4. Dans la nouvelle fenêtre, sélectionnez **Browse...**
-5. Dirigez vous vers le dossier où vous avez extrait snes9x-rr, allez dans le dossier `lua`, puis
-   choisissez `multibridge.lua`
-6. Remarquez qu'un nom vous a été assigné, et que l'interface Web affiche "SNES Device: Connected", avec ce même nom
-   dans le coin en haut à gauche.
+5. Sélectionnez le fichier lua connecteur inclus avec votre client
+    - Recherchez `/SNI/lua/` dans votre fichier Archipelago. 
+6. Si vous avez une erreur en chargeant le script indiquant `socket.dll missing` ou similaire, naviguez vers le fichier du
+lua que vous utilisez dans votre explorateur de fichiers et copiez le `socket.dll` à la base de votre installation snes9x.
+
+#### BSNES-Plus
+
+1. Chargez votre ROM si ce n'est pas déjà fait.
+2. L'émulateur devrait automatiquement se connecter lorsque SNI se lancera.
 
 ##### BizHawk
 
-1. Assurez vous d'avoir le coeur BSNES chargé. Cela est possible en cliquant sur le menu "Tools" de BizHawk et suivant
+1. Assurez vous d'avoir le cœur BSNES chargé. Cela est possible en cliquant sur le menu "Tools" de BizHawk et suivant
    ces options de menu :
-   `Config --> Cores --> SNES --> BSNES`  
-   Une fois le coeur changé, vous devez redémarrer BizHawk.
+    - (≤ 2.8) `Config` 〉 `Cores` 〉 `SNES` 〉 `BSNES`
+    - (≥ 2.9) `Config` 〉 `Preferred Cores` 〉 `SNES` 〉 `BSNESv115+`  
+   Une fois le cœur changé, rechargez le avec Ctrl+R (par défaut).
 2. Chargez votre ROM si ce n'est pas déjà fait.
-3. Cliquez sur le menu "Tools" et cliquez sur **Lua Console**
-4. Cliquez sur le bouton pour ouvrir un nouveau script Lua.
-5. Dirigez vous vers le dossier d'installation des utilitaires du MultiWorld, puis dans les dossiers suivants :  
-   `QUsb2Snes/Qusb2Snes/LuaBridge`
-6. Sélectionnez `luabridge.lua` et cliquez sur "Open".
-7. Remarquez qu'un nom vous a été assigné, et que l'interface Web affiche "SNES Device: Connected", avec ce même nom
-   dans le coin en haut à gauche.
+3. Glissez et déposez le fichier `Connector.lua` que vous avez téléchargé ci-dessus sur la fenêtre principale EmuHawk.
+    - Recherchez `/SNI/lua/` dans votre fichier Archipelago. 
+    - Vous pouvez aussi ouvrir la console Lua manuellement, cliquez sur `Script` 〉 `Open Script`, et naviguez sur `Connecteur.lua`
+      avec le sélecteur de fichiers.
+
+##### RetroArch 1.10.1 ou plus récent
+
+Vous n'avez qu'à faire ces étapes qu'une fois.
+
+1. Entrez dans le menu principal RetroArch
+2. Allez dans Réglages --> Interface utilisateur. Mettez "Afficher les réglages avancés" sur ON.
+3. Allez dans Réglages --> Réseau. Mettez "Commandes Réseau" sur ON. (trouvé sous Request Device 16.) Laissez le 
+Port des commandes réseau à 555355.
+
+![Screenshot of Network Commands setting](/static/generated/docs/A%20Link%20to%20the%20Past/retroarch-network-commands-fr.png)
+4. Allez dans Menu Principal --> Mise à jour en ligne --> Téléchargement de cœurs. Descendez jusqu'a"Nintendo - SNES / SFC (bsnes-mercury Performance)" et 
+   sélectionnez le.
+
+Quand vous chargez une ROM, veillez a sélectionner un cœur **bsnes-mercury**. Ce sont les seuls cœurs qui autorisent les outils externs à lire les données d'une ROM.
 
 #### Avec une solution matérielle
 
@@ -147,10 +105,7 @@ le maintenant. Les utilisateurs de SD2SNES et de FXPak Pro peuvent télécharger
 [sur cette page](http://usb2snes.com/#supported-platforms).
 
 1. Fermez votre émulateur, qui s'est potentiellement lancé automatiquement.
-2. Fermez QUsb2Snes, qui s'est lancé automatiquement avec le client.
-3. Lancez la version appropriée de QUsb2Snes (v0.7.16).
-4. Lancer votre console et chargez la ROM.
-5. Remarquez que l'interface Web affiche "SNES Device: Connected", avec le nom de votre appareil.
+2. Lancez votre console et chargez la ROM.
 
 ### Se connecter au MultiServer
 
@@ -165,47 +120,6 @@ l'interface Web.
 
 ### Jouer au jeu
 
-Une fois que l'interface Web affiche que la SNES et le serveur sont connectés, vous êtes prêt à jouer. Félicitations
-pour avoir rejoint un multiworld !
-
-## Héberger un MultiWorld
-
-La méthode recommandée pour héberger une partie est d'utiliser le service d'hébergement fourni par
-[le site](https://berserkermulti.world/generate). Le processus est relativement simple :
-
-1. Récupérez les fichiers YAML des joueurs.
-2. Créez une archive zip contenant ces fichiers YAML.
-3. Téléversez l'archive zip sur le lien ci-dessus.
-4. Attendez un moment que les seed soient générées.
-5. Lorsque les seeds sont générées, vous serez redirigé vers une page d'informations "Seed Info".
-6. Cliquez sur "Create New Room". Cela vous amènera à la page du serveur. Fournissez le lien de cette page aux autres
-   joueurs afin qu'ils puissent récupérer leurs patchs.  
-   **Note:** Les patchs fournis sur cette page permettront aux joueurs de se connecteur automatiquement au serveur,
-   tandis que ceux de la page "Seed Info" non.
-7. Remarquez qu'un lien vers le traqueur du MultiWorld est en haut de la page de la salle. Vous devriez également
-   fournir ce lien aux joueurs pour qu'ils puissent suivre la progression de la partie. N'importe quel personne voulant
-   observer devrait avoir accès à ce lien.
-8. Une fois que tous les joueurs ont rejoint, vous pouvez commencer à jouer.
-
-## Auto-tracking
-
-Si vous voulez utiliser l'auto-tracking, plusieurs logiciels offrent cette possibilité.  
-Le logiciel recommandé pour l'auto-tracking actuellement est
-[OpenTracker](https://github.com/trippsc2/OpenTracker/releases).
-
-### Installation
-
-1. Téléchargez le fichier d'installation approprié pour votre ordinateur (Les utilisateurs Windows voudront le
-   fichier `.msi`).
-2. Durant le processus d'installation, il vous sera peut-être demandé d'installer les outils "Microsoft Visual Studio
-   Build Tools". Un lien est fourni durant l'installation d'OpenTracker, et celle des outils doit se faire manuellement.
-
-### Activer l'auto-tracking
-
-1. Une fois OpenTracker démarré, cliquez sur le menu "Tracking" en haut de la fenêtre, puis choisissez **
-   AutoTracker...**
-2. Appuyez sur le bouton **Get Devices**
-3. Sélectionnez votre appareil SNES dans la liste déroulante.
-4. Si vous voulez tracquer les petites clés ainsi que les objets des donjons, cochez la case **Race Illegal Tracking**
-5. Cliquez sur le bouton **Start Autotracking**
-6. Fermez la fenêtre "AutoTracker" maintenant, elle n'est plus nécessaire
+Une fois que l'interface Web affiche que la SNES et le serveur sont connectés, vous êtes prêt à jouer. Félicitations,
+vous venez de rejoindre un multiworld ! Vous pouvez exécuter différentes commandes dans votre client. Pour plus d'informations
+sur ces commandes, vous pouvez utiliser `/help` pour les commandes locales et `!help` pour les commandes serveur.
diff --git a/worlds/alttp/docs/retroarch-network-commands-fr.png b/worlds/alttp/docs/retroarch-network-commands-fr.png
new file mode 100644
index 0000000000000000000000000000000000000000..60eba5b1b0fb5c45f51b6c8728617bd0a9043775
GIT binary patch
literal 20461
zcmce;1z44Bw=Rl-3J53yN{N)TC?O5f-3<Z)(kUg41xQPG_oQ1I5s;GZ6ane(-edah
zb@pEC?0wE!YsY_G-#-E2oo_tP7<Y~7D=#aCiB5=)f`Wo6Aug<lf^tn1zCOHl75=}1
zV*vSb#ZFO75T&4-cp1LAZY&@pfPzvSjB%!i3g4sIh-=uPpkRGR{&(evb@po%6uA!)
z!UD=pI_pz6)p18I_-rDp?bCgQ86IFb4!#o0Q-7-3E53FyNO^%L72ucp*z7ZVp9w3C
znef{6W+{vCSL{{Aal#5$MC4h~`>&@nTr#<0#W~!!!N31H>~MF|c!SfpyE}%rvu>A*
zg`3{i*0vvck|;8nKQD=pU$EknlfcWnR-yE3@Y?J2*&g|0Lb;_83e7T;Rw?9nTNN!W
zQ?pdGZgY6>-HW-|CVF`NfBg-12-e?!ChNZfuO>XgT=0St=p%j;UXr)(AnynY>%;%?
z8~#uJm>N#`w@7)l^X_9N3B3FFv$C>gs_dv47}lD7@73<>N;n%av#@MV*Ad;jClnTz
zl+>f9{E<p3GJu%VcB<Op^k98XhAmYl?s<*ldTQlxz83qm@)b|d%flH@ehP}Ya$Y!9
zgjRnyYE^=k`i5V@>5#zm9zyIwiDhQf4BvS<p-RhXU_vR-c$p^eCGGAHQcql5T>H)G
zgq`MCHgl(7&pYU5_n*A{6)_T$6r)vXg@=ddurWC{GQv(yo@zRfS*yhMfXysCB&2U^
z_PcYP=+~N>n>TLwwdm^<M*I6?EO6?;2{=uxsjlC{!{a~PQ0g5GVsCFZUybH0^LO0n
ztiD*dSx=}M81jUh`}8|AsoR#o<;6LzA|*AoQu>4E77sS}3Mu(nbaZsAtgIeBeE1`n
zv{1L<;^O?2goMPI-{EwlX7l1~x5sj#V%vp{h}UH=M=5K#P?rhE*GZ|x-ofGg><n(8
zGc1B%mMr2<udC>*h1C|@Q=ipJh*G+gyk=m`XBS)IbM7XZK@iqOZNM$GAI<!bl|^lS
z<?*v;Z!XS`aVr7>0#x%gGxD_=lceP3@BDPLw`VO>W1*+d{qW%fg;-Dk33nvBibY2_
zZMfm(!u^FSD9IJY7Z=oZKYHw3D%zKaBH1MjvDQOJhWj2}gc#ajlBnqB5^iSD9|qB&
z)2kJ{OrfZQyJg+qUs7J4z~gKS4}5)Xt)!&H<9vUFgxhhl-aW4HiIC430gF-X;k0XH
zWF##uEj;s+?H{BR6ci-H#F`Zr?c6Fn_EqbG-kIwIU-twF50?kBvgDGmZru`>k}@#I
z+Xyt6KNJ%XsS&fcw_hSDH|hJZgSn1o?LH+N8xxbj>l%p;H?Xa{+bA%gv~+j6&XtzQ
z#mPy2zsU;&A0Hq6RP>ww^JzGu%l=B8)AsNF3@Prn8?_$iT)Nt#zl@bbB&XSmD=V|+
z)zsBFOnQ^;7Q0pY@4?>iHpE_v-dPtrk&q*v(S1V4kc#h{BG9xwBvOHoNqzBSDfM^C
zm+^teHH&*zY9_`xVf#%>BOJLT)XkM)$7VTKZ^o4oJY=daXDDGEa*x%sJ@IyEygOCK
zP+u)+c0yE$<C`w*H&R{}%WnOUkdW)mZ((zDb97P{7ng8;K|#SAw;wdRiuXNB{N3G~
zBGjV4Jyr9T_D9~!D%<{a2{(s`TLjgxfo5lC;YqTxvew!yVg>S9O>%Tdgnv@M=_o~v
zH^2GCAXiyLYqZoD8*g%IN&~}rT~@J?%kIzZ^261U;PN(k!Bj(G;p@3{=EHd!>go@u
z#K)c7+<3g`#@FiIPit#yov>-&Cn-c6pPckJdmK)^U0z<UMT1-8_%yKE!fhk?gSW%L
zkKH+o@x5>16J5b)i1@{wIPOUd?MS|2&yeye0ev&yM5{=##Z$6+jcZ&x4>dKNEeU5Z
zbVHt%)HKV_{F0UQRlhv`$|vD^A5SA@`=N^BKuCd*57vzvHx4&vj8*8YM~mKnxXM^#
zzbx3EV?I(~|1N8OadXq!z~FmzOk7-{c1@(<(1@<*RH?C?oLrAior^;H?)G+ZDg9!Q
z2-$V4I+H$f3W_w?X;szLC8yJ{^a)u_o|+Fc48Nbk5ko!Zo*zZfy`o+mue9z#Tz$Kf
zmE@7S(D?qEM#NoTVcaSjUQ%9{aP~Ss#lhA<B1=n4&!btNhrBMmc?TO)rvq~Q8LzAC
zmla)t^WqxavrG8gPkO)NM!~uF#6ev(yH_)GDuOD~V}zA5sB#qKFrI#8oYT3&+;cv+
zGyK64@8s59FU~m3*`L*2Ry?+br3H3t?r+T`Bo)uI@W-M{t>o|nLmm*QTXIhiI(Qfq
zs>n>?tKSg8V=Z!jz8Y9>DxVfoVAvU%t5%pPC@y}>JjLxr-z=Ow)I3HyI^GzGrtjac
zUA;<U)7Fg_NWjwC-@gNk373z?MjnGI;^R&1hx{Hd<>Z3*6(Sl_65`|0F)(OPdP5Pc
zC)EzCG#y0)re=preH4TrcJAe(Pqr&%$tonLryCj_yls5z=$QG{aermV2b**!Q!S8?
z&F}d`0s;wvs^sK%Y>F2cw{LfKcBZAbXkOnC8tTQTAyL#DLa3~TLCejy+zU%oKerLo
z*FPFL>yzW#PhT=B-7eZ-X(`+@3|JFr&+C4#G^`cu=XWIVljp2frcn;3_`<GGCvPD`
z>6(IG$a<@dBY|43x_-@*yn@SbT&^CG1%;_*0rr`hnc=Pv{B(<pi&IikFo~Y?xE($9
zVj1?)u1fpbh+zH^M3QD0^+a2J=;zPC$PVK-@EAL#5cfFjZEcw|T4fWsis@3+?-3Kn
zfBDk5x)K=|M=xb`^=;@?4SV~tf&#0VdUp*BJ?ix!V$LQ+$7m}pRVkt?Qznk<?FKO}
zZZqQQVTu{w#nBuTn?6~cYI|RHXeEPu!|%oRAM$k)Pcyo{5ZhjV-FZ%ZjLuo+7m2&9
zuF|?TYF*Z~-qcW+9CcPEEO#i9Wt1mLbE$DdjEIuw_dZ=tiWp|+(aDLokI$}O<S-OS
zOACu|YrcEF!rk57P*WM?;<?{;Pfpfq*Er(%esXx#tpCi_60iOtnT?5Nfo?;hJ~35a
z7`2>Ey_?1?{VnN*%FE8&TIxWLxz@nNo}`-UYDJY_vN-5^P#Jk#57q(*Sh5lM`7#9K
z{r#a8Lf?z|&~<~8yOk~B@)xpxeA*PE>Tn;CiDgaU_l{!H#d^qd1SgfJa3l>tW-vW|
zdOei=l0QE*RFw3DNQZH;t9xo-26rr)NXK{4fgnURaks{Wwr858=(8D=1-_U3VfyjM
zvlyAwg#_C5xd{nBxaxh)c%;N`8cAX^Gu#`@*NVzFq*3fG`H0hjK4@iO!LY7!k^vX|
z(u+rIXLmOzK~0&`W+^*6JDBfe>0o^#F)?w*^O83swXyL<hnz+J_)wv)u9(>3SgCOy
zoegz+i~s#39_RjYbG43o<qW=xii)*~w7ieZ&vOgwCTZPBmCN0ZZMC(vV^uT~0fJ?h
zOUp*`VF^<2ic~oV;cA6Hytm6$n|nmM_%=sdzbmQQ8sA}THZAZ*r4lobc34A_`(l&#
z&G&qOUy90ARP7G?i>W7rNcnXb4u!62XlURLayhQG+0EouzukPYD%$tH1S_}WfyB0-
z-*qgR?s(3*g@uKUjg7^{`y?dmzkipwpE@2(#hVGo1VoM$Xd9@^a!X7Fk#Ik*Iq0Zo
z(P~#w3yq19D9z%@MgO$<QPLZmbQ%Cfb8|EFjNQjjhh#FtB66u{O{cf-Wkn8zUk>Ee
zU~h^oZ*^@3)~T|+(S6xt9c8+=@G=S?yP~IaL(8Qgy~FHDe*%=V?gVa!mBA3tZW~3#
z(25GjT-AK1x~q9wtHb%ub<(?kemYCYdU)_<i1y_+s5i>8wcq0?lLmZfVzN~0yh{_I
zczb92`1GT~{qelYN_IRb#v1;T-0crlnQeZ(aA|*c<(jRXoq>VD7{Zo{lCt-+<#^fb
zK6*Bn!c|7~qIZ!&K|$<RlV53l2$#QyM!;TT_44Sy$7reGk?UQ1!FAFu$0*oS&th%<
zeOotT$%KEO;G3GV1T5@`gzPvT=aPbgC+2z$ub(=sD62-iadd<o;Ov7%qP{<v)6b2m
zF&QGZ>=!kko|&nbZr-1cRw&h8-#|<8+5|lWnvKd=HHIfo3W|z)r>7G~G9)D>5oc3c
z1d^Q4dFyN!I$#xP_%|NwK~*3jC7prQ<Wl<l`SWMbo`qW-SMSK*)Rc|q2vIRK>Pd7z
z-Z4ChR#(Yzzw?BJWmm`9MCHw!;=J3?OlhUlq&A;P#hrApw1_9#h5hK{?^>5XVc9s&
zC*sxQmbrN5AWR&^K*vB=wisNSA4?c$Pc0iSE+J7|S{ioVYHngeLsbNg?`I6lkH*G#
zY|pKyCue3nyP}_AVPWOLO{L`Jo%;UW;7?Z!1D2V&xl-clR88eh{woCqg)+bs8EXoU
z3JMDR@gt_c(8#s*wzjsiE-fZ`J~?fr-+%elhAe}9tX#qSxkv)HquatgobL8^z|b<`
z1tq1WQ4AX7v^D1Pzs}kK+Y5_{8MpZ1<#iF#<KW{*#>cO1Z17o6^SHaa4<n%!tx{$$
zWhteY^3=`u-pcP(`zYHwV0Feek?-Z{n7POnR>&;|&^-G^?E)x*XD{i%EkG+p$dn=E
zfj<jxHP3~czSS7JPR?SOmkyOnwfD&Mk{%)3`NvlVKZ5pmccmmHQ?EV8c#^MGIbCAt
zpOIk*=v!Yu)z?=dO*An396H~i626s*60S?L{u?8s$EYDtrC~SbYn1+(3+AtI+7~OJ
z(Inw<>h0?*PEP&>Q1Z{8Ke*(F>l3gBIlQ!Sn9G8Ld-j$Ga$e}M($o9n1mxt<8e&;n
zZyp^rH1rFq=<4crL=B2BD;>v2-u`*pA?*BjWJrhtaGuq{93jJTAB|F@_Qda9x8g~?
zGpQaw7Nx|=$jGRws-m6OULd`mCddEu=@+BW>AUVUu#U=DsHmtqqnNTNe{kn~#a=)x
zZ3@I}CBhwJTO0nl&PBlavs%SzS4C%4lvc~=zDBI+V*Q|;bVT$6d{(-1{p^;M-Tku<
zWt15WiThDKZDq?JbCRQWq^Va$-ha$*9+ao%u1u+H5O5nxG62}s4Qq$_rs3z~-9=J<
zk9ao4fas@sS4HkfQsNTQ;H}Rz@YB&rUcCL@R<l_zwcOFt;$_<o2m$~Vjbiv|O@@(?
z5kP17y@r$&Jwd^yL|#{Na`KKTDl#D?+QcEk6nMV_^%wdLHeh=hnT6cWfCtY$JQq=5
zW@763{$1!GUj?;{sFqSB$DjPw%a<>KudJu9g*5D3@5U~5J=}nb*RPdX+Zopp&aDO|
zJM6KHKL4~NQ3E_i_&1YwwI~Hs(r_fxZRBq>ry!w4Xi>WhHds_TitIC#+wJbpDXp&Y
zo8miYNNs$MnJWBlx5;<RNF?5TQr%M$&~s@@vK6MYLUc}N<RDT_sAMG#^#<igEvL`*
zFH275dh|ag(X1D%ci}ft-j)8t)Bh*5`QOL6<(3M?%1rtKqL4@YW$Eu<^Ib~uNZ={*
z+dv<TLgXvq|I$1B`~Enwt-am%{?N*wpK-O6DlcEgCnkC<b|(}S72Ttj-5U0!T8L@y
z>Z)};w33#-EraX<x(b+)3>wU~^KA~R!|M~3!R$kypIeTvjhFjRYgSrKIfV@ZQ3ZI>
zPG3j}EcquI@?r)hE3K^V*D=@=mn-sbKeKkhbLeevGadfvGm@*smY9)NWSh}N>UpLh
zFW+0|`nKa9kd;~93jvyJ?XNcP)pW!>jI5@rRg{$ntL%(*b!R?*{tS3*M|SAdV77v&
zsOWbe?8SY;*^P~d4<69q`#Wm~)z$GbnywtZY-{iAG;oJgFe}BmR_AjuAZb5+Vb}w}
zBPt{$#YWY;_2gi}8dxemlg`=9<waEG1x5I&N2iLFoS4`TIlkl9y~zTwd4cEq`ue(g
zX#yZJZTmuoTa=oX=B(sE2)r~;qtwFEvb3b6tE($~W*<66U|?WQi0U@7E&qJ8`o~eV
zXqs5Bl=DNx!nsg)KW&Y}YGhIpDIO0muLj1`@Yz2-Nez}0&w<0J<f@vQt935o;Nl9i
z=(0EmscUH9;o?HweZ4kXTq_X-#b}`_KAw1<6Evfjsj2!3#gvwRzSIr}It^$k4lJTE
z>C}q*92@<N-L4ML&tErAa(DdQ><f)9fz!@teZ2f<9Q)$xJO>w-$NrESAn3us4_7<A
zLPA2=b?dkT5equk7%R2gdZDf0mX3Z6_lbO>Eve^K7-khI|E;O%Lj;;u1|pD%y|tyK
z+<ImjDg?WPN_`j<hLH>!%I!>M0IOvztZI3Z*1FC!OLYwDMZZRi4b%#Cc;9YJR?c`#
z6linT%LX;}h)=^pxq16Rk<Dz=>EY(?V@@C%X$$ZuH9+ioanE#dUSpj@CpB%i&C|?R
zJ-AX8(L24e&AfR;bNMy*N?AH{`IduqawbKBFgb0=ZwE$3$s0fiVBwZkRLDw84-O3M
zZf)H{LrY-=l8s!gpdk@+*=MUW)Vm%&S%{9HSCfrp^(`#GArq=J9eB*c<2K(G;_dAX
zCz{gtBao=_?WT?f!r;(DLEr+5vqDm(%!}9cK>pj*R6_Zek&V}?s`!QsW}730q~;+6
ztR{CDDaboG@w((IurM&<m<`b_dHDG1i;BKHud$xtV`5^O7LxpBoQ{LPtf;7{j=V-8
z4QszUKdA0=44;}$n@lSg*H#1_3P$l>CRa8KTYT9P*EbV4G;22>h(63l#0J@uaM?eF
z=8;g5vg3_OL_^bCA{F%{Jigj-ePwl3s=a4sW~Q~(+ku6hUAM-O(F;-7a8YgC12{Rc
z&SgJUd~t5hz}Wc5Nw(y#UVnT>W@hH`3d^|MTzXUzcJ|8T<m4Negk7<0{tid-e&}Ok
zV|mg*n~(NKbWO+V-Cb4jzJ~Fi@7-g(iACIo2oR@CZ4+5OUg}G$T~@)BgXU>sZhrb5
zn}2Vq@1s%q+s)}Dj}uy|&J3xje%IGi*Ec>QMsG%ig$YrJiil`8c<?@de!zcuEC(1<
z11VDmKBA+m(ETc-EFZoxwI~wRQJ?zg8MD*TdY3-NJz&o=uHEK5C;pkdf5t6>k|TXq
zjU{hmIyKPc^ofs@7<LZjswt6CQhq9z=SyC)`PKLy5CT3PUUBQz*4DdsDCoo`b|MC?
z0mWryJoZa>ys*)U2L&Y-etr80y4}dYJ^N6lnEwzvHfq)UTw2P~QVzUa)&7kg)S<HN
zwl;C}4pdasypSE;SFc_{%}C;NSNCspm&fClVz(GAY7e7U;tKHhPg~=7-S*}D^l(lU
zblzTu8{5Ga4ZP`8I2i>o<j>gV^Cf{|V5~Fz47xC?+t1Ec7i26egA#)8oYOl^XP}Hd
zoNtDB)*llatGJ;@<Iw_7-P`-Q#po7jow(iVq>c+gzpv(Y5OX^QL~2*t>#4A_vupN$
zOH?uZPg3F6?ESO`L|Nfo2<EuwmMfE0cAz$bTyRrGyUNz9f4+zRlE-Q5)wqh}I>5}%
zNXE1x+0K#aY<RNrx$3}iwQIFa)E2iDt*6r|YjkgFYHs-Isl;&AcxD<pUiJfj5(*}a
z+}_{E#KvC4W6U4OlA9PErI~SijN==hke~z`CXwUqMtoJ3GiZyHq5b0Y6!`vQ=31aF
zYTm-s-q;n!9Y@8I>D*r(Q3^<-blI722UKNjY+RbSLr18rvA}D(N5pQ$<9QLkgQ<eL
zL78%=0-#K(aZh*jvyX`J@$v8!Mn*<c?vlcAov$`f>I9#w4aOj##Tirc(UZH8(vi7&
zWXdIN%*_d1-cYZyrLqPdoE?FisGw+K9pU8U)!bZEFZa%L&~O3kZBGF`!eBgg>b9ew
zY^Jap^~N~<)Lvd@!LD=I3Sygqgrtd<x2;H8zS2s&A~Ho>pc6}yhF-n~>T#Lcauk=H
zogLl|aeGfsmZOeBNMlM`YASHvw24Y<R~HwL%k#r<zpK}-(ef9Uo2fN;xRa11z&0;N
zG$v5qXVP)onU??tNqedoaWXnSu814Cz-efqO5bBAe8iWHddlpxW+ezaPA27$CVwL;
z<9@kfR4`M?$*C$$jJ}=0`u$^c=b+DiegLLS84J}UeojeMLU+>qzr}4e)3dS$LKno5
z%~Sub$29AK<{Of*L8iw$k2$$Cm?&HI7m{L=@qI(osdrJ4=O<DP%LUAdEKqiK*c+&+
zs7%exE6s-dM(7)>X+7_kOmY{1fI!RUCrqvrr5JSUs!ybZtSlBLW&-H48H#=ae0(dO
zIINb#6E%BR-Cn<@G*>XC9y`u|f9+<!6o|B6;^K&ih&ojx=*h_5i&_k1Viu~s81lt2
zfqr54rz=Odfv+&ic`@OwN&5%T^WU`=?@naIB}U8*Klxs|_mIx{<S@y^)PG0o`TRcf
zu_cj`>+(3eyj@68(LD!HY=(!13>nv=ZfD9SbRduo6jttL@B0~Qr<Flk&62Ma!Toql
z?GiFF8R8@968ChXLft);MB93C$>A~Q+7zk-j@Hv7J9Sr#2@MUU^E^~F`t||!KfqtJ
zk9s}>YS*oIi{X2$s$xp|DUF5`s%2jq9_j3Nz6Izq#dL68Mtw3p6}uRjO<_H)Mfd~*
z(Ya-A8~M=^{dH1>MKPlE(-j4w|2=ah0sv@^hKZSReHh9lr`?|i54L_3v;JqfE2F+4
z0htgyiGk!K&x@)xqQXJD*(R^>>DMEo1mn048>7V(g}DG}|2I(AQBDy;sRIt)@gqPD
zJirVkQ#)p?Za}fd%`6^az)FaEK+9*`{rd-tOK_5L{S2Gs_#?*Ug%KQ*bz>Iq*O-od
zQZkjdxI3#=WCAZN_zAcj^OBNu6&3rxkO`^Vm`+viM>1+LFfzhUzjyDRjI=Z%8{K(C
z8OY)aavEP#WE7U}`nSZy#NZ0A4CNXd8kQUVBt*Z0Z#(mw5;q^TxTU2fb$NN4&1qgZ
z0(uD8ZE1PQMN)#^2iw~*eC}L$Gyz72h6*2^v9V?RT3BBP?LxO2j}~!qa-vwDE-IPS
zu~_!n#3*|L3Z}+TTU$2ZYtVpFnAg7poW=Fvllpb`l$8-=4)PEhM#i5%f69<;(z(q=
z^k$Jhcp%OqvH6(~7aqkpa>*@pMk$5PB`8n&*hZWlzL<?ZzxV-L^73T05O7L=BrL2d
zr)_=7%RFpAJ^3o_g*#FKExtZ#xb+74y<~+620M|QEq_|MdhGTT2hi8^{TQXQgTHqL
zdb8s=XVK*>iyOas^&;jYbMx8pZZIi-HzBR4boA5r<hQ7B&@sdP4mM{<@$f{(J~+IZ
zc0bgXRD1H|Nx0NQ9;Z71qeBEaGw-mllvdd-!tc%W_C6&e)9Xp(y?giW!ba$ql+*oH
zG2cM%<QK<lW2L)`JvXmk2dQXh$WS!kfk0d;O-xkO;_NKh=`iBzIHpc$>Y&Kor*M2O
zu2@IKgEn2~tBXEkz*#_aUS?F9UXU^DNTAo!(&|vDb3M%bCG~HatIFQtuZ;~^+9XE_
zUEL(bDW--q!BbuLo->dj<<lg|N!r&38EBW367ue&lhCwg$Pk4Olsbe2dTk8c4lDIk
zx8yH4qzNo6K&<%Lvt>?3BVFaKLdCShzqIv*!;61yC;tl%G(8)kfZs$xG5*h(!T*NU
zCidzEoAjj;Fd?~f;{^Www?0wnTOVJ+cR*Y3Bc0X%sNMW;-r?WrRfmLy-D5%w0jF`6
zKz#km!OMFNTBe?!9*AeZ@-HPjSi)jroDVmqqN5+g#-E+J)u$3NXq3E$x(&D!+9|0u
z;x4F>W98=e>&jsZ0D%E2!(!aM2LA}48FWi<b?d=ef*QCz1lLtQnjbeI!h}I0mOm)x
z))l8CLSoNs8|$z;yT76w7!uTkPLiUb0^D(Y{3PM+bjr@`cOP1<q65#{E)4_(1RWtF
zF-=`dtE&@|3Y=6_3t@76DNa9BbEaSqVPaxl9?fARnS$~;n0ab>>UvgI1w8y<ae_2r
zIr;UCfWS9cR?^baOHAqM>8}sg#`rJKST?W2+R;+bPs=z8J`Lnkr=W{05_M)HSVn9&
znL9cj_!#mX{rU*jbTCvIPEO||fQjCia|ss_^Tyu&5pi*GK0ZIT=YFh?6gGHXdWeaM
zP0LNygM$qRx0|T2tkwA`8vM|GWiSV-g}*TQ^d6n3r)P&<_)4|?GP8d3trLvx?d=e8
z%0ZnhS(53$?qR3()Y6zVwvMx_*`7`{m{rHe#|qyD2Exiw!lI)&JTKhPwSc*U)Z9N@
z5ZOaTL-W~)4>r|EZcIdk3S4Ihg;;A4NoU-AnZ;QD(9k}3y3j--wXK5u{Ls<Ro;`mK
z8~mv`thMZ)!XhoH`V!+^WX}0S+nJT=giN)Ou4JK29l-IH#5aHcZi*`_1CCBDmpEDT
z)|#8UCND2f*Yn%~c5S8g%%9v&AjAL!=jslpOUufnB_v=)j0E#vJRl%g{`Kp{@w>MO
zrzP77uiG*cS#OrTST~@&$tCfT+`025GO~5J-$+9s@$7;o+vM<bP!LvK8a|_@bPTiC
z!Kcc4E9#$JUEPViQeI#wz6L-l+B!Do3_g1JeO?~P%YC4~s2CU+UhZkXM2I%wxUlSW
zYMlfK%t47MS#4sz%Ae*((_l_YngssKK&U>kbtsO13#+QEtgMR**FPw9)M1E=EGtQd
zG&L!Dh2z9d!GlbfT4lp)M9?+2Eaw_{{j?>|M%-gfZ4cgpd%gE?`=x>*+j*dxudpI{
z%c`a(Y$0sGLmY2X%gfokuz7iTJ4ngM$gbVE{fjr922*~LfXkkSWCu=LiqmMJBLZ}}
z-?_QMZN0F2(6F&dIc?KZQf3pl-<s^bnQK*$O{Hw+k{6^>rg`$j$goK@$FHKuxaT1q
zq%cbHcg7Ra-#Ps0BKX(bnOt23q|={GO-(cc{jGCzb8uHoOQEwVeI1hp;v5Q|&w%1_
z+#Og+*bjMLAWa(?y*gS!;;5Iu)He&AL62$K8RweD&^|c(IE{0!SfGi*H-{`DhpJG<
zU^)$9#?|kz)cdWm@fU1`Jjn%c4&~*Okxn5Er^EXA(8x&Cl)T~puj^cD;I2$%vn1k=
z5BnJ^!_T3ih^a$-T-?EAfsb$n#aL^R9CU3nWIt3@u5fey_>Fb<f0a3#oQ6L#J^a(1
z;0l!sspWua0}`$IL<Qp}Y=C4m*Z>C@mA>eH{dK3cONwJHa=szozFQmPYekP*+_E0G
z)0ykjWnF(ZVq|x{oaZIKlD<jfsft9PXf?o)0-d^8ba>c#UOQJv#<7Vxia;$%O(h?G
z0J)YscV4^~ax5?bs{yhdV5_8V3B3QPNrO%dgzsp34zdh+!HDZv>+|!%?H^OI8FM7l
z3biVOQg3r7WI6^v<V_``;YU&v9)}fNR7puqsIPfm9NgSWFKa;41-Zw0AXhYyP=qKr
zARs;YrM!G2A?+pVjT?U!7WS71e9CVD$?PlW_j!Pie*p0z&+twFOs1qK2kSK;GNcIk
z?8rh{j%|ee%6g?wnQ-bLn-XQFcdd$qcb0idLdIC%OkU+f!<jD`8T)^3m9|NF9jFqd
zxfEHcC<TUe4-SUgVhe54gA~uoTBi5i8?5e3o7R&e`nS0E)m8q0c2&04pMjBET~*a*
z3kje+Iw2oV9mRykl(4WcS~ka(L0=WLme^mvetr6MT}Q1F{7MbxdtbwFy+I&!aB!f-
zDaLP-9Vg+m{iG669H=B|q!I(r9I{HBQ1XC@endcsXK#O>k%6K9=r_jw`}fg<Kp9AS
zZb?{o4)u$RgJa9%?-eq0j4%CO7p&n5j&j+3Of`1S)!T0?cRROZa7_DTsbK9Q!#p?7
z`ym^{-0CXP!-w7Unwk)asVFX1s6Upb#Np)T&Pq=&;&}saZD+UZxIQjHS;(^|!hl~o
zqB^^J_o`3k!pZ(BZL0zfuk+44G$g$G4~@z@88=ZQ4%7RrC%<l=9owm?sUgrOB?QSV
zpgaNVOn7E+L#4dDoK{FnQ?uXEgkx9?j`gpZbIMr(bWvFiXE2URlq$M>NIky3ZpT3n
zho!tAgKVmyO_ij8`*5%ezeGP6K174;N#5k_#+ZYMgS1vzT*}s+8XWC}ujX3z1EsOm
z-HS4a+}2Wi`&(IikG?Yt0CXMG^d?7T<fci<d$A7YR=-Zh{bgw0|EE~=JczukWjku@
z`haTJ6&J!h;VP{Cr_;)+bt82KCAInL+g3KUQeON03@q23r{@n>S60qTh?6sSu9Gy|
z(BV4xGyx6QzeRso5W-Y6*$!)?A&d2D4x7{3!-1*S3`tZYo`wF#!$TvEjpwv$?d<HF
znwskAVdCN%Z)q`vqPP>qG4z?4fDzI$t%#<#q16z^l6G8=a5t_9%`Kp0VF@#mb5_N>
zHFGlp;t^kPIA`~ndy@FGs2;L`AsO37epYL`R{opoagMI^yo{}ViH>+c3l*2&vcD#!
zsD47%{aPI=w)@MnpkOU_lW-|_@*8u|(n@G))qqA_t8-;IABse+PNwtjpIS;E#jF3H
z=CHzLuxqbTU7ZwDqnM~@34VlQXu>ujhs~q9*NyM4fV>XEhlNTN4i1h<Gq?#`E~v^0
zH17eAi97@GC;W#88y5C6D0G;Hi<MIBy!1cvwY`m(d6jqeHu?Md@fRvB+ExvBCZ1;=
z^p{&F{~;&Qqh5I|mzbBE+o?IqL?E5O6`^7XIuhg<rc<sp$ZZYgD3!f_Bla+ZUMDmx
zHdZpEKqBmM?Gvigi_Cy8DYU``+BK@PI>leVegz@O)zwueijI~xXXmZ8AwGk8Z<*-;
zG8<Rx6jBZ@-yi5p0DmBsk-=_mU;x!A%?(TXVNEmVo7CU@6#v>7-k5I>D+}*AynQ<L
z`SN_zGY>MY$r`Y#*UvuWY|WQG%M)p3{X@r?<VtT8YQNb}Z;{#OSDBxiE=n=wdyg8F
z<F&Q5*A3f*goKi4c_6EU{_yPSuV4ey>DsD>hRf(@2CsEpZ=<0}$jKdUZAEk1J@)^I
zRJRsg4ma}M=pUT2eSo6U@euX*%1Si^r&J^FGM5z>Kf^pZUQFt&-<ITsRHgW`jH6{Z
zu+T;D+;*z{;^X7tu?R2IadW%2hf;->)Z9Sr4(<Yo26;WzJoRrKdBx-ayW88_A<_VW
zfq{_`<G_zMFk?XmmtmH&6&`ZGvjnCp8X6idDeX}ElM5_TzW5RfDuo4WcIe|K=mVqX
z_&(iI0k}yl#@llQ5Kx35XzX*#FOhpY=DtA(r36AHH)@tLGPOQMT;MB54DDfm2qfVi
zhCM+`i*#fdzLr@{xq$QtZ3<QtxHXR-KMo{}xR4x&CXt=RFxi_)v-i2>cUPA*Iyra^
zVAyB^-T;1YvAq)fQlX5?X)8G`&EOx5-SzV)t?&l006^X7HI%PS4r)}Clb^;$M2MiZ
zLf7~ZRayDg&CP9DH9Z@tz8{AY(z??n4TPq|q*#^cPJ+6Q(5ie=;}CG52g$pV#iuO5
z6jMy$ydZRDYHA9`HM+Cf@y%~b1K783r^lqf6(;oy48&Xq^x3|%&`I0AElal{RMm0r
zn*8!BSa9Qn`7TFWdgmwm%irl37}C$&&yL>w1=|&LhllkKe2Y1@xBQyk=HYS8m)l8C
zGiQxXsxLYR>6mGz)TtDEq3yqkuIk$oCErx0Vk23;efu_zoxFE6zi0hgk<2swrcY?N
z0yH7=CdtZWo|hNd*)$#adDnI!#;RCt`{qr`%N<b5lan9$;VxWQ<;28{fd~w~jkSqM
z^p`IH?h?V2vwbVk)(a<?)+{O{pX>(o1e|6Frzt8a9j`D`hz2CfD1<{~42+pC?&d02
z)^9LLD6FL3dH`LIghYm$)^)y+=l$+?dGQs{a_S5_YHD+&tLzNT&ACncDG%oI%eH|7
zfX?$V(#?S&;y^${#1s4A-~hJ+uz;*{i2f3EEo6ER_{KkMO`R$vXx`B*5_d00b{NA8
zE2CkX%TivpXISJpezhEnboYf``T0@YWvluB9y=Hk+As2L%-<{rPvc}Uxt0Pwe`muX
zb#v>WeTO)N36}b;PvSSXo-4c)^1g=hjvaXK*6^dQD=6=(!FaAk<=_O#e8o%rrhM9+
zKTsNwcJv_eCvf|+9}AM|_os@m=v+k^@(Ld9kh&UhE9o0DCyw{|uYv6JgycoJ(*8X0
zLm4;-qRC6`o!KYuML3EP97P%9?@=TmXTIX|6n=s2b_mvs1RGn(j!&aQWV~D;8qTN^
z6@H5O&rhH5G++M}cs3VCoS1zTCHbyRBv$gu1*Y*In}fS3FDQ@)MJ*`13X;wT@teua
ze~)hoX>;XwVGy>L=LVPl)(7NUl@pMYG_I1tWxim9D=w^rGzav4HtXs5kxQAsZ^kOP
z&le@jfDee#1?(GuNEx=8n&Ut?DagrX6PurvxItk8XWC?}gsO1lD%cDl{vWU876OoI
ziMt^AGXHwZ1cL9VR43I0-)oF9T{aCdZu<JFbF-+qv9zCM>HZ8p&s1TUP3V}cuF~Es
z>3uUOdEWd3?5jZmYKklkc2b?fP%wr^0LH`nK$aa)>f-!7M4YuCb~-iX4uuUC7TdFD
zv**e91ATqRdjoRNQ%Q-5yO1Y<ywl`fo9Z*CZ^q{E=IppD?=0MZ(46tvkBZ5q%wun;
z?DQLkKZA@jKPS}<7wq$_h$Ur%4Mc&=#Ml@KhfOjNC$S)6a1!Mqf>&2t>vFKRyuN-8
zF&)MCiX<(l(?n+UuCAxxa5CuBeoasR#C|?7D+v<;%Bk5_39dKYb)UQcVEyAacj_VI
z>N!5T>z`TohyCHX*LD^EPW()rXJh5);OE20u$k(<(wK*}ikJxce)sK``=BpCC=g;m
zvk>-h%8eWbHw}C-xtwlbsz~1%&n$O-ejYd?zw1H3$mR0irD>a!B*##}nqSIPaS@O5
z@kp#zMM}zzCFh$M(NE8l@}m0vuogcwF=b^2y2$jO#GxbAcdZpG&3x@~M<5dC0jdl<
zT(EtC&RtwwC~xiUy=Dxkt2+lbFEurl=AbXMW3Xu?q6!d(7smbUr$$}Tpn5{%y^e~C
zOo(d+1O`Gj$@XAP!wkvl0gq-B9!<p6M&5q#^bz=^6*f?cKq+?q8OsKKwwpG=*d4e)
zEHtz#x8ofU-bx(THMzODhXr(?RY8tkBo3@p&DXEz0Unf>cV2RUWWayARtk4qz6V61
z-Ww4OIWM?{wEP1DGx+v4z#BI+G;A4BdAFV~P8rMbhP-YIWD4BoW3GKny4T#o8Otj2
z3N?~{7q||6Pn84|o)h03hY@cRTHOY^$WixtvBUP=uGuMc5(}raa7Wq1p`bY`F0SCS
ztjN#%PPv*YQt3oUYZ+LXys~n$Ca%0~EWhUkSm%ahnLs|l@rKca_mF=Q6#M|;fQXz7
z*gAP1c}Ph~`S}~5ap&bR+`k_M=%n0YjG2KUphOe?2X=vB2Y6c`ek3-$kj2xHO7Z#7
ziL~d_#DbA1smjiW{1?bXv}KU0OnMtCgtoj|*Z_eXkE1QJIudN`VBjc#_;-dBH|q``
z*3|$O08FBIkU=HW_PfRZ*o+hRT{g94*z@S<=<KX4F{1Po+H2bo4ri5uK)Z!`nX7)W
z6ZF<_8Qr**TZS5bFL8V+IXPo0dI*QuvcIfnbJdysEmKzwF>O-}6V9`QQ5UF*!JPt_
zphRY8V=Cu797o>#rX4kC|00$>mOV$MT(}yUAKK}PVaY?}rKit-#ic?+5E2md-JNP`
z(g)28{Ci?v7gmxfcI#<rM$o&mnj3Xm<j0917m$^;`1vly$=)*LkgUwW50TT+d5DVY
zcNORb1{T&Z?DzRFxg+xq<@NGC9P}rk&VyRBIaR}6HwhAeVscg0F=*#bS<GeMU>c$;
zkvFd5vL06?1Cn9LpuypngX2GO)->x1J86efL~BF2BcM;ww!nnLwyYwg;aRD}eN4tO
zr0$Og0{#T0zQ6YP^mJl$%kv6@X4&UIHXy~78T>PGA|N1uNysWc&5O!P{PO_DAdoV)
zU5VYIteNsi^3}?;{yhXq6EU=#sEJ})Mj1I><00Fa_*zk^VWq_E>`{-|=N%uGr`>hz
z6)ty05mfzseX)WQb3Yb5mDC7GT42T_=piqh`0(%F`erFqBGuq+L+w#W6D_v7y}*cm
z9d2Mcv)4yhYzhJl_)2r&V`WPhW;_z7T?Y}3-u-<%qV50?AH8Z`G;AGE-_@lA1g>N}
zqmviaV`OG+_Pp3l0$EnI4p=-)^klz?@h-pP(tvA^MZ&cQIf9}?sR4(rU*8}`ATc{m
zZ%BeJ0m*~pn2>~>+t}C;FH4@veAJ=|D;yH-5I+!?Li9f$$=4FI_UorxmA^}91>zpm
z(^&^v2TVE}ZaSGl7qT8`w32=nUCYt=ak1U23w>b)j3wo-RGj~{1Mj{NFcg;?DQ>K%
zxBa^X17G#i5~MsBBX)mmOx2i<HF$ce8k&^u1ebS4rZ#OhTy|@=foBJP2NT2~l?K%6
z#b1_>fY9On>C+j+i}E_4ddkarb>@6(A~00a38}VSKxc$O1C5Bi^@*rRfKkROF(B;j
zC=xin4^_PTU#<I+=xEr#Sy>}FO4O=UxG5h#e!Pc+<5Z`QOXZvsP<;dMD@g>z@{x__
zg-Q$l<8h`P5lOkku&l5MDXEoq1UkdVw7@6RPs(z4opRW%6~mzTf@TH$nCnB5LVvab
zg|F}q;NLBm81TmBT_Gv%tnDWly%vuBy~M!EYWa3YFNSFjuqZ?qlvP0;D6!BNHdj|`
zpeQdbnOwVeZQ(E)^jc7D=oJ~*`a3luSS?1swAMMS;ul8w1_v)@FhjhzY;Sirt(JZ>
zx3E6-09KWxt7+ebd^kW*WHuG_XTdM|*FoLOl5@`Z=ek6H?E!SE6@dUGj=`IS;3)d%
z^zI+f_Ft=rgyNjG@S7~oBj=WQllMf~9C9MX#b^a6aUxFHdTe20B+6Aa`1gG;M$OJu
zYv07gX>g5t;yFvf?+4lrY!1BP6_`Wo>FHVIotN*J&G3W0+;^(~P2r)XJlRW4_3*@s
z_2lNUv6yjMb}3g=5fKshy*@E0mIr%#XBVfNOfSE_kjS0fT&I&yv`Z}zK(!KsQcrP4
z4(FULd1#s$DXy$sSmH14)n8uiX;_3{t`jqLXke)O6jANw7BWPC*xTR>4`WR+4dOSs
zbZL$3;(k+Hk#HwBG<eOPF*A2`b<OWrz6Ku`1~M3FXtoXyL1U%#!hxg?7^%vfcFKDm
z%Rg~+LQ)gM&md_&TEYWK@Wu0VUD55G9ox5W4|jL{gMu92yn*lzcTH0+-QQhcmZUTL
zWd+s?mA9H?VV2>c*$>1*$FlZG?`;ax9zXR@N$e08fBA!Q-`}@(IS|^90lO6NEY;cZ
zjN2p?4N$?LwiU6c!1zm+g_w_Xg(|WQ4a%B3pEGW6ZPC!urmW!*6BFOR|0DHAhGMaL
z7gsiLXWwbHziIM-oof^7J<w~nPgY@+&d1xkJC5D@>}VU8z}*e8WBz7^Q2CeRCpo74
zR8h^ARmHWJuOi5XVAtAY@XsPLBDUXa`Fb3qiRm+RKhSXLZdzNqRF@K2J9AvlG+y{x
z-no^xg&Qpi^-LRN^e9~q)A6!pAS%vb#9VYtP(;!BFODe8^=7d54^(UAzLZ0pxpZYh
zko%>&dbUkZOm41u1jQ5t>rHabJZN#Y6$uWeAy)AJ*z#Ggr49YO0lFH_h<r)05I)U2
z%QGSyL^iBDvjcIUBm_c0aMmFQ1llb{6$OM)5kP*j+l8$}Nte4B26faJb!9rdE%K6L
zr`tQ&{wu@Jf{#S_HMUh9P^*{696d4`k}i-czyc=RdI~U|ezvtm^Efk;903ey)XMPL
zg{O?nHs~j<)qDwGhv6RNf|QGU9;h9Zz5qiVH?SW{i)|MbJsn=RgmurqzrPPE;FB8V
zafo68uq(C2`}FA(1Ysus$&0TEXI4}^U#QZlbD^D_#0Oo0<;D76RpIHYK!ALQu<}@p
zZlAiNLV|yM@NZ~*hZY$cPl2sfZk`d`st^ISsDy;v%>{xgCRMfzk}&2rEZ81=zWeJZ
z*(f}{JNuD0meY;-Nk^y+=YBB7ow=`2HW+@tsrBczi+!K#QQn4Gi;re_C+k5hB${z3
zJU+V#kyBIe^RES&juz>?c<}<_-H^>+>P?J{RE031<I{SZ*$=_Na<bhsx;IQm3Z_8F
zMsoI5d1Kh&U>%@);kv+7!8dLR&l6ulh+MX=DweUW<k?IeKxhpjj2qK++?HR;m5<AD
zg&^`LQT!2sP0E*E`3f>}9#;is%NMW&!Y5q!mWtoZi59EJLyd@!mu4{lGakfCNfGo3
zi>Ye1p8@|}2pvs^ww#p9zOAPxSi35-JzZSbD?B_L5SXMC3@t&VZhCsUV<t5s$HdzA
z?=71hkm5x0YN(Nr8v{t3)_}iKWj#|5TtH<{6oG=xuHapSf%2%ZsNP}c&*fpsGPm-u
z>)A_c#@x2nc;3(5TbhFBmz5gqj8fwvH4b()vZAu3RtuAuRL}6KAL=N;Jeml}r`&>4
zdrFW=z&+6QI9`BN0G<>LH$H6A=4JpYuH$8<JI+BbAxi{7He{PMxCDRU6nY;W5Hd}^
zo;t>|OXLi!g+-n?rP*|?vyRU6c)2-07=$qE2&OALl%TmE!Ae}F!+C(6dic)w20+~3
z9kPW<DePDRbY8hc9?(W&&ekhuz{#iqG>Y%r29Q&#^rYePJXlc{1`bTEgoK1Zg4dBq
z%#Ht-JLHKMK20;!rw)K8SwahP(+HK^BQv&d%fR-s<8?YpTN8Ch^Cu1VCM?1A=)}i@
z!GYGriz40Hw7#Q4+?|&TWxDedOcw%DJ10L3YgHj|e681nL!0_z00xTusmh!N7fPV_
zfCJDs0bs9mA724wCA<=X^=ltlDw88&MElP5tX25(IeaO91sU=glm#M9CxigXJboht
zE1Axw8i=$Ro-o%t#3_3^7o{3x8sCXwUdw*(k_56AjKm?D;EmWC9n@j)xCY*6@J0@j
zd*cK5c4$Igj1xWbr`X7!nmr%~GT-?35+wv1w#WY={&;_hf78Du{-4oa$jC3#QghV7
zng1pJvF}!kfP&}40nM-!;e3_v!I=?yA+J)N1b#Yw^*T3v$)o^DP^Y^nW-lj0m1-%o
zS_s)eUqHEY19Ae>k0q^d*+9JD5Ayf<j+K2r!QoZj{YyUm-yJ1TZo%e112X2|rU!`B
z%y-4*b35cSo&I|Ekh**FWCI2o!JM7XFK-84rmv?rJ3rsNDsMj66x=#A1TZuoC?X{P
zeuG;e&rNx=+r6)pt*{oced=-JEon(fqm{6}$rrvBUe{Mypn#S8QJow<j3YVLO>i%U
zkTfK3*XIxjLJE?WuK@Z>5kO?h%N>9o=0K}DTZqyvadb$T1<ei!V8<##C_T5_Y(gw8
zEo~Pv;fJ8qgYk5!rl{DY1ryYcU*FFAN6D<Uu!jjBd)4LyoEuN<DJB-fS>PyrPj~m%
ztv?OQE)wTomhi3D5pXABv<#VDsKLz4zqfF|$V#|wPE~+SlxrbC!~pgB_0h30;HRrl
zSO4U%yc0jfR-ND@ym`|HyeJR_evOqPF0mmtgJ@5Xilb`%ovFRJ^m=|PbLZCDLG#<m
zUF=gr?OMx*NAib-x6Pc#_7Z%E_@0<p7?+YwnsweC4$OW#NtX@74ZnZ?u0L6!r-KgR
zU5;WB4~P`7I}#8N3btg5;zpO*?a*OMU#$sQyC5;qu%2~{T>SiP%Ez%&a<f`5_d$8E
z7Ao8M{%62w10`Sq<aLZrOq?Dci-?Iq*f=m!ITOFWpbMTV)R+4q;;e6eH~%w?c<j$q
z|7!gcI*1H;(&>fS^8avcJR%}jxc_Z!ZP0Da%%k|R;hDf%OywKgg&@x5agS%XoEey3
zdEibu`kug~8-rFwS4W3mVeW%{jiOiI;HfM#CUL*D0$vBf_PN#hTS)|T$ccByUqGy2
zwdkLkT3FOVu^zvGk_RI`BQQR&On-6kxR45TYM@hTj6gv@{@LwhYDgdZwc63<{QzuD
zF#g4b&LF+S8s_NenD?=^@}jS(PUV8d;Ga$ppj$v>9R=mm0%lH3kH<Ts;I>s?+??4)
z>vfIqURC_9B~ivu@l;PG_25k|MAWtalC}ch_L<V&3d;#lm$3Pc-Vp+rmzI&qk!Bq1
zc5Q?3YlcCJFgYX>>)&oZESDF4^pAT^zOGddll8&R`OF4sgoM6>)CrVUp)7T+Nv$&_
zjbT4ss0K{?^=Qa>`}l~#j4+9bGxl;fDW97Y6#TMs&~`xfM%wZy2p%q0^WilZlL}We
z=>*pTpe=a(qYa)7QBn6d$uj!8x)QjfuIfU#z|pb7-(Skc#s)NXQ``<S(5$_@yda*)
z?YL$#Q_t)9KAsLp0XAxsb;EguSnxw8-TL%H*}FCnFToujB?&_}Aq2cg<kIlBtqQR?
z|7yG<)!E-*5i`Ek_q4;)NLc$L`dAQR00RX@I)#;Gx#0;5+M1}e+)LKL+Gcvg9WD0M
zjBg3Js#IpAmFN&7;nKIVx&Rr1&t)$gdZcp3_k+GPG2p5YeJ+BCs-Gbj7Z;Gtcs6tV
z{S+Y*krxMo<Bv%6X?0-ftijZ`ejqa*X4X5!zG8zPOY$cWZNG_%+Gk_GMhpnYGHe(o
z=Q^!MnV&udEgNRpuB?xOw?pfoFbBdwB$KXejeyt;fGI@`l6=~Y-b7CrmoKv}+YJ|d
zEE8)FTosRARlG9&GuAHB+A;0K4SjAk2{Anv;{}NQot>X+%zpcLQ(4~B$YdSTCnC94
z)3p+tze{`g;-2aWdU$w1J`nb2B9F6RAq>8du_f|*dO&Ml^Gfe1bcfh)!^ui644KG5
z4j=Z&U}|BZ+yIBmo=GhG_^nmZ(L1>Krj{_NQ_gBN=>$)W^%`q&_^x^--0m-a7hSM;
z8`ra0>lQ8+)CRFowt6C;4X<zSZ2!5eOAd=n;7vAA(8i#9pj~fJMX!0reM!xAcQpSc
z3{UZC@|QM#%lsB@9pJHW|AzUi$q~eIsXgqww2ZaTFYu8R8TcJf>;tmWILdo%K_!Lw
zRS|sL!nFsht-Ws&^uO39-s|q{^cNI@4<NAg!GuC;3u|Hgv1R<eo@fxU#E&UZlLmr{
z=bk{8<Pz{KM4=21uPQ#uq+lmWG?h>pe{2{IjlmWWQr<^q7o{>omyhAv>WLJr*WSN>
zAKtItPeu3hw#ZGwaAtxCS^|slGGFv?657X#kJFgz96`V-JBKY)xQA+sI2eZ#rX(7}
z>-rpn_|r5-9R(fDk6VQLP(m1bLLg@aqk`V($kaSz`g1o{=_*g7znnxlRtE*;i(b|@
zW*-Nsq~A|M#c%%(mAbuG;%zTG-oWvFAYz~FYE8TASe{3JeG3|YVI668UR&#=)z}k_
zM2aEy0vk5m<)vgD7?Oe+Ntlayhb0R;^YuDhdRE4cf+J)S%U+u=z{f#EAwHo#=1ML>
z+$NHphUr<89G*#7u_m;g<S+;hiHjW#pP+$n-@bvJR$K7NQsenG<{9_H1lX=aM&7C4
zC91N{4W$%j;nNKAylO$~gh7yg_+%6|wgnkQ6<13mqd%|?Jx|x!RSjW`H#@6oL0ND%
zpoF$iyx4yZ>TsT<*>^FDwAwfSRXJfoL1}xS6U5H@rk(W<VlJ5~Xv3e#Ip1vDu3)PF
zQ9e#SwFhavMfaxm-BFpu=E0{u$5RkI>W?$nLASR(Dre3-X~io*CKJM<qAG1>1;^0h
zfQ%18<p=J#)*KK}P_O}F@W8+Ta&k=5<RdN{&0Z1W>ieh|6Ar-ggtFuzTaRgr)!p`2
zROs3YHei?uR1DGM3Z4_<goK3Uwx5C#H8rOYUsx`3hx#)*ItqeJDUUK*1vWfbC8thw
z<yeA+!wV^A?2F{d-mh=wz+L8rX@K(Dc5^f@p4dQ`fnzu6ZG<Ucou>M|N0*v}AFleH
zp>c}pEy4b|GoEXE`Ogk|dNr$Zvf<2c{0hoNLVqT<2iM#1mTv=&^dFp+oOK3dw3JPZ
zWA;5pj7c#W`-V(8tO95Eh3gSlR|wRikpu4<pRlyMK!|`KYrWMJ7uO$fhMuvrdv5>s
zvi+L!5o+9%`~`=c4wf%>$^^#q1Wg`+LO$3{uZYWJGA4jVqMtK0I;uV{MbFG^3-iAJ
zs1mn94|`e$chk0kn9jh+NOeO?HMzfQ5Jt@Ez=KPI)lNfW0%8_0kbKSZlk>wF!?#E6
z_jY)uk;QnygY~~Hawo>p&$^~DBlT#xs`G49lvFOk{dpC{#mA4se^2dhpF6p>46+nF
z9eS_~)4|K~%@D=a14dx)WboFr^R<ytzn-+1n9oS3ynjf@UAPps91{*g|1Cdd7?^6o
z;2P$N$O0RsHfgUGgQNjD0cJ5)0(K*))R19lv+`9^?c<}#o{do$`hbc7bAGDw@>>AW
zf?$voN1{-t4jlFKodv0BA(8Ugw46^s6TXs^%Q2xeHpE-G;4}I&9yP?%lNZIs>~R+f
z7K9<*PIe6S*4g7#d0y7T;%+in5r@{FlQ6tf9Shz5-Sdg+^553Ew7TvECO_yxVY&`T
zaIpi365&$7R65mYB*ev&vHqD_AKdE7He2dVfwA3iZ4l(<e*Z>(IDrBsjxU5c1XTXp
zDFL_31%=B5uTZMk?meId!I(4`o&=WEqI$N%DB5%9;r{t%Ywx?Gf%28cr9Qio1P9!&
zaMBts`8C$(RKIBj*{>OYtF5ckQ27ILXu2Vc%I4PNlU(lY?Kx%WueqY&VNwTUGG5kV
zBLjuUI}334(wP^6A-P!H$txQ$S?!QpR3v}=zL9yYdN*AnOkKqY99al1#DFWGi!e7r
zpc!Jg#Gx;~gik@pC0>R-uY?9W9*m2lJ>aXL=RY^y>8LtEB=}xOIl9?qKE+{~Db{Mz
zVjawPS+sZg0F!B2Pv!lT_;8U`4<BJieGXmNMAe@C$BVijd6I*CR(Q1w;`ecIb|5DP
zdRr2f?OG}kBlKrZm=)qu_44*Eu__cvfN4oXv1Y$s8>E-UWxpgw>YkpPE5!)0g?o>s
zZS3rnzJB!c&a^yO88U~z1*JT%7}9sT?)yU!&l;Q4F%|x+OTY&rP!GR%@i-VW#(jd!
z#b}22MM6qzxe*)_w|^N>hoaN}1Yl1wzQa#xHl#vgx(GeJ`ykMMx!(|S0eLS`|K%b6
z)imH!j7%jyYHICz?kem6{k%(m4drYiS}dH8iqU<gaqa!t>^1Q7diXq$pK_CW_JQlv
zKqIZus(F5~zi^3H=UK{V_zY_JM9x^4VFvXh2CPJVMqzlu0y6w&>KXu3E3Br>tgK|k
z?77CrCMLAh)qBm2yQ0Z1i32;>!OJE^IswJ}e0+SoyxNWhQX0U>A)L$oSCWwELx6Cj
zs;cULpD9y_DR7nYP`e4T8rQF1?;W3<oNR6uzIQJSw38%!cUZOXK{CZe#~|ZM{m`aE
zCWs9UIXO6@VUFzE#6;Xdx;_0uiUJ^1Q7yoEvXYV|#l<<WS0yBTlai9$R9(YjayG1M
z9hZ9b;25~v*(Y1GLLK)2B;$6%oJ{i8xE~+K!U0qi<sIY90s$`zv7<f3pmaybLx1>i
z6%q^?iI80avH7Kl^>vhAN$Z6@t?6=f?)u>y1JY9s%;<#UlG3*!UcG*Q{VDI85M)cm
z(~71f*<&<$m7AcJ?0NYHhJgfY`dJ(!zx7q<*6#?@?FVV0TJ!hcMW+V^!Op=U!)6zZ
z2f%?AGxg^H5Z%fL&DlBhn?Ix7d&~+s0wyMF$csdrAzUE-VbmQz2J1#r3MszWJHYg!
zt=(-Z#&IKvx-LJJxCyboPtc(uw$$P2RjS+IVc%#qR+5pDLWb!AAHfCUe<IEUUF|Dc
zS`#qc*I5A_Y6v#sO9ht-kqG0=Y6_ARtR%M`2{0pQRpdXUyt+$FEN!hjTaM>$vry5n
zADp?v&+>QEUCoM$j)_qSPcIXr=+AWAoF=(@SK*lG3d)gj=flzE;|G;dj6{;R_h_CI
zT-uh(+5`wR(TmBE7ikse{FepZ^68(m?=AQ1$js-@y8rKpPtRX-a^>rqtukNxR<8o?
z6aX#~U<gRQ_h~Pf1@6!TMMyjnj<hxUoxoG<4t7s1D#|(sTB86w%MREKn>~F=iyQcK
fx)n>eZ24#ZcZ1BowK1Faf)seV`njxgN@xNATN@Pc

literal 0
HcmV?d00001


From 78bc7b81567209a660f455e342c9295613f1af88 Mon Sep 17 00:00:00 2001
From: Shiny <36184001+ShinyNT@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:43:58 -0300
Subject: [PATCH 052/381] Docs: update Pokemon R/B spanish guide (#2672)

* Update setup_es.md

* Update setup_es.md

i'm stupid and actually didn't edit the client chose part lol
---
 worlds/pokemon_rb/docs/setup_es.md | 49 +++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/worlds/pokemon_rb/docs/setup_es.md b/worlds/pokemon_rb/docs/setup_es.md
index 6499c9501263..67024c5b52ec 100644
--- a/worlds/pokemon_rb/docs/setup_es.md
+++ b/worlds/pokemon_rb/docs/setup_es.md
@@ -11,8 +11,7 @@ Al usar BizHawk, esta guía solo es aplicable en los sistemas de Windows y Linux
   - Instrucciones de instalación detalladas para BizHawk se pueden encontrar en el enlace de arriba.
   - Los usuarios de Windows deben ejecutar el instalador de prerrequisitos (prereq installer) primero, que también se 
     encuentra en el enlace de arriba.
-- El cliente incorporado de Archipelago, que se puede encontrar [aquí](https://github.com/ArchipelagoMW/Archipelago/releases)
-  (selecciona `Pokemon Client` durante la instalación).
+- El cliente incorporado de Archipelago, que se puede encontrar [aquí](https://github.com/ArchipelagoMW/Archipelago/releases).
 - Los ROMs originales de Pokémon Red y/o Blue. La comunidad de Archipelago no puede proveerlos.
 
 ## Software Opcional
@@ -75,27 +74,41 @@ Y los siguientes caracteres especiales (cada uno ocupa un carácter):
 
 ## Unirse a un juego MultiWorld
 
-### Obtener tu parche de Pokémon
+### Generar y parchar un juego
 
-Cuando te unes a un juego multiworld, se te pedirá que entregues tu archivo YAML a quien lo esté organizando.
-Una vez que la generación acabe, el anfitrión te dará un enlace a tu archivo, o un .zip con los archivos de
-todos. Tu archivo tiene una extensión `.apred` o `.apblue`.
+1. Crea tu archivo de opciones (YAML).
+2. Sigue las instrucciones generales de Archipelago para [generar un juego](../../Archipelago/setup/en#generating-a-game).
+Haciendo esto se generará un archivo de salida. Tu parche tendrá la extensión de archivo `.apred` o `.apblue`.
+3. Abre `ArchipelagoLauncher.exe`
+4. Selecciona "Open Patch" en el lado izquierdo y selecciona tu parche.
+5. Si es tu primera vez parchando, se te pedirá que selecciones tu ROM original.
+6. Un archivo `.gb` parchado será creado en el mismo lugar donde está el parche.
+7. La primera vez que abras un parche con BizHawk Client, también se te pedira ubicar `EmuHawk.exe` en tu
+instalación de BizHawk.
 
-Haz doble clic en tu archivo `.apred` o `.apblue` para que se ejecute el cliente y realice el parcheado del ROM.
-Una vez acabe ese proceso (esto puede tardar un poco), el cliente y el emulador se abrirán automáticamente (si es que se
-ha asociado la extensión al emulador tal como fue recomendado)
+Si estás jugando una semilla single-player y no te importa tener seguimiento ni pistas, puedes terminar aqui, cerrar el
+cliente, y cargar el ROM parchado en cualquier emulador. Sin embargo, para multiworlds y otras funciones de Archipelago,
+continúa con los pasos abajo, usando el emulador BizHawk.
 
 ### Conectarse al multiserver
 
-Una vez ejecutado tanto el cliente como el emulador, hay que conectarlos. Abre la carpeta de instalación de Archipelago,
-luego abre `data/lua`, y simplemente arrastra el archivo `connector_pkmn_rb.lua` a la ventana principal de Emuhawk.
-(Alternativamente, puedes abrir la consola de Lua manualmente. En Emuhawk ir a Tools > Lua Console, luego ir al menú
-`Script` 〉 `Open Script`, navegar a la ubicación de `connector_pkmn_rb.lua` y seleccionarlo.)
-
-Para conectar el cliente con el servidor, simplemente pon `<dirección>:<puerto>` en la caja de texto superior y presiona
-enter (si el servidor tiene contraseña, en la caja de texto inferior escribir `/connect <dirección>:<puerto> [contraseña]`)
-
-Ahora ya estás listo para tu aventura en Kanto.
+Por defecto, abrir un parche hará los pasos del 1 al 5 automáticamente. Incluso asi, es bueno memorizarlos en caso de
+que tengas que cerrar y volver a abrir el juego por alguna razón.
+
+1. Pokémon Red/Blue usa el BizHawk Client de Archipelago. Si el cliente no está abierto desde cuando parchaste tu juego,
+puedes volverlo a abrir desde el Launcher.
+2. Asegúrate que EmuHawk esta cargando el ROM parchado.
+3. En EmuHawk, ir a `Tools > Lua Console`. Esta ventana debe quedarse abierta mientras se juega.
+4. En la ventana de Lua Console, ir a `Script > Open Script…`.
+5. Navegar a tu carpeta de instalación de Archipelago y abrir `data/lua/connector_bizhawk_generic.lua`.
+6. El emulador se puede congelar por unos segundos hasta que logre conectarse al cliente. Esto es normal. La ventana del
+BizHawk Client debería indicar que se logro conectar y reconocer Pokémon Red/Blue.
+7. Para conectar el cliente al servidor, ingresa la dirección y el puerto (por ejemplo, `archipelago.gg:38281`) en el
+campo de texto superior del cliente y y haz clic en Connect.
+
+Para conectar el cliente al multiserver simplemente escribe `<dirección>:<puerto>` en el campo de texto superior y
+presiona enter (si el servidor usa contraseña, escribe en el campo de texto inferior
+`/connect <dirección>:<puerto>[contraseña]`)
 
 ## Auto-Tracking
 

From 283d1ab7e8d88a63f47bf1a2e82fd13ea56a889f Mon Sep 17 00:00:00 2001
From: axe-y <58866768+axe-y@users.noreply.github.com>
Date: Thu, 28 Nov 2024 19:35:09 -0500
Subject: [PATCH 053/381] DLC Quest Bug Fix 50+ coin bundle basic Campaign
 (#4276)

* DLC Quest Bug Fix

* DLC Quest Bug Fix
---
 worlds/dlcquest/__init__.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/worlds/dlcquest/__init__.py b/worlds/dlcquest/__init__.py
index b8f2aad6ff94..37eae9b447d1 100644
--- a/worlds/dlcquest/__init__.py
+++ b/worlds/dlcquest/__init__.py
@@ -72,8 +72,16 @@ def create_items(self):
 
         self.multiworld.itempool += created_items
 
-        if self.options.campaign == Options.Campaign.option_basic or self.options.campaign == Options.Campaign.option_both:
-            self.multiworld.early_items[self.player]["Movement Pack"] = 1
+        campaign = self.options.campaign
+        has_both = campaign == Options.Campaign.option_both
+        has_base = campaign == Options.Campaign.option_basic or has_both
+        has_big_bundles = self.options.coinsanity and self.options.coinbundlequantity > 50
+        early_items = self.multiworld.early_items
+        if has_base:
+            if has_both and has_big_bundles:
+                early_items[self.player]["Incredibly Important Pack"] = 1
+            else:
+                early_items[self.player]["Movement Pack"] = 1
 
         for item in items_to_exclude:
             if item in self.multiworld.itempool:
@@ -82,7 +90,7 @@ def create_items(self):
     def precollect_coinsanity(self):
         if self.options.campaign == Options.Campaign.option_basic:
             if self.options.coinsanity == Options.CoinSanity.option_coin and self.options.coinbundlequantity >= 5:
-                self.multiworld.push_precollected(self.create_item("Movement Pack"))
+                self.multiworld.push_precollected(self.create_item("DLC Quest: Coin Bundle"))
 
     def create_item(self, item: Union[str, ItemData], classification: ItemClassification = None) -> DLCQuestItem:
         if isinstance(item, str):

From 3ba0576cf6a1c96452b4babef67eedca18f4f9b3 Mon Sep 17 00:00:00 2001
From: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:36:21 -0700
Subject: [PATCH 054/381] CV64: Fix the first Waterway 3HB ledge setting the
 flag of one of the Nitro room item locations. #4277

---
 worlds/cv64/rom.py | 63 +++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/worlds/cv64/rom.py b/worlds/cv64/rom.py
index db621c7101d6..7af4e3807ac2 100644
--- a/worlds/cv64/rom.py
+++ b/worlds/cv64/rom.py
@@ -684,38 +684,37 @@ def apply_patches(caller: APProcedurePatch, rom: bytes, options_file: str) -> by
 
         # Disable the 3HBs checking and setting flags when breaking them and enable their individual items checking and
         # setting flags instead.
-        if options["multi_hit_breakables"]:
-            rom_data.write_int32(0xE87F8, 0x00000000)  # NOP
-            rom_data.write_int16(0xE836C, 0x1000)
-            rom_data.write_int32(0xE8B40, 0x0C0FF3CD)  # JAL 0x803FCF34
-            rom_data.write_int32s(0xBFCF34, patches.three_hit_item_flags_setter)
-            # Villa foyer chandelier-specific functions (yeah, IDK why KCEK made different functions for this one)
-            rom_data.write_int32(0xE7D54, 0x00000000)  # NOP
-            rom_data.write_int16(0xE7908, 0x1000)
-            rom_data.write_byte(0xE7A5C, 0x10)
-            rom_data.write_int32(0xE7F08, 0x0C0FF3DF)  # JAL 0x803FCF7C
-            rom_data.write_int32s(0xBFCF7C, patches.chandelier_item_flags_setter)
-
-            # New flag values to put in each 3HB vanilla flag's spot
-            rom_data.write_int32(0x10C7C8, 0x8000FF48)  # FoS dirge maiden rock
-            rom_data.write_int32(0x10C7B0, 0x0200FF48)  # FoS S1 bridge rock
-            rom_data.write_int32(0x10C86C, 0x0010FF48)  # CW upper rampart save nub
-            rom_data.write_int32(0x10C878, 0x4000FF49)  # CW Dracula switch slab
-            rom_data.write_int32(0x10CAD8, 0x0100FF49)  # Tunnel twin arrows slab
-            rom_data.write_int32(0x10CAE4, 0x0004FF49)  # Tunnel lonesome bucket pit rock
-            rom_data.write_int32(0x10CB54, 0x4000FF4A)  # UW poison parkour ledge
-            rom_data.write_int32(0x10CB60, 0x0080FF4A)  # UW skeleton crusher ledge
-            rom_data.write_int32(0x10CBF0, 0x0008FF4A)  # CC Behemoth crate
-            rom_data.write_int32(0x10CC2C, 0x2000FF4B)  # CC elevator pedestal
-            rom_data.write_int32(0x10CC70, 0x0200FF4B)  # CC lizard locker slab
-            rom_data.write_int32(0x10CD88, 0x0010FF4B)  # ToE pre-midsavepoint platforms ledge
-            rom_data.write_int32(0x10CE6C, 0x4000FF4C)  # ToSci invisible bridge crate
-            rom_data.write_int32(0x10CF20, 0x0080FF4C)  # CT inverted battery slab
-            rom_data.write_int32(0x10CF2C, 0x0008FF4C)  # CT inverted door slab
-            rom_data.write_int32(0x10CF38, 0x8000FF4D)  # CT final room door slab
-            rom_data.write_int32(0x10CF44, 0x1000FF4D)  # CT Renon slab
-            rom_data.write_int32(0x10C908, 0x0008FF4D)  # Villa foyer chandelier
-            rom_data.write_byte(0x10CF37, 0x04)  # pointer for CT final room door slab item data
+        rom_data.write_int32(0xE87F8, 0x00000000)  # NOP
+        rom_data.write_int16(0xE836C, 0x1000)
+        rom_data.write_int32(0xE8B40, 0x0C0FF3CD)  # JAL 0x803FCF34
+        rom_data.write_int32s(0xBFCF34, patches.three_hit_item_flags_setter)
+        # Villa foyer chandelier-specific functions (yeah, IDK why KCEK made different functions for this one)
+        rom_data.write_int32(0xE7D54, 0x00000000)  # NOP
+        rom_data.write_int16(0xE7908, 0x1000)
+        rom_data.write_byte(0xE7A5C, 0x10)
+        rom_data.write_int32(0xE7F08, 0x0C0FF3DF)  # JAL 0x803FCF7C
+        rom_data.write_int32s(0xBFCF7C, patches.chandelier_item_flags_setter)
+
+        # New flag values to put in each 3HB vanilla flag's spot
+        rom_data.write_int32(0x10C7C8, 0x8000FF48)  # FoS dirge maiden rock
+        rom_data.write_int32(0x10C7B0, 0x0200FF48)  # FoS S1 bridge rock
+        rom_data.write_int32(0x10C86C, 0x0010FF48)  # CW upper rampart save nub
+        rom_data.write_int32(0x10C878, 0x4000FF49)  # CW Dracula switch slab
+        rom_data.write_int32(0x10CAD8, 0x0100FF49)  # Tunnel twin arrows slab
+        rom_data.write_int32(0x10CAE4, 0x0004FF49)  # Tunnel lonesome bucket pit rock
+        rom_data.write_int32(0x10CB54, 0x4000FF4A)  # UW poison parkour ledge
+        rom_data.write_int32(0x10CB60, 0x0080FF4A)  # UW skeleton crusher ledge
+        rom_data.write_int32(0x10CBF0, 0x0008FF4A)  # CC Behemoth crate
+        rom_data.write_int32(0x10CC2C, 0x2000FF4B)  # CC elevator pedestal
+        rom_data.write_int32(0x10CC70, 0x0200FF4B)  # CC lizard locker slab
+        rom_data.write_int32(0x10CD88, 0x0010FF4B)  # ToE pre-midsavepoint platforms ledge
+        rom_data.write_int32(0x10CE6C, 0x4000FF4C)  # ToSci invisible bridge crate
+        rom_data.write_int32(0x10CF20, 0x0080FF4C)  # CT inverted battery slab
+        rom_data.write_int32(0x10CF2C, 0x0008FF4C)  # CT inverted door slab
+        rom_data.write_int32(0x10CF38, 0x8000FF4D)  # CT final room door slab
+        rom_data.write_int32(0x10CF44, 0x1000FF4D)  # CT Renon slab
+        rom_data.write_int32(0x10C908, 0x0008FF4D)  # Villa foyer chandelier
+        rom_data.write_byte(0x10CF37, 0x04)  # pointer for CT final room door slab item data
 
         # Once-per-frame gameplay checks
         rom_data.write_int32(0x6C848, 0x080FF40D)  # J 0x803FD034

From 4780fd9974a9392b009e17c72b8f8a1f7671698f Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 01:37:19 +0100
Subject: [PATCH 055/381] The Witness: Rename some *horrendously* named
 variables (#4258)

* Rename all instances of 'multi' to 'progressive' and all instances of 'prog' to 'progression'

* We do a little reordering

* More

* One more
---
 worlds/witness/hints.py        | 34 +++++++++++++++-----------
 worlds/witness/player_items.py |  4 ++--
 worlds/witness/player_logic.py | 44 ++++++++++++++++++----------------
 worlds/witness/rules.py        |  6 ++---
 4 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index dac7e3fb4d05..82837aed0686 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -301,11 +301,11 @@ def hint_from_location(world: "WitnessWorld", location: str) -> Optional[Witness
 
 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 = [
+    progression_item_names_in_this_world = [
         item.name for item in own_itempool
         if item.advancement and item.code and item.location
     ]
-    world.random.shuffle(prog_item_names_in_this_world)
+    world.random.shuffle(progression_item_names_in_this_world)
 
     locations_in_this_world = [
         location for location in world.multiworld.get_locations(world.player)
@@ -318,22 +318,24 @@ def get_item_and_location_names_in_random_order(world: "WitnessWorld",
 
     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
+    return progression_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_item_and_location_names_in_random_order(world, own_itempool)
+    progression_items_in_this_world, locations_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
+        if item in progression_items_in_this_world
     ]
     priority_items = [
         item for item in get_priority_hint_items(world)
-        if item in prog_items_in_this_world
+        if item in progression_items_in_this_world
     ]
 
     if world.options.vague_hints:
@@ -341,11 +343,11 @@ def make_always_and_priority_hints(world: "WitnessWorld", own_itempool: List["Wi
     else:
         always_locations = [
             location for location in get_always_hint_locations(world)
-            if location in loc_in_this_world
+            if location in locations_in_this_world
         ]
         priority_locations = [
             location for location in get_priority_hint_locations(world)
-            if location in loc_in_this_world
+            if location in locations_in_this_world
         ]
 
     # Get always and priority location/item hints
@@ -376,7 +378,9 @@ 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_item_and_location_names_in_random_order(world, own_itempool)
+    progression_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)
 
@@ -390,7 +394,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:
+        if not progression_items_in_this_world and not locations_in_this_world and not hints_to_use_first:
             logging.warning(f"Ran out of items/locations to hint for player {world.player_name}.")
             break
 
@@ -399,8 +403,8 @@ def make_extra_location_hints(world: "WitnessWorld", hint_amount: int, own_itemp
             location_hint = hints_to_use_first.pop()
         elif next_random_hint_is_location and locations_in_this_world:
             location_hint = hint_from_location(world, locations_in_this_world.pop())
-        elif not next_random_hint_is_location and prog_items_in_this_world:
-            location_hint = hint_from_item(world, prog_items_in_this_world.pop(), own_itempool)
+        elif not next_random_hint_is_location and progression_items_in_this_world:
+            location_hint = hint_from_item(world, progression_items_in_this_world.pop(), own_itempool)
         # The list that the hint was supposed to be taken from was empty.
         # Try the other list, which has to still have something, as otherwise, all lists would be empty,
         # which would have triggered the guard condition above.
@@ -587,9 +591,11 @@ def make_area_hints(world: "WitnessWorld", amount: int, already_hinted_locations
     hints = []
 
     for hinted_area in hinted_areas:
-        hint_string, prog_amount, hunt_panels = word_area_hint(world, hinted_area, items_per_area[hinted_area])
+        hint_string, progression_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, hunt_panels))
+        hints.append(
+            WitnessWordedHint(hint_string, None, f"hinted_area:{hinted_area}", progression_amount, hunt_panels)
+        )
 
     if len(hinted_areas) < amount:
         logging.warning(f"Was not able to make {amount} area hints for player {world.player_name}. "
diff --git a/worlds/witness/player_items.py b/worlds/witness/player_items.py
index 3be298ebccae..831e614f21c4 100644
--- a/worlds/witness/player_items.py
+++ b/worlds/witness/player_items.py
@@ -55,7 +55,7 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic,
             name: data for (name, data) in self.item_data.items()
             if data.classification not in
                {ItemClassification.progression, ItemClassification.progression_skip_balancing}
-               or name in player_logic.PROG_ITEMS_ACTUALLY_IN_THE_GAME
+               or name in player_logic.PROGRESSION_ITEMS_ACTUALLY_IN_THE_GAME
         }
 
         # Downgrade door items
@@ -76,7 +76,7 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic,
         }
         for item_name, item_data in progression_dict.items():
             if isinstance(item_data.definition, ProgressiveItemDefinition):
-                num_progression = len(self._logic.MULTI_LISTS[item_name])
+                num_progression = len(self._logic.PROGRESSIVE_LISTS[item_name])
                 self._mandatory_items[item_name] = num_progression
             else:
                 self._mandatory_items[item_name] = 1
diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index f8b7db3570a9..fd86679844a7 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -75,13 +75,15 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in
 
         self.UNREACHABLE_REGIONS: Set[str] = set()
 
+        self.THEORETICAL_BASE_ITEMS: Set[str] = set()
         self.THEORETICAL_ITEMS: Set[str] = set()
-        self.THEORETICAL_ITEMS_NO_MULTI: Set[str] = set()
-        self.MULTI_AMOUNTS: Dict[str, int] = defaultdict(lambda: 1)
-        self.MULTI_LISTS: Dict[str, List[str]] = {}
-        self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI: Set[str] = set()
-        self.PROG_ITEMS_ACTUALLY_IN_THE_GAME: Set[str] = set()
+        self.BASE_PROGESSION_ITEMS_ACTUALLY_IN_THE_GAME: Set[str] = set()
+        self.PROGRESSION_ITEMS_ACTUALLY_IN_THE_GAME: Set[str] = set()
+
+        self.PARENT_ITEM_COUNT_PER_BASE_ITEM: Dict[str, int] = defaultdict(lambda: 1)
+        self.PROGRESSIVE_LISTS: Dict[str, List[str]] = {}
         self.DOOR_ITEMS_BY_ID: Dict[str, List[str]] = {}
+
         self.STARTING_INVENTORY: Set[str] = set()
 
         self.DIFFICULTY = world.options.puzzle_randomization
@@ -183,13 +185,13 @@ def reduce_req_within_region(self, entity_hex: str) -> WitnessRule:
 
         # Remove any items that don't actually exist in the settings (e.g. Symbol Shuffle turned off)
         these_items = frozenset({
-            subset.intersection(self.THEORETICAL_ITEMS_NO_MULTI)
+            subset.intersection(self.THEORETICAL_BASE_ITEMS)
             for subset in these_items
         })
 
         # Update the list of "items that are actually being used by any entity"
         for subset in these_items:
-            self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI.update(subset)
+            self.BASE_PROGESSION_ITEMS_ACTUALLY_IN_THE_GAME.update(subset)
 
         # Handle door entities (door shuffle)
         if entity_hex in self.DOOR_ITEMS_BY_ID:
@@ -197,7 +199,7 @@ def reduce_req_within_region(self, entity_hex: str) -> WitnessRule:
             door_items = frozenset({frozenset([item]) for item in self.DOOR_ITEMS_BY_ID[entity_hex]})
 
             for dependent_item in door_items:
-                self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI.update(dependent_item)
+                self.BASE_PROGESSION_ITEMS_ACTUALLY_IN_THE_GAME.update(dependent_item)
 
             these_items = logical_and_witness_rules([door_items, these_items])
 
@@ -299,10 +301,10 @@ def make_single_adjustment(self, adj_type: str, line: str) -> None:
 
             self.THEORETICAL_ITEMS.add(item_name)
             if isinstance(static_witness_logic.ALL_ITEMS[item_name], ProgressiveItemDefinition):
-                self.THEORETICAL_ITEMS_NO_MULTI.update(cast(ProgressiveItemDefinition,
-                                                            static_witness_logic.ALL_ITEMS[item_name]).child_item_names)
+                self.THEORETICAL_BASE_ITEMS.update(cast(ProgressiveItemDefinition,
+                                                        static_witness_logic.ALL_ITEMS[item_name]).child_item_names)
             else:
-                self.THEORETICAL_ITEMS_NO_MULTI.add(item_name)
+                self.THEORETICAL_BASE_ITEMS.add(item_name)
 
             if static_witness_logic.ALL_ITEMS[item_name].category in [ItemCategory.DOOR, ItemCategory.LASER]:
                 entity_hexes = cast(DoorItemDefinition, static_witness_logic.ALL_ITEMS[item_name]).panel_id_hexes
@@ -316,11 +318,11 @@ def make_single_adjustment(self, adj_type: str, line: str) -> None:
 
             self.THEORETICAL_ITEMS.discard(item_name)
             if isinstance(static_witness_logic.ALL_ITEMS[item_name], ProgressiveItemDefinition):
-                self.THEORETICAL_ITEMS_NO_MULTI.difference_update(
+                self.THEORETICAL_BASE_ITEMS.difference_update(
                     cast(ProgressiveItemDefinition, static_witness_logic.ALL_ITEMS[item_name]).child_item_names
                 )
             else:
-                self.THEORETICAL_ITEMS_NO_MULTI.discard(item_name)
+                self.THEORETICAL_BASE_ITEMS.discard(item_name)
 
             if static_witness_logic.ALL_ITEMS[item_name].category in [ItemCategory.DOOR, ItemCategory.LASER]:
                 entity_hexes = cast(DoorItemDefinition, static_witness_logic.ALL_ITEMS[item_name]).panel_id_hexes
@@ -843,7 +845,7 @@ def make_dependency_reduced_checklist(self) -> None:
         self.REQUIREMENTS_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()
+        self.BASE_PROGESSION_ITEMS_ACTUALLY_IN_THE_GAME = set()
 
         # Make independent requirements for entities
         for entity_hex in self.DEPENDENT_REQUIREMENTS_BY_HEX.keys():
@@ -868,18 +870,18 @@ def finalize_items(self) -> None:
         """
         Finalise which items are used in the world, and handle their progressive versions.
         """
-        for item in self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI:
+        for item in self.BASE_PROGESSION_ITEMS_ACTUALLY_IN_THE_GAME:
             if item not in self.THEORETICAL_ITEMS:
                 progressive_item_name = static_witness_logic.get_parent_progressive_item(item)
-                self.PROG_ITEMS_ACTUALLY_IN_THE_GAME.add(progressive_item_name)
+                self.PROGRESSION_ITEMS_ACTUALLY_IN_THE_GAME.add(progressive_item_name)
                 child_items = cast(ProgressiveItemDefinition,
                                    static_witness_logic.ALL_ITEMS[progressive_item_name]).child_item_names
-                multi_list = [child_item for child_item in child_items
-                              if child_item in self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI]
-                self.MULTI_AMOUNTS[item] = multi_list.index(item) + 1
-                self.MULTI_LISTS[progressive_item_name] = multi_list
+                progressive_list = [child_item for child_item in child_items
+                              if child_item in self.BASE_PROGESSION_ITEMS_ACTUALLY_IN_THE_GAME]
+                self.PARENT_ITEM_COUNT_PER_BASE_ITEM[item] = progressive_list.index(item) + 1
+                self.PROGRESSIVE_LISTS[progressive_item_name] = progressive_list
             else:
-                self.PROG_ITEMS_ACTUALLY_IN_THE_GAME.add(item)
+                self.PROGRESSION_ITEMS_ACTUALLY_IN_THE_GAME.add(item)
 
     def solvability_guaranteed(self, entity_hex: str) -> bool:
         return not (
diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py
index 74ea2aef5740..323d5943c853 100644
--- a/worlds/witness/rules.py
+++ b/worlds/witness/rules.py
@@ -201,10 +201,10 @@ def _has_item(item: str, world: "WitnessWorld",
     if item == "Theater to Tunnels":
         return lambda state: _can_do_theater_to_tunnels(state, world)
 
-    prog_item = static_witness_logic.get_parent_progressive_item(item)
-    needed_amount = player_logic.MULTI_AMOUNTS[item]
+    actual_item = static_witness_logic.get_parent_progressive_item(item)
+    needed_amount = player_logic.PARENT_ITEM_COUNT_PER_BASE_ITEM[item]
 
-    simple_rule: SimpleItemRepresentation = SimpleItemRepresentation(prog_item, needed_amount)
+    simple_rule: SimpleItemRepresentation = SimpleItemRepresentation(actual_item, needed_amount)
     return simple_rule
 
 

From 5d30d16e09d981eb3263c683c742300af1d4d81c Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 01:37:33 +0100
Subject: [PATCH 056/381] Docs: Mention explicit_indirect_conditions & "Menu"
 -> origin_region_name (#3887)

* Docs: Mention explicit_indirect_conditions

https://github.com/ArchipelagoMW/Archipelago/pull/3682

* Update world api.md

* Docs: "Menu" -> origin_region_name

https://github.com/ArchipelagoMW/Archipelago/pull/3682

* Update docs/world api.md

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

* Update world api.md

* I just didn't do this one and then Medic approved it anyway LMAO

* Update world api.md

---------

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
---
 docs/world api.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/world api.md b/docs/world api.md
index bf09d965f11d..20669d7ae7be 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -288,8 +288,8 @@ like entrance randomization in logic.
 
 Regions have a list called `exits`, containing `Entrance` objects representing transitions to other regions.
 
-There must be one special region, "Menu", from which the logic unfolds. AP assumes that a player will always be able to
-return to the "Menu" region by resetting the game ("Save and quit").
+There must be one special region (Called "Menu" by default, but configurable using [origin_region_name](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/AutoWorld.py#L295-L296)),
+from which the logic unfolds. AP assumes that a player will always be able to return to this starting region by resetting the game ("Save and quit").
 
 ### Entrances
 
@@ -328,6 +328,9 @@ Even doing `state.can_reach_location` or `state.can_reach_entrance` is problemat
 You can use `multiworld.register_indirect_condition(region, entrance)` to explicitly tell the generator that, when a given region becomes accessible, it is necessary to re-check a specific entrance.
 You **must** use `multiworld.register_indirect_condition` if you perform this kind of `can_reach` from an entrance access rule, unless you have a **very** good technical understanding of the relevant code and can reason why it will never lead to problems in your case.
 
+Alternatively, you can set [world.explicit_indirect_conditions = False](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/AutoWorld.py#L298-L301),
+avoiding the need for indirect conditions at the expense of performance.
+
 ### Item Rules
 
 An item rule is a function that returns `True` or `False` for a `Location` based on a single item. It can be used to
@@ -463,7 +466,7 @@ The world has to provide the following things for generation:
 
 * the properties mentioned above
 * additions to the item pool
-* additions to the regions list: at least one called "Menu"
+* additions to the regions list: at least one named after the world class's origin_region_name ("Menu" by default)
 * locations placed inside those regions
 * a `def create_item(self, item: str) -> MyGameItem` to create any item on demand
 * applying `self.multiworld.push_precollected` for world-defined start inventory
@@ -516,7 +519,7 @@ def generate_early(self) -> None:
 
 ```python
 def create_regions(self) -> None:
-    # Add regions to the multiworld. "Menu" is the required starting point.
+    # Add regions to the multiworld. One of them must use the origin_region_name as its name ("Menu" by default).
     # Arguments to Region() are name, player, multiworld, and optionally hint_text
     menu_region = Region("Menu", self.player, self.multiworld)
     self.multiworld.regions.append(menu_region)  # or use += [menu_region...]

From 3cb5219e09a4908cfbce3249372bffff9ca32410 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Fri, 29 Nov 2024 00:38:17 +0000
Subject: [PATCH 057/381] Core: Fix playthrough only checking half of the
 sphere 0 items (#4268)

* Core: Fix playthrough only checking half of the sphere 0 items

The lists of precollected items were being mutated while iterating those
same lists, causing playthrough to skip checking half of the sphere 0
advancement items.

This patch ensures the lists are copied before they are iterated.

* Replace chain.from_iterable with two for loops for better clarity

Added a comment to `multiworld.push_precollected(item)` to explain that
it is also modifying `precollected_items`.
---
 BaseClasses.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 2e4efd606df9..1ee27e02fe54 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1384,14 +1384,21 @@ def create_playthrough(self, create_paths: bool = True) -> None:
 
         # second phase, sphere 0
         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)
-            multiworld.state.remove(item)
-            if not multiworld.can_beat_game():
-                multiworld.push_precollected(item)
-            else:
-                removed_precollected.append(item)
+
+        for precollected_items in multiworld.precollected_items.values():
+            # The list of items is mutated by removing one item at a time to determine if each item is required to beat
+            # the game, and re-adding that item if it was required, so a copy needs to be made before iterating.
+            for item in precollected_items.copy():
+                if not item.advancement:
+                    continue
+                logging.debug('Checking if %s (Player %d) is required to beat the game.', item.name, item.player)
+                precollected_items.remove(item)
+                multiworld.state.remove(item)
+                if not multiworld.can_beat_game():
+                    # Add the item back into `precollected_items` and collect it into `multiworld.state`.
+                    multiworld.push_precollected(item)
+                else:
+                    removed_precollected.append(item)
 
         # we are now down to just the required progress items in collection_spheres. Unfortunately
         # the previous pruning stage could potentially have made certain items dependant on others

From c022c742b529fe2dda59c2606a590c35c195e2cc Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Thu, 28 Nov 2024 19:38:53 -0500
Subject: [PATCH 058/381] Core: Add item.filler helper (#4081)

* Add filler helper

* Update BaseClasses.py
---
 BaseClasses.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BaseClasses.py b/BaseClasses.py
index 1ee27e02fe54..9bf9e68608a5 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1262,6 +1262,10 @@ def useful(self) -> bool:
     def trap(self) -> bool:
         return ItemClassification.trap in self.classification
 
+    @property
+    def filler(self) -> bool:
+        return not (self.advancement or self.useful or self.trap)
+
     @property
     def excludable(self) -> bool:
         return not (self.advancement or self.useful)

From ce78c75999aaa1573f1d8ab16b6e190f163ede2e Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Thu, 28 Nov 2024 19:40:53 -0500
Subject: [PATCH 059/381] OoT: Turn Logic Tricks into an OptionSet (#3551)

* Alphabetizing WebHost display for logic tricks

* Convert to a Set

* Changing this back to match upstream
---
 worlds/oot/Options.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/oot/Options.py b/worlds/oot/Options.py
index 613c5d01b381..797b276b766c 100644
--- a/worlds/oot/Options.py
+++ b/worlds/oot/Options.py
@@ -1,7 +1,7 @@
 import typing
 import random
 from dataclasses import dataclass
-from Options import Option, DefaultOnToggle, Toggle, Range, OptionList, OptionSet, DeathLink, PlandoConnections, \
+from Options import Option, DefaultOnToggle, Toggle, Range, OptionSet, DeathLink, PlandoConnections, \
     PerGameCommonOptions, OptionGroup
 from .EntranceShuffle import entrance_shuffle_table
 from .LogicTricks import normalized_name_tricks
@@ -1272,7 +1272,7 @@ class SfxOcarina(Choice):
 }
 
 
-class LogicTricks(OptionList):
+class LogicTricks(OptionSet):
     """Set various tricks for logic in Ocarina of Time. 
     Format as a comma-separated list of "nice" names: ["Fewer Tunic Requirements", "Hidden Grottos without Stone of Agony"].
     A full list of supported tricks can be found at:

From 62e4285924f5825f87ad141562c5a7f8bbb3fc34 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 01:41:13 +0100
Subject: [PATCH 060/381] Core: Make region.add_exits return the created
 Entrances (#3885)

* Core: Make region.add_exits return the created Entrances

* Update BaseClasses.py

* Update BaseClasses.py

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 BaseClasses.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 9bf9e68608a5..700a21506ac8 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1110,7 +1110,7 @@ def create_exit(self, name: str) -> Entrance:
         return exit_
 
     def add_exits(self, exits: Union[Iterable[str], Dict[str, Optional[str]]],
-                  rules: Dict[str, Callable[[CollectionState], bool]] = None) -> None:
+                  rules: Dict[str, Callable[[CollectionState], bool]] = None) -> List[Entrance]:
         """
         Connects current region to regions in exit dictionary. Passed region names must exist first.
 
@@ -1120,10 +1120,14 @@ def add_exits(self, exits: Union[Iterable[str], Dict[str, Optional[str]]],
         """
         if not isinstance(exits, Dict):
             exits = dict.fromkeys(exits)
-        for connecting_region, name in exits.items():
-            self.connect(self.multiworld.get_region(connecting_region, self.player),
-                         name,
-                         rules[connecting_region] if rules and connecting_region in rules else None)
+        return [
+            self.connect(
+                self.multiworld.get_region(connecting_region, self.player),
+                name,
+                rules[connecting_region] if rules and connecting_region in rules else None,
+            )
+            for connecting_region, name in exits.items()
+        ]
 
     def __repr__(self):
         return self.multiworld.get_name_string_for_object(self) if self.multiworld else f'{self.name} (Player {self.player})'

From 82260d728fb5780dfba12e93c53b840be48d9299 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 01:41:40 +0100
Subject: [PATCH 061/381] The Witness: Add Fast Travel Option (#3766)

* add unlockable warps

* Change Swamp Near Platform to Swamp Platform

* apply changes to variety as well
---
 worlds/witness/data/WitnessLogic.txt        |  4 ++--
 worlds/witness/data/WitnessLogicExpert.txt  |  4 ++--
 worlds/witness/data/WitnessLogicVanilla.txt |  4 ++--
 worlds/witness/data/WitnessLogicVariety.txt |  4 ++--
 worlds/witness/options.py                   | 14 ++++++++++++++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/worlds/witness/data/WitnessLogic.txt b/worlds/witness/data/WitnessLogic.txt
index 8fadf68c3131..0dbb88a107b1 100644
--- a/worlds/witness/data/WitnessLogic.txt
+++ b/worlds/witness/data/WitnessLogic.txt
@@ -752,12 +752,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
 158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers
 158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers
 
-Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
+Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
 158302 - 0x00609 (Sliding Bridge) - True - Shapers
 159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
 159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True
 
-Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
+Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
 158313 - 0x00982 (Platform Row 1) - True - Shapers
 158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
 158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
diff --git a/worlds/witness/data/WitnessLogicExpert.txt b/worlds/witness/data/WitnessLogicExpert.txt
index c6d6efa96485..0f601724acbe 100644
--- a/worlds/witness/data/WitnessLogicExpert.txt
+++ b/worlds/witness/data/WitnessLogicExpert.txt
@@ -752,12 +752,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
 158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers & Rotated Shapers & Triangles & Black/White Squares
 158301 - 0x181A9 (Intro Back 8) - 0x00987 - Rotated Shapers & Triangles & Black/White Squares
 
-Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
+Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
 158302 - 0x00609 (Sliding Bridge) - True - Shapers & Black/White Squares
 159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
 159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True
 
-Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
+Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
 158313 - 0x00982 (Platform Row 1) - True - Rotated Shapers
 158314 - 0x0097F (Platform Row 2) - 0x00982 - Rotated Shapers
 158315 - 0x0098F (Platform Row 3) - 0x0097F - Rotated Shapers
diff --git a/worlds/witness/data/WitnessLogicVanilla.txt b/worlds/witness/data/WitnessLogicVanilla.txt
index 1186c470233e..f0c6a8690ed3 100644
--- a/worlds/witness/data/WitnessLogicVanilla.txt
+++ b/worlds/witness/data/WitnessLogicVanilla.txt
@@ -752,12 +752,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
 158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers
 158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers
 
-Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
+Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
 158302 - 0x00609 (Sliding Bridge) - True - Shapers
 159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
 159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True
 
-Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
+Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
 158313 - 0x00982 (Platform Row 1) - True - Shapers
 158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
 158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
diff --git a/worlds/witness/data/WitnessLogicVariety.txt b/worlds/witness/data/WitnessLogicVariety.txt
index 31263aa33790..b7b705a6db9f 100644
--- a/worlds/witness/data/WitnessLogicVariety.txt
+++ b/worlds/witness/data/WitnessLogicVariety.txt
@@ -752,12 +752,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
 158300 - 0x00987 (Intro Back 7) - 0x00985 - Rotated Shapers & Triangles
 158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers & Triangles
 
-Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
+Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
 158302 - 0x00609 (Sliding Bridge) - True - Shapers
 159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
 159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True
 
-Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
+Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
 158313 - 0x00982 (Platform Row 1) - True - Shapers
 158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
 158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
diff --git a/worlds/witness/options.py b/worlds/witness/options.py
index d1713e73c541..bb935388e3c7 100644
--- a/worlds/witness/options.py
+++ b/worlds/witness/options.py
@@ -164,6 +164,16 @@ class ObeliskKeys(DefaultOnToggle):
     display_name = "Obelisk Keys"
 
 
+class UnlockableWarps(Toggle):
+    """
+    Adds unlockable fast travel points to the game.
+    These warp points are represented by spheres in game. You walk up to one, you unlock it for warping.
+
+    The warp points are: Entry, Symmetry Island, Desert, Quarry, Keep, Shipwreck, Town, Jungle, Bunker, Treehouse, Mountaintop, Caves.
+    """
+    display_name = "Unlockable Fast Travel Points"
+
+
 class ShufflePostgame(Toggle):
     """
     Adds locations into the pool that are guaranteed to become accessible after or at the same time as your goal.
@@ -424,6 +434,7 @@ class TheWitnessOptions(PerGameCommonOptions):
     shuffle_discarded_panels: ShuffleDiscardedPanels
     shuffle_vault_boxes: ShuffleVaultBoxes
     obelisk_keys: ObeliskKeys
+    unlockable_warps: UnlockableWarps
     shuffle_EPs: ShuffleEnvironmentalPuzzles  # noqa: N815
     EP_difficulty: EnvironmentalPuzzlesDifficulty
     shuffle_postgame: ShufflePostgame
@@ -479,6 +490,9 @@ class TheWitnessOptions(PerGameCommonOptions):
         ShuffleBoat,
         ObeliskKeys,
     ]),
+    OptionGroup("Warps", [
+       UnlockableWarps,
+    ]),
     OptionGroup("Filler Items", [
         PuzzleSkipAmount,
         TrapPercentage,

From 710cf4ebba67198133bd02150b08e757c3fc9c0d Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 01:42:08 +0100
Subject: [PATCH 062/381] Core: Add __iter__ to VerifyKeys (#3550)

* Add __iter__ to VerifyKeys

* Typing
---
 Options.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Options.py b/Options.py
index 992348cb546d..d81f81face06 100644
--- a/Options.py
+++ b/Options.py
@@ -828,7 +828,10 @@ def verify(self, world: typing.Type[World], player_name: str, plando_options: "P
                                     f"is not a valid location name from {world.game}. "
                                     f"Did you mean '{picks[0][0]}' ({picks[0][1]}% sure)")
 
+    def __iter__(self) -> typing.Iterator[typing.Any]:
+        return self.value.__iter__()
 
+    
 class OptionDict(Option[typing.Dict[str, typing.Any]], VerifyKeys, typing.Mapping[str, typing.Any]):
     default = {}
     supports_weighting = False

From 1ba7700283a50e3b11ae791452cc6b80d0d3fe26 Mon Sep 17 00:00:00 2001
From: Justus Lind <DeamonHunter@users.noreply.github.com>
Date: Fri, 29 Nov 2024 10:44:21 +1000
Subject: [PATCH 063/381] Muse Dash: Change AttributeError to KeyError when
 Create_Item receives an item name that doesn't exist in the world (#4215)

* Change missing attribute error to key error.

* Swap to explicit key error

* Revert "Swap to explicit key error"

This reverts commit 719255891e543d15720b6bdeb293621266618efc.
---
 worlds/musedash/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/musedash/__init__.py b/worlds/musedash/__init__.py
index ab3a4819fc48..be2eec2f87b8 100644
--- a/worlds/musedash/__init__.py
+++ b/worlds/musedash/__init__.py
@@ -183,7 +183,7 @@ def create_item(self, name: str) -> Item:
         if album:
             return MuseDashSongItem(name, self.player, album)
 
-        song = self.md_collection.song_items.get(name)
+        song = self.md_collection.song_items[name]
         return MuseDashSongItem(name, self.player, song)
 
     def get_filler_item_name(self) -> str:

From faeb54224edeeba14a2491acb10e81d5920ead32 Mon Sep 17 00:00:00 2001
From: josephwhite <damasta21th@aol.com>
Date: Thu, 28 Nov 2024 19:45:26 -0500
Subject: [PATCH 064/381] Super Mario 64: Option groups (#4161)

* sm64ex: add option groups

* sm64ex: rename sanity options group to item options

* sm64ex: rename sanity options group to logic options

* sm64ex: seperate star costs from goal options and add entrance rando to logic options

* sm64ex: seperate ability options from logic options group
---
 worlds/sm64ex/Options.py  | 28 +++++++++++++++++++++++++++-
 worlds/sm64ex/__init__.py |  4 +++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/worlds/sm64ex/Options.py b/worlds/sm64ex/Options.py
index 8269d3a262cd..6cf233558ce2 100644
--- a/worlds/sm64ex/Options.py
+++ b/worlds/sm64ex/Options.py
@@ -1,6 +1,6 @@
 import typing
 from dataclasses import dataclass
-from Options import DefaultOnToggle, Range, Toggle, DeathLink, Choice, PerGameCommonOptions, OptionSet
+from Options import DefaultOnToggle, Range, Toggle, DeathLink, Choice, PerGameCommonOptions, OptionSet, OptionGroup
 from .Items import action_item_table
 
 class EnableCoinStars(DefaultOnToggle):
@@ -127,6 +127,32 @@ class MoveRandomizerActions(OptionSet):
     valid_keys = [action for action in action_item_table if action != 'Double Jump']
     default = valid_keys
 
+sm64_options_groups = [
+    OptionGroup("Logic Options", [
+        AreaRandomizer,
+        BuddyChecks,
+        ExclamationBoxes,
+        ProgressiveKeys,
+        EnableCoinStars,
+        StrictCapRequirements,
+        StrictCannonRequirements,
+    ]),
+    OptionGroup("Ability Options", [
+        EnableMoveRandomizer,
+        MoveRandomizerActions,
+        StrictMoveRequirements,
+    ]),
+    OptionGroup("Star Options", [
+        AmountOfStars,
+        FirstBowserStarDoorCost,
+        BasementStarDoorCost,
+        SecondFloorStarDoorCost,
+        MIPS1Cost,
+        MIPS2Cost,
+        StarsToFinish,
+    ]),
+]
+
 @dataclass
 class SM64Options(PerGameCommonOptions):
     area_rando: AreaRandomizer
diff --git a/worlds/sm64ex/__init__.py b/worlds/sm64ex/__init__.py
index d4bafbafcc57..40c778ebe66c 100644
--- a/worlds/sm64ex/__init__.py
+++ b/worlds/sm64ex/__init__.py
@@ -3,7 +3,7 @@
 import json
 from .Items import item_table, action_item_table, cannon_item_table, SM64Item
 from .Locations import location_table, SM64Location
-from .Options import SM64Options
+from .Options import sm64_options_groups, SM64Options
 from .Rules import set_rules
 from .Regions import create_regions, sm64_level_to_entrances, SM64Levels
 from BaseClasses import Item, Tutorial, ItemClassification, Region
@@ -20,6 +20,8 @@ class SM64Web(WebWorld):
         ["N00byKing"]
     )]
 
+    option_groups = sm64_options_groups
+
 
 class SM64World(World):
     """ 

From b972e8c0716dc39661b055ebc289d2b9b6d7d34f Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Fri, 29 Nov 2024 01:57:18 +0100
Subject: [PATCH 065/381] Core: fix deprecation warning for utcnow() in
 setup.py (#4170)

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f075551d58b0..59c2d698d35b 100644
--- a/setup.py
+++ b/setup.py
@@ -321,7 +321,7 @@ def run(self) -> None:
                                   f"{ex}\nPlease close all AP instances and delete manually.")
 
         # regular cx build
-        self.buildtime = datetime.datetime.utcnow()
+        self.buildtime = datetime.datetime.now(datetime.timezone.utc)
         super().run()
 
         # manually copy built modules to lib folder. cx_Freeze does not know they exist.

From b783eab1e868160a14e4a424abdb105c11004eea Mon Sep 17 00:00:00 2001
From: Emily <35015090+EmilyV99@users.noreply.github.com>
Date: Thu, 28 Nov 2024 20:10:31 -0500
Subject: [PATCH 066/381] Core: Introduce 'Hint Priority' concept (#3506)

* Introduce 'Hint Priority' concept

* fix error when sorting hints while not connected

* fix 'found' -> 'status' kivy stuff

* remove extraneous warning

this warning fired if you clicked to select or toggle priority of any hint, as you weren't clicking on the header...

* skip scanning individual header widgets when not clicking on the header

* update hints on disconnection

* minor cleanup

* minor fixes/cleanup

* fix: hints not updating properly for receiving player

* update re: review

* 'type() is' -> 'isinstance()'

* cleanup, re: Jouramie's review

* Change 'priority' to 'status', add 'Unspecified' and 'Avoid' statuses, update colors

* cleanup

* move dicts out of functions

* fix: new hints being returned when hint already exists

* fix: show `Found` properly when hinting already-found hints

* import `Hint` and `HintStatus` directly from `NetUtils`

* Default any hinted `Trap` item to be classified as `Avoid` by default

* add some sanity checks

* re: Vi's feedback

* move dict out of function

* Update kvui.py

* remove unneeded dismiss message

* allow lclick to drop hint status dropdown

* underline hint statuses to indicate clickability

* only underline clickable statuses

* Update kvui.py

* Update kvui.py

---------

Co-authored-by: Silvris <58583688+Silvris@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 CommonClient.py          |  12 ++-
 Main.py                  |   2 +-
 MultiServer.py           | 174 ++++++++++++++++++++++++++++++---------
 NetUtils.py              |  41 +++++++--
 Utils.py                 |   3 +-
 data/client.kv           |   8 +-
 docs/network protocol.md |  24 ++++++
 kvui.py                  |  96 ++++++++++++++++-----
 8 files changed, 288 insertions(+), 72 deletions(-)

diff --git a/CommonClient.py b/CommonClient.py
index 47100a7383ab..fc6ae6d9a5fa 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -23,7 +23,7 @@
 
 from MultiServer import CommandProcessor
 from NetUtils import (Endpoint, decode, NetworkItem, encode, JSONtoTextParser, ClientStatus, Permission, NetworkSlot,
-                      RawJSONtoTextParser, add_json_text, add_json_location, add_json_item, JSONTypes, SlotType)
+                      RawJSONtoTextParser, add_json_text, add_json_location, add_json_item, JSONTypes, HintStatus, SlotType)
 from Utils import Version, stream_input, async_start
 from worlds import network_data_package, AutoWorldRegister
 import os
@@ -412,6 +412,7 @@ async def disconnect(self, allow_autoreconnect: bool = False):
             await self.server.socket.close()
         if self.server_task is not None:
             await self.server_task
+        self.ui.update_hints()
 
     async def send_msgs(self, msgs: typing.List[typing.Any]) -> None:
         """ `msgs` JSON serializable """
@@ -551,7 +552,14 @@ async def shutdown(self):
             await self.ui_task
         if self.input_task:
             self.input_task.cancel()
-
+    
+    # Hints
+    def update_hint(self, location: int, finding_player: int, status: typing.Optional[HintStatus]) -> None:
+        msg = {"cmd": "UpdateHint", "location": location, "player": finding_player}
+        if status is not None:
+            msg["status"] = status
+        async_start(self.send_msgs([msg]), name="update_hint")
+    
     # DataPackage
     async def prepare_data_package(self, relevant_games: typing.Set[str],
                                    remote_date_package_versions: typing.Dict[str, int],
diff --git a/Main.py b/Main.py
index 4008ca5e9017..6b94b84c278b 100644
--- a/Main.py
+++ b/Main.py
@@ -276,7 +276,7 @@ def write_multidata():
                 def precollect_hint(location):
                     entrance = er_hint_data.get(location.player, {}).get(location.address, "")
                     hint = NetUtils.Hint(location.item.player, location.player, location.address,
-                                         location.item.code, False, entrance, location.item.flags)
+                                         location.item.code, False, entrance, location.item.flags, False)
                     precollected_hints[location.player].add(hint)
                     if location.item.player not in multiworld.groups:
                         precollected_hints[location.item.player].add(hint)
diff --git a/MultiServer.py b/MultiServer.py
index 847a0b281c40..0db8722b5cb6 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -41,7 +41,8 @@
 import Utils
 from Utils import version_tuple, restricted_loads, Version, async_start, get_intended_text
 from NetUtils import Endpoint, ClientStatus, NetworkItem, decode, encode, NetworkPlayer, Permission, NetworkSlot, \
-    SlotType, LocationStore
+    SlotType, LocationStore, Hint, HintStatus
+from BaseClasses import ItemClassification
 
 min_client_version = Version(0, 1, 6)
 colorama.init()
@@ -228,7 +229,7 @@ def __init__(self, host: str, port: int, server_password: str, password: str, lo
         self.hint_cost = hint_cost
         self.location_check_points = location_check_points
         self.hints_used = collections.defaultdict(int)
-        self.hints: typing.Dict[team_slot, typing.Set[NetUtils.Hint]] = collections.defaultdict(set)
+        self.hints: typing.Dict[team_slot, typing.Set[Hint]] = collections.defaultdict(set)
         self.release_mode: str = release_mode
         self.remaining_mode: str = remaining_mode
         self.collect_mode: str = collect_mode
@@ -656,13 +657,29 @@ def get_hint_cost(self, slot):
             return max(1, int(self.hint_cost * 0.01 * len(self.locations[slot])))
         return 0
 
-    def recheck_hints(self, team: typing.Optional[int] = None, slot: typing.Optional[int] = None):
+    def recheck_hints(self, team: typing.Optional[int] = None, slot: typing.Optional[int] = None,
+                      changed: typing.Optional[typing.Set[team_slot]] = None) -> None:
+        """Refreshes the hints for the specified team/slot. Providing 'None' for either team or slot
+        will refresh all teams or all slots respectively. If a set is passed for 'changed', each (team,slot)
+        pair that has at least one hint modified will be added to the set.
+        """
         for hint_team, hint_slot in self.hints:
-            if (team is None or team == hint_team) and (slot is None or slot == hint_slot):
-                self.hints[hint_team, hint_slot] = {
-                    hint.re_check(self, hint_team) for hint in
-                    self.hints[hint_team, hint_slot]
-                }
+            if team != hint_team and team is not None:
+                continue  # Check specified team only, all if team is None
+            if slot != hint_slot and slot is not None:
+                continue  # Check specified slot only, all if slot is None
+            new_hints: typing.Set[Hint] = set()
+            for hint in self.hints[hint_team, hint_slot]:
+                new_hint = hint.re_check(self, hint_team)
+                new_hints.add(new_hint)
+                if hint == new_hint:
+                    continue
+                for player in self.slot_set(hint.receiving_player) | {hint.finding_player}:
+                    if changed is not None:
+                        changed.add((hint_team,player))
+                    if slot is not None and slot != player:
+                        self.replace_hint(hint_team, player, hint, new_hint)
+            self.hints[hint_team, hint_slot] = new_hints
 
     def get_rechecked_hints(self, team: int, slot: int):
         self.recheck_hints(team, slot)
@@ -711,7 +728,7 @@ def get_aliased_name(self, team: int, slot: int):
         else:
             return self.player_names[team, slot]
 
-    def notify_hints(self, team: int, hints: typing.List[NetUtils.Hint], only_new: bool = False,
+    def notify_hints(self, team: int, hints: typing.List[Hint], only_new: bool = False,
                      recipients: typing.Sequence[int] = None):
         """Send and remember hints."""
         if only_new:
@@ -749,6 +766,17 @@ def notify_hints(self, team: int, hints: typing.List[NetUtils.Hint], only_new: b
                 for client in clients:
                     async_start(self.send_msgs(client, client_hints))
 
+    def get_hint(self, team: int, finding_player: int, seeked_location: int) -> typing.Optional[Hint]:
+        for hint in self.hints[team, finding_player]:
+            if hint.location == seeked_location:
+                return hint
+        return None
+    
+    def replace_hint(self, team: int, slot: int, old_hint: Hint, new_hint: Hint) -> None:
+        if old_hint in self.hints[team, slot]:
+            self.hints[team, slot].remove(old_hint)
+            self.hints[team, slot].add(new_hint)
+    
     # "events"
 
     def on_goal_achieved(self, client: Client):
@@ -1050,14 +1078,15 @@ def register_location_checks(ctx: Context, team: int, slot: int, locations: typi
             "hint_points": get_slot_points(ctx, team, slot),
             "checked_locations": new_locations,  # send back new checks only
         }])
-        old_hints = ctx.hints[team, slot].copy()
-        ctx.recheck_hints(team, slot)
-        if old_hints != ctx.hints[team, slot]:
-            ctx.on_changed_hints(team, slot)
+        updated_slots: typing.Set[tuple[int, int]] = set()
+        ctx.recheck_hints(team, slot, updated_slots)
+        for hint_team, hint_slot in updated_slots:
+            ctx.on_changed_hints(hint_team, hint_slot)
         ctx.save()
 
 
-def collect_hints(ctx: Context, team: int, slot: int, item: typing.Union[int, str]) -> typing.List[NetUtils.Hint]:
+def collect_hints(ctx: Context, team: int, slot: int, item: typing.Union[int, str], auto_status: HintStatus) \
+        -> typing.List[Hint]:
     hints = []
     slots: typing.Set[int] = {slot}
     for group_id, group in ctx.groups.items():
@@ -1067,31 +1096,58 @@ def collect_hints(ctx: Context, team: int, slot: int, item: typing.Union[int, st
     seeked_item_id = item if isinstance(item, int) else ctx.item_names_for_game(ctx.games[slot])[item]
     for finding_player, location_id, item_id, receiving_player, item_flags \
             in ctx.locations.find_item(slots, seeked_item_id):
-        found = location_id in ctx.location_checks[team, finding_player]
-        entrance = ctx.er_hint_data.get(finding_player, {}).get(location_id, "")
-        hints.append(NetUtils.Hint(receiving_player, finding_player, location_id, item_id, found, entrance,
-                                   item_flags))
+        prev_hint = ctx.get_hint(team, slot, location_id)
+        if prev_hint:
+            hints.append(prev_hint)
+        else:
+            found = location_id in ctx.location_checks[team, finding_player]
+            entrance = ctx.er_hint_data.get(finding_player, {}).get(location_id, "")
+            new_status = auto_status
+            if found:
+                new_status = HintStatus.HINT_FOUND
+            elif item_flags & ItemClassification.trap:
+                new_status = HintStatus.HINT_AVOID
+            hints.append(Hint(receiving_player, finding_player, location_id, item_id, found, entrance,
+                                       item_flags, new_status))
 
     return hints
 
 
-def collect_hint_location_name(ctx: Context, team: int, slot: int, location: str) -> typing.List[NetUtils.Hint]:
+def collect_hint_location_name(ctx: Context, team: int, slot: int, location: str, auto_status: HintStatus) \
+        -> typing.List[Hint]:
     seeked_location: int = ctx.location_names_for_game(ctx.games[slot])[location]
-    return collect_hint_location_id(ctx, team, slot, seeked_location)
+    return collect_hint_location_id(ctx, team, slot, seeked_location, auto_status)
 
 
-def collect_hint_location_id(ctx: Context, team: int, slot: int, seeked_location: int) -> typing.List[NetUtils.Hint]:
+def collect_hint_location_id(ctx: Context, team: int, slot: int, seeked_location: int, auto_status: HintStatus) \
+        -> typing.List[Hint]:
+    prev_hint = ctx.get_hint(team, slot, seeked_location)
+    if prev_hint:
+        return [prev_hint]
     result = ctx.locations[slot].get(seeked_location, (None, None, None))
     if any(result):
         item_id, receiving_player, item_flags = result
 
         found = seeked_location in ctx.location_checks[team, slot]
         entrance = ctx.er_hint_data.get(slot, {}).get(seeked_location, "")
-        return [NetUtils.Hint(receiving_player, slot, seeked_location, item_id, found, entrance, item_flags)]
+        new_status = auto_status
+        if found:
+            new_status = HintStatus.HINT_FOUND
+        elif item_flags & ItemClassification.trap:
+            new_status = HintStatus.HINT_AVOID
+        return [Hint(receiving_player, slot, seeked_location, item_id, found, entrance, item_flags,
+                              new_status)]
     return []
 
 
-def format_hint(ctx: Context, team: int, hint: NetUtils.Hint) -> str:
+status_names: typing.Dict[HintStatus, str] = {
+    HintStatus.HINT_FOUND: "(found)",
+    HintStatus.HINT_UNSPECIFIED: "(unspecified)",
+    HintStatus.HINT_NO_PRIORITY: "(no priority)",
+    HintStatus.HINT_AVOID: "(avoid)",
+    HintStatus.HINT_PRIORITY: "(priority)",
+}
+def format_hint(ctx: Context, team: int, hint: Hint) -> str:
     text = f"[Hint]: {ctx.player_names[team, hint.receiving_player]}'s " \
            f"{ctx.item_names[ctx.slot_info[hint.receiving_player].game][hint.item]} is " \
            f"at {ctx.location_names[ctx.slot_info[hint.finding_player].game][hint.location]} " \
@@ -1099,7 +1155,8 @@ def format_hint(ctx: Context, team: int, hint: NetUtils.Hint) -> str:
 
     if hint.entrance:
         text += f" at {hint.entrance}"
-    return text + (". (found)" if hint.found else ".")
+    
+    return text + ". " + status_names.get(hint.status, "(unknown)")
 
 
 def json_format_send_event(net_item: NetworkItem, receiving_player: int):
@@ -1503,7 +1560,7 @@ def _cmd_getitem(self, item_name: str) -> bool:
     def get_hints(self, input_text: str, for_location: bool = False) -> bool:
         points_available = get_client_points(self.ctx, self.client)
         cost = self.ctx.get_hint_cost(self.client.slot)
-
+        auto_status = HintStatus.HINT_UNSPECIFIED if for_location else HintStatus.HINT_PRIORITY
         if not input_text:
             hints = {hint.re_check(self.ctx, self.client.team) for hint in
                      self.ctx.hints[self.client.team, self.client.slot]}
@@ -1529,9 +1586,9 @@ def get_hints(self, input_text: str, for_location: bool = False) -> bool:
                 self.output(f"Sorry, \"{hint_name}\" is marked as non-hintable.")
                 hints = []
             elif not for_location:
-                hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_id)
+                hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_id, auto_status)
             else:
-                hints = collect_hint_location_id(self.ctx, self.client.team, self.client.slot, hint_id)
+                hints = collect_hint_location_id(self.ctx, self.client.team, self.client.slot, hint_id, auto_status)
 
         else:
             game = self.ctx.games[self.client.slot]
@@ -1551,16 +1608,16 @@ def get_hints(self, input_text: str, for_location: bool = False) -> bool:
                     hints = []
                     for item_name in self.ctx.item_name_groups[game][hint_name]:
                         if item_name in self.ctx.item_names_for_game(game):  # ensure item has an ID
-                            hints.extend(collect_hints(self.ctx, self.client.team, self.client.slot, item_name))
+                            hints.extend(collect_hints(self.ctx, self.client.team, self.client.slot, item_name, auto_status))
                 elif not for_location and hint_name in self.ctx.item_names_for_game(game):  # item name
-                    hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_name)
+                    hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_name, auto_status)
                 elif hint_name in self.ctx.location_name_groups[game]:  # location group name
                     hints = []
                     for loc_name in self.ctx.location_name_groups[game][hint_name]:
                         if loc_name in self.ctx.location_names_for_game(game):
-                            hints.extend(collect_hint_location_name(self.ctx, self.client.team, self.client.slot, loc_name))
+                            hints.extend(collect_hint_location_name(self.ctx, self.client.team, self.client.slot, loc_name, auto_status))
                 else:  # location name
-                    hints = collect_hint_location_name(self.ctx, self.client.team, self.client.slot, hint_name)
+                    hints = collect_hint_location_name(self.ctx, self.client.team, self.client.slot, hint_name, auto_status)
 
             else:
                 self.output(response)
@@ -1832,13 +1889,51 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
 
                 target_item, target_player, flags = ctx.locations[client.slot][location]
                 if create_as_hint:
-                    hints.extend(collect_hint_location_id(ctx, client.team, client.slot, location))
+                    hints.extend(collect_hint_location_id(ctx, client.team, client.slot, location,
+                                                          HintStatus.HINT_UNSPECIFIED))
                 locs.append(NetworkItem(target_item, location, target_player, flags))
             ctx.notify_hints(client.team, hints, only_new=create_as_hint == 2)
             if locs and create_as_hint:
                 ctx.save()
             await ctx.send_msgs(client, [{'cmd': 'LocationInfo', 'locations': locs}])
-
+        
+        elif cmd == 'UpdateHint':
+            location = args["location"]
+            player = args["player"]
+            status = args["status"]
+            if not isinstance(player, int) or not isinstance(location, int) \
+                    or (status is not None and not isinstance(status, int)):
+                await ctx.send_msgs(client,
+                                    [{'cmd': 'InvalidPacket', "type": "arguments", "text": 'UpdateHint',
+                                      "original_cmd": cmd}])
+                return
+            hint = ctx.get_hint(client.team, player, location)
+            if not hint:
+                return  # Ignored safely
+            if hint.receiving_player != client.slot:
+                await ctx.send_msgs(client,
+                                    [{'cmd': 'InvalidPacket', "type": "arguments", "text": 'UpdateHint: No Permission',
+                                      "original_cmd": cmd}])
+                return
+            new_hint = hint
+            if status is None:
+                return
+            try:
+                status = HintStatus(status)
+            except ValueError:
+                await ctx.send_msgs(client,
+                                    [{'cmd': 'InvalidPacket', "type": "arguments",
+                                      "text": 'UpdateHint: Invalid Status', "original_cmd": cmd}])
+                return
+            new_hint = new_hint.re_prioritize(ctx, status)
+            if hint == new_hint:
+                return
+            ctx.replace_hint(client.team, hint.finding_player, hint, new_hint)
+            ctx.replace_hint(client.team, hint.receiving_player, hint, new_hint)
+            ctx.save()
+            ctx.on_changed_hints(client.team, hint.finding_player)
+            ctx.on_changed_hints(client.team, hint.receiving_player)
+        
         elif cmd == 'StatusUpdate':
             update_client_status(ctx, client, args["status"])
 
@@ -2143,9 +2238,9 @@ def _cmd_hint(self, player_name: str, *item_name: str) -> bool:
                     hints = []
                     for item_name_from_group in self.ctx.item_name_groups[game][item]:
                         if item_name_from_group in self.ctx.item_names_for_game(game):  # ensure item has an ID
-                            hints.extend(collect_hints(self.ctx, team, slot, item_name_from_group))
+                            hints.extend(collect_hints(self.ctx, team, slot, item_name_from_group, HintStatus.HINT_PRIORITY))
                 else:  # item name or id
-                    hints = collect_hints(self.ctx, team, slot, item)
+                    hints = collect_hints(self.ctx, team, slot, item, HintStatus.HINT_PRIORITY)
 
                 if hints:
                     self.ctx.notify_hints(team, hints)
@@ -2179,14 +2274,17 @@ def _cmd_hint_location(self, player_name: str, *location_name: str) -> bool:
 
             if usable:
                 if isinstance(location, int):
-                    hints = collect_hint_location_id(self.ctx, team, slot, location)
+                    hints = collect_hint_location_id(self.ctx, team, slot, location,
+                                                     HintStatus.HINT_UNSPECIFIED)
                 elif game in self.ctx.location_name_groups and location in self.ctx.location_name_groups[game]:
                     hints = []
                     for loc_name_from_group in self.ctx.location_name_groups[game][location]:
                         if loc_name_from_group in self.ctx.location_names_for_game(game):
-                            hints.extend(collect_hint_location_name(self.ctx, team, slot, loc_name_from_group))
+                            hints.extend(collect_hint_location_name(self.ctx, team, slot, loc_name_from_group,
+                                                                    HintStatus.HINT_UNSPECIFIED))
                 else:
-                    hints = collect_hint_location_name(self.ctx, team, slot, location)
+                    hints = collect_hint_location_name(self.ctx, team, slot, location,
+                                                       HintStatus.HINT_UNSPECIFIED)
                 if hints:
                     self.ctx.notify_hints(team, hints)
                 else:
diff --git a/NetUtils.py b/NetUtils.py
index 4776b228db17..ec6ff3eb1d81 100644
--- a/NetUtils.py
+++ b/NetUtils.py
@@ -29,6 +29,14 @@ class ClientStatus(ByValue, enum.IntEnum):
     CLIENT_GOAL = 30
 
 
+class HintStatus(enum.IntEnum):
+    HINT_FOUND = 0
+    HINT_UNSPECIFIED = 1
+    HINT_NO_PRIORITY = 10
+    HINT_AVOID = 20
+    HINT_PRIORITY = 30
+
+
 class SlotType(ByValue, enum.IntFlag):
     spectator = 0b00
     player = 0b01
@@ -297,6 +305,20 @@ def add_json_location(parts: list, location_id: int, player: int = 0, **kwargs)
     parts.append({"text": str(location_id), "player": player, "type": JSONTypes.location_id, **kwargs})
 
 
+status_names: typing.Dict[HintStatus, str] = {
+    HintStatus.HINT_FOUND: "(found)",
+    HintStatus.HINT_UNSPECIFIED: "(unspecified)",
+    HintStatus.HINT_NO_PRIORITY: "(no priority)",
+    HintStatus.HINT_AVOID: "(avoid)",
+    HintStatus.HINT_PRIORITY: "(priority)",
+}
+status_colors: typing.Dict[HintStatus, str] = {
+    HintStatus.HINT_FOUND: "green",
+    HintStatus.HINT_UNSPECIFIED: "white",
+    HintStatus.HINT_NO_PRIORITY: "slateblue",
+    HintStatus.HINT_AVOID: "salmon",
+    HintStatus.HINT_PRIORITY: "plum",
+}
 class Hint(typing.NamedTuple):
     receiving_player: int
     finding_player: int
@@ -305,14 +327,21 @@ class Hint(typing.NamedTuple):
     found: bool
     entrance: str = ""
     item_flags: int = 0
+    status: HintStatus = HintStatus.HINT_UNSPECIFIED
 
     def re_check(self, ctx, team) -> Hint:
-        if self.found:
+        if self.found and self.status == HintStatus.HINT_FOUND:
             return self
         found = self.location in ctx.location_checks[team, self.finding_player]
         if found:
-            return Hint(self.receiving_player, self.finding_player, self.location, self.item, found, self.entrance,
-                        self.item_flags)
+            return self._replace(found=found, status=HintStatus.HINT_FOUND)
+        return self
+    
+    def re_prioritize(self, ctx, status: HintStatus) -> Hint:
+        if self.found and status != HintStatus.HINT_FOUND:
+            status = HintStatus.HINT_FOUND
+        if status != self.status:
+            return self._replace(status=status)
         return self
 
     def __hash__(self):
@@ -334,10 +363,8 @@ def as_network_message(self) -> dict:
         else:
             add_json_text(parts, "'s World")
         add_json_text(parts, ". ")
-        if self.found:
-            add_json_text(parts, "(found)", type="color", color="green")
-        else:
-            add_json_text(parts, "(not found)", type="color", color="red")
+        add_json_text(parts, status_names.get(self.status, "(unknown)"), type="color",
+                      color=status_colors.get(self.status, "red"))
 
         return {"cmd": "PrintJSON", "data": parts, "type": "Hint",
                 "receiving": self.receiving_player,
diff --git a/Utils.py b/Utils.py
index 535933d815b1..cd0a89713199 100644
--- a/Utils.py
+++ b/Utils.py
@@ -421,7 +421,8 @@ def find_class(self, module: str, name: str) -> type:
         if module == "builtins" and name in safe_builtins:
             return getattr(builtins, name)
         # used by MultiServer -> savegame/multidata
-        if module == "NetUtils" and name in {"NetworkItem", "ClientStatus", "Hint", "SlotType", "NetworkSlot"}:
+        if module == "NetUtils" and name in {"NetworkItem", "ClientStatus", "Hint",
+                                             "SlotType", "NetworkSlot", "HintStatus"}:
             return getattr(self.net_utils_module, name)
         # Options and Plando are unpickled by WebHost -> Generate
         if module == "worlds.generic" and name == "PlandoItem":
diff --git a/data/client.kv b/data/client.kv
index dc8a5c9c9d72..3455f2a23657 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -59,7 +59,7 @@
     finding_text: "Finding Player"
     location_text: "Location"
     entrance_text: "Entrance"
-    found_text: "Found?"
+    status_text: "Status"
     TooltipLabel:
         id: receiving
         sort_key: 'receiving'
@@ -96,9 +96,9 @@
         valign: 'center'
         pos_hint: {"center_y": 0.5}
     TooltipLabel:
-        id: found
-        sort_key: 'found'
-        text: root.found_text
+        id: status
+        sort_key: 'status'
+        text: root.status_text
         halign: 'center'
         valign: 'center'
         pos_hint: {"center_y": 0.5}
diff --git a/docs/network protocol.md b/docs/network protocol.md
index 4a96a43f818f..1c5b2e002289 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -272,6 +272,7 @@ These packets are sent purely from client to server. They are not accepted by cl
 * [Sync](#Sync)
 * [LocationChecks](#LocationChecks)
 * [LocationScouts](#LocationScouts)
+* [UpdateHint](#UpdateHint)
 * [StatusUpdate](#StatusUpdate)
 * [Say](#Say)
 * [GetDataPackage](#GetDataPackage)
@@ -342,6 +343,29 @@ This is useful in cases where an item appears in the game world, such as 'ledge
 | locations | list\[int\] | The ids of the locations seen by the client. May contain any number of locations, even ones sent before; duplicates do not cause issues with the Archipelago server. |
 | create_as_hint | int | If non-zero, the scouted locations get created and broadcasted as a player-visible hint. <br/>If 2 only new hints are broadcast, however this does not remove them from the LocationInfo reply. |
 
+### UpdateHint
+Sent to the server to update the status of a Hint. The client must be the 'receiving_player' of the Hint, or the update fails.
+
+### Arguments
+| Name | Type | Notes |
+| ---- | ---- | ----- |
+| player | int | The ID of the player whose location is being hinted for. |
+| location | int | The ID of the location to update the hint for. If no hint exists for this location, the packet is ignored. |
+| status | [HintStatus](#HintStatus) | Optional. If included, sets the status of the hint to this status. |
+
+#### HintStatus
+An enumeration containing the possible hint states.
+
+```python
+import enum
+class HintStatus(enum.IntEnum):
+    HINT_FOUND = 0
+    HINT_UNSPECIFIED = 1
+    HINT_NO_PRIORITY = 10
+    HINT_AVOID = 20
+    HINT_PRIORITY = 30
+```
+
 ### StatusUpdate
 Sent to the server to update on the sender's status. Examples include readiness or goal completion. (Example: defeated Ganon in A Link to the Past)
 
diff --git a/kvui.py b/kvui.py
index 2723654214c1..dfe935930049 100644
--- a/kvui.py
+++ b/kvui.py
@@ -52,6 +52,7 @@
 from kivy.uix.floatlayout import FloatLayout
 from kivy.uix.label import Label
 from kivy.uix.progressbar import ProgressBar
+from kivy.uix.dropdown import DropDown
 from kivy.utils import escape_markup
 from kivy.lang import Builder
 from kivy.uix.recycleview.views import RecycleDataViewBehavior
@@ -63,7 +64,7 @@
 
 fade_in_animation = Animation(opacity=0, duration=0) + Animation(opacity=1, duration=0.25)
 
-from NetUtils import JSONtoTextParser, JSONMessagePart, SlotType
+from NetUtils import JSONtoTextParser, JSONMessagePart, SlotType, HintStatus
 from Utils import async_start, get_input_text_from_response
 
 if typing.TYPE_CHECKING:
@@ -300,11 +301,11 @@ def apply_selection(self, rv, index, is_selected):
         """ Respond to the selection of items in the view. """
         self.selected = is_selected
 
-
 class HintLabel(RecycleDataViewBehavior, BoxLayout):
     selected = BooleanProperty(False)
     striped = BooleanProperty(False)
     index = None
+    dropdown: DropDown
 
     def __init__(self):
         super(HintLabel, self).__init__()
@@ -313,10 +314,32 @@ def __init__(self):
         self.finding_text = ""
         self.location_text = ""
         self.entrance_text = ""
-        self.found_text = ""
+        self.status_text = ""
+        self.hint = {}
         for child in self.children:
             child.bind(texture_size=self.set_height)
 
+
+        ctx = App.get_running_app().ctx
+        self.dropdown = DropDown()
+
+        def set_value(button):
+            self.dropdown.select(button.status)
+
+        def select(instance, data):
+            ctx.update_hint(self.hint["location"],
+                            self.hint["finding_player"],
+                            data)
+
+        for status in (HintStatus.HINT_NO_PRIORITY, HintStatus.HINT_PRIORITY, HintStatus.HINT_AVOID):
+            name = status_names[status]
+            status_button = Button(text=name, size_hint_y=None, height=dp(50))
+            status_button.status = status
+            status_button.bind(on_release=set_value)
+            self.dropdown.add_widget(status_button)
+
+        self.dropdown.bind(on_select=select)
+
     def set_height(self, instance, value):
         self.height = max([child.texture_size[1] for child in self.children])
 
@@ -328,7 +351,8 @@ def refresh_view_attrs(self, rv, index, data):
         self.finding_text = data["finding"]["text"]
         self.location_text = data["location"]["text"]
         self.entrance_text = data["entrance"]["text"]
-        self.found_text = data["found"]["text"]
+        self.status_text = data["status"]["text"]
+        self.hint = data["status"]["hint"]
         self.height = self.minimum_height
         return super(HintLabel, self).refresh_view_attrs(rv, index, data)
 
@@ -338,13 +362,21 @@ def on_touch_down(self, touch):
             return True
         if self.index:  # skip header
             if self.collide_point(*touch.pos):
-                if self.selected:
+                status_label = self.ids["status"]
+                if status_label.collide_point(*touch.pos):
+                    if self.hint["status"] == HintStatus.HINT_FOUND:
+                        return
+                    ctx = App.get_running_app().ctx
+                    if ctx.slot == self.hint["receiving_player"]:  # If this player owns this hint
+                        # open a dropdown
+                        self.dropdown.open(self.ids["status"])
+                elif self.selected:
                     self.parent.clear_selection()
                 else:
                     text = "".join((self.receiving_text, "\'s ", self.item_text, " is at ", self.location_text, " in ",
                                     self.finding_text, "\'s World", (" at " + self.entrance_text)
                                     if self.entrance_text != "Vanilla"
-                                    else "", ". (", self.found_text.lower(), ")"))
+                                    else "", ". (", self.status_text.lower(), ")"))
                     temp = MarkupLabel(text).markup
                     text = "".join(
                         part for part in temp if not part.startswith(("[color", "[/color]", "[ref=", "[/ref]")))
@@ -358,18 +390,16 @@ def on_touch_down(self, touch):
             for child in self.children:
                 if child.collide_point(*touch.pos):
                     key = child.sort_key
-                    parent.hint_sorter = lambda element: remove_between_brackets.sub("", element[key]["text"]).lower()
+                    if key == "status":
+                        parent.hint_sorter = lambda element: element["status"]["hint"]["status"]
+                    else: parent.hint_sorter = lambda element: remove_between_brackets.sub("", element[key]["text"]).lower()
                     if key == parent.sort_key:
                         # second click reverses order
                         parent.reversed = not parent.reversed
                     else:
                         parent.sort_key = key
                         parent.reversed = False
-                    break
-            else:
-                logging.warning("Did not find clicked header for sorting.")
-
-            App.get_running_app().update_hints()
+                    App.get_running_app().update_hints()
 
     def apply_selection(self, rv, index, is_selected):
         """ Respond to the selection of items in the view. """
@@ -663,7 +693,7 @@ def set_new_energy_link_value(self):
             self.energy_link_label.text = f"EL: {Utils.format_SI_prefix(self.ctx.current_energy_link_value)}J"
 
     def update_hints(self):
-        hints = self.ctx.stored_data[f"_read_hints_{self.ctx.team}_{self.ctx.slot}"]
+        hints = self.ctx.stored_data.get(f"_read_hints_{self.ctx.team}_{self.ctx.slot}", [])
         self.log_panels["Hints"].refresh_hints(hints)
 
     # default F1 keybind, opens a settings menu, that seems to break the layout engine once closed
@@ -719,6 +749,22 @@ def fix_heights(self):
                 element.height = element.texture_size[1]
 
 
+status_names: typing.Dict[HintStatus, str] = {
+    HintStatus.HINT_FOUND: "Found",
+    HintStatus.HINT_UNSPECIFIED: "Unspecified",
+    HintStatus.HINT_NO_PRIORITY: "No Priority",
+    HintStatus.HINT_AVOID: "Avoid",
+    HintStatus.HINT_PRIORITY: "Priority",
+}
+status_colors: typing.Dict[HintStatus, str] = {
+    HintStatus.HINT_FOUND: "green",
+    HintStatus.HINT_UNSPECIFIED: "white",
+    HintStatus.HINT_NO_PRIORITY: "cyan",
+    HintStatus.HINT_AVOID: "salmon",
+    HintStatus.HINT_PRIORITY: "plum",
+}
+
+
 class HintLog(RecycleView):
     header = {
         "receiving": {"text": "[u]Receiving Player[/u]"},
@@ -726,12 +772,13 @@ class HintLog(RecycleView):
         "finding": {"text": "[u]Finding Player[/u]"},
         "location": {"text": "[u]Location[/u]"},
         "entrance": {"text": "[u]Entrance[/u]"},
-        "found": {"text": "[u]Status[/u]"},
+        "status": {"text": "[u]Status[/u]",
+                   "hint": {"receiving_player": -1, "location": -1, "finding_player": -1, "status": ""}},
         "striped": True,
     }
 
     sort_key: str = ""
-    reversed: bool = False
+    reversed: bool = True
 
     def __init__(self, parser):
         super(HintLog, self).__init__()
@@ -739,8 +786,18 @@ def __init__(self, parser):
         self.parser = parser
 
     def refresh_hints(self, hints):
+        if not hints:  # Fix the scrolling looking visually wrong in some edge cases
+            self.scroll_y = 1.0
         data = []
+        ctx = App.get_running_app().ctx
         for hint in hints:
+            if not hint.get("status"): # Allows connecting to old servers
+                hint["status"] = HintStatus.HINT_FOUND if hint["found"] else HintStatus.HINT_UNSPECIFIED
+            hint_status_node = self.parser.handle_node({"type": "color",
+                                                        "color": status_colors.get(hint["status"], "red"),
+                                                        "text": status_names.get(hint["status"], "Unknown")})
+            if hint["status"] != HintStatus.HINT_FOUND and hint["receiving_player"] == ctx.slot:
+                hint_status_node = f"[u]{hint_status_node}[/u]"
             data.append({
                 "receiving": {"text": self.parser.handle_node({"type": "player_id", "text": hint["receiving_player"]})},
                 "item": {"text": self.parser.handle_node({
@@ -758,9 +815,10 @@ def refresh_hints(self, hints):
                 "entrance": {"text": self.parser.handle_node({"type": "color" if hint["entrance"] else "text",
                                                               "color": "blue", "text": hint["entrance"]
                                                               if hint["entrance"] else "Vanilla"})},
-                "found": {
-                    "text": self.parser.handle_node({"type": "color", "color": "green" if hint["found"] else "red",
-                                                     "text": "Found" if hint["found"] else "Not Found"})},
+                "status": {
+                    "text": hint_status_node,
+                    "hint": hint,
+                },
             })
 
         data.sort(key=self.hint_sorter, reverse=self.reversed)
@@ -771,7 +829,7 @@ def refresh_hints(self, hints):
 
     @staticmethod
     def hint_sorter(element: dict) -> str:
-        return ""
+        return element["status"]["hint"]["status"]  # By status by default
 
     def fix_heights(self):
         """Workaround fix for divergent texture and layout heights"""

From 8923b06a49692322168537a7ddbc56fef15ab5d2 Mon Sep 17 00:00:00 2001
From: BootsinSoots <102177943+BootsinSoots@users.noreply.github.com>
Date: Thu, 28 Nov 2024 20:16:12 -0500
Subject: [PATCH 067/381] Webhost: Make YGO 06 setup title match page #4262

Make Guide title match the rest of the set up guides on the webhost
---
 worlds/yugioh06/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/yugioh06/__init__.py b/worlds/yugioh06/__init__.py
index a39b52cd09d5..90bbed1a2174 100644
--- a/worlds/yugioh06/__init__.py
+++ b/worlds/yugioh06/__init__.py
@@ -50,7 +50,7 @@
 class Yugioh06Web(WebWorld):
     theme = "stone"
     setup = Tutorial(
-        "Multiworld Setup Tutorial",
+        "Multiworld Setup Guide",
         "A guide to setting up Yu-Gi-Oh! - Ultimate Masters Edition - World Championship Tournament 2006 "
         "for Archipelago on your computer.",
         "English",

From ce210cd4ee27bd9b171d3fb0d9ddb776f7d985f4 Mon Sep 17 00:00:00 2001
From: Solidus Snake <63137482+dontjoome@users.noreply.github.com>
Date: Thu, 28 Nov 2024 20:16:50 -0500
Subject: [PATCH 068/381] SMZ3: Add Start Inventory From Pool (#4252)

* Add Start Inventory From Pool

Just as the title implies

* Update Options.py

Fix dataclass since I had just pulled changes from prior options.py without seeing if anythin had changed

* Update Options.py

One more time with feeling

* Update worlds/smz3/Options.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/smz3/Options.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/worlds/smz3/Options.py b/worlds/smz3/Options.py
index 7df01f8710e1..02521d695a7a 100644
--- a/worlds/smz3/Options.py
+++ b/worlds/smz3/Options.py
@@ -1,5 +1,6 @@
 import typing
-from Options import Choice, Option, PerGameCommonOptions, Toggle, DefaultOnToggle, Range, ItemsAccessibility
+
+from Options import Choice, Option, PerGameCommonOptions, Toggle, DefaultOnToggle, Range, ItemsAccessibility, StartInventoryPool
 from dataclasses import dataclass
 
 class SMLogic(Choice):
@@ -129,6 +130,7 @@ class EnergyBeep(DefaultOnToggle):
 
 @dataclass
 class SMZ3Options(PerGameCommonOptions):
+    start_inventory_from_pool: StartInventoryPool
     accessibility: ItemsAccessibility
     sm_logic: SMLogic
     sword_location: SwordLocation

From 30b414429f5b118c9f0b77537d6aac464510615f Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Fri, 29 Nov 2024 05:02:26 +0100
Subject: [PATCH 069/381] LTTP: sort of use new options system (#3764)

* LttP: switch to dataclass options definition

* LttP: write old options onto multiworld
LttP: use World.random
---
 worlds/alttp/Options.py  | 166 +++++++++++++++++++--------------------
 worlds/alttp/Rom.py      |   9 ++-
 worlds/alttp/__init__.py |  35 +++++----
 3 files changed, 109 insertions(+), 101 deletions(-)

diff --git a/worlds/alttp/Options.py b/worlds/alttp/Options.py
index bd87cbf2c3ea..097458611734 100644
--- a/worlds/alttp/Options.py
+++ b/worlds/alttp/Options.py
@@ -1,7 +1,7 @@
-import typing
+from dataclasses import dataclass
 
 from BaseClasses import MultiWorld
-from Options import Choice, Range, DeathLink, DefaultOnToggle, FreeText, ItemsAccessibility, Option, \
+from Options import Choice, Range, DeathLink, DefaultOnToggle, FreeText, ItemsAccessibility, PerGameCommonOptions, \
     PlandoBosses, PlandoConnections, PlandoTexts, Removed, StartInventoryPool, Toggle
 from .EntranceShuffle import default_connections, default_dungeon_connections, \
     inverted_default_connections, inverted_default_dungeon_connections
@@ -742,86 +742,86 @@ class ALttPPlandoTexts(PlandoTexts):
     valid_keys = TextTable.valid_keys
 
 
-alttp_options: typing.Dict[str, type(Option)] = {
-    "accessibility": ItemsAccessibility,
-    "plando_connections": ALttPPlandoConnections,
-    "plando_texts": ALttPPlandoTexts,
-    "start_inventory_from_pool": StartInventoryPool,
-    "goal": Goal,
-    "mode": Mode,
-    "glitches_required": GlitchesRequired,
-    "dark_room_logic": DarkRoomLogic,
-    "open_pyramid": OpenPyramid,
-    "crystals_needed_for_gt": CrystalsTower,
-    "crystals_needed_for_ganon": CrystalsGanon,
-    "triforce_pieces_mode": TriforcePiecesMode,
-    "triforce_pieces_percentage": TriforcePiecesPercentage,
-    "triforce_pieces_required": TriforcePiecesRequired,
-    "triforce_pieces_available": TriforcePiecesAvailable,
-    "triforce_pieces_extra": TriforcePiecesExtra,
-    "entrance_shuffle": EntranceShuffle,
-    "entrance_shuffle_seed": EntranceShuffleSeed,
-    "big_key_shuffle": big_key_shuffle,
-    "small_key_shuffle": small_key_shuffle,
-    "key_drop_shuffle": key_drop_shuffle,
-    "compass_shuffle": compass_shuffle,
-    "map_shuffle": map_shuffle,
-    "restrict_dungeon_item_on_boss": RestrictBossItem,
-    "item_pool": ItemPool,
-    "item_functionality": ItemFunctionality,
-    "enemy_health": EnemyHealth,
-    "enemy_damage": EnemyDamage,
-    "progressive": Progressive,
-    "swordless": Swordless,
-    "dungeon_counters": DungeonCounters,
-    "retro_bow": RetroBow,
-    "retro_caves": RetroCaves,
-    "hints": Hints,
-    "scams": Scams,
-    "boss_shuffle": LTTPBosses,
-    "pot_shuffle": PotShuffle,
-    "enemy_shuffle": EnemyShuffle,
-    "killable_thieves": KillableThieves,
-    "bush_shuffle": BushShuffle,
-    "shop_item_slots": ShopItemSlots,
-    "randomize_shop_inventories": RandomizeShopInventories,
-    "shuffle_shop_inventories": ShuffleShopInventories,
-    "include_witch_hut": IncludeWitchHut,
-    "randomize_shop_prices": RandomizeShopPrices,
-    "randomize_cost_types": RandomizeCostTypes,
-    "shop_price_modifier": ShopPriceModifier,
-    "shuffle_capacity_upgrades": ShuffleCapacityUpgrades,
-    "bombless_start": BomblessStart,
-    "shuffle_prizes": ShufflePrizes,
-    "tile_shuffle": TileShuffle,
-    "misery_mire_medallion": MiseryMireMedallion,
-    "turtle_rock_medallion": TurtleRockMedallion,
-    "glitch_boots": GlitchBoots,
-    "beemizer_total_chance": BeemizerTotalChance,
-    "beemizer_trap_chance": BeemizerTrapChance,
-    "timer": Timer,
-    "countdown_start_time": CountdownStartTime,
-    "red_clock_time": RedClockTime,
-    "blue_clock_time": BlueClockTime,
-    "green_clock_time": GreenClockTime,
-    "death_link": DeathLink,
-    "allow_collect": AllowCollect,
-    "ow_palettes": OWPalette,
-    "uw_palettes": UWPalette,
-    "hud_palettes": HUDPalette,
-    "sword_palettes": SwordPalette,
-    "shield_palettes": ShieldPalette,
-    # "link_palettes": LinkPalette,
-    "heartbeep": HeartBeep,
-    "heartcolor": HeartColor,
-    "quickswap": QuickSwap,
-    "menuspeed": MenuSpeed,
-    "music": Music,
-    "reduceflashing": ReduceFlashing,
-    "triforcehud": TriforceHud,
+@dataclass
+class ALTTPOptions(PerGameCommonOptions):
+    accessibility: ItemsAccessibility
+    plando_connections: ALttPPlandoConnections
+    plando_texts: ALttPPlandoTexts
+    start_inventory_from_pool: StartInventoryPool
+    goal: Goal
+    mode: Mode
+    glitches_required: GlitchesRequired
+    dark_room_logic: DarkRoomLogic
+    open_pyramid: OpenPyramid
+    crystals_needed_for_gt: CrystalsTower
+    crystals_needed_for_ganon: CrystalsGanon
+    triforce_pieces_mode: TriforcePiecesMode
+    triforce_pieces_percentage: TriforcePiecesPercentage
+    triforce_pieces_required: TriforcePiecesRequired
+    triforce_pieces_available: TriforcePiecesAvailable
+    triforce_pieces_extra: TriforcePiecesExtra
+    entrance_shuffle: EntranceShuffle
+    entrance_shuffle_seed: EntranceShuffleSeed
+    big_key_shuffle: big_key_shuffle
+    small_key_shuffle: small_key_shuffle
+    key_drop_shuffle: key_drop_shuffle
+    compass_shuffle: compass_shuffle
+    map_shuffle: map_shuffle
+    restrict_dungeon_item_on_boss: RestrictBossItem
+    item_pool: ItemPool
+    item_functionality: ItemFunctionality
+    enemy_health: EnemyHealth
+    enemy_damage: EnemyDamage
+    progressive: Progressive
+    swordless: Swordless
+    dungeon_counters: DungeonCounters
+    retro_bow: RetroBow
+    retro_caves: RetroCaves
+    hints: Hints
+    scams: Scams
+    boss_shuffle: LTTPBosses
+    pot_shuffle: PotShuffle
+    enemy_shuffle: EnemyShuffle
+    killable_thieves: KillableThieves
+    bush_shuffle: BushShuffle
+    shop_item_slots: ShopItemSlots
+    randomize_shop_inventories: RandomizeShopInventories
+    shuffle_shop_inventories: ShuffleShopInventories
+    include_witch_hut: IncludeWitchHut
+    randomize_shop_prices: RandomizeShopPrices
+    randomize_cost_types: RandomizeCostTypes
+    shop_price_modifier: ShopPriceModifier
+    shuffle_capacity_upgrades: ShuffleCapacityUpgrades
+    bombless_start: BomblessStart
+    shuffle_prizes: ShufflePrizes
+    tile_shuffle: TileShuffle
+    misery_mire_medallion: MiseryMireMedallion
+    turtle_rock_medallion: TurtleRockMedallion
+    glitch_boots: GlitchBoots
+    beemizer_total_chance: BeemizerTotalChance
+    beemizer_trap_chance: BeemizerTrapChance
+    timer: Timer
+    countdown_start_time: CountdownStartTime
+    red_clock_time: RedClockTime
+    blue_clock_time: BlueClockTime
+    green_clock_time: GreenClockTime
+    death_link: DeathLink
+    allow_collect: AllowCollect
+    ow_palettes: OWPalette
+    uw_palettes: UWPalette
+    hud_palettes: HUDPalette
+    sword_palettes: SwordPalette
+    shield_palettes: ShieldPalette
+    # link_palettes: LinkPalette
+    heartbeep: HeartBeep
+    heartcolor: HeartColor
+    quickswap: QuickSwap
+    menuspeed: MenuSpeed
+    music: Music
+    reduceflashing: ReduceFlashing
+    triforcehud: TriforceHud
 
     # removed:
-    "goals": Removed,
-    "smallkey_shuffle": Removed,
-    "bigkey_shuffle": Removed,
-}
+    goals: Removed
+    smallkey_shuffle: Removed
+    bigkey_shuffle: Removed
diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py
index 224de6aaf7f3..73a77b03f532 100644
--- a/worlds/alttp/Rom.py
+++ b/worlds/alttp/Rom.py
@@ -782,8 +782,8 @@ def get_nonnative_item_sprite(code: int) -> int:
 
 
 def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
-    local_random = world.per_slot_randoms[player]
     local_world = world.worlds[player]
+    local_random = local_world.random
 
     # patch items
 
@@ -1867,7 +1867,7 @@ def apply_oof_sfx(rom, oof: str):
 def apply_rom_settings(rom, beep, color, quickswap, menuspeed, music: bool, sprite: str, oof: str, palettes_options,
                        world=None, player=1, allow_random_on_event=False, reduceflashing=False,
                        triforcehud: str = None, deathlink: bool = False, allowcollect: bool = False):
-    local_random = random if not world else world.per_slot_randoms[player]
+    local_random = random if not world else world.worlds[player].random
     disable_music: bool = not music
     # enable instant item menu
     if menuspeed == 'instant':
@@ -2197,8 +2197,9 @@ def write_string_to_rom(rom, target, string):
 
 def write_strings(rom, world, player):
     from . import ALTTPWorld
-    local_random = world.per_slot_randoms[player]
+
     w: ALTTPWorld = world.worlds[player]
+    local_random = w.random
 
     tt = TextTable()
     tt.removeUnwantedText()
@@ -2425,7 +2426,7 @@ def hint_text(dest, ped_hint=False):
     if world.worlds[player].has_progressive_bows and (w.difficulty_requirements.progressive_bow_limit >= 2 or (
             world.swordless[player] or world.glitches_required[player] == 'no_glitches')):
         prog_bow_locs = world.find_item_locations('Progressive Bow', player, True)
-        world.per_slot_randoms[player].shuffle(prog_bow_locs)
+        local_random.shuffle(prog_bow_locs)
         found_bow = False
         found_bow_alt = False
         while prog_bow_locs and not (found_bow and found_bow_alt):
diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py
index f897d3762929..b5489906889f 100644
--- a/worlds/alttp/__init__.py
+++ b/worlds/alttp/__init__.py
@@ -1,28 +1,27 @@
 import logging
 import os
 import random
-import settings
 import threading
 import typing
 
-import Utils
+import settings
 from BaseClasses import Item, CollectionState, Tutorial, MultiWorld
+from worlds.AutoWorld import World, WebWorld, LogicMixin
+from .Client import ALTTPSNIClient
 from .Dungeons import create_dungeons, Dungeon
 from .EntranceShuffle import link_entrances, link_inverted_entrances, plando_connect
 from .InvertedRegions import create_inverted_regions, mark_dark_world_regions
 from .ItemPool import generate_itempool, difficulties
 from .Items import item_init_table, item_name_groups, item_table, GetBeemizerItem
-from .Options import alttp_options, small_key_shuffle
+from .Options import ALTTPOptions, small_key_shuffle
 from .Regions import lookup_name_to_id, create_regions, mark_light_world_regions, lookup_vanilla_location_to_entrance, \
     is_main_entrance, key_drop_data
-from .Client import ALTTPSNIClient
 from .Rom import LocalRom, patch_rom, patch_race_rom, check_enemizer, patch_enemizer, apply_rom_settings, \
     get_hash_string, get_base_rom_path, LttPDeltaPatch
 from .Rules import set_rules
 from .Shops import create_shops, Shop, push_shop_inventories, ShopType, price_rate_display, price_type_display_name
-from .SubClasses import ALttPItem, LTTPRegionType
-from worlds.AutoWorld import World, WebWorld, LogicMixin
 from .StateHelpers import can_buy_unlimited
+from .SubClasses import ALttPItem, LTTPRegionType
 
 lttp_logger = logging.getLogger("A Link to the Past")
 
@@ -132,7 +131,8 @@ class ALTTPWorld(World):
     Ganon!
     """
     game = "A Link to the Past"
-    option_definitions = alttp_options
+    options_dataclass = ALTTPOptions
+    options: ALTTPOptions
     settings_key = "lttp_options"
     settings: typing.ClassVar[ALTTPSettings]
     topology_present = True
@@ -286,13 +286,22 @@ def stage_assert_generate(cls, multiworld: MultiWorld):
         if not os.path.exists(rom_file):
             raise FileNotFoundError(rom_file)
         if multiworld.is_race:
-            import xxtea
+            import xxtea  # noqa
         for player in multiworld.get_game_players(cls.game):
             if multiworld.worlds[player].use_enemizer:
                 check_enemizer(multiworld.worlds[player].enemizer_path)
                 break
 
     def generate_early(self):
+        # write old options
+        import dataclasses
+        is_first = self.player == min(self.multiworld.get_game_players(self.game))
+
+        for field in dataclasses.fields(self.options_dataclass):
+            if is_first:
+                setattr(self.multiworld, field.name, {})
+            getattr(self.multiworld, field.name)[self.player] = getattr(self.options, field.name)
+        # end of old options re-establisher
 
         player = self.player
         multiworld = self.multiworld
@@ -536,12 +545,10 @@ def stage_generate_output(cls, multiworld, output_directory):
 
     @property
     def use_enemizer(self) -> bool:
-        world = self.multiworld
-        player = self.player
-        return bool(world.boss_shuffle[player] or world.enemy_shuffle[player]
-                    or world.enemy_health[player] != 'default' or world.enemy_damage[player] != 'default'
-                    or world.pot_shuffle[player] or world.bush_shuffle[player]
-                    or world.killable_thieves[player])
+        return bool(self.options.boss_shuffle or self.options.enemy_shuffle
+                    or self.options.enemy_health != 'default' or self.options.enemy_damage != 'default'
+                    or self.options.pot_shuffle or self.options.bush_shuffle
+                    or self.options.killable_thieves)
 
     def generate_output(self, output_directory: str):
         multiworld = self.multiworld

From 1371c63a8debded46b764ac1953134b1f0491bfa Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 07:14:23 +0100
Subject: [PATCH 070/381] Core: Actually take item from pool when plandoing
 from_pool (#2420)

* Actually take item from pool when plandoing from_pool

* Remove the awkward index thing

* oops left a comment in

* there wasn't a line break here before

* Only remove if actually found, check against player number

* oops

* Go back to index based system so we can just remove at the end

* Comment

* Fix error on None

* Update Fill.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>
---
 Fill.py | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/Fill.py b/Fill.py
index 706cca657457..912b4d05bed9 100644
--- a/Fill.py
+++ b/Fill.py
@@ -978,15 +978,32 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
             multiworld.random.shuffle(items)
             count = 0
             err: typing.List[str] = []
-            successful_pairs: typing.List[typing.Tuple[Item, Location]] = []
+            successful_pairs: typing.List[typing.Tuple[int, Item, Location]] = []
+            claimed_indices: typing.Set[typing.Optional[int]] = set()
             for item_name in items:
-                item = multiworld.worlds[player].create_item(item_name)
+                index_to_delete: typing.Optional[int] = None
+                if from_pool:
+                    try:
+                        # If from_pool, try to find an existing item with this name & player in the itempool and use it
+                        index_to_delete, item = next(
+                            (i, item) for i, item in enumerate(multiworld.itempool)
+                            if item.player == player and item.name == item_name and i not in claimed_indices
+                        )
+                    except StopIteration:
+                        warn(
+                        f"Could not remove {item_name} from pool for {multiworld.player_name[player]} as it's already missing from it.",
+                        placement['force'])
+                        item = multiworld.worlds[player].create_item(item_name)
+                else:
+                    item = multiworld.worlds[player].create_item(item_name)
+
                 for location in reversed(candidates):
                     if (location.address is None) == (item.code is None):  # either both None or both not None
                         if not location.item:
                             if location.item_rule(item):
                                 if location.can_fill(multiworld.state, item, False):
-                                    successful_pairs.append((item, location))
+                                    successful_pairs.append((index_to_delete, item, location))
+                                    claimed_indices.add(index_to_delete)
                                     candidates.remove(location)
                                     count = count + 1
                                     break
@@ -998,6 +1015,7 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
                             err.append(f"Cannot place {item_name} into already filled location {location}.")
                     else:
                         err.append(f"Mismatch between {item_name} and {location}, only one is an event.")
+
                 if count == maxcount:
                     break
             if count < placement['count']['min']:
@@ -1005,17 +1023,16 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
                 failed(
                     f"Plando block failed to place {m - count} of {m} item(s) for {multiworld.player_name[player]}, error(s): {' '.join(err)}",
                     placement['force'])
-            for (item, location) in successful_pairs:
+
+            # Sort indices in reverse so we can remove them one by one
+            successful_pairs = sorted(successful_pairs, key=lambda successful_pair: successful_pair[0] or 0, reverse=True)
+
+            for (index, item, location) in successful_pairs:
                 multiworld.push_item(location, item, collect=False)
                 location.locked = True
                 logging.debug(f"Plando placed {item} at {location}")
-                if from_pool:
-                    try:
-                        multiworld.itempool.remove(item)
-                    except ValueError:
-                        warn(
-                            f"Could not remove {item} from pool for {multiworld.player_name[player]} as it's already missing from it.",
-                            placement['force'])
+                if index is not None:  # If this item is from_pool and was found in the pool, remove it.
+                    multiworld.itempool.pop(index)
 
         except Exception as e:
             raise Exception(

From 91185f4f7c84b93ef5c7e9ee95665022e89d1a90 Mon Sep 17 00:00:00 2001
From: ken <kedNalatacId@gmail.com>
Date: Thu, 28 Nov 2024 22:16:54 -0800
Subject: [PATCH 071/381] Core: Add timestamps to logging for seed generation
 (#3028)

* Add timestamps to logging for improved debugging

* Add datetime to general logging; particularly useful for large seeds.

* Move console timestamps from Main to Utils.init_logging (better location)

* Update Main.py

remove spurious blank line

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

---------

Co-authored-by: Zach Parks <zach@alliware.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
---
 Utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Utils.py b/Utils.py
index cd0a89713199..4e8d7fc427e0 100644
--- a/Utils.py
+++ b/Utils.py
@@ -515,10 +515,13 @@ def filter(self, record: logging.LogRecord) -> bool:
             return self.condition(record)
 
     file_handler.addFilter(Filter("NoStream", lambda record: not getattr(record,  "NoFile", False)))
+    file_handler.addFilter(Filter("NoCarriageReturn", lambda record: '\r' not in record.msg))
     root_logger.addHandler(file_handler)
     if sys.stdout:
+        formatter = logging.Formatter(fmt='[%(asctime)s] %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
         stream_handler = logging.StreamHandler(sys.stdout)
         stream_handler.addFilter(Filter("NoFile", lambda record: not getattr(record, "NoStream", False)))
+        stream_handler.setFormatter(formatter)
         root_logger.addHandler(stream_handler)
 
     # Relay unhandled exceptions to logger.

From 6f2464d4ad5023fec18d466bd7a77b69c003a7e8 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Fri, 29 Nov 2024 00:24:24 -0800
Subject: [PATCH 072/381] Pokemon Emerald: Rework tags/dynamically create item
 and location groups (#3263)

* Pokemon Emerald: Rework location tags to categories

* Pokemon Emerald: Rework item tags, automatically create item/location groups

* Pokemon Emerald: Move item and location groups to data.py, add some regional location groups

* Map Regions

* Pokemon Emerald: Fix up location groups

* Pokemon Emerald: Move groups to their own file

* Pokemon Emerald: Add meta groups for location groups

* Pokemon Emerald: Fix has_group using updated item group name

* Pokemon Emerald: Add sanity check for maps in location groups

* Pokemon Emerald: Remove missed use of location.tags

* Pokemon Emerald: Reclassify white and black flutes

* Pokemon Emerald: Update changelog

* Pokemon Emerald: Adjust changelog

---------

Co-authored-by: Tsukino <16899482+Tsukino-uwu@users.noreply.github.com>
---
 worlds/pokemon_emerald/CHANGELOG.md        |    1 +
 worlds/pokemon_emerald/__init__.py         |   83 +-
 worlds/pokemon_emerald/data.py             |   19 +
 worlds/pokemon_emerald/data/items.json     |  102 +-
 worlds/pokemon_emerald/data/locations.json | 4014 +++++++++++++-------
 worlds/pokemon_emerald/groups.py           |  721 ++++
 worlds/pokemon_emerald/items.py            |   26 +-
 worlds/pokemon_emerald/locations.py        |   64 +-
 worlds/pokemon_emerald/rules.py            |   14 +-
 worlds/pokemon_emerald/sanity_check.py     |   19 +-
 10 files changed, 3551 insertions(+), 1512 deletions(-)
 create mode 100644 worlds/pokemon_emerald/groups.py

diff --git a/worlds/pokemon_emerald/CHANGELOG.md b/worlds/pokemon_emerald/CHANGELOG.md
index 0dd874b25029..72005d6f9d3f 100644
--- a/worlds/pokemon_emerald/CHANGELOG.md
+++ b/worlds/pokemon_emerald/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Features
 
+- Added many new item and location groups.
 - Added a Swedish translation of the setup guide.
 - The client communicates map transitions to any trackers connected to the slot.
 - Added the player's Normalize Encounter Rates option to slot data for trackers.
diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py
index a87f93ece56b..c99a0c11cdfb 100644
--- a/worlds/pokemon_emerald/__init__.py
+++ b/worlds/pokemon_emerald/__init__.py
@@ -15,11 +15,11 @@
 from worlds.AutoWorld import WebWorld, World
 
 from .client import PokemonEmeraldClient  # Unused, but required to register with BizHawkClient
-from .data import LEGENDARY_POKEMON, MapData, SpeciesData, TrainerData, data as emerald_data
-from .items import (ITEM_GROUPS, PokemonEmeraldItem, create_item_label_to_code_map, get_item_classification,
-                    offset_item_value)
-from .locations import (LOCATION_GROUPS, PokemonEmeraldLocation, create_location_label_to_id_map,
-                        create_locations_with_tags, set_free_fly, set_legendary_cave_entrances)
+from .data import LEGENDARY_POKEMON, MapData, SpeciesData, TrainerData, LocationCategory, data as emerald_data
+from .groups import ITEM_GROUPS, LOCATION_GROUPS
+from .items import PokemonEmeraldItem, create_item_label_to_code_map, get_item_classification, offset_item_value
+from .locations import (PokemonEmeraldLocation, create_location_label_to_id_map, create_locations_by_category,
+                        set_free_fly, set_legendary_cave_entrances)
 from .opponents import randomize_opponent_parties
 from .options import (Goal, DarkCavesRequireFlash, HmRequirements, ItemPoolType, PokemonEmeraldOptions,
                       RandomizeWildPokemon, RandomizeBadges, RandomizeHms, NormanRequirement)
@@ -133,9 +133,10 @@ def __init__(self, multiworld, player):
 
     @classmethod
     def stage_assert_generate(cls, multiworld: MultiWorld) -> None:
-        from .sanity_check import validate_regions
+        from .sanity_check import validate_regions, validate_group_maps
 
         assert validate_regions()
+        assert validate_group_maps()
 
     def get_filler_item_name(self) -> str:
         return "Great Ball"
@@ -237,24 +238,32 @@ def generate_early(self) -> None:
 
     def create_regions(self) -> None:
         from .regions import create_regions
-        regions = create_regions(self)
-
-        tags = {"Badge", "HM", "KeyItem", "Rod", "Bike", "EventTicket"}  # Tags with progression items always included
+        all_regions = create_regions(self)
+
+        # Categories with progression items always included
+        categories = {
+            LocationCategory.BADGE,
+            LocationCategory.HM,
+            LocationCategory.KEY,
+            LocationCategory.ROD,
+            LocationCategory.BIKE,
+            LocationCategory.TICKET
+        }
         if self.options.overworld_items:
-            tags.add("OverworldItem")
+            categories.add(LocationCategory.OVERWORLD_ITEM)
         if self.options.hidden_items:
-            tags.add("HiddenItem")
+            categories.add(LocationCategory.HIDDEN_ITEM)
         if self.options.npc_gifts:
-            tags.add("NpcGift")
+            categories.add(LocationCategory.GIFT)
         if self.options.berry_trees:
-            tags.add("BerryTree")
+            categories.add(LocationCategory.BERRY_TREE)
         if self.options.dexsanity:
-            tags.add("Pokedex")
+            categories.add(LocationCategory.POKEDEX)
         if self.options.trainersanity:
-            tags.add("Trainer")
-        create_locations_with_tags(self, regions, tags)
+            categories.add(LocationCategory.TRAINER)
+        create_locations_by_category(self, all_regions, categories)
 
-        self.multiworld.regions.extend(regions.values())
+        self.multiworld.regions.extend(all_regions.values())
 
         # Exclude locations which are always locked behind the player's goal
         def exclude_locations(location_names: List[str]):
@@ -325,21 +334,21 @@ def create_items(self) -> None:
         # Filter progression items which shouldn't be shuffled into the itempool.
         # Their locations will still exist, but event items will be placed and
         # locked at their vanilla locations instead.
-        filter_tags = set()
+        filter_categories = set()
 
         if not self.options.key_items:
-            filter_tags.add("KeyItem")
+            filter_categories.add(LocationCategory.KEY)
         if not self.options.rods:
-            filter_tags.add("Rod")
+            filter_categories.add(LocationCategory.ROD)
         if not self.options.bikes:
-            filter_tags.add("Bike")
+            filter_categories.add(LocationCategory.BIKE)
         if not self.options.event_tickets:
-            filter_tags.add("EventTicket")
+            filter_categories.add(LocationCategory.TICKET)
 
         if self.options.badges in {RandomizeBadges.option_vanilla, RandomizeBadges.option_shuffle}:
-            filter_tags.add("Badge")
+            filter_categories.add(LocationCategory.BADGE)
         if self.options.hms in {RandomizeHms.option_vanilla, RandomizeHms.option_shuffle}:
-            filter_tags.add("HM")
+            filter_categories.add(LocationCategory.HM)
 
         # If Badges and HMs are set to the `shuffle` option, don't add them to
         # the normal item pool, but do create their items and save them and
@@ -347,17 +356,17 @@ def create_items(self) -> None:
         if self.options.badges == RandomizeBadges.option_shuffle:
             self.badge_shuffle_info = [
                 (location, self.create_item_by_code(location.default_item_code))
-                for location in [l for l in item_locations if "Badge" in l.tags]
+                for location in [l for l in item_locations if emerald_data.locations[l.key].category == LocationCategory.BADGE]
             ]
         if self.options.hms == RandomizeHms.option_shuffle:
             self.hm_shuffle_info = [
                 (location, self.create_item_by_code(location.default_item_code))
-                for location in [l for l in item_locations if "HM" in l.tags]
+                for location in [l for l in item_locations if emerald_data.locations[l.key].category == LocationCategory.HM]
             ]
 
         # Filter down locations to actual items that will be filled and create
         # the itempool.
-        item_locations = [location for location in item_locations if len(filter_tags & location.tags) == 0]
+        item_locations = [location for location in item_locations if emerald_data.locations[location.key].category not in filter_categories]
         default_itempool = [self.create_item_by_code(location.default_item_code) for location in item_locations]
 
         # Take the itempool as-is
@@ -366,7 +375,8 @@ def create_items(self) -> None:
 
         # Recreate the itempool from random items
         elif self.options.item_pool_type in (ItemPoolType.option_diverse, ItemPoolType.option_diverse_balanced):
-            item_categories = ["Ball", "Heal", "Candy", "Vitamin", "EvoStone", "Money", "TM", "Held", "Misc", "Berry"]
+            item_categories = ["Ball", "Healing", "Rare Candy", "Vitamin", "Evolution Stone",
+                               "Money", "TM", "Held", "Misc", "Berry"]
 
             # Count occurrences of types of vanilla items in pool
             item_category_counter = Counter()
@@ -436,25 +446,26 @@ def generate_basic(self) -> None:
 
         # Key items which are considered in access rules but not randomized are converted to events and placed
         # in their vanilla locations so that the player can have them in their inventory for logic.
-        def convert_unrandomized_items_to_events(tag: str) -> None:
+        def convert_unrandomized_items_to_events(category: LocationCategory) -> None:
             for location in self.multiworld.get_locations(self.player):
-                if location.tags is not None and tag in location.tags:
+                assert isinstance(location, PokemonEmeraldLocation)
+                if location.key is not None and emerald_data.locations[location.key].category == category:
                     location.place_locked_item(self.create_event(self.item_id_to_name[location.default_item_code]))
                     location.progress_type = LocationProgressType.DEFAULT
                     location.address = None
 
         if self.options.badges == RandomizeBadges.option_vanilla:
-            convert_unrandomized_items_to_events("Badge")
+            convert_unrandomized_items_to_events(LocationCategory.BADGE)
         if self.options.hms == RandomizeHms.option_vanilla:
-            convert_unrandomized_items_to_events("HM")
+            convert_unrandomized_items_to_events(LocationCategory.HM)
         if not self.options.rods:
-            convert_unrandomized_items_to_events("Rod")
+            convert_unrandomized_items_to_events(LocationCategory.ROD)
         if not self.options.bikes:
-            convert_unrandomized_items_to_events("Bike")
+            convert_unrandomized_items_to_events(LocationCategory.BIKE)
         if not self.options.event_tickets:
-            convert_unrandomized_items_to_events("EventTicket")
+            convert_unrandomized_items_to_events(LocationCategory.TICKET)
         if not self.options.key_items:
-            convert_unrandomized_items_to_events("KeyItem")
+            convert_unrandomized_items_to_events(LocationCategory.KEY)
 
     def pre_fill(self) -> None:
         # Badges and HMs that are set to shuffle need to be placed at
diff --git a/worlds/pokemon_emerald/data.py b/worlds/pokemon_emerald/data.py
index 432d59387391..c7af5ef2284a 100644
--- a/worlds/pokemon_emerald/data.py
+++ b/worlds/pokemon_emerald/data.py
@@ -117,6 +117,21 @@ class ItemData(NamedTuple):
     tags: FrozenSet[str]
 
 
+class LocationCategory(IntEnum):
+    BADGE = 0
+    HM = 1
+    KEY = 2
+    ROD = 3
+    BIKE = 4
+    TICKET = 5
+    OVERWORLD_ITEM = 6
+    HIDDEN_ITEM = 7
+    GIFT = 8
+    BERRY_TREE = 9
+    TRAINER = 10
+    POKEDEX = 11
+
+
 class LocationData(NamedTuple):
     name: str
     label: str
@@ -124,6 +139,7 @@ class LocationData(NamedTuple):
     default_item: int
     address: Union[int, List[int]]
     flag: int
+    category: LocationCategory
     tags: FrozenSet[str]
 
 
@@ -431,6 +447,7 @@ def _init() -> None:
                     location_json["default_item"],
                     [location_json["address"]] + [j["address"] for j in alternate_rival_jsons],
                     location_json["flag"],
+                    LocationCategory[location_attributes_json[location_name]["category"]],
                     frozenset(location_attributes_json[location_name]["tags"])
                 )
             else:
@@ -441,6 +458,7 @@ def _init() -> None:
                     location_json["default_item"],
                     location_json["address"],
                     location_json["flag"],
+                    LocationCategory[location_attributes_json[location_name]["category"]],
                     frozenset(location_attributes_json[location_name]["tags"])
                 )
             new_region.locations.append(location_name)
@@ -948,6 +966,7 @@ def _init() -> None:
             evo_stage_to_ball_map[evo_stage],
             data.locations[dex_location_name].address,
             data.locations[dex_location_name].flag,
+            data.locations[dex_location_name].category,
             data.locations[dex_location_name].tags
         )
 
diff --git a/worlds/pokemon_emerald/data/items.json b/worlds/pokemon_emerald/data/items.json
index 139d75aad0ab..4c09d215cf3c 100644
--- a/worlds/pokemon_emerald/data/items.json
+++ b/worlds/pokemon_emerald/data/items.json
@@ -52,49 +52,49 @@
   "ITEM_HM_CUT": {
     "label": "HM01 Cut",
     "classification": "PROGRESSION",
-    "tags": ["HM", "Unique"],
+    "tags": ["HM", "HM01", "Unique"],
     "modern_id": 420
   },
   "ITEM_HM_FLY": {
     "label": "HM02 Fly",
     "classification": "PROGRESSION",
-    "tags": ["HM", "Unique"],
+    "tags": ["HM", "HM02", "Unique"],
     "modern_id": 421
   },
   "ITEM_HM_SURF": {
     "label": "HM03 Surf",
     "classification": "PROGRESSION",
-    "tags": ["HM", "Unique"],
+    "tags": ["HM", "HM03", "Unique"],
     "modern_id": 422
   },
   "ITEM_HM_STRENGTH": {
     "label": "HM04 Strength",
     "classification": "PROGRESSION",
-    "tags": ["HM", "Unique"],
+    "tags": ["HM", "HM04", "Unique"],
     "modern_id": 423
   },
   "ITEM_HM_FLASH": {
     "label": "HM05 Flash",
     "classification": "PROGRESSION",
-    "tags": ["HM", "Unique"],
+    "tags": ["HM", "HM05", "Unique"],
     "modern_id": 424
   },
   "ITEM_HM_ROCK_SMASH": {
     "label": "HM06 Rock Smash",
     "classification": "PROGRESSION",
-    "tags": ["HM", "Unique"],
+    "tags": ["HM", "HM06", "Unique"],
     "modern_id": 425
   },
   "ITEM_HM_WATERFALL": {
     "label": "HM07 Waterfall",
     "classification": "PROGRESSION",
-    "tags": ["HM", "Unique"],
+    "tags": ["HM", "HM07", "Unique"],
     "modern_id": 737
   },
   "ITEM_HM_DIVE": {
     "label": "HM08 Dive",
     "classification": "PROGRESSION",
-    "tags": ["HM", "Unique"],
+    "tags": ["HM", "HM08", "Unique"],
     "modern_id": null
   },
 
@@ -375,169 +375,169 @@
   "ITEM_POTION": {
     "label": "Potion",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 17
   },
   "ITEM_ANTIDOTE": {
     "label": "Antidote",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 18
   },
   "ITEM_BURN_HEAL": {
     "label": "Burn Heal",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 19
   },
   "ITEM_ICE_HEAL": {
     "label": "Ice Heal",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 20
   },
   "ITEM_AWAKENING": {
     "label": "Awakening",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 21
   },
   "ITEM_PARALYZE_HEAL": {
     "label": "Paralyze Heal",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 22
   },
   "ITEM_FULL_RESTORE": {
     "label": "Full Restore",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 23
   },
   "ITEM_MAX_POTION": {
     "label": "Max Potion",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 24
   },
   "ITEM_HYPER_POTION": {
     "label": "Hyper Potion",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 25
   },
   "ITEM_SUPER_POTION": {
     "label": "Super Potion",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 26
   },
   "ITEM_FULL_HEAL": {
     "label": "Full Heal",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 27
   },
   "ITEM_REVIVE": {
     "label": "Revive",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 28
   },
   "ITEM_MAX_REVIVE": {
     "label": "Max Revive",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 29
   },
   "ITEM_FRESH_WATER": {
     "label": "Fresh Water",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 30
   },
   "ITEM_SODA_POP": {
     "label": "Soda Pop",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 31
   },
   "ITEM_LEMONADE": {
     "label": "Lemonade",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 32
   },
   "ITEM_MOOMOO_MILK": {
     "label": "Moomoo Milk",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 33
   },
   "ITEM_ENERGY_POWDER": {
     "label": "Energy Powder",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 34
   },
   "ITEM_ENERGY_ROOT": {
     "label": "Energy Root",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 35
   },
   "ITEM_HEAL_POWDER": {
     "label": "Heal Powder",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 36
   },
   "ITEM_REVIVAL_HERB": {
     "label": "Revival Herb",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 37
   },
   "ITEM_ETHER": {
     "label": "Ether",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 38
   },
   "ITEM_MAX_ETHER": {
     "label": "Max Ether",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 39
   },
   "ITEM_ELIXIR": {
     "label": "Elixir",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 40
   },
   "ITEM_MAX_ELIXIR": {
     "label": "Max Elixir",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 41
   },
   "ITEM_LAVA_COOKIE": {
     "label": "Lava Cookie",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 42
   },
   "ITEM_BERRY_JUICE": {
     "label": "Berry Juice",
     "classification": "FILLER",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 43
   },
   "ITEM_SACRED_ASH": {
     "label": "Sacred Ash",
     "classification": "USEFUL",
-    "tags": ["Heal"],
+    "tags": ["Healing"],
     "modern_id": 44
   },
 
@@ -736,19 +736,19 @@
   },
   "ITEM_BLACK_FLUTE": {
     "label": "Black Flute",
-    "classification": "FILLER",
+    "classification": "USEFUL",
     "tags": ["Misc"],
     "modern_id": 68
   },
   "ITEM_WHITE_FLUTE": {
     "label": "White Flute",
-    "classification": "FILLER",
+    "classification": "USEFUL",
     "tags": ["Misc"],
     "modern_id": 69
   },
   "ITEM_HEART_SCALE": {
     "label": "Heart Scale",
-    "classification": "FILLER",
+    "classification": "USEFUL",
     "tags": ["Misc"],
     "modern_id": 93
   },
@@ -757,37 +757,37 @@
   "ITEM_SUN_STONE": {
     "label": "Sun Stone",
     "classification": "USEFUL",
-    "tags": ["EvoStone"],
+    "tags": ["Evolution Stone"],
     "modern_id": 80
   },
   "ITEM_MOON_STONE": {
     "label": "Moon Stone",
     "classification": "USEFUL",
-    "tags": ["EvoStone"],
+    "tags": ["Evolution Stone"],
     "modern_id": 81
   },
   "ITEM_FIRE_STONE": {
     "label": "Fire Stone",
     "classification": "USEFUL",
-    "tags": ["EvoStone"],
+    "tags": ["Evolution Stone"],
     "modern_id": 82
   },
   "ITEM_THUNDER_STONE": {
     "label": "Thunder Stone",
     "classification": "USEFUL",
-    "tags": ["EvoStone"],
+    "tags": ["Evolution Stone"],
     "modern_id": 83
   },
   "ITEM_WATER_STONE": {
     "label": "Water Stone",
     "classification": "USEFUL",
-    "tags": ["EvoStone"],
+    "tags": ["Evolution Stone"],
     "modern_id": 84
   },
   "ITEM_LEAF_STONE": {
     "label": "Leaf Stone",
     "classification": "USEFUL",
-    "tags": ["EvoStone"],
+    "tags": ["Evolution Stone"],
     "modern_id": 85
   },
 
@@ -1215,7 +1215,7 @@
   "ITEM_KINGS_ROCK": {
     "label": "King's Rock",
     "classification": "USEFUL",
-    "tags": ["Held"],
+    "tags": ["Held", "Evolution Stone"],
     "modern_id": 221
   },
   "ITEM_SILVER_POWDER": {
@@ -1245,13 +1245,13 @@
   "ITEM_DEEP_SEA_TOOTH": {
     "label": "Deep Sea Tooth",
     "classification": "USEFUL",
-    "tags": ["Held"],
+    "tags": ["Held", "Evolution Stone"],
     "modern_id": 226
   },
   "ITEM_DEEP_SEA_SCALE": {
     "label": "Deep Sea Scale",
     "classification": "USEFUL",
-    "tags": ["Held"],
+    "tags": ["Held", "Evolution Stone"],
     "modern_id": 227
   },
   "ITEM_SMOKE_BALL": {
@@ -1287,7 +1287,7 @@
   "ITEM_METAL_COAT": {
     "label": "Metal Coat",
     "classification": "USEFUL",
-    "tags": ["Held"],
+    "tags": ["Held", "Evolution Stone"],
     "modern_id": 233
   },
   "ITEM_LEFTOVERS": {
@@ -1299,7 +1299,7 @@
   "ITEM_DRAGON_SCALE": {
     "label": "Dragon Scale",
     "classification": "USEFUL",
-    "tags": ["Held"],
+    "tags": ["Held", "Evolution Stone"],
     "modern_id": 235
   },
   "ITEM_LIGHT_BALL": {
@@ -1401,7 +1401,7 @@
   "ITEM_UP_GRADE": {
     "label": "Up-Grade",
     "classification": "USEFUL",
-    "tags": ["Held"],
+    "tags": ["Held", "Evolution Stone"],
     "modern_id": 252
   },
   "ITEM_SHELL_BELL": {
diff --git a/worlds/pokemon_emerald/data/locations.json b/worlds/pokemon_emerald/data/locations.json
index 55ef15d871bb..63f42340cce4 100644
--- a/worlds/pokemon_emerald/data/locations.json
+++ b/worlds/pokemon_emerald/data/locations.json
@@ -1,5364 +1,6702 @@
 {
   "BADGE_1": {
     "label": "Rustboro Gym - Stone Badge",
-    "tags": ["Badge"]
+    "tags": [],
+    "category": "BADGE"
   },
   "BADGE_2": {
     "label": "Dewford Gym - Knuckle Badge",
-    "tags": ["Badge"]
+    "tags": [],
+    "category": "BADGE"
   },
   "BADGE_3": {
     "label": "Mauville Gym - Dynamo Badge",
-    "tags": ["Badge"]
+    "tags": [],
+    "category": "BADGE"
   },
   "BADGE_4": {
     "label": "Lavaridge Gym - Heat Badge",
-    "tags": ["Badge"]
+    "tags": [],
+    "category": "BADGE"
   },
   "BADGE_5": {
     "label": "Petalburg Gym - Balance Badge",
-    "tags": ["Badge"]
+    "tags": [],
+    "category": "BADGE"
   },
   "BADGE_6": {
     "label": "Fortree Gym - Feather Badge",
-    "tags": ["Badge"]
+    "tags": [],
+    "category": "BADGE"
   },
   "BADGE_7": {
     "label": "Mossdeep Gym - Mind Badge",
-    "tags": ["Badge"]
+    "tags": [],
+    "category": "BADGE"
   },
   "BADGE_8": {
     "label": "Sootopolis Gym - Rain Badge",
-    "tags": ["Badge"]
+    "tags": [],
+    "category": "BADGE"
   },
 
   "NPC_GIFT_RECEIVED_HM_CUT": {
     "label": "Rustboro City - HM01 from Cutter's House",
-    "tags": ["HM"]
+    "tags": [],
+    "category": "HM"
   },
   "NPC_GIFT_RECEIVED_HM_FLY": {
     "label": "Route 119 - HM02 from Rival Battle",
-    "tags": ["HM"]
+    "tags": [],
+    "category": "HM"
   },
   "NPC_GIFT_RECEIVED_HM_SURF": {
     "label": "Petalburg City - HM03 from Wally's Uncle",
-    "tags": ["HM"]
+    "tags": [],
+    "category": "HM"
   },
   "NPC_GIFT_RECEIVED_HM_STRENGTH": {
     "label": "Rusturf Tunnel - HM04 from Tunneler",
-    "tags": ["HM"]
+    "tags": [],
+    "category": "HM"
   },
   "NPC_GIFT_RECEIVED_HM_FLASH": {
     "label": "Granite Cave 1F - HM05 from Hiker",
-    "tags": ["HM"]
+    "tags": [],
+    "category": "HM"
   },
   "NPC_GIFT_RECEIVED_HM_ROCK_SMASH": {
     "label": "Mauville City - HM06 from Rock Smash Guy",
-    "tags": ["HM"]
+    "tags": [],
+    "category": "HM"
   },
   "NPC_GIFT_RECEIVED_HM_WATERFALL": {
     "label": "Sootopolis City - HM07 from Wallace",
-    "tags": ["HM"]
+    "tags": [],
+    "category": "HM"
   },
   "NPC_GIFT_RECEIVED_HM_DIVE": {
     "label": "Mossdeep City - HM08 from Steven's House",
-    "tags": ["HM"]
+    "tags": [],
+    "category": "HM"
   },
 
   "NPC_GIFT_RECEIVED_ACRO_BIKE": {
     "label": "Mauville City - Acro Bike",
-    "tags": ["Bike"]
+    "tags": [],
+    "category": "BIKE"
   },
   "NPC_GIFT_RECEIVED_MACH_BIKE": {
     "label": "Mauville City - Mach Bike",
-    "tags": ["Bike"]
+    "tags": [],
+    "category": "BIKE"
   },
 
   "NPC_GIFT_RECEIVED_WAILMER_PAIL": {
     "label": "Route 104 - Wailmer Pail from Flower Shop Lady",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_DEVON_GOODS_RUSTURF_TUNNEL": {
     "label": "Rusturf Tunnel - Recover Devon Goods",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_LETTER": {
     "label": "Devon Corp 3F - Letter from Mr. Stone",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_COIN_CASE": {
     "label": "Mauville City - Coin Case from Lady in House",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_METEORITE": {
     "label": "Mt Chimney - Meteorite from Machine",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_GO_GOGGLES": {
     "label": "Lavaridge Town - Go Goggles from Rival",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_GOT_BASEMENT_KEY_FROM_WATTSON": {
     "label": "Mauville City - Basement Key from Wattson",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_ITEMFINDER": {
     "label": "Route 110 - Itemfinder from Rival",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_DEVON_SCOPE": {
     "label": "Route 120 - Devon Scope from Steven",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_MAGMA_EMBLEM": {
     "label": "Mt Pyre Summit - Magma Emblem from Old Lady",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY": {
     "label": "Abandoned Ship - Captain's Office Key",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY": {
     "label": "Abandoned Ship HF - Room 4 Key",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY": {
     "label": "Abandoned Ship HF - Room 1 Key",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY": {
     "label": "Abandoned Ship HF - Room 6 Key",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY": {
     "label": "Abandoned Ship HF - Room 2 Key",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER": {
     "label": "Abandoned Ship HF - Scanner",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_POKEBLOCK_CASE": {
     "label": "Lilycove City - Pokeblock Case from Contest Hall",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_SS_TICKET": {
     "label": "Littleroot Town - S.S. Ticket from Norman",
-    "tags": ["KeyItem"]
+    "tags": [],
+    "category": "KEY"
   },
   "NPC_GIFT_RECEIVED_AURORA_TICKET": {
     "label": "Littleroot Town - Aurora Ticket from Norman",
-    "tags": ["EventTicket"]
+    "tags": [],
+    "category": "TICKET"
   },
   "NPC_GIFT_RECEIVED_EON_TICKET": {
     "label": "Littleroot Town - Eon Ticket from Norman",
-    "tags": ["EventTicket"]
+    "tags": [],
+    "category": "TICKET"
   },
   "NPC_GIFT_RECEIVED_MYSTIC_TICKET": {
     "label": "Littleroot Town - Mystic Ticket from Norman",
-    "tags": ["EventTicket"]
+    "tags": [],
+    "category": "TICKET"
   },
   "NPC_GIFT_RECEIVED_OLD_SEA_MAP": {
     "label": "Littleroot Town - Old Sea Map from Norman",
-    "tags": ["EventTicket"]
+    "tags": [],
+    "category": "TICKET"
   },
 
   "NPC_GIFT_RECEIVED_OLD_ROD": {
     "label": "Dewford Town - Old Rod from Fisherman",
-    "tags": ["Rod"]
+    "tags": [],
+    "category": "ROD"
   },
   "NPC_GIFT_RECEIVED_GOOD_ROD": {
     "label": "Route 118 - Good Rod from Fisherman",
-    "tags": ["Rod"]
+    "tags": [],
+    "category": "ROD"
   },
   "NPC_GIFT_RECEIVED_SUPER_ROD": {
     "label": "Mossdeep City - Super Rod from Fisherman in House",
-    "tags": ["Rod"]
+    "tags": [],
+    "category": "ROD"
   },
 
   "HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM": {
     "label": "Artisan Cave B1F - Hidden Item 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON": {
     "label": "Artisan Cave B1F - Hidden Item 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN": {
     "label": "Artisan Cave B1F - Hidden Item 3",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC": {
     "label": "Artisan Cave B1F - Hidden Item 4",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET": {
     "label": "Fallarbor Town - Hidden Item in Crater",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1": {
     "label": "Granite Cave B2F - Hidden Item After Crumbling Floor",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2": {
     "label": "Granite Cave B2F - Hidden Item on Platform",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL": {
     "label": "Jagged Pass - Hidden Item in Grass",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL": {
     "label": "Jagged Pass - Hidden Item in Corner",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL": {
     "label": "Lavaridge Town - Hidden Item in Springs",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE": {
     "label": "Lilycove City - Hidden Item on Beach West",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL": {
     "label": "Lilycove City - Hidden Item on Beach East",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_LILYCOVE_CITY_PP_UP": {
     "label": "Lilycove City - Hidden Item on Beach North",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER": {
     "label": "Mt Pyre Exterior - Hidden Item First Grave",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL": {
     "label": "Mt Pyre Exterior - Hidden Item Second Grave",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY": {
     "label": "Mt Pyre Summit - Hidden Item in Grass",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC": {
     "label": "Mt Pyre Summit - Hidden Item Grave",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY": {
     "label": "Petalburg City - Hidden Item Past Pond South",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL": {
     "label": "Petalburg Woods - Hidden Item After Grunt",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_PETALBURG_WOODS_POTION": {
     "label": "Petalburg Woods - Hidden Item Southeast",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1": {
     "label": "Petalburg Woods - Hidden Item Past Tree North",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2": {
     "label": "Petalburg Woods - Hidden Item Past Tree South",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_104_ANTIDOTE": {
     "label": "Route 104 - Hidden Item on Beach 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_104_HEART_SCALE": {
     "label": "Route 104 - Hidden Item on Beach 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_104_POTION": {
     "label": "Route 104 - Hidden Item on Beach 3",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_104_POKE_BALL": {
     "label": "Route 104 - Hidden Item Behind Flower Shop 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_104_SUPER_POTION": {
     "label": "Route 104 - Hidden Item Behind Flower Shop 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_105_BIG_PEARL": {
     "label": "Route 105 - Hidden Item Between Trainers",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_105_HEART_SCALE": {
     "label": "Route 105 - Hidden Item on Small Island",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_106_HEART_SCALE": {
     "label": "Route 106 - Hidden Item on Beach 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_106_STARDUST": {
     "label": "Route 106 - Hidden Item on Beach 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_106_POKE_BALL": {
     "label": "Route 106 - Hidden Item on Beach 3",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_108_RARE_CANDY": {
     "label": "Route 108 - Hidden Item on Rock",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_109_REVIVE": {
     "label": "Route 109 - Hidden Item on Beach Southwest",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_109_ETHER": {
     "label": "Route 109 - Hidden Item on Beach Southeast",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2": {
     "label": "Route 109 - Hidden Item on Beach Under Umbrella",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_109_GREAT_BALL": {
     "label": "Route 109 - Hidden Item on Beach West",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1": {
     "label": "Route 109 - Hidden Item on Beach Behind Old Man",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3": {
     "label": "Route 109 - Hidden Item in Front of Couple",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_110_FULL_HEAL": {
     "label": "Route 110 - Hidden Item South of Rival",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_110_GREAT_BALL": {
     "label": "Route 110 - Hidden Item North of Rival",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_110_REVIVE": {
     "label": "Route 110 - Hidden Item Behind Two Trainers",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_110_POKE_BALL": {
     "label": "Route 110 - Hidden Item South of Berries",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_111_PROTEIN": {
     "label": "Route 111 - Hidden Item Desert Behind Tower",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_111_RARE_CANDY": {
     "label": "Route 111 - Hidden Item Desert on Rock 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_111_STARDUST": {
     "label": "Route 111 - Hidden Item Desert on Rock 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_113_ETHER": {
     "label": "Route 113 - Hidden Item Mound West of Three Trainers",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_113_NUGGET": {
     "label": "Route 113 - Hidden Item Mound Between Trainers",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_113_TM_DOUBLE_TEAM": {
     "label": "Route 113 - Hidden Item Mound West of Workshop",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_114_CARBOS": {
     "label": "Route 114 - Hidden Item Rock in Grass",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_114_REVIVE": {
     "label": "Route 114 - Hidden Item West of Bridge",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_115_HEART_SCALE": {
     "label": "Route 115 - Hidden Item Behind Trainer on Beach",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES": {
     "label": "Route 116 - Hidden Item in East",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_116_SUPER_POTION": {
     "label": "Route 116 - Hidden Item in Tree Maze",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_117_REPEL": {
     "label": "Route 117 - Hidden Item Behind Flower Patch",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_118_HEART_SCALE": {
     "label": "Route 118 - Hidden Item West on Rock",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_118_IRON": {
     "label": "Route 118 - Hidden Item East on Rock",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_119_FULL_HEAL": {
     "label": "Route 119 - Hidden Item in South Tall Grass",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_119_CALCIUM": {
     "label": "Route 119 - Hidden Item Across South Rail",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_119_ULTRA_BALL": {
     "label": "Route 119 - Hidden Item in East Tall Grass",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_119_MAX_ETHER": {
     "label": "Route 119 - Hidden Item Next to Waterfall",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1": {
     "label": "Route 120 - Hidden Item Behind Trees",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_120_REVIVE": {
     "label": "Route 120 - Hidden Item in North Tall Grass",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_120_ZINC": {
     "label": "Route 120 - Hidden Item in Tall Grass Maze",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2": {
     "label": "Route 120 - Hidden Item Behind Southwest Pool",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_121_HP_UP": {
     "label": "Route 121 - Hidden Item West of Grunts",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_121_FULL_HEAL": {
     "label": "Route 121 - Hidden Item in Maze 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_121_MAX_REVIVE": {
     "label": "Route 121 - Hidden Item in Maze 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_121_NUGGET": {
     "label": "Route 121 - Hidden Item Behind Tree",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_123_PP_UP": {
     "label": "Route 123 - Hidden Item East Behind Tree 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_123_RARE_CANDY": {
     "label": "Route 123 - Hidden Item East Behind Tree 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_123_HYPER_POTION": {
     "label": "Route 123 - Hidden Item on Rock Before Ledges",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_123_SUPER_REPEL": {
     "label": "Route 123 - Hidden Item in North Path Grass",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_123_REVIVE": {
     "label": "Route 123 - Hidden Item Behind House",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1": {
     "label": "Route 128 - Hidden Item North Island",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2": {
     "label": "Route 128 - Hidden Item Center Island",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3": {
     "label": "Route 128 - Hidden Item Southwest Island",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC": {
     "label": "Safari Zone NE - Hidden Item North",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY": {
     "label": "Safari Zone NE - Hidden Item East",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE": {
     "label": "Safari Zone SE - Hidden Item in South Grass 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP": {
     "label": "Safari Zone SE - Hidden Item in South Grass 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS": {
     "label": "SS Tidal - Hidden Item in Lower Deck Trash Can",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD": {
     "label": "Route 124 UW - Hidden Item in Big Area",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_124_CARBOS": {
     "label": "Route 124 UW - Hidden Item in Tunnel Alcove",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_124_CALCIUM": {
     "label": "Route 124 UW - Hidden Item in North Tunnel 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2": {
     "label": "Route 124 UW - Hidden Item in North Tunnel 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_124_PEARL": {
     "label": "Route 124 UW - Hidden Item in Small Area North",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL": {
     "label": "Route 124 UW - Hidden Item in Small Area Middle",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1": {
     "label": "Route 124 UW - Hidden Item in Small Area South",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_126_STARDUST": {
     "label": "Route 126 UW - Hidden Item Northeast",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL": {
     "label": "Route 126 UW - Hidden Item in North Alcove",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL": {
     "label": "Route 126 UW - Hidden Item in Southeast",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE": {
     "label": "Route 126 UW - Hidden Item in Northwest Alcove",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD": {
     "label": "Route 126 UW - Hidden Item in Southwest Area",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_126_IRON": {
     "label": "Route 126 UW - Hidden Item in West Area 1",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_126_PEARL": {
     "label": "Route 126 UW - Hidden Item in West Area 2",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD": {
     "label": "Route 126 UW - Hidden Item in West Area 3",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE": {
     "label": "Route 127 UW - Hidden Item in West Area",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE": {
     "label": "Route 127 UW - Hidden Item in Center Area",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_127_HP_UP": {
     "label": "Route 127 UW - Hidden Item in East Area",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_127_RED_SHARD": {
     "label": "Route 127 UW - Hidden Item in Northeast Area",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_128_PEARL": {
     "label": "Route 128 UW - Hidden Item in East Area",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_UNDERWATER_128_PROTEIN": {
     "label": "Route 128 UW - Hidden Item in Small Area",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL": {
     "label": "Victory Road 1F - Hidden Item on Southeast Ledge",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR": {
     "label": "Victory Road B2F - Hidden Item Above Waterfall",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL": {
     "label": "Victory Road B2F - Hidden Item in Northeast Corner",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
   "HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH": {
     "label": "Navel Rock Top - Hidden Item Sacred Ash",
-    "tags": ["HiddenItem"]
+    "tags": [],
+    "category": "HIDDEN_ITEM"
   },
 
   "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_RAIN_DANCE": {
     "label": "Abandoned Ship HF - Item in Room 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE": {
     "label": "Abandoned Ship HF - Item in Room 3",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL": {
     "label": "Abandoned Ship HF - Item in Room 6",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL": {
     "label": "Abandoned Ship 1F - Item in East Side Northwest Room",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE": {
     "label": "Abandoned Ship 1F - Item in West Side North Room",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE": {
     "label": "Abandoned Ship B1F - Item in South Rooms",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_ICE_BEAM": {
     "label": "Abandoned Ship B1F - Item in Storage Room",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL": {
     "label": "Abandoned Ship B1F - Item in North Rooms",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL": {
     "label": "Aqua Hideout B1F - Item in Center Room 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_AQUA_HIDEOUT_B1F_NUGGET": {
     "label": "Aqua Hideout B1F - Item in Center Room 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR": {
     "label": "Aqua Hideout B1F - Item in East Room",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_AQUA_HIDEOUT_B2F_NEST_BALL": {
     "label": "Aqua Hideout B2F - Item in Long Hallway",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ARTISAN_CAVE_1F_CARBOS": {
     "label": "Artisan Cave 1F - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ARTISAN_CAVE_B1F_HP_UP": {
     "label": "Artisan Cave B1F - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_FIERY_PATH_FIRE_STONE": {
     "label": "Fiery Path - Item Behind Boulders 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_FIERY_PATH_TM_TOXIC": {
     "label": "Fiery Path - Item Behind Boulders 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE": {
     "label": "Granite Cave 1F - Item Before Ladder",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_GRANITE_CAVE_B1F_POKE_BALL": {
     "label": "Granite Cave B1F - Item in Alcove",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_GRANITE_CAVE_B2F_RARE_CANDY": {
     "label": "Granite Cave B2F - Item After Crumbling Floor",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_GRANITE_CAVE_B2F_REPEL": {
     "label": "Granite Cave B2F - Item After Mud Slope",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_JAGGED_PASS_BURN_HEAL": {
     "label": "Jagged Pass - Item Below Hideout",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_LILYCOVE_CITY_MAX_REPEL": {
     "label": "Lilycove City - Item on Peninsula",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY": {
     "label": "Magma Hideout 1F - Item on Ledge",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE": {
     "label": "Magma Hideout 2F - Item on West Platform",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR": {
     "label": "Magma Hideout 2F - Item on East Platform",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET": {
     "label": "Magma Hideout 3F - Item Before Last Floor",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX": {
     "label": "Magma Hideout 3F - Item in Drill Room",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE": {
     "label": "Magma Hideout 3F - Item After Groudon",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE": {
     "label": "Magma Hideout 4F - Item Before Groudon",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MAUVILLE_CITY_X_SPEED": {
     "label": "Mauville City - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_METEOR_FALLS_1F_1R_FULL_HEAL": {
     "label": "Meteor Falls 1F - Item Northeast",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_METEOR_FALLS_1F_1R_MOON_STONE": {
     "label": "Meteor Falls 1F - Item West",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_METEOR_FALLS_1F_1R_PP_UP": {
     "label": "Meteor Falls 1F - Item Below Waterfall",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_METEOR_FALLS_1F_1R_TM_IRON_TAIL": {
     "label": "Meteor Falls 1F - Item Before Steven's Cave",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_METEOR_FALLS_B1F_2R_TM_DRAGON_CLAW": {
     "label": "Meteor Falls B1F - Item in North Cave",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MOSSDEEP_CITY_NET_BALL": {
     "label": "Mossdeep City - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MT_PYRE_2F_ULTRA_BALL": {
     "label": "Mt Pyre 2F - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MT_PYRE_3F_SUPER_REPEL": {
     "label": "Mt Pyre 3F - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MT_PYRE_4F_SEA_INCENSE": {
     "label": "Mt Pyre 4F - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MT_PYRE_5F_LAX_INCENSE": {
     "label": "Mt Pyre 5F - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MT_PYRE_6F_TM_SHADOW_BALL": {
     "label": "Mt Pyre 6F - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MT_PYRE_EXTERIOR_TM_SKILL_SWAP": {
     "label": "Mt Pyre Exterior - Item 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_MT_PYRE_EXTERIOR_MAX_POTION": {
     "label": "Mt Pyre Exterior - Item 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_NEW_MAUVILLE_ESCAPE_ROPE": {
     "label": "New Mauville - Item 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_NEW_MAUVILLE_PARALYZE_HEAL": {
     "label": "New Mauville - Item 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_NEW_MAUVILLE_FULL_HEAL": {
     "label": "New Mauville - Item 3",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_NEW_MAUVILLE_THUNDER_STONE": {
     "label": "New Mauville - Item 4",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_NEW_MAUVILLE_ULTRA_BALL": {
     "label": "New Mauville - Item 5",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_PETALBURG_CITY_ETHER": {
     "label": "Petalburg City - Item Past Pond South",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_PETALBURG_CITY_MAX_REVIVE": {
     "label": "Petalburg City - Item Past Pond North",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_PETALBURG_WOODS_ETHER": {
     "label": "Petalburg Woods - Item Northwest",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_PETALBURG_WOODS_PARALYZE_HEAL": {
     "label": "Petalburg Woods - Item Southwest",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_PETALBURG_WOODS_GREAT_BALL": {
     "label": "Petalburg Woods - Item Past Tree Northeast",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_PETALBURG_WOODS_X_ATTACK": {
     "label": "Petalburg Woods - Item Past Tree South",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_102_POTION": {
     "label": "Route 102 - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_103_GUARD_SPEC": {
     "label": "Route 103 - Item Near Berries",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_103_PP_UP": {
     "label": "Route 103 - Item in Tree Maze",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_104_POKE_BALL": {
     "label": "Route 104 - Item Near Briney on Ledge",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_104_POTION": {
     "label": "Route 104 - Item Behind Flower Shop",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_104_X_ACCURACY": {
     "label": "Route 104 - Item Behind Tree",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_104_PP_UP": {
     "label": "Route 104 - Item East Past Pond",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_105_IRON": {
     "label": "Route 105 - Item on Island",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_106_PROTEIN": {
     "label": "Route 106 - Item on West Beach",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_108_STAR_PIECE": {
     "label": "Route 108 - Item Between Trainers",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_109_POTION": {
     "label": "Route 109 - Item on Beach",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_109_PP_UP": {
     "label": "Route 109 - Item on Island",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_110_DIRE_HIT": {
     "label": "Route 110 - Item South of Rival",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_110_ELIXIR": {
     "label": "Route 110 - Item South of Berries",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_110_RARE_CANDY": {
     "label": "Route 110 - Item on Island",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_111_ELIXIR": {
     "label": "Route 111 - Item Near Winstrates",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_111_HP_UP": {
     "label": "Route 111 - Item West of Pond Near Winstrates",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_111_STARDUST": {
     "label": "Route 111 - Item Desert Near Tower",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_111_TM_SANDSTORM": {
     "label": "Route 111 - Item Desert South",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_112_NUGGET": {
     "label": "Route 112 - Item on Ledges",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_113_SUPER_REPEL": {
     "label": "Route 113 - Item Past Three Trainers",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_113_MAX_ETHER": {
     "label": "Route 113 - Item on Ledge",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_113_HYPER_POTION": {
     "label": "Route 113 - Item Near Fallarbor South",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_114_ENERGY_POWDER": {
     "label": "Route 114 - Item Between Trainers",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_114_PROTEIN": {
     "label": "Route 114 - Item Behind Smashable Rock",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_114_RARE_CANDY": {
     "label": "Route 114 - Item Above Waterfall",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_115_SUPER_POTION": {
     "label": "Route 115 - Item on Beach",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_115_PP_UP": {
     "label": "Route 115 - Item on Ledge",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_115_GREAT_BALL": {
     "label": "Route 115 - Item Behind Smashable Rock",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_115_HEAL_POWDER": {
     "label": "Route 115 - Item North Near Trainers",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_115_TM_FOCUS_PUNCH": {
     "label": "Route 115 - Item Near Mud Slope",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_115_IRON": {
     "label": "Route 115 - Item Past Mud Slope",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_116_REPEL": {
     "label": "Route 116 - Item in Grass",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_116_X_SPECIAL": {
     "label": "Route 116 - Item Near Tunnel",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_116_POTION": {
     "label": "Route 116 - Item in Tree Maze 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_116_ETHER": {
     "label": "Route 116 - Item in Tree Maze 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_116_HP_UP": {
     "label": "Route 116 - Item in East",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_117_GREAT_BALL": {
     "label": "Route 117 - Item Behind Flower Patch",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_117_REVIVE": {
     "label": "Route 117 - Item Behind Tree",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_118_HYPER_POTION": {
     "label": "Route 118 - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_SUPER_REPEL": {
     "label": "Route 119 - Item in South Tall Grass 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_HYPER_POTION_1": {
     "label": "Route 119 - Item in South Tall Grass 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_ZINC": {
     "label": "Route 119 - Item Across River South",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_HYPER_POTION_2": {
     "label": "Route 119 - Item Near Mud Slope",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_ELIXIR_1": {
     "label": "Route 119 - Item East of Mud Slope",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_ELIXIR_2": {
     "label": "Route 119 - Item on River Bank",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_LEAF_STONE": {
     "label": "Route 119 - Item Near South Waterfall",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_NUGGET": {
     "label": "Route 119 - Item Above North Waterfall 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_119_RARE_CANDY": {
     "label": "Route 119 - Item Above North Waterfall 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_120_NEST_BALL": {
     "label": "Route 120 - Item Near North Pond",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_120_REVIVE": {
     "label": "Route 120 - Item in North Puddles",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_120_NUGGET": {
     "label": "Route 120 - Item in Tall Grass Maze",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_120_HYPER_POTION": {
     "label": "Route 120 - Item in Tall Grass South",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_120_FULL_HEAL": {
     "label": "Route 120 - Item Behind Southwest Pool",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_121_ZINC": {
     "label": "Route 121 - Item Near Safari Zone",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_121_REVIVE": {
     "label": "Route 121 - Item in Maze 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_121_CARBOS": {
     "label": "Route 121 - Item in Maze 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_123_ULTRA_BALL": {
     "label": "Route 123 - Item Below Ledges",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_123_ELIXIR": {
     "label": "Route 123 - Item on Ledges 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_123_REVIVAL_HERB": {
     "label": "Route 123 - Item on Ledges 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_123_PP_UP": {
     "label": "Route 123 - Item on Ledges 3",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_123_CALCIUM": {
     "label": "Route 123 - Item on Ledges 4",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_124_RED_SHARD": {
     "label": "Route 124 - Item in Northwest Area",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_124_YELLOW_SHARD": {
     "label": "Route 124 - Item in Northeast Area",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_124_BLUE_SHARD": {
     "label": "Route 124 - Item in Southwest Area",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_125_BIG_PEARL": {
     "label": "Route 125 - Item Between Trainers",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_126_GREEN_SHARD": {
     "label": "Route 126 - Item in Separated Area",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_127_ZINC": {
     "label": "Route 127 - Item North",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_127_CARBOS": {
     "label": "Route 127 - Item East",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_127_RARE_CANDY": {
     "label": "Route 127 - Item Between Trainers",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_132_PROTEIN": {
     "label": "Route 132 - Item 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_132_RARE_CANDY": {
     "label": "Route 132 - Item 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_133_BIG_PEARL": {
     "label": "Route 133 - Item 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_133_MAX_REVIVE": {
     "label": "Route 133 - Item 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_133_STAR_PIECE": {
     "label": "Route 133 - Item 3",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_134_CARBOS": {
     "label": "Route 134 - Item 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_ROUTE_134_STAR_PIECE": {
     "label": "Route 134 - Item 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_RUSTBORO_CITY_X_DEFEND": {
     "label": "Rustboro City - Item Behind Fences",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_RUSTURF_TUNNEL_POKE_BALL": {
     "label": "Rusturf Tunnel - Item West",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_RUSTURF_TUNNEL_MAX_ETHER": {
     "label": "Rusturf Tunnel - Item East",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SAFARI_ZONE_NORTH_CALCIUM": {
     "label": "Safari Zone N - Item in Grass",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET": {
     "label": "Safari Zone NE - Item on Ledge",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SAFARI_ZONE_NORTH_WEST_TM_SOLAR_BEAM": {
     "label": "Safari Zone NW - Item Behind Pond",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL": {
     "label": "Safari Zone SE - Item in Grass",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE": {
     "label": "Safari Zone SW - Item Behind Pond",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SCORCHED_SLAB_TM_SUNNY_DAY": {
     "label": "Scorched Slab - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_EARTHQUAKE": {
     "label": "Seafloor Cavern Room 9 - Item Before Kyogre",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL": {
     "label": "Shoal Cave Entrance - Item on Ledge",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE": {
     "label": "Shoal Cave Ice Room - Item 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SHOAL_CAVE_ICE_ROOM_TM_HAIL": {
     "label": "Shoal Cave Ice Room - Item 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY": {
     "label": "Shoal Cave Inner Room - Item in Center",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL": {
     "label": "Shoal Cave Stairs Room - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL": {
     "label": "Trick House Puzzle 1 - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL": {
     "label": "Trick House Puzzle 2 - Item 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL": {
     "label": "Trick House Puzzle 2 - Item 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL": {
     "label": "Trick House Puzzle 3 - Item 1",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL": {
     "label": "Trick House Puzzle 3 - Item 2",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL": {
     "label": "Trick House Puzzle 4 - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL": {
     "label": "Trick House Puzzle 6 - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL": {
     "label": "Trick House Puzzle 7 - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL": {
     "label": "Trick House Puzzle 8 - Item",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_VICTORY_ROAD_1F_MAX_ELIXIR": {
     "label": "Victory Road 1F - Item East",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_VICTORY_ROAD_1F_PP_UP": {
     "label": "Victory Road 1F - Item on Southeast Ledge",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_VICTORY_ROAD_B1F_FULL_RESTORE": {
     "label": "Victory Road B1F - Item Behind Boulders",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_VICTORY_ROAD_B1F_TM_PSYCHIC": {
     "label": "Victory Road B1F - Item on Northeast Ledge",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
   "ITEM_VICTORY_ROAD_B2F_FULL_HEAL": {
     "label": "Victory Road B2F - Item Above Waterfall",
-    "tags": ["OverworldItem"]
+    "tags": [],
+    "category": "OVERWORLD_ITEM"
   },
 
   "NPC_GIFT_GOT_TM_THUNDERBOLT_FROM_WATTSON": {
     "label": "Mauville City - TM24 from Wattson",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_6_SODA_POP": {
     "label": "Route 109 - Seashore House Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_AMULET_COIN": {
     "label": "Littleroot Town - Amulet Coin from Mom",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_CHARCOAL": {
     "label": "Lavaridge Town Herb Shop - Charcoal from Man",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_CHESTO_BERRY_ROUTE_104": {
     "label": "Route 104 - Gift from Woman Near Berries",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_CLEANSE_TAG": {
     "label": "Mt Pyre 1F - Cleanse Tag from Woman in NE Corner",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_EXP_SHARE": {
     "label": "Devon Corp 3F - Exp. Share from Mr. Stone",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_FOCUS_BAND": {
     "label": "Shoal Cave Lower Room - Focus Band from Black Belt",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_GREAT_BALL_PETALBURG_WOODS": {
     "label": "Petalburg Woods - Gift from Devon Employee",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_GREAT_BALL_RUSTBORO_CITY": {
     "label": "Rustboro City - Gift from Devon Employee",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_KINGS_ROCK": {
     "label": "Mossdeep City - King's Rock from Boy",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_MACHO_BRACE": {
     "label": "Route 111 - Winstrate Family Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_MENTAL_HERB": {
     "label": "Fortree City - Wingull Delivery Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_MIRACLE_SEED": {
     "label": "Petalburg Woods - Miracle Seed from Lady",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_POTION_OLDALE": {
     "label": "Oldale Town - Gift from Shop Tutorial",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_POWDER_JAR": {
     "label": "Slateport City - Powder Jar from Lady in Market",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_PREMIER_BALL_RUSTBORO": {
     "label": "Rustboro City - Gift from Boy in Apartments",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_QUICK_CLAW": {
     "label": "Rustboro City - Quick Claw from School Teacher",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_REPEAT_BALL": {
     "label": "Route 116 - Gift from Devon Researcher",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_SECRET_POWER": {
     "label": "Route 111 - Secret Power from Man Near Tree",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_SILK_SCARF": {
     "label": "Dewford Town - Silk Scarf from Man in House",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_SOFT_SAND": {
     "label": "Route 109 - Soft Sand from Tuber",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_SOOT_SACK": {
     "label": "Route 113 - Soot Sack from Glass Blower",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_SOOTHE_BELL": {
     "label": "Slateport City - Soothe Bell from Woman in Fan Club",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_SUN_STONE_MOSSDEEP": {
     "label": "Space Center - Gift from Man",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_WATER_PULSE": {
     "label": "Sootopolis Gym - TM03 from Juan",
-    "tags": ["NpcGift"]
+    "tags": ["Gym TMs"],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_CALM_MIND": {
     "label": "Mossdeep Gym - TM04 from Tate and Liza",
-    "tags": ["NpcGift"]
+    "tags": ["Gym TMs"],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_ROAR": {
     "label": "Route 114 - TM05 from Roaring Man",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_BULK_UP": {
     "label": "Dewford Gym - TM08 from Brawly",
-    "tags": ["NpcGift"]
+    "tags": ["Gym TMs"],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_BULLET_SEED": {
     "label": "Route 104 - TM09 from Boy",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_HIDDEN_POWER": {
     "label": "Fortree City - TM10 from Hidden Power Lady",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_GIGA_DRAIN": {
     "label": "Route 123 - TM19 from Girl near Berries",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_FRUSTRATION": {
     "label": "Pacifidlog Town - TM21 from Man in House",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_RETURN": {
     "label": "Fallarbor Town - TM27 from Cozmo",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_RETURN_2": {
     "label": "Pacifidlog Town - TM27 from Man in House",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_DIG": {
     "label": "Route 114 - TM28 from Fossil Maniac's Brother",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_BRICK_BREAK": {
     "label": "Sootopolis City - TM31 from Black Belt in House",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_SHOCK_WAVE": {
     "label": "Mauville Gym - TM34 from Wattson",
-    "tags": ["NpcGift"]
+    "tags": ["Gym TMs"],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_SLUDGE_BOMB": {
     "label": "Dewford Town - TM36 from Sludge Bomb Man",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_ROCK_TOMB": {
     "label": "Rustboro Gym - TM39 from Roxanne",
-    "tags": ["NpcGift"]
+    "tags": ["Gym TMs"],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_AERIAL_ACE": {
     "label": "Fortree Gym - TM40 from Winona",
-    "tags": ["NpcGift"]
+    "tags": ["Gym TMs"],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_TORMENT": {
     "label": "Slateport City - TM41 from Sailor in Battle Tent",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_FACADE": {
     "label": "Petalburg Gym - TM42 from Norman",
-    "tags": ["NpcGift"]
+    "tags": ["Gym TMs"],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_REST": {
     "label": "Lilycove City - TM44 from Man in House",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_ATTRACT": {
     "label": "Verdanturf Town - TM45 from Woman in Battle Tent",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_THIEF": {
     "label": "Oceanic Museum - TM46 from Aqua Grunt in Museum",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_STEEL_WING": {
     "label": "Granite Cave 1F - TM47 from Steven",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_SNATCH": {
     "label": "SS Tidal - TM49 from Thief",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TM_OVERHEAT": {
     "label": "Lavaridge Gym - TM50 from Flannery",
-    "tags": ["NpcGift"]
+    "tags": ["Gym TMs"],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_WHITE_HERB": {
     "label": "Route 104 - White Herb from Lady Near Flower Shop",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_FLOWER_SHOP_RECEIVED_BERRY": {
     "label": "Route 104 - Berry from Girl in Flower Shop",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_DEEP_SEA_SCALE": {
     "label": "Slateport City - Deep Sea Scale from Capt. Stern",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_DEEP_SEA_TOOTH": {
     "label": "Slateport City - Deep Sea Tooth from Capt. Stern",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TRICK_HOUSE_REWARD_1": {
     "label": "Trick House Puzzle 1 - Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TRICK_HOUSE_REWARD_2": {
     "label": "Trick House Puzzle 2 - Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TRICK_HOUSE_REWARD_3": {
     "label": "Trick House Puzzle 3 - Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TRICK_HOUSE_REWARD_4": {
     "label": "Trick House Puzzle 4 - Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TRICK_HOUSE_REWARD_5": {
     "label": "Trick House Puzzle 5 - Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TRICK_HOUSE_REWARD_6": {
     "label": "Trick House Puzzle 6 - Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_TRICK_HOUSE_REWARD_7": {
     "label": "Trick House Puzzle 7 - Reward",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_RECEIVED_FIRST_POKEBALLS": {
     "label": "Littleroot Town - Pokeballs from Rival",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_SOOTOPOLIS_RECEIVED_BERRY_1": {
     "label": "Sootopolis City - Berry from Girl on Grass 1",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_SOOTOPOLIS_RECEIVED_BERRY_2": {
     "label": "Sootopolis City - Berry from Girl on Grass 2",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_ROUTE_111_RECEIVED_BERRY": {
     "label": "Route 111 - Berry from Girl Near Berry Trees",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_ROUTE_114_RECEIVED_BERRY": {
     "label": "Route 114 - Berry from Man Near House",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_ROUTE_120_RECEIVED_BERRY": {
     "label": "Route 120 - Berry from Lady Near Berry Trees",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_BERRY_MASTER_RECEIVED_BERRY_1": {
     "label": "Route 123 - Berry from Berry Master 1",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_BERRY_MASTER_RECEIVED_BERRY_2": {
     "label": "Route 123 - Berry from Berry Master 2",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_BERRY_MASTERS_WIFE": {
     "label": "Route 123 - Berry from Berry Master's Wife",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
   "NPC_GIFT_LILYCOVE_RECEIVED_BERRY": {
     "label": "Lilycove City - Berry from Gentleman Above Ledges",
-    "tags": ["NpcGift"]
+    "tags": [],
+    "category": "GIFT"
   },
 
   "BERRY_TREE_01": {
     "label": "Route 102 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_02": {
     "label": "Route 102 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_03": {
     "label": "Route 104 - Berry Tree Flower Shop 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_04": {
     "label": "Route 104 - Berry Tree Flower Shop 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_05": {
     "label": "Route 103 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_06": {
     "label": "Route 103 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_07": {
     "label": "Route 103 - Berry Tree 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_08": {
     "label": "Route 104 - Berry Tree North 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_09": {
     "label": "Route 104 - Berry Tree North 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_10": {
     "label": "Route 104 - Berry Tree North 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_11": {
     "label": "Route 104 - Berry Tree South 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_12": {
     "label": "Route 104 - Berry Tree South 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_13": {
     "label": "Route 104 - Berry Tree South 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_14": {
     "label": "Route 123 - Berry Tree Berry Master 6",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_15": {
     "label": "Route 123 - Berry Tree Berry Master 7",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_16": {
     "label": "Route 110 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_17": {
     "label": "Route 110 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_18": {
     "label": "Route 110 - Berry Tree 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_19": {
     "label": "Route 111 - Berry Tree 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_20": {
     "label": "Route 111 - Berry Tree 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_21": {
     "label": "Route 112 - Berry Tree 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_22": {
     "label": "Route 112 - Berry Tree 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_23": {
     "label": "Route 112 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_24": {
     "label": "Route 112 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_25": {
     "label": "Route 116 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_26": {
     "label": "Route 116 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_27": {
     "label": "Route 117 - Berry Tree 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_28": {
     "label": "Route 117 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_29": {
     "label": "Route 117 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_30": {
     "label": "Route 123 - Berry Tree Berry Master 8",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_31": {
     "label": "Route 118 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_32": {
     "label": "Route 118 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_33": {
     "label": "Route 118 - Berry Tree 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_34": {
     "label": "Route 119 - Berry Tree North 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_35": {
     "label": "Route 119 - Berry Tree North 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_36": {
     "label": "Route 119 - Berry Tree North 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_37": {
     "label": "Route 120 - Berry Tree in Side Area 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_38": {
     "label": "Route 120 - Berry Tree in Side Area 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_39": {
     "label": "Route 120 - Berry Tree in Side Area 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_40": {
     "label": "Route 120 - Berry Tree South 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_41": {
     "label": "Route 120 - Berry Tree South 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_42": {
     "label": "Route 120 - Berry Tree South 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_43": {
     "label": "Route 120 - Berry Tree Pond 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_44": {
     "label": "Route 120 - Berry Tree Pond 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_45": {
     "label": "Route 120 - Berry Tree Pond 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_46": {
     "label": "Route 120 - Berry Tree Pond 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_47": {
     "label": "Route 121 - Berry Tree West 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_48": {
     "label": "Route 121 - Berry Tree West 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_49": {
     "label": "Route 121 - Berry Tree West 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_50": {
     "label": "Route 121 - Berry Tree West 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_51": {
     "label": "Route 121 - Berry Tree East 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_52": {
     "label": "Route 121 - Berry Tree East 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_53": {
     "label": "Route 121 - Berry Tree East 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_54": {
     "label": "Route 121 - Berry Tree East 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_55": {
     "label": "Route 115 - Berry Tree Behind Smashable Rock 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_56": {
     "label": "Route 115 - Berry Tree Behind Smashable Rock 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_57": {
     "label": "Route 123 - Berry Tree East 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_58": {
     "label": "Route 123 - Berry Tree Berry Master 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_59": {
     "label": "Route 123 - Berry Tree Berry Master 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_60": {
     "label": "Route 123 - Berry Tree Berry Master 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_61": {
     "label": "Route 123 - Berry Tree Berry Master 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_62": {
     "label": "Route 123 - Berry Tree East 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_63": {
     "label": "Route 123 - Berry Tree East 5",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_64": {
     "label": "Route 123 - Berry Tree East 6",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_65": {
     "label": "Route 123 - Berry Tree Berry Master 9",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_66": {
     "label": "Route 116 - Berry Tree 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_67": {
     "label": "Route 116 - Berry Tree 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_68": {
     "label": "Route 114 - Berry Tree 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_69": {
     "label": "Route 115 - Berry Tree North 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_70": {
     "label": "Route 115 - Berry Tree North 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_71": {
     "label": "Route 115 - Berry Tree North 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_72": {
     "label": "Route 123 - Berry Tree Berry Master 10",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_73": {
     "label": "Route 123 - Berry Tree Berry Master 11",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_74": {
     "label": "Route 123 - Berry Tree Berry Master 12",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_75": {
     "label": "Route 104 - Berry Tree Flower Shop 3",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_76": {
     "label": "Route 104 - Berry Tree Flower Shop 4",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_77": {
     "label": "Route 114 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_78": {
     "label": "Route 114 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_79": {
     "label": "Route 123 - Berry Tree Berry Master 5",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_80": {
     "label": "Route 111 - Berry Tree 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_81": {
     "label": "Route 111 - Berry Tree 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_82": {
     "label": "Route 130 - Berry Tree on Mirage Island",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_83": {
     "label": "Route 119 - Berry Tree Above Waterfall 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_84": {
     "label": "Route 119 - Berry Tree Above Waterfall 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_85": {
     "label": "Route 119 - Berry Tree South 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_86": {
     "label": "Route 119 - Berry Tree South 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_87": {
     "label": "Route 123 - Berry Tree East 1",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
   "BERRY_TREE_88": {
     "label": "Route 123 - Berry Tree East 2",
-    "tags": ["BerryTree"]
+    "tags": [],
+    "category": "BERRY_TREE"
   },
 
   "POKEDEX_REWARD_001": {
     "label": "Pokedex - Bulbasaur",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_002": {
     "label": "Pokedex - Ivysaur",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_003": {
     "label": "Pokedex - Venusaur",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_004": {
     "label": "Pokedex - Charmander",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_005": {
     "label": "Pokedex - Charmeleon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_006": {
     "label": "Pokedex - Charizard",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_007": {
     "label": "Pokedex - Squirtle",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_008": {
     "label": "Pokedex - Wartortle",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_009": {
     "label": "Pokedex - Blastoise",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_010": {
     "label": "Pokedex - Caterpie",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_011": {
     "label": "Pokedex - Metapod",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_012": {
     "label": "Pokedex - Butterfree",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_013": {
     "label": "Pokedex - Weedle",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_014": {
     "label": "Pokedex - Kakuna",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_015": {
     "label": "Pokedex - Beedrill",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_016": {
     "label": "Pokedex - Pidgey",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_017": {
     "label": "Pokedex - Pidgeotto",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_018": {
     "label": "Pokedex - Pidgeot",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_019": {
     "label": "Pokedex - Rattata",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_020": {
     "label": "Pokedex - Raticate",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_021": {
     "label": "Pokedex - Spearow",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_022": {
     "label": "Pokedex - Fearow",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_023": {
     "label": "Pokedex - Ekans",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_024": {
     "label": "Pokedex - Arbok",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_025": {
     "label": "Pokedex - Pikachu",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_026": {
     "label": "Pokedex - Raichu",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_027": {
     "label": "Pokedex - Sandshrew",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_028": {
     "label": "Pokedex - Sandslash",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_029": {
     "label": "Pokedex - Nidoran Female",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_030": {
     "label": "Pokedex - Nidorina",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_031": {
     "label": "Pokedex - Nidoqueen",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_032": {
     "label": "Pokedex - Nidoran Male",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_033": {
     "label": "Pokedex - Nidorino",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_034": {
     "label": "Pokedex - Nidoking",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_035": {
     "label": "Pokedex - Clefairy",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_036": {
     "label": "Pokedex - Clefable",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_037": {
     "label": "Pokedex - Vulpix",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_038": {
     "label": "Pokedex - Ninetales",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_039": {
     "label": "Pokedex - Jigglypuff",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_040": {
     "label": "Pokedex - Wigglytuff",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_041": {
     "label": "Pokedex - Zubat",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_042": {
     "label": "Pokedex - Golbat",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_043": {
     "label": "Pokedex - Oddish",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_044": {
     "label": "Pokedex - Gloom",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_045": {
     "label": "Pokedex - Vileplume",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_046": {
     "label": "Pokedex - Paras",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_047": {
     "label": "Pokedex - Parasect",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_048": {
     "label": "Pokedex - Venonat",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_049": {
     "label": "Pokedex - Venomoth",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_050": {
     "label": "Pokedex - Diglett",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_051": {
     "label": "Pokedex - Dugtrio",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_052": {
     "label": "Pokedex - Meowth",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_053": {
     "label": "Pokedex - Persian",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_054": {
     "label": "Pokedex - Psyduck",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_055": {
     "label": "Pokedex - Golduck",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_056": {
     "label": "Pokedex - Mankey",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_057": {
     "label": "Pokedex - Primeape",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_058": {
     "label": "Pokedex - Growlithe",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_059": {
     "label": "Pokedex - Arcanine",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_060": {
     "label": "Pokedex - Poliwag",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_061": {
     "label": "Pokedex - Poliwhirl",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_062": {
     "label": "Pokedex - Poliwrath",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_063": {
     "label": "Pokedex - Abra",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_064": {
     "label": "Pokedex - Kadabra",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_065": {
     "label": "Pokedex - Alakazam",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_066": {
     "label": "Pokedex - Machop",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_067": {
     "label": "Pokedex - Machoke",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_068": {
     "label": "Pokedex - Machamp",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_069": {
     "label": "Pokedex - Bellsprout",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_070": {
     "label": "Pokedex - Weepinbell",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_071": {
     "label": "Pokedex - Victreebel",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_072": {
     "label": "Pokedex - Tentacool",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_073": {
     "label": "Pokedex - Tentacruel",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_074": {
     "label": "Pokedex - Geodude",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_075": {
     "label": "Pokedex - Graveler",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_076": {
     "label": "Pokedex - Golem",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_077": {
     "label": "Pokedex - Ponyta",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_078": {
     "label": "Pokedex - Rapidash",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_079": {
     "label": "Pokedex - Slowpoke",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_080": {
     "label": "Pokedex - Slowbro",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_081": {
     "label": "Pokedex - Magnemite",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_082": {
     "label": "Pokedex - Magneton",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_083": {
     "label": "Pokedex - Farfetch'd",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_084": {
     "label": "Pokedex - Doduo",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_085": {
     "label": "Pokedex - Dodrio",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_086": {
     "label": "Pokedex - Seel",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_087": {
     "label": "Pokedex - Dewgong",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_088": {
     "label": "Pokedex - Grimer",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_089": {
     "label": "Pokedex - Muk",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_090": {
     "label": "Pokedex - Shellder",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_091": {
     "label": "Pokedex - Cloyster",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_092": {
     "label": "Pokedex - Gastly",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_093": {
     "label": "Pokedex - Haunter",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_094": {
     "label": "Pokedex - Gengar",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_095": {
     "label": "Pokedex - Onix",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_096": {
     "label": "Pokedex - Drowzee",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_097": {
     "label": "Pokedex - Hypno",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_098": {
     "label": "Pokedex - Krabby",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_099": {
     "label": "Pokedex - Kingler",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_100": {
     "label": "Pokedex - Voltorb",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_101": {
     "label": "Pokedex - Electrode",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_102": {
     "label": "Pokedex - Exeggcute",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_103": {
     "label": "Pokedex - Exeggutor",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_104": {
     "label": "Pokedex - Cubone",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_105": {
     "label": "Pokedex - Marowak",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_106": {
     "label": "Pokedex - Hitmonlee",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_107": {
     "label": "Pokedex - Hitmonchan",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_108": {
     "label": "Pokedex - Lickitung",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_109": {
     "label": "Pokedex - Koffing",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_110": {
     "label": "Pokedex - Weezing",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_111": {
     "label": "Pokedex - Rhyhorn",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_112": {
     "label": "Pokedex - Rhydon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_113": {
     "label": "Pokedex - Chansey",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_114": {
     "label": "Pokedex - Tangela",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_115": {
     "label": "Pokedex - Kangaskhan",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_116": {
     "label": "Pokedex - Horsea",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_117": {
     "label": "Pokedex - Seadra",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_118": {
     "label": "Pokedex - Goldeen",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_119": {
     "label": "Pokedex - Seaking",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_120": {
     "label": "Pokedex - Staryu",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_121": {
     "label": "Pokedex - Starmie",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_122": {
     "label": "Pokedex - Mr. Mime",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_123": {
     "label": "Pokedex - Scyther",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_124": {
     "label": "Pokedex - Jynx",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_125": {
     "label": "Pokedex - Electabuzz",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_126": {
     "label": "Pokedex - Magmar",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_127": {
     "label": "Pokedex - Pinsir",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_128": {
     "label": "Pokedex - Tauros",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_129": {
     "label": "Pokedex - Magikarp",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_130": {
     "label": "Pokedex - Gyarados",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_131": {
     "label": "Pokedex - Lapras",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_132": {
     "label": "Pokedex - Ditto",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_133": {
     "label": "Pokedex - Eevee",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_134": {
     "label": "Pokedex - Vaporeon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_135": {
     "label": "Pokedex - Jolteon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_136": {
     "label": "Pokedex - Flareon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_137": {
     "label": "Pokedex - Porygon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_138": {
     "label": "Pokedex - Omanyte",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_139": {
     "label": "Pokedex - Omastar",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_140": {
     "label": "Pokedex - Kabuto",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_141": {
     "label": "Pokedex - Kabutops",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_142": {
     "label": "Pokedex - Aerodactyl",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_143": {
     "label": "Pokedex - Snorlax",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_144": {
     "label": "Pokedex - Articuno",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_145": {
     "label": "Pokedex - Zapdos",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_146": {
     "label": "Pokedex - Moltres",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_147": {
     "label": "Pokedex - Dratini",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_148": {
     "label": "Pokedex - Dragonair",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_149": {
     "label": "Pokedex - Dragonite",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_150": {
     "label": "Pokedex - Mewtwo",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_151": {
     "label": "Pokedex - Mew",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_152": {
     "label": "Pokedex - Chikorita",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_153": {
     "label": "Pokedex - Bayleef",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_154": {
     "label": "Pokedex - Meganium",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_155": {
     "label": "Pokedex - Cyndaquil",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_156": {
     "label": "Pokedex - Quilava",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_157": {
     "label": "Pokedex - Typhlosion",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_158": {
     "label": "Pokedex - Totodile",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_159": {
     "label": "Pokedex - Croconaw",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_160": {
     "label": "Pokedex - Feraligatr",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_161": {
     "label": "Pokedex - Sentret",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_162": {
     "label": "Pokedex - Furret",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_163": {
     "label": "Pokedex - Hoothoot",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_164": {
     "label": "Pokedex - Noctowl",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_165": {
     "label": "Pokedex - Ledyba",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_166": {
     "label": "Pokedex - Ledian",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_167": {
     "label": "Pokedex - Spinarak",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_168": {
     "label": "Pokedex - Ariados",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_169": {
     "label": "Pokedex - Crobat",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_170": {
     "label": "Pokedex - Chinchou",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_171": {
     "label": "Pokedex - Lanturn",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_172": {
     "label": "Pokedex - Pichu",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_173": {
     "label": "Pokedex - Cleffa",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_174": {
     "label": "Pokedex - Igglybuff",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_175": {
     "label": "Pokedex - Togepi",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_176": {
     "label": "Pokedex - Togetic",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_177": {
     "label": "Pokedex - Natu",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_178": {
     "label": "Pokedex - Xatu",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_179": {
     "label": "Pokedex - Mareep",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_180": {
     "label": "Pokedex - Flaaffy",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_181": {
     "label": "Pokedex - Ampharos",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_182": {
     "label": "Pokedex - Bellossom",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_183": {
     "label": "Pokedex - Marill",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_184": {
     "label": "Pokedex - Azumarill",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_185": {
     "label": "Pokedex - Sudowoodo",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_186": {
     "label": "Pokedex - Politoed",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_187": {
     "label": "Pokedex - Hoppip",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_188": {
     "label": "Pokedex - Skiploom",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_189": {
     "label": "Pokedex - Jumpluff",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_190": {
     "label": "Pokedex - Aipom",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_191": {
     "label": "Pokedex - Sunkern",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_192": {
     "label": "Pokedex - Sunflora",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_193": {
     "label": "Pokedex - Yanma",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_194": {
     "label": "Pokedex - Wooper",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_195": {
     "label": "Pokedex - Quagsire",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_196": {
     "label": "Pokedex - Espeon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_197": {
     "label": "Pokedex - Umbreon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_198": {
     "label": "Pokedex - Murkrow",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_199": {
     "label": "Pokedex - Slowking",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_200": {
     "label": "Pokedex - Misdreavus",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_201": {
     "label": "Pokedex - Unown",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_202": {
     "label": "Pokedex - Wobbuffet",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_203": {
     "label": "Pokedex - Girafarig",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_204": {
     "label": "Pokedex - Pineco",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_205": {
     "label": "Pokedex - Forretress",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_206": {
     "label": "Pokedex - Dunsparce",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_207": {
     "label": "Pokedex - Gligar",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_208": {
     "label": "Pokedex - Steelix",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_209": {
     "label": "Pokedex - Snubbull",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_210": {
     "label": "Pokedex - Granbull",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_211": {
     "label": "Pokedex - Qwilfish",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_212": {
     "label": "Pokedex - Scizor",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_213": {
     "label": "Pokedex - Shuckle",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_214": {
     "label": "Pokedex - Heracross",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_215": {
     "label": "Pokedex - Sneasel",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_216": {
     "label": "Pokedex - Teddiursa",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_217": {
     "label": "Pokedex - Ursaring",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_218": {
     "label": "Pokedex - Slugma",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_219": {
     "label": "Pokedex - Magcargo",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_220": {
     "label": "Pokedex - Swinub",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_221": {
     "label": "Pokedex - Piloswine",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_222": {
     "label": "Pokedex - Corsola",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_223": {
     "label": "Pokedex - Remoraid",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_224": {
     "label": "Pokedex - Octillery",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_225": {
     "label": "Pokedex - Delibird",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_226": {
     "label": "Pokedex - Mantine",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_227": {
     "label": "Pokedex - Skarmory",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_228": {
     "label": "Pokedex - Houndour",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_229": {
     "label": "Pokedex - Houndoom",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_230": {
     "label": "Pokedex - Kingdra",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_231": {
     "label": "Pokedex - Phanpy",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_232": {
     "label": "Pokedex - Donphan",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_233": {
     "label": "Pokedex - Porygon2",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_234": {
     "label": "Pokedex - Stantler",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_235": {
     "label": "Pokedex - Smeargle",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_236": {
     "label": "Pokedex - Tyrogue",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_237": {
     "label": "Pokedex - Hitmontop",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_238": {
     "label": "Pokedex - Smoochum",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_239": {
     "label": "Pokedex - Elekid",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_240": {
     "label": "Pokedex - Magby",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_241": {
     "label": "Pokedex - Miltank",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_242": {
     "label": "Pokedex - Blissey",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_243": {
     "label": "Pokedex - Raikou",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_244": {
     "label": "Pokedex - Entei",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_245": {
     "label": "Pokedex - Suicune",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_246": {
     "label": "Pokedex - Larvitar",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_247": {
     "label": "Pokedex - Pupitar",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_248": {
     "label": "Pokedex - Tyranitar",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_249": {
     "label": "Pokedex - Lugia",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_250": {
     "label": "Pokedex - Ho-Oh",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_251": {
     "label": "Pokedex - Celebi",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_252": {
     "label": "Pokedex - Treecko",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_253": {
     "label": "Pokedex - Grovyle",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_254": {
     "label": "Pokedex - Sceptile",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_255": {
     "label": "Pokedex - Torchic",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_256": {
     "label": "Pokedex - Combusken",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_257": {
     "label": "Pokedex - Blaziken",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_258": {
     "label": "Pokedex - Mudkip",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_259": {
     "label": "Pokedex - Marshtomp",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_260": {
     "label": "Pokedex - Swampert",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_261": {
     "label": "Pokedex - Poochyena",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_262": {
     "label": "Pokedex - Mightyena",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_263": {
     "label": "Pokedex - Zigzagoon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_264": {
     "label": "Pokedex - Linoone",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_265": {
     "label": "Pokedex - Wurmple",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_266": {
     "label": "Pokedex - Silcoon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_267": {
     "label": "Pokedex - Beautifly",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_268": {
     "label": "Pokedex - Cascoon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_269": {
     "label": "Pokedex - Dustox",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_270": {
     "label": "Pokedex - Lotad",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_271": {
     "label": "Pokedex - Lombre",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_272": {
     "label": "Pokedex - Ludicolo",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_273": {
     "label": "Pokedex - Seedot",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_274": {
     "label": "Pokedex - Nuzleaf",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_275": {
     "label": "Pokedex - Shiftry",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_276": {
     "label": "Pokedex - Taillow",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_277": {
     "label": "Pokedex - Swellow",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_278": {
     "label": "Pokedex - Wingull",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_279": {
     "label": "Pokedex - Pelipper",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_280": {
     "label": "Pokedex - Ralts",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_281": {
     "label": "Pokedex - Kirlia",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_282": {
     "label": "Pokedex - Gardevoir",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_283": {
     "label": "Pokedex - Surskit",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_284": {
     "label": "Pokedex - Masquerain",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_285": {
     "label": "Pokedex - Shroomish",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_286": {
     "label": "Pokedex - Breloom",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_287": {
     "label": "Pokedex - Slakoth",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_288": {
     "label": "Pokedex - Vigoroth",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_289": {
     "label": "Pokedex - Slaking",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_290": {
     "label": "Pokedex - Nincada",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_291": {
     "label": "Pokedex - Ninjask",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_292": {
     "label": "Pokedex - Shedinja",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_293": {
     "label": "Pokedex - Whismur",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_294": {
     "label": "Pokedex - Loudred",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_295": {
     "label": "Pokedex - Exploud",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_296": {
     "label": "Pokedex - Makuhita",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_297": {
     "label": "Pokedex - Hariyama",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_298": {
     "label": "Pokedex - Azurill",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_299": {
     "label": "Pokedex - Nosepass",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_300": {
     "label": "Pokedex - Skitty",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_301": {
     "label": "Pokedex - Delcatty",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_302": {
     "label": "Pokedex - Sableye",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_303": {
     "label": "Pokedex - Mawile",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_304": {
     "label": "Pokedex - Aron",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_305": {
     "label": "Pokedex - Lairon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_306": {
     "label": "Pokedex - Aggron",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_307": {
     "label": "Pokedex - Meditite",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_308": {
     "label": "Pokedex - Medicham",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_309": {
     "label": "Pokedex - Electrike",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_310": {
     "label": "Pokedex - Manectric",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_311": {
     "label": "Pokedex - Plusle",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_312": {
     "label": "Pokedex - Minun",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_313": {
     "label": "Pokedex - Volbeat",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_314": {
     "label": "Pokedex - Illumise",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_315": {
     "label": "Pokedex - Roselia",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_316": {
     "label": "Pokedex - Gulpin",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_317": {
     "label": "Pokedex - Swalot",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_318": {
     "label": "Pokedex - Carvanha",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_319": {
     "label": "Pokedex - Sharpedo",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_320": {
     "label": "Pokedex - Wailmer",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_321": {
     "label": "Pokedex - Wailord",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_322": {
     "label": "Pokedex - Numel",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_323": {
     "label": "Pokedex - Camerupt",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_324": {
     "label": "Pokedex - Torkoal",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_325": {
     "label": "Pokedex - Spoink",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_326": {
     "label": "Pokedex - Grumpig",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_327": {
     "label": "Pokedex - Spinda",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_328": {
     "label": "Pokedex - Trapinch",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_329": {
     "label": "Pokedex - Vibrava",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_330": {
     "label": "Pokedex - Flygon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_331": {
     "label": "Pokedex - Cacnea",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_332": {
     "label": "Pokedex - Cacturne",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_333": {
     "label": "Pokedex - Swablu",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_334": {
     "label": "Pokedex - Altaria",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_335": {
     "label": "Pokedex - Zangoose",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_336": {
     "label": "Pokedex - Seviper",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_337": {
     "label": "Pokedex - Lunatone",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_338": {
     "label": "Pokedex - Solrock",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_339": {
     "label": "Pokedex - Barboach",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_340": {
     "label": "Pokedex - Whiscash",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_341": {
     "label": "Pokedex - Corphish",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_342": {
     "label": "Pokedex - Crawdaunt",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_343": {
     "label": "Pokedex - Baltoy",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_344": {
     "label": "Pokedex - Claydol",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_345": {
     "label": "Pokedex - Lileep",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_346": {
     "label": "Pokedex - Cradily",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_347": {
     "label": "Pokedex - Anorith",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_348": {
     "label": "Pokedex - Armaldo",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_349": {
     "label": "Pokedex - Feebas",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_350": {
     "label": "Pokedex - Milotic",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_351": {
     "label": "Pokedex - Castform",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_352": {
     "label": "Pokedex - Kecleon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_353": {
     "label": "Pokedex - Shuppet",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_354": {
     "label": "Pokedex - Banette",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_355": {
     "label": "Pokedex - Duskull",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_356": {
     "label": "Pokedex - Dusclops",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_357": {
     "label": "Pokedex - Tropius",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_358": {
     "label": "Pokedex - Chimecho",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_359": {
     "label": "Pokedex - Absol",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_360": {
     "label": "Pokedex - Wynaut",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_361": {
     "label": "Pokedex - Snorunt",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_362": {
     "label": "Pokedex - Glalie",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_363": {
     "label": "Pokedex - Spheal",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_364": {
     "label": "Pokedex - Sealeo",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_365": {
     "label": "Pokedex - Walrein",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_366": {
     "label": "Pokedex - Clamperl",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_367": {
     "label": "Pokedex - Huntail",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_368": {
     "label": "Pokedex - Gorebyss",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_369": {
     "label": "Pokedex - Relicanth",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_370": {
     "label": "Pokedex - Luvdisc",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_371": {
     "label": "Pokedex - Bagon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_372": {
     "label": "Pokedex - Shelgon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_373": {
     "label": "Pokedex - Salamence",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_374": {
     "label": "Pokedex - Beldum",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_375": {
     "label": "Pokedex - Metang",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_376": {
     "label": "Pokedex - Metagross",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_377": {
     "label": "Pokedex - Regirock",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_378": {
     "label": "Pokedex - Regice",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_379": {
     "label": "Pokedex - Registeel",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_380": {
     "label": "Pokedex - Latias",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_381": {
     "label": "Pokedex - Latios",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_382": {
     "label": "Pokedex - Kyogre",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_383": {
     "label": "Pokedex - Groudon",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_384": {
     "label": "Pokedex - Rayquaza",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_385": {
     "label": "Pokedex - Jirachi",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
   "POKEDEX_REWARD_386": {
     "label": "Pokedex - Deoxys",
-    "tags": ["Pokedex"]
+    "tags": [],
+    "category": "POKEDEX"
   },
 
   "TRAINER_AARON_REWARD": {
     "label": "Route 134 - Dragon Tamer Aaron",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ABIGAIL_1_REWARD": {
     "label": "Route 110 - Triathlete Abigail",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_AIDAN_REWARD": {
     "label": "Route 127 - Bird Keeper Aidan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_AISHA_REWARD": {
     "label": "Route 117 - Battle Girl Aisha",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALBERTO_REWARD": {
     "label": "Route 123 - Bird Keeper Alberto",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALBERT_REWARD": {
     "label": "Victory Road 1F - Cooltrainer Albert",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALEXA_REWARD": {
     "label": "Route 128 - Cooltrainer Alexa",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALEXIA_REWARD": {
     "label": "Petalburg Gym - Cooltrainer Alexia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALEX_REWARD": {
     "label": "Route 134 - Bird Keeper Alex",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALICE_REWARD": {
     "label": "Route 109 - Swimmer Alice",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALIX_REWARD": {
     "label": "Route 115 - Psychic Alix",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALLEN_REWARD": {
     "label": "Route 102 - Youngster Allen",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALLISON_REWARD": {
     "label": "Route 129 - Triathlete Allison",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ALYSSA_REWARD": {
     "label": "Route 110 - Triathlete Alyssa",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_AMY_AND_LIV_1_REWARD": {
     "label": "Route 103 - Twins Amy and Liv",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANNA_AND_MEG_1_REWARD": {
     "label": "Route 117 - Sr. and Jr. Anna and Meg",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANDREA_REWARD": {
     "label": "Sootopolis Gym - Lass Andrea",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANDRES_1_REWARD": {
     "label": "Route 105 - Ruin Maniac Andres",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANDREW_REWARD": {
     "label": "Route 103 - Fisherman Andrew",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANGELICA_REWARD": {
     "label": "Route 120 - Parasol Lady Angelica",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANGELINA_REWARD": {
     "label": "Route 114 - Picnicker Angelina",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANGELO_REWARD": {
     "label": "Mauville Gym - Bug Maniac Angelo",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANNIKA_REWARD": {
     "label": "Sootopolis Gym - Pokefan Annika",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ANTHONY_REWARD": {
     "label": "Route 110 - Triathlete Anthony",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ARCHIE_REWARD": {
     "label": "Seafloor Cavern Room 9 - Aqua Leader Archie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ASHLEY_REWARD": {
     "label": "Fortree Gym - Picnicker Ashley",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ATHENA_REWARD": {
     "label": "Route 127 - Cooltrainer Athena",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ATSUSHI_REWARD": {
     "label": "Mt Pyre 5F - Black Belt Atsushi",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_AURON_REWARD": {
     "label": "Route 125 - Expert Auron",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_AUSTINA_REWARD": {
     "label": "Route 109 - Tuber Austina",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_AUTUMN_REWARD": {
     "label": "Jagged Pass - Picnicker Autumn",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_AXLE_REWARD": {
     "label": "Lavaridge Gym - Kindler Axle",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BARNY_REWARD": {
     "label": "Route 118 - Fisherman Barny",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BARRY_REWARD": {
     "label": "Route 126 - Swimmer Barry",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BEAU_REWARD": {
     "label": "Route 111 - Camper Beau",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BECKY_REWARD": {
     "label": "Route 111 - Picnicker Becky",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BECK_REWARD": {
     "label": "Route 133 - Bird Keeper Beck",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BENJAMIN_1_REWARD": {
     "label": "Route 110 - Triathlete Benjamin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BEN_REWARD": {
     "label": "Mauville Gym - Youngster Ben",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BERKE_REWARD": {
     "label": "Petalburg Gym - Cooltrainer Berke",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BERNIE_1_REWARD": {
     "label": "Route 114 - Kindler Bernie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BETHANY_REWARD": {
     "label": "Sootopolis Gym - Pokefan Bethany",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BETH_REWARD": {
     "label": "Route 107 - Swimmer Beth",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BEVERLY_REWARD": {
     "label": "Route 105 - Swimmer Beverly",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BIANCA_REWARD": {
     "label": "Route 111 - Picnicker Bianca",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BILLY_REWARD": {
     "label": "Route 104 - Youngster Billy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BLAKE_REWARD": {
     "label": "Mossdeep Gym - Psychic Blake",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRANDEN_REWARD": {
     "label": "Route 111 - Camper Branden",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRANDI_REWARD": {
     "label": "Route 117 - Psychic Brandi",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRAWLY_1_REWARD": {
     "label": "Dewford Gym - Leader Brawly",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRAXTON_REWARD": {
     "label": "Route 123 - Cooltrainer Braxton",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRENDAN_LILYCOVE_MUDKIP_REWARD": {
     "label": "Lilycove City - Rival Brendan/May",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRENDAN_ROUTE_103_MUDKIP_REWARD": {
     "label": "Route 103 - Rival Brendan/May",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRENDAN_ROUTE_110_MUDKIP_REWARD": {
     "label": "Route 110 - Rival Brendan/May",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRENDAN_ROUTE_119_MUDKIP_REWARD": {
     "label": "Route 119 - Rival Brendan/May",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRENDAN_RUSTBORO_MUDKIP_REWARD": {
     "label": "Rustboro City - Rival Brendan/May",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRENDA_REWARD": {
     "label": "Route 126 - Swimmer Brenda",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRENDEN_REWARD": {
     "label": "Dewford Gym - Sailor Brenden",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRENT_REWARD": {
     "label": "Route 119 - Bug Maniac Brent",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRIANNA_REWARD": {
     "label": "Sootopolis Gym - Lady Brianna",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRICE_REWARD": {
     "label": "Route 112 - Hiker Brice",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRIDGET_REWARD": {
     "label": "Sootopolis Gym - Beauty Bridget",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BROOKE_1_REWARD": {
     "label": "Route 111 - Cooltrainer Brooke",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRYANT_REWARD": {
     "label": "Route 112 - Kindler Bryant",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_BRYAN_REWARD": {
     "label": "Route 111 - Ruin Maniac Bryan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CALE_REWARD": {
     "label": "Route 121 - Bug Maniac Cale",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CALLIE_REWARD": {
     "label": "Route 120 - Battle Girl Callie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CALVIN_1_REWARD": {
     "label": "Route 102 - Youngster Calvin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CAMDEN_REWARD": {
     "label": "Route 127 - Triathlete Camden",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CAMERON_1_REWARD": {
     "label": "Route 123 - Psychic Cameron",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CAMRON_REWARD": {
     "label": "Route 107 - Triathlete Camron",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CARLEE_REWARD": {
     "label": "Route 128 - Swimmer Carlee",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CAROLINA_REWARD": {
     "label": "Route 108 - Cooltrainer Carolina",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CAROLINE_REWARD": {
     "label": "Victory Road B2F - Cooltrainer Caroline",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CAROL_REWARD": {
     "label": "Route 112 - Picnicker Carol",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CARTER_REWARD": {
     "label": "Route 109 - Fisherman Carter",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CATHERINE_1_REWARD": {
     "label": "Route 119 - Pokemon Ranger Catherine",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CEDRIC_REWARD": {
     "label": "Mt Pyre 6F - Psychic Cedric",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CELIA_REWARD": {
     "label": "Route 111 - Picnicker Celia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CELINA_REWARD": {
     "label": "Route 111 - Aroma Lady Celina",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CHAD_REWARD": {
     "label": "Route 124 - Swimmer Chad",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CHANDLER_REWARD": {
     "label": "Route 109 - Tuber Chandler",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CHARLIE_REWARD": {
     "label": "Abandoned Ship 1F - Tuber Charlie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CHARLOTTE_REWARD": {
     "label": "Route 114 - Picnicker Charlotte",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CHASE_REWARD": {
     "label": "Route 129 - Triathlete Chase",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CHESTER_REWARD": {
     "label": "Route 118 - Bird Keeper Chester",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CHIP_REWARD": {
     "label": "Route 120 - Ruin Maniac Chip",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CHRIS_REWARD": {
     "label": "Route 119 - Fisherman Chris",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CINDY_1_REWARD": {
     "label": "Route 104 - Lady Cindy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CLARENCE_REWARD": {
     "label": "Route 129 - Swimmer Clarence",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CLARISSA_REWARD": {
     "label": "Route 120 - Parasol Lady Clarissa",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CLARK_REWARD": {
     "label": "Route 116 - Hiker Clark",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CLAUDE_REWARD": {
     "label": "Route 114 - Fisherman Claude",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CLIFFORD_REWARD": {
     "label": "Mossdeep Gym - Gentleman Clifford",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_COBY_REWARD": {
     "label": "Route 113 - Bird Keeper Coby",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_COLE_REWARD": {
     "label": "Lavaridge Gym - Kindler Cole",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_COLIN_REWARD": {
     "label": "Route 120 - Bird Keeper Colin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_COLTON_REWARD": {
     "label": "SS Tidal - Pokefan Colton",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CONNIE_REWARD": {
     "label": "Sootopolis Gym - Beauty Connie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CONOR_REWARD": {
     "label": "Route 133 - Expert Conor",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CORY_1_REWARD": {
     "label": "Route 108 - Sailor Cory",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CRISSY_REWARD": {
     "label": "Sootopolis Gym - Lass Crissy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CRISTIAN_REWARD": {
     "label": "Dewford Gym - Black Belt Cristian",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CRISTIN_1_REWARD": {
     "label": "Route 121 - Cooltrainer Cristin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_CYNDY_1_REWARD": {
     "label": "Route 115 - Battle Girl Cyndy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DAISUKE_REWARD": {
     "label": "Route 111 - Black Belt Daisuke",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DAISY_REWARD": {
     "label": "Route 103 - Aroma Lady Daisy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DALE_REWARD": {
     "label": "Route 110 - Fisherman Dale",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DALTON_1_REWARD": {
     "label": "Route 118 - Guitarist Dalton",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DANA_REWARD": {
     "label": "Route 132 - Swimmer Dana",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DANIELLE_REWARD": {
     "label": "Lavaridge Gym - Battle Girl Danielle",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DAPHNE_REWARD": {
     "label": "Sootopolis Gym - Lady Daphne",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DARCY_REWARD": {
     "label": "Route 132 - Cooltrainer Darcy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DARIAN_REWARD": {
     "label": "Route 104 - Fisherman Darian",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DARIUS_REWARD": {
     "label": "Fortree Gym - Bird Keeper Darius",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DARRIN_REWARD": {
     "label": "Route 107 - Swimmer Darrin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DAVID_REWARD": {
     "label": "Route 109 - Swimmer David",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DAVIS_REWARD": {
     "label": "Route 123 - Bug Catcher Davis",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DAWSON_REWARD": {
     "label": "Route 116 - Rich Boy Dawson",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DAYTON_REWARD": {
     "label": "Route 119 - Kindler Dayton",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DEANDRE_REWARD": {
     "label": "Route 118 - Youngster Deandre",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DEAN_REWARD": {
     "label": "Route 126 - Swimmer Dean",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DEBRA_REWARD": {
     "label": "Route 133 - Swimmer Debra",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DECLAN_REWARD": {
     "label": "Route 124 - Swimmer Declan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DEMETRIUS_REWARD": {
     "label": "Abandoned Ship 1F - Youngster Demetrius",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DENISE_REWARD": {
     "label": "Route 107 - Swimmer Denise",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DEREK_REWARD": {
     "label": "Route 117 - Bug Maniac Derek",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DEVAN_REWARD": {
     "label": "Route 116 - Hiker Devan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DIANA_1_REWARD": {
     "label": "Jagged Pass - Picnicker Diana",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DIANNE_REWARD": {
     "label": "Victory Road B2F - Cooltrainer Dianne",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DILLON_REWARD": {
     "label": "Route 113 - Youngster Dillon",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DOMINIK_REWARD": {
     "label": "Route 105 - Swimmer Dominik",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DONALD_REWARD": {
     "label": "Route 119 - Bug Maniac Donald",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DONNY_REWARD": {
     "label": "Route 127 - Triathlete Donny",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DOUGLAS_REWARD": {
     "label": "Route 106 - Swimmer Douglas",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DOUG_REWARD": {
     "label": "Route 119 - Bug Catcher Doug",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DRAKE_REWARD": {
     "label": "Ever Grande City - Elite Four Drake",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DREW_REWARD": {
     "label": "Route 111 - Camper Drew",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DUNCAN_REWARD": {
     "label": "Abandoned Ship B1F - Sailor Duncan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DUSTY_1_REWARD": {
     "label": "Route 111 - Ruin Maniac Dusty",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DWAYNE_REWARD": {
     "label": "Route 109 - Sailor Dwayne",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DYLAN_1_REWARD": {
     "label": "Route 117 - Triathlete Dylan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_DEZ_AND_LUKE_REWARD": {
     "label": "Mt Pyre 2F - Young Couple Dez and Luke",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_EDGAR_REWARD": {
     "label": "Victory Road 1F - Cooltrainer Edgar",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_EDMOND_REWARD": {
     "label": "Route 109 - Sailor Edmond",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_EDWARDO_REWARD": {
     "label": "Fortree Gym - Bird Keeper Edwardo",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_EDWARD_REWARD": {
     "label": "Route 110 - Psychic Edward",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_EDWIN_1_REWARD": {
     "label": "Route 110 - Collector Edwin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ED_REWARD": {
     "label": "Route 123 - Collector Ed",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ELIJAH_REWARD": {
     "label": "Route 109 - Bird Keeper Elijah",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ELI_REWARD": {
     "label": "Lavaridge Gym - Hiker Eli",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ELLIOT_1_REWARD": {
     "label": "Route 106 - Fisherman Elliot",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ERIC_REWARD": {
     "label": "Jagged Pass - Hiker Eric",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ERNEST_1_REWARD": {
     "label": "Route 125 - Sailor Ernest",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ETHAN_1_REWARD": {
     "label": "Jagged Pass - Camper Ethan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_FABIAN_REWARD": {
     "label": "Route 119 - Guitarist Fabian",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_FELIX_REWARD": {
     "label": "Victory Road B2F - Cooltrainer Felix",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_FERNANDO_1_REWARD": {
     "label": "Route 123 - Guitarist Fernando",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_FLANNERY_1_REWARD": {
     "label": "Lavaridge Gym - Leader Flannery",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_FLINT_REWARD": {
     "label": "Fortree Gym - Camper Flint",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_FOSTER_REWARD": {
     "label": "Route 105 - Ruin Maniac Foster",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_FRANKLIN_REWARD": {
     "label": "Route 133 - Swimmer Franklin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_FREDRICK_REWARD": {
     "label": "Route 123 - Expert Fredrick",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GABRIELLE_1_REWARD": {
     "label": "Mt Pyre 3F - Pokemon Breeder Gabrielle",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GARRET_REWARD": {
     "label": "SS Tidal - Rich Boy Garret",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GARRISON_REWARD": {
     "label": "Abandoned Ship 1F - Ruin Maniac Garrison",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GEORGE_REWARD": {
     "label": "Petalburg Gym - Cooltrainer George",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GERALD_REWARD": {
     "label": "Lavaridge Gym - Cooltrainer Gerald",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GILBERT_REWARD": {
     "label": "Route 132 - Swimmer Gilbert",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GINA_AND_MIA_1_REWARD": {
     "label": "Route 104 - Twins Gina and Mia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GLACIA_REWARD": {
     "label": "Ever Grande City - Elite Four Glacia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRACE_REWARD": {
     "label": "Route 124 - Swimmer Grace",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GREG_REWARD": {
     "label": "Route 119 - Bug Catcher Greg",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_AQUA_HIDEOUT_1_REWARD": {
     "label": "Aqua Hideout 1F - Team Aqua Grunt",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_AQUA_HIDEOUT_2_REWARD": {
     "label": "Aqua Hideout B1F - Team Aqua Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_AQUA_HIDEOUT_3_REWARD": {
     "label": "Aqua Hideout B1F - Team Aqua Grunt 4",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_AQUA_HIDEOUT_4_REWARD": {
     "label": "Aqua Hideout B2F - Team Aqua Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_AQUA_HIDEOUT_5_REWARD": {
     "label": "Aqua Hideout B1F - Team Aqua Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_AQUA_HIDEOUT_6_REWARD": {
     "label": "Aqua Hideout B2F - Team Aqua Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_AQUA_HIDEOUT_7_REWARD": {
     "label": "Aqua Hideout B1F - Team Aqua Grunt 3",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_AQUA_HIDEOUT_8_REWARD": {
     "label": "Aqua Hideout B2F - Team Aqua Grunt 3",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_10_REWARD": {
     "label": "Magma Hideout 3F - Team Magma Grunt 3",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_11_REWARD": {
     "label": "Magma Hideout 4F - Team Magma Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_12_REWARD": {
     "label": "Magma Hideout 4F - Team Magma Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_13_REWARD": {
     "label": "Magma Hideout 4F - Team Magma Grunt 3",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_14_REWARD": {
     "label": "Magma Hideout 2F - Team Magma Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_15_REWARD": {
     "label": "Magma Hideout 2F - Team Magma Grunt 5",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_16_REWARD": {
     "label": "Magma Hideout 3F - Team Magma Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_1_REWARD": {
     "label": "Magma Hideout 1F - Team Magma Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_2_REWARD": {
     "label": "Magma Hideout 1F - Team Magma Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_3_REWARD": {
     "label": "Magma Hideout 2F - Team Magma Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_4_REWARD": {
     "label": "Magma Hideout 2F - Team Magma Grunt 4",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_5_REWARD": {
     "label": "Magma Hideout 2F - Team Magma Grunt 3",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_6_REWARD": {
     "label": "Magma Hideout 2F - Team Magma Grunt 6",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_7_REWARD": {
     "label": "Magma Hideout 2F - Team Magma Grunt 7",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_8_REWARD": {
     "label": "Magma Hideout 2F - Team Magma Grunt 8",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MAGMA_HIDEOUT_9_REWARD": {
     "label": "Magma Hideout 3F - Team Magma Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MT_CHIMNEY_1_REWARD": {
     "label": "Mt Chimney - Team Magma Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MT_CHIMNEY_2_REWARD": {
     "label": "Mt Chimney - Team Magma Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MT_PYRE_1_REWARD": {
     "label": "Mt Pyre Summit - Team Aqua Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MT_PYRE_2_REWARD": {
     "label": "Mt Pyre Summit - Team Aqua Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MT_PYRE_3_REWARD": {
     "label": "Mt Pyre Summit - Team Aqua Grunt 4",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MT_PYRE_4_REWARD": {
     "label": "Mt Pyre Summit - Team Aqua Grunt 3",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MUSEUM_1_REWARD": {
     "label": "Oceanic Museum - Team Aqua Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_MUSEUM_2_REWARD": {
     "label": "Oceanic Museum - Team Aqua Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_PETALBURG_WOODS_REWARD": {
     "label": "Petalburg Woods - Team Aqua Grunt",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_RUSTURF_TUNNEL_REWARD": {
     "label": "Rusturf Tunnel - Team Aqua Grunt",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SEAFLOOR_CAVERN_1_REWARD": {
     "label": "Seafloor Cavern Room 1 - Team Aqua Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SEAFLOOR_CAVERN_2_REWARD": {
     "label": "Seafloor Cavern Room 1 - Team Aqua Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SEAFLOOR_CAVERN_3_REWARD": {
     "label": "Seafloor Cavern Room 4 - Team Aqua Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SEAFLOOR_CAVERN_4_REWARD": {
     "label": "Seafloor Cavern Room 4 - Team Aqua Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SEAFLOOR_CAVERN_5_REWARD": {
     "label": "Seafloor Cavern Room 3 - Team Aqua Grunt",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SPACE_CENTER_1_REWARD": {
     "label": "Space Center - Team Magma Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SPACE_CENTER_2_REWARD": {
     "label": "Space Center - Team Magma Grunt 4",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SPACE_CENTER_3_REWARD": {
     "label": "Space Center - Team Magma Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SPACE_CENTER_4_REWARD": {
     "label": "Space Center - Team Magma Grunt 3",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SPACE_CENTER_5_REWARD": {
     "label": "Space Center - Team Magma Grunt 5",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SPACE_CENTER_6_REWARD": {
     "label": "Space Center - Team Magma Grunt 6",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_SPACE_CENTER_7_REWARD": {
     "label": "Space Center - Team Magma Grunt 7",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_WEATHER_INST_1_REWARD": {
     "label": "Weather Institute 1F - Team Aqua Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_WEATHER_INST_2_REWARD": {
     "label": "Weather Institute 2F - Team Aqua Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_WEATHER_INST_3_REWARD": {
     "label": "Weather Institute 2F - Team Aqua Grunt 3",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_WEATHER_INST_4_REWARD": {
     "label": "Weather Institute 1F - Team Aqua Grunt 1",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GRUNT_WEATHER_INST_5_REWARD": {
     "label": "Weather Institute 2F - Team Aqua Grunt 2",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_GWEN_REWARD": {
     "label": "Route 109 - Tuber Gwen",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HAILEY_REWARD": {
     "label": "Route 109 - Tuber Hailey",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HALEY_1_REWARD": {
     "label": "Route 104 - Lass Haley",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HALLE_REWARD": {
     "label": "Victory Road B1F - Cooltrainer Halle",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HANNAH_REWARD": {
     "label": "Mossdeep Gym - Psychic Hannah",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HARRISON_REWARD": {
     "label": "Route 128 - Swimmer Harrison",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HAYDEN_REWARD": {
     "label": "Route 111 - Kindler Hayden",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HECTOR_REWARD": {
     "label": "Route 115 - Collector Hector",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HEIDI_REWARD": {
     "label": "Route 111 - Picnicker Heidi",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HELENE_REWARD": {
     "label": "Route 115 - Battle Girl Helene",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HENRY_REWARD": {
     "label": "Route 127 - Fisherman Henry",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HERMAN_REWARD": {
     "label": "Route 131 - Swimmer Herman",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HIDEO_REWARD": {
     "label": "Route 119 - Ninja Boy Hideo",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HITOSHI_REWARD": {
     "label": "Route 134 - Black Belt Hitoshi",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HOPE_REWARD": {
     "label": "Victory Road 1F - Cooltrainer Hope",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HUDSON_REWARD": {
     "label": "Route 134 - Sailor Hudson",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HUEY_REWARD": {
     "label": "Route 109 - Sailor Huey",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HUGH_REWARD": {
     "label": "Route 119 - Bird Keeper Hugh",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_HUMBERTO_REWARD": {
     "label": "Fortree Gym - Bird Keeper Humberto",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_IMANI_REWARD": {
     "label": "Route 105 - Swimmer Imani",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_IRENE_REWARD": {
     "label": "Route 111 - Picnicker Irene",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ISAAC_1_REWARD": {
     "label": "Route 117 - Pokemon Breeder Isaac",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ISABELLA_REWARD": {
     "label": "Route 124 - Triathlete Isabella",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ISABELLE_REWARD": {
     "label": "Route 103 - Swimmer Isabelle",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ISABEL_1_REWARD": {
     "label": "Route 110 - Pokefan Isabel",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ISAIAH_1_REWARD": {
     "label": "Route 128 - Triathlete Isaiah",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ISOBEL_REWARD": {
     "label": "Route 126 - Triathlete Isobel",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_IVAN_REWARD": {
     "label": "Route 104 - Fisherman Ivan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JACE_REWARD": {
     "label": "Lavaridge Gym - Kindler Jace",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JACKI_1_REWARD": {
     "label": "Route 123 - Psychic Jacki",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JACKSON_1_REWARD": {
     "label": "Route 119 - Pokemon Ranger Jackson",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JACK_REWARD": {
     "label": "Route 134 - Swimmer Jack",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JACLYN_REWARD": {
     "label": "Route 110 - Psychic Jaclyn",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JACOB_REWARD": {
     "label": "Route 110 - Triathlete Jacob",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JAIDEN_REWARD": {
     "label": "Route 115 - Ninja Boy Jaiden",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JAMES_1_REWARD": {
     "label": "Petalburg Woods - Bug Catcher James",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JANICE_REWARD": {
     "label": "Route 116 - Lass Janice",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JANI_REWARD": {
     "label": "Abandoned Ship 1F - Tuber Jani",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JARED_REWARD": {
     "label": "Fortree Gym - Bird Keeper Jared",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JASMINE_REWARD": {
     "label": "Route 110 - Triathlete Jasmine",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JAYLEN_REWARD": {
     "label": "Route 113 - Youngster Jaylen",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JAZMYN_REWARD": {
     "label": "Route 123 - Cooltrainer Jazmyn",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JEFFREY_1_REWARD": {
     "label": "Route 120 - Bug Maniac Jeffrey",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JEFF_REWARD": {
     "label": "Lavaridge Gym - Kindler Jeff",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JENNA_REWARD": {
     "label": "Route 120 - Pokemon Ranger Jenna",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JENNIFER_REWARD": {
     "label": "Route 120 - Cooltrainer Jennifer",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JENNY_1_REWARD": {
     "label": "Route 124 - Swimmer Jenny",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JEROME_REWARD": {
     "label": "Route 108 - Swimmer Jerome",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JERRY_1_REWARD": {
     "label": "Route 116 - School Kid Jerry",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JESSICA_1_REWARD": {
     "label": "Route 121 - Beauty Jessica",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOCELYN_REWARD": {
     "label": "Dewford Gym - Battle Girl Jocelyn",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JODY_REWARD": {
     "label": "Petalburg Gym - Cooltrainer Jody",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOEY_REWARD": {
     "label": "Route 116 - Youngster Joey",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOHANNA_REWARD": {
     "label": "Route 109 - Beauty Johanna",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOHN_AND_JAY_1_REWARD": {
     "label": "Meteor Falls 1F - Old Couple John and Jay",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOHNSON_REWARD": {
     "label": "Route 116 - Youngster Johnson",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JONAH_REWARD": {
     "label": "Route 127 - Fisherman Jonah",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JONAS_REWARD": {
     "label": "Route 123 - Ninja Boy Jonas",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JONATHAN_REWARD": {
     "label": "Route 132 - Cooltrainer Jonathan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOSEPH_REWARD": {
     "label": "Route 110 - Guitarist Joseph",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOSE_REWARD": {
     "label": "Route 116 - Bug Catcher Jose",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOSH_REWARD": {
     "label": "Rustboro Gym - Youngster Josh",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JOSUE_REWARD": {
     "label": "Route 105 - Bird Keeper Josue",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JUAN_1_REWARD": {
     "label": "Sootopolis Gym - Leader Juan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JULIE_REWARD": {
     "label": "Victory Road B2F - Cooltrainer Julie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_JULIO_REWARD": {
     "label": "Jagged Pass - Triathlete Julio",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KAI_REWARD": {
     "label": "Route 114 - Fisherman Kai",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KALEB_REWARD": {
     "label": "Route 110 - Pokefan Kaleb",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KARA_REWARD": {
     "label": "Route 131 - Swimmer Kara",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KAREN_1_REWARD": {
     "label": "Route 116 - School Kid Karen",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KATE_AND_JOY_REWARD": {
     "label": "Route 121 - Sr. and Jr. Kate and Joy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KATELYNN_REWARD": {
     "label": "Victory Road 1F - Cooltrainer Katelynn",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KATELYN_1_REWARD": {
     "label": "Route 128 - Triathlete Katelyn",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KATHLEEN_REWARD": {
     "label": "Mossdeep Gym - Hex Maniac Kathleen",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KATIE_REWARD": {
     "label": "Route 130 - Swimmer Katie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KAYLA_REWARD": {
     "label": "Mt Pyre 3F - Psychic Kayla",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KAYLEY_REWARD": {
     "label": "Route 123 - Parasol Lady Kayley",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KEEGAN_REWARD": {
     "label": "Lavaridge Gym - Kindler Keegan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KEIGO_REWARD": {
     "label": "Route 120 - Ninja Boy Keigo",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KELVIN_REWARD": {
     "label": "Route 134 - Sailor Kelvin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KENT_REWARD": {
     "label": "Route 119 - Bug Catcher Kent",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KEVIN_REWARD": {
     "label": "Route 131 - Swimmer Kevin",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KIM_AND_IRIS_REWARD": {
     "label": "Route 125 - Sr. and Jr. Kim and Iris",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KINDRA_REWARD": {
     "label": "Route 123 - Hex Maniac Kindra",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KIRA_AND_DAN_1_REWARD": {
     "label": "Abandoned Ship 1F - Young Couple Kira and Dan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KIRK_REWARD": {
     "label": "Mauville Gym - Guitarist Kirk",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KIYO_REWARD": {
     "label": "Route 132 - Black Belt Kiyo",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KOICHI_REWARD": {
     "label": "Route 115 - Black Belt Koichi",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KOJI_1_REWARD": {
     "label": "Route 127 - Black Belt Koji",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KYLA_REWARD": {
     "label": "Route 106 - Swimmer Kyla",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_KYRA_REWARD": {
     "label": "Route 115 - Triathlete Kyra",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LAO_1_REWARD": {
     "label": "Route 113 - Ninja Boy Lao",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LARRY_REWARD": {
     "label": "Route 112 - Camper Larry",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LAURA_REWARD": {
     "label": "Dewford Gym - Battle Girl Laura",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LAUREL_REWARD": {
     "label": "Route 134 - Swimmer Laurel",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LAWRENCE_REWARD": {
     "label": "Route 113 - Camper Lawrence",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LEA_AND_JED_REWARD": {
     "label": "SS Tidal - Young Couple Lea and Jed",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LEAH_REWARD": {
     "label": "Mt Pyre 2F - Hex Maniac Leah",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LENNY_REWARD": {
     "label": "Route 114 - Hiker Lenny",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LEONARDO_REWARD": {
     "label": "Route 126 - Swimmer Leonardo",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LEONARD_REWARD": {
     "label": "SS Tidal - Sailor Leonard",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LEONEL_REWARD": {
     "label": "Route 120 - Cooltrainer Leonel",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LILA_AND_ROY_1_REWARD": {
     "label": "Route 124 - Sis and Bro Lila and Roy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LILITH_REWARD": {
     "label": "Dewford Gym - Battle Girl Lilith",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LINDA_REWARD": {
     "label": "Route 133 - Swimmer Linda",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LISA_AND_RAY_REWARD": {
     "label": "Route 107 - Sis and Bro Lisa and Ray",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LOLA_1_REWARD": {
     "label": "Route 109 - Tuber Lola",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LORENZO_REWARD": {
     "label": "Route 120 - Pokemon Ranger Lorenzo",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LUCAS_1_REWARD": {
     "label": "Route 114 - Hiker Lucas",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LUIS_REWARD": {
     "label": "Route 105 - Swimmer Luis",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LUNG_REWARD": {
     "label": "Route 113 - Ninja Boy Lung",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LYDIA_1_REWARD": {
     "label": "Route 117 - Pokemon Breeder Lydia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_LYLE_REWARD": {
     "label": "Petalburg Woods - Bug Catcher Lyle",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MACEY_REWARD": {
     "label": "Mossdeep Gym - Psychic Macey",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MADELINE_1_REWARD": {
     "label": "Route 113 - Parasol Lady Madeline",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MAKAYLA_REWARD": {
     "label": "Route 132 - Expert Makayla",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MARCEL_REWARD": {
     "label": "Route 121 - Cooltrainer Marcel",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MARCOS_REWARD": {
     "label": "Route 103 - Guitarist Marcos",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MARC_REWARD": {
     "label": "Rustboro Gym - Hiker Marc",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MARIA_1_REWARD": {
     "label": "Route 117 - Triathlete Maria",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MARK_REWARD": {
     "label": "Mt Pyre 2F - Pokemaniac Mark",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MARLENE_REWARD": {
     "label": "Route 115 - Psychic Marlene",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MARLEY_REWARD": {
     "label": "Route 134 - Cooltrainer Marley",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MARY_REWARD": {
     "label": "Petalburg Gym - Cooltrainer Mary",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MATTHEW_REWARD": {
     "label": "Route 108 - Swimmer Matthew",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MATT_REWARD": {
     "label": "Aqua Hideout B2F - Aqua Admin Matt",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MAURA_REWARD": {
     "label": "Mossdeep Gym - Psychic Maura",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MAXIE_MAGMA_HIDEOUT_REWARD": {
     "label": "Magma Hideout 4F - Magma Leader Maxie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MAXIE_MT_CHIMNEY_REWARD": {
     "label": "Mt Chimney - Magma Leader Maxie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MEL_AND_PAUL_REWARD": {
     "label": "Route 109 - Young Couple Mel and Paul",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MELINA_REWARD": {
     "label": "Route 117 - Triathlete Melina",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MELISSA_REWARD": {
     "label": "Mt Chimney - Beauty Melissa",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MICAH_REWARD": {
     "label": "SS Tidal - Gentleman Micah",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MICHELLE_REWARD": {
     "label": "Victory Road B1F - Cooltrainer Michelle",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MIGUEL_1_REWARD": {
     "label": "Route 103 - Pokefan Miguel",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MIKE_2_REWARD": {
     "label": "Rusturf Tunnel - Hiker Mike",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MISSY_REWARD": {
     "label": "Route 108 - Swimmer Missy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MITCHELL_REWARD": {
     "label": "Victory Road B1F - Cooltrainer Mitchell",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MIU_AND_YUKI_REWARD": {
     "label": "Route 123 - Twins Miu and Yuki",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MOLLIE_REWARD": {
     "label": "Route 133 - Expert Mollie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_MYLES_REWARD": {
     "label": "Route 121 - Pokemon Breeder Myles",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NANCY_REWARD": {
     "label": "Route 114 - Picnicker Nancy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NAOMI_REWARD": {
     "label": "SS Tidal - Lady Naomi",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NATE_REWARD": {
     "label": "Mossdeep Gym - Gentleman Nate",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NED_REWARD": {
     "label": "Route 106 - Fisherman Ned",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NICHOLAS_REWARD": {
     "label": "Mossdeep Gym - Psychic Nicholas",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NICOLAS_1_REWARD": {
     "label": "Meteor Falls 1F - Dragon Tamer Nicolas",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NIKKI_REWARD": {
     "label": "Route 126 - Swimmer Nikki",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NOB_1_REWARD": {
     "label": "Route 115 - Black Belt Nob",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NOLAN_REWARD": {
     "label": "Route 114 - Fisherman Nolan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NOLEN_REWARD": {
     "label": "Route 125 - Swimmer Nolen",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_NORMAN_1_REWARD": {
     "label": "Petalburg Gym - Leader Norman",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_OLIVIA_REWARD": {
     "label": "Sootopolis Gym - Beauty Olivia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_OWEN_REWARD": {
     "label": "Victory Road B2F - Cooltrainer Owen",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PABLO_1_REWARD": {
     "label": "Route 126 - Triathlete Pablo",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PARKER_REWARD": {
     "label": "Petalburg Gym - Cooltrainer Parker",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PAT_REWARD": {
     "label": "Route 121 - Pokemon Breeder Pat",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PAXTON_REWARD": {
     "label": "Route 132 - Expert Paxton",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PERRY_REWARD": {
     "label": "Route 118 - Bird Keeper Perry",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PETE_REWARD": {
     "label": "Route 103 - Swimmer Pete",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PHILLIP_REWARD": {
     "label": "SS Tidal - Sailor Phillip",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PHIL_REWARD": {
     "label": "Route 119 - Bird Keeper Phil",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PHOEBE_REWARD": {
     "label": "Ever Grande City - Elite Four Phoebe",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PRESLEY_REWARD": {
     "label": "Route 125 - Bird Keeper Presley",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_PRESTON_REWARD": {
     "label": "Mossdeep Gym - Psychic Preston",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_QUINCY_REWARD": {
     "label": "Victory Road 1F - Cooltrainer Quincy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RACHEL_REWARD": {
     "label": "Route 119 - Parasol Lady Rachel",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RANDALL_REWARD": {
     "label": "Petalburg Gym - Cooltrainer Randall",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_REED_REWARD": {
     "label": "Route 129 - Swimmer Reed",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RELI_AND_IAN_REWARD": {
     "label": "Route 131 - Sis and Bro Reli and Ian",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_REYNA_REWARD": {
     "label": "Route 134 - Battle Girl Reyna",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RHETT_REWARD": {
     "label": "Route 103 - Black Belt Rhett",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RICHARD_REWARD": {
     "label": "Route 131 - Swimmer Richard",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RICKY_1_REWARD": {
     "label": "Route 109 - Tuber Ricky",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RICK_REWARD": {
     "label": "Route 102 - Bug Catcher Rick",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RILEY_REWARD": {
     "label": "Route 120 - Ninja Boy Riley",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ROBERT_1_REWARD": {
     "label": "Route 120 - Bird Keeper Robert",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RODNEY_REWARD": {
     "label": "Route 130 - Swimmer Rodney",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ROGER_REWARD": {
     "label": "Route 127 - Fisherman Roger",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ROLAND_REWARD": {
     "label": "Route 124 - Swimmer Roland",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RONALD_REWARD": {
     "label": "Route 132 - Fisherman Ronald",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ROSE_1_REWARD": {
     "label": "Route 118 - Aroma Lady Rose",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ROXANNE_1_REWARD": {
     "label": "Rustboro Gym - Leader Roxanne",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_RUBEN_REWARD": {
     "label": "Route 128 - Cooltrainer Ruben",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SAMANTHA_REWARD": {
     "label": "Mossdeep Gym - Psychic Samantha",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SAMUEL_REWARD": {
     "label": "Victory Road B1F - Cooltrainer Samuel",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SANTIAGO_REWARD": {
     "label": "Route 130 - Swimmer Santiago",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SARAH_REWARD": {
     "label": "Route 116 - Lady Sarah",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SAWYER_1_REWARD": {
     "label": "Mt Chimney - Hiker Sawyer",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHANE_REWARD": {
     "label": "Route 114 - Camper Shane",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHANNON_REWARD": {
     "label": "Victory Road B1F - Cooltrainer Shannon",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHARON_REWARD": {
     "label": "Route 125 - Swimmer Sharon",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHAWN_REWARD": {
     "label": "Mauville Gym - Guitarist Shawn",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHAYLA_REWARD": {
     "label": "Route 112 - Aroma Lady Shayla",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHEILA_REWARD": {
     "label": "Mt Chimney - Beauty Sheila",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHELBY_1_REWARD": {
     "label": "Mt Chimney - Expert Shelby",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHELLY_SEAFLOOR_CAVERN_REWARD": {
     "label": "Seafloor Cavern Room 3 - Aqua Admin Shelly",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHELLY_WEATHER_INSTITUTE_REWARD": {
     "label": "Weather Institute 2F - Aqua Admin Shelly",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SHIRLEY_REWARD": {
     "label": "Mt Chimney - Beauty Shirley",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SIDNEY_REWARD": {
     "label": "Ever Grande City - Elite Four Sidney",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SIENNA_REWARD": {
     "label": "Route 126 - Swimmer Sienna",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SIMON_REWARD": {
     "label": "Route 109 - Tuber Simon",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SOPHIE_REWARD": {
     "label": "Route 113 - Picnicker Sophie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SPENCER_REWARD": {
     "label": "Route 124 - Swimmer Spencer",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_STAN_REWARD": {
     "label": "Route 125 - Swimmer Stan",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_STEVEN_REWARD": {
     "label": "Meteor Falls 1F - Rival Steven",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_STEVE_1_REWARD": {
     "label": "Route 114 - Pokemaniac Steve",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SUSIE_REWARD": {
     "label": "Route 131 - Swimmer Susie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_SYLVIA_REWARD": {
     "label": "Mossdeep Gym - Hex Maniac Sylvia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TABITHA_MAGMA_HIDEOUT_REWARD": {
     "label": "Magma Hideout 4F - Magma Admin Tabitha",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TABITHA_MT_CHIMNEY_REWARD": {
     "label": "Mt Chimney - Magma Admin Tabitha",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TAKAO_REWARD": {
     "label": "Dewford Gym - Black Belt Takao",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TAKASHI_REWARD": {
     "label": "Route 119 - Ninja Boy Takashi",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TALIA_REWARD": {
     "label": "Route 131 - Triathlete Talia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TAMMY_REWARD": {
     "label": "Route 121 - Hex Maniac Tammy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TANYA_REWARD": {
     "label": "Route 125 - Swimmer Tanya",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TARA_REWARD": {
     "label": "Route 108 - Swimmer Tara",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TASHA_REWARD": {
     "label": "Mt Pyre 4F - Hex Maniac Tasha",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TATE_AND_LIZA_1_REWARD": {
     "label": "Mossdeep Gym - Leader Tate and Liza",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TAYLOR_REWARD": {
     "label": "Route 119 - Bug Maniac Taylor",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TYRA_AND_IVY_REWARD": {
     "label": "Route 114 - Sr. and Jr. Tyra and Ivy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_THALIA_1_REWARD": {
     "label": "Abandoned Ship 1F - Beauty Thalia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_THOMAS_REWARD": {
     "label": "SS Tidal - Gentleman Thomas",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TIANA_REWARD": {
     "label": "Route 102 - Lass Tiana",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TIFFANY_REWARD": {
     "label": "Sootopolis Gym - Beauty Tiffany",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TIMMY_REWARD": {
     "label": "Route 110 - Youngster Timmy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TIMOTHY_1_REWARD": {
     "label": "Route 115 - Expert Timothy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TISHA_REWARD": {
     "label": "Route 129 - Swimmer Tisha",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TOMMY_REWARD": {
     "label": "Rustboro Gym - Youngster Tommy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TONY_1_REWARD": {
     "label": "Route 107 - Swimmer Tony",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TORI_AND_TIA_REWARD": {
     "label": "Route 113 - Twins Tori and Tia",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TRAVIS_REWARD": {
     "label": "Route 111 - Camper Travis",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TRENT_1_REWARD": {
     "label": "Route 112 - Hiker Trent",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_TYRON_REWARD": {
     "label": "Route 111 - Camper Tyron",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VALERIE_1_REWARD": {
     "label": "Mt Pyre 6F - Hex Maniac Valerie",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VANESSA_REWARD": {
     "label": "Route 121 - Pokefan Vanessa",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VICKY_REWARD": {
     "label": "Route 111 - Winstrate Vicky",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VICTORIA_REWARD": {
     "label": "Route 111 - Winstrate Victoria",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VICTOR_REWARD": {
     "label": "Route 111 - Winstrate Victor",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VIOLET_REWARD": {
     "label": "Route 123 - Aroma Lady Violet",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VIRGIL_REWARD": {
     "label": "Mossdeep Gym - Psychic Virgil",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VITO_REWARD": {
     "label": "Victory Road B2F - Cooltrainer Vito",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VIVIAN_REWARD": {
     "label": "Mauville Gym - Battle Girl Vivian",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_VIVI_REWARD": {
     "label": "Route 111 - Winstrate Vivi",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WADE_REWARD": {
     "label": "Route 118 - Fisherman Wade",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WALLACE_REWARD": {
     "label": "Ever Grande City - Champion Wallace",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WALTER_1_REWARD": {
     "label": "Route 121 - Gentleman Walter",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WALLY_MAUVILLE_REWARD": {
     "label": "Mauville City - Rival Wally",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WALLY_VR_1_REWARD": {
     "label": "Victory Road 1F - Rival Wally",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WATTSON_1_REWARD": {
     "label": "Mauville Gym - Leader Wattson",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WARREN_REWARD": {
     "label": "Route 133 - Cooltrainer Warren",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WAYNE_REWARD": {
     "label": "Route 128 - Fisherman Wayne",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WENDY_REWARD": {
     "label": "Route 123 - Cooltrainer Wendy",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WILLIAM_REWARD": {
     "label": "Mt Pyre 3F - Psychic William",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WILTON_1_REWARD": {
     "label": "Route 111 - Cooltrainer Wilton",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WINONA_1_REWARD": {
     "label": "Fortree Gym - Leader Winona",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WINSTON_1_REWARD": {
     "label": "Route 104 - Rich Boy Winston",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_WYATT_REWARD": {
     "label": "Route 113 - Pokemaniac Wyatt",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_YASU_REWARD": {
     "label": "Route 119 - Ninja Boy Yasu",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   },
   "TRAINER_ZANDER_REWARD": {
     "label": "Mt Pyre 2F - Black Belt Zander",
-    "tags": ["Trainer"]
+    "tags": [],
+    "category": "TRAINER"
   }
 }
diff --git a/worlds/pokemon_emerald/groups.py b/worlds/pokemon_emerald/groups.py
new file mode 100644
index 000000000000..d358da18350f
--- /dev/null
+++ b/worlds/pokemon_emerald/groups.py
@@ -0,0 +1,721 @@
+from typing import Dict, Set
+
+from .data import LocationCategory, data
+
+
+# Item Groups
+ITEM_GROUPS: Dict[str, Set[str]] = {}
+
+for item in data.items.values():
+    for tag in item.tags:
+        if tag not in ITEM_GROUPS:
+            ITEM_GROUPS[tag] = set()
+        ITEM_GROUPS[tag].add(item.label)
+
+# Location Groups
+_LOCATION_GROUP_MAPS = {
+    "Abandoned Ship": {
+        "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
+        "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+        "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+        "MAP_ABANDONED_SHIP_DECK",
+        "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+        "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+        "MAP_ABANDONED_SHIP_ROOMS2_1F",
+        "MAP_ABANDONED_SHIP_ROOMS2_B1F",
+        "MAP_ABANDONED_SHIP_ROOMS_1F",
+        "MAP_ABANDONED_SHIP_ROOMS_B1F",
+        "MAP_ABANDONED_SHIP_ROOM_B1F",
+        "MAP_ABANDONED_SHIP_UNDERWATER1",
+        "MAP_ABANDONED_SHIP_UNDERWATER2",
+    },
+    "Aqua Hideout": {
+        "MAP_AQUA_HIDEOUT_1F",
+        "MAP_AQUA_HIDEOUT_B1F",
+        "MAP_AQUA_HIDEOUT_B2F",
+    },
+    "Battle Frontier": {
+        "MAP_ARTISAN_CAVE_1F",
+        "MAP_ARTISAN_CAVE_B1F",
+        "MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR",
+        "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
+        "MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
+        "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
+        "MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
+        "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
+        "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
+        "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR",
+        "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
+        "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL",
+        "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL",
+        "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS",
+        "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
+        "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
+        "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
+        "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR",
+        "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR",
+        "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
+        "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
+        "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
+        "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
+        "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
+        "MAP_BATTLE_FRONTIER_LOUNGE1",
+        "MAP_BATTLE_FRONTIER_LOUNGE2",
+        "MAP_BATTLE_FRONTIER_LOUNGE3",
+        "MAP_BATTLE_FRONTIER_LOUNGE4",
+        "MAP_BATTLE_FRONTIER_LOUNGE5",
+        "MAP_BATTLE_FRONTIER_LOUNGE6",
+        "MAP_BATTLE_FRONTIER_LOUNGE7",
+        "MAP_BATTLE_FRONTIER_LOUNGE8",
+        "MAP_BATTLE_FRONTIER_LOUNGE9",
+        "MAP_BATTLE_FRONTIER_MART",
+        "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+        "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+        "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
+        "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F",
+        "MAP_BATTLE_FRONTIER_RANKING_HALL",
+        "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
+        "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE",
+        "MAP_BATTLE_PYRAMID_SQUARE01",
+        "MAP_BATTLE_PYRAMID_SQUARE02",
+        "MAP_BATTLE_PYRAMID_SQUARE03",
+        "MAP_BATTLE_PYRAMID_SQUARE04",
+        "MAP_BATTLE_PYRAMID_SQUARE05",
+        "MAP_BATTLE_PYRAMID_SQUARE06",
+        "MAP_BATTLE_PYRAMID_SQUARE07",
+        "MAP_BATTLE_PYRAMID_SQUARE08",
+        "MAP_BATTLE_PYRAMID_SQUARE09",
+        "MAP_BATTLE_PYRAMID_SQUARE10",
+        "MAP_BATTLE_PYRAMID_SQUARE11",
+        "MAP_BATTLE_PYRAMID_SQUARE12",
+        "MAP_BATTLE_PYRAMID_SQUARE13",
+        "MAP_BATTLE_PYRAMID_SQUARE14",
+        "MAP_BATTLE_PYRAMID_SQUARE15",
+        "MAP_BATTLE_PYRAMID_SQUARE16",
+    },
+    "Birth Island": {
+        "MAP_BIRTH_ISLAND_EXTERIOR",
+        "MAP_BIRTH_ISLAND_HARBOR",
+    },
+    "Contest Hall": {
+        "MAP_CONTEST_HALL",
+        "MAP_CONTEST_HALL_BEAUTY",
+        "MAP_CONTEST_HALL_COOL",
+        "MAP_CONTEST_HALL_CUTE",
+        "MAP_CONTEST_HALL_SMART",
+        "MAP_CONTEST_HALL_TOUGH",
+    },
+    "Dewford Town": {
+        "MAP_DEWFORD_TOWN",
+        "MAP_DEWFORD_TOWN_GYM",
+        "MAP_DEWFORD_TOWN_HALL",
+        "MAP_DEWFORD_TOWN_HOUSE1",
+        "MAP_DEWFORD_TOWN_HOUSE2",
+        "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
+        "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F",
+    },
+    "Ever Grande City": {
+        "MAP_EVER_GRANDE_CITY",
+        "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
+        "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
+        "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
+        "MAP_EVER_GRANDE_CITY_HALL1",
+        "MAP_EVER_GRANDE_CITY_HALL2",
+        "MAP_EVER_GRANDE_CITY_HALL3",
+        "MAP_EVER_GRANDE_CITY_HALL4",
+        "MAP_EVER_GRANDE_CITY_HALL5",
+        "MAP_EVER_GRANDE_CITY_HALL_OF_FAME",
+        "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
+        "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
+        "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F",
+        "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+        "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F",
+        "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+    },
+    "Fallarbor Town": {
+        "MAP_FALLARBOR_TOWN",
+        "MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM",
+        "MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR",
+        "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY",
+        "MAP_FALLARBOR_TOWN_COZMOS_HOUSE",
+        "MAP_FALLARBOR_TOWN_MART",
+        "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE",
+        "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
+        "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F",
+    },
+    "Faraway Island": {
+        "MAP_FARAWAY_ISLAND_ENTRANCE",
+        "MAP_FARAWAY_ISLAND_INTERIOR",
+    },
+    "Fiery Path": {"MAP_FIERY_PATH"},
+    "Fortree City": {
+        "MAP_FORTREE_CITY",
+        "MAP_FORTREE_CITY_DECORATION_SHOP",
+        "MAP_FORTREE_CITY_GYM",
+        "MAP_FORTREE_CITY_HOUSE1",
+        "MAP_FORTREE_CITY_HOUSE2",
+        "MAP_FORTREE_CITY_HOUSE3",
+        "MAP_FORTREE_CITY_HOUSE4",
+        "MAP_FORTREE_CITY_HOUSE5",
+        "MAP_FORTREE_CITY_MART",
+        "MAP_FORTREE_CITY_POKEMON_CENTER_1F",
+        "MAP_FORTREE_CITY_POKEMON_CENTER_2F",
+    },
+    "Granite Cave": {
+        "MAP_GRANITE_CAVE_1F",
+        "MAP_GRANITE_CAVE_B1F",
+        "MAP_GRANITE_CAVE_B2F",
+        "MAP_GRANITE_CAVE_STEVENS_ROOM",
+    },
+    "Jagged Pass": {"MAP_JAGGED_PASS"},
+    "Lavaridge Town": {
+        "MAP_LAVARIDGE_TOWN",
+        "MAP_LAVARIDGE_TOWN_GYM_1F",
+        "MAP_LAVARIDGE_TOWN_GYM_B1F",
+        "MAP_LAVARIDGE_TOWN_HERB_SHOP",
+        "MAP_LAVARIDGE_TOWN_HOUSE",
+        "MAP_LAVARIDGE_TOWN_MART",
+        "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
+        "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F",
+    },
+    "Lilycove City": {
+        "MAP_LILYCOVE_CITY",
+        "MAP_LILYCOVE_CITY_CONTEST_HALL",
+        "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
+        "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
+        "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F",
+        "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
+        "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
+        "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
+        "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
+        "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
+        "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+        "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP",
+        "MAP_LILYCOVE_CITY_HARBOR",
+        "MAP_LILYCOVE_CITY_HOUSE1",
+        "MAP_LILYCOVE_CITY_HOUSE2",
+        "MAP_LILYCOVE_CITY_HOUSE3",
+        "MAP_LILYCOVE_CITY_HOUSE4",
+        "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
+        "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F",
+        "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE",
+        "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F",
+        "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F",
+        "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB",
+    },
+    "Littleroot Town": {
+        "MAP_INSIDE_OF_TRUCK",
+        "MAP_LITTLEROOT_TOWN",
+        "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
+        "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F",
+        "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
+        "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+        "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
+    },
+    "Magma Hideout": {
+        "MAP_MAGMA_HIDEOUT_1F",
+        "MAP_MAGMA_HIDEOUT_2F_1R",
+        "MAP_MAGMA_HIDEOUT_2F_2R",
+        "MAP_MAGMA_HIDEOUT_2F_3R",
+        "MAP_MAGMA_HIDEOUT_3F_1R",
+        "MAP_MAGMA_HIDEOUT_3F_2R",
+        "MAP_MAGMA_HIDEOUT_3F_3R",
+        "MAP_MAGMA_HIDEOUT_4F",
+    },
+    "Marine Cave": {
+        "MAP_MARINE_CAVE_END",
+        "MAP_MARINE_CAVE_ENTRANCE",
+        "MAP_UNDERWATER_MARINE_CAVE",
+    },
+    "Mauville City": {
+        "MAP_MAUVILLE_CITY",
+        "MAP_MAUVILLE_CITY_BIKE_SHOP",
+        "MAP_MAUVILLE_CITY_GAME_CORNER",
+        "MAP_MAUVILLE_CITY_GYM",
+        "MAP_MAUVILLE_CITY_HOUSE1",
+        "MAP_MAUVILLE_CITY_HOUSE2",
+        "MAP_MAUVILLE_CITY_MART",
+        "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F",
+        "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F",
+    },
+    "Meteor Falls": {
+        "MAP_METEOR_FALLS_1F_1R",
+        "MAP_METEOR_FALLS_1F_2R",
+        "MAP_METEOR_FALLS_B1F_1R",
+        "MAP_METEOR_FALLS_B1F_2R",
+        "MAP_METEOR_FALLS_STEVENS_CAVE",
+    },
+    "Mirage Tower": {
+        "MAP_MIRAGE_TOWER_1F",
+        "MAP_MIRAGE_TOWER_2F",
+        "MAP_MIRAGE_TOWER_3F",
+        "MAP_MIRAGE_TOWER_4F",
+    },
+    "Mossdeep City": {
+        "MAP_MOSSDEEP_CITY",
+        "MAP_MOSSDEEP_CITY_GAME_CORNER_1F",
+        "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F",
+        "MAP_MOSSDEEP_CITY_GYM",
+        "MAP_MOSSDEEP_CITY_HOUSE1",
+        "MAP_MOSSDEEP_CITY_HOUSE2",
+        "MAP_MOSSDEEP_CITY_HOUSE3",
+        "MAP_MOSSDEEP_CITY_HOUSE4",
+        "MAP_MOSSDEEP_CITY_MART",
+        "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F",
+        "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F",
+        "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F",
+        "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F",
+        "MAP_MOSSDEEP_CITY_STEVENS_HOUSE",
+    },
+    "Mt. Chimney": {
+        "MAP_MT_CHIMNEY",
+        "MAP_MT_CHIMNEY_CABLE_CAR_STATION",
+    },
+    "Mt. Pyre": {
+        "MAP_MT_PYRE_1F",
+        "MAP_MT_PYRE_2F",
+        "MAP_MT_PYRE_3F",
+        "MAP_MT_PYRE_4F",
+        "MAP_MT_PYRE_5F",
+        "MAP_MT_PYRE_6F",
+        "MAP_MT_PYRE_EXTERIOR",
+        "MAP_MT_PYRE_SUMMIT",
+    },
+    "Navel Rock": {
+        "MAP_NAVEL_ROCK_B1F",
+        "MAP_NAVEL_ROCK_BOTTOM",
+        "MAP_NAVEL_ROCK_DOWN01",
+        "MAP_NAVEL_ROCK_DOWN02",
+        "MAP_NAVEL_ROCK_DOWN03",
+        "MAP_NAVEL_ROCK_DOWN04",
+        "MAP_NAVEL_ROCK_DOWN05",
+        "MAP_NAVEL_ROCK_DOWN06",
+        "MAP_NAVEL_ROCK_DOWN07",
+        "MAP_NAVEL_ROCK_DOWN08",
+        "MAP_NAVEL_ROCK_DOWN09",
+        "MAP_NAVEL_ROCK_DOWN10",
+        "MAP_NAVEL_ROCK_DOWN11",
+        "MAP_NAVEL_ROCK_ENTRANCE",
+        "MAP_NAVEL_ROCK_EXTERIOR",
+        "MAP_NAVEL_ROCK_FORK",
+        "MAP_NAVEL_ROCK_HARBOR",
+        "MAP_NAVEL_ROCK_TOP",
+        "MAP_NAVEL_ROCK_UP1",
+        "MAP_NAVEL_ROCK_UP2",
+        "MAP_NAVEL_ROCK_UP3",
+        "MAP_NAVEL_ROCK_UP4",
+    },
+    "New Mauville": {
+        "MAP_NEW_MAUVILLE_ENTRANCE",
+        "MAP_NEW_MAUVILLE_INSIDE",
+    },
+    "Oldale Town": {
+        "MAP_OLDALE_TOWN",
+        "MAP_OLDALE_TOWN_HOUSE1",
+        "MAP_OLDALE_TOWN_HOUSE2",
+        "MAP_OLDALE_TOWN_MART",
+        "MAP_OLDALE_TOWN_POKEMON_CENTER_1F",
+        "MAP_OLDALE_TOWN_POKEMON_CENTER_2F",
+    },
+    "Pacifidlog Town": {
+        "MAP_PACIFIDLOG_TOWN",
+        "MAP_PACIFIDLOG_TOWN_HOUSE1",
+        "MAP_PACIFIDLOG_TOWN_HOUSE2",
+        "MAP_PACIFIDLOG_TOWN_HOUSE3",
+        "MAP_PACIFIDLOG_TOWN_HOUSE4",
+        "MAP_PACIFIDLOG_TOWN_HOUSE5",
+        "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F",
+        "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F",
+    },
+    "Petalburg City": {
+        "MAP_PETALBURG_CITY",
+        "MAP_PETALBURG_CITY_GYM",
+        "MAP_PETALBURG_CITY_HOUSE1",
+        "MAP_PETALBURG_CITY_HOUSE2",
+        "MAP_PETALBURG_CITY_MART",
+        "MAP_PETALBURG_CITY_POKEMON_CENTER_1F",
+        "MAP_PETALBURG_CITY_POKEMON_CENTER_2F",
+        "MAP_PETALBURG_CITY_WALLYS_HOUSE",
+    },
+    "Petalburg Woods": {"MAP_PETALBURG_WOODS"},
+    "Route 101": {"MAP_ROUTE101"},
+    "Route 102": {"MAP_ROUTE102"},
+    "Route 103": {"MAP_ROUTE103"},
+    "Route 104": {
+        "MAP_ROUTE104",
+        "MAP_ROUTE104_MR_BRINEYS_HOUSE",
+        "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
+    },
+    "Route 105": {
+        "MAP_ISLAND_CAVE",
+        "MAP_ROUTE105",
+        "MAP_UNDERWATER_ROUTE105",
+    },
+    "Route 106": {"MAP_ROUTE106"},
+    "Route 107": {"MAP_ROUTE107"},
+    "Route 108": {"MAP_ROUTE108"},
+    "Route 109": {
+        "MAP_ROUTE109",
+        "MAP_ROUTE109_SEASHORE_HOUSE",
+    },
+    "Route 110": {
+        "MAP_ROUTE110",
+        "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
+        "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
+    },
+    "Trick House": {
+        "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR",
+        "MAP_ROUTE110_TRICK_HOUSE_END",
+        "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+        "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1",
+        "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2",
+        "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3",
+        "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4",
+        "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5",
+        "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6",
+        "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+        "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8",
+    },
+    "Route 111": {
+        "MAP_DESERT_RUINS",
+        "MAP_ROUTE111",
+        "MAP_ROUTE111_OLD_LADYS_REST_STOP",
+        "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE",
+    },
+    "Route 112": {
+        "MAP_ROUTE112",
+        "MAP_ROUTE112_CABLE_CAR_STATION",
+    },
+    "Route 113": {
+        "MAP_ROUTE113",
+        "MAP_ROUTE113_GLASS_WORKSHOP",
+    },
+    "Route 114": {
+        "MAP_DESERT_UNDERPASS",
+        "MAP_ROUTE114",
+        "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE",
+        "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL",
+        "MAP_ROUTE114_LANETTES_HOUSE",
+    },
+    "Route 115": {"MAP_ROUTE115"},
+    "Route 116": {
+        "MAP_ROUTE116",
+        "MAP_ROUTE116_TUNNELERS_REST_HOUSE",
+    },
+    "Route 117": {
+        "MAP_ROUTE117",
+        "MAP_ROUTE117_POKEMON_DAY_CARE",
+    },
+    "Route 118": {"MAP_ROUTE118"},
+    "Route 119": {
+        "MAP_ROUTE119",
+        "MAP_ROUTE119_HOUSE",
+        "MAP_ROUTE119_WEATHER_INSTITUTE_1F",
+        "MAP_ROUTE119_WEATHER_INSTITUTE_2F",
+    },
+    "Route 120": {
+        "MAP_ANCIENT_TOMB",
+        "MAP_ROUTE120",
+        "MAP_SCORCHED_SLAB",
+    },
+    "Route 121": {
+        "MAP_ROUTE121",
+    },
+    "Route 122": {"MAP_ROUTE122"},
+    "Route 123": {
+        "MAP_ROUTE123",
+        "MAP_ROUTE123_BERRY_MASTERS_HOUSE",
+    },
+    "Route 124": {
+        "MAP_ROUTE124",
+        "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
+        "MAP_UNDERWATER_ROUTE124",
+    },
+    "Route 125": {
+        "MAP_ROUTE125",
+        "MAP_UNDERWATER_ROUTE125",
+    },
+    "Route 126": {
+        "MAP_ROUTE126",
+        "MAP_UNDERWATER_ROUTE126",
+    },
+    "Route 127": {
+        "MAP_ROUTE127",
+        "MAP_UNDERWATER_ROUTE127",
+    },
+    "Route 128": {
+        "MAP_ROUTE128",
+        "MAP_UNDERWATER_ROUTE128",
+    },
+    "Route 129": {
+        "MAP_ROUTE129",
+        "MAP_UNDERWATER_ROUTE129",
+    },
+    "Route 130": {"MAP_ROUTE130"},
+    "Route 131": {"MAP_ROUTE131"},
+    "Route 132": {"MAP_ROUTE132"},
+    "Route 133": {"MAP_ROUTE133"},
+    "Route 134": {
+        "MAP_ROUTE134",
+        "MAP_UNDERWATER_ROUTE134",
+        "MAP_SEALED_CHAMBER_INNER_ROOM",
+        "MAP_SEALED_CHAMBER_OUTER_ROOM",
+        "MAP_UNDERWATER_SEALED_CHAMBER",
+    },
+    "Rustboro City": {
+        "MAP_RUSTBORO_CITY",
+        "MAP_RUSTBORO_CITY_CUTTERS_HOUSE",
+        "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
+        "MAP_RUSTBORO_CITY_DEVON_CORP_2F",
+        "MAP_RUSTBORO_CITY_DEVON_CORP_3F",
+        "MAP_RUSTBORO_CITY_FLAT1_1F",
+        "MAP_RUSTBORO_CITY_FLAT1_2F",
+        "MAP_RUSTBORO_CITY_FLAT2_1F",
+        "MAP_RUSTBORO_CITY_FLAT2_2F",
+        "MAP_RUSTBORO_CITY_FLAT2_3F",
+        "MAP_RUSTBORO_CITY_GYM",
+        "MAP_RUSTBORO_CITY_HOUSE1",
+        "MAP_RUSTBORO_CITY_HOUSE2",
+        "MAP_RUSTBORO_CITY_HOUSE3",
+        "MAP_RUSTBORO_CITY_MART",
+        "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F",
+        "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F",
+        "MAP_RUSTBORO_CITY_POKEMON_SCHOOL",
+    },
+    "Rusturf Tunnel": {"MAP_RUSTURF_TUNNEL"},
+    "Safari Zone": {
+        "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE",
+        "MAP_SAFARI_ZONE_NORTH",
+        "MAP_SAFARI_ZONE_NORTHEAST",
+        "MAP_SAFARI_ZONE_NORTHWEST",
+        "MAP_SAFARI_ZONE_REST_HOUSE",
+        "MAP_SAFARI_ZONE_SOUTH",
+        "MAP_SAFARI_ZONE_SOUTHEAST",
+        "MAP_SAFARI_ZONE_SOUTHWEST",
+    },
+    "Seafloor Cavern": {
+        "MAP_SEAFLOOR_CAVERN_ENTRANCE",
+        "MAP_SEAFLOOR_CAVERN_ROOM1",
+        "MAP_SEAFLOOR_CAVERN_ROOM2",
+        "MAP_SEAFLOOR_CAVERN_ROOM3",
+        "MAP_SEAFLOOR_CAVERN_ROOM4",
+        "MAP_SEAFLOOR_CAVERN_ROOM5",
+        "MAP_SEAFLOOR_CAVERN_ROOM6",
+        "MAP_SEAFLOOR_CAVERN_ROOM7",
+        "MAP_SEAFLOOR_CAVERN_ROOM8",
+        "MAP_SEAFLOOR_CAVERN_ROOM9",
+        "MAP_UNDERWATER_SEAFLOOR_CAVERN",
+    },
+    "Shoal Cave": {
+        "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM",
+        "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM",
+        "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+        "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
+        "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+        "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+        "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
+    },
+    "Sky Pillar": {
+        "MAP_SKY_PILLAR_1F",
+        "MAP_SKY_PILLAR_2F",
+        "MAP_SKY_PILLAR_3F",
+        "MAP_SKY_PILLAR_4F",
+        "MAP_SKY_PILLAR_5F",
+        "MAP_SKY_PILLAR_ENTRANCE",
+        "MAP_SKY_PILLAR_OUTSIDE",
+        "MAP_SKY_PILLAR_TOP",
+    },
+    "Slateport City": {
+        "MAP_SLATEPORT_CITY",
+        "MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM",
+        "MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR",
+        "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY",
+        "MAP_SLATEPORT_CITY_HARBOR",
+        "MAP_SLATEPORT_CITY_HOUSE",
+        "MAP_SLATEPORT_CITY_MART",
+        "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE",
+        "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
+        "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F",
+        "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F",
+        "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F",
+        "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB",
+        "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
+        "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F",
+    },
+    "Sootopolis City": {
+        "MAP_CAVE_OF_ORIGIN_1F",
+        "MAP_CAVE_OF_ORIGIN_B1F",
+        "MAP_CAVE_OF_ORIGIN_ENTRANCE",
+        "MAP_SOOTOPOLIS_CITY",
+        "MAP_SOOTOPOLIS_CITY_GYM_1F",
+        "MAP_SOOTOPOLIS_CITY_GYM_B1F",
+        "MAP_SOOTOPOLIS_CITY_HOUSE1",
+        "MAP_SOOTOPOLIS_CITY_HOUSE2",
+        "MAP_SOOTOPOLIS_CITY_HOUSE3",
+        "MAP_SOOTOPOLIS_CITY_HOUSE4",
+        "MAP_SOOTOPOLIS_CITY_HOUSE5",
+        "MAP_SOOTOPOLIS_CITY_HOUSE6",
+        "MAP_SOOTOPOLIS_CITY_HOUSE7",
+        "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE",
+        "MAP_SOOTOPOLIS_CITY_MART",
+        "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
+        "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F",
+        "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F",
+        "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F",
+        "MAP_UNDERWATER_SOOTOPOLIS_CITY",
+    },
+    "Southern Island": {
+        "MAP_SOUTHERN_ISLAND_EXTERIOR",
+        "MAP_SOUTHERN_ISLAND_INTERIOR",
+    },
+    "S.S. Tidal": {
+        "MAP_SS_TIDAL_CORRIDOR",
+        "MAP_SS_TIDAL_LOWER_DECK",
+        "MAP_SS_TIDAL_ROOMS",
+    },
+    "Terra Cave": {
+        "MAP_TERRA_CAVE_END",
+        "MAP_TERRA_CAVE_ENTRANCE",
+    },
+    "Trainer Hill": {
+        "MAP_TRAINER_HILL_2F",
+        "MAP_TRAINER_HILL_3F",
+        "MAP_TRAINER_HILL_4F",
+        "MAP_TRAINER_HILL_ELEVATOR",
+        "MAP_TRAINER_HILL_ENTRANCE",
+        "MAP_TRAINER_HILL_ROOF",
+    },
+    "Verdanturf Town": {
+        "MAP_VERDANTURF_TOWN",
+        "MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM",
+        "MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR",
+        "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY",
+        "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE",
+        "MAP_VERDANTURF_TOWN_HOUSE",
+        "MAP_VERDANTURF_TOWN_MART",
+        "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F",
+        "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F",
+        "MAP_VERDANTURF_TOWN_WANDAS_HOUSE",
+    },
+    "Victory Road": {
+        "MAP_VICTORY_ROAD_1F",
+        "MAP_VICTORY_ROAD_B1F",
+        "MAP_VICTORY_ROAD_B2F",
+    },
+}
+
+_LOCATION_CATEGORY_TO_GROUP_NAME = {
+    LocationCategory.BADGE: "Badges",
+    LocationCategory.HM: "HMs",
+    LocationCategory.KEY: "Key Items",
+    LocationCategory.ROD: "Fishing Rods",
+    LocationCategory.BIKE: "Bikes",
+    LocationCategory.TICKET: "Tickets",
+    LocationCategory.OVERWORLD_ITEM: "Overworld Items",
+    LocationCategory.HIDDEN_ITEM: "Hidden Items",
+    LocationCategory.GIFT: "NPC Gifts",
+    LocationCategory.BERRY_TREE: "Berry Trees",
+    LocationCategory.TRAINER: "Trainers",
+    LocationCategory.POKEDEX: "Pokedex",
+}
+
+LOCATION_GROUPS: Dict[str, Set[str]] = {group_name: set() for group_name in _LOCATION_CATEGORY_TO_GROUP_NAME.values()}
+for location in data.locations.values():
+    # Category groups
+    LOCATION_GROUPS[_LOCATION_CATEGORY_TO_GROUP_NAME[location.category]].add(location.label)
+
+    # Tag groups
+    for tag in location.tags:
+        if tag not in LOCATION_GROUPS:
+            LOCATION_GROUPS[tag] = set()
+        LOCATION_GROUPS[tag].add(location.label)
+
+    # Geographic groups
+    if location.parent_region != "REGION_POKEDEX":
+        map_name = data.regions[location.parent_region].parent_map.name
+        for group, maps in _LOCATION_GROUP_MAPS.items():
+            if map_name in maps:
+                if group not in LOCATION_GROUPS:
+                    LOCATION_GROUPS[group] = set()
+                LOCATION_GROUPS[group].add(location.label)
+                break
+
+# Meta-groups
+LOCATION_GROUPS["Cities"] = {
+    *LOCATION_GROUPS.get("Littleroot Town", set()),
+    *LOCATION_GROUPS.get("Oldale Town", set()),
+    *LOCATION_GROUPS.get("Petalburg City", set()),
+    *LOCATION_GROUPS.get("Rustboro City", set()),
+    *LOCATION_GROUPS.get("Dewford Town", set()),
+    *LOCATION_GROUPS.get("Slateport City", set()),
+    *LOCATION_GROUPS.get("Mauville City", set()),
+    *LOCATION_GROUPS.get("Verdanturf Town", set()),
+    *LOCATION_GROUPS.get("Fallarbor Town", set()),
+    *LOCATION_GROUPS.get("Lavaridge Town", set()),
+    *LOCATION_GROUPS.get("Fortree City", set()),
+    *LOCATION_GROUPS.get("Mossdeep City", set()),
+    *LOCATION_GROUPS.get("Sootopolis City", set()),
+    *LOCATION_GROUPS.get("Pacifidlog Town", set()),
+    *LOCATION_GROUPS.get("Ever Grande City", set()),
+}
+
+LOCATION_GROUPS["Dungeons"] = {
+    *LOCATION_GROUPS.get("Petalburg Woods", set()),
+    *LOCATION_GROUPS.get("Rusturf Tunnel", set()),
+    *LOCATION_GROUPS.get("Granite Cave", set()),
+    *LOCATION_GROUPS.get("Fiery Path", set()),
+    *LOCATION_GROUPS.get("Meteor Falls", set()),
+    *LOCATION_GROUPS.get("Jagged Pass", set()),
+    *LOCATION_GROUPS.get("Mt. Chimney", set()),
+    *LOCATION_GROUPS.get("Abandoned Ship", set()),
+    *LOCATION_GROUPS.get("New Mauville", set()),
+    *LOCATION_GROUPS.get("Mt. Pyre", set()),
+    *LOCATION_GROUPS.get("Seafloor Cavern", set()),
+    *LOCATION_GROUPS.get("Sky Pillar", set()),
+    *LOCATION_GROUPS.get("Victory Road", set()),
+}
+
+LOCATION_GROUPS["Routes"] = {
+    *LOCATION_GROUPS.get("Route 101", set()),
+    *LOCATION_GROUPS.get("Route 102", set()),
+    *LOCATION_GROUPS.get("Route 103", set()),
+    *LOCATION_GROUPS.get("Route 104", set()),
+    *LOCATION_GROUPS.get("Route 105", set()),
+    *LOCATION_GROUPS.get("Route 106", set()),
+    *LOCATION_GROUPS.get("Route 107", set()),
+    *LOCATION_GROUPS.get("Route 108", set()),
+    *LOCATION_GROUPS.get("Route 109", set()),
+    *LOCATION_GROUPS.get("Route 110", set()),
+    *LOCATION_GROUPS.get("Route 111", set()),
+    *LOCATION_GROUPS.get("Route 112", set()),
+    *LOCATION_GROUPS.get("Route 113", set()),
+    *LOCATION_GROUPS.get("Route 114", set()),
+    *LOCATION_GROUPS.get("Route 115", set()),
+    *LOCATION_GROUPS.get("Route 116", set()),
+    *LOCATION_GROUPS.get("Route 117", set()),
+    *LOCATION_GROUPS.get("Route 118", set()),
+    *LOCATION_GROUPS.get("Route 119", set()),
+    *LOCATION_GROUPS.get("Route 120", set()),
+    *LOCATION_GROUPS.get("Route 121", set()),
+    *LOCATION_GROUPS.get("Route 122", set()),
+    *LOCATION_GROUPS.get("Route 123", set()),
+    *LOCATION_GROUPS.get("Route 124", set()),
+    *LOCATION_GROUPS.get("Route 125", set()),
+    *LOCATION_GROUPS.get("Route 126", set()),
+    *LOCATION_GROUPS.get("Route 127", set()),
+    *LOCATION_GROUPS.get("Route 128", set()),
+    *LOCATION_GROUPS.get("Route 129", set()),
+    *LOCATION_GROUPS.get("Route 130", set()),
+    *LOCATION_GROUPS.get("Route 131", set()),
+    *LOCATION_GROUPS.get("Route 132", set()),
+    *LOCATION_GROUPS.get("Route 133", set()),
+    *LOCATION_GROUPS.get("Route 134", set()),
+}
diff --git a/worlds/pokemon_emerald/items.py b/worlds/pokemon_emerald/items.py
index 436db771d396..922bbbc0dbfb 100644
--- a/worlds/pokemon_emerald/items.py
+++ b/worlds/pokemon_emerald/items.py
@@ -1,7 +1,7 @@
 """
 Classes and functions related to AP items for Pokemon Emerald
 """
-from typing import Dict, FrozenSet, Optional
+from typing import Dict, FrozenSet, Set, Optional
 
 from BaseClasses import Item, ItemClassification
 
@@ -46,30 +46,6 @@ def create_item_label_to_code_map() -> Dict[str, int]:
     return label_to_code_map
 
 
-ITEM_GROUPS = {
-    "Badges": {
-        "Stone Badge", "Knuckle Badge",
-        "Dynamo Badge", "Heat Badge",
-        "Balance Badge", "Feather Badge",
-        "Mind Badge", "Rain Badge",
-    },
-    "HMs": {
-        "HM01 Cut", "HM02 Fly",
-        "HM03 Surf", "HM04 Strength",
-        "HM05 Flash", "HM06 Rock Smash",
-        "HM07 Waterfall", "HM08 Dive",
-    },
-    "HM01": {"HM01 Cut"},
-    "HM02": {"HM02 Fly"},
-    "HM03": {"HM03 Surf"},
-    "HM04": {"HM04 Strength"},
-    "HM05": {"HM05 Flash"},
-    "HM06": {"HM06 Rock Smash"},
-    "HM07": {"HM07 Waterfall"},
-    "HM08": {"HM08 Dive"},
-}
-
-
 def get_item_classification(item_code: int) -> ItemClassification:
     """
     Returns the item classification for a given AP item id (code)
diff --git a/worlds/pokemon_emerald/locations.py b/worlds/pokemon_emerald/locations.py
index 9123690bead7..473c189166be 100644
--- a/worlds/pokemon_emerald/locations.py
+++ b/worlds/pokemon_emerald/locations.py
@@ -1,59 +1,17 @@
 """
 Classes and functions related to AP locations for Pokemon Emerald
 """
-from typing import TYPE_CHECKING, Dict, Optional, FrozenSet, Iterable
+from typing import TYPE_CHECKING, Dict, Optional, Set
 
 from BaseClasses import Location, Region
 
-from .data import BASE_OFFSET, NATIONAL_ID_TO_SPECIES_ID, POKEDEX_OFFSET, data
+from .data import BASE_OFFSET, NATIONAL_ID_TO_SPECIES_ID, POKEDEX_OFFSET, LocationCategory, data
 from .items import offset_item_value
 
 if TYPE_CHECKING:
     from . import PokemonEmeraldWorld
 
 
-LOCATION_GROUPS = {
-    "Badges": {
-        "Rustboro Gym - Stone Badge",
-        "Dewford Gym - Knuckle Badge",
-        "Mauville Gym - Dynamo Badge",
-        "Lavaridge Gym - Heat Badge",
-        "Petalburg Gym - Balance Badge",
-        "Fortree Gym - Feather Badge",
-        "Mossdeep Gym - Mind Badge",
-        "Sootopolis Gym - Rain Badge",
-    },
-    "Gym TMs": {
-        "Rustboro Gym - TM39 from Roxanne",
-        "Dewford Gym - TM08 from Brawly",
-        "Mauville Gym - TM34 from Wattson",
-        "Lavaridge Gym - TM50 from Flannery",
-        "Petalburg Gym - TM42 from Norman",
-        "Fortree Gym - TM40 from Winona",
-        "Mossdeep Gym - TM04 from Tate and Liza",
-        "Sootopolis Gym - TM03 from Juan",
-    },
-    "Trick House": {
-        "Trick House Puzzle 1 - Item",
-        "Trick House Puzzle 2 - Item 1",
-        "Trick House Puzzle 2 - Item 2",
-        "Trick House Puzzle 3 - Item 1",
-        "Trick House Puzzle 3 - Item 2",
-        "Trick House Puzzle 4 - Item",
-        "Trick House Puzzle 6 - Item",
-        "Trick House Puzzle 7 - Item",
-        "Trick House Puzzle 8 - Item",
-        "Trick House Puzzle 1 - Reward",
-        "Trick House Puzzle 2 - Reward",
-        "Trick House Puzzle 3 - Reward",
-        "Trick House Puzzle 4 - Reward",
-        "Trick House Puzzle 5 - Reward",
-        "Trick House Puzzle 6 - Reward",
-        "Trick House Puzzle 7 - Reward",
-    }
-}
-
-
 VISITED_EVENT_NAME_TO_ID = {
     "EVENT_VISITED_LITTLEROOT_TOWN": 0,
     "EVENT_VISITED_OLDALE_TOWN": 1,
@@ -80,7 +38,7 @@ class PokemonEmeraldLocation(Location):
     game: str = "Pokemon Emerald"
     item_address: Optional[int]
     default_item_code: Optional[int]
-    tags: FrozenSet[str]
+    key: Optional[str]
 
     def __init__(
             self,
@@ -88,13 +46,13 @@ def __init__(
             name: str,
             address: Optional[int],
             parent: Optional[Region] = None,
+            key: Optional[str] = None,
             item_address: Optional[int] = None,
-            default_item_value: Optional[int] = None,
-            tags: FrozenSet[str] = frozenset()) -> None:
+            default_item_value: Optional[int] = None) -> None:
         super().__init__(player, name, address, parent)
         self.default_item_code = None if default_item_value is None else offset_item_value(default_item_value)
         self.item_address = item_address
-        self.tags = tags
+        self.key = key
 
 
 def offset_flag(flag: int) -> int:
@@ -115,16 +73,14 @@ def reverse_offset_flag(location_id: int) -> int:
     return location_id - BASE_OFFSET
 
 
-def create_locations_with_tags(world: "PokemonEmeraldWorld", regions: Dict[str, Region], tags: Iterable[str]) -> None:
+def create_locations_by_category(world: "PokemonEmeraldWorld", regions: Dict[str, Region], categories: Set[LocationCategory]) -> None:
     """
     Iterates through region data and adds locations to the multiworld if
     those locations include any of the provided tags.
     """
-    tags = set(tags)
-
     for region_name, region_data in data.regions.items():
         region = regions[region_name]
-        filtered_locations = [loc for loc in region_data.locations if len(tags & data.locations[loc].tags) > 0]
+        filtered_locations = [loc for loc in region_data.locations if data.locations[loc].category in categories]
 
         for location_name in filtered_locations:
             location_data = data.locations[location_name]
@@ -144,9 +100,9 @@ def create_locations_with_tags(world: "PokemonEmeraldWorld", regions: Dict[str,
                 location_data.label,
                 location_id,
                 region,
+                location_name,
                 location_data.address,
-                location_data.default_item,
-                location_data.tags
+                location_data.default_item
             )
             region.locations.append(location)
 
diff --git a/worlds/pokemon_emerald/rules.py b/worlds/pokemon_emerald/rules.py
index 5f83686ebeec..b8d1efb1a98d 100644
--- a/worlds/pokemon_emerald/rules.py
+++ b/worlds/pokemon_emerald/rules.py
@@ -6,7 +6,8 @@
 from BaseClasses import CollectionState
 from worlds.generic.Rules import add_rule, set_rule
 
-from .data import NATIONAL_ID_TO_SPECIES_ID, NUM_REAL_SPECIES, data
+from .data import LocationCategory, NATIONAL_ID_TO_SPECIES_ID, NUM_REAL_SPECIES, data
+from .locations import PokemonEmeraldLocation
 from .options import DarkCavesRequireFlash, EliteFourRequirement, NormanRequirement, Goal
 
 if TYPE_CHECKING:
@@ -23,7 +24,7 @@ def set_rules(world: "PokemonEmeraldWorld") -> None:
                 state.has(hm, world.player) and state.has_all(badges, world.player)
         else:
             hm_rules[hm] = lambda state, hm=hm, badges=badges: \
-                state.has(hm, world.player) and state.has_group_unique("Badges", world.player, badges)
+                state.has(hm, world.player) and state.has_group_unique("Badge", world.player, badges)
 
     def has_acro_bike(state: CollectionState):
         return state.has("Acro Bike", world.player)
@@ -236,11 +237,11 @@ def get_location(location: str):
     if world.options.norman_requirement == NormanRequirement.option_badges:
         set_rule(
             get_entrance("MAP_PETALBURG_CITY_GYM:2/MAP_PETALBURG_CITY_GYM:3"),
-            lambda state: state.has_group_unique("Badges", world.player, world.options.norman_count.value)
+            lambda state: state.has_group_unique("Badge", world.player, world.options.norman_count.value)
         )
         set_rule(
             get_entrance("MAP_PETALBURG_CITY_GYM:5/MAP_PETALBURG_CITY_GYM:6"),
-            lambda state: state.has_group_unique("Badges", world.player, world.options.norman_count.value)
+            lambda state: state.has_group_unique("Badge", world.player, world.options.norman_count.value)
         )
     else:
         set_rule(
@@ -1506,7 +1507,7 @@ def get_location(location: str):
     if world.options.elite_four_requirement == EliteFourRequirement.option_badges:
         set_rule(
             get_entrance("REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/MAIN -> REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/BEHIND_BADGE_CHECKERS"),
-            lambda state: state.has_group_unique("Badges", world.player, world.options.elite_four_count.value)
+            lambda state: state.has_group_unique("Badge", world.player, world.options.elite_four_count.value)
         )
     else:
         set_rule(
@@ -1659,7 +1660,8 @@ def get_location(location: str):
     # Add Itemfinder requirement to hidden items
     if world.options.require_itemfinder:
         for location in world.multiworld.get_locations(world.player):
-            if location.tags is not None and "HiddenItem" in location.tags:
+            assert isinstance(location, PokemonEmeraldLocation)
+            if location.key is not None and data.locations[location.key].category == LocationCategory.HIDDEN_ITEM:
                 add_rule(
                     location,
                     lambda state: state.has("Itemfinder", world.player)
diff --git a/worlds/pokemon_emerald/sanity_check.py b/worlds/pokemon_emerald/sanity_check.py
index 24eb768bfbc5..048b19b46919 100644
--- a/worlds/pokemon_emerald/sanity_check.py
+++ b/worlds/pokemon_emerald/sanity_check.py
@@ -5,8 +5,6 @@
 import logging
 from typing import List
 
-from .data import load_json_data, data
-
 
 _IGNORABLE_LOCATIONS = frozenset({
     "HIDDEN_ITEM_TRICK_HOUSE_NUGGET",  # Is permanently mssiable and has special behavior that sets the flag early
@@ -247,12 +245,29 @@
 })
 
 
+def validate_group_maps() -> bool:
+    from .data import data
+    from .groups import _LOCATION_GROUP_MAPS
+
+    failed = False
+
+    for group_name, map_set in _LOCATION_GROUP_MAPS.items():
+        for map_name in map_set:
+            if map_name not in data.maps:
+                failed = True
+                logging.error("Pokemon Emerald: Map named %s in location group %s does not exist", map_name, group_name)
+
+    return not failed
+
+
 def validate_regions() -> bool:
     """
     Verifies that Emerald's data doesn't have duplicate or missing
     regions/warps/locations. Meant to catch problems during development like
     forgetting to add a new location or incorrectly splitting a region.
     """
+    from .data import load_json_data, data
+
     extracted_data_json = load_json_data("extracted_data.json")
     error_messages: List[str] = []
     warn_messages: List[str] = []

From 05aa96a33573b97c93a2e252994699050e262252 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:07:14 +0100
Subject: [PATCH 073/381] CI: use py3.12 for the linux and windows builds
 (#4284)

* CI: use py3.12 for the linux build

* CI: use py3.12 for the windows build
---
 .github/workflows/build.yml   | 6 +++---
 .github/workflows/release.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c013172ea034..a5a2f52f3222 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Install python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Download run-time dependencies
         run: |
           Invoke-WebRequest -Uri https://github.com/Ijwu/Enemizer/releases/download/${Env:ENEMIZER_VERSION}/win-x64.zip -OutFile enemizer.zip
@@ -111,10 +111,10 @@ jobs:
       - name: Get a recent python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Install build-time dependencies
         run: |
-          echo "PYTHON=python3.11" >> $GITHUB_ENV
+          echo "PYTHON=python3.12" >> $GITHUB_ENV
           wget -nv https://github.com/AppImage/AppImageKit/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage
           chmod a+rx appimagetool-x86_64.AppImage
           ./appimagetool-x86_64.AppImage --appimage-extract
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3f8651d408e7..b28ec8733408 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,10 +44,10 @@ jobs:
       - name: Get a recent python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Install build-time dependencies
         run: |
-          echo "PYTHON=python3.11" >> $GITHUB_ENV
+          echo "PYTHON=python3.12" >> $GITHUB_ENV
           wget -nv https://github.com/AppImage/AppImageKit/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage
           chmod a+rx appimagetool-x86_64.AppImage
           ./appimagetool-x86_64.AppImage --appimage-extract

From d36c9834612a35cdeb84f43e6609ff5021c5f235 Mon Sep 17 00:00:00 2001
From: Benjamin S Wolf <jokeserver@gmail.com>
Date: Fri, 29 Nov 2024 11:40:02 -0800
Subject: [PATCH 074/381] Core: Log warnings at call site, not Utils itself
 (#4229)

---
 Utils.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Utils.py b/Utils.py
index 4e8d7fc427e0..f5c6ca6414f5 100644
--- a/Utils.py
+++ b/Utils.py
@@ -858,11 +858,10 @@ def async_start(co: Coroutine[None, None, typing.Any], name: Optional[str] = Non
     task.add_done_callback(_faf_tasks.discard)
 
 
-def deprecate(message: str):
+def deprecate(message: str, add_stacklevels: int = 0):
     if __debug__:
         raise Exception(message)
-    import warnings
-    warnings.warn(message)
+    warnings.warn(message, stacklevel=2 + add_stacklevels)
 
 
 class DeprecateDict(dict):
@@ -876,10 +875,9 @@ def __init__(self, message: str, error: bool = False) -> None:
 
     def __getitem__(self, item: Any) -> Any:
         if self.should_error:
-            deprecate(self.log_message)
+            deprecate(self.log_message, add_stacklevels=1)
         elif __debug__:
-            import warnings
-            warnings.warn(self.log_message)
+            warnings.warn(self.log_message, stacklevel=2)
         return super().__getitem__(item)
 
 

From ed4e44b99403fedb27ab933e50068192bf2a4e7a Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Fri, 29 Nov 2024 14:41:26 -0500
Subject: [PATCH 075/381] Stardew Valley: Remove some events for a slight
 performance increase (#4085)

---
 worlds/stardew_valley/__init__.py             | 15 -------
 worlds/stardew_valley/logic/building_logic.py | 11 +++--
 worlds/stardew_valley/logic/money_logic.py    | 13 ++++--
 worlds/stardew_valley/logic/shipping_logic.py |  5 +--
 .../logic/special_order_logic.py              |  7 ++--
 worlds/stardew_valley/rules.py                | 40 ++++++++-----------
 .../stardew_rule/rule_explain.py              | 20 +++++-----
 .../strings/ap_names/event_names.py           |  4 --
 .../test/rules/TestBuildings.py               |  9 -----
 9 files changed, 48 insertions(+), 76 deletions(-)

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 44306011361c..01ca56531f00 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -206,25 +206,10 @@ def precollect_farm_type_items(self):
             self.multiworld.push_precollected(self.create_starting_item("Progressive Coop"))
 
     def setup_player_events(self):
-        self.setup_construction_events()
-        self.setup_quest_events()
         self.setup_action_events()
         self.setup_logic_events()
 
-    def setup_construction_events(self):
-        can_construct_buildings = LocationData(None, RegionName.carpenter, Event.can_construct_buildings)
-        self.create_event_location(can_construct_buildings, True_(), Event.can_construct_buildings)
-
-    def setup_quest_events(self):
-        start_dark_talisman_quest = LocationData(None, RegionName.railroad, Event.start_dark_talisman_quest)
-        self.create_event_location(start_dark_talisman_quest, self.logic.wallet.has_rusty_key(), Event.start_dark_talisman_quest)
-
     def setup_action_events(self):
-        can_ship_event = LocationData(None, LogicRegion.shipping, Event.can_ship_items)
-        self.create_event_location(can_ship_event, true_, Event.can_ship_items)
-        can_shop_pierre_event = LocationData(None, RegionName.pierre_store, Event.can_shop_at_pierre)
-        self.create_event_location(can_shop_pierre_event, true_, Event.can_shop_at_pierre)
-
         spring_farming = LocationData(None, LogicRegion.spring_farming, Event.spring_farming)
         self.create_event_location(spring_farming, true_, Event.spring_farming)
         summer_farming = LocationData(None, LogicRegion.summer_farming, Event.summer_farming)
diff --git a/worlds/stardew_valley/logic/building_logic.py b/worlds/stardew_valley/logic/building_logic.py
index 4611eba37d64..b4eff4399385 100644
--- a/worlds/stardew_valley/logic/building_logic.py
+++ b/worlds/stardew_valley/logic/building_logic.py
@@ -1,3 +1,4 @@
+from functools import cached_property
 from typing import Dict, Union
 
 from Utils import cache_self1
@@ -8,12 +9,12 @@
 from .region_logic import RegionLogicMixin
 from ..options import BuildingProgression
 from ..stardew_rule import StardewRule, True_, False_, Has
-from ..strings.ap_names.event_names import Event
 from ..strings.artisan_good_names import ArtisanGood
 from ..strings.building_names import Building
 from ..strings.fish_names import WaterItem
 from ..strings.material_names import Material
 from ..strings.metal_names import MetalBar
+from ..strings.region_names import Region
 
 has_group = "building"
 
@@ -60,7 +61,7 @@ def has_building(self, building: str) -> StardewRule:
                 return True_()
             return self.logic.received(building)
 
-        carpenter_rule = self.logic.received(Event.can_construct_buildings)
+        carpenter_rule = self.logic.building.can_construct_buildings
         if not self.options.building_progression & BuildingProgression.option_progressive:
             return Has(building, self.registry.building_rules, has_group) & carpenter_rule
 
@@ -75,6 +76,10 @@ def has_building(self, building: str) -> StardewRule:
             building = " ".join(["Progressive", *building.split(" ")[1:]])
         return self.logic.received(building, count) & carpenter_rule
 
+    @cached_property
+    def can_construct_buildings(self) -> StardewRule:
+        return self.logic.region.can_reach(Region.carpenter)
+
     @cache_self1
     def has_house(self, upgrade_level: int) -> StardewRule:
         if upgrade_level < 1:
@@ -83,7 +88,7 @@ def has_house(self, upgrade_level: int) -> StardewRule:
         if upgrade_level > 3:
             return False_()
 
-        carpenter_rule = self.logic.received(Event.can_construct_buildings)
+        carpenter_rule = self.logic.building.can_construct_buildings
         if self.options.building_progression & BuildingProgression.option_progressive:
             return carpenter_rule & self.logic.received(f"Progressive House", upgrade_level)
 
diff --git a/worlds/stardew_valley/logic/money_logic.py b/worlds/stardew_valley/logic/money_logic.py
index 73c5291af082..85370273c987 100644
--- a/worlds/stardew_valley/logic/money_logic.py
+++ b/worlds/stardew_valley/logic/money_logic.py
@@ -1,3 +1,4 @@
+import typing
 from typing import Union
 
 from Utils import cache_self1
@@ -11,10 +12,14 @@
 from ..data.shop import ShopSource
 from ..options import SpecialOrderLocations
 from ..stardew_rule import StardewRule, True_, HasProgressionPercent, False_, true_
-from ..strings.ap_names.event_names import Event
 from ..strings.currency_names import Currency
 from ..strings.region_names import Region, LogicRegion
 
+if typing.TYPE_CHECKING:
+    from .shipping_logic import ShippingLogicMixin
+
+    assert ShippingLogicMixin
+
 qi_gem_rewards = ("100 Qi Gems", "50 Qi Gems", "40 Qi Gems", "35 Qi Gems", "25 Qi Gems",
                   "20 Qi Gems", "15 Qi Gems", "10 Qi Gems")
 
@@ -26,7 +31,7 @@ def __init__(self, *args, **kwargs):
 
 
 class MoneyLogic(BaseLogic[Union[RegionLogicMixin, MoneyLogicMixin, TimeLogicMixin, RegionLogicMixin, ReceivedLogicMixin, HasLogicMixin, SeasonLogicMixin,
-GrindLogicMixin]]):
+GrindLogicMixin, 'ShippingLogicMixin']]):
 
     @cache_self1
     def can_have_earned_total(self, amount: int) -> StardewRule:
@@ -37,7 +42,7 @@ def can_have_earned_total(self, amount: int) -> StardewRule:
         willy_rule = self.logic.region.can_reach_all((Region.fish_shop, LogicRegion.fishing))
         clint_rule = self.logic.region.can_reach_all((Region.blacksmith, Region.mines_floor_5))
         robin_rule = self.logic.region.can_reach_all((Region.carpenter, Region.secret_woods))
-        shipping_rule = self.logic.received(Event.can_ship_items)
+        shipping_rule = self.logic.shipping.can_use_shipping_bin
 
         if amount < 2000:
             selling_any_rule = pierre_rule | willy_rule | clint_rule | robin_rule | shipping_rule
@@ -50,7 +55,7 @@ def can_have_earned_total(self, amount: int) -> StardewRule:
         if amount < 10000:
             return shipping_rule
 
-        seed_rules = self.logic.received(Event.can_shop_at_pierre)
+        seed_rules = self.logic.region.can_reach(Region.pierre_store)
         if amount < 40000:
             return shipping_rule & seed_rules
 
diff --git a/worlds/stardew_valley/logic/shipping_logic.py b/worlds/stardew_valley/logic/shipping_logic.py
index 8d545e219627..e9f2258172e6 100644
--- a/worlds/stardew_valley/logic/shipping_logic.py
+++ b/worlds/stardew_valley/logic/shipping_logic.py
@@ -11,7 +11,6 @@
 from ..options import ExcludeGingerIsland, Shipsanity
 from ..options import SpecialOrderLocations
 from ..stardew_rule import StardewRule
-from ..strings.ap_names.event_names import Event
 from ..strings.building_names import Building
 
 
@@ -29,7 +28,7 @@ def can_use_shipping_bin(self) -> StardewRule:
 
     @cache_self1
     def can_ship(self, item: str) -> StardewRule:
-        return self.logic.received(Event.can_ship_items) & self.logic.has(item)
+        return self.logic.shipping.can_use_shipping_bin & self.logic.has(item)
 
     def can_ship_everything(self) -> StardewRule:
         shipsanity_prefix = "Shipsanity: "
@@ -49,7 +48,7 @@ def can_ship_everything(self) -> StardewRule:
 
     def can_ship_everything_in_slot(self, all_location_names_in_slot: List[str]) -> StardewRule:
         if self.options.shipsanity == Shipsanity.option_none:
-            return self.can_ship_everything()
+            return self.logic.shipping.can_ship_everything()
 
         rules = [self.logic.building.has_building(Building.shipping_bin)]
 
diff --git a/worlds/stardew_valley/logic/special_order_logic.py b/worlds/stardew_valley/logic/special_order_logic.py
index 65497df477b8..8bcd78d7d26e 100644
--- a/worlds/stardew_valley/logic/special_order_logic.py
+++ b/worlds/stardew_valley/logic/special_order_logic.py
@@ -21,7 +21,6 @@
 from ..content.vanilla.qi_board import qi_board_content_pack
 from ..stardew_rule import StardewRule, Has, false_
 from ..strings.animal_product_names import AnimalProduct
-from ..strings.ap_names.event_names import Event
 from ..strings.ap_names.transport_names import Transportation
 from ..strings.artisan_good_names import ArtisanGood
 from ..strings.crop_names import Vegetable, Fruit
@@ -61,7 +60,7 @@ def initialize_rules(self):
             SpecialOrder.gifts_for_george: self.logic.season.has(Season.spring) & self.logic.has(Forageable.leek),
             SpecialOrder.fragments_of_the_past: self.logic.monster.can_kill(Monster.skeleton),
             SpecialOrder.gus_famous_omelet: self.logic.has(AnimalProduct.any_egg),
-            SpecialOrder.crop_order: self.logic.ability.can_farm_perfectly() & self.logic.received(Event.can_ship_items),
+            SpecialOrder.crop_order: self.logic.ability.can_farm_perfectly() & self.logic.shipping.can_use_shipping_bin,
             SpecialOrder.community_cleanup: self.logic.skill.can_crab_pot,
             SpecialOrder.the_strong_stuff: self.logic.has(ArtisanGood.specific_juice(Vegetable.potato)),
             SpecialOrder.pierres_prime_produce: self.logic.ability.can_farm_perfectly(),
@@ -94,12 +93,12 @@ def initialize_rules(self):
             self.update_rules({
                 SpecialOrder.qis_crop: self.logic.ability.can_farm_perfectly() & self.logic.region.can_reach(Region.greenhouse) &
                                        self.logic.region.can_reach(Region.island_west) & self.logic.skill.has_total_level(50) &
-                                       self.logic.has(Machine.seed_maker) & self.logic.received(Event.can_ship_items),
+                                       self.logic.has(Machine.seed_maker) & self.logic.shipping.can_use_shipping_bin,
                 SpecialOrder.lets_play_a_game: self.logic.arcade.has_junimo_kart_max_level(),
                 SpecialOrder.four_precious_stones: self.logic.time.has_lived_max_months & self.logic.has("Prismatic Shard") &
                                                    self.logic.ability.can_mine_perfectly_in_the_skull_cavern(),
                 SpecialOrder.qis_hungry_challenge: self.logic.ability.can_mine_perfectly_in_the_skull_cavern(),
-                SpecialOrder.qis_cuisine: self.logic.cooking.can_cook() & self.logic.received(Event.can_ship_items) &
+                SpecialOrder.qis_cuisine: self.logic.cooking.can_cook() & self.logic.shipping.can_use_shipping_bin &
                                           (self.logic.money.can_spend_at(Region.saloon, 205000) | self.logic.money.can_spend_at(Region.pierre_store, 170000)),
                 SpecialOrder.qis_kindness: self.logic.relationship.can_give_loved_gifts_to_everyone(),
                 SpecialOrder.extended_family: self.logic.ability.can_fish_perfectly() & self.logic.has(Fish.angler) & self.logic.has(Fish.glacierfish) &
diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py
index eda2d4377e09..e7107e89f948 100644
--- a/worlds/stardew_valley/rules.py
+++ b/worlds/stardew_valley/rules.py
@@ -27,7 +27,6 @@
 from .stardew_rule.rule_explain import explain
 from .strings.ap_names.ap_option_names import OptionName
 from .strings.ap_names.community_upgrade_names import CommunityUpgrade
-from .strings.ap_names.event_names import Event
 from .strings.ap_names.mods.mod_items import SVEQuestItem, SVERunes
 from .strings.ap_names.transport_names import Transportation
 from .strings.artisan_good_names import ArtisanGood
@@ -251,7 +250,8 @@ def set_entrance_rules(logic: StardewLogic, multiworld, player, world_options: S
     set_entrance_rule(multiworld, player, Entrance.enter_witch_warp_cave, logic.quest.has_dark_talisman() | (logic.mod.magic.can_blink()))
     set_entrance_rule(multiworld, player, Entrance.enter_witch_hut, (logic.has(ArtisanGood.void_mayonnaise) | logic.mod.magic.can_blink()))
     set_entrance_rule(multiworld, player, Entrance.enter_mutant_bug_lair,
-                      (logic.received(Event.start_dark_talisman_quest) & logic.relationship.can_meet(NPC.krobus)) | logic.mod.magic.can_blink())
+                      (logic.wallet.has_rusty_key() & logic.region.can_reach(Region.railroad) & logic.relationship.can_meet(
+                          NPC.krobus)) | logic.mod.magic.can_blink())
     set_entrance_rule(multiworld, player, Entrance.enter_casino, logic.quest.has_club_card())
 
     set_bedroom_entrance_rules(logic, multiworld, player, world_options)
@@ -307,8 +307,7 @@ def set_mines_floor_entrance_rules(logic, multiworld, player):
         rule = logic.mine.has_mine_elevator_to_floor(floor - 10)
         if floor == 5 or floor == 45 or floor == 85:
             rule = rule & logic.mine.can_progress_in_the_mines_from_floor(floor)
-        entrance = multiworld.get_entrance(dig_to_mines_floor(floor), player)
-        MultiWorldRules.set_rule(entrance, rule)
+        set_entrance_rule(multiworld, player, dig_to_mines_floor(floor), rule)
 
 
 def set_skull_cavern_floor_entrance_rules(logic, multiworld, player):
@@ -316,8 +315,7 @@ def set_skull_cavern_floor_entrance_rules(logic, multiworld, player):
         rule = logic.mod.elevator.has_skull_cavern_elevator_to_floor(floor - 25)
         if floor == 25 or floor == 75 or floor == 125:
             rule = rule & logic.mine.can_progress_in_the_skull_cavern_from_floor(floor)
-        entrance = multiworld.get_entrance(dig_to_skull_floor(floor), player)
-        MultiWorldRules.set_rule(entrance, rule)
+        set_entrance_rule(multiworld, player, dig_to_skull_floor(floor), rule)
 
 
 def set_blacksmith_entrance_rules(logic, multiworld, player):
@@ -346,9 +344,8 @@ def set_skill_entrance_rules(logic, multiworld, player, world_options: StardewVa
 
 
 def set_blacksmith_upgrade_rule(logic, multiworld, player, entrance_name: str, item_name: str, tool_material: str):
-    material_entrance = multiworld.get_entrance(entrance_name, player)
     upgrade_rule = logic.has(item_name) & logic.money.can_spend(tool_upgrade_prices[tool_material])
-    MultiWorldRules.set_rule(material_entrance, upgrade_rule)
+    set_entrance_rule(multiworld, player, entrance_name, upgrade_rule)
 
 
 def set_festival_entrance_rules(logic, multiworld, player):
@@ -880,25 +877,19 @@ def set_traveling_merchant_day_rules(logic: StardewLogic, multiworld: MultiWorld
 
 
 def set_arcade_machine_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
-    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_junimo_kart, player),
-                             logic.received(Wallet.skull_key))
+    play_junimo_kart_rule = logic.received(Wallet.skull_key)
+
     if world_options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling:
+        set_entrance_rule(multiworld, player, Entrance.play_junimo_kart, play_junimo_kart_rule)
         return
 
-    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_junimo_kart, player),
-                             logic.has("Junimo Kart Small Buff"))
-    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_junimo_kart_2, player),
-                             logic.has("Junimo Kart Medium Buff"))
-    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_junimo_kart_3, player),
-                             logic.has("Junimo Kart Big Buff"))
-    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_junimo_kart_4, player),
-                             logic.has("Junimo Kart Max Buff"))
-    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_journey_of_the_prairie_king, player),
-                             logic.has("JotPK Small Buff"))
-    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_jotpk_world_2, player),
-                             logic.has("JotPK Medium Buff"))
-    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_jotpk_world_3, player),
-                             logic.has("JotPK Big Buff"))
+    set_entrance_rule(multiworld, player, Entrance.play_junimo_kart, play_junimo_kart_rule & logic.has("Junimo Kart Small Buff"))
+    set_entrance_rule(multiworld, player, Entrance.reach_junimo_kart_2, logic.has("Junimo Kart Medium Buff"))
+    set_entrance_rule(multiworld, player, Entrance.reach_junimo_kart_3, logic.has("Junimo Kart Big Buff"))
+    set_entrance_rule(multiworld, player, Entrance.reach_junimo_kart_4, logic.has("Junimo Kart Max Buff"))
+    set_entrance_rule(multiworld, player, Entrance.play_journey_of_the_prairie_king, logic.has("JotPK Small Buff"))
+    set_entrance_rule(multiworld, player, Entrance.reach_jotpk_world_2, logic.has("JotPK Medium Buff"))
+    set_entrance_rule(multiworld, player, Entrance.reach_jotpk_world_3, logic.has("JotPK Big Buff"))
     MultiWorldRules.add_rule(multiworld.get_location("Journey of the Prairie King Victory", player),
                              logic.has("JotPK Max Buff"))
 
@@ -1049,6 +1040,7 @@ def set_entrance_rule(multiworld, player, entrance: str, rule: StardewRule):
         potentially_required_regions = look_for_indirect_connection(rule)
         if potentially_required_regions:
             for region in potentially_required_regions:
+                logger.debug(f"Registering indirect condition for {region} -> {entrance}")
                 multiworld.register_indirect_condition(multiworld.get_region(region, player), multiworld.get_entrance(entrance, player))
 
         MultiWorldRules.set_rule(multiworld.get_entrance(entrance, player), rule)
diff --git a/worlds/stardew_valley/stardew_rule/rule_explain.py b/worlds/stardew_valley/stardew_rule/rule_explain.py
index a9767c7b72d5..2e2b9c959d7f 100644
--- a/worlds/stardew_valley/stardew_rule/rule_explain.py
+++ b/worlds/stardew_valley/stardew_rule/rule_explain.py
@@ -4,7 +4,7 @@
 from functools import cached_property, singledispatch
 from typing import Iterable, Set, Tuple, List, Optional
 
-from BaseClasses import CollectionState
+from BaseClasses import CollectionState, Location, Entrance
 from worlds.generic.Rules import CollectionRule
 from . import StardewRule, AggregatingStardewRule, Count, Has, TotalReceived, Received, Reach, true_
 
@@ -12,10 +12,10 @@
 @dataclass
 class RuleExplanation:
     rule: StardewRule
-    state: CollectionState
+    state: CollectionState = field(repr=False, hash=False)
     expected: bool
     sub_rules: Iterable[StardewRule] = field(default_factory=list)
-    explored_rules_key: Set[Tuple[str, str]] = field(default_factory=set)
+    explored_rules_key: Set[Tuple[str, str]] = field(default_factory=set, repr=False, hash=False)
     current_rule_explored: bool = False
 
     def __post_init__(self):
@@ -38,13 +38,6 @@ def __str__(self, depth=0):
                                                       if i.result is not self.expected else i.summary(depth + 1)
                                                       for i in sorted(self.explained_sub_rules, key=lambda x: x.result))
 
-    def __repr__(self, depth=0):
-        if not self.sub_rules:
-            return self.summary(depth)
-
-        return self.summary(depth) + "\n" + "\n".join(i.__repr__(depth + 1)
-                                                      for i in sorted(self.explained_sub_rules, key=lambda x: x.result))
-
     @cached_property
     def result(self) -> bool:
         try:
@@ -134,6 +127,10 @@ def _(rule: Reach, state: CollectionState, expected: bool, explored_spots: Set[T
                 access_rules = [Reach(spot.parent_region.name, "Region", rule.player)]
             else:
                 access_rules = [spot.access_rule, Reach(spot.parent_region.name, "Region", rule.player)]
+        elif spot.access_rule == Location.access_rule:
+            # Sometime locations just don't have an access rule and all the relevant logic is in the parent region.
+            access_rules = [Reach(spot.parent_region.name, "Region", rule.player)]
+
 
     elif rule.resolution_hint == 'Entrance':
         spot = state.multiworld.get_entrance(rule.spot, rule.player)
@@ -143,6 +140,9 @@ def _(rule: Reach, state: CollectionState, expected: bool, explored_spots: Set[T
                 access_rules = [Reach(spot.parent_region.name, "Region", rule.player)]
             else:
                 access_rules = [spot.access_rule, Reach(spot.parent_region.name, "Region", rule.player)]
+        elif spot.access_rule == Entrance.access_rule:
+            # Sometime entrances just don't have an access rule and all the relevant logic is in the parent region.
+            access_rules = [Reach(spot.parent_region.name, "Region", rule.player)]
 
     else:
         spot = state.multiworld.get_region(rule.spot, rule.player)
diff --git a/worlds/stardew_valley/strings/ap_names/event_names.py b/worlds/stardew_valley/strings/ap_names/event_names.py
index 88f9715abc65..449bb6720964 100644
--- a/worlds/stardew_valley/strings/ap_names/event_names.py
+++ b/worlds/stardew_valley/strings/ap_names/event_names.py
@@ -8,10 +8,6 @@ def event(name: str):
 
 class Event:
     victory = event("Victory")
-    can_construct_buildings = event("Can Construct Buildings")
-    start_dark_talisman_quest = event("Start Dark Talisman Quest")
-    can_ship_items = event("Can Ship Items")
-    can_shop_at_pierre = event("Can Shop At Pierre's")
     spring_farming = event("Spring Farming")
     summer_farming = event("Summer Farming")
     fall_farming = event("Fall Farming")
diff --git a/worlds/stardew_valley/test/rules/TestBuildings.py b/worlds/stardew_valley/test/rules/TestBuildings.py
index 2c276d8b5cbe..cacd6ea381b6 100644
--- a/worlds/stardew_valley/test/rules/TestBuildings.py
+++ b/worlds/stardew_valley/test/rules/TestBuildings.py
@@ -23,10 +23,6 @@ def test_big_coop_blueprint(self):
         self.assertFalse(big_coop_blueprint_rule(self.multiworld.state),
                          f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}")
 
-        self.multiworld.state.collect(self.create_item("Can Construct Buildings"), prevent_sweep=True)
-        self.assertFalse(big_coop_blueprint_rule(self.multiworld.state),
-                         f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}")
-
         self.multiworld.state.collect(self.create_item("Progressive Coop"), prevent_sweep=False)
         self.assertTrue(big_coop_blueprint_rule(self.multiworld.state),
                         f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}")
@@ -35,7 +31,6 @@ def test_deluxe_coop_blueprint(self):
         self.assertFalse(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state))
 
         self.collect_lots_of_money()
-        self.multiworld.state.collect(self.create_item("Can Construct Buildings"), prevent_sweep=True)
         self.assertFalse(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state))
 
         self.multiworld.state.collect(self.create_item("Progressive Coop"), prevent_sweep=True)
@@ -53,10 +48,6 @@ def test_big_shed_blueprint(self):
         self.assertFalse(big_shed_rule(self.multiworld.state),
                          f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}")
 
-        self.multiworld.state.collect(self.create_item("Can Construct Buildings"), prevent_sweep=True)
-        self.assertFalse(big_shed_rule(self.multiworld.state),
-                         f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}")
-
         self.multiworld.state.collect(self.create_item("Progressive Shed"), prevent_sweep=True)
         self.assertTrue(big_shed_rule(self.multiworld.state),
                         f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}")

From 1454bacfddca12cf324198e27963f063dcc9c12e Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Fri, 29 Nov 2024 14:43:33 -0500
Subject: [PATCH 076/381] HK: better error messaging for charm plando (#3907)

---
 worlds/hk/Options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py
index fc8eae1c0aa3..e17abbb7ae47 100644
--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -300,7 +300,7 @@ class PlandoCharmCosts(OptionDict):
     display_name = "Charm Notch Cost Plando"
     valid_keys = frozenset(charm_names)
     schema = Schema({
-        Optional(name): And(int, lambda n: 6 >= n >= 0) for name in charm_names
+        Optional(name): And(int, lambda n: 6 >= n >= 0, error="Charm costs must be integers in the range 0-6.") for name in charm_names
         })
 
     def get_costs(self, charm_costs: typing.List[int]) -> typing.List[int]:

From a5231a27cc1d25e55f58fb847d3148a8db346523 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:45:10 +0100
Subject: [PATCH 077/381] Yacht Dice: Mark YachtWeights.py as
 "linguist-generated" (#3898)

This means its diff will be collapsed by default on PRs that change it, because it is an "auto generated" file that does not need to be looked at by reviewers
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 537a05f68b67..5ab537933405 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 worlds/blasphemous/region_data.py linguist-generated=true
+worlds/yachtdice/YachtWeights.py linguist-generated=true

From b605fb10323c8d1ace0465ece41db2b0eb2d0b2e Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:45:44 +0100
Subject: [PATCH 078/381] The Witness: Make Elevators Come To You an OptionSet
 (#4000)

* Split elevators come to you

* .

* unit test

* mypy stuff

* Fine. I'll fix the fcking commented out code. Happy?

* ruff

* """""Backwards compatibility"""""

* ruff

* make it look better

* #

* fix presets

* fix a unit test

* Make that explicit in the code

* Improve description
---
 .../Door_Shuffle/Elevators_Come_To_You.txt    | 11 ---
 worlds/witness/data/utils.py                  |  4 --
 worlds/witness/options.py                     | 42 ++++++++++--
 worlds/witness/player_logic.py                | 26 ++++++-
 worlds/witness/presets.py                     |  9 ++-
 worlds/witness/test/test_auto_elevators.py    | 68 +++++++------------
 .../witness/test/test_roll_other_options.py   |  3 +-
 7 files changed, 94 insertions(+), 69 deletions(-)
 delete mode 100644 worlds/witness/data/settings/Door_Shuffle/Elevators_Come_To_You.txt

diff --git a/worlds/witness/data/settings/Door_Shuffle/Elevators_Come_To_You.txt b/worlds/witness/data/settings/Door_Shuffle/Elevators_Come_To_You.txt
deleted file mode 100644
index 78d245f9f0b5..000000000000
--- a/worlds/witness/data/settings/Door_Shuffle/Elevators_Come_To_You.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-New Connections:
-Quarry - Quarry Elevator - TrueOneWay
-Outside Quarry - Quarry Elevator - TrueOneWay
-Outside Bunker - Bunker Elevator - TrueOneWay
-Outside Swamp - Swamp Long Bridge - TrueOneWay
-Swamp Near Boat - Swamp Long Bridge - TrueOneWay
-Town Red Rooftop - Town Maze Rooftop - TrueOneWay
-
-
-Requirement Changes:
-0x035DE - 0x17E2B - True
\ No newline at end of file
diff --git a/worlds/witness/data/utils.py b/worlds/witness/data/utils.py
index 737daff70fae..190c00dc283b 100644
--- a/worlds/witness/data/utils.py
+++ b/worlds/witness/data/utils.py
@@ -204,10 +204,6 @@ def get_caves_except_path_to_challenge_exclusion_list() -> List[str]:
     return get_adjustment_file("settings/Exclusions/Caves_Except_Path_To_Challenge.txt")
 
 
-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")
 
diff --git a/worlds/witness/options.py b/worlds/witness/options.py
index bb935388e3c7..b5c15e242f10 100644
--- a/worlds/witness/options.py
+++ b/worlds/witness/options.py
@@ -2,7 +2,18 @@
 
 from schema import And, Schema
 
-from Options import Choice, DefaultOnToggle, OptionDict, OptionGroup, PerGameCommonOptions, Range, Toggle, Visibility
+from Options import (
+    Choice,
+    DefaultOnToggle,
+    OptionDict,
+    OptionError,
+    OptionGroup,
+    OptionSet,
+    PerGameCommonOptions,
+    Range,
+    Toggle,
+    Visibility,
+)
 
 from .data import static_logic as static_witness_logic
 from .data.item_definition_classes import ItemCategory, WeightedItemDefinition
@@ -294,12 +305,33 @@ class ChallengeLasers(Range):
     default = 11
 
 
-class ElevatorsComeToYou(Toggle):
+class ElevatorsComeToYou(OptionSet):
     """
-    If on, the Quarry Elevator, Bunker Elevator and Swamp Long Bridge will "come to you" if you approach them.
-    This does actually affect logic as it allows unintended backwards / early access into these areas.
+    In vanilla, some bridges/elevators come to you if you walk up to them when they are not currently there.
+    However, there are some that don't. Notably, this prevents Quarry Elevator from being a logical access method into Quarry, because you can send it away without riding ot and then permanently be locked out of using it.
+
+    This option allows you to change specific elevators/bridges to "come to you" as well.
+
+    - Quarry Elevator: Makes the Quarry Elevator come down when you approach it from lower Quarry and back up when you approach it from above
+    - Swamp Long Bridge: Rotates the side you approach it from towards you, but also rotates the other side away
+    - Bunker Elevator: Makes the Bunker Elevator come to any floor that you approach it from, meaning it can be accessed from the roof immediately
     """
-    display_name = "All Bridges & Elevators come to you"
+
+    # Used to be a toggle
+    @classmethod
+    def from_text(cls, text: str):
+        if text.lower() in {"off", "0", "false", "none", "null", "no"}:
+            raise OptionError('elevators_come_to_you is an OptionSet now. The equivalent of "false" is {}')
+        if text.lower() in {"on", "1", "true", "yes"}:
+            raise OptionError(
+                f'elevators_come_to_you is an OptionSet now. The equivalent of "true" is {set(cls.valid_keys)}'
+            )
+        return super().from_text(text)
+
+    display_name = "Elevators come to you"
+
+    valid_keys = frozenset({"Quarry Elevator", "Swamp Long Bridge", "Bunker Elevator"})
+    default = frozenset({"Quarry Elevator"})
 
 
 class TrapPercentage(Range):
diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index fd86679844a7..ec4ea066e579 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -34,7 +34,6 @@
     get_discard_exclusion_list,
     get_early_caves_list,
     get_early_caves_start_list,
-    get_elevators_come_to_you,
     get_entity_hunt,
     get_ep_all_individual,
     get_ep_easy,
@@ -626,8 +625,29 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None:
         if world.options.early_caves == "add_to_pool" and not remote_doors:
             adjustment_linesets_in_order.append(get_early_caves_list())
 
-        if world.options.elevators_come_to_you:
-            adjustment_linesets_in_order.append(get_elevators_come_to_you())
+        if "Quarry Elevator" in world.options.elevators_come_to_you:
+            adjustment_linesets_in_order.append([
+                "New Connections:",
+                "Quarry - Quarry Elevator - TrueOneWay",
+                "Outside Quarry - Quarry Elevator - TrueOneWay",
+            ])
+        if "Bunker Elevator" in world.options.elevators_come_to_you:
+            adjustment_linesets_in_order.append([
+                "New Connections:",
+                "Outside Bunker - Bunker Elevator - TrueOneWay",
+            ])
+        if "Swamp Long Bridge" in world.options.elevators_come_to_you:
+            adjustment_linesets_in_order.append([
+                "New Connections:",
+                "Outside Swamp - Swamp Long Bridge - TrueOneWay",
+                "Swamp Near Boat - Swamp Long Bridge - TrueOneWay",
+                "Requirement Changes:",
+                "0x035DE - 0x17E2B - True",  # Swamp Purple Sand Bottom EP
+            ])
+        # if "Town Maze Rooftop Bridge" in world.options.elevators_come_to_you:
+        #     adjustment_linesets_in_order.append([
+        #         "New Connections:"
+        #         "Town Red Rooftop - Town Maze Rooftop - TrueOneWay"
 
         if world.options.victory_condition == "panel_hunt":
             adjustment_linesets_in_order.append(get_entity_hunt())
diff --git a/worlds/witness/presets.py b/worlds/witness/presets.py
index 8993048065f4..687d74f771cb 100644
--- a/worlds/witness/presets.py
+++ b/worlds/witness/presets.py
@@ -35,7 +35,8 @@
         "challenge_lasers": 11,
 
         "early_caves": EarlyCaves.option_off,
-        "elevators_come_to_you": False,
+
+        "elevators_come_to_you": ElevatorsComeToYou.default,
 
         "trap_percentage": TrapPercentage.default,
         "puzzle_skip_amount": PuzzleSkipAmount.default,
@@ -73,7 +74,8 @@
         "challenge_lasers": 9,
 
         "early_caves": EarlyCaves.option_off,
-        "elevators_come_to_you": False,
+
+        "elevators_come_to_you": ElevatorsComeToYou.default,
 
         "trap_percentage": TrapPercentage.default,
         "puzzle_skip_amount": 15,
@@ -111,7 +113,8 @@
         "challenge_lasers": 9,
 
         "early_caves": EarlyCaves.option_off,
-        "elevators_come_to_you": True,
+
+        "elevators_come_to_you": ElevatorsComeToYou.valid_keys,
 
         "trap_percentage": TrapPercentage.default,
         "puzzle_skip_amount": 15,
diff --git a/worlds/witness/test/test_auto_elevators.py b/worlds/witness/test/test_auto_elevators.py
index 16b1b5a56d37..f91943e85577 100644
--- a/worlds/witness/test/test_auto_elevators.py
+++ b/worlds/witness/test/test_auto_elevators.py
@@ -1,49 +1,25 @@
-from ..test import WitnessMultiworldTestBase, WitnessTestBase
-
-
-class TestElevatorsComeToYou(WitnessTestBase):
-    options = {
-        "elevators_come_to_you": True,
-        "shuffle_doors": "mixed",
-        "shuffle_symbols": False,
-    }
-
-    def test_bunker_laser(self) -> None:
-        """
-        In elevators_come_to_you, Bunker can be entered from the back.
-        This means that you can access the laser with just Bunker Elevator Control (Panel).
-        It also means that you can, for example, access UV Room with the Control and the Elevator Room Entry Door.
-        """
-
-        self.assertFalse(self.multiworld.state.can_reach("Bunker Laser Panel", "Location", self.player))
-
-        self.collect_by_name("Bunker Elevator Control (Panel)")
-
-        self.assertTrue(self.multiworld.state.can_reach("Bunker Laser Panel", "Location", self.player))
-        self.assertFalse(self.multiworld.state.can_reach("Bunker UV Room 2", "Location", self.player))
-
-        self.collect_by_name("Bunker Elevator Room Entry (Door)")
-        self.collect_by_name("Bunker Drop-Down Door Controls (Panel)")
-
-        self.assertTrue(self.multiworld.state.can_reach("Bunker UV Room 2", "Location", self.player))
+from ..test import WitnessMultiworldTestBase
 
 
 class TestElevatorsComeToYouBleed(WitnessMultiworldTestBase):
     options_per_world = [
         {
-            "elevators_come_to_you": False,
+            "elevators_come_to_you": {},
         },
         {
-            "elevators_come_to_you": True,
+            "elevators_come_to_you": {"Quarry Elevator", "Swamp Long Bridge", "Bunker Elevator"},
         },
         {
-            "elevators_come_to_you": False,
+            "elevators_come_to_you": {}
         },
     ]
 
     common_options = {
         "shuffle_symbols": False,
         "shuffle_doors": "panels",
+        "shuffle_boat": True,
+        "shuffle_EPs": "individual",
+        "obelisk_keys": False,
     }
 
     def test_correct_access_per_player(self) -> None:
@@ -53,14 +29,22 @@ def test_correct_access_per_player(self) -> None:
         (This is essentially a "does connection info bleed over" test).
         """
 
-        self.assertFalse(self.multiworld.state.can_reach("Bunker Laser Panel", "Location", 1))
-        self.assertFalse(self.multiworld.state.can_reach("Bunker Laser Panel", "Location", 2))
-        self.assertFalse(self.multiworld.state.can_reach("Bunker Laser Panel", "Location", 3))
-
-        self.collect_by_name(["Bunker Elevator Control (Panel)"], 1)
-        self.collect_by_name(["Bunker Elevator Control (Panel)"], 2)
-        self.collect_by_name(["Bunker Elevator Control (Panel)"], 3)
-
-        self.assertFalse(self.multiworld.state.can_reach("Bunker Laser Panel", "Location", 1))
-        self.assertTrue(self.multiworld.state.can_reach("Bunker Laser Panel", "Location", 2))
-        self.assertFalse(self.multiworld.state.can_reach("Bunker Laser Panel", "Location", 3))
+        combinations = [
+            ("Quarry Elevator Control (Panel)", "Quarry Boathouse Intro Left"),
+            ("Swamp Long Bridge (Panel)", "Swamp Long Bridge Side EP"),
+            ("Bunker Elevator Control (Panel)", "Bunker Laser Panel"),
+        ]
+
+        for item, location in combinations:
+            with self.subTest(f"Test that {item} only locks {location} for player 2"):
+                self.assertFalse(self.multiworld.state.can_reach_location(location, 1))
+                self.assertFalse(self.multiworld.state.can_reach_location(location, 2))
+                self.assertFalse(self.multiworld.state.can_reach_location(location, 3))
+
+                self.collect_by_name(item, 1)
+                self.collect_by_name(item, 2)
+                self.collect_by_name(item, 3)
+
+                self.assertFalse(self.multiworld.state.can_reach_location(location, 1))
+                self.assertTrue(self.multiworld.state.can_reach_location(location, 2))
+                self.assertFalse(self.multiworld.state.can_reach_location(location, 3))
diff --git a/worlds/witness/test/test_roll_other_options.py b/worlds/witness/test/test_roll_other_options.py
index 7473716e06e6..0429b097eac3 100644
--- a/worlds/witness/test/test_roll_other_options.py
+++ b/worlds/witness/test/test_roll_other_options.py
@@ -1,3 +1,4 @@
+from ..options import ElevatorsComeToYou
 from ..test import WitnessTestBase
 
 # These are just some random options combinations, just to catch whether I broke anything obvious
@@ -19,7 +20,7 @@ class TestExpertNonRandomizedEPs(WitnessTestBase):
 class TestVanillaAutoElevatorsPanels(WitnessTestBase):
     options = {
         "puzzle_randomization": "none",
-        "elevators_come_to_you": True,
+        "elevators_come_to_you": ElevatorsComeToYou.valid_keys - ElevatorsComeToYou.default,  # Opposite of default
         "shuffle_doors": "panels",
         "victory_condition": "mountain_box_short",
         "early_caves": True,

From 77d35b95e242fa15c60739262938d70be27fa8d7 Mon Sep 17 00:00:00 2001
From: Ehseezed <97066152+Ehseezed@users.noreply.github.com>
Date: Fri, 29 Nov 2024 13:46:12 -0600
Subject: [PATCH 079/381] Timespinner: Update AP to have parity with standalone
 options (#3805)

---
 worlds/timespinner/Items.py           |  8 ++++++--
 worlds/timespinner/Locations.py       |  4 ++--
 worlds/timespinner/LogicExtensions.py |  3 +++
 worlds/timespinner/Options.py         | 20 +++++++++++++++++---
 worlds/timespinner/__init__.py        | 10 ++++++++++
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/worlds/timespinner/Items.py b/worlds/timespinner/Items.py
index 45c67c254736..3beead95153b 100644
--- a/worlds/timespinner/Items.py
+++ b/worlds/timespinner/Items.py
@@ -138,7 +138,7 @@ class ItemData(NamedTuple):
     'Elevator Keycard': ItemData('Relic', 1337125, progression=True),
     'Jewelry Box': ItemData('Relic', 1337126, useful=True),
     'Goddess Brooch': ItemData('Relic', 1337127),
-    'Wyrm Brooch': ItemData('Relic', 1337128), 	
+    'Wyrm Brooch': ItemData('Relic', 1337128),
     'Greed Brooch': ItemData('Relic', 1337129),
     'Eternal Brooch': ItemData('Relic', 1337130),
     'Blue Orb': ItemData('Orb Melee', 1337131),
@@ -199,7 +199,11 @@ class ItemData(NamedTuple):
     'Chaos Trap': ItemData('Trap', 1337186, 0, trap=True),
     'Neurotoxin Trap': ItemData('Trap', 1337187, 0, trap=True),
     'Bee Trap': ItemData('Trap', 1337188, 0, trap=True),
-    # 1337189 - 1337248 Reserved
+    'Laser Access A': ItemData('Relic', 1337189, progression=True),
+    'Laser Access I': ItemData('Relic', 1337191, progression=True),
+    'Laser Access M': ItemData('Relic', 1337192, progression=True),
+    'Throw Stun Trap': ItemData('Trap', 1337193, 0, trap=True),
+    # 1337194 - 1337248 Reserved
     'Max Sand': ItemData('Stat', 1337249, 14)
 }
 
diff --git a/worlds/timespinner/Locations.py b/worlds/timespinner/Locations.py
index 2423e06bb010..93ac6ccb98c7 100644
--- a/worlds/timespinner/Locations.py
+++ b/worlds/timespinner/Locations.py
@@ -71,8 +71,8 @@ def get_location_datas(player: Optional[int], options: Optional[TimespinnerOptio
         LocationData('Skeleton Shaft', 'Sealed Caves (Xarion): Skeleton',  1337044),
         LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Shroom jump room',  1337045, logic.has_timestop),
         LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Double shroom room',  1337046),
-        LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Mini jackpot room',  1337047, logic.has_forwarddash_doublejump),
-        LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Below mini jackpot room',  1337048),
+        LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Jacksquat room',  1337047, logic.has_forwarddash_doublejump),
+        LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Below Jacksquat room',  1337048),
         LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Secret room',  1337049, logic.can_break_walls),
         LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Bottom left room',  1337050),
         LocationData('Sealed Caves (Xarion)', 'Sealed Caves (Xarion): Last chance before Xarion',  1337051, logic.has_doublejump),
diff --git a/worlds/timespinner/LogicExtensions.py b/worlds/timespinner/LogicExtensions.py
index 6c9cb3f684a0..2a0a358737f7 100644
--- a/worlds/timespinner/LogicExtensions.py
+++ b/worlds/timespinner/LogicExtensions.py
@@ -22,6 +22,7 @@ def __init__(self, player: int, options: Optional[TimespinnerOptions],
         self.flag_specific_keycards = bool(options and options.specific_keycards)
         self.flag_eye_spy = bool(options and options.eye_spy)
         self.flag_unchained_keys = bool(options and options.unchained_keys)
+        self.flag_prism_break = bool(options and options.prism_break)
 
         if precalculated_weights:
             if self.flag_unchained_keys:
@@ -92,6 +93,8 @@ def can_break_walls(self, state: CollectionState) -> bool:
             return True
 
     def can_kill_all_3_bosses(self, state: CollectionState) -> bool:
+        if self.flag_prism_break:
+            return state.has_all({'Laser Access M', 'Laser Access I', 'Laser Access A'}, self.player)
         return state.has_all({'Killed Maw', 'Killed Twins', 'Killed Aelana'}, self.player)
 
     def has_teleport(self, state: CollectionState) -> bool:
diff --git a/worlds/timespinner/Options.py b/worlds/timespinner/Options.py
index c06dd36797fd..72f2d8b35abf 100644
--- a/worlds/timespinner/Options.py
+++ b/worlds/timespinner/Options.py
@@ -180,12 +180,19 @@ class DamageRandoOverrides(OptionDict):
     }
 
 class HpCap(Range):
-    "Sets the number that Lunais's HP maxes out at."
+    """Sets the number that Lunais's HP maxes out at."""
     display_name = "HP Cap"
     range_start = 1
     range_end = 999
     default = 999
 
+class AuraCap(Range):
+    """Sets the maximum Aura Lunais is allowed to have. Level 1 is 80. Djinn Inferno costs 45."""
+    display_name = "Aura Cap"
+    range_start = 45
+    range_end = 999
+    default = 999
+
 class LevelCap(Range):
     """Sets the max level Lunais can achieve."""
     display_name = "Level Cap"
@@ -359,13 +366,18 @@ class TrapChance(Range):
 class Traps(OptionList):
     """List of traps that may be in the item pool to find"""
     display_name = "Traps Types"
-    valid_keys = { "Meteor Sparrow Trap", "Poison Trap", "Chaos Trap", "Neurotoxin Trap", "Bee Trap" }
-    default = [ "Meteor Sparrow Trap", "Poison Trap", "Chaos Trap", "Neurotoxin Trap", "Bee Trap" ]
+    valid_keys = { "Meteor Sparrow Trap", "Poison Trap", "Chaos Trap", "Neurotoxin Trap", "Bee Trap", "Throw Stun Trap" }
+    default = [ "Meteor Sparrow Trap", "Poison Trap", "Chaos Trap", "Neurotoxin Trap", "Bee Trap", "Throw Stun Trap" ]
 
 class PresentAccessWithWheelAndSpindle(Toggle):
     """When inverted, allows using the refugee camp warp when both the Timespinner Wheel and Spindle is acquired."""
     display_name = "Back to the future"
 
+class PrismBreak(Toggle):
+    """Adds 3 Laser Access items to the item pool to remove the lasers blocking the military hangar area
+    instead of needing to beat the Golden Idol, Aelana, and The Maw."""
+    display_name = "Prism Break"
+
 @dataclass
 class TimespinnerOptions(PerGameCommonOptions, DeathLinkMixin):
     start_with_jewelry_box: StartWithJewelryBox
@@ -383,6 +395,7 @@ class TimespinnerOptions(PerGameCommonOptions, DeathLinkMixin):
     damage_rando: DamageRando
     damage_rando_overrides: DamageRandoOverrides
     hp_cap: HpCap
+    aura_cap: AuraCap
     level_cap: LevelCap
     extra_earrings_xp: ExtraEarringsXP
     boss_healing: BossHealing
@@ -401,6 +414,7 @@ class TimespinnerOptions(PerGameCommonOptions, DeathLinkMixin):
     rising_tides_overrides: RisingTidesOverrides
     unchained_keys: UnchainedKeys
     back_to_the_future: PresentAccessWithWheelAndSpindle
+    prism_break: PrismBreak
     trap_chance: TrapChance
     traps: Traps
 
diff --git a/worlds/timespinner/__init__.py b/worlds/timespinner/__init__.py
index 72903bd5ffea..a2a5c7ce9c78 100644
--- a/worlds/timespinner/__init__.py
+++ b/worlds/timespinner/__init__.py
@@ -102,6 +102,7 @@ def fill_slot_data(self) -> Dict[str, object]:
             "DamageRando": self.options.damage_rando.value,
             "DamageRandoOverrides": self.options.damage_rando_overrides.value,
             "HpCap": self.options.hp_cap.value,
+            "AuraCap": self.options.aura_cap.value,
             "LevelCap": self.options.level_cap.value,
             "ExtraEarringsXP": self.options.extra_earrings_xp.value,
             "BossHealing": self.options.boss_healing.value,
@@ -119,6 +120,7 @@ def fill_slot_data(self) -> Dict[str, object]:
             "RisingTides": self.options.rising_tides.value,
             "UnchainedKeys": self.options.unchained_keys.value,
             "PresentAccessWithWheelAndSpindle": self.options.back_to_the_future.value,
+            "PrismBreak": self.options.prism_break.value,
             "Traps": self.options.traps.value,
             "DeathLink": self.options.death_link.value,
             "StinkyMaw": True,
@@ -224,6 +226,9 @@ def create_item(self, name: str) -> Item:
         elif name in {"Timeworn Warp Beacon", "Modern Warp Beacon", "Mysterious Warp Beacon"} \
                 and not self.options.unchained_keys:
             item.classification = ItemClassification.filler
+        elif name in {"Laser Access A", "Laser Access I", "Laser Access M"} \
+                and not self.options.prism_break:
+            item.classification = ItemClassification.filler
 
         return item
 
@@ -256,6 +261,11 @@ def get_excluded_items(self) -> Set[str]:
             excluded_items.add('Modern Warp Beacon')
             excluded_items.add('Mysterious Warp Beacon')
 
+        if not self.options.prism_break:
+            excluded_items.add('Laser Access A')
+            excluded_items.add('Laser Access I')
+            excluded_items.add('Laser Access M')
+
         for item in self.multiworld.precollected_items[self.player]:
             if item.name not in self.item_name_groups['UseItem']:
                 excluded_items.add(item.name)

From d7a0f4cb4c540c8c5045982d6e10968386ea7c39 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:49:36 +0100
Subject: [PATCH 080/381] CI: fix naming of windows build action (#4286)

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a5a2f52f3222..ab94326d8188 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ env:
 jobs:
   # build-release-macos: # LF volunteer
 
-  build-win-py310: # RCs will still be built and signed by hand
+  build-win: # RCs will still be built and signed by hand
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4

From b5343a36ff4c500905b537bbf297843578b7389e Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Fri, 29 Nov 2024 12:17:56 -0800
Subject: [PATCH 081/381] Core: fix settings API for removal of Python 3.8, 3.9
 (#4280)

* Core: fix settings API for removal of Python 3.8, 3.9

This is fixing 2 problems:
- The `World` class has the annotation:
  `settings: ClassVar[Optional["Group"]]`
  so `MyWorld.settings` should not raise an exception like it does for some worlds.
  With the `Optional` there, it looks like it should return `None` for the worlds that don't use it. So that's what I changed it to.

- `Group.update` had some code that required `typing.Union` instead of the Python 3.10 `|` for unions.

added unit test for this fix
added change in Zillion that I used to discover this problem and used it to test the test

* fix copy-pasted stuff

* tuple instead of set

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 settings.py                   | 10 ++++++++--
 test/general/test_settings.py | 16 ++++++++++++++++
 worlds/AutoWorld.py           |  5 ++++-
 worlds/zillion/__init__.py    |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 test/general/test_settings.py

diff --git a/settings.py b/settings.py
index 792770521459..ccd3458003c2 100644
--- a/settings.py
+++ b/settings.py
@@ -7,6 +7,7 @@
 import os.path
 import shutil
 import sys
+import types
 import typing
 import warnings
 from enum import IntEnum
@@ -162,8 +163,13 @@ def update(self, dct: Dict[str, Any]) -> None:
             else:
                 # assign value, try to upcast to type hint
                 annotation = self.get_type_hints().get(k, None)
-                candidates = [] if annotation is None else \
-                    typing.get_args(annotation) if typing.get_origin(annotation) is Union else [annotation]
+                candidates = (
+                    [] if annotation is None else (
+                        typing.get_args(annotation)
+                        if typing.get_origin(annotation) in (Union, types.UnionType)
+                        else [annotation]
+                    )
+                )
                 none_type = type(None)
                 for cls in candidates:
                     assert isinstance(cls, type), f"{self.__class__.__name__}.{k}: type {cls} not supported in settings"
diff --git a/test/general/test_settings.py b/test/general/test_settings.py
new file mode 100644
index 000000000000..165d7982b5fb
--- /dev/null
+++ b/test/general/test_settings.py
@@ -0,0 +1,16 @@
+from unittest import TestCase
+
+from settings import Group
+from worlds.AutoWorld import AutoWorldRegister
+
+
+class TestSettings(TestCase):
+    def test_settings_can_update(self) -> None:
+        """
+        Test that world settings can update.
+        """
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=game_name):
+                if world_type.settings is not None:
+                    assert isinstance(world_type.settings, Group)
+                    world_type.settings.update({})  # a previous bug had a crash in this call to update
diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py
index 3c4edc1b0c3b..ded8701d3b61 100644
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -33,7 +33,10 @@ def settings(cls) -> Any:  # actual type is defined in World
         # lazy loading + caching to minimize runtime cost
         if cls.__settings is None:
             from settings import get_settings
-            cls.__settings = get_settings()[cls.settings_key]
+            try:
+                cls.__settings = get_settings()[cls.settings_key]
+            except AttributeError:
+                return None
         return cls.__settings
 
     def __new__(mcs, name: str, bases: Tuple[type, ...], dct: Dict[str, Any]) -> AutoWorldRegister:
diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index d5e86bb33292..e689f2f55c58 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -47,7 +47,7 @@ class RomStart(str):
         """
 
     rom_file: RomFile = RomFile(RomFile.copy_to)
-    rom_start: typing.Union[RomStart, bool] = RomStart("retroarch")
+    rom_start: RomStart | bool = RomStart("retroarch")
 
 
 class ZillionWebWorld(WebWorld):

From 2fb59d39c93a6b5e36efe25d79c9d626b53139fe Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Fri, 29 Nov 2024 12:25:01 -0800
Subject: [PATCH 082/381] Zillion: use "new" settings api and cleaning (#3903)

* Zillion: use "new" settings api and cleaning

* python 3.10 typing update

* don't separate assignments of item link players
---
 worlds/zillion/__init__.py                    | 83 ++++++++++---------
 worlds/zillion/client.py                      | 69 +++++++--------
 worlds/zillion/gen_data.py                    |  3 +-
 worlds/zillion/id_maps.py                     | 29 +++----
 worlds/zillion/logic.py                       | 13 +--
 worlds/zillion/options.py                     | 10 +--
 worlds/zillion/patch.py                       | 24 ++++--
 worlds/zillion/region.py                      | 10 ++-
 worlds/zillion/test/TestReproducibleRandom.py |  7 +-
 worlds/zillion/test/__init__.py               |  8 +-
 10 files changed, 136 insertions(+), 120 deletions(-)

diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index e689f2f55c58..5a4e2bb48f18 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -3,11 +3,12 @@
 import functools
 import settings
 import threading
-import typing
-from typing import Any, Dict, List, Set, Tuple, Optional, Union
+from typing import Any, ClassVar
 import os
 import logging
 
+from typing_extensions import override
+
 from BaseClasses import ItemClassification, LocationProgressType, \
     MultiWorld, Item, CollectionState, Entrance, Tutorial
 
@@ -76,7 +77,7 @@ class ZillionWorld(World):
     options_dataclass = ZillionOptions
     options: ZillionOptions  # type: ignore
 
-    settings: typing.ClassVar[ZillionSettings]  # type: ignore
+    settings: ClassVar[ZillionSettings]  # type: ignore
     # these type: ignore are because of this issue: https://github.com/python/typing/discussions/1486
 
     topology_present = True  # indicate if world type has any meaningful layout/pathing
@@ -89,14 +90,14 @@ class ZillionWorld(World):
 
     class LogStreamInterface:
         logger: logging.Logger
-        buffer: List[str]
+        buffer: list[str]
 
         def __init__(self, logger: logging.Logger) -> None:
             self.logger = logger
             self.buffer = []
 
         def write(self, msg: str) -> None:
-            if msg.endswith('\n'):
+            if msg.endswith("\n"):
                 self.buffer.append(msg[:-1])
                 self.logger.debug("".join(self.buffer))
                 self.buffer = []
@@ -108,21 +109,21 @@ def flush(self) -> None:
 
     lsi: LogStreamInterface
 
-    id_to_zz_item: Optional[Dict[int, ZzItem]] = None
+    id_to_zz_item: dict[int, ZzItem] | None = None
     zz_system: System
-    _item_counts: "Counter[str]" = Counter()
+    _item_counts: Counter[str] = Counter()
     """
     These are the items counts that will be in the game,
     which might be different from the item counts the player asked for in options
     (if the player asked for something invalid).
     """
-    my_locations: List[ZillionLocation] = []
+    my_locations: list[ZillionLocation] = []
     """ This is kind of a cache to avoid iterating through all the multiworld locations in logic. """
     slot_data_ready: threading.Event
     """ This event is set in `generate_output` when the data is ready for `fill_slot_data` """
-    logic_cache: Union[ZillionLogicCache, None] = None
+    logic_cache: ZillionLogicCache | None = None
 
-    def __init__(self, world: MultiWorld, player: int):
+    def __init__(self, world: MultiWorld, player: int) -> None:
         super().__init__(world, player)
         self.logger = logging.getLogger("Zillion")
         self.lsi = ZillionWorld.LogStreamInterface(self.logger)
@@ -133,6 +134,7 @@ def _make_item_maps(self, start_char: Chars) -> None:
         _id_to_name, _id_to_zz_id, id_to_zz_item = make_id_to_others(start_char)
         self.id_to_zz_item = id_to_zz_item
 
+    @override
     def generate_early(self) -> None:
         zz_op, item_counts = validate(self.options)
 
@@ -150,12 +152,13 @@ def generate_early(self) -> None:
         # just in case the options changed anything (I don't think they do)
         assert self.zz_system.randomizer, "init failed"
         for zz_name in self.zz_system.randomizer.locations:
-            if zz_name != 'main':
+            if zz_name != "main":
                 assert self.zz_system.randomizer.loc_name_2_pretty[zz_name] in self.location_name_to_id, \
                     f"{self.zz_system.randomizer.loc_name_2_pretty[zz_name]} not in location map"
 
         self._make_item_maps(zz_op.start_char)
 
+    @override
     def create_regions(self) -> None:
         assert self.zz_system.randomizer, "generate_early hasn't been called"
         assert self.id_to_zz_item, "generate_early hasn't been called"
@@ -177,23 +180,23 @@ def create_regions(self) -> None:
                 zz_loc.req.gun = 1
             assert len(self.zz_system.randomizer.get_locations(Req(gun=1, jump=1))) != 0
 
-        start = self.zz_system.randomizer.regions['start']
+        start = self.zz_system.randomizer.regions["start"]
 
-        all: Dict[str, ZillionRegion] = {}
+        all_regions: dict[str, ZillionRegion] = {}
         for here_zz_name, zz_r in self.zz_system.randomizer.regions.items():
             here_name = "Menu" if here_zz_name == "start" else zz_reg_name_to_reg_name(here_zz_name)
-            all[here_name] = ZillionRegion(zz_r, here_name, here_name, p, w)
-            self.multiworld.regions.append(all[here_name])
+            all_regions[here_name] = ZillionRegion(zz_r, here_name, here_name, p, w)
+            self.multiworld.regions.append(all_regions[here_name])
 
         limited_skill = Req(gun=3, jump=3, skill=self.zz_system.randomizer.options.skill, hp=940, red=1, floppy=126)
         queue = deque([start])
-        done: Set[str] = set()
+        done: set[str] = set()
         while len(queue):
             zz_here = queue.popleft()
             here_name = "Menu" if zz_here.name == "start" else zz_reg_name_to_reg_name(zz_here.name)
             if here_name in done:
                 continue
-            here = all[here_name]
+            here = all_regions[here_name]
 
             for zz_loc in zz_here.locations:
                 # if local gun reqs didn't place "keyword" item
@@ -217,15 +220,16 @@ def access_rule_wrapped(zz_loc_local: ZzLocation,
                     self.my_locations.append(loc)
 
             for zz_dest in zz_here.connections.keys():
-                dest_name = "Menu" if zz_dest.name == 'start' else zz_reg_name_to_reg_name(zz_dest.name)
-                dest = all[dest_name]
-                exit = Entrance(p, f"{here_name} to {dest_name}", here)
-                here.exits.append(exit)
-                exit.connect(dest)
+                dest_name = "Menu" if zz_dest.name == "start" else zz_reg_name_to_reg_name(zz_dest.name)
+                dest = all_regions[dest_name]
+                exit_ = Entrance(p, f"{here_name} to {dest_name}", here)
+                here.exits.append(exit_)
+                exit_.connect(dest)
 
                 queue.append(zz_dest)
             done.add(here.name)
 
+    @override
     def create_items(self) -> None:
         if not self.id_to_zz_item:
             self._make_item_maps("JJ")
@@ -249,14 +253,11 @@ def create_items(self) -> None:
                 self.logger.debug(f"Zillion Items: {item_name}  1")
                 self.multiworld.itempool.append(self.create_item(item_name))
 
-    def set_rules(self) -> None:
-        # logic for this game is in create_regions
-        pass
-
+    @override
     def generate_basic(self) -> None:
         assert self.zz_system.randomizer, "generate_early hasn't been called"
         # main location name is an alias
-        main_loc_name = self.zz_system.randomizer.loc_name_2_pretty[self.zz_system.randomizer.locations['main'].name]
+        main_loc_name = self.zz_system.randomizer.loc_name_2_pretty[self.zz_system.randomizer.locations["main"].name]
 
         self.multiworld.get_location(main_loc_name, self.player)\
             .place_locked_item(self.create_item("Win"))
@@ -264,22 +265,18 @@ def generate_basic(self) -> None:
             lambda state: state.has("Win", self.player)
 
     @staticmethod
-    def stage_generate_basic(multiworld: MultiWorld, *args: Any) -> None:
+    def stage_generate_basic(multiworld: MultiWorld, *args: Any) -> None:  # noqa: ANN401
         # item link pools are about to be created in main
         # JJ can't be an item link unless all the players share the same start_char
         # (The reason for this is that the JJ ZillionItem will have a different ZzItem depending
         #  on whether the start char is Apple or Champ, and the logic depends on that ZzItem.)
         for group in multiworld.groups.values():
-            # TODO: remove asserts on group when we can specify which members of TypedDict are optional
-            assert "game" in group
-            if group["game"] == "Zillion":
-                assert "item_pool" in group
+            if group["game"] == "Zillion" and "item_pool" in group:
                 item_pool = group["item_pool"]
                 to_stay: Chars = "JJ"
                 if "JJ" in item_pool:
-                    assert "players" in group
-                    group_players = group["players"]
-                    players_start_chars: List[Tuple[int, Chars]] = []
+                    group["players"] = group_players = set(group["players"])
+                    players_start_chars: list[tuple[int, Chars]] = []
                     for player in group_players:
                         z_world = multiworld.worlds[player]
                         assert isinstance(z_world, ZillionWorld)
@@ -291,17 +288,17 @@ def stage_generate_basic(multiworld: MultiWorld, *args: Any) -> None:
                     elif start_char_counts["Champ"] > start_char_counts["Apple"]:
                         to_stay = "Champ"
                     else:  # equal
-                        choices: Tuple[Chars, ...] = ("Apple", "Champ")
+                        choices: tuple[Chars, ...] = ("Apple", "Champ")
                         to_stay = multiworld.random.choice(choices)
 
                     for p, sc in players_start_chars:
                         if sc != to_stay:
                             group_players.remove(p)
-                assert "world" in group
                 group_world = group["world"]
                 assert isinstance(group_world, ZillionWorld)
                 group_world._make_item_maps(to_stay)
 
+    @override
     def post_fill(self) -> None:
         """Optional Method that is called after regular fill. Can be used to do adjustments before output generation.
         This happens before progression balancing,  so the items may not be in their final locations yet."""
@@ -317,10 +314,10 @@ def finalize_item_locations(self) -> GenData:
 
         assert self.zz_system.randomizer, "generate_early hasn't been called"
 
-        # debug_zz_loc_ids: Dict[str, int] = {}
+        # debug_zz_loc_ids: dict[str, int] = {}
         empty = zz_items[4]
         multi_item = empty  # a different patcher method differentiates empty from ap multi item
-        multi_items: Dict[str, Tuple[str, str]] = {}  # zz_loc_name to (item_name, player_name)
+        multi_items: dict[str, tuple[str, str]] = {}  # zz_loc_name to (item_name, player_name)
         for z_loc in self.multiworld.get_locations(self.player):
             assert isinstance(z_loc, ZillionLocation)
             # debug_zz_loc_ids[z_loc.zz_loc.name] = id(z_loc.zz_loc)
@@ -343,7 +340,7 @@ def finalize_item_locations(self) -> GenData:
         #     print(id_)
         # print("size:", len(debug_zz_loc_ids))
 
-        # debug_loc_to_id: Dict[str, int] = {}
+        # debug_loc_to_id: dict[str, int] = {}
         # regions = self.zz_randomizer.regions
         # for region in regions.values():
         #     for loc in region.locations:
@@ -358,10 +355,11 @@ def finalize_item_locations(self) -> GenData:
                 f"in world {self.player} didn't get an item"
             )
 
-        game_id = self.multiworld.player_name[self.player].encode() + b'\x00' + self.multiworld.seed_name[-6:].encode()
+        game_id = self.multiworld.player_name[self.player].encode() + b"\x00" + self.multiworld.seed_name[-6:].encode()
 
         return GenData(multi_items, self.zz_system.get_game(), game_id)
 
+    @override
     def generate_output(self, output_directory: str) -> None:
         """This method gets called from a threadpool, do not use multiworld.random here.
         If you need any last-second randomization, use self.random instead."""
@@ -383,6 +381,7 @@ def generate_output(self, output_directory: str) -> None:
 
         self.logger.debug(f"Zillion player {self.player} finished generate_output")
 
+    @override
     def fill_slot_data(self) -> ZillionSlotInfo:  # json of WebHostLib.models.Slot
         """Fill in the `slot_data` field in the `Connected` network package.
         This is a way the generator can give custom data to the client.
@@ -400,6 +399,7 @@ def fill_slot_data(self) -> ZillionSlotInfo:  # json of WebHostLib.models.Slot
 
     # end of ordered Main.py calls
 
+    @override
     def create_item(self, name: str) -> Item:
         """Create an item for this world type and player.
         Warning: this may be called with self.multiworld = None, for example by MultiServer"""
@@ -420,6 +420,7 @@ def create_item(self, name: str) -> Item:
         z_item = ZillionItem(name, classification, item_id, self.player, zz_item)
         return z_item
 
+    @override
     def get_filler_item_name(self) -> str:
         """Called when the item pool needs to be filled with additional items to match location count."""
         return "Empty"
diff --git a/worlds/zillion/client.py b/worlds/zillion/client.py
index 09d0565e1c5e..d629df583a81 100644
--- a/worlds/zillion/client.py
+++ b/worlds/zillion/client.py
@@ -3,7 +3,7 @@
 import io
 import pkgutil
 import platform
-from typing import Any, ClassVar, Coroutine, Dict, List, Optional, Protocol, Tuple, cast
+from typing import Any, ClassVar, Coroutine, Protocol, cast
 
 from CommonClient import CommonContext, server_loop, gui_enabled, \
     ClientCommandProcessor, logger, get_base_parser
@@ -11,6 +11,7 @@
 from Utils import async_start
 
 import colorama
+from typing_extensions import override
 
 from zilliandomizer.zri.memory import Memory, RescueInfo
 from zilliandomizer.zri import events
@@ -35,11 +36,11 @@ def _cmd_map(self) -> None:
 
 
 class ToggleCallback(Protocol):
-    def __call__(self) -> None: ...
+    def __call__(self) -> object: ...
 
 
 class SetRoomCallback(Protocol):
-    def __call__(self, rooms: List[List[int]]) -> None: ...
+    def __call__(self, rooms: list[list[int]]) -> object: ...
 
 
 class ZillionContext(CommonContext):
@@ -47,7 +48,7 @@ class ZillionContext(CommonContext):
     command_processor = ZillionCommandProcessor
     items_handling = 1  # receive items from other players
 
-    known_name: Optional[str]
+    known_name: str | None
     """ This is almost the same as `auth` except `auth` is reset to `None` when server disconnects, and this isn't. """
 
     from_game: "asyncio.Queue[events.EventFromGame]"
@@ -56,11 +57,11 @@ class ZillionContext(CommonContext):
     """ local checks watched by server """
     next_item: int
     """ index in `items_received` """
-    ap_id_to_name: Dict[int, str]
-    ap_id_to_zz_id: Dict[int, int]
+    ap_id_to_name: dict[int, str]
+    ap_id_to_zz_id: dict[int, int]
     start_char: Chars = "JJ"
-    rescues: Dict[int, RescueInfo] = {}
-    loc_mem_to_id: Dict[int, int] = {}
+    rescues: dict[int, RescueInfo] = {}
+    loc_mem_to_id: dict[int, int] = {}
     got_room_info: asyncio.Event
     """ flag for connected to server """
     got_slot_data: asyncio.Event
@@ -119,22 +120,22 @@ def reset_game_state(self) -> None:
         self.finished_game = False
         self.items_received.clear()
 
-    # override
-    def on_deathlink(self, data: Dict[str, Any]) -> None:
+    @override
+    def on_deathlink(self, data: dict[str, Any]) -> None:
         self.to_game.put_nowait(events.DeathEventToGame())
         return super().on_deathlink(data)
 
-    # override
+    @override
     async def server_auth(self, password_requested: bool = False) -> None:
         if password_requested and not self.password:
             await super().server_auth(password_requested)
         if not self.auth:
-            logger.info('waiting for connection to game...')
+            logger.info("waiting for connection to game...")
             return
         logger.info("logging in to server...")
         await self.send_connect()
 
-    # override
+    @override
     def run_gui(self) -> None:
         from kvui import GameManager
         from kivy.core.text import Label as CoreLabel
@@ -154,10 +155,10 @@ class MapPanel(Widget):
                 MAP_WIDTH: ClassVar[int] = 281
 
                 map_background: CoreImage
-                _number_textures: List[Texture] = []
-                rooms: List[List[int]] = []
+                _number_textures: list[Texture] = []
+                rooms: list[list[int]] = []
 
-                def __init__(self, **kwargs: Any) -> None:
+                def __init__(self, **kwargs: Any) -> None:  # noqa: ANN401
                     super().__init__(**kwargs)
 
                     FILE_NAME = "empty-zillion-map-row-col-labels-281.png"
@@ -183,7 +184,7 @@ def _make_numbers(self) -> None:
                         label.refresh()
                         self._number_textures.append(label.texture)
 
-                def update_map(self, *args: Any) -> None:
+                def update_map(self, *args: Any) -> None:  # noqa: ANN401
                     self.canvas.clear()
 
                     with self.canvas:
@@ -203,6 +204,7 @@ def update_map(self, *args: Any) -> None:
                                     num_texture = self._number_textures[num]
                                     Rectangle(texture=num_texture, size=num_texture.size, pos=pos)
 
+            @override
             def build(self) -> Layout:
                 container = super().build()
                 self.map_widget = ZillionManager.MapPanel(size_hint_x=None, width=ZillionManager.MapPanel.MAP_WIDTH)
@@ -216,17 +218,18 @@ def toggle_map_width(self) -> None:
                     self.map_widget.width = 0
                 self.container.do_layout()
 
-            def set_rooms(self, rooms: List[List[int]]) -> None:
+            def set_rooms(self, rooms: list[list[int]]) -> None:
                 self.map_widget.rooms = rooms
                 self.map_widget.update_map()
 
         self.ui = ZillionManager(self)
-        self.ui_toggle_map = lambda: self.ui.toggle_map_width()
-        self.ui_set_rooms = lambda rooms: self.ui.set_rooms(rooms)
+        self.ui_toggle_map = lambda: isinstance(self.ui, ZillionManager) and self.ui.toggle_map_width()
+        self.ui_set_rooms = lambda rooms: isinstance(self.ui, ZillionManager) and self.ui.set_rooms(rooms)
         run_co: Coroutine[Any, Any, None] = self.ui.async_run()
         self.ui_task = asyncio.create_task(run_co, name="UI")
 
-    def on_package(self, cmd: str, args: Dict[str, Any]) -> None:
+    @override
+    def on_package(self, cmd: str, args: dict[str, Any]) -> None:
         self.room_item_numbers_to_ui()
         if cmd == "Connected":
             logger.info("logged in to Archipelago server")
@@ -238,7 +241,7 @@ def on_package(self, cmd: str, args: Dict[str, Any]) -> None:
             if "start_char" not in slot_data:
                 logger.warning("invalid Zillion `Connected` packet, `slot_data` missing `start_char`")
                 return
-            self.start_char = slot_data['start_char']
+            self.start_char = slot_data["start_char"]
             if self.start_char not in {"Apple", "Champ", "JJ"}:
                 logger.warning("invalid Zillion `Connected` packet, "
                                f"`slot_data` `start_char` has invalid value: {self.start_char}")
@@ -259,7 +262,7 @@ def on_package(self, cmd: str, args: Dict[str, Any]) -> None:
                 self.rescues[0 if rescue_id == "0" else 1] = ri
 
             if "loc_mem_to_id" not in slot_data:
-                logger.warn("invalid Zillion `Connected` packet, `slot_data` missing `loc_mem_to_id`")
+                logger.warning("invalid Zillion `Connected` packet, `slot_data` missing `loc_mem_to_id`")
                 return
             loc_mem_to_id = slot_data["loc_mem_to_id"]
             self.loc_mem_to_id = {}
@@ -286,7 +289,7 @@ def on_package(self, cmd: str, args: Dict[str, Any]) -> None:
             if "keys" not in args:
                 logger.warning(f"invalid Retrieved packet to ZillionClient: {args}")
                 return
-            keys = cast(Dict[str, Optional[str]], args["keys"])
+            keys = cast(dict[str, str | None], args["keys"])
             doors_b64 = keys.get(f"zillion-{self.auth}-doors", None)
             if doors_b64:
                 logger.info("received door data from server")
@@ -321,9 +324,9 @@ def process_from_game_queue(self) -> None:
                 if server_id in self.missing_locations:
                     self.ap_local_count += 1
                     n_locations = len(self.missing_locations) + len(self.checked_locations) - 1  # -1 to ignore win
-                    logger.info(f'New Check: {loc_name} ({self.ap_local_count}/{n_locations})')
+                    logger.info(f"New Check: {loc_name} ({self.ap_local_count}/{n_locations})")
                     async_start(self.send_msgs([
-                        {"cmd": 'LocationChecks', "locations": [server_id]}
+                        {"cmd": "LocationChecks", "locations": [server_id]}
                     ]))
                 else:
                     # This will happen a lot in Zillion,
@@ -334,7 +337,7 @@ def process_from_game_queue(self) -> None:
             elif isinstance(event_from_game, events.WinEventFromGame):
                 if not self.finished_game:
                     async_start(self.send_msgs([
-                        {"cmd": 'LocationChecks', "locations": [loc_name_to_id["J-6 bottom far left"]]},
+                        {"cmd": "LocationChecks", "locations": [loc_name_to_id["J-6 bottom far left"]]},
                         {"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}
                     ]))
                     self.finished_game = True
@@ -362,24 +365,24 @@ def process_items_received(self) -> None:
                 ap_id = self.items_received[index].item
                 from_name = self.player_names[self.items_received[index].player]
                 # TODO: colors in this text, like sni client?
-                logger.info(f'received {self.ap_id_to_name[ap_id]} from {from_name}')
+                logger.info(f"received {self.ap_id_to_name[ap_id]} from {from_name}")
             self.to_game.put_nowait(
                 events.ItemEventToGame(zz_item_ids)
             )
             self.next_item = len(self.items_received)
 
 
-def name_seed_from_ram(data: bytes) -> Tuple[str, str]:
+def name_seed_from_ram(data: bytes) -> tuple[str, str]:
     """ returns player name, and end of seed string """
     if len(data) == 0:
         # no connection to game
         return "", "xxx"
-    null_index = data.find(b'\x00')
+    null_index = data.find(b"\x00")
     if null_index == -1:
         logger.warning(f"invalid game id in rom {repr(data)}")
         null_index = len(data)
     name = data[:null_index].decode()
-    null_index_2 = data.find(b'\x00', null_index + 1)
+    null_index_2 = data.find(b"\x00", null_index + 1)
     if null_index_2 == -1:
         null_index_2 = len(data)
     seed_name = data[null_index + 1:null_index_2].decode()
@@ -479,8 +482,8 @@ def log_no_spam(msg: str) -> None:
 
 async def main() -> None:
     parser = get_base_parser()
-    parser.add_argument('diff_file', default="", type=str, nargs="?",
-                        help='Path to a .apzl Archipelago Binary Patch file')
+    parser.add_argument("diff_file", default="", type=str, nargs="?",
+                        help="Path to a .apzl Archipelago Binary Patch file")
     # SNI parser.add_argument('--loglevel', default='info', choices=['debug', 'info', 'warning', 'error', 'critical'])
     args = parser.parse_args()
     print(args)
diff --git a/worlds/zillion/gen_data.py b/worlds/zillion/gen_data.py
index 13cbee9ced20..214073396153 100644
--- a/worlds/zillion/gen_data.py
+++ b/worlds/zillion/gen_data.py
@@ -1,6 +1,5 @@
 from dataclasses import dataclass
 import json
-from typing import Dict, Tuple
 
 from zilliandomizer.game import Game as ZzGame
 
@@ -9,7 +8,7 @@
 class GenData:
     """ data passed from generation to patcher """
 
-    multi_items: Dict[str, Tuple[str, str]]
+    multi_items: dict[str, tuple[str, str]]
     """ zz_loc_name to (item_name, player_name) """
     zz_game: ZzGame
     game_id: bytes
diff --git a/worlds/zillion/id_maps.py b/worlds/zillion/id_maps.py
index 32d71fc79b30..25762f99cd6b 100644
--- a/worlds/zillion/id_maps.py
+++ b/worlds/zillion/id_maps.py
@@ -1,5 +1,6 @@
 from collections import defaultdict
-from typing import Dict, Iterable, Mapping, Tuple, TypedDict
+from collections.abc import Iterable, Mapping
+from typing import TypedDict
 
 from zilliandomizer.logic_components.items import (
     Item as ZzItem,
@@ -40,13 +41,13 @@
 _zz_empty = zz_item_name_to_zz_item["empty"]
 
 
-def make_id_to_others(start_char: Chars) -> Tuple[
-    Dict[int, str], Dict[int, int], Dict[int, ZzItem]
+def make_id_to_others(start_char: Chars) -> tuple[
+    dict[int, str], dict[int, int], dict[int, ZzItem]
 ]:
     """ returns id_to_name, id_to_zz_id, id_to_zz_item """
-    id_to_name: Dict[int, str] = {}
-    id_to_zz_id: Dict[int, int] = {}
-    id_to_zz_item: Dict[int, ZzItem] = {}
+    id_to_name: dict[int, str] = {}
+    id_to_zz_id: dict[int, int] = {}
+    id_to_zz_item: dict[int, ZzItem] = {}
 
     if start_char == "JJ":
         name_to_zz_item = {
@@ -91,14 +92,14 @@ def make_room_name(row: int, col: int) -> str:
     return f"{chr(ord('A') + row - 1)}-{col + 1}"
 
 
-loc_name_to_id: Dict[str, int] = {
+loc_name_to_id: dict[str, int] = {
     name: id_ + base_id
     for name, id_ in pretty_loc_name_to_id.items()
 }
 
 
 def zz_reg_name_to_reg_name(zz_reg_name: str) -> str:
-    if zz_reg_name[0] == 'r' and zz_reg_name[3] == 'c':
+    if zz_reg_name[0] == "r" and zz_reg_name[3] == "c":
         row, col = parse_reg_name(zz_reg_name)
         end = zz_reg_name[5:]
         return f"{make_room_name(row, col)} {end.upper()}"
@@ -113,17 +114,17 @@ class ClientRescue(TypedDict):
 
 class ZillionSlotInfo(TypedDict):
     start_char: Chars
-    rescues: Dict[str, ClientRescue]
-    loc_mem_to_id: Dict[int, int]
+    rescues: dict[str, ClientRescue]
+    loc_mem_to_id: dict[int, int]
     """ memory location of canister to Archipelago location id number """
 
 
 def get_slot_info(regions: Iterable[RegionData],
                   start_char: Chars,
                   loc_name_to_pretty: Mapping[str, str]) -> ZillionSlotInfo:
-    items_placed_in_map_index: Dict[int, int] = defaultdict(int)
-    rescue_locations: Dict[int, RescueInfo] = {}
-    loc_memory_to_loc_id: Dict[int, int] = {}
+    items_placed_in_map_index: dict[int, int] = defaultdict(int)
+    rescue_locations: dict[int, RescueInfo] = {}
+    loc_memory_to_loc_id: dict[int, int] = {}
     for region in regions:
         for loc in region.locations:
             assert loc.item, ("There should be an item placed in every location before "
@@ -142,7 +143,7 @@ def get_slot_info(regions: Iterable[RegionData],
                 loc_memory_to_loc_id[loc_memory] = pretty_loc_name_to_id[loc_name_to_pretty[loc.name]]
                 items_placed_in_map_index[map_index] += 1
 
-    rescues: Dict[str, ClientRescue] = {}
+    rescues: dict[str, ClientRescue] = {}
     for i in (0, 1):
         if i in rescue_locations:
             ri = rescue_locations[i]
diff --git a/worlds/zillion/logic.py b/worlds/zillion/logic.py
index a14910a200e5..f3d1814a9e9b 100644
--- a/worlds/zillion/logic.py
+++ b/worlds/zillion/logic.py
@@ -1,4 +1,5 @@
-from typing import Dict, FrozenSet, Mapping, Tuple, List, Counter as _Counter
+from collections import Counter
+from collections.abc import Mapping
 
 from BaseClasses import CollectionState
 
@@ -35,7 +36,7 @@ def set_randomizer_locs(cs: CollectionState, p: int, zz_r: Randomizer) -> int:
     return _hash
 
 
-def item_counts(cs: CollectionState, p: int) -> Tuple[Tuple[str, int], ...]:
+def item_counts(cs: CollectionState, p: int) -> tuple[tuple[str, int], ...]:
     """
     the zilliandomizer items that player p has collected
 
@@ -44,11 +45,11 @@ def item_counts(cs: CollectionState, p: int) -> Tuple[Tuple[str, int], ...]:
     return tuple((item_name, cs.count(item_name, p)) for item_name in item_name_to_id)
 
 
-_cache_miss: Tuple[None, FrozenSet[Location]] = (None, frozenset())
+_cache_miss: tuple[None, frozenset[Location]] = (None, frozenset())
 
 
 class ZillionLogicCache:
-    _cache: Dict[int, Tuple[_Counter[str], FrozenSet[Location]]]
+    _cache: dict[int, tuple[Counter[str], frozenset[Location]]]
     """ `{ hash: (counter_from_prog_items, accessible_zz_locations) }` """
     _player: int
     _zz_r: Randomizer
@@ -60,7 +61,7 @@ def __init__(self, player: int, zz_r: Randomizer, id_to_zz_item: Mapping[int, It
         self._zz_r = zz_r
         self._id_to_zz_item = id_to_zz_item
 
-    def cs_to_zz_locs(self, cs: CollectionState) -> FrozenSet[Location]:
+    def cs_to_zz_locs(self, cs: CollectionState) -> frozenset[Location]:
         """
         given an Archipelago `CollectionState`,
         returns frozenset of accessible zilliandomizer locations
@@ -76,7 +77,7 @@ def cs_to_zz_locs(self, cs: CollectionState) -> FrozenSet[Location]:
             return locs
 
         # print("cache miss")
-        have_items: List[Item] = []
+        have_items: list[Item] = []
         for name, count in counts:
             have_items.extend([self._id_to_zz_item[item_name_to_id[name]]] * count)
         # have_req is the result of converting AP CollectionState to zilliandomizer collection state
diff --git a/worlds/zillion/options.py b/worlds/zillion/options.py
index ec0fdb0b22e1..22a698472265 100644
--- a/worlds/zillion/options.py
+++ b/worlds/zillion/options.py
@@ -1,6 +1,6 @@
 from collections import Counter
 from dataclasses import dataclass
-from typing import ClassVar, Dict, Literal, Tuple, TypeGuard
+from typing import ClassVar, Literal, TypeGuard
 
 from Options import Choice, DefaultOnToggle, NamedRange, OptionGroup, PerGameCommonOptions, Range, Removed, Toggle
 
@@ -107,7 +107,7 @@ class ZillionStartChar(Choice):
     display_name = "start character"
     default = "random"
 
-    _name_capitalization: ClassVar[Dict[int, Chars]] = {
+    _name_capitalization: ClassVar[dict[int, Chars]] = {
         option_jj: "JJ",
         option_apple: "Apple",
         option_champ: "Champ",
@@ -263,7 +263,7 @@ class ZillionMapGen(Choice):
     option_full = 2
     default = 0
 
-    def zz_value(self) -> Literal['none', 'rooms', 'full']:
+    def zz_value(self) -> Literal["none", "rooms", "full"]:
         if self.value == ZillionMapGen.option_none:
             return "none"
         if self.value == ZillionMapGen.option_rooms:
@@ -305,7 +305,7 @@ class ZillionOptions(PerGameCommonOptions):
 ]
 
 
-def convert_item_counts(ic: "Counter[str]") -> ZzItemCounts:
+def convert_item_counts(ic: Counter[str]) -> ZzItemCounts:
     tr: ZzItemCounts = {
         ID.card: ic["ID Card"],
         ID.red: ic["Red ID Card"],
@@ -319,7 +319,7 @@ def convert_item_counts(ic: "Counter[str]") -> ZzItemCounts:
     return tr
 
 
-def validate(options: ZillionOptions) -> "Tuple[ZzOptions, Counter[str]]":
+def validate(options: ZillionOptions) -> tuple[ZzOptions, Counter[str]]:
     """
     adjusts options to make game completion possible
 
diff --git a/worlds/zillion/patch.py b/worlds/zillion/patch.py
index 6bc6d04dd663..0eee3315f4a1 100644
--- a/worlds/zillion/patch.py
+++ b/worlds/zillion/patch.py
@@ -1,5 +1,5 @@
 import os
-from typing import Any, BinaryIO, Optional, cast
+from typing import BinaryIO
 import zipfile
 
 from typing_extensions import override
@@ -11,11 +11,11 @@
 
 from .gen_data import GenData
 
-USHASH = 'd4bf9e7bcf9a48da53785d2ae7bc4270'
+US_HASH = "d4bf9e7bcf9a48da53785d2ae7bc4270"
 
 
 class ZillionPatch(APAutoPatchInterface):
-    hash = USHASH
+    hash = US_HASH
     game = "Zillion"
     patch_file_ending = ".apzl"
     result_file_ending = ".sms"
@@ -23,8 +23,14 @@ class ZillionPatch(APAutoPatchInterface):
     gen_data_str: str
     """ JSON encoded """
 
-    def __init__(self, *args: Any, gen_data_str: str = "", **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(self,
+                 path: str | None = None,
+                 player: int | None = None,
+                 player_name: str = "",
+                 server: str = "",
+                 *,
+                 gen_data_str: str = "") -> None:
+        super().__init__(path=path, player=player, player_name=player_name, server=server)
         self.gen_data_str = gen_data_str
 
     @classmethod
@@ -44,15 +50,17 @@ def read_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
         super().read_contents(opened_zipfile)
         self.gen_data_str = opened_zipfile.read("gen_data.json").decode()
 
+    @override
     def patch(self, target: str) -> None:
         self.read()
         write_rom_from_gen_data(self.gen_data_str, target)
 
 
-def get_base_rom_path(file_name: Optional[str] = None) -> str:
-    options = Utils.get_options()
+def get_base_rom_path(file_name: str | None = None) -> str:
+    from . import ZillionSettings, ZillionWorld
+    settings: ZillionSettings = ZillionWorld.settings
     if not file_name:
-        file_name = cast(str, options["zillion_options"]["rom_file"])
+        file_name = settings.rom_file
     if not os.path.exists(file_name):
         file_name = Utils.user_path(file_name)
     return file_name
diff --git a/worlds/zillion/region.py b/worlds/zillion/region.py
index cf5aa6588950..40565f008263 100644
--- a/worlds/zillion/region.py
+++ b/worlds/zillion/region.py
@@ -1,9 +1,11 @@
-from typing import Optional
-from BaseClasses import MultiWorld, Region, Location, Item, CollectionState
+from typing_extensions import override
+
 from zilliandomizer.logic_components.regions import Region as ZzRegion
 from zilliandomizer.logic_components.locations import Location as ZzLocation
 from zilliandomizer.logic_components.items import RESCUE
 
+from BaseClasses import MultiWorld, Region, Location, Item, CollectionState
+
 from .id_maps import loc_name_to_id
 from .item import ZillionItem
 
@@ -28,12 +30,12 @@ def __init__(self,
                  zz_loc: ZzLocation,
                  player: int,
                  name: str,
-                 parent: Optional[Region] = None) -> None:
+                 parent: Region | None = None) -> None:
         loc_id = loc_name_to_id[name]
         super().__init__(player, name, loc_id, parent)
         self.zz_loc = zz_loc
 
-    # override
+    @override
     def can_fill(self, state: CollectionState, item: Item, check_access: bool = True) -> bool:
         saved_gun_req = -1
         if isinstance(item, ZillionItem) \
diff --git a/worlds/zillion/test/TestReproducibleRandom.py b/worlds/zillion/test/TestReproducibleRandom.py
index a92fae240709..352165449a8b 100644
--- a/worlds/zillion/test/TestReproducibleRandom.py
+++ b/worlds/zillion/test/TestReproducibleRandom.py
@@ -1,4 +1,3 @@
-from typing import cast
 from . import ZillionTestBase
 
 from .. import ZillionWorld
@@ -9,7 +8,8 @@ class SeedTest(ZillionTestBase):
 
     def test_reproduce_seed(self) -> None:
         self.world_setup(42)
-        z_world = cast(ZillionWorld, self.multiworld.worlds[1])
+        z_world = self.multiworld.worlds[1]
+        assert isinstance(z_world, ZillionWorld)
         r = z_world.zz_system.randomizer
         assert r
         randomized_requirements_first = tuple(
@@ -18,7 +18,8 @@ def test_reproduce_seed(self) -> None:
         )
 
         self.world_setup(42)
-        z_world = cast(ZillionWorld, self.multiworld.worlds[1])
+        z_world = self.multiworld.worlds[1]
+        assert isinstance(z_world, ZillionWorld)
         r = z_world.zz_system.randomizer
         assert r
         randomized_requirements_second = tuple(
diff --git a/worlds/zillion/test/__init__.py b/worlds/zillion/test/__init__.py
index fe62bae34c9e..a669442364fe 100644
--- a/worlds/zillion/test/__init__.py
+++ b/worlds/zillion/test/__init__.py
@@ -1,4 +1,3 @@
-from typing import cast
 from test.bases import WorldTestBase
 from .. import ZillionWorld
 
@@ -13,8 +12,9 @@ def ensure_gun_3_requirement(self) -> None:
         This makes sure that gun 3 is required by making all the canisters
         in O-7 (including key word canisters) require gun 3.
         """
-        zz_world = cast(ZillionWorld, self.multiworld.worlds[1])
-        assert zz_world.zz_system.randomizer
-        for zz_loc_name, zz_loc in zz_world.zz_system.randomizer.locations.items():
+        z_world = self.multiworld.worlds[1]
+        assert isinstance(z_world, ZillionWorld)
+        assert z_world.zz_system.randomizer
+        for zz_loc_name, zz_loc in z_world.zz_system.randomizer.locations.items():
             if zz_loc_name.startswith("r15c6"):
                 zz_loc.req.gun = 3

From 8444ffa0c7cf8dbc404d7197204f4810d0a54214 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Fri, 29 Nov 2024 15:34:14 -0500
Subject: [PATCH 083/381] id Tech: Standardizing and fixing display names
 (#4240)

---
 worlds/doom_1993/Options.py | 2 +-
 worlds/doom_ii/Options.py   | 2 +-
 worlds/heretic/Options.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/worlds/doom_1993/Options.py b/worlds/doom_1993/Options.py
index f65952d3eb49..b4fc50aac674 100644
--- a/worlds/doom_1993/Options.py
+++ b/worlds/doom_1993/Options.py
@@ -112,7 +112,7 @@ class StartWithComputerAreaMaps(Toggle):
 class ResetLevelOnDeath(DefaultOnToggle):
     """When dying, levels are reset and monsters respawned. But inventory and checks are kept.
     Turning this setting off is considered easy mode. Good for new players that don't know the levels well."""
-    display_name="Reset Level on Death"
+    display_name = "Reset Level on Death"
 
 
 class Episode1(DefaultOnToggle):
diff --git a/worlds/doom_ii/Options.py b/worlds/doom_ii/Options.py
index cc39512a176e..6ecfb1aecd6c 100644
--- a/worlds/doom_ii/Options.py
+++ b/worlds/doom_ii/Options.py
@@ -102,7 +102,7 @@ class StartWithComputerAreaMaps(Toggle):
 class ResetLevelOnDeath(DefaultOnToggle):
     """When dying, levels are reset and monsters respawned. But inventory and checks are kept.
     Turning this setting off is considered easy mode. Good for new players that don't know the levels well."""
-    display_message="Reset level on death"
+    display_name = "Reset Level on Death"
 
 
 class Episode1(DefaultOnToggle):
diff --git a/worlds/heretic/Options.py b/worlds/heretic/Options.py
index 75e2257a7336..14f4198a55f0 100644
--- a/worlds/heretic/Options.py
+++ b/worlds/heretic/Options.py
@@ -104,7 +104,7 @@ class StartWithMapScrolls(Toggle):
 class ResetLevelOnDeath(DefaultOnToggle):
     """When dying, levels are reset and monsters respawned. But inventory and checks are kept.
     Turning this setting off is considered easy mode. Good for new players that don't know the levels well."""
-    display_message="Reset level on death"
+    display_name = "Reset Level on Death"
 
     
 class CheckSanity(Toggle):

From c97e4866ddfd8eb31bdd3f22b1b63d1b91c62e03 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 22:43:01 +0100
Subject: [PATCH 084/381] Core: Rewrite start inventory from pool code (#3778)

* Rewrite start inventory from pool code

* I think this is nicer?

* lol

* I just made it even shorter and nicer

* comments :D

* I think this makes more logical sense

* final change I promise

* HOLD UP THIS IS SO SHORT NOW

* ???????? Vi pls

* ???????? Vi pls????????????????

* this was probably important idk

* Lmao this just did not work correctly at all
---
 Main.py | 65 +++++++++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/Main.py b/Main.py
index 6b94b84c278b..606514630f0d 100644
--- a/Main.py
+++ b/Main.py
@@ -153,45 +153,38 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
 
     # remove starting inventory from pool items.
     # Because some worlds don't actually create items during create_items this has to be as late as possible.
-    if any(getattr(multiworld.worlds[player].options, "start_inventory_from_pool", None) for player in multiworld.player_ids):
-        new_items: List[Item] = []
-        old_items: List[Item] = []
-        depletion_pool: Dict[int, Dict[str, int]] = {
-            player: getattr(multiworld.worlds[player].options,
-                            "start_inventory_from_pool",
-                            StartInventoryPool({})).value.copy()
-            for player in multiworld.player_ids
-        }
-        for player, items in depletion_pool.items():
-            player_world: AutoWorld.World = multiworld.worlds[player]
-            for count in items.values():
-                for _ in range(count):
-                    new_items.append(player_world.create_filler())
-        target: int = sum(sum(items.values()) for items in depletion_pool.values())
-        for i, item in enumerate(multiworld.itempool):
+    fallback_inventory = StartInventoryPool({})
+    depletion_pool: Dict[int, Dict[str, int]] = {
+        player: getattr(multiworld.worlds[player].options, "start_inventory_from_pool", fallback_inventory).value.copy()
+        for player in multiworld.player_ids
+    }
+    target_per_player = {
+        player: sum(target_items.values()) for player, target_items in depletion_pool.items() if target_items
+    }
+
+    if target_per_player:
+        new_itempool: List[Item] = []
+
+        # Make new itempool with start_inventory_from_pool items removed
+        for item in multiworld.itempool:
             if depletion_pool[item.player].get(item.name, 0):
-                target -= 1
                 depletion_pool[item.player][item.name] -= 1
-                # quick abort if we have found all items
-                if not target:
-                    old_items.extend(multiworld.itempool[i+1:])
-                    break
             else:
-                old_items.append(item)
-
-        # leftovers?
-        if target:
-            for player, remaining_items in depletion_pool.items():
-                remaining_items = {name: count for name, count in remaining_items.items() if count}
-                if remaining_items:
-                    logger.warning(f"{multiworld.get_player_name(player)}"
-                                    f" is trying to remove items from their pool that don't exist: {remaining_items}")
-                    # find all filler we generated for the current player and remove until it matches 
-                    removables = [item for item in new_items if item.player == player]
-                    for _ in range(sum(remaining_items.values())):
-                        new_items.remove(removables.pop())
-        assert len(multiworld.itempool) == len(new_items + old_items), "Item Pool amounts should not change."
-        multiworld.itempool[:] = new_items + old_items
+                new_itempool.append(item)
+
+        # Create filler in place of the removed items, warn if any items couldn't be found in the multiworld itempool
+        for player, target in target_per_player.items():
+            unfound_items = {item: count for item, count in depletion_pool[player].items() if count}
+
+            if unfound_items:
+                player_name = multiworld.get_player_name(player)
+                logger.warning(f"{player_name} tried to remove items from their pool that don't exist: {unfound_items}")
+
+            needed_items = target_per_player[player] - sum(unfound_items.values())
+            new_itempool += [multiworld.worlds[player].create_filler() for _ in range(needed_items)]
+
+        assert len(multiworld.itempool) == len(new_itempool), "Item Pool amounts should not change."
+        multiworld.itempool[:] = new_itempool
 
     multiworld.link_items()
 

From 6e5adc7abdecf4baf6a29d89934cfe6cea0cba82 Mon Sep 17 00:00:00 2001
From: David St-Louis <daivuk@gmail.com>
Date: Fri, 29 Nov 2024 16:45:36 -0500
Subject: [PATCH 085/381] New Game: Faxanadu (#3059)

---
 README.md                           |   1 +
 docs/CODEOWNERS                     |   3 +
 worlds/faxanadu/Items.py            |  58 ++++++++
 worlds/faxanadu/Locations.py        | 199 ++++++++++++++++++++++++++++
 worlds/faxanadu/Options.py          | 107 +++++++++++++++
 worlds/faxanadu/Regions.py          |  66 +++++++++
 worlds/faxanadu/Rules.py            |  79 +++++++++++
 worlds/faxanadu/__init__.py         | 190 ++++++++++++++++++++++++++
 worlds/faxanadu/docs/en_Faxanadu.md |  27 ++++
 worlds/faxanadu/docs/setup_en.md    |  32 +++++
 10 files changed, 762 insertions(+)
 create mode 100644 worlds/faxanadu/Items.py
 create mode 100644 worlds/faxanadu/Locations.py
 create mode 100644 worlds/faxanadu/Options.py
 create mode 100644 worlds/faxanadu/Regions.py
 create mode 100644 worlds/faxanadu/Rules.py
 create mode 100644 worlds/faxanadu/__init__.py
 create mode 100644 worlds/faxanadu/docs/en_Faxanadu.md
 create mode 100644 worlds/faxanadu/docs/setup_en.md

diff --git a/README.md b/README.md
index 0e57bce53b51..2cc3c18aa09d 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,7 @@ Currently, the following games are supported:
 * Kingdom Hearts 1
 * Mega Man 2
 * Yacht Dice
+* Faxanadu
 
 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 a51cac37026b..4b7496c686c8 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -63,6 +63,9 @@
 # Factorio
 /worlds/factorio/ @Berserker66
 
+# Faxanadu
+/worlds/faxanadu/ @Daivuk
+
 # Final Fantasy Mystic Quest
 /worlds/ffmq/ @Alchav @wildham0
 
diff --git a/worlds/faxanadu/Items.py b/worlds/faxanadu/Items.py
new file mode 100644
index 000000000000..4815fde9de66
--- /dev/null
+++ b/worlds/faxanadu/Items.py
@@ -0,0 +1,58 @@
+from BaseClasses import ItemClassification
+from typing import List, Optional
+
+
+class ItemDef:
+    def __init__(self,
+                 id: Optional[int],
+                 name: str,
+                 classification: ItemClassification,
+                 count: int,
+                 progression_count: int,
+                 prefill_location: Optional[str]):
+        self.id = id
+        self.name = name
+        self.classification = classification
+        self.count = count
+        self.progression_count = progression_count
+        self.prefill_location = prefill_location
+
+
+items: List[ItemDef] = [
+    ItemDef(400000, 'Progressive Sword', ItemClassification.progression, 4, 0, None),
+    ItemDef(400001, 'Progressive Armor', ItemClassification.progression, 3, 0, None),
+    ItemDef(400002, 'Progressive Shield', ItemClassification.useful, 4, 0, None),
+    ItemDef(400003, 'Spring Elixir', ItemClassification.progression, 1, 0, None),
+    ItemDef(400004, 'Mattock', ItemClassification.progression, 1, 0, None),
+    ItemDef(400005, 'Unlock Wingboots', ItemClassification.progression, 1, 0, None),
+    ItemDef(400006, 'Key Jack', ItemClassification.progression, 1, 0, None),
+    ItemDef(400007, 'Key Queen', ItemClassification.progression, 1, 0, None),
+    ItemDef(400008, 'Key King', ItemClassification.progression, 1, 0, None),
+    ItemDef(400009, 'Key Joker', ItemClassification.progression, 1, 0, None),
+    ItemDef(400010, 'Key Ace', ItemClassification.progression, 1, 0, None),
+    ItemDef(400011, 'Ring of Ruby', ItemClassification.progression, 1, 0, None),
+    ItemDef(400012, 'Ring of Dworf', ItemClassification.progression, 1, 0, None),
+    ItemDef(400013, 'Demons Ring', ItemClassification.progression, 1, 0, None),
+    ItemDef(400014, 'Black Onyx', ItemClassification.progression, 1, 0, None),
+    ItemDef(None, 'Sky Spring Flow', ItemClassification.progression, 1, 0, 'Sky Spring'),
+    ItemDef(None, 'Tower of Fortress Spring Flow', ItemClassification.progression, 1, 0, 'Tower of Fortress Spring'),
+    ItemDef(None, 'Joker Spring Flow', ItemClassification.progression, 1, 0, 'Joker Spring'),
+    ItemDef(400015, 'Deluge', ItemClassification.progression, 1, 0, None),
+    ItemDef(400016, 'Thunder', ItemClassification.useful, 1, 0, None),
+    ItemDef(400017, 'Fire', ItemClassification.useful, 1, 0, None),
+    ItemDef(400018, 'Death', ItemClassification.useful, 1, 0, None),
+    ItemDef(400019, 'Tilte', ItemClassification.useful, 1, 0, None),
+    ItemDef(400020, 'Ring of Elf', ItemClassification.useful, 1, 0, None),
+    ItemDef(400021, 'Magical Rod', ItemClassification.useful, 1, 0, None),
+    ItemDef(400022, 'Pendant', ItemClassification.useful, 1, 0, None),
+    ItemDef(400023, 'Hourglass', ItemClassification.filler, 6, 0, None),
+    # We need at least 4 red potions for the Tower of Red Potion. Up to the player to save them up!
+    ItemDef(400024, 'Red Potion', ItemClassification.filler, 15, 4, None),
+    ItemDef(400025, 'Elixir', ItemClassification.filler, 4, 0, None),
+    ItemDef(400026, 'Glove', ItemClassification.filler, 5, 0, None),
+    ItemDef(400027, 'Ointment', ItemClassification.filler, 8, 0, None),
+    ItemDef(400028, 'Poison', ItemClassification.trap, 13, 0, None),
+    ItemDef(None, 'Killed Evil One', ItemClassification.progression, 1, 0, 'Evil One'),
+    # Placeholder item so the game knows which shop slot to prefill wingboots
+    ItemDef(400029, 'Wingboots', ItemClassification.useful, 0, 0, None),
+]
diff --git a/worlds/faxanadu/Locations.py b/worlds/faxanadu/Locations.py
new file mode 100644
index 000000000000..ebb785f9391a
--- /dev/null
+++ b/worlds/faxanadu/Locations.py
@@ -0,0 +1,199 @@
+from typing import List, Optional
+
+
+class LocationType():
+    world = 1  # Just standing there in the world
+    hidden = 2  # Kill all monsters in the room to reveal, each "item room" counter tick.
+    boss_reward = 3  # Kill a boss to reveal the item
+    shop = 4  # Buy at a shop
+    give = 5  # Given by an NPC
+    spring = 6  # Activatable spring
+    boss = 7  # Entity to kill to trigger the check
+
+
+class ItemType():
+    unknown = 0  # Or don't care
+    red_potion = 1
+
+
+class LocationDef:
+    def __init__(self, id: Optional[int], name: str, region: str, type: int, original_item: int):
+        self.id = id
+        self.name = name
+        self.region = region
+        self.type = type
+        self.original_item = original_item
+
+
+locations: List[LocationDef] = [
+    # Eolis
+    LocationDef(400100, 'Eolis Guru', 'Eolis', LocationType.give, ItemType.unknown),
+    LocationDef(400101, 'Eolis Key Jack', 'Eolis', LocationType.shop, ItemType.unknown),
+    LocationDef(400102, 'Eolis Hand Dagger', 'Eolis', LocationType.shop, ItemType.unknown),
+    LocationDef(400103, 'Eolis Red Potion', 'Eolis', LocationType.shop, ItemType.red_potion),
+    LocationDef(400104, 'Eolis Elixir', 'Eolis', LocationType.shop, ItemType.unknown),
+    LocationDef(400105, 'Eolis Deluge', 'Eolis', LocationType.shop, ItemType.unknown),
+
+    # Path to Apolune
+    LocationDef(400106, 'Path to Apolune Magic Shield', 'Path to Apolune', LocationType.shop, ItemType.unknown),
+    LocationDef(400107, 'Path to Apolune Death', 'Path to Apolune', LocationType.shop, ItemType.unknown),
+
+    # Apolune
+    LocationDef(400108, 'Apolune Small Shield', 'Apolune', LocationType.shop, ItemType.unknown),
+    LocationDef(400109, 'Apolune Hand Dagger', 'Apolune', LocationType.shop, ItemType.unknown),
+    LocationDef(400110, 'Apolune Deluge', 'Apolune', LocationType.shop, ItemType.unknown),
+    LocationDef(400111, 'Apolune Red Potion', 'Apolune', LocationType.shop, ItemType.red_potion),
+    LocationDef(400112, 'Apolune Key Jack', 'Apolune', LocationType.shop, ItemType.unknown),
+
+    # Tower of Trunk
+    LocationDef(400113, 'Tower of Trunk Hidden Mattock', 'Tower of Trunk', LocationType.hidden, ItemType.unknown),
+    LocationDef(400114, 'Tower of Trunk Hidden Hourglass', 'Tower of Trunk', LocationType.hidden, ItemType.unknown),
+    LocationDef(400115, 'Tower of Trunk Boss Mattock', 'Tower of Trunk', LocationType.boss_reward, ItemType.unknown),
+
+    # Path to Forepaw
+    LocationDef(400116, 'Path to Forepaw Hidden Red Potion', 'Path to Forepaw', LocationType.hidden, ItemType.red_potion),
+    LocationDef(400117, 'Path to Forepaw Glove', 'Path to Forepaw', LocationType.world, ItemType.unknown),
+
+    # Forepaw
+    LocationDef(400118, 'Forepaw Long Sword', 'Forepaw', LocationType.shop, ItemType.unknown),
+    LocationDef(400119, 'Forepaw Studded Mail', 'Forepaw', LocationType.shop, ItemType.unknown),
+    LocationDef(400120, 'Forepaw Small Shield', 'Forepaw', LocationType.shop, ItemType.unknown),
+    LocationDef(400121, 'Forepaw Red Potion', 'Forepaw', LocationType.shop, ItemType.red_potion),
+    LocationDef(400122, 'Forepaw Wingboots', 'Forepaw', LocationType.shop, ItemType.unknown),
+    LocationDef(400123, 'Forepaw Key Jack', 'Forepaw', LocationType.shop, ItemType.unknown),
+    LocationDef(400124, 'Forepaw Key Queen', 'Forepaw', LocationType.shop, ItemType.unknown),
+
+    # Trunk
+    LocationDef(400125, 'Trunk Hidden Ointment', 'Trunk', LocationType.hidden, ItemType.unknown),
+    LocationDef(400126, 'Trunk Hidden Red Potion', 'Trunk', LocationType.hidden, ItemType.red_potion),
+    LocationDef(400127, 'Trunk Red Potion', 'Trunk', LocationType.world, ItemType.red_potion),
+    LocationDef(None, 'Sky Spring', 'Trunk', LocationType.spring, ItemType.unknown),
+
+    # Joker Spring
+    LocationDef(400128, 'Joker Spring Ruby Ring', 'Joker Spring', LocationType.give, ItemType.unknown),
+    LocationDef(None, 'Joker Spring', 'Joker Spring', LocationType.spring, ItemType.unknown),
+
+    # Tower of Fortress
+    LocationDef(400129, 'Tower of Fortress Poison 1', 'Tower of Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400130, 'Tower of Fortress Poison 2', 'Tower of Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400131, 'Tower of Fortress Hidden Wingboots', 'Tower of Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400132, 'Tower of Fortress Ointment', 'Tower of Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400133, 'Tower of Fortress Boss Wingboots', 'Tower of Fortress', LocationType.boss_reward, ItemType.unknown),
+    LocationDef(400134, 'Tower of Fortress Elixir', 'Tower of Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400135, 'Tower of Fortress Guru', 'Tower of Fortress', LocationType.give, ItemType.unknown),
+    LocationDef(None, 'Tower of Fortress Spring', 'Tower of Fortress', LocationType.spring, ItemType.unknown),
+
+    # Path to Mascon
+    LocationDef(400136, 'Path to Mascon Hidden Wingboots', 'Path to Mascon', LocationType.hidden, ItemType.unknown),
+
+    # Tower of Red Potion
+    LocationDef(400137, 'Tower of Red Potion', 'Tower of Red Potion', LocationType.world, ItemType.red_potion),
+
+    # Mascon
+    LocationDef(400138, 'Mascon Large Shield', 'Mascon', LocationType.shop, ItemType.unknown),
+    LocationDef(400139, 'Mascon Thunder', 'Mascon', LocationType.shop, ItemType.unknown),
+    LocationDef(400140, 'Mascon Mattock', 'Mascon', LocationType.shop, ItemType.unknown),
+    LocationDef(400141, 'Mascon Red Potion', 'Mascon', LocationType.shop, ItemType.red_potion),
+    LocationDef(400142, 'Mascon Key Jack', 'Mascon', LocationType.shop, ItemType.unknown),
+    LocationDef(400143, 'Mascon Key Queen', 'Mascon', LocationType.shop, ItemType.unknown),
+
+    # Path to Victim
+    LocationDef(400144, 'Misty Shop Death', 'Path to Victim', LocationType.shop, ItemType.unknown),
+    LocationDef(400145, 'Misty Shop Hourglass', 'Path to Victim', LocationType.shop, ItemType.unknown),
+    LocationDef(400146, 'Misty Shop Elixir', 'Path to Victim', LocationType.shop, ItemType.unknown),
+    LocationDef(400147, 'Misty Shop Red Potion', 'Path to Victim', LocationType.shop, ItemType.red_potion),
+    LocationDef(400148, 'Misty Doctor Office', 'Path to Victim', LocationType.hidden, ItemType.unknown),
+
+    # Tower of Suffer
+    LocationDef(400149, 'Tower of Suffer Hidden Wingboots', 'Tower of Suffer', LocationType.hidden, ItemType.unknown),
+    LocationDef(400150, 'Tower of Suffer Hidden Hourglass', 'Tower of Suffer', LocationType.hidden, ItemType.unknown),
+    LocationDef(400151, 'Tower of Suffer Pendant', 'Tower of Suffer', LocationType.boss_reward, ItemType.unknown),
+
+    # Victim
+    LocationDef(400152, 'Victim Full Plate', 'Victim', LocationType.shop, ItemType.unknown),
+    LocationDef(400153, 'Victim Mattock', 'Victim', LocationType.shop, ItemType.unknown),
+    LocationDef(400154, 'Victim Red Potion', 'Victim', LocationType.shop, ItemType.red_potion),
+    LocationDef(400155, 'Victim Key King', 'Victim', LocationType.shop, ItemType.unknown),
+    LocationDef(400156, 'Victim Key Queen', 'Victim', LocationType.shop, ItemType.unknown),
+    LocationDef(400157, 'Victim Tavern', 'Mist', LocationType.give, ItemType.unknown),
+
+    # Mist
+    LocationDef(400158, 'Mist Hidden Poison 1', 'Mist', LocationType.hidden, ItemType.unknown),
+    LocationDef(400159, 'Mist Hidden Poison 2', 'Mist', LocationType.hidden, ItemType.unknown),
+    LocationDef(400160, 'Mist Hidden Wingboots', 'Mist', LocationType.hidden, ItemType.unknown),
+    LocationDef(400161, 'Misty Magic Hall', 'Mist', LocationType.give, ItemType.unknown),
+    LocationDef(400162, 'Misty House', 'Mist', LocationType.give, ItemType.unknown),
+
+    # Useless Tower
+    LocationDef(400163, 'Useless Tower', 'Useless Tower', LocationType.hidden, ItemType.unknown),
+
+    # Tower of Mist
+    LocationDef(400164, 'Tower of Mist Hidden Ointment', 'Tower of Mist', LocationType.hidden, ItemType.unknown),
+    LocationDef(400165, 'Tower of Mist Elixir', 'Tower of Mist', LocationType.world, ItemType.unknown),
+    LocationDef(400166, 'Tower of Mist Black Onyx', 'Tower of Mist', LocationType.boss_reward, ItemType.unknown),
+
+    # Path to Conflate
+    LocationDef(400167, 'Path to Conflate Hidden Ointment', 'Path to Conflate', LocationType.hidden, ItemType.unknown),
+    LocationDef(400168, 'Path to Conflate Poison', 'Path to Conflate', LocationType.hidden, ItemType.unknown),
+
+    # Helm Branch
+    LocationDef(400169, 'Helm Branch Hidden Glove', 'Helm Branch', LocationType.hidden, ItemType.unknown),
+    LocationDef(400170, 'Helm Branch Battle Helmet', 'Helm Branch', LocationType.boss_reward, ItemType.unknown),
+
+    # Conflate
+    LocationDef(400171, 'Conflate Giant Blade', 'Conflate', LocationType.shop, ItemType.unknown),
+    LocationDef(400172, 'Conflate Magic Shield', 'Conflate', LocationType.shop, ItemType.unknown),
+    LocationDef(400173, 'Conflate Wingboots', 'Conflate', LocationType.shop, ItemType.unknown),
+    LocationDef(400174, 'Conflate Red Potion', 'Conflate', LocationType.shop, ItemType.red_potion),
+    LocationDef(400175, 'Conflate Guru', 'Conflate', LocationType.give, ItemType.unknown),
+
+    # Branches
+    LocationDef(400176, 'Branches Hidden Ointment', 'Branches', LocationType.hidden, ItemType.unknown),
+    LocationDef(400177, 'Branches Poison', 'Branches', LocationType.world, ItemType.unknown),
+    LocationDef(400178, 'Branches Hidden Mattock', 'Branches', LocationType.hidden, ItemType.unknown),
+    LocationDef(400179, 'Branches Hidden Hourglass', 'Branches', LocationType.hidden, ItemType.unknown),
+
+    # Path to Daybreak
+    LocationDef(400180, 'Path to Daybreak Hidden Wingboots 1', 'Path to Daybreak', LocationType.hidden, ItemType.unknown),
+    LocationDef(400181, 'Path to Daybreak Magical Rod', 'Path to Daybreak', LocationType.world, ItemType.unknown),
+    LocationDef(400182, 'Path to Daybreak Hidden Wingboots 2', 'Path to Daybreak', LocationType.hidden, ItemType.unknown),
+    LocationDef(400183, 'Path to Daybreak Poison', 'Path to Daybreak', LocationType.world, ItemType.unknown),
+    LocationDef(400184, 'Path to Daybreak Glove', 'Path to Daybreak', LocationType.world, ItemType.unknown),
+    LocationDef(400185, 'Path to Daybreak Battle Suit', 'Path to Daybreak', LocationType.boss_reward, ItemType.unknown),
+
+    # Daybreak
+    LocationDef(400186, 'Daybreak Tilte', 'Daybreak', LocationType.shop, ItemType.unknown),
+    LocationDef(400187, 'Daybreak Giant Blade', 'Daybreak', LocationType.shop, ItemType.unknown),
+    LocationDef(400188, 'Daybreak Red Potion', 'Daybreak', LocationType.shop, ItemType.red_potion),
+    LocationDef(400189, 'Daybreak Key King', 'Daybreak', LocationType.shop, ItemType.unknown),
+    LocationDef(400190, 'Daybreak Key Queen', 'Daybreak', LocationType.shop, ItemType.unknown),
+
+    # Dartmoor Castle
+    LocationDef(400191, 'Dartmoor Castle Hidden Hourglass', 'Dartmoor Castle', LocationType.hidden, ItemType.unknown),
+    LocationDef(400192, 'Dartmoor Castle Hidden Red Potion', 'Dartmoor Castle', LocationType.hidden, ItemType.red_potion),
+
+    # Dartmoor
+    LocationDef(400193, 'Dartmoor Giant Blade', 'Dartmoor', LocationType.shop, ItemType.unknown),
+    LocationDef(400194, 'Dartmoor Red Potion', 'Dartmoor', LocationType.shop, ItemType.red_potion),
+    LocationDef(400195, 'Dartmoor Key King', 'Dartmoor', LocationType.shop, ItemType.unknown),
+
+    # Fraternal Castle
+    LocationDef(400196, 'Fraternal Castle Hidden Ointment', 'Fraternal Castle', LocationType.hidden, ItemType.unknown),
+    LocationDef(400197, 'Fraternal Castle Shop Hidden Ointment', 'Fraternal Castle', LocationType.hidden, ItemType.unknown),
+    LocationDef(400198, 'Fraternal Castle Poison 1', 'Fraternal Castle', LocationType.world, ItemType.unknown),
+    LocationDef(400199, 'Fraternal Castle Poison 2', 'Fraternal Castle', LocationType.world, ItemType.unknown),
+    LocationDef(400200, 'Fraternal Castle Poison 3', 'Fraternal Castle', LocationType.world, ItemType.unknown),
+    # LocationDef(400201, 'Fraternal Castle Red Potion', 'Fraternal Castle', LocationType.world, ItemType.red_potion),  # This location is inaccessible. Keeping commented for context.
+    LocationDef(400202, 'Fraternal Castle Hidden Hourglass', 'Fraternal Castle', LocationType.hidden, ItemType.unknown),
+    LocationDef(400203, 'Fraternal Castle Dragon Slayer', 'Fraternal Castle', LocationType.boss_reward, ItemType.unknown),
+    LocationDef(400204, 'Fraternal Castle Guru', 'Fraternal Castle', LocationType.give, ItemType.unknown),
+
+    # Evil Fortress
+    LocationDef(400205, 'Evil Fortress Ointment', 'Evil Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400206, 'Evil Fortress Poison 1', 'Evil Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400207, 'Evil Fortress Glove', 'Evil Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400208, 'Evil Fortress Poison 2', 'Evil Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400209, 'Evil Fortress Poison 3', 'Evil Fortress', LocationType.world, ItemType.unknown),
+    LocationDef(400210, 'Evil Fortress Hidden Glove', 'Evil Fortress', LocationType.hidden, ItemType.unknown),
+    LocationDef(None, 'Evil One', 'Evil Fortress', LocationType.boss, ItemType.unknown),
+]
diff --git a/worlds/faxanadu/Options.py b/worlds/faxanadu/Options.py
new file mode 100644
index 000000000000..dbcb5789944f
--- /dev/null
+++ b/worlds/faxanadu/Options.py
@@ -0,0 +1,107 @@
+from Options import PerGameCommonOptions, Toggle, DefaultOnToggle, StartInventoryPool, Choice
+from dataclasses import dataclass
+
+
+class KeepShopRedPotions(Toggle):
+    """
+    Prevents the Shop's Red Potions from being shuffled. Those locations
+    will have purchasable Red Potion as usual for their usual price.
+    """
+    display_name = "Keep Shop Red Potions"
+
+
+class IncludePendant(Toggle):
+    """
+    Pendant is an item that boosts your attack power permanently when picked up.
+    However, due to a programming error in the original game, it has the reverse
+    effect. You start with the Pendant power, and lose it when picking
+    it up. So this item is essentially a trap.
+    There is a setting in the client to reverse the effect back to its original intend.
+    This could be used in conjunction with this option to increase or lower difficulty.
+    """
+    display_name = "Include Pendant"
+
+
+class IncludePoisons(DefaultOnToggle):
+    """
+    Whether or not to include Poison Potions in the pool of items. Including them
+    effectively turn them into traps in multiplayer.
+    """
+    display_name = "Include Poisons"
+
+
+class RequireDragonSlayer(Toggle):
+    """
+    Requires the Dragon Slayer to be available before fighting the final boss is required.
+    Turning this on will turn Progressive Shields into progression items.
+
+    This setting does not force you to use Dragon Slayer to kill the final boss.
+    Instead, it ensures that you will have the Dragon Slayer and be able to equip
+    it before you are expected to beat the final boss.
+    """
+    display_name = "Require Dragon Slayer"
+
+
+class RandomMusic(Toggle):
+    """
+    All levels' music is shuffled. Except the title screen because it's finite.
+    This is an aesthetic option and doesn't affect gameplay.
+    """
+    display_name = "Random Musics"
+
+
+class RandomSound(Toggle):
+    """
+    All sounds are shuffled.
+    This is an aesthetic option and doesn't affect gameplay.
+    """
+    display_name = "Random Sounds"
+
+
+class RandomNPC(Toggle):
+    """
+    NPCs and their portraits are shuffled.
+    This is an aesthetic option and doesn't affect gameplay.
+    """
+    display_name = "Random NPCs"
+
+
+class RandomMonsters(Choice):
+    """
+    Choose how monsters are randomized.
+    "Vanilla": No randomization
+    "Level Shuffle": Monsters are shuffled within a level
+    "Level Random": Monsters are picked randomly, balanced based on the ratio of the current level
+    "World Shuffle": Monsters are shuffled across the entire world
+    "World Random": Monsters are picked randomly, balanced based on the ratio of the entire world
+    "Chaotic": Completely random, except big vs small ratio is kept. Big are mini-bosses.
+    """
+    display_name = "Random Monsters"
+    option_vanilla = 0
+    option_level_shuffle = 1
+    option_level_random = 2
+    option_world_shuffle = 3
+    option_world_random = 4
+    option_chaotic = 5
+    default = 0
+
+
+class RandomRewards(Toggle):
+    """
+    Monsters drops are shuffled.
+    """
+    display_name = "Random Rewards"
+
+
+@dataclass
+class FaxanaduOptions(PerGameCommonOptions):
+    start_inventory_from_pool: StartInventoryPool
+    keep_shop_red_potions: KeepShopRedPotions
+    include_pendant: IncludePendant
+    include_poisons: IncludePoisons
+    require_dragon_slayer: RequireDragonSlayer
+    random_musics: RandomMusic
+    random_sounds: RandomSound
+    random_npcs: RandomNPC
+    random_monsters: RandomMonsters
+    random_rewards: RandomRewards
diff --git a/worlds/faxanadu/Regions.py b/worlds/faxanadu/Regions.py
new file mode 100644
index 000000000000..9db11d8ef114
--- /dev/null
+++ b/worlds/faxanadu/Regions.py
@@ -0,0 +1,66 @@
+from BaseClasses import Region
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from . import FaxanaduWorld
+
+
+def create_region(name, player, multiworld):
+    region = Region(name, player, multiworld)
+    multiworld.regions.append(region)
+    return region
+
+
+def create_regions(faxanadu_world: "FaxanaduWorld"):
+    player = faxanadu_world.player
+    multiworld = faxanadu_world.multiworld
+
+    # Create regions
+    menu = create_region("Menu", player, multiworld)
+    eolis = create_region("Eolis", player, multiworld)
+    path_to_apolune = create_region("Path to Apolune", player, multiworld)
+    apolune = create_region("Apolune", player, multiworld)
+    create_region("Tower of Trunk", player, multiworld)
+    path_to_forepaw = create_region("Path to Forepaw", player, multiworld)
+    forepaw = create_region("Forepaw", player, multiworld)
+    trunk = create_region("Trunk", player, multiworld)
+    create_region("Joker Spring", player, multiworld)
+    create_region("Tower of Fortress", player, multiworld)
+    path_to_mascon = create_region("Path to Mascon", player, multiworld)
+    create_region("Tower of Red Potion", player, multiworld)
+    mascon = create_region("Mascon", player, multiworld)
+    path_to_victim = create_region("Path to Victim", player, multiworld)
+    create_region("Tower of Suffer", player, multiworld)
+    victim = create_region("Victim", player, multiworld)
+    mist = create_region("Mist", player, multiworld)
+    create_region("Useless Tower", player, multiworld)
+    create_region("Tower of Mist", player, multiworld)
+    path_to_conflate = create_region("Path to Conflate", player, multiworld)
+    create_region("Helm Branch", player, multiworld)
+    create_region("Conflate", player, multiworld)
+    branches = create_region("Branches", player, multiworld)
+    path_to_daybreak = create_region("Path to Daybreak", player, multiworld)
+    daybreak = create_region("Daybreak", player, multiworld)
+    dartmoor_castle = create_region("Dartmoor Castle", player, multiworld)
+    create_region("Dartmoor", player, multiworld)
+    create_region("Fraternal Castle", player, multiworld)
+    create_region("Evil Fortress", player, multiworld)
+
+    # Create connections
+    menu.add_exits(["Eolis"])
+    eolis.add_exits(["Path to Apolune"])
+    path_to_apolune.add_exits(["Apolune"])
+    apolune.add_exits(["Tower of Trunk", "Path to Forepaw"])
+    path_to_forepaw.add_exits(["Forepaw"])
+    forepaw.add_exits(["Trunk"])
+    trunk.add_exits(["Joker Spring", "Tower of Fortress", "Path to Mascon"])
+    path_to_mascon.add_exits(["Tower of Red Potion", "Mascon"])
+    mascon.add_exits(["Path to Victim"])
+    path_to_victim.add_exits(["Tower of Suffer", "Victim"])
+    victim.add_exits(["Mist"])
+    mist.add_exits(["Useless Tower", "Tower of Mist", "Path to Conflate"])
+    path_to_conflate.add_exits(["Helm Branch", "Conflate", "Branches"])
+    branches.add_exits(["Path to Daybreak"])
+    path_to_daybreak.add_exits(["Daybreak"])
+    daybreak.add_exits(["Dartmoor Castle"])
+    dartmoor_castle.add_exits(["Dartmoor", "Fraternal Castle", "Evil Fortress"])
diff --git a/worlds/faxanadu/Rules.py b/worlds/faxanadu/Rules.py
new file mode 100644
index 000000000000..a48b442c107a
--- /dev/null
+++ b/worlds/faxanadu/Rules.py
@@ -0,0 +1,79 @@
+from typing import TYPE_CHECKING
+from worlds.generic.Rules import set_rule
+
+if TYPE_CHECKING:
+    from . import FaxanaduWorld
+
+
+def can_buy_in_eolis(state, player):
+    # Sword or Deluge so we can farm for gold.
+    # Ring of Elf so we can get 1500 from the King.
+    return state.has_any(["Progressive Sword", "Deluge", "Ring of Elf"], player)
+
+
+def has_any_magic(state, player):
+    return state.has_any(["Deluge", "Thunder", "Fire", "Death", "Tilte"], player)
+
+
+def set_rules(faxanadu_world: "FaxanaduWorld"):
+    player = faxanadu_world.player
+    multiworld = faxanadu_world.multiworld
+
+    # Region rules
+    set_rule(multiworld.get_entrance("Eolis -> Path to Apolune", player), lambda state:
+             state.has_all(["Key Jack", "Progressive Sword"], player))  # You can't go far with magic only
+    set_rule(multiworld.get_entrance("Apolune -> Tower of Trunk", player), lambda state: state.has("Key Jack", player))
+    set_rule(multiworld.get_entrance("Apolune -> Path to Forepaw", player), lambda state: state.has("Mattock", player))
+    set_rule(multiworld.get_entrance("Trunk -> Joker Spring", player), lambda state: state.has("Key Joker", player))
+    set_rule(multiworld.get_entrance("Trunk -> Tower of Fortress", player), lambda state: state.has("Key Jack", player))
+    set_rule(multiworld.get_entrance("Trunk -> Path to Mascon", player), lambda state: 
+             state.has_all(["Key Queen", "Ring of Ruby", "Sky Spring Flow", "Tower of Fortress Spring Flow", "Joker Spring Flow"], player) and 
+             state.has("Progressive Sword", player, 2))
+    set_rule(multiworld.get_entrance("Path to Mascon -> Tower of Red Potion", player), lambda state:
+             state.has("Key Queen", player) and
+             state.has("Red Potion", player, 4))  # It's impossible to go through the tower of Red Potion without at least 1-2 potions. Give them 4 for good measure.
+    set_rule(multiworld.get_entrance("Path to Victim -> Tower of Suffer", player), lambda state: state.has("Key Queen", player))
+    set_rule(multiworld.get_entrance("Path to Victim -> Victim", player), lambda state: state.has("Unlock Wingboots", player))
+    set_rule(multiworld.get_entrance("Mist -> Useless Tower", player), lambda state:
+             state.has_all(["Key King", "Unlock Wingboots"], player))
+    set_rule(multiworld.get_entrance("Mist -> Tower of Mist", player), lambda state: state.has("Key King", player))
+    set_rule(multiworld.get_entrance("Mist -> Path to Conflate", player), lambda state: state.has("Key Ace", player))
+    set_rule(multiworld.get_entrance("Path to Conflate -> Helm Branch", player), lambda state: state.has("Key King", player))
+    set_rule(multiworld.get_entrance("Path to Conflate -> Branches", player), lambda state: state.has("Key King", player))
+    set_rule(multiworld.get_entrance("Daybreak -> Dartmoor Castle", player), lambda state: state.has("Ring of Dworf", player))
+    set_rule(multiworld.get_entrance("Dartmoor Castle -> Evil Fortress", player), lambda state: state.has("Demons Ring", player))
+
+    # Location rules
+    set_rule(multiworld.get_location("Eolis Key Jack", player), lambda state: can_buy_in_eolis(state, player))
+    set_rule(multiworld.get_location("Eolis Hand Dagger", player), lambda state: can_buy_in_eolis(state, player))
+    set_rule(multiworld.get_location("Eolis Elixir", player), lambda state: can_buy_in_eolis(state, player))
+    set_rule(multiworld.get_location("Eolis Deluge", player), lambda state: can_buy_in_eolis(state, player))
+    set_rule(multiworld.get_location("Eolis Red Potion", player), lambda state: can_buy_in_eolis(state, player))
+    set_rule(multiworld.get_location("Path to Apolune Magic Shield", player), lambda state: state.has("Key King", player))  # Mid-late cost, make sure we've progressed
+    set_rule(multiworld.get_location("Path to Apolune Death", player), lambda state: state.has("Key Ace", player))  # Mid-late cost, make sure we've progressed
+    set_rule(multiworld.get_location("Tower of Trunk Hidden Mattock", player), lambda state:
+             # This is actually possible if the monster drop into the stairs and kill it with dagger. But it's a "pro move"
+             state.has("Deluge", player, 1) or
+             state.has("Progressive Sword", player, 2))
+    set_rule(multiworld.get_location("Path to Forepaw Glove", player), lambda state:
+             state.has_all(["Deluge", "Unlock Wingboots"], player))
+    set_rule(multiworld.get_location("Trunk Red Potion", player), lambda state: state.has("Unlock Wingboots", player))
+    set_rule(multiworld.get_location("Sky Spring", player), lambda state: state.has("Unlock Wingboots", player))
+    set_rule(multiworld.get_location("Tower of Fortress Spring", player), lambda state: state.has("Spring Elixir", player))
+    set_rule(multiworld.get_location("Tower of Fortress Guru", player), lambda state: state.has("Sky Spring Flow", player))
+    set_rule(multiworld.get_location("Tower of Suffer Hidden Wingboots", player), lambda state: 
+             state.has("Deluge", player) or
+             state.has("Progressive Sword", player, 2))
+    set_rule(multiworld.get_location("Misty House", player), lambda state: state.has("Black Onyx", player))
+    set_rule(multiworld.get_location("Misty Doctor Office", player), lambda state: has_any_magic(state, player))
+    set_rule(multiworld.get_location("Conflate Guru", player), lambda state: state.has("Progressive Armor", player, 3))
+    set_rule(multiworld.get_location("Branches Hidden Mattock", player), lambda state: state.has("Unlock Wingboots", player))
+    set_rule(multiworld.get_location("Path to Daybreak Glove", player), lambda state: state.has("Unlock Wingboots", player))
+    set_rule(multiworld.get_location("Dartmoor Castle Hidden Hourglass", player), lambda state: state.has("Unlock Wingboots", player))
+    set_rule(multiworld.get_location("Dartmoor Castle Hidden Red Potion", player), lambda state: has_any_magic(state, player))
+    set_rule(multiworld.get_location("Fraternal Castle Guru", player), lambda state: state.has("Progressive Sword", player, 4))
+    set_rule(multiworld.get_location("Fraternal Castle Shop Hidden Ointment", player), lambda state: has_any_magic(state, player))
+
+    if faxanadu_world.options.require_dragon_slayer.value:
+        set_rule(multiworld.get_location("Evil One", player), lambda state: 
+                 state.has_all_counts({"Progressive Sword": 4, "Progressive Armor": 3, "Progressive Shield": 4}, player))
diff --git a/worlds/faxanadu/__init__.py b/worlds/faxanadu/__init__.py
new file mode 100644
index 000000000000..c4ae1ccaa198
--- /dev/null
+++ b/worlds/faxanadu/__init__.py
@@ -0,0 +1,190 @@
+from typing import Any, Dict, List
+
+from BaseClasses import Item, Location, Tutorial, ItemClassification, MultiWorld
+from worlds.AutoWorld import WebWorld, World
+from . import Items, Locations, Regions, Rules
+from .Options import FaxanaduOptions
+from worlds.generic.Rules import set_rule
+
+
+DAXANADU_VERSION = "0.3.0"
+
+
+class FaxanaduLocation(Location):
+    game: str = "Faxanadu"
+
+
+class FaxanaduItem(Item):
+    game: str = "Faxanadu"
+
+
+class FaxanaduWeb(WebWorld):
+    tutorials = [Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up the Faxanadu randomizer connected to an Archipelago Multiworld",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Daivuk"]
+    )]
+    theme = "dirt"
+
+
+class FaxanaduWorld(World):
+    """
+    Faxanadu is an action role-playing platform video game developed by Hudson Soft for the Nintendo Entertainment System
+    """
+    options_dataclass = FaxanaduOptions
+    options: FaxanaduOptions
+    game = "Faxanadu"
+    web = FaxanaduWeb()
+
+    item_name_to_id = {item.name: item.id for item in Items.items if item.id is not None}
+    item_name_to_item = {item.name: item for item in Items.items}
+    location_name_to_id = {loc.name: loc.id for loc in Locations.locations if loc.id is not None}
+
+    def __init__(self, world: MultiWorld, player: int):
+        self.filler_ratios: Dict[str, int] = {}
+        
+        super().__init__(world, player)
+
+    def create_regions(self):
+        Regions.create_regions(self)
+
+        # Add locations into regions
+        for region in self.multiworld.get_regions(self.player):
+            for loc in [location for location in Locations.locations if location.region == region.name]:
+                location = FaxanaduLocation(self.player, loc.name, loc.id, region)
+
+                # In Faxanadu, Poison hurts you when picked up. It makes no sense to sell them in shops
+                if loc.type == Locations.LocationType.shop:
+                    location.item_rule = lambda item, player=self.player: not (player == item.player and item.name == "Poison")
+                
+                region.locations.append(location)
+
+    def set_rules(self):
+        Rules.set_rules(self)
+        self.multiworld.completion_condition[self.player] = lambda state: state.has("Killed Evil One", self.player)
+
+    def create_item(self, name: str) -> FaxanaduItem:
+        item: Items.ItemDef = self.item_name_to_item[name]
+        return FaxanaduItem(name, item.classification, item.id, self.player)
+
+    # Returns how many red potions were prefilled into shops
+    def prefill_shop_red_potions(self) -> int:
+        red_potion_in_shop_count = 0
+        if self.options.keep_shop_red_potions:
+            red_potion_item = self.item_name_to_item["Red Potion"]
+            red_potion_shop_locations = [
+                loc
+                for loc in Locations.locations
+                if loc.type == Locations.LocationType.shop and loc.original_item == Locations.ItemType.red_potion
+            ]
+            for loc in red_potion_shop_locations:
+                location = self.get_location(loc.name)
+                location.place_locked_item(FaxanaduItem(red_potion_item.name, red_potion_item.classification, red_potion_item.id, self.player))
+                red_potion_in_shop_count += 1
+        return red_potion_in_shop_count
+
+    def put_wingboot_in_shop(self, shops, region_name):
+        item = self.item_name_to_item["Wingboots"]
+        shop = shops.pop(region_name)
+        slot = self.random.randint(0, len(shop) - 1)
+        loc = shop[slot]
+        location = self.get_location(loc.name)
+        location.place_locked_item(FaxanaduItem(item.name, item.classification, item.id, self.player))
+
+        # Put a rule right away that we need to have to unlocked.
+        set_rule(location, lambda state: state.has("Unlock Wingboots", self.player))
+
+    # Returns how many wingboots were prefilled into shops
+    def prefill_shop_wingboots(self) -> int:
+        # Collect shops
+        shops: Dict[str, List[Locations.LocationDef]] = {}
+        for loc in Locations.locations:
+            if loc.type == Locations.LocationType.shop:
+                if self.options.keep_shop_red_potions and loc.original_item == Locations.ItemType.red_potion:
+                    continue # Don't override our red potions
+                shops.setdefault(loc.region, []).append(loc)
+        
+        shop_count = len(shops)
+        wingboots_count = round(shop_count / 2.5) # On 10 shops, we should have about 4 shops with wingboots
+
+        # At least one should be in the first 4 shops. Because we require wingboots to progress past that point.
+        must_have_regions = [region for i, region in enumerate(shops) if i < 4]
+        self.put_wingboot_in_shop(shops, self.random.choice(must_have_regions))
+
+        # Fill in the rest randomly in remaining shops
+        for i in range(wingboots_count - 1): # -1 because we added one already
+            region = self.random.choice(list(shops.keys()))
+            self.put_wingboot_in_shop(shops, region)
+
+        return wingboots_count
+
+    def create_items(self) -> None:
+        itempool: List[FaxanaduItem] = []
+
+        # Prefill red potions in shops if option is set
+        red_potion_in_shop_count = self.prefill_shop_red_potions()
+
+        # Prefill wingboots in shops
+        wingboots_in_shop_count = self.prefill_shop_wingboots()
+
+        # Create the item pool, excluding fillers.
+        prefilled_count = red_potion_in_shop_count + wingboots_in_shop_count
+        for item in Items.items:
+            # Ignore pendant if turned off
+            if item.name == "Pendant" and not self.options.include_pendant:
+                continue
+
+            # ignore fillers for now, we will fill them later
+            if item.classification in [ItemClassification.filler, ItemClassification.trap] and \
+               item.progression_count == 0:
+                continue
+
+            prefill_loc = None
+            if item.prefill_location:
+                prefill_loc = self.get_location(item.prefill_location)
+
+            # if require dragon slayer is turned on, we need progressive shields to be progression
+            item_classification = item.classification
+            if self.options.require_dragon_slayer and item.name == "Progressive Shield":
+                item_classification = ItemClassification.progression
+
+            if prefill_loc:
+                prefill_loc.place_locked_item(FaxanaduItem(item.name, item_classification, item.id, self.player))
+                prefilled_count += 1
+            else:
+                for i in range(item.count - item.progression_count):
+                    itempool.append(FaxanaduItem(item.name, item_classification, item.id, self.player))
+                for i in range(item.progression_count):
+                    itempool.append(FaxanaduItem(item.name, ItemClassification.progression, item.id, self.player))
+
+        # Set up filler ratios
+        self.filler_ratios = {
+            item.name: item.count
+            for item in Items.items
+            if item.classification in [ItemClassification.filler, ItemClassification.trap]
+        }
+
+        # If red potions are locked in shops, remove the count from the ratio.
+        self.filler_ratios["Red Potion"] -= red_potion_in_shop_count
+
+        # Remove poisons if not desired
+        if not self.options.include_poisons:
+            self.filler_ratios["Poison"] = 0
+
+        # Randomly add fillers to the pool with ratios based on og game occurrence counts.
+        filler_count = len(Locations.locations) - len(itempool) - prefilled_count
+        for i in range(filler_count):
+            itempool.append(self.create_item(self.get_filler_item_name()))
+                
+        self.multiworld.itempool += itempool
+
+    def get_filler_item_name(self) -> str:
+        return self.random.choices(list(self.filler_ratios.keys()), weights=list(self.filler_ratios.values()))[0]
+    
+    def fill_slot_data(self) -> Dict[str, Any]:
+        slot_data = self.options.as_dict("keep_shop_red_potions", "random_musics", "random_sounds", "random_npcs", "random_monsters", "random_rewards")
+        slot_data["daxanadu_version"] = DAXANADU_VERSION
+        return slot_data
diff --git a/worlds/faxanadu/docs/en_Faxanadu.md b/worlds/faxanadu/docs/en_Faxanadu.md
new file mode 100644
index 000000000000..7f5c4ab293ce
--- /dev/null
+++ b/worlds/faxanadu/docs/en_Faxanadu.md
@@ -0,0 +1,27 @@
+# Faxanadu
+
+## Where is the settings page?
+
+The [player options page](../player-options) contains the options needed to configure your game session.
+
+## What does randomization do to this game?
+
+All game items collected in the map, shops, and boss drops are randomized.
+
+Keys are unique. Once you get the Jack Key, you can open all Jack doors; the key stays in your inventory.
+
+Wingboots are randomized across shops only. They are LOCKED and cannot be bought until you get the item that unlocks them.
+
+Normal Elixirs don't revive the tower spring. A new item, Spring Elixir, is necessary. This new item is unique.
+
+## What is the goal?
+
+The goal is to kill the Evil One.
+
+## What is a "check" in The Faxanadu?
+
+Shop items, item locations in the world, boss drops, and secret items.
+
+## What "items" can you unlock in Faxanadu?
+
+Keys, Armors, Weapons, Potions, Shields, Magics, Poisons, Gloves, etc.
diff --git a/worlds/faxanadu/docs/setup_en.md b/worlds/faxanadu/docs/setup_en.md
new file mode 100644
index 000000000000..4ff714c61393
--- /dev/null
+++ b/worlds/faxanadu/docs/setup_en.md
@@ -0,0 +1,32 @@
+# Faxanadu Randomizer Setup
+
+## Required Software
+
+- [Daxanadu](https://github.com/Daivuk/Daxanadu/releases/)
+- Faxanadu ROM, English version
+
+## Optional Software
+
+- [ArchipelagoTextClient](https://github.com/ArchipelagoMW/Archipelago/releases)
+
+## Installing Daxanadu
+1. Download [Daxanadu.zip](https://github.com/Daivuk/Daxanadu/releases/) and extract it.
+2. Copy your rom `Faxanadu (U).nes` into the newly extracted folder.
+
+## Joining a MultiWorld Game
+
+1. Launch Daxanadu.exe
+2. From the Main menu, go to the `ARCHIPELAGO` menu. Enter the server's address, slot name, and password. Then select `PLAY`.
+3. Enjoy!
+
+To continue a game, follow the same connection steps.
+Connecting with a different seed won't erase your progress in other seeds.
+
+## Archipelago Text Client
+
+We recommend having Archipelago's Text Client open on the side to keep track of what items you receive and send.
+Daxanadu doesn't display messages. You'll only get popups when picking them up.
+
+## Auto-Tracking
+
+Daxanadu has an integrated tracker that can be toggled in the options.

From 1365bd7a0ac0a130de3f383505140091ef8a0683 Mon Sep 17 00:00:00 2001
From: Kaito Sinclaire <ks@rosenthalcastle.org>
Date: Fri, 29 Nov 2024 13:46:38 -0800
Subject: [PATCH 086/381] CODEOWNERS: Add KScl as world maintainer for id Tech
 1 games (#4288)

---
 docs/CODEOWNERS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index 4b7496c686c8..64a1362bf380 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -55,10 +55,10 @@
 /worlds/dlcquest/ @axe-y @agilbert1412
 
 # DOOM 1993
-/worlds/doom_1993/ @Daivuk
+/worlds/doom_1993/ @Daivuk @KScl
 
 # DOOM II
-/worlds/doom_ii/ @Daivuk
+/worlds/doom_ii/ @Daivuk @KScl
 
 # Factorio
 /worlds/factorio/ @Berserker66
@@ -70,7 +70,7 @@
 /worlds/ffmq/ @Alchav @wildham0
 
 # Heretic
-/worlds/heretic/ @Daivuk
+/worlds/heretic/ @Daivuk @KScl
 
 # Hollow Knight
 /worlds/hk/ @BadMagic100 @qwint

From 7c00c9a49d4f1626c049ad132e64da2d09f5e818 Mon Sep 17 00:00:00 2001
From: palex00 <32203971+palex00@users.noreply.github.com>
Date: Fri, 29 Nov 2024 22:48:01 +0100
Subject: [PATCH 087/381] Core: Change "Unreachable Items" to "Unreachable
 progression items" in playthrough warning for clarification (#4287)

---
 BaseClasses.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 700a21506ac8..d84da5d212b4 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1545,7 +1545,7 @@ def write_option(option_key: str, option_obj: Options.AssembleOptions) -> None:
                 [f"  {location}: {item}" for (location, item) in sphere.items()] if isinstance(sphere, dict) else
                 [f"  {item}" for item in sphere])) for (sphere_nr, sphere) in self.playthrough.items()]))
             if self.unreachables:
-                outfile.write('\n\nUnreachable Items:\n\n')
+                outfile.write('\n\nUnreachable Progression Items:\n\n')
                 outfile.write(
                     '\n'.join(['%s: %s' % (unreachable.item, unreachable) for unreachable in self.unreachables]))
 

From b0a61be9df713e31ec874d84326d26f3d3e225ac Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Fri, 29 Nov 2024 16:57:35 -0500
Subject: [PATCH 088/381] Tests: Add test that local/non local items aren't
 modified late #3976

---
 test/general/test_items.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/general/test_items.py b/test/general/test_items.py
index 9cc91a1b00ef..64ce1b6997b7 100644
--- a/test/general/test_items.py
+++ b/test/general/test_items.py
@@ -80,3 +80,21 @@ def test_itempool_not_modified(self):
                         call_all(multiworld, step)
                         self.assertEqual(created_items, multiworld.itempool,
                                          f"{game_name} modified the itempool during {step}")
+
+    def test_locality_not_modified(self):
+        """Test that worlds don't modify the locality of items after duplicates are resolved"""
+        gen_steps = ("generate_early", "create_regions", "create_items")
+        additional_steps = ("set_rules", "generate_basic", "pre_fill")
+        worlds_to_test = {game: world for game, world in AutoWorldRegister.world_types.items()}
+        for game_name, world_type in worlds_to_test.items():
+            with self.subTest("Game", game=game_name):
+                multiworld = setup_solo_multiworld(world_type, gen_steps)
+                local_items = multiworld.worlds[1].options.local_items.value.copy()
+                non_local_items = multiworld.worlds[1].options.non_local_items.value.copy()
+                for step in additional_steps:
+                    with self.subTest("step", step=step):
+                        call_all(multiworld, step)
+                        self.assertEqual(local_items, multiworld.worlds[1].options.local_items.value,
+                                         f"{game_name} modified local_items during {step}")
+                        self.assertEqual(non_local_items, multiworld.worlds[1].options.non_local_items.value,
+                                         f"{game_name} modified non_local_items during {step}")

From 46dfc4d4fc00d61e89a2b3885053d003df7bae81 Mon Sep 17 00:00:00 2001
From: Aaron Wagener <mmmcheese158@gmail.com>
Date: Fri, 29 Nov 2024 16:37:14 -0600
Subject: [PATCH 089/381] Core: Allow option groups to specify option order
 (#3393)

* Core: Allow option groups to specify option order

* words hard

* Actually use the earlier built dictionary for faster in checking

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 Options.py | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/Options.py b/Options.py
index d81f81face06..0d0e6ae1cd95 100644
--- a/Options.py
+++ b/Options.py
@@ -1463,22 +1463,26 @@ class OptionGroup(typing.NamedTuple):
 def get_option_groups(world: typing.Type[World], visibility_level: Visibility = Visibility.template) -> typing.Dict[
         str, typing.Dict[str, typing.Type[Option[typing.Any]]]]:
     """Generates and returns a dictionary for the option groups of a specified world."""
-    option_groups = {option: option_group.name
-                     for option_group in world.web.option_groups
-                     for option in option_group.options}
+    option_to_name = {option: option_name for option_name, option in world.options_dataclass.type_hints.items()}
+
+    ordered_groups = {group.name: group.options for group in world.web.option_groups}
+
     # add a default option group for uncategorized options to get thrown into
-    ordered_groups = ["Game Options"]
-    [ordered_groups.append(group) for group in option_groups.values() if group not in ordered_groups]
-    grouped_options = {group: {} for group in ordered_groups}
-    for option_name, option in world.options_dataclass.type_hints.items():
-        if visibility_level & option.visibility:
-            grouped_options[option_groups.get(option, "Game Options")][option_name] = option
-
-    # if the world doesn't have any ungrouped options, this group will be empty so just remove it
-    if not grouped_options["Game Options"]:
-        del grouped_options["Game Options"]
-
-    return grouped_options
+    if "Game Options" not in ordered_groups:
+        grouped_options = set(option for group in ordered_groups.values() for option in group)
+        ungrouped_options = [option for option in option_to_name if option not in grouped_options]
+        # only add the game options group if we have ungrouped options
+        if ungrouped_options:
+            ordered_groups = {**{"Game Options": ungrouped_options}, **ordered_groups}
+
+    return {
+        group: {
+            option_to_name[option]: option
+            for option in group_options
+            if (visibility_level in option.visibility and option in option_to_name)
+        }
+        for group, group_options in ordered_groups.items()
+    }
 
 
 def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], generate_hidden: bool = True) -> None:

From dd88b2c6581e9f5db97dc3601086637f34c52b5f Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Fri, 29 Nov 2024 23:47:27 +0100
Subject: [PATCH 090/381] The Witness: Fix unreachable locations on Longbox +
 Postgame #4291

---
 worlds/witness/player_logic.py                 | 2 +-
 worlds/witness/test/test_roll_other_options.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index ec4ea066e579..58f15532f58c 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -984,7 +984,7 @@ def make_event_panel_lists(self) -> None:
         Makes event-item pairs for entities with associated events, unless these entities are disabled.
         """
 
-        self.ALWAYS_EVENT_NAMES_BY_HEX[self.VICTORY_LOCATION] = "Victory"
+        self.USED_EVENT_NAMES_BY_HEX[self.VICTORY_LOCATION].append("Victory")
 
         for event_hex, event_name in self.ALWAYS_EVENT_NAMES_BY_HEX.items():
             self.USED_EVENT_NAMES_BY_HEX[event_hex].append(event_name)
diff --git a/worlds/witness/test/test_roll_other_options.py b/worlds/witness/test/test_roll_other_options.py
index 0429b097eac3..05f3235a1f4d 100644
--- a/worlds/witness/test/test_roll_other_options.py
+++ b/worlds/witness/test/test_roll_other_options.py
@@ -62,3 +62,10 @@ class TestPostgameGroupedDoors(WitnessTestBase):
         "door_groupings": "regional",
         "victory_condition": "elevator",
     }
+
+
+class TestPostgamePanels(WitnessTestBase):
+    options = {
+        "victory_condition": "mountain_box_long",
+        "shuffle_postgame": True
+    }

From 1487d323cd165270c85ebf938b47cf1726a33900 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Fri, 29 Nov 2024 18:01:24 -0500
Subject: [PATCH 091/381] Core: update error message for mismatched "event"
 placements #4043

---
 Main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Main.py b/Main.py
index 606514630f0d..b9612e9549ba 100644
--- a/Main.py
+++ b/Main.py
@@ -282,7 +282,7 @@ def precollect_hint(location):
                     if type(location.address) == int:
                         assert location.item.code is not None, "item code None should be event, " \
                                                                "location.address should then also be None. Location: " \
-                                                               f" {location}"
+                                                               f" {location}, Item: {location.item}"
                         assert location.address not in locations_data[location.player], (
                             f"Locations with duplicate address. {location} and "
                             f"{locations_data[location.player][location.address]}")

From 492e3a355e5f9ec341e3b27fc522372374de1cea Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sat, 30 Nov 2024 00:37:26 +0100
Subject: [PATCH 092/381] WebHost: delete unused script tag (#4062)

---
 WebHostLib/templates/templates.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WebHostLib/templates/templates.html b/WebHostLib/templates/templates.html
index fb6ea7e9eab5..3b2418ae15b6 100644
--- a/WebHostLib/templates/templates.html
+++ b/WebHostLib/templates/templates.html
@@ -4,9 +4,6 @@
     {% include 'header/grassHeader.html' %}
     <title>Option Templates (YAML)</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/markdown.css") }}" />
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js"
-            integrity="sha512-L03kznCrNOfVxOUovR6ESfCz9Gfny7gihUX/huVbQB9zjODtYpxaVtIaAkpetoiyV2eqWbvxMH9fiSv5enX7bw=="
-            crossorigin="anonymous"></script>
 {% endblock %}
 
 {% block body %}

From e262c8be9cc6b4c315673e9c7675fdf0d1328c1d Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Fri, 29 Nov 2024 19:46:35 -0500
Subject: [PATCH 093/381] Stardew Valley: Fix a bug where locations in logic
 would disappear from universal tracker as items get sent (#4230)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/stardew_valley/__init__.py             | 72 ++++++++++++-------
 worlds/stardew_valley/items.py                | 13 ++--
 worlds/stardew_valley/stardew_rule/state.py   | 12 +++-
 worlds/stardew_valley/test/TestCrops.py       |  8 +--
 worlds/stardew_valley/test/TestOptions.py     | 19 ++++-
 worlds/stardew_valley/test/__init__.py        | 33 ++++-----
 .../stardew_valley/test/rules/TestArcades.py  | 52 +++++++-------
 .../test/rules/TestBuildings.py               |  8 +--
 .../test/rules/TestCookingRecipes.py          | 32 ++++-----
 .../test/rules/TestCraftingRecipes.py         | 30 ++++----
 .../test/rules/TestDonations.py               |  6 +-
 .../test/rules/TestFriendship.py              | 34 ++++-----
 .../stardew_valley/test/rules/TestShipping.py |  2 +-
 .../test/rules/TestStateRules.py              | 28 +++++---
 worlds/stardew_valley/test/rules/TestTools.py | 40 +++++------
 .../stardew_valley/test/rules/TestWeapons.py  | 48 ++++++-------
 .../test/stability/TestStability.py           |  7 +-
 17 files changed, 242 insertions(+), 202 deletions(-)

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 01ca56531f00..135afa1c9726 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -3,7 +3,7 @@
 from typing import Dict, Any, Iterable, Optional, Union, List, TextIO
 
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
-from Options import PerGameCommonOptions
+from Options import PerGameCommonOptions, Accessibility
 from worlds.AutoWorld import World, WebWorld
 from . import rules
 from .bundles.bundle_room import BundleRoom
@@ -91,15 +91,14 @@ class StardewValleyWorld(World):
     web = StardewWebWorld()
     modified_bundles: List[BundleRoom]
     randomized_entrances: Dict[str, str]
-    total_progression_items: int
 
-    # all_progression_items: Dict[str, int] # If you need to debug total_progression_items, uncommenting this will help tremendously
+    total_progression_items: int
+    excluded_from_total_progression_items: List[str] = [Event.received_walnuts]
 
     def __init__(self, multiworld: MultiWorld, player: int):
         super().__init__(multiworld, player)
         self.filler_item_pool_names = []
         self.total_progression_items = 0
-        # self.all_progression_items = dict()
 
         # Taking the seed specified in slot data for UT, otherwise just generating the seed.
         self.seed = getattr(multiworld, "re_gen_passthrough", {}).get(STARDEW_VALLEY, self.random.getrandbits(64))
@@ -121,17 +120,27 @@ def force_change_options_if_incompatible(self):
         goal_is_perfection = self.options.goal == Goal.option_perfection
         goal_is_island_related = goal_is_walnut_hunter or goal_is_perfection
         exclude_ginger_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true
+
         if goal_is_island_related and exclude_ginger_island:
             self.options.exclude_ginger_island.value = ExcludeGingerIsland.option_false
             goal_name = self.options.goal.current_key
-            player_name = self.multiworld.player_name[self.player]
             logger.warning(
-                f"Goal '{goal_name}' requires Ginger Island. Exclude Ginger Island setting forced to 'False' for player {self.player} ({player_name})")
+                f"Goal '{goal_name}' requires Ginger Island. Exclude Ginger Island setting forced to 'False' for player {self.player} ({self.player_name})")
+
         if exclude_ginger_island and self.options.walnutsanity != Walnutsanity.preset_none:
             self.options.walnutsanity.value = Walnutsanity.preset_none
-            player_name = self.multiworld.player_name[self.player]
             logger.warning(
-                f"Walnutsanity requires Ginger Island. Ginger Island was excluded from {self.player} ({player_name})'s world, so walnutsanity was force disabled")
+                f"Walnutsanity requires Ginger Island. Ginger Island was excluded from {self.player} ({self.player_name})'s world, so walnutsanity was force disabled")
+
+        if goal_is_perfection and self.options.accessibility == Accessibility.option_minimal:
+            self.options.accessibility.value = Accessibility.option_full
+            logger.warning(
+                f"Goal 'Perfection' requires full accessibility. Accessibility setting forced to 'Full' for player {self.player} ({self.player_name})")
+
+        elif self.options.goal == Goal.option_allsanity and self.options.accessibility == Accessibility.option_minimal:
+            self.options.accessibility.value = Accessibility.option_full
+            logger.warning(
+                f"Goal 'Allsanity' requires full accessibility. Accessibility setting forced to 'Full' for player {self.player} ({self.player_name})")
 
     def create_regions(self):
         def create_region(name: str, exits: Iterable[str]) -> Region:
@@ -171,8 +180,7 @@ def create_items(self):
                                for location in self.multiworld.get_locations(self.player)
                                if location.address is not None])
 
-        created_items = create_items(self.create_item, self.delete_item, locations_count, items_to_exclude, self.options, self.content,
-                                     self.random)
+        created_items = create_items(self.create_item, locations_count, items_to_exclude, self.options, self.content, self.random)
 
         self.multiworld.itempool += created_items
 
@@ -180,6 +188,18 @@ def create_items(self):
         self.setup_player_events()
         self.setup_victory()
 
+        # This is really a best-effort to get the total progression items count. It is mostly used to spread grinds across spheres are push back locations that
+        # only become available after months or years in game. In most cases, not having the exact count will not impact the logic.
+        #
+        # The actual total can be impacted by the start_inventory_from_pool, when items are removed from the pool but not from the total. The is also a bug
+        # with plando where additional progression items can be created without being accounted for, which impact the real amount of progression items. This can
+        # ultimately create unwinnable seeds where some items (like Blueberry seeds) are locked in Shipsanity: Blueberry, but world is deemed winnable as the
+        # winning rule only check the count of collected progression items.
+        self.total_progression_items += sum(1 for i in self.multiworld.precollected_items[self.player] if i.advancement)
+        self.total_progression_items += sum(1 for i in self.multiworld.get_filled_locations(self.player) if i.advancement)
+        self.total_progression_items += sum(1 for i in created_items if i.advancement)
+        self.total_progression_items -= 1  # -1 for the victory event
+
     def precollect_starting_season(self):
         if self.options.season_randomization == SeasonRandomization.option_progressive:
             return
@@ -304,14 +324,8 @@ def create_item(self, item: Union[str, ItemData], override_classification: ItemC
         if override_classification is None:
             override_classification = item.classification
 
-        if override_classification & ItemClassification.progression:
-            self.total_progression_items += 1
         return StardewItem(item.name, override_classification, item.code, self.player)
 
-    def delete_item(self, item: Item):
-        if item.classification & ItemClassification.progression:
-            self.total_progression_items -= 1
-
     def create_starting_item(self, item: Union[str, ItemData]) -> StardewItem:
         if isinstance(item, str):
             item = item_table[item]
@@ -330,10 +344,6 @@ def create_event_location(self, location_data: LocationData, rule: StardewRule =
         region.locations.append(location)
         location.place_locked_item(StardewItem(item, ItemClassification.progression, None, self.player))
 
-        # This is not ideal, but the rule count them so...
-        if item != Event.victory:
-            self.total_progression_items += 1
-
     def set_rules(self):
         set_rules(self)
 
@@ -426,15 +436,25 @@ def fill_slot_data(self) -> Dict[str, Any]:
 
     def collect(self, state: CollectionState, item: StardewItem) -> bool:
         change = super().collect(state, item)
-        if change:
-            state.prog_items[self.player][Event.received_walnuts] += self.get_walnut_amount(item.name)
-        return change
+        if not change:
+            return False
+
+        walnut_amount = self.get_walnut_amount(item.name)
+        if walnut_amount:
+            state.prog_items[self.player][Event.received_walnuts] += walnut_amount
+
+        return True
 
     def remove(self, state: CollectionState, item: StardewItem) -> bool:
         change = super().remove(state, item)
-        if change:
-            state.prog_items[self.player][Event.received_walnuts] -= self.get_walnut_amount(item.name)
-        return change
+        if not change:
+            return False
+
+        walnut_amount = self.get_walnut_amount(item.name)
+        if walnut_amount:
+            state.prog_items[self.player][Event.received_walnuts] -= walnut_amount
+
+        return True
 
     @staticmethod
     def get_walnut_amount(item_name: str) -> int:
diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py
index 993863bf5bf5..5bf59a5e8397 100644
--- a/worlds/stardew_valley/items.py
+++ b/worlds/stardew_valley/items.py
@@ -169,14 +169,14 @@ def get_too_many_items_error_message(locations_count: int, items_count: int) ->
     return f"There should be at least as many locations [{locations_count}] as there are mandatory items [{items_count}]"
 
 
-def create_items(item_factory: StardewItemFactory, item_deleter: StardewItemDeleter, locations_count: int, items_to_exclude: List[Item],
+def create_items(item_factory: StardewItemFactory, locations_count: int, items_to_exclude: List[Item],
                  options: StardewValleyOptions, content: StardewContent, random: Random) -> List[Item]:
     items = []
     unique_items = create_unique_items(item_factory, options, content, random)
 
-    remove_items(item_deleter, items_to_exclude, unique_items)
+    remove_items(items_to_exclude, unique_items)
 
-    remove_items_if_no_room_for_them(item_deleter, unique_items, locations_count, random)
+    remove_items_if_no_room_for_them(unique_items, locations_count, random)
 
     items += unique_items
     logger.debug(f"Created {len(unique_items)} unique items")
@@ -192,14 +192,13 @@ def create_items(item_factory: StardewItemFactory, item_deleter: StardewItemDele
     return items
 
 
-def remove_items(item_deleter: StardewItemDeleter, items_to_remove, items):
+def remove_items(items_to_remove, items):
     for item in items_to_remove:
         if item in items:
             items.remove(item)
-            item_deleter(item)
 
 
-def remove_items_if_no_room_for_them(item_deleter: StardewItemDeleter, unique_items: List[Item], locations_count: int, random: Random):
+def remove_items_if_no_room_for_them(unique_items: List[Item], locations_count: int, random: Random):
     if len(unique_items) <= locations_count:
         return
 
@@ -212,7 +211,7 @@ def remove_items_if_no_room_for_them(item_deleter: StardewItemDeleter, unique_it
         logger.debug(f"Player has more items than locations, trying to remove {number_of_items_to_remove} random filler items")
     assert len(removable_items) >= number_of_items_to_remove, get_too_many_items_error_message(locations_count, len(unique_items))
     items_to_remove = random.sample(removable_items, number_of_items_to_remove)
-    remove_items(item_deleter, items_to_remove, unique_items)
+    remove_items(items_to_remove, unique_items)
 
 
 def create_unique_items(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, random: Random) -> List[Item]:
diff --git a/worlds/stardew_valley/stardew_rule/state.py b/worlds/stardew_valley/stardew_rule/state.py
index 5f5e61b3d4e5..6fc349a6274d 100644
--- a/worlds/stardew_valley/stardew_rule/state.py
+++ b/worlds/stardew_valley/stardew_rule/state.py
@@ -1,10 +1,13 @@
 from dataclasses import dataclass
-from typing import Iterable, Union, List, Tuple, Hashable
+from typing import Iterable, Union, List, Tuple, Hashable, TYPE_CHECKING
 
 from BaseClasses import CollectionState
 from .base import BaseStardewRule, CombinableStardewRule
 from .protocol import StardewRule
 
+if TYPE_CHECKING:
+    from .. import StardewValleyWorld
+
 
 class TotalReceived(BaseStardewRule):
     count: int
@@ -102,16 +105,19 @@ def value(self):
         return self.percent
 
     def __call__(self, state: CollectionState) -> bool:
-        stardew_world = state.multiworld.worlds[self.player]
+        stardew_world: "StardewValleyWorld" = state.multiworld.worlds[self.player]
         total_count = stardew_world.total_progression_items
         needed_count = (total_count * self.percent) // 100
         player_state = state.prog_items[self.player]
 
-        if needed_count <= len(player_state):
+        if needed_count <= len(player_state) - len(stardew_world.excluded_from_total_progression_items):
             return True
 
         total_count = 0
         for item, item_count in player_state.items():
+            if item in stardew_world.excluded_from_total_progression_items:
+                continue
+
             total_count += item_count
             if total_count >= needed_count:
                 return True
diff --git a/worlds/stardew_valley/test/TestCrops.py b/worlds/stardew_valley/test/TestCrops.py
index 362e6bf27e7c..4fa836a97d14 100644
--- a/worlds/stardew_valley/test/TestCrops.py
+++ b/worlds/stardew_valley/test/TestCrops.py
@@ -11,10 +11,10 @@ def test_need_greenhouse_for_cactus(self):
         harvest_cactus = self.world.logic.region.can_reach_location("Harvest Cactus Fruit")
         self.assert_rule_false(harvest_cactus, self.multiworld.state)
 
-        self.multiworld.state.collect(self.world.create_item("Cactus Seeds"), prevent_sweep=False)
-        self.multiworld.state.collect(self.world.create_item("Shipping Bin"), prevent_sweep=False)
-        self.multiworld.state.collect(self.world.create_item("Desert Obelisk"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Cactus Seeds"))
+        self.multiworld.state.collect(self.create_item("Shipping Bin"))
+        self.multiworld.state.collect(self.create_item("Desert Obelisk"))
         self.assert_rule_false(harvest_cactus, self.multiworld.state)
 
-        self.multiworld.state.collect(self.world.create_item("Greenhouse"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Greenhouse"))
         self.assert_rule_true(harvest_cactus, self.multiworld.state)
diff --git a/worlds/stardew_valley/test/TestOptions.py b/worlds/stardew_valley/test/TestOptions.py
index 2824a10c38af..9db7f06ff5a5 100644
--- a/worlds/stardew_valley/test/TestOptions.py
+++ b/worlds/stardew_valley/test/TestOptions.py
@@ -1,6 +1,6 @@
 import itertools
 
-from Options import NamedRange
+from Options import NamedRange, Accessibility
 from . import SVTestCase, allsanity_no_mods_6_x_x, allsanity_mods_6_x_x, solo_multiworld
 from .assertion import WorldAssertMixin
 from .long.option_names import all_option_choices
@@ -54,6 +54,23 @@ def test_given_goal_when_generate_then_victory_is_in_correct_location(self):
                 victory = multi_world.find_item("Victory", 1)
                 self.assertEqual(victory.name, location)
 
+    def test_given_perfection_goal_when_generate_then_accessibility_is_forced_to_full(self):
+        """There is a bug with the current victory condition of the perfection goal that can create unwinnable seeds if the accessibility is set to minimal and
+        the world gets flooded with progression items through plando. This will increase the amount of collected progression items pass the total amount
+        calculated for the world when creating the item pool. This will cause the victory condition to be met before all locations are collected, so some could
+        be left inaccessible, which in practice will make the seed unwinnable. 
+        """
+        for accessibility in Accessibility.options.keys():
+            world_options = {Goal.internal_name: Goal.option_perfection, "accessibility": accessibility}
+            with self.solo_world_sub_test(f"Accessibility: {accessibility}", world_options) as (_, world):
+                self.assertEqual(world.options.accessibility, Accessibility.option_full)
+
+    def test_given_allsanity_goal_when_generate_then_accessibility_is_forced_to_full(self):
+        for accessibility in Accessibility.options.keys():
+            world_options = {Goal.internal_name: Goal.option_allsanity, "accessibility": accessibility}
+            with self.solo_world_sub_test(f"Accessibility: {accessibility}", world_options) as (_, world):
+                self.assertEqual(world.options.accessibility, Accessibility.option_full)
+
 
 class TestSeasonRandomization(SVTestCase):
     def test_given_disabled_when_generate_then_all_seasons_are_precollected(self):
diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py
index 8f4e5af28f84..1a312e569d11 100644
--- a/worlds/stardew_valley/test/__init__.py
+++ b/worlds/stardew_valley/test/__init__.py
@@ -6,7 +6,7 @@
 from contextlib import contextmanager
 from typing import Dict, ClassVar, Iterable, Tuple, Optional, List, Union, Any
 
-from BaseClasses import MultiWorld, CollectionState, PlandoOptions, get_seed, Location, Item, ItemClassification
+from BaseClasses import MultiWorld, CollectionState, PlandoOptions, get_seed, Location, Item
 from Options import VerifyKeys
 from test.bases import WorldTestBase
 from test.general import gen_steps, setup_solo_multiworld as setup_base_solo_multiworld
@@ -236,7 +236,6 @@ def world_setup(self, *args, **kwargs):
 
         self.original_state = self.multiworld.state.copy()
         self.original_itempool = self.multiworld.itempool.copy()
-        self.original_prog_item_count = world.total_progression_items
         self.unfilled_locations = self.multiworld.get_unfilled_locations(1)
         if self.constructed:
             self.world = world  # noqa
@@ -246,7 +245,6 @@ def tearDown(self) -> None:
         self.multiworld.itempool = self.original_itempool
         for location in self.unfilled_locations:
             location.item = None
-        self.world.total_progression_items = self.original_prog_item_count
 
         self.multiworld.lock.release()
 
@@ -257,20 +255,13 @@ def run_default_tests(self) -> bool:
         return super().run_default_tests
 
     def collect_lots_of_money(self, percent: float = 0.25):
-        self.multiworld.state.collect(self.world.create_item("Shipping Bin"), prevent_sweep=False)
-        real_total_prog_items = self.multiworld.worlds[self.player].total_progression_items
+        self.collect("Shipping Bin")
+        real_total_prog_items = self.world.total_progression_items
         required_prog_items = int(round(real_total_prog_items * percent))
-        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
+        self.collect("Stardrop", required_prog_items)
 
     def collect_all_the_money(self):
-        self.multiworld.state.collect(self.world.create_item("Shipping Bin"), prevent_sweep=False)
-        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
+        self.collect_lots_of_money(0.95)
 
     def collect_everything(self):
         non_event_items = [item for item in self.multiworld.get_items() if item.code]
@@ -278,7 +269,8 @@ def collect_everything(self):
             self.multiworld.state.collect(item)
 
     def collect_all_except(self, item_to_not_collect: str):
-        for item in self.multiworld.get_items():
+        non_event_items = [item for item in self.multiworld.get_items() if item.code]
+        for item in non_event_items:
             if item.name != item_to_not_collect:
                 self.multiworld.state.collect(item)
 
@@ -290,25 +282,26 @@ def get_real_location_names(self) -> List[str]:
 
     def collect(self, item: Union[str, Item, Iterable[Item]], count: int = 1) -> Union[None, Item, List[Item]]:
         assert count > 0
+
         if not isinstance(item, str):
             super().collect(item)
             return
+
         if count == 1:
             item = self.create_item(item)
             self.multiworld.state.collect(item)
             return item
+
         items = []
         for i in range(count):
             item = self.create_item(item)
             self.multiworld.state.collect(item)
             items.append(item)
+
         return items
 
     def create_item(self, item: str) -> StardewItem:
-        created_item = self.world.create_item(item)
-        if created_item.classification & ItemClassification.progression:
-            self.multiworld.worlds[self.player].total_progression_items -= 1
-        return created_item
+        return self.world.create_item(item)
 
     def remove_one_by_name(self, item: str) -> None:
         self.remove(self.create_item(item))
@@ -336,7 +329,6 @@ def solo_multiworld(world_options: Optional[Dict[Union[str, StardewValleyOption]
         original_state = multiworld.state.copy()
         original_itempool = multiworld.itempool.copy()
         unfilled_locations = multiworld.get_unfilled_locations(1)
-        original_prog_item_count = world.total_progression_items
 
         yield multiworld, world
 
@@ -344,7 +336,6 @@ def solo_multiworld(world_options: Optional[Dict[Union[str, StardewValleyOption]
         multiworld.itempool = original_itempool
         for location in unfilled_locations:
             location.item = None
-        multiworld.total_progression_items = original_prog_item_count
 
         multiworld.lock.release()
 
diff --git a/worlds/stardew_valley/test/rules/TestArcades.py b/worlds/stardew_valley/test/rules/TestArcades.py
index 2922ecfb5d9e..69e5b22cc01b 100644
--- a/worlds/stardew_valley/test/rules/TestArcades.py
+++ b/worlds/stardew_valley/test/rules/TestArcades.py
@@ -19,8 +19,8 @@ def test_prairie_king(self):
         life = self.create_item("JotPK: Extra Life")
         drop = self.create_item("JotPK: Increased Drop Rate")
 
-        self.multiworld.state.collect(boots, prevent_sweep=True)
-        self.multiworld.state.collect(gun, prevent_sweep=True)
+        self.multiworld.state.collect(boots)
+        self.multiworld.state.collect(gun)
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state))
         self.assertFalse(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state))
         self.assertFalse(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state))
@@ -28,8 +28,8 @@ def test_prairie_king(self):
         self.remove(boots)
         self.remove(gun)
 
-        self.multiworld.state.collect(boots, prevent_sweep=True)
-        self.multiworld.state.collect(boots, prevent_sweep=True)
+        self.multiworld.state.collect(boots)
+        self.multiworld.state.collect(boots)
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state))
         self.assertFalse(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state))
         self.assertFalse(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state))
@@ -37,10 +37,10 @@ def test_prairie_king(self):
         self.remove(boots)
         self.remove(boots)
 
-        self.multiworld.state.collect(boots, prevent_sweep=True)
-        self.multiworld.state.collect(gun, prevent_sweep=True)
-        self.multiworld.state.collect(ammo, prevent_sweep=True)
-        self.multiworld.state.collect(life, prevent_sweep=True)
+        self.multiworld.state.collect(boots)
+        self.multiworld.state.collect(gun)
+        self.multiworld.state.collect(ammo)
+        self.multiworld.state.collect(life)
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state))
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state))
         self.assertFalse(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state))
@@ -50,13 +50,13 @@ def test_prairie_king(self):
         self.remove(ammo)
         self.remove(life)
 
-        self.multiworld.state.collect(boots, prevent_sweep=True)
-        self.multiworld.state.collect(gun, prevent_sweep=True)
-        self.multiworld.state.collect(gun, prevent_sweep=True)
-        self.multiworld.state.collect(ammo, prevent_sweep=True)
-        self.multiworld.state.collect(ammo, prevent_sweep=True)
-        self.multiworld.state.collect(life, prevent_sweep=True)
-        self.multiworld.state.collect(drop, prevent_sweep=True)
+        self.multiworld.state.collect(boots)
+        self.multiworld.state.collect(gun)
+        self.multiworld.state.collect(gun)
+        self.multiworld.state.collect(ammo)
+        self.multiworld.state.collect(ammo)
+        self.multiworld.state.collect(life)
+        self.multiworld.state.collect(drop)
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state))
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state))
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state))
@@ -69,17 +69,17 @@ def test_prairie_king(self):
         self.remove(life)
         self.remove(drop)
 
-        self.multiworld.state.collect(boots, prevent_sweep=True)
-        self.multiworld.state.collect(boots, prevent_sweep=True)
-        self.multiworld.state.collect(gun, prevent_sweep=True)
-        self.multiworld.state.collect(gun, prevent_sweep=True)
-        self.multiworld.state.collect(gun, prevent_sweep=True)
-        self.multiworld.state.collect(gun, prevent_sweep=True)
-        self.multiworld.state.collect(ammo, prevent_sweep=True)
-        self.multiworld.state.collect(ammo, prevent_sweep=True)
-        self.multiworld.state.collect(ammo, prevent_sweep=True)
-        self.multiworld.state.collect(life, prevent_sweep=True)
-        self.multiworld.state.collect(drop, prevent_sweep=True)
+        self.multiworld.state.collect(boots)
+        self.multiworld.state.collect(boots)
+        self.multiworld.state.collect(gun)
+        self.multiworld.state.collect(gun)
+        self.multiworld.state.collect(gun)
+        self.multiworld.state.collect(gun)
+        self.multiworld.state.collect(ammo)
+        self.multiworld.state.collect(ammo)
+        self.multiworld.state.collect(ammo)
+        self.multiworld.state.collect(life)
+        self.multiworld.state.collect(drop)
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state))
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state))
         self.assertTrue(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state))
diff --git a/worlds/stardew_valley/test/rules/TestBuildings.py b/worlds/stardew_valley/test/rules/TestBuildings.py
index cacd6ea381b6..d1f60b20e0db 100644
--- a/worlds/stardew_valley/test/rules/TestBuildings.py
+++ b/worlds/stardew_valley/test/rules/TestBuildings.py
@@ -23,7 +23,7 @@ def test_big_coop_blueprint(self):
         self.assertFalse(big_coop_blueprint_rule(self.multiworld.state),
                          f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}")
 
-        self.multiworld.state.collect(self.create_item("Progressive Coop"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Progressive Coop"))
         self.assertTrue(big_coop_blueprint_rule(self.multiworld.state),
                         f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}")
 
@@ -33,10 +33,10 @@ def test_deluxe_coop_blueprint(self):
         self.collect_lots_of_money()
         self.assertFalse(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state))
 
-        self.multiworld.state.collect(self.create_item("Progressive Coop"), prevent_sweep=True)
+        self.multiworld.state.collect(self.create_item("Progressive Coop"))
         self.assertFalse(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state))
 
-        self.multiworld.state.collect(self.create_item("Progressive Coop"), prevent_sweep=True)
+        self.multiworld.state.collect(self.create_item("Progressive Coop"))
         self.assertTrue(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state))
 
     def test_big_shed_blueprint(self):
@@ -48,6 +48,6 @@ def test_big_shed_blueprint(self):
         self.assertFalse(big_shed_rule(self.multiworld.state),
                          f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}")
 
-        self.multiworld.state.collect(self.create_item("Progressive Shed"), prevent_sweep=True)
+        self.multiworld.state.collect(self.create_item("Progressive Shed"))
         self.assertTrue(big_shed_rule(self.multiworld.state),
                         f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}")
diff --git a/worlds/stardew_valley/test/rules/TestCookingRecipes.py b/worlds/stardew_valley/test/rules/TestCookingRecipes.py
index 7ab9d61cb942..d5f9da73c9d7 100644
--- a/worlds/stardew_valley/test/rules/TestCookingRecipes.py
+++ b/worlds/stardew_valley/test/rules/TestCookingRecipes.py
@@ -17,14 +17,14 @@ def test_can_learn_qos_recipe(self):
         rule = self.world.logic.region.can_reach_location(location)
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Progressive House"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Radish Seeds"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Spring"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Summer"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Progressive House"))
+        self.multiworld.state.collect(self.create_item("Radish Seeds"))
+        self.multiworld.state.collect(self.create_item("Spring"))
+        self.multiworld.state.collect(self.create_item("Summer"))
         self.collect_lots_of_money()
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("The Queen of Sauce"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("The Queen of Sauce"))
         self.assert_rule_true(rule, self.multiworld.state)
 
 
@@ -42,21 +42,21 @@ def test_can_learn_qos_recipe(self):
         rule = self.world.logic.region.can_reach_location(location)
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Progressive House"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Radish Seeds"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Summer"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Progressive House"))
+        self.multiworld.state.collect(self.create_item("Radish Seeds"))
+        self.multiworld.state.collect(self.create_item("Summer"))
         self.collect_lots_of_money()
         self.assert_rule_false(rule, self.multiworld.state)
 
         spring = self.create_item("Spring")
         qos = self.create_item("The Queen of Sauce")
-        self.multiworld.state.collect(spring, prevent_sweep=False)
-        self.multiworld.state.collect(qos, prevent_sweep=False)
+        self.multiworld.state.collect(spring)
+        self.multiworld.state.collect(qos)
         self.assert_rule_false(rule, self.multiworld.state)
         self.multiworld.state.remove(spring)
         self.multiworld.state.remove(qos)
 
-        self.multiworld.state.collect(self.create_item("Radish Salad Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Radish Salad Recipe"))
         self.assert_rule_true(rule, self.multiworld.state)
 
     def test_get_chefsanity_check_recipe(self):
@@ -64,20 +64,20 @@ def test_get_chefsanity_check_recipe(self):
         rule = self.world.logic.region.can_reach_location(location)
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Spring"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Spring"))
         self.collect_lots_of_money()
         self.assert_rule_false(rule, self.multiworld.state)
 
         seeds = self.create_item("Radish Seeds")
         summer = self.create_item("Summer")
         house = self.create_item("Progressive House")
-        self.multiworld.state.collect(seeds, prevent_sweep=False)
-        self.multiworld.state.collect(summer, prevent_sweep=False)
-        self.multiworld.state.collect(house, prevent_sweep=False)
+        self.multiworld.state.collect(seeds)
+        self.multiworld.state.collect(summer)
+        self.multiworld.state.collect(house)
         self.assert_rule_false(rule, self.multiworld.state)
         self.multiworld.state.remove(seeds)
         self.multiworld.state.remove(summer)
         self.multiworld.state.remove(house)
 
-        self.multiworld.state.collect(self.create_item("The Queen of Sauce"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("The Queen of Sauce"))
         self.assert_rule_true(rule, self.multiworld.state)
diff --git a/worlds/stardew_valley/test/rules/TestCraftingRecipes.py b/worlds/stardew_valley/test/rules/TestCraftingRecipes.py
index 4719edea1d59..46a1b73d0b7a 100644
--- a/worlds/stardew_valley/test/rules/TestCraftingRecipes.py
+++ b/worlds/stardew_valley/test/rules/TestCraftingRecipes.py
@@ -25,7 +25,7 @@ def test_can_craft_recipe(self):
         self.collect_all_the_money()
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Marble Brazier Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Marble Brazier Recipe"))
         self.assert_rule_true(rule, self.multiworld.state)
 
     def test_can_learn_crafting_recipe(self):
@@ -38,16 +38,16 @@ def test_can_learn_crafting_recipe(self):
 
     def test_can_craft_festival_recipe(self):
         recipe = all_crafting_recipes_by_name["Jack-O-Lantern"]
-        self.multiworld.state.collect(self.create_item("Pumpkin Seeds"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Torch Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Pumpkin Seeds"))
+        self.multiworld.state.collect(self.create_item("Torch Recipe"))
         self.collect_lots_of_money()
         rule = self.world.logic.crafting.can_craft(recipe)
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Fall"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Fall"))
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Jack-O-Lantern Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Jack-O-Lantern Recipe"))
         self.assert_rule_true(rule, self.multiworld.state)
 
     def test_require_furnace_recipe_for_smelting_checks(self):
@@ -64,7 +64,7 @@ def test_require_furnace_recipe_for_smelting_checks(self):
         self.collect_all_the_money()
         self.assert_rules_false(rules, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Furnace Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Furnace Recipe"))
         self.assert_rules_true(rules, self.multiworld.state)
 
 
@@ -79,16 +79,16 @@ class TestCraftsanityWithFestivalsLogic(SVTestBase):
 
     def test_can_craft_festival_recipe(self):
         recipe = all_crafting_recipes_by_name["Jack-O-Lantern"]
-        self.multiworld.state.collect(self.create_item("Pumpkin Seeds"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Fall"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Pumpkin Seeds"))
+        self.multiworld.state.collect(self.create_item("Fall"))
         self.collect_lots_of_money()
         rule = self.world.logic.crafting.can_craft(recipe)
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Jack-O-Lantern Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Jack-O-Lantern Recipe"))
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Torch Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Torch Recipe"))
         self.assert_rule_true(rule, self.multiworld.state)
 
 
@@ -109,7 +109,7 @@ def test_can_craft_recipe(self):
 
     def test_can_craft_festival_recipe(self):
         recipe = all_crafting_recipes_by_name["Jack-O-Lantern"]
-        self.multiworld.state.collect(self.create_item("Pumpkin Seeds"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Pumpkin Seeds"))
         self.collect_lots_of_money()
         rule = self.world.logic.crafting.can_craft(recipe)
         result = rule(self.multiworld.state)
@@ -126,7 +126,7 @@ def test_requires_mining_levels_for_smelting_checks(self):
         self.collect([self.create_item("Progressive Sword")] * 4)
         self.collect([self.create_item("Progressive Mine Elevator")] * 24)
         self.collect([self.create_item("Progressive Trash Can")] * 2)
-        self.multiworld.state.collect(self.create_item("Furnace Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Furnace Recipe"))
         self.collect([self.create_item("Combat Level")] * 10)
         self.collect([self.create_item("Fishing Level")] * 10)
         self.collect_all_the_money()
@@ -147,11 +147,11 @@ class TestNoCraftsanityWithFestivalsLogic(SVTestBase):
 
     def test_can_craft_festival_recipe(self):
         recipe = all_crafting_recipes_by_name["Jack-O-Lantern"]
-        self.multiworld.state.collect(self.create_item("Pumpkin Seeds"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Fall"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Pumpkin Seeds"))
+        self.multiworld.state.collect(self.create_item("Fall"))
         self.collect_lots_of_money()
         rule = self.world.logic.crafting.can_craft(recipe)
         self.assert_rule_false(rule, self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item("Jack-O-Lantern Recipe"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Jack-O-Lantern Recipe"))
         self.assert_rule_true(rule, self.multiworld.state)
diff --git a/worlds/stardew_valley/test/rules/TestDonations.py b/worlds/stardew_valley/test/rules/TestDonations.py
index 984a3ebc38b4..3927bd09a48b 100644
--- a/worlds/stardew_valley/test/rules/TestDonations.py
+++ b/worlds/stardew_valley/test/rules/TestDonations.py
@@ -18,7 +18,7 @@ def test_cannot_make_any_donation_without_museum_access(self):
         for donation in locations_by_tag[LocationTags.MUSEUM_DONATIONS]:
             self.assertFalse(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state))
 
-        self.multiworld.state.collect(self.create_item(railroad_item), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(railroad_item))
 
         for donation in locations_by_tag[LocationTags.MUSEUM_DONATIONS]:
             self.assertTrue(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state))
@@ -39,7 +39,7 @@ def test_cannot_make_any_donation_without_museum_access(self):
         for donation in donation_locations:
             self.assertFalse(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state))
 
-        self.multiworld.state.collect(self.create_item(railroad_item), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(railroad_item))
 
         for donation in donation_locations:
             self.assertTrue(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state))
@@ -58,7 +58,7 @@ def test_cannot_make_any_donation_without_museum_access(self):
         for donation in locations_by_tag[LocationTags.MUSEUM_MILESTONES]:
             self.assertFalse(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state))
 
-        self.multiworld.state.collect(self.create_item(railroad_item), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(railroad_item))
 
         for donation in locations_by_tag[LocationTags.MUSEUM_MILESTONES]:
             self.assertTrue(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state))
diff --git a/worlds/stardew_valley/test/rules/TestFriendship.py b/worlds/stardew_valley/test/rules/TestFriendship.py
index fb186ca99480..3e9109ed5010 100644
--- a/worlds/stardew_valley/test/rules/TestFriendship.py
+++ b/worlds/stardew_valley/test/rules/TestFriendship.py
@@ -11,34 +11,34 @@ class TestFriendsanityDatingRules(SVTestBase):
 
     def test_earning_dating_heart_requires_dating(self):
         self.collect_all_the_money()
-        self.multiworld.state.collect(self.create_item("Fall"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Beach Bridge"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Progressive House"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Fall"))
+        self.multiworld.state.collect(self.create_item("Beach Bridge"))
+        self.multiworld.state.collect(self.create_item("Progressive House"))
         for i in range(3):
-            self.multiworld.state.collect(self.create_item("Progressive Pickaxe"), prevent_sweep=False)
-            self.multiworld.state.collect(self.create_item("Progressive Weapon"), prevent_sweep=False)
-            self.multiworld.state.collect(self.create_item("Progressive Axe"), prevent_sweep=False)
-            self.multiworld.state.collect(self.create_item("Progressive Barn"), prevent_sweep=False)
+            self.multiworld.state.collect(self.create_item("Progressive Pickaxe"))
+            self.multiworld.state.collect(self.create_item("Progressive Weapon"))
+            self.multiworld.state.collect(self.create_item("Progressive Axe"))
+            self.multiworld.state.collect(self.create_item("Progressive Barn"))
         for i in range(10):
-            self.multiworld.state.collect(self.create_item("Foraging Level"), prevent_sweep=False)
-            self.multiworld.state.collect(self.create_item("Farming Level"), prevent_sweep=False)
-            self.multiworld.state.collect(self.create_item("Mining Level"), prevent_sweep=False)
-            self.multiworld.state.collect(self.create_item("Combat Level"), prevent_sweep=False)
-            self.multiworld.state.collect(self.create_item("Progressive Mine Elevator"), prevent_sweep=False)
-            self.multiworld.state.collect(self.create_item("Progressive Mine Elevator"), prevent_sweep=False)
+            self.multiworld.state.collect(self.create_item("Foraging Level"))
+            self.multiworld.state.collect(self.create_item("Farming Level"))
+            self.multiworld.state.collect(self.create_item("Mining Level"))
+            self.multiworld.state.collect(self.create_item("Combat Level"))
+            self.multiworld.state.collect(self.create_item("Progressive Mine Elevator"))
+            self.multiworld.state.collect(self.create_item("Progressive Mine Elevator"))
 
         npc = "Abigail"
         heart_name = f"{npc} <3"
         step = 3
 
         self.assert_can_reach_heart_up_to(npc, 3, step)
-        self.multiworld.state.collect(self.create_item(heart_name), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(heart_name))
         self.assert_can_reach_heart_up_to(npc, 6, step)
-        self.multiworld.state.collect(self.create_item(heart_name), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(heart_name))
         self.assert_can_reach_heart_up_to(npc, 8, step)
-        self.multiworld.state.collect(self.create_item(heart_name), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(heart_name))
         self.assert_can_reach_heart_up_to(npc, 10, step)
-        self.multiworld.state.collect(self.create_item(heart_name), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(heart_name))
         self.assert_can_reach_heart_up_to(npc, 14, step)
 
     def assert_can_reach_heart_up_to(self, npc: str, max_reachable: int, step: int):
diff --git a/worlds/stardew_valley/test/rules/TestShipping.py b/worlds/stardew_valley/test/rules/TestShipping.py
index 973d8d3ada7d..b26d1e94ee2c 100644
--- a/worlds/stardew_valley/test/rules/TestShipping.py
+++ b/worlds/stardew_valley/test/rules/TestShipping.py
@@ -76,7 +76,7 @@ def test_all_shipsanity_locations_require_shipping_bin(self):
             with self.subTest(location.name):
                 self.remove(bin_item)
                 self.assertFalse(self.world.logic.region.can_reach_location(location.name)(self.multiworld.state))
-                self.multiworld.state.collect(bin_item, prevent_sweep=False)
+                self.multiworld.state.collect(bin_item)
                 shipsanity_rule = self.world.logic.region.can_reach_location(location.name)
                 self.assert_rule_true(shipsanity_rule, self.multiworld.state)
                 self.remove(bin_item)
diff --git a/worlds/stardew_valley/test/rules/TestStateRules.py b/worlds/stardew_valley/test/rules/TestStateRules.py
index 7d10f4ceb1d3..49577d2223e0 100644
--- a/worlds/stardew_valley/test/rules/TestStateRules.py
+++ b/worlds/stardew_valley/test/rules/TestStateRules.py
@@ -1,12 +1,22 @@
-import unittest
+from .. import SVTestBase, allsanity_mods_6_x_x
+from ...stardew_rule import HasProgressionPercent
 
-from BaseClasses import ItemClassification
-from ...test import solo_multiworld
 
+class TestHasProgressionPercentWithVictory(SVTestBase):
+    options = allsanity_mods_6_x_x()
 
-class TestHasProgressionPercent(unittest.TestCase):
-    def test_max_item_amount_is_full_collection(self):
-        # Not caching because it fails too often for some reason
-        with solo_multiworld(world_caching=False) as (multiworld, world):
-            progression_item_count = sum(1 for i in multiworld.get_items() if i.classification & ItemClassification.progression)
-            self.assertEqual(world.total_progression_items, progression_item_count - 1)  # -1 to skip Victory
+    def test_has_100_progression_percent_is_false_while_items_are_missing(self):
+        has_100_progression_percent = HasProgressionPercent(1, 100)
+
+        for i, item in enumerate([i for i in self.multiworld.get_items() if i.advancement and i.code][1:]):
+            if item.name != "Victory":
+                self.collect(item)
+            self.assertFalse(has_100_progression_percent(self.multiworld.state),
+                             f"Rule became true after {i} items, total_progression_items is {self.world.total_progression_items}")
+
+    def test_has_100_progression_percent_account_for_victory_not_being_collected(self):
+        has_100_progression_percent = HasProgressionPercent(1, 100)
+
+        self.collect_all_except("Victory")
+
+        self.assert_rule_true(has_100_progression_percent, self.multiworld.state)
diff --git a/worlds/stardew_valley/test/rules/TestTools.py b/worlds/stardew_valley/test/rules/TestTools.py
index 5f0fe8ef3ffb..5b8975f4e707 100644
--- a/worlds/stardew_valley/test/rules/TestTools.py
+++ b/worlds/stardew_valley/test/rules/TestTools.py
@@ -21,30 +21,30 @@ def test_sturgeon(self):
         self.assert_rule_false(sturgeon_rule, self.multiworld.state)
 
         summer = self.create_item("Summer")
-        self.multiworld.state.collect(summer, prevent_sweep=False)
+        self.multiworld.state.collect(summer)
         self.assert_rule_false(sturgeon_rule, self.multiworld.state)
 
         fishing_rod = self.create_item("Progressive Fishing Rod")
-        self.multiworld.state.collect(fishing_rod, prevent_sweep=False)
-        self.multiworld.state.collect(fishing_rod, prevent_sweep=False)
+        self.multiworld.state.collect(fishing_rod)
+        self.multiworld.state.collect(fishing_rod)
         self.assert_rule_false(sturgeon_rule, self.multiworld.state)
 
         fishing_level = self.create_item("Fishing Level")
-        self.multiworld.state.collect(fishing_level, prevent_sweep=False)
+        self.multiworld.state.collect(fishing_level)
         self.assert_rule_false(sturgeon_rule, self.multiworld.state)
 
-        self.multiworld.state.collect(fishing_level, prevent_sweep=False)
-        self.multiworld.state.collect(fishing_level, prevent_sweep=False)
-        self.multiworld.state.collect(fishing_level, prevent_sweep=False)
-        self.multiworld.state.collect(fishing_level, prevent_sweep=False)
-        self.multiworld.state.collect(fishing_level, prevent_sweep=False)
+        self.multiworld.state.collect(fishing_level)
+        self.multiworld.state.collect(fishing_level)
+        self.multiworld.state.collect(fishing_level)
+        self.multiworld.state.collect(fishing_level)
+        self.multiworld.state.collect(fishing_level)
         self.assert_rule_true(sturgeon_rule, self.multiworld.state)
 
         self.remove(summer)
         self.assert_rule_false(sturgeon_rule, self.multiworld.state)
 
         winter = self.create_item("Winter")
-        self.multiworld.state.collect(winter, prevent_sweep=False)
+        self.multiworld.state.collect(winter)
         self.assert_rule_true(sturgeon_rule, self.multiworld.state)
 
         self.remove(fishing_rod)
@@ -53,24 +53,24 @@ def test_sturgeon(self):
     def test_old_master_cannoli(self):
         self.multiworld.state.prog_items = {1: Counter()}
 
-        self.multiworld.state.collect(self.create_item("Progressive Axe"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Progressive Axe"), prevent_sweep=False)
-        self.multiworld.state.collect(self.create_item("Summer"), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item("Progressive Axe"))
+        self.multiworld.state.collect(self.create_item("Progressive Axe"))
+        self.multiworld.state.collect(self.create_item("Summer"))
         self.collect_lots_of_money()
 
         rule = self.world.logic.region.can_reach_location("Old Master Cannoli")
         self.assert_rule_false(rule, self.multiworld.state)
 
         fall = self.create_item("Fall")
-        self.multiworld.state.collect(fall, prevent_sweep=False)
+        self.multiworld.state.collect(fall)
         self.assert_rule_false(rule, self.multiworld.state)
 
         tuesday = self.create_item("Traveling Merchant: Tuesday")
-        self.multiworld.state.collect(tuesday, prevent_sweep=False)
+        self.multiworld.state.collect(tuesday)
         self.assert_rule_false(rule, self.multiworld.state)
 
         rare_seed = self.create_item("Rare Seed")
-        self.multiworld.state.collect(rare_seed, prevent_sweep=False)
+        self.multiworld.state.collect(rare_seed)
         self.assert_rule_true(rule, self.multiworld.state)
 
         self.remove(fall)
@@ -80,11 +80,11 @@ def test_old_master_cannoli(self):
 
         green_house = self.create_item("Greenhouse")
         self.collect(self.create_item(Event.fall_farming))
-        self.multiworld.state.collect(green_house, prevent_sweep=False)
+        self.multiworld.state.collect(green_house)
         self.assert_rule_false(rule, self.multiworld.state)
 
         friday = self.create_item("Traveling Merchant: Friday")
-        self.multiworld.state.collect(friday, prevent_sweep=False)
+        self.multiworld.state.collect(friday)
         self.assertTrue(self.multiworld.get_location("Old Master Cannoli", 1).access_rule(self.multiworld.state))
 
         self.remove(green_house)
@@ -111,7 +111,7 @@ def test_cannot_get_any_tool_without_blacksmith_access(self):
             for material in [ToolMaterial.copper, ToolMaterial.iron, ToolMaterial.gold, ToolMaterial.iridium]:
                 self.assert_rule_false(self.world.logic.tool.has_tool(tool, material), self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item(railroad_item), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(railroad_item))
 
         for tool in [Tool.pickaxe, Tool.axe, Tool.hoe, Tool.trash_can, Tool.watering_can]:
             for material in [ToolMaterial.copper, ToolMaterial.iron, ToolMaterial.gold, ToolMaterial.iridium]:
@@ -125,7 +125,7 @@ def test_cannot_get_fishing_rod_without_willy_access(self):
         for fishing_rod_level in [3, 4]:
             self.assert_rule_false(self.world.logic.tool.has_fishing_rod(fishing_rod_level), self.multiworld.state)
 
-        self.multiworld.state.collect(self.create_item(railroad_item), prevent_sweep=False)
+        self.multiworld.state.collect(self.create_item(railroad_item))
 
         for fishing_rod_level in [3, 4]:
             self.assert_rule_true(self.world.logic.tool.has_fishing_rod(fishing_rod_level), self.multiworld.state)
diff --git a/worlds/stardew_valley/test/rules/TestWeapons.py b/worlds/stardew_valley/test/rules/TestWeapons.py
index 972170b93c75..383f26e841d2 100644
--- a/worlds/stardew_valley/test/rules/TestWeapons.py
+++ b/worlds/stardew_valley/test/rules/TestWeapons.py
@@ -10,40 +10,40 @@ class TestWeaponsLogic(SVTestBase):
     }
 
     def test_mine(self):
-        self.multiworld.state.collect(self.create_item("Progressive Pickaxe"), prevent_sweep=True)
-        self.multiworld.state.collect(self.create_item("Progressive Pickaxe"), prevent_sweep=True)
-        self.multiworld.state.collect(self.create_item("Progressive Pickaxe"), prevent_sweep=True)
-        self.multiworld.state.collect(self.create_item("Progressive Pickaxe"), prevent_sweep=True)
-        self.multiworld.state.collect(self.create_item("Progressive House"), prevent_sweep=True)
+        self.multiworld.state.collect(self.create_item("Progressive Pickaxe"))
+        self.multiworld.state.collect(self.create_item("Progressive Pickaxe"))
+        self.multiworld.state.collect(self.create_item("Progressive Pickaxe"))
+        self.multiworld.state.collect(self.create_item("Progressive Pickaxe"))
+        self.multiworld.state.collect(self.create_item("Progressive House"))
         self.collect([self.create_item("Combat Level")] * 10)
         self.collect([self.create_item("Mining Level")] * 10)
         self.collect([self.create_item("Progressive Mine Elevator")] * 24)
-        self.multiworld.state.collect(self.create_item("Bus Repair"), prevent_sweep=True)
-        self.multiworld.state.collect(self.create_item("Skull Key"), prevent_sweep=True)
+        self.multiworld.state.collect(self.create_item("Bus Repair"))
+        self.multiworld.state.collect(self.create_item("Skull Key"))
 
-        self.GiveItemAndCheckReachableMine("Progressive Sword", 1)
-        self.GiveItemAndCheckReachableMine("Progressive Dagger", 1)
-        self.GiveItemAndCheckReachableMine("Progressive Club", 1)
+        self.give_item_and_check_reachable_mine("Progressive Sword", 1)
+        self.give_item_and_check_reachable_mine("Progressive Dagger", 1)
+        self.give_item_and_check_reachable_mine("Progressive Club", 1)
 
-        self.GiveItemAndCheckReachableMine("Progressive Sword", 2)
-        self.GiveItemAndCheckReachableMine("Progressive Dagger", 2)
-        self.GiveItemAndCheckReachableMine("Progressive Club", 2)
+        self.give_item_and_check_reachable_mine("Progressive Sword", 2)
+        self.give_item_and_check_reachable_mine("Progressive Dagger", 2)
+        self.give_item_and_check_reachable_mine("Progressive Club", 2)
 
-        self.GiveItemAndCheckReachableMine("Progressive Sword", 3)
-        self.GiveItemAndCheckReachableMine("Progressive Dagger", 3)
-        self.GiveItemAndCheckReachableMine("Progressive Club", 3)
+        self.give_item_and_check_reachable_mine("Progressive Sword", 3)
+        self.give_item_and_check_reachable_mine("Progressive Dagger", 3)
+        self.give_item_and_check_reachable_mine("Progressive Club", 3)
 
-        self.GiveItemAndCheckReachableMine("Progressive Sword", 4)
-        self.GiveItemAndCheckReachableMine("Progressive Dagger", 4)
-        self.GiveItemAndCheckReachableMine("Progressive Club", 4)
+        self.give_item_and_check_reachable_mine("Progressive Sword", 4)
+        self.give_item_and_check_reachable_mine("Progressive Dagger", 4)
+        self.give_item_and_check_reachable_mine("Progressive Club", 4)
 
-        self.GiveItemAndCheckReachableMine("Progressive Sword", 5)
-        self.GiveItemAndCheckReachableMine("Progressive Dagger", 5)
-        self.GiveItemAndCheckReachableMine("Progressive Club", 5)
+        self.give_item_and_check_reachable_mine("Progressive Sword", 5)
+        self.give_item_and_check_reachable_mine("Progressive Dagger", 5)
+        self.give_item_and_check_reachable_mine("Progressive Club", 5)
 
-    def GiveItemAndCheckReachableMine(self, item_name: str, reachable_level: int):
+    def give_item_and_check_reachable_mine(self, item_name: str, reachable_level: int):
         item = self.multiworld.create_item(item_name, self.player)
-        self.multiworld.state.collect(item, prevent_sweep=True)
+        self.multiworld.state.collect(item)
         rule = self.world.logic.mine.can_mine_in_the_mines_floor_1_40()
         if reachable_level > 0:
             self.assert_rule_true(rule, self.multiworld.state)
diff --git a/worlds/stardew_valley/test/stability/TestStability.py b/worlds/stardew_valley/test/stability/TestStability.py
index 137a7172aff4..b4d0f30ea51f 100644
--- a/worlds/stardew_valley/test/stability/TestStability.py
+++ b/worlds/stardew_valley/test/stability/TestStability.py
@@ -7,9 +7,6 @@
 from BaseClasses import get_seed
 from .. import SVTestCase
 
-# There seems to be 4 bytes that appear at random at the end of the output, breaking the json... I don't know where they came from.
-BYTES_TO_REMOVE = 4
-
 # <function Location.<lambda> at 0x102ca98a0>
 lambda_regex = re.compile(r"^<function Location\.<lambda> at (.*)>$")
 
@@ -27,8 +24,8 @@ def test_all_locations_and_items_are_the_same_between_two_generations(self):
         output_a = subprocess.check_output([sys.executable, '-m', 'worlds.stardew_valley.test.stability.StabilityOutputScript', '--seed', str(seed)])
         output_b = subprocess.check_output([sys.executable, '-m', 'worlds.stardew_valley.test.stability.StabilityOutputScript', '--seed', str(seed)])
 
-        result_a = json.loads(output_a[:-BYTES_TO_REMOVE])
-        result_b = json.loads(output_b[:-BYTES_TO_REMOVE])
+        result_a = json.loads(output_a)
+        result_b = json.loads(output_b)
 
         for i, ((room_a, bundles_a), (room_b, bundles_b)) in enumerate(zip(result_a["bundles"].items(), result_b["bundles"].items())):
             self.assertEqual(room_a, room_b, f"Bundle rooms at index {i} is different between both executions. Seed={seed}")

From ad30e3264aedb9eb02cee167cc5d487594acd5c5 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sat, 30 Nov 2024 02:15:50 +0100
Subject: [PATCH 094/381] The Witness: Turn off default tests on a test that is
 prone to swap fails #4261

---
 worlds/witness/test/test_disable_non_randomized.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/worlds/witness/test/test_disable_non_randomized.py b/worlds/witness/test/test_disable_non_randomized.py
index e7cb1597b2ba..bf285f035d5b 100644
--- a/worlds/witness/test/test_disable_non_randomized.py
+++ b/worlds/witness/test/test_disable_non_randomized.py
@@ -3,6 +3,8 @@
 
 
 class TestDisableNonRandomized(WitnessTestBase):
+    run_default_tests = False
+
     options = {
         "disable_non_randomized_puzzles": True,
         "shuffle_doors": "panels",

From 089b3f17a7058d281624828a747ecb3ccba071cf Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sat, 30 Nov 2024 02:16:52 +0100
Subject: [PATCH 095/381] The Witness: Add "Panel Keys" and "Obelisk Keys" item
 groups #4026

---
 worlds/witness/data/static_items.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/worlds/witness/data/static_items.py b/worlds/witness/data/static_items.py
index e5103ef3807e..c64df741982e 100644
--- a/worlds/witness/data/static_items.py
+++ b/worlds/witness/data/static_items.py
@@ -1,4 +1,4 @@
-from typing import Dict, List, Set
+from typing import Dict, List, Set, cast
 
 from BaseClasses import ItemClassification
 
@@ -41,7 +41,19 @@ def populate_items() -> None:
             ITEM_GROUPS.setdefault("Symbols", set()).add(item_name)
         elif definition.category is ItemCategory.DOOR:
             classification = ItemClassification.progression
-            ITEM_GROUPS.setdefault("Doors", set()).add(item_name)
+
+            first_entity_hex = cast(DoorItemDefinition, definition).panel_id_hexes[0]
+            entity_type = static_witness_logic.ENTITIES_BY_HEX[first_entity_hex]["entityType"]
+
+            if entity_type == "Door":
+                ITEM_GROUPS.setdefault("Doors", set()).add(item_name)
+            elif entity_type == "Panel":
+                ITEM_GROUPS.setdefault("Panel Keys", set()).add(item_name)
+            elif entity_type in {"EP", "Obelisk Side", "Obelisk"}:
+                ITEM_GROUPS.setdefault("Obelisk Keys", set()).add(item_name)
+            else:
+                raise ValueError(f"Couldn't figure out what type of door item {definition} is.")
+
         elif definition.category is ItemCategory.LASER:
             classification = ItemClassification.progression_skip_balancing
             ITEM_GROUPS.setdefault("Lasers", set()).add(item_name)

From 72e88bb493b465ad2cfb1c4250c9bed60fb220fa Mon Sep 17 00:00:00 2001
From: lordlou <87331798+lordlou@users.noreply.github.com>
Date: Fri, 29 Nov 2024 21:36:00 -0500
Subject: [PATCH 096/381] SMZ3: generate without rom (#3461)

* - 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

* 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

* now doesnt require ROM for generation

* removed stage_assert_generate

* fixed conflict with main and small cleanup
---
 worlds/smz3/Rom.py      | 24 ++++++++++++++++++++++--
 worlds/smz3/__init__.py | 37 ++++++++++---------------------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/worlds/smz3/Rom.py b/worlds/smz3/Rom.py
index 3fec151dc679..d66d9239792d 100644
--- a/worlds/smz3/Rom.py
+++ b/worlds/smz3/Rom.py
@@ -3,18 +3,38 @@
 
 import Utils
 from Utils import read_snes_rom
-from worlds.Files import APDeltaPatch
+from worlds.Files import APProcedurePatch, APPatchExtension, APTokenMixin, APTokenTypes
+from worlds.smz3.ips import IPS_Patch
 
 SMJUHASH = '21f3e98df4780ee1c667b84e57d88675'
 LTTPJPN10HASH = '03a63945398191337e896e5771f77173'
 ROM_PLAYER_LIMIT = 256
 
+world_folder = os.path.dirname(__file__)
 
-class SMZ3DeltaPatch(APDeltaPatch):
+class SMZ3PatchExtensions(APPatchExtension):
+    game = "SMZ3"
+
+    @staticmethod
+    def apply_basepatch(caller: APProcedurePatch, rom: bytes) -> bytes:
+        basepatch = IPS_Patch.load(world_folder + "/data/zsm.ips")
+        return basepatch.apply(rom)
+
+class SMZ3ProcedurePatch(APProcedurePatch, APTokenMixin):
     hash = "3a177ba9879e3dd04fb623a219d175b2"
     game = "SMZ3"
     patch_file_ending = ".apsmz3"
 
+    procedure = [
+        ("apply_basepatch", []),
+        ("apply_tokens", ["token_data.bin"]),
+    ]
+
+    def write_tokens(self, patches):
+        for addr, data in patches.items():
+            self.write_token(APTokenTypes.WRITE, addr, bytes(data))
+        self.write_file("token_data.bin", self.get_token_binary())
+
     @classmethod
     def get_source_data(cls) -> bytes:
         return get_base_rom_bytes()
diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index 5e6a6ac60965..838db1f7e745 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -19,11 +19,10 @@
 from .TotalSMZ3.Region import IReward, IMedallionAccess
 from .TotalSMZ3.Text.Texts import openFile
 from worlds.AutoWorld import World, AutoLogicRegister, WebWorld
-from .Client import SMZ3SNIClient
-from .Rom import get_base_rom_bytes, SMZ3DeltaPatch
-from .ips import IPS_Patch
+from .Rom import SMZ3ProcedurePatch
 from .Options import SMZ3Options
-from Options import Accessibility, ItemsAccessibility
+from Options import ItemsAccessibility
+from .Client import SMZ3SNIClient
 
 world_folder = os.path.dirname(__file__)
 logger = logging.getLogger("SMZ3")
@@ -183,10 +182,6 @@ def isProgression(cls, itemType):
                             }
         return itemType in progressionTypes
 
-    @classmethod
-    def stage_assert_generate(cls, multiworld: MultiWorld):
-        base_combined_rom = get_base_rom_bytes()
-
     def generate_early(self):
         self.config = Config()
         self.config.GameMode = GameMode.Multiworld
@@ -444,10 +439,6 @@ def apply_customization(self):
 
     def generate_output(self, output_directory: str):
         try:
-            base_combined_rom = get_base_rom_bytes()
-            basepatch = IPS_Patch.load(world_folder + "/data/zsm.ips")
-            base_combined_rom = basepatch.apply(base_combined_rom)
-
             patcher = TotalSMZ3Patch(self.smz3World,
                                      [world.smz3World for key, world in self.multiworld.worlds.items() if isinstance(world, SMZ3World) and hasattr(world, "smz3World")],
                                      self.multiworld.seed_name,
@@ -459,21 +450,13 @@ def generate_output(self, output_directory: str):
             patches.update(self.apply_sm_custom_sprite())
             patches.update(self.apply_item_names())
             patches.update(self.apply_customization())
-            for addr, bytes in patches.items():
-                offset = 0
-                for byte in bytes:
-                    base_combined_rom[addr + offset] = byte
-                    offset += 1
-
-            outfilebase = self.multiworld.get_out_file_name_base(self.player)
-
-            filename = os.path.join(output_directory, f"{outfilebase}.sfc")
-            with open(filename, "wb") as binary_file:
-                binary_file.write(base_combined_rom)
-            patch = SMZ3DeltaPatch(os.path.splitext(filename)[0] + SMZ3DeltaPatch.patch_file_ending, player=self.player,
-                                   player_name=self.multiworld.player_name[self.player], patched_path=filename)
-            patch.write()
-            os.remove(filename)
+
+            patch = SMZ3ProcedurePatch(player=self.player, player_name=self.player_name)
+            patch.write_tokens(patches)
+            rom_path = os.path.join(output_directory, f"{self.multiworld.get_out_file_name_base(self.player)}"
+                                                      f"{patch.patch_file_ending}")
+            patch.write(rom_path)
+
             self.rom_name = bytearray(patcher.title, 'utf8')
         except:
             raise

From 7adb673a80a4fcaf8c5ca87369c5851fe2d7a0bf Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sat, 30 Nov 2024 03:37:08 +0100
Subject: [PATCH 097/381] Core: "Fix" Priority Fill (#3592)

* Priority fill -> Don't use one item per player

* fix unit test thing

* Ok, I think this should do it properly
---
 Fill.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Fill.py b/Fill.py
index 912b4d05bed9..86a4639c51ce 100644
--- a/Fill.py
+++ b/Fill.py
@@ -36,7 +36,8 @@ def sweep_from_pool(base_state: CollectionState, itempool: typing.Sequence[Item]
 def fill_restrictive(multiworld: MultiWorld, base_state: CollectionState, locations: typing.List[Location],
                      item_pool: typing.List[Item], single_player_placement: bool = False, lock: bool = False,
                      swap: bool = True, on_place: typing.Optional[typing.Callable[[Location], None]] = None,
-                     allow_partial: bool = False, allow_excluded: bool = False, name: str = "Unknown") -> None:
+                     allow_partial: bool = False, allow_excluded: bool = False, one_item_per_player: bool = True,
+                     name: str = "Unknown") -> None:
     """
     :param multiworld: Multiworld to be filled.
     :param base_state: State assumed before fill.
@@ -63,14 +64,22 @@ def fill_restrictive(multiworld: MultiWorld, base_state: CollectionState, locati
     placed = 0
 
     while any(reachable_items.values()) and locations:
-        # grab one item per player
-        items_to_place = [items.pop()
-                          for items in reachable_items.values() if items]
+        if one_item_per_player:
+            # grab one item per player
+            items_to_place = [items.pop()
+                              for items in reachable_items.values() if items]
+        else:
+            next_player = multiworld.random.choice([player for player, items in reachable_items.items() if items])
+            items_to_place = []
+            if item_pool:
+                items_to_place.append(reachable_items[next_player].pop())
+
         for item in items_to_place:
             for p, pool_item in enumerate(item_pool):
                 if pool_item is item:
                     item_pool.pop(p)
                     break
+
         maximum_exploration_state = sweep_from_pool(
             base_state, item_pool + unplaced_items, multiworld.get_filled_locations(item.player)
             if single_player_placement else None)
@@ -480,7 +489,8 @@ def mark_for_locking(location: Location):
     if prioritylocations:
         # "priority fill"
         fill_restrictive(multiworld, multiworld.state, prioritylocations, progitempool,
-                         single_player_placement=single_player, swap=False, on_place=mark_for_locking, name="Priority")
+                         single_player_placement=single_player, swap=False, on_place=mark_for_locking,
+                         name="Priority", one_item_per_player=False)
         accessibility_corrections(multiworld, multiworld.state, prioritylocations, progitempool)
         defaultlocations = prioritylocations + defaultlocations
 

From 845a60495589e7b25a8d3f225c5aac40cb153826 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Fri, 29 Nov 2024 21:40:14 -0500
Subject: [PATCH 098/381] MultiServer: !status shows Ready status (#3598)

* Makes !status show a note if the slot is in Status Ready

* update variable name for better clarity
---
 MultiServer.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/MultiServer.py b/MultiServer.py
index 0db8722b5cb6..628817d5977c 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -975,9 +975,13 @@ def get_status_string(ctx: Context, team: int, tag: str):
         tagged = len([client for client in ctx.clients[team][slot] if tag in client.tags])
         completion_text = f"({len(ctx.location_checks[team, slot])}/{len(ctx.locations[slot])})"
         tag_text = f" {tagged} of which are tagged {tag}" if connected and tag else ""
-        goal_text = " and has finished." if ctx.client_game_state[team, slot] == ClientStatus.CLIENT_GOAL else "."
+        status_text = (
+            " and has finished." if ctx.client_game_state[team, slot] == ClientStatus.CLIENT_GOAL else
+            " and is ready." if ctx.client_game_state[team, slot] == ClientStatus.CLIENT_READY else
+            "."
+            )
         text += f"\n{ctx.get_aliased_name(team, slot)} has {connected} connection{'' if connected == 1 else 's'}" \
-                f"{tag_text}{goal_text} {completion_text}"
+                f"{tag_text}{status_text} {completion_text}"
     return text
 
 

From a537d8eb65a0b85210504691ef420cfdb8d7f3b3 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Fri, 29 Nov 2024 21:58:52 -0500
Subject: [PATCH 099/381] Launcher: support Component icons inside apworlds
 (#3629)

* Add kivy overrides to allow AsyncImage source paths of the format ap:worlds.module/subpath/to/data.png that use pkgutil to load files from within an apworld

* Apply suggestions from code review

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

* change original-load variable name for clarity per review

* add comment to record pkgutil format

* remove dependency on PIL

* i hate typing

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 Launcher.py                  |  7 +++----
 kvui.py                      | 38 ++++++++++++++++++++++++++++++++++++
 worlds/LauncherComponents.py |  1 +
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index f04d67a5aa0d..0b8be232170d 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -246,9 +246,8 @@ def launch(exe, in_terminal=False):
 
 
 def run_gui():
-    from kvui import App, ContainerLayout, GridLayout, Button, Label, ScrollBox, Widget
+    from kvui import App, ContainerLayout, GridLayout, Button, Label, ScrollBox, Widget, ApAsyncImage
     from kivy.core.window import Window
-    from kivy.uix.image import AsyncImage
     from kivy.uix.relativelayout import RelativeLayout
 
     class Launcher(App):
@@ -281,8 +280,8 @@ def build_button(component: Component) -> Widget:
                 button.component = component
                 button.bind(on_release=self.component_action)
                 if component.icon != "icon":
-                    image = AsyncImage(source=icon_paths[component.icon],
-                                       size=(38, 38), size_hint=(None, 1), pos=(5, 0))
+                    image = ApAsyncImage(source=icon_paths[component.icon],
+                                         size=(38, 38), size_hint=(None, 1), pos=(5, 0))
                     box_layout = RelativeLayout(size_hint_y=None, height=40)
                     box_layout.add_widget(button)
                     box_layout.add_widget(image)
diff --git a/kvui.py b/kvui.py
index dfe935930049..d98fc7ed9ab8 100644
--- a/kvui.py
+++ b/kvui.py
@@ -3,6 +3,8 @@
 import sys
 import typing
 import re
+import io
+import pkgutil
 from collections import deque
 
 assert "kivy" not in sys.modules, "kvui should be imported before kivy for frozen compatibility"
@@ -34,6 +36,7 @@
 from kivy.core.window import Window
 from kivy.core.clipboard import Clipboard
 from kivy.core.text.markup import MarkupLabel
+from kivy.core.image import ImageLoader, ImageLoaderBase, ImageData
 from kivy.base import ExceptionHandler, ExceptionManager
 from kivy.clock import Clock
 from kivy.factory import Factory
@@ -61,6 +64,7 @@
 from kivy.uix.recycleview.layout import LayoutSelectionBehavior
 from kivy.animation import Animation
 from kivy.uix.popup import Popup
+from kivy.uix.image import AsyncImage
 
 fade_in_animation = Animation(opacity=0, duration=0) + Animation(opacity=1, duration=0.25)
 
@@ -838,6 +842,40 @@ def fix_heights(self):
             element.height = max_height
 
 
+class ApAsyncImage(AsyncImage):
+    def is_uri(self, filename: str) -> bool:
+        if filename.startswith("ap:"):
+            return True
+        else:
+            return super().is_uri(filename)
+
+
+class ImageLoaderPkgutil(ImageLoaderBase):
+    def load(self, filename: str) -> typing.List[ImageData]:
+        # take off the "ap:" prefix
+        module, path = filename[3:].split("/", 1)
+        data = pkgutil.get_data(module, path)
+        return self._bytes_to_data(data)
+
+    def _bytes_to_data(self, data: typing.Union[bytes, bytearray]) -> typing.List[ImageData]:
+        loader = next(loader for loader in ImageLoader.loaders if loader.can_load_memory())
+        return loader.load(loader, io.BytesIO(data))
+
+
+# grab the default loader method so we can override it but use it as a fallback
+_original_image_loader_load = ImageLoader.load
+
+
+def load_override(filename: str, default_load=_original_image_loader_load, **kwargs):
+    if filename.startswith("ap:"):
+        return ImageLoaderPkgutil(filename)
+    else:
+        return default_load(filename, **kwargs)
+
+
+ImageLoader.load = load_override
+
+
 class E(ExceptionHandler):
     logger = logging.getLogger("Client")
 
diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index 67806a7394c7..7f178f1739fc 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -207,6 +207,7 @@ def install_apworld(apworld_path: str = "") -> None:
 ]
 
 
+# if registering an icon from within an apworld, the format "ap:module.name/path/to/file.png" can be used
 icon_paths = {
     'icon': local_path('data', 'icon.png'),
     'mcicon': local_path('data', 'mcicon.png'),

From 0705f6e6c06baa33d60573e0a201385ba6e27ca4 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sat, 30 Nov 2024 04:08:17 +0100
Subject: [PATCH 100/381] Factorio: option groups (#4293)

---
 worlds/factorio/Options.py  | 41 ++++++++++++++++++++++++++++++++-----
 worlds/factorio/__init__.py |  4 +++-
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index 5a41250fa760..dd17e2d68bdd 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -6,7 +6,7 @@
 from schema import Schema, Optional, And, Or
 
 from Options import Choice, OptionDict, OptionSet, DefaultOnToggle, Range, DeathLink, Toggle, \
-    StartInventoryPool, PerGameCommonOptions
+    StartInventoryPool, PerGameCommonOptions, OptionGroup
 
 # schema helpers
 FloatRange = lambda low, high: And(Or(int, float), lambda f: low <= f <= high)
@@ -293,7 +293,7 @@ class FactorioWorldGen(OptionDict):
     with in-depth documentation at https://lua-api.factorio.com/latest/Concepts.html#MapGenSettings"""
     display_name = "World Generation"
     # FIXME: do we want default be a rando-optimized default or in-game DS?
-    value: typing.Dict[str, typing.Dict[str, typing.Any]]
+    value: dict[str, dict[str, typing.Any]]
     default = {
         "autoplace_controls": {
             # terrain
@@ -402,7 +402,7 @@ class FactorioWorldGen(OptionDict):
         }
     })
 
-    def __init__(self, value: typing.Dict[str, typing.Any]):
+    def __init__(self, value: dict[str, typing.Any]):
         advanced = {"pollution", "enemy_evolution", "enemy_expansion"}
         self.value = {
             "basic": {k: v for k, v in value.items() if k not in advanced},
@@ -421,7 +421,7 @@ def optional_min_lte_max(container, min_key, max_key):
         optional_min_lte_max(enemy_expansion, "min_expansion_cooldown", "max_expansion_cooldown")
 
     @classmethod
-    def from_any(cls, data: typing.Dict[str, typing.Any]) -> FactorioWorldGen:
+    def from_any(cls, data: dict[str, typing.Any]) -> FactorioWorldGen:
         if type(data) == dict:
             return cls(data)
         else:
@@ -435,7 +435,7 @@ class ImportedBlueprint(DefaultOnToggle):
 
 class EnergyLink(Toggle):
     """Allow sending energy to other worlds. 25% of the energy is lost in the transfer."""
-    display_name = "EnergyLink"
+    display_name = "Energy Link"
 
 
 @dataclass
@@ -473,3 +473,34 @@ class FactorioOptions(PerGameCommonOptions):
     death_link: DeathLink
     energy_link: EnergyLink
     start_inventory_from_pool: StartInventoryPool
+
+
+option_groups: list[OptionGroup] = [
+    OptionGroup(
+        "Technologies",
+        [
+            TechTreeLayout,
+            Progressive,
+            MinTechCost,
+            MaxTechCost,
+            TechCostDistribution,
+            TechCostMix,
+            RampingTechCosts,
+            TechTreeInformation,
+        ]
+    ),
+    OptionGroup(
+        "Traps",
+        [
+            AttackTrapCount,
+            EvolutionTrapCount,
+            EvolutionTrapIncrease,
+            TeleportTrapCount,
+            GrenadeTrapCount,
+            ClusterGrenadeTrapCount,
+            ArtilleryTrapCount,
+            AtomicRocketTrapCount,
+        ],
+        start_collapsed=True
+    ),
+]
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index 9f1f3cb573f9..dd14ab434717 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -12,7 +12,8 @@
 from worlds.generic import Rules
 from .Locations import location_pools, location_table
 from .Mod import generate_mod
-from .Options import FactorioOptions, MaxSciencePack, Silo, Satellite, TechTreeInformation, Goal, TechCostDistribution
+from .Options import (FactorioOptions, MaxSciencePack, Silo, Satellite, TechTreeInformation, Goal,
+                      TechCostDistribution, option_groups)
 from .Shapes import get_shapes
 from .Technologies import base_tech_table, recipe_sources, base_technology_table, \
     all_product_sources, required_technologies, get_rocket_requirements, \
@@ -61,6 +62,7 @@ class FactorioWeb(WebWorld):
         "setup/en",
         ["Berserker, Farrak Kilhn"]
     )]
+    option_groups = option_groups
 
 
 class FactorioItem(Item):

From c1b27f79ac4107e5b253f8cf68fcbfb64d9a11f8 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sat, 30 Nov 2024 04:11:03 +0100
Subject: [PATCH 101/381] Core: cull events from multidata spheres (#3623)

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 BaseClasses.py | 43 +++++++++++++++++++++++++++++++++++++++++++
 Main.py        |  5 ++---
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index d84da5d212b4..98ada4f861ec 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -604,6 +604,49 @@ def get_spheres(self) -> Iterator[Set[Location]]:
                 state.collect(location.item, True, location)
             locations -= sphere
 
+    def get_sendable_spheres(self) -> Iterator[Set[Location]]:
+        """
+        yields a set of multiserver sendable locations (location.item.code: int) for each logical sphere
+
+        If there are unreachable locations, the last sphere of reachable locations is followed by an empty set,
+        and then a set of all of the unreachable locations.
+        """
+        state = CollectionState(self)
+        locations: Set[Location] = set()
+        events: Set[Location] = set()
+        for location in self.get_filled_locations():
+            if type(location.item.code) is int:
+                locations.add(location)
+            else:
+                events.add(location)
+
+        while locations:
+            sphere: Set[Location] = set()
+
+            # cull events out
+            done_events: Set[Union[Location, None]] = {None}
+            while done_events:
+                done_events = set()
+                for event in events:
+                    if event.can_reach(state):
+                        state.collect(event.item, True, event)
+                        done_events.add(event)
+                events -= done_events
+
+            for location in locations:
+                if location.can_reach(state):
+                    sphere.add(location)
+
+            yield sphere
+            if not sphere:
+                if locations:
+                    yield locations  # unreachable locations
+                break
+
+            for location in sphere:
+                state.collect(location.item, True, location)
+            locations -= sphere
+
     def fulfills_accessibility(self, state: Optional[CollectionState] = None):
         """Check if accessibility rules are fulfilled with current or supplied state."""
         if not state:
diff --git a/Main.py b/Main.py
index b9612e9549ba..3a11181bd99f 100644
--- a/Main.py
+++ b/Main.py
@@ -306,11 +306,10 @@ def precollect_hint(location):
 
                 # get spheres -> filter address==None -> skip empty
                 spheres: List[Dict[int, Set[int]]] = []
-                for sphere in multiworld.get_spheres():
+                for sphere in multiworld.get_sendable_spheres():
                     current_sphere: Dict[int, Set[int]] = collections.defaultdict(set)
                     for sphere_location in sphere:
-                        if type(sphere_location.address) is int:
-                            current_sphere[sphere_location.player].add(sphere_location.address)
+                        current_sphere[sphere_location.player].add(sphere_location.address)
 
                     if current_sphere:
                         spheres.append(dict(current_sphere))

From 9eaca9527783d88e176119e7b2f436a374159357 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sat, 30 Nov 2024 04:11:28 +0100
Subject: [PATCH 102/381] WebHost: add a page to manage session cookie (#4173)

---
 WebHostLib/__init__.py            |  2 +-
 WebHostLib/misc.py                |  7 -------
 WebHostLib/session.py             | 31 +++++++++++++++++++++++++++++++
 WebHostLib/templates/session.html | 30 ++++++++++++++++++++++++++++++
 WebHostLib/templates/siteMap.html |  1 +
 5 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 WebHostLib/session.py
 create mode 100644 WebHostLib/templates/session.html

diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py
index dbe2182b0747..9b2b6736f13c 100644
--- a/WebHostLib/__init__.py
+++ b/WebHostLib/__init__.py
@@ -85,6 +85,6 @@ def register():
 
     from WebHostLib.customserver import run_server_process
     # to trigger app routing picking up on it
-    from . import tracker, upload, landing, check, generate, downloads, api, stats, misc, robots, options
+    from . import tracker, upload, landing, check, generate, downloads, api, stats, misc, robots, options, session
 
     app.register_blueprint(api.api_endpoints)
diff --git a/WebHostLib/misc.py b/WebHostLib/misc.py
index c49b1ae17801..6be0e470b3b4 100644
--- a/WebHostLib/misc.py
+++ b/WebHostLib/misc.py
@@ -18,13 +18,6 @@ def get_world_theme(game_name: str):
     return 'grass'
 
 
-@app.before_request
-def register_session():
-    session.permanent = True  # technically 31 days after the last visit
-    if not session.get("_id", None):
-        session["_id"] = uuid4()  # uniquely identify each session without needing a login
-
-
 @app.errorhandler(404)
 @app.errorhandler(jinja2.exceptions.TemplateNotFound)
 def page_not_found(err):
diff --git a/WebHostLib/session.py b/WebHostLib/session.py
new file mode 100644
index 000000000000..d5dab7d6e6e6
--- /dev/null
+++ b/WebHostLib/session.py
@@ -0,0 +1,31 @@
+from uuid import uuid4, UUID
+
+from flask import session, render_template
+
+from WebHostLib import app
+
+
+@app.before_request
+def register_session():
+    session.permanent = True  # technically 31 days after the last visit
+    if not session.get("_id", None):
+        session["_id"] = uuid4()  # uniquely identify each session without needing a login
+
+
+@app.route('/session')
+def show_session():
+    return render_template(
+        "session.html",
+    )
+
+
+@app.route('/session/<string:_id>')
+def set_session(_id: str):
+    new_id: UUID = UUID(_id, version=4)
+    old_id: UUID = session["_id"]
+    if old_id != new_id:
+        session["_id"] = new_id
+    return render_template(
+        "session.html",
+        old_id=old_id,
+    )
diff --git a/WebHostLib/templates/session.html b/WebHostLib/templates/session.html
new file mode 100644
index 000000000000..b75474483a8f
--- /dev/null
+++ b/WebHostLib/templates/session.html
@@ -0,0 +1,30 @@
+{% extends 'pageWrapper.html' %}
+
+{% block head %}
+    {% include 'header/stoneHeader.html' %}
+    <title>Session</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/markdown.css") }}" />
+{% endblock %}
+
+{% block body %}
+    <div class="markdown">
+        {% if old_id is defined %}
+            <p>Your old code was:</p>
+            <code>{{ old_id }}</code>
+            <br>
+        {% endif %}
+        <p>The following code is your unique identifier, it binds your uploaded content, such as rooms and seeds to you.
+            Treat it like a combined login name and password.
+            You should save this securely if you ever need to restore access.
+            You can also paste it into another device to access your content from multiple devices / browsers.
+            Some browsers, such as Brave, will delete your identifier cookie on a timer.</p>
+        <code>{{ session["_id"] }}</code>
+        <br>
+        <p>
+            The following link can be used to set the identifier. Do not share the code or link with others. <br>
+            <a href="{{ url_for('set_session', _id=session['_id']) }}">
+                {{ url_for('set_session', _id=session['_id'], _external=True) }}
+            </a>
+        </p>
+    </div>
+{%  endblock %}
diff --git a/WebHostLib/templates/siteMap.html b/WebHostLib/templates/siteMap.html
index cdd6ad45eb27..b7db8227dc50 100644
--- a/WebHostLib/templates/siteMap.html
+++ b/WebHostLib/templates/siteMap.html
@@ -26,6 +26,7 @@ <h2>Base Pages</h2>
             <li><a href="/user-content">User Content</a></li>
             <li><a href="{{url_for('stats')}}">Game Statistics</a></li>
             <li><a href="/glossary/en">Glossary</a></li>
+            <li><a href="{{url_for("show_session")}}">Session / Login</a></li>
         </ul>
 
         <h2>Tutorials</h2>

From d6da3bc899cd11e76a5a6da4fb6870134341d080 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sat, 30 Nov 2024 06:53:28 +0100
Subject: [PATCH 103/381] Factorio: add Atomic Cliff Remover Trap (#4282)

---
 worlds/factorio/Options.py                    |  8 +++++++
 worlds/factorio/__init__.py                   |  5 ++++-
 worlds/factorio/data/mod/lib.lua              | 21 ++++++++++++++-----
 worlds/factorio/data/mod_template/control.lua |  7 +++++++
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index dd17e2d68bdd..72f438778b60 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -272,6 +272,12 @@ class AtomicRocketTrapCount(TrapCount):
     display_name = "Atomic Rocket Traps"
 
 
+class AtomicCliffRemoverTrapCount(TrapCount):
+    """Trap items that when received trigger an atomic rocket explosion on a random cliff.
+    Warning: there is no warning. The launch is instantaneous."""
+    display_name = "Atomic Cliff Remover Traps"
+
+
 class EvolutionTrapCount(TrapCount):
     """Trap items that when received increase the enemy evolution."""
     display_name = "Evolution Traps"
@@ -467,6 +473,7 @@ class FactorioOptions(PerGameCommonOptions):
     cluster_grenade_traps: ClusterGrenadeTrapCount
     artillery_traps: ArtilleryTrapCount
     atomic_rocket_traps: AtomicRocketTrapCount
+    atomic_cliff_remover_traps: AtomicCliffRemoverTrapCount
     attack_traps: AttackTrapCount
     evolution_traps: EvolutionTrapCount
     evolution_trap_increase: EvolutionTrapIncrease
@@ -500,6 +507,7 @@ class FactorioOptions(PerGameCommonOptions):
             ClusterGrenadeTrapCount,
             ArtilleryTrapCount,
             AtomicRocketTrapCount,
+            AtomicCliffRemoverTrapCount,
         ],
         start_collapsed=True
     ),
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index dd14ab434717..8f8abeb292f1 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -77,6 +77,7 @@ class FactorioItem(Item):
 all_items["Cluster Grenade Trap"] = factorio_base_id - 5
 all_items["Artillery Trap"] = factorio_base_id - 6
 all_items["Atomic Rocket Trap"] = factorio_base_id - 7
+all_items["Atomic Cliff Remover Trap"] = factorio_base_id - 8
 
 
 class Factorio(World):
@@ -142,6 +143,7 @@ def create_regions(self):
                          self.options.grenade_traps + \
                          self.options.cluster_grenade_traps + \
                          self.options.atomic_rocket_traps + \
+                         self.options.atomic_cliff_remover_traps + \
                          self.options.artillery_traps
 
         location_pool = []
@@ -194,7 +196,8 @@ def sorter(loc: FactorioScienceLocation):
     def create_items(self) -> None:
         self.custom_technologies = self.set_custom_technologies()
         self.set_custom_recipes()
-        traps = ("Evolution", "Attack", "Teleport", "Grenade", "Cluster Grenade", "Artillery", "Atomic Rocket")
+        traps = ("Evolution", "Attack", "Teleport", "Grenade", "Cluster Grenade", "Artillery", "Atomic Rocket",
+                 "Atomic Cliff Remover")
         for trap_name in traps:
             self.multiworld.itempool.extend(self.create_item(f"{trap_name} Trap") for _ in
                                             range(getattr(self.options,
diff --git a/worlds/factorio/data/mod/lib.lua b/worlds/factorio/data/mod/lib.lua
index 7be7403e48f1..517a54e3d642 100644
--- a/worlds/factorio/data/mod/lib.lua
+++ b/worlds/factorio/data/mod/lib.lua
@@ -28,12 +28,23 @@ function random_offset_position(position, offset)
 end
 
 function fire_entity_at_players(entity_name, speed)
+    local entities = {}
     for _, player in ipairs(game.forces["player"].players) do
-        current_character = player.character
-        if current_character ~= nil then
-            current_character.surface.create_entity{name=entity_name,
-                position=random_offset_position(current_character.position, 128),
-                target=current_character, speed=speed}
+        if player.character ~= nil then
+            table.insert(entities, player.character)
         end
     end
+    return fire_entity_at_entities(entity_name, entities, speed)
+end
+
+function fire_entity_at_entities(entity_name, entities, speed)
+    for _, current_entity in ipairs(entities) do
+        local target = current_entity
+        if target.health == nil then
+            target = target.position
+        end
+        current_entity.surface.create_entity{name=entity_name,
+            position=random_offset_position(current_entity.position, 128),
+            target=target, speed=speed}
+    end
 end
diff --git a/worlds/factorio/data/mod_template/control.lua b/worlds/factorio/data/mod_template/control.lua
index b08608a60ae9..e486c7433095 100644
--- a/worlds/factorio/data/mod_template/control.lua
+++ b/worlds/factorio/data/mod_template/control.lua
@@ -737,6 +737,13 @@ end,
 ["Atomic Rocket Trap"] = function ()
     fire_entity_at_players("atomic-rocket", 0.1)
 end,
+["Atomic Cliff Remover Trap"] = function ()
+    local cliffs = game.surfaces["nauvis"].find_entities_filtered{type = "cliff"}
+
+    if #cliffs > 0 then
+        fire_entity_at_entities("atomic-rocket", {cliffs[math.random(#cliffs)]}, 0.1)
+    end
+end,
 }
 
 commands.add_command("ap-get-technology", "Grant a technology, used by the Archipelago Client.", function(call)

From 7cbd50a2e6f646870f0309a9f8c93bfe24f3a18a Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sat, 30 Nov 2024 10:02:32 -0500
Subject: [PATCH 104/381] HK: add item group for dream nail(s) (#4069)

---
 worlds/hk/Items.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/hk/Items.py b/worlds/hk/Items.py
index 8515465826a5..a2b7c06d62a6 100644
--- a/worlds/hk/Items.py
+++ b/worlds/hk/Items.py
@@ -61,6 +61,7 @@ class HKItemData(NamedTuple):
     "VesselFragments": lookup_type_to_names["Vessel"],
     "WhisperingRoots": lookup_type_to_names["Root"],
     "WhiteFragments": {"Queen_Fragment", "King_Fragment", "Void_Heart"},
+    "DreamNails": {"Dream_Nail", "Dream_Gate", "Awoken_Dream_Nail"},
 })
 item_name_groups['Horizontal'] = item_name_groups['Cloak'] | item_name_groups['CDash']
 item_name_groups['Vertical'] = item_name_groups['Claw'] | {'Monarch_Wings'}

From ca6792a8a7c5f82e3a8c539c7f0d23e44b181c4f Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Sat, 30 Nov 2024 10:08:41 -0500
Subject: [PATCH 105/381] Blasphemous: Add start_inventory_from_pool (#4217)

---
 worlds/blasphemous/Options.py  | 3 ++-
 worlds/blasphemous/__init__.py | 9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/worlds/blasphemous/Options.py b/worlds/blasphemous/Options.py
index 0bd08b13b260..e0bbcd770758 100644
--- a/worlds/blasphemous/Options.py
+++ b/worlds/blasphemous/Options.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from Options import Choice, Toggle, DefaultOnToggle, DeathLink, PerGameCommonOptions, OptionGroup
+from Options import Choice, Toggle, DefaultOnToggle, DeathLink, PerGameCommonOptions, StartInventoryPool, OptionGroup
 import random
 
 
@@ -213,6 +213,7 @@ class BlasphemousDeathLink(DeathLink):
 
 @dataclass
 class BlasphemousOptions(PerGameCommonOptions):
+    start_inventory_from_pool: StartInventoryPool
     prie_dieu_warp: PrieDieuWarp
     skip_cutscenes: SkipCutscenes
     corpse_hints: CorpseHints
diff --git a/worlds/blasphemous/__init__.py b/worlds/blasphemous/__init__.py
index 67031710e4eb..a967fbac9289 100644
--- a/worlds/blasphemous/__init__.py
+++ b/worlds/blasphemous/__init__.py
@@ -137,12 +137,6 @@ def create_items(self):
         ]
 
         skipped_items = []
-        junk: int = 0
-
-        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())
 
@@ -194,9 +188,6 @@ def create_items(self):
                 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()))
-
         self.multiworld.itempool += pool
 
         self.place_items_from_dict(unrandomized_dict)

From b83b48629de128a0b04c71b40ea4dc8b9aafc6e8 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Sat, 30 Nov 2024 17:23:28 +0100
Subject: [PATCH 106/381] Core: rework python version check (#4294)

* Docs: update min required version

and add comment about security.

* Core: rework python version check

* CI: set min micro update for build and release
---
 .github/workflows/build.yml   |  6 ++++--
 .github/workflows/release.yml |  3 ++-
 ModuleUpdate.py               | 11 +++++++++--
 docs/running from source.md   |  4 +++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab94326d8188..27ca76e41f8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,8 @@ jobs:
       - name: Install python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '~3.12.7'
+          check-latest: true
       - name: Download run-time dependencies
         run: |
           Invoke-WebRequest -Uri https://github.com/Ijwu/Enemizer/releases/download/${Env:ENEMIZER_VERSION}/win-x64.zip -OutFile enemizer.zip
@@ -111,7 +112,8 @@ jobs:
       - name: Get a recent python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '~3.12.7'
+          check-latest: true
       - name: Install build-time dependencies
         run: |
           echo "PYTHON=python3.12" >> $GITHUB_ENV
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b28ec8733408..aec4f90998cf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,7 +44,8 @@ jobs:
       - name: Get a recent python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '~3.12.7'
+          check-latest: true
       - name: Install build-time dependencies
         run: |
           echo "PYTHON=python3.12" >> $GITHUB_ENV
diff --git a/ModuleUpdate.py b/ModuleUpdate.py
index dada16cefcaf..04cf25ea5594 100644
--- a/ModuleUpdate.py
+++ b/ModuleUpdate.py
@@ -5,8 +5,15 @@
 import warnings
 
 
-if sys.version_info < (3, 10, 11):
-    raise RuntimeError(f"Incompatible Python Version found: {sys.version_info}. 3.10.11+ is supported.")
+if sys.platform in ("win32", "darwin") and sys.version_info < (3, 10, 11):
+    # Official micro version updates. This should match the number in docs/running from source.md.
+    raise RuntimeError(f"Incompatible Python Version found: {sys.version_info}. Official 3.10.15+ is supported.")
+elif sys.platform in ("win32", "darwin") and sys.version_info < (3, 10, 15):
+    # There are known security issues, but no easy way to install fixed versions on Windows for testing.
+    warnings.warn(f"Python Version {sys.version_info} has security issues. Don't use in production.")
+elif sys.version_info < (3, 10, 1):
+    # Other platforms may get security backports instead of micro updates, so the number is unreliable.
+    raise RuntimeError(f"Incompatible Python Version found: {sys.version_info}. 3.10.1+ is supported.")
 
 # don't run update if environment is frozen/compiled or if not the parent process (skip in subprocess)
 _skip_update = bool(getattr(sys, "frozen", False) or multiprocessing.parent_process())
diff --git a/docs/running from source.md b/docs/running from source.md
index 66dd1925c897..33d6b3928e54 100644
--- a/docs/running from source.md	
+++ b/docs/running from source.md	
@@ -7,7 +7,9 @@ use that version. These steps are for developers or platforms without compiled r
 ## General
 
 What you'll need:
- * [Python 3.10.15 or newer](https://www.python.org/downloads/), not the Windows Store version
+ * [Python 3.10.11 or newer](https://www.python.org/downloads/), not the Windows Store version
+   * On Windows, please consider only using the latest supported version in production environments since security
+     updates for older versions are not easily available.
    * 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

From e5374eb8b81ac9913f4618f660d6f3c65b63261a Mon Sep 17 00:00:00 2001
From: palex00 <32203971+palex00@users.noreply.github.com>
Date: Sun, 1 Dec 2024 03:22:02 +0100
Subject: [PATCH 107/381] [PKMN RB] Make Encounters in one location unique
 (#3994)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Makes encounters in a location generate unique Pokémon

* vyneras actually got it to work

* V5 Update Fix Part 1

* Part 2

* final puzzle piece
---
 worlds/pokemon_rb/encounters.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/worlds/pokemon_rb/encounters.py b/worlds/pokemon_rb/encounters.py
index fbe4abfe4466..aa20114787c3 100644
--- a/worlds/pokemon_rb/encounters.py
+++ b/worlds/pokemon_rb/encounters.py
@@ -170,6 +170,8 @@ def process_pokemon_locations(self):
     encounter_slots = encounter_slots_master.copy()
 
     zone_mapping = {}
+    zone_placed_mons = {}
+    
     if self.options.randomize_wild_pokemon:
         mons_list = [pokemon for pokemon in poke_data.pokemon_data.keys() if pokemon not in poke_data.legendary_pokemon
                      or self.options.randomize_legendary_pokemon.value == 3]
@@ -180,11 +182,13 @@ def process_pokemon_locations(self):
             zone = " - ".join(location.name.split(" - ")[:-1])
             if zone not in zone_mapping:
                 zone_mapping[zone] = {}
+            if zone not in zone_placed_mons:
+                zone_placed_mons[zone] = []
             original_mon = slot.original_item
             if self.options.area_1_to_1_mapping and original_mon in zone_mapping[zone]:
                 mon = zone_mapping[zone][original_mon]
             else:
-                mon = randomize_pokemon(self, original_mon, mons_list,
+                mon = randomize_pokemon(self, original_mon, [m for m in mons_list if m not in zone_placed_mons[zone]],
                                         self.options.randomize_wild_pokemon.value, self.random)
             #
             while ("Pokemon Tower 6F" in slot.name and
@@ -201,6 +205,7 @@ def process_pokemon_locations(self):
             location.item.location = location
             locations.append(location)
             zone_mapping[zone][original_mon] = mon
+            zone_placed_mons[zone].append(mon)
 
         mons_to_add = []
         remaining_pokemon = [pokemon for pokemon in poke_data.pokemon_data.keys() if placed_mons[pokemon] == 0 and
@@ -270,4 +275,4 @@ def process_pokemon_locations(self):
             location.item = self.create_item(slot.original_item)
             location.locked = True
             location.item.location = location
-            placed_mons[location.item.name] += 1
\ No newline at end of file
+            placed_mons[location.item.name] += 1

From f735416bdac39db987ffb8af4b0d7bc09846c172 Mon Sep 17 00:00:00 2001
From: Kaito Sinclaire <ks@rosenthalcastle.org>
Date: Sat, 30 Nov 2024 18:46:34 -0800
Subject: [PATCH 108/381] id Tech 1: Clean up difficulty options (#4298)

---
 worlds/doom_1993/Options.py | 11 ++++++++---
 worlds/doom_ii/Options.py   | 11 ++++++++---
 worlds/heretic/Options.py   | 15 +++++++--------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/worlds/doom_1993/Options.py b/worlds/doom_1993/Options.py
index b4fc50aac674..c9c61110328c 100644
--- a/worlds/doom_1993/Options.py
+++ b/worlds/doom_1993/Options.py
@@ -16,9 +16,9 @@ class Goal(Choice):
 
 class Difficulty(Choice):
     """
-    Choose the difficulty option. Those match DOOM's difficulty options.
-    baby (I'm too young to die.) double ammos, half damage, less monsters or strength.
-    easy (Hey, not too rough.) less monsters or strength.
+    Choose the game difficulty. These options match DOOM's skill levels.
+    baby (I'm too young to die.) Same as easy, with double ammo pickups and half damage taken.
+    easy (Hey, not too rough.) Less monsters or strength.
     medium (Hurt me plenty.) Default.
     hard (Ultra-Violence.) More monsters or strength.
     nightmare (Nightmare!) Monsters attack more rapidly and respawn.
@@ -29,6 +29,11 @@ class Difficulty(Choice):
     option_medium = 2
     option_hard = 3
     option_nightmare = 4
+    alias_itytd = 0
+    alias_hntr = 1
+    alias_hmp = 2
+    alias_uv = 3
+    alias_nm = 4
     default = 2
 
 
diff --git a/worlds/doom_ii/Options.py b/worlds/doom_ii/Options.py
index 6ecfb1aecd6c..98c8ebc56e16 100644
--- a/worlds/doom_ii/Options.py
+++ b/worlds/doom_ii/Options.py
@@ -6,9 +6,9 @@
 
 class Difficulty(Choice):
     """
-    Choose the difficulty option. Those match DOOM's difficulty options.
-    baby (I'm too young to die.) double ammos, half damage, less monsters or strength.
-    easy (Hey, not too rough.) less monsters or strength.
+    Choose the game difficulty. These options match DOOM's skill levels.
+    baby (I'm too young to die.) Same as easy, with double ammo pickups and half damage taken.
+    easy (Hey, not too rough.) Less monsters or strength.
     medium (Hurt me plenty.) Default.
     hard (Ultra-Violence.) More monsters or strength.
     nightmare (Nightmare!) Monsters attack more rapidly and respawn.
@@ -19,6 +19,11 @@ class Difficulty(Choice):
     option_medium = 2
     option_hard = 3
     option_nightmare = 4
+    alias_itytd = 0
+    alias_hntr = 1
+    alias_hmp = 2
+    alias_uv = 3
+    alias_nm = 4
     default = 2
 
 
diff --git a/worlds/heretic/Options.py b/worlds/heretic/Options.py
index 14f4198a55f0..7d98207b0f8e 100644
--- a/worlds/heretic/Options.py
+++ b/worlds/heretic/Options.py
@@ -16,14 +16,8 @@ class Goal(Choice):
 
 class Difficulty(Choice):
     """
-    Choose the difficulty option. Those match DOOM's difficulty options.
-    baby (I'm too young to die.) double ammos, half damage, less monsters or strength.
-    easy (Hey, not too rough.) less monsters or strength.
-    medium (Hurt me plenty.) Default.
-    hard (Ultra-Violence.) More monsters or strength.
-    nightmare (Nightmare!) Monsters attack more rapidly and respawn.
-
-    wet nurse (hou needeth a wet-nurse) - Fewer monsters and more items than medium. Damage taken is halved, and ammo pickups carry twice as much ammo. Any Quartz Flasks and Mystic Urns are automatically used when the player nears death.
+    Choose the game difficulty. These options match Heretic's skill levels.
+    wet nurse (Thou needeth a wet-nurse) - Fewer monsters and more items than medium. Damage taken is halved, and ammo pickups carry twice as much ammo. Any Quartz Flasks and Mystic Urns are automatically used when the player nears death.
     easy (Yellowbellies-r-us) - Fewer monsters and more items than medium.
     medium (Bringest them oneth) - Completely balanced, this is the standard difficulty level.
     hard (Thou art a smite-meister) - More monsters and fewer items than medium.
@@ -35,6 +29,11 @@ class Difficulty(Choice):
     option_medium = 2
     option_hard = 3
     option_black_plague = 4
+    alias_wn = 0
+    alias_yru = 1
+    alias_bto = 2
+    alias_sm = 3
+    alias_bp = 4
     default = 2
 
 

From a67688749f556c631b3e1423c03f64d6151a5cb4 Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Sat, 30 Nov 2024 21:52:07 -0500
Subject: [PATCH 109/381] Stardew Valley: Refactor skill progression to use new
 feature system (#3662)

* create a first draft of the feature

* use feature in items and locations

* add content to more places

* use feature in logic

* replace option check by feature

* remove unused code

* remove weird white space

* some import nitpicking

* flip negative if
---
 worlds/stardew_valley/__init__.py             |  4 +-
 worlds/stardew_valley/bundles/bundle_item.py  | 24 +++---
 worlds/stardew_valley/content/__init__.py     | 21 ++++-
 .../content/feature/__init__.py               |  1 +
 .../content/feature/skill_progression.py      | 46 +++++++++++
 worlds/stardew_valley/content/game_content.py |  3 +-
 worlds/stardew_valley/data/skill.py           | 14 ++++
 worlds/stardew_valley/early_items.py          | 11 ++-
 worlds/stardew_valley/items.py                | 35 ++++----
 worlds/stardew_valley/locations.py            | 81 ++++++++++---------
 worlds/stardew_valley/logic/crafting_logic.py |  5 +-
 worlds/stardew_valley/logic/grind_logic.py    |  3 +-
 worlds/stardew_valley/logic/mine_logic.py     | 25 ++++--
 worlds/stardew_valley/logic/skill_logic.py    | 27 ++++---
 .../mods/logic/deepwoods_logic.py             |  7 +-
 .../stardew_valley/mods/logic/skills_logic.py | 11 +--
 worlds/stardew_valley/regions.py              | 22 ++---
 worlds/stardew_valley/rules.py                | 67 ++++-----------
 worlds/stardew_valley/test/TestRegions.py     | 10 ++-
 .../stardew_valley/test/content/__init__.py   |  3 +-
 worlds/stardew_valley/test/mods/TestMods.py   |  5 +-
 21 files changed, 244 insertions(+), 181 deletions(-)
 create mode 100644 worlds/stardew_valley/content/feature/skill_progression.py

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 135afa1c9726..34c617f5013a 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -148,7 +148,7 @@ def create_region(name: str, exits: Iterable[str]) -> Region:
             region.exits = [Entrance(self.player, exit_name, region) for exit_name in exits]
             return region
 
-        world_regions, world_entrances, self.randomized_entrances = create_regions(create_region, self.random, self.options)
+        world_regions, world_entrances, self.randomized_entrances = create_regions(create_region, self.random, self.options, self.content)
 
         self.logic = StardewLogic(self.player, self.options, self.content, world_regions.keys())
         self.modified_bundles = get_all_bundles(self.random,
@@ -184,7 +184,7 @@ def create_items(self):
 
         self.multiworld.itempool += created_items
 
-        setup_early_items(self.multiworld, self.options, self.player, self.random)
+        setup_early_items(self.multiworld, self.options, self.content, self.player, self.random)
         self.setup_player_events()
         self.setup_victory()
 
diff --git a/worlds/stardew_valley/bundles/bundle_item.py b/worlds/stardew_valley/bundles/bundle_item.py
index 7dc9c0e1a3b5..91e279d2a623 100644
--- a/worlds/stardew_valley/bundles/bundle_item.py
+++ b/worlds/stardew_valley/bundles/bundle_item.py
@@ -3,8 +3,8 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 
-from ..content import StardewContent
-from ..options import StardewValleyOptions, ExcludeGingerIsland, FestivalLocations, SkillProgression
+from ..content import StardewContent, content_packs
+from ..options import StardewValleyOptions, FestivalLocations
 from ..strings.crop_names import Fruit
 from ..strings.currency_names import Currency
 from ..strings.quality_names import CropQuality, FishQuality, ForageQuality
@@ -12,34 +12,35 @@
 
 class BundleItemSource(ABC):
     @abstractmethod
-    def can_appear(self, options: StardewValleyOptions) -> bool:
+    def can_appear(self, content: StardewContent, options: StardewValleyOptions) -> bool:
         ...
 
 
 class VanillaItemSource(BundleItemSource):
-    def can_appear(self, options: StardewValleyOptions) -> bool:
+    def can_appear(self, content: StardewContent, options: StardewValleyOptions) -> bool:
         return True
 
 
 class IslandItemSource(BundleItemSource):
-    def can_appear(self, options: StardewValleyOptions) -> bool:
-        return options.exclude_ginger_island == ExcludeGingerIsland.option_false
+    def can_appear(self, content: StardewContent, options: StardewValleyOptions) -> bool:
+        return content_packs.ginger_island_content_pack.name in content.registered_packs
 
 
 class FestivalItemSource(BundleItemSource):
-    def can_appear(self, options: StardewValleyOptions) -> bool:
+    def can_appear(self, content: StardewContent, options: StardewValleyOptions) -> bool:
         return options.festival_locations != FestivalLocations.option_disabled
 
 
+# FIXME remove this once recipes are in content packs
 class MasteryItemSource(BundleItemSource):
-    def can_appear(self, options: StardewValleyOptions) -> bool:
-        return options.skill_progression == SkillProgression.option_progressive_with_masteries
+    def can_appear(self, content: StardewContent, options: StardewValleyOptions) -> bool:
+        return content.features.skill_progression.are_masteries_shuffled
 
 
 class ContentItemSource(BundleItemSource):
     """This is meant to be used for items that are managed by the content packs."""
 
-    def can_appear(self, options: StardewValleyOptions) -> bool:
+    def can_appear(self, content: StardewContent, options: StardewValleyOptions) -> bool:
         raise ValueError("This should not be called, check if the item is in the content instead.")
 
 
@@ -97,5 +98,4 @@ def can_appear(self, content: StardewContent, options: StardewValleyOptions) ->
         if isinstance(self.source, ContentItemSource):
             return self.get_item() in content.game_items
 
-        return self.source.can_appear(options)
-
+        return self.source.can_appear(content, options)
diff --git a/worlds/stardew_valley/content/__init__.py b/worlds/stardew_valley/content/__init__.py
index 9130873fa405..54b4d75d5e5c 100644
--- a/worlds/stardew_valley/content/__init__.py
+++ b/worlds/stardew_valley/content/__init__.py
@@ -1,5 +1,5 @@
 from . import content_packs
-from .feature import cropsanity, friendsanity, fishsanity, booksanity
+from .feature import cropsanity, friendsanity, fishsanity, booksanity, skill_progression
 from .game_content import ContentPack, StardewContent, StardewFeatures
 from .unpacking import unpack_content
 from .. import options
@@ -31,7 +31,8 @@ def choose_features(player_options: options.StardewValleyOptions) -> StardewFeat
         choose_booksanity(player_options.booksanity),
         choose_cropsanity(player_options.cropsanity),
         choose_fishsanity(player_options.fishsanity),
-        choose_friendsanity(player_options.friendsanity, player_options.friendsanity_heart_size)
+        choose_friendsanity(player_options.friendsanity, player_options.friendsanity_heart_size),
+        choose_skill_progression(player_options.skill_progression),
     )
 
 
@@ -105,3 +106,19 @@ def choose_friendsanity(friendsanity_option: options.Friendsanity, heart_size: o
         return friendsanity.FriendsanityAllWithMarriage(heart_size.value)
 
     raise ValueError(f"No friendsanity feature mapped to {str(friendsanity_option.value)}")
+
+
+skill_progression_by_option = {
+    options.SkillProgression.option_vanilla: skill_progression.SkillProgressionVanilla(),
+    options.SkillProgression.option_progressive: skill_progression.SkillProgressionProgressive(),
+    options.SkillProgression.option_progressive_with_masteries: skill_progression.SkillProgressionProgressiveWithMasteries(),
+}
+
+
+def choose_skill_progression(skill_progression_option: options.SkillProgression) -> skill_progression.SkillProgressionFeature:
+    skill_progression_feature = skill_progression_by_option.get(skill_progression_option)
+
+    if skill_progression_feature is None:
+        raise ValueError(f"No skill progression feature mapped to {str(skill_progression_option.value)}")
+
+    return skill_progression_feature
diff --git a/worlds/stardew_valley/content/feature/__init__.py b/worlds/stardew_valley/content/feature/__init__.py
index 74249c808257..f3e5c6732e32 100644
--- a/worlds/stardew_valley/content/feature/__init__.py
+++ b/worlds/stardew_valley/content/feature/__init__.py
@@ -2,3 +2,4 @@
 from . import cropsanity
 from . import fishsanity
 from . import friendsanity
+from . import skill_progression
diff --git a/worlds/stardew_valley/content/feature/skill_progression.py b/worlds/stardew_valley/content/feature/skill_progression.py
new file mode 100644
index 000000000000..1325d4b35ff2
--- /dev/null
+++ b/worlds/stardew_valley/content/feature/skill_progression.py
@@ -0,0 +1,46 @@
+from abc import ABC, abstractmethod
+from typing import ClassVar, Iterable, Tuple
+
+from ...data.skill import Skill
+
+
+class SkillProgressionFeature(ABC):
+    is_progressive: ClassVar[bool]
+    are_masteries_shuffled: ClassVar[bool]
+
+    @abstractmethod
+    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[Tuple[int, str]]:
+        ...
+
+    @abstractmethod
+    def is_mastery_randomized(self, skill: Skill) -> bool:
+        ...
+
+
+class SkillProgressionVanilla(SkillProgressionFeature):
+    is_progressive = False
+    are_masteries_shuffled = False
+
+    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[Tuple[int, str]]:
+        return ()
+
+    def is_mastery_randomized(self, skill: Skill) -> bool:
+        return False
+
+
+class SkillProgressionProgressive(SkillProgressionFeature):
+    is_progressive = True
+    are_masteries_shuffled = False
+
+    def get_randomized_level_names_by_level(self, skill: Skill) -> Iterable[Tuple[int, str]]:
+        return skill.level_names_by_level
+
+    def is_mastery_randomized(self, skill: Skill) -> bool:
+        return False
+
+
+class SkillProgressionProgressiveWithMasteries(SkillProgressionProgressive):
+    are_masteries_shuffled = True
+
+    def is_mastery_randomized(self, skill: Skill) -> bool:
+        return skill.has_mastery
diff --git a/worlds/stardew_valley/content/game_content.py b/worlds/stardew_valley/content/game_content.py
index 8dcf933145e3..7ff3217b04ed 100644
--- a/worlds/stardew_valley/content/game_content.py
+++ b/worlds/stardew_valley/content/game_content.py
@@ -3,7 +3,7 @@
 from dataclasses import dataclass, field
 from typing import Dict, Iterable, Set, Any, Mapping, Type, Tuple, Union
 
-from .feature import booksanity, cropsanity, fishsanity, friendsanity
+from .feature import booksanity, cropsanity, fishsanity, friendsanity, skill_progression
 from ..data.fish_data import FishItem
 from ..data.game_item import GameItem, ItemSource, ItemTag
 from ..data.skill import Skill
@@ -53,6 +53,7 @@ class StardewFeatures:
     cropsanity: cropsanity.CropsanityFeature
     fishsanity: fishsanity.FishsanityFeature
     friendsanity: friendsanity.FriendsanityFeature
+    skill_progression: skill_progression.SkillProgressionFeature
 
 
 @dataclass(frozen=True)
diff --git a/worlds/stardew_valley/data/skill.py b/worlds/stardew_valley/data/skill.py
index 4c754ddd8716..df4ff9feed6d 100644
--- a/worlds/stardew_valley/data/skill.py
+++ b/worlds/stardew_valley/data/skill.py
@@ -1,7 +1,21 @@
 from dataclasses import dataclass, field
+from functools import cached_property
+from typing import Iterable, Tuple
 
 
 @dataclass(frozen=True)
 class Skill:
     name: str
     has_mastery: bool = field(kw_only=True)
+
+    @cached_property
+    def mastery_name(self) -> str:
+        return f"{self.name} Mastery"
+
+    @cached_property
+    def level_name(self) -> str:
+        return f"{self.name} Level"
+
+    @cached_property
+    def level_names_by_level(self) -> Iterable[Tuple[int, str]]:
+        return tuple((level, f"Level {level} {self.name}") for level in range(1, 11))
diff --git a/worlds/stardew_valley/early_items.py b/worlds/stardew_valley/early_items.py
index e1ad8cebfd4a..81e28956b3cf 100644
--- a/worlds/stardew_valley/early_items.py
+++ b/worlds/stardew_valley/early_items.py
@@ -1,11 +1,13 @@
 from random import Random
 
 from . import options as stardew_options
+from .content import StardewContent
 from .strings.ap_names.ap_weapon_names import APWeapon
 from .strings.ap_names.transport_names import Transportation
 from .strings.building_names import Building
 from .strings.region_names import Region
 from .strings.season_names import Season
+from .strings.skill_names import Skill
 from .strings.tv_channel_names import Channel
 from .strings.wallet_item_names import Wallet
 
@@ -14,7 +16,7 @@
 seasons = [Season.spring, Season.summer, Season.fall, Season.winter]
 
 
-def setup_early_items(multiworld, options: stardew_options.StardewValleyOptions, player: int, random: Random):
+def setup_early_items(multiworld, options: stardew_options.StardewValleyOptions, content: StardewContent, player: int, random: Random):
     early_forced = []
     early_candidates = []
     early_candidates.extend(always_early_candidates)
@@ -31,12 +33,13 @@ def setup_early_items(multiworld, options: stardew_options.StardewValleyOptions,
         early_forced.append("Progressive Backpack")
 
     if options.tool_progression & stardew_options.ToolProgression.option_progressive:
-        if options.fishsanity != stardew_options.Fishsanity.option_none:
+        if content.features.fishsanity.is_enabled:
             early_candidates.append("Progressive Fishing Rod")
         early_forced.append("Progressive Pickaxe")
 
-    if options.skill_progression == stardew_options.SkillProgression.option_progressive:
-        early_forced.append("Fishing Level")
+    fishing = content.skills.get(Skill.fishing)
+    if fishing is not None and content.features.skill_progression.is_progressive:
+        early_forced.append(fishing.level_name)
 
     if options.quest_locations >= 0:
         early_candidates.append(Wallet.magnifying_glass)
diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py
index 5bf59a5e8397..3d852a37f402 100644
--- a/worlds/stardew_valley/items.py
+++ b/worlds/stardew_valley/items.py
@@ -15,7 +15,7 @@
 from .logic.logic_event import all_events
 from .mods.mod_data import ModNames
 from .options import StardewValleyOptions, TrapItems, FestivalLocations, ExcludeGingerIsland, SpecialOrderLocations, SeasonRandomization, Museumsanity, \
-    BuildingProgression, SkillProgression, ToolProgression, ElevatorProgression, BackpackProgression, ArcadeMachineLocations, Monstersanity, Goal, \
+    BuildingProgression, ToolProgression, ElevatorProgression, BackpackProgression, ArcadeMachineLocations, Monstersanity, Goal, \
     Chefsanity, Craftsanity, BundleRandomization, EntranceRandomization, Shipsanity, Walnutsanity, EnabledFillerBuffs
 from .strings.ap_names.ap_option_names import OptionName
 from .strings.ap_names.ap_weapon_names import APWeapon
@@ -226,8 +226,8 @@ def create_unique_items(item_factory: StardewItemFactory, options: StardewValley
     create_weapons(item_factory, options, items)
     items.append(item_factory("Skull Key"))
     create_elevators(item_factory, options, items)
-    create_tools(item_factory, options, items)
-    create_skills(item_factory, options, items)
+    create_tools(item_factory, options, content, items)
+    create_skills(item_factory, content, items)
     create_wizard_buildings(item_factory, options, items)
     create_carpenter_buildings(item_factory, options, items)
     items.append(item_factory("Railroad Boulder Removed"))
@@ -316,7 +316,7 @@ def create_elevators(item_factory: StardewItemFactory, options: StardewValleyOpt
         items.extend([item_factory(item) for item in ["Progressive Skull Cavern Elevator"] * 8])
 
 
-def create_tools(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+def create_tools(item_factory: StardewItemFactory, options: StardewValleyOptions, content: StardewContent, items: List[Item]):
     if options.tool_progression & ToolProgression.option_progressive:
         for item_data in items_by_group[Group.PROGRESSIVE_TOOLS]:
             name = item_data.name
@@ -325,28 +325,29 @@ def create_tools(item_factory: StardewItemFactory, options: StardewValleyOptions
                 items.append(item_factory(item_data, ItemClassification.useful))
             else:
                 items.extend([item_factory(item) for item in [item_data] * 4])
-        if options.skill_progression == SkillProgression.option_progressive_with_masteries:
+
+        if content.features.skill_progression.are_masteries_shuffled:
+            # Masteries add another tier to the scythe and the fishing rod
             items.append(item_factory("Progressive Scythe"))
             items.append(item_factory("Progressive Fishing Rod"))
+
+    # The golden scythe is always randomized
     items.append(item_factory("Progressive Scythe"))
 
 
-def create_skills(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if options.skill_progression == SkillProgression.option_vanilla:
+def create_skills(item_factory: StardewItemFactory, content: StardewContent, items: List[Item]):
+    skill_progression = content.features.skill_progression
+    if not skill_progression.is_progressive:
         return
 
-    for item in items_by_group[Group.SKILL_LEVEL_UP]:
-        if item.mod_name not in options.mods and item.mod_name is not None:
-            continue
-        items.extend(item_factory(item) for item in [item.name] * 10)
+    for skill in content.skills.values():
+        items.extend(item_factory(skill.level_name) for _ in skill_progression.get_randomized_level_names_by_level(skill))
 
-    if options.skill_progression != SkillProgression.option_progressive_with_masteries:
-        return
+        if skill_progression.is_mastery_randomized(skill):
+            items.append(item_factory(skill.mastery_name))
 
-    for item in items_by_group[Group.SKILL_MASTERY]:
-        if item.mod_name not in options.mods and item.mod_name is not None:
-            continue
-        items.append(item_factory(item))
+    if skill_progression.are_masteries_shuffled:
+        items.append(item_factory(Wallet.mastery_of_the_five_ways))
 
 
 def create_wizard_buildings(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
diff --git a/worlds/stardew_valley/locations.py b/worlds/stardew_valley/locations.py
index 1d67d535ccee..b3a8db6f0341 100644
--- a/worlds/stardew_valley/locations.py
+++ b/worlds/stardew_valley/locations.py
@@ -11,7 +11,7 @@
 from .data.museum_data import all_museum_items
 from .mods.mod_data import ModNames
 from .options import ExcludeGingerIsland, ArcadeMachineLocations, SpecialOrderLocations, Museumsanity, \
-    FestivalLocations, SkillProgression, BuildingProgression, ToolProgression, ElevatorProgression, BackpackProgression, FarmType
+    FestivalLocations, BuildingProgression, ToolProgression, ElevatorProgression, BackpackProgression, FarmType
 from .options import StardewValleyOptions, Craftsanity, Chefsanity, Cooksanity, Shipsanity, Monstersanity
 from .strings.goal_names import Goal
 from .strings.quest_names import ModQuest, Quest
@@ -188,12 +188,12 @@ def extend_cropsanity_locations(randomized_locations: List[LocationData], conten
                                 for item in content.find_tagged_items(ItemTag.CROPSANITY))
 
 
-def extend_quests_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_quests_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     if options.quest_locations < 0:
         return
 
     story_quest_locations = locations_by_tag[LocationTags.STORY_QUEST]
-    story_quest_locations = filter_disabled_locations(options, story_quest_locations)
+    story_quest_locations = filter_disabled_locations(options, content, story_quest_locations)
     randomized_locations.extend(story_quest_locations)
 
     for i in range(0, options.quest_locations.value):
@@ -284,9 +284,9 @@ def extend_desert_festival_chef_locations(randomized_locations: List[LocationDat
     randomized_locations.extend(locations_to_add)
 
 
-def extend_special_order_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_special_order_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     if options.special_order_locations & SpecialOrderLocations.option_board:
-        board_locations = filter_disabled_locations(options, locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD])
+        board_locations = filter_disabled_locations(options, content, locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD])
         randomized_locations.extend(board_locations)
 
     include_island = options.exclude_ginger_island == ExcludeGingerIsland.option_false
@@ -308,9 +308,9 @@ def extend_walnut_purchase_locations(randomized_locations: List[LocationData], o
     randomized_locations.extend(locations_by_tag[LocationTags.WALNUT_PURCHASE])
 
 
-def extend_mandatory_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_mandatory_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     mandatory_locations = [location for location in locations_by_tag[LocationTags.MANDATORY]]
-    filtered_mandatory_locations = filter_disabled_locations(options, mandatory_locations)
+    filtered_mandatory_locations = filter_disabled_locations(options, content, mandatory_locations)
     randomized_locations.extend(filtered_mandatory_locations)
 
 
@@ -349,32 +349,32 @@ def extend_elevator_locations(randomized_locations: List[LocationData], options:
     randomized_locations.extend(filtered_elevator_locations)
 
 
-def extend_monstersanity_locations(randomized_locations: List[LocationData], options):
+def extend_monstersanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     monstersanity = options.monstersanity
     if monstersanity == Monstersanity.option_none:
         return
     if monstersanity == Monstersanity.option_one_per_monster or monstersanity == Monstersanity.option_split_goals:
         monster_locations = [location for location in locations_by_tag[LocationTags.MONSTERSANITY_MONSTER]]
-        filtered_monster_locations = filter_disabled_locations(options, monster_locations)
+        filtered_monster_locations = filter_disabled_locations(options, content, monster_locations)
         randomized_locations.extend(filtered_monster_locations)
         return
     goal_locations = [location for location in locations_by_tag[LocationTags.MONSTERSANITY_GOALS]]
-    filtered_goal_locations = filter_disabled_locations(options, goal_locations)
+    filtered_goal_locations = filter_disabled_locations(options, content, goal_locations)
     randomized_locations.extend(filtered_goal_locations)
     if monstersanity != Monstersanity.option_progressive_goals:
         return
     progressive_goal_locations = [location for location in locations_by_tag[LocationTags.MONSTERSANITY_PROGRESSIVE_GOALS]]
-    filtered_progressive_goal_locations = filter_disabled_locations(options, progressive_goal_locations)
+    filtered_progressive_goal_locations = filter_disabled_locations(options, content, progressive_goal_locations)
     randomized_locations.extend(filtered_progressive_goal_locations)
 
 
-def extend_shipsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_shipsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     shipsanity = options.shipsanity
     if shipsanity == Shipsanity.option_none:
         return
     if shipsanity == Shipsanity.option_everything:
         ship_locations = [location for location in locations_by_tag[LocationTags.SHIPSANITY]]
-        filtered_ship_locations = filter_disabled_locations(options, ship_locations)
+        filtered_ship_locations = filter_disabled_locations(options, content, ship_locations)
         randomized_locations.extend(filtered_ship_locations)
         return
     shipsanity_locations = set()
@@ -385,11 +385,11 @@ def extend_shipsanity_locations(randomized_locations: List[LocationData], option
     if shipsanity == Shipsanity.option_full_shipment or shipsanity == Shipsanity.option_full_shipment_with_fish:
         shipsanity_locations = shipsanity_locations.union({location for location in locations_by_tag[LocationTags.SHIPSANITY_FULL_SHIPMENT]})
 
-    filtered_shipsanity_locations = filter_disabled_locations(options, list(shipsanity_locations))
+    filtered_shipsanity_locations = filter_disabled_locations(options, content, list(shipsanity_locations))
     randomized_locations.extend(filtered_shipsanity_locations)
 
 
-def extend_cooksanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_cooksanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     cooksanity = options.cooksanity
     if cooksanity == Cooksanity.option_none:
         return
@@ -398,11 +398,11 @@ def extend_cooksanity_locations(randomized_locations: List[LocationData], option
     else:
         cooksanity_locations = (location for location in locations_by_tag[LocationTags.COOKSANITY])
 
-    filtered_cooksanity_locations = filter_disabled_locations(options, cooksanity_locations)
+    filtered_cooksanity_locations = filter_disabled_locations(options, content, cooksanity_locations)
     randomized_locations.extend(filtered_cooksanity_locations)
 
 
-def extend_chefsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_chefsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     chefsanity = options.chefsanity
     if chefsanity == Chefsanity.option_none:
         return
@@ -418,16 +418,16 @@ def extend_chefsanity_locations(randomized_locations: List[LocationData], option
     if chefsanity & Chefsanity.option_skills:
         chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_SKILL]})
 
-    filtered_chefsanity_locations = filter_disabled_locations(options, list(chefsanity_locations_by_name.values()))
+    filtered_chefsanity_locations = filter_disabled_locations(options, content, list(chefsanity_locations_by_name.values()))
     randomized_locations.extend(filtered_chefsanity_locations)
 
 
-def extend_craftsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+def extend_craftsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
     if options.craftsanity == Craftsanity.option_none:
         return
 
     craftsanity_locations = [craft for craft in locations_by_tag[LocationTags.CRAFTSANITY]]
-    filtered_craftsanity_locations = filter_disabled_locations(options, craftsanity_locations)
+    filtered_craftsanity_locations = filter_disabled_locations(options, content, craftsanity_locations)
     randomized_locations.extend(filtered_craftsanity_locations)
 
 
@@ -467,7 +467,7 @@ def create_locations(location_collector: StardewLocationCollector,
                      random: Random):
     randomized_locations = []
 
-    extend_mandatory_locations(randomized_locations, options)
+    extend_mandatory_locations(randomized_locations, options, content)
     extend_bundle_locations(randomized_locations, bundle_rooms)
     extend_backpack_locations(randomized_locations, options)
 
@@ -476,13 +476,12 @@ def create_locations(location_collector: StardewLocationCollector,
 
     extend_elevator_locations(randomized_locations, options)
 
-    if not options.skill_progression == SkillProgression.option_vanilla:
-        for location in locations_by_tag[LocationTags.SKILL_LEVEL]:
-            if location.mod_name is not None and location.mod_name not in options.mods:
-                continue
-            if LocationTags.MASTERY_LEVEL in location.tags and options.skill_progression != SkillProgression.option_progressive_with_masteries:
-                continue
-            randomized_locations.append(location_table[location.name])
+    skill_progression = content.features.skill_progression
+    if skill_progression.is_progressive:
+        for skill in content.skills.values():
+            randomized_locations.extend([location_table[location_name] for _, location_name in skill_progression.get_randomized_level_names_by_level(skill)])
+            if skill_progression.is_mastery_randomized(skill):
+                randomized_locations.append(location_table[skill.mastery_name])
 
     if options.building_progression & BuildingProgression.option_progressive:
         for location in locations_by_tag[LocationTags.BUILDING_BLUEPRINT]:
@@ -501,15 +500,15 @@ def create_locations(location_collector: StardewLocationCollector,
     extend_friendsanity_locations(randomized_locations, content)
 
     extend_festival_locations(randomized_locations, options, random)
-    extend_special_order_locations(randomized_locations, options)
+    extend_special_order_locations(randomized_locations, options, content)
     extend_walnut_purchase_locations(randomized_locations, options)
 
-    extend_monstersanity_locations(randomized_locations, options)
-    extend_shipsanity_locations(randomized_locations, options)
-    extend_cooksanity_locations(randomized_locations, options)
-    extend_chefsanity_locations(randomized_locations, options)
-    extend_craftsanity_locations(randomized_locations, options)
-    extend_quests_locations(randomized_locations, options)
+    extend_monstersanity_locations(randomized_locations, options, content)
+    extend_shipsanity_locations(randomized_locations, options, content)
+    extend_cooksanity_locations(randomized_locations, options, content)
+    extend_chefsanity_locations(randomized_locations, options, content)
+    extend_craftsanity_locations(randomized_locations, options, content)
+    extend_quests_locations(randomized_locations, options, content)
     extend_book_locations(randomized_locations, content)
     extend_walnutsanity_locations(randomized_locations, options)
 
@@ -538,19 +537,21 @@ def filter_qi_order_locations(options: StardewValleyOptions, locations: Iterable
     return (location for location in locations if include_qi_orders or LocationTags.REQUIRES_QI_ORDERS not in location.tags)
 
 
-def filter_masteries_locations(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
-    include_masteries = options.skill_progression == SkillProgression.option_progressive_with_masteries
-    return (location for location in locations if include_masteries or LocationTags.REQUIRES_MASTERIES not in location.tags)
+def filter_masteries_locations(content: StardewContent, locations: Iterable[LocationData]) -> Iterable[LocationData]:
+    # FIXME Remove once recipes are handled by the content packs
+    if content.features.skill_progression.are_masteries_shuffled:
+        return locations
+    return (location for location in locations if LocationTags.REQUIRES_MASTERIES not in location.tags)
 
 
 def filter_modded_locations(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
     return (location for location in locations if location.mod_name is None or location.mod_name in options.mods)
 
 
-def filter_disabled_locations(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
+def filter_disabled_locations(options: StardewValleyOptions, content: StardewContent, locations: Iterable[LocationData]) -> Iterable[LocationData]:
     locations_farm_filter = filter_farm_type(options, locations)
     locations_island_filter = filter_ginger_island(options, locations_farm_filter)
     locations_qi_filter = filter_qi_order_locations(options, locations_island_filter)
-    locations_masteries_filter = filter_masteries_locations(options, locations_qi_filter)
+    locations_masteries_filter = filter_masteries_locations(content, locations_qi_filter)
     locations_mod_filter = filter_modded_locations(options, locations_masteries_filter)
     return locations_mod_filter
diff --git a/worlds/stardew_valley/logic/crafting_logic.py b/worlds/stardew_valley/logic/crafting_logic.py
index 0403230eee34..28bf0d2af22c 100644
--- a/worlds/stardew_valley/logic/crafting_logic.py
+++ b/worlds/stardew_valley/logic/crafting_logic.py
@@ -16,7 +16,7 @@
 from ..data.recipe_source import CutsceneSource, ShopTradeSource, ArchipelagoSource, LogicSource, SpecialOrderSource, \
     FestivalShopSource, QuestSource, StarterSource, ShopSource, SkillSource, MasterySource, FriendshipSource, SkillCraftsanitySource
 from ..locations import locations_by_tag, LocationTags
-from ..options import Craftsanity, SpecialOrderLocations, ExcludeGingerIsland, SkillProgression
+from ..options import Craftsanity, SpecialOrderLocations, ExcludeGingerIsland
 from ..stardew_rule import StardewRule, True_, False_
 from ..strings.region_names import Region
 
@@ -101,12 +101,13 @@ def can_craft_everything(self) -> StardewRule:
         craftsanity_prefix = "Craft "
         all_recipes_names = []
         exclude_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true
-        exclude_masteries = self.options.skill_progression != SkillProgression.option_progressive_with_masteries
+        exclude_masteries = not self.content.features.skill_progression.are_masteries_shuffled
         for location in locations_by_tag[LocationTags.CRAFTSANITY]:
             if not location.name.startswith(craftsanity_prefix):
                 continue
             if exclude_island and LocationTags.GINGER_ISLAND in location.tags:
                 continue
+            # FIXME Remove when recipes are in content packs
             if exclude_masteries and LocationTags.REQUIRES_MASTERIES in location.tags:
                 continue
             if location.mod_name and location.mod_name not in self.options.mods:
diff --git a/worlds/stardew_valley/logic/grind_logic.py b/worlds/stardew_valley/logic/grind_logic.py
index e0ac84639d9c..997300ae7a54 100644
--- a/worlds/stardew_valley/logic/grind_logic.py
+++ b/worlds/stardew_valley/logic/grind_logic.py
@@ -7,7 +7,6 @@
 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
 from ..strings.book_names import Book
 from ..strings.craftable_names import Consumable
@@ -39,7 +38,7 @@ 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 \
+            if not self.content.features.booksanity.is_enabled \
             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)
diff --git a/worlds/stardew_valley/logic/mine_logic.py b/worlds/stardew_valley/logic/mine_logic.py
index 61eba41ffe07..350582ae0dbb 100644
--- a/worlds/stardew_valley/logic/mine_logic.py
+++ b/worlds/stardew_valley/logic/mine_logic.py
@@ -58,14 +58,19 @@ def can_progress_in_the_mines_from_floor(self, floor: int) -> StardewRule:
         rules = []
         weapon_rule = self.logic.mine.get_weapon_rule_for_floor_tier(tier)
         rules.append(weapon_rule)
+
         if self.options.tool_progression & ToolProgression.option_progressive:
             rules.append(self.logic.tool.has_tool(Tool.pickaxe, ToolMaterial.tiers[tier]))
-        if self.options.skill_progression >= options.SkillProgression.option_progressive:
-            skill_tier = min(10, max(0, tier * 2))
-            rules.append(self.logic.skill.has_level(Skill.combat, skill_tier))
-            rules.append(self.logic.skill.has_level(Skill.mining, skill_tier))
+
+        # No alternative for vanilla because we assume that you will grind the levels in the mines.
+        if self.content.features.skill_progression.is_progressive:
+            skill_level = min(10, max(0, tier * 2))
+            rules.append(self.logic.skill.has_level(Skill.combat, skill_level))
+            rules.append(self.logic.skill.has_level(Skill.mining, skill_level))
+
         if tier >= 4:
             rules.append(self.logic.cooking.can_cook())
+
         return self.logic.and_(*rules)
 
     @cache_self1
@@ -82,10 +87,14 @@ def can_progress_in_the_skull_cavern_from_floor(self, floor: int) -> StardewRule
         rules = []
         weapon_rule = self.logic.combat.has_great_weapon
         rules.append(weapon_rule)
+
         if self.options.tool_progression & ToolProgression.option_progressive:
             rules.append(self.logic.received("Progressive Pickaxe", min(4, max(0, tier + 2))))
-        if self.options.skill_progression >= options.SkillProgression.option_progressive:
-            skill_tier = min(10, max(0, tier * 2 + 6))
-            rules.extend({self.logic.skill.has_level(Skill.combat, skill_tier),
-                          self.logic.skill.has_level(Skill.mining, skill_tier)})
+
+        # No alternative for vanilla because we assume that you will grind the levels in the mines.
+        if self.content.features.skill_progression.is_progressive:
+            skill_level = min(10, max(0, tier * 2 + 6))
+            rules.extend((self.logic.skill.has_level(Skill.combat, skill_level),
+                          self.logic.skill.has_level(Skill.mining, skill_level)))
+
         return self.logic.and_(*rules)
diff --git a/worlds/stardew_valley/logic/skill_logic.py b/worlds/stardew_valley/logic/skill_logic.py
index 17fabca28d95..bc2f6cb1263d 100644
--- a/worlds/stardew_valley/logic/skill_logic.py
+++ b/worlds/stardew_valley/logic/skill_logic.py
@@ -11,7 +11,6 @@
 from .season_logic import SeasonLogicMixin
 from .time_logic import TimeLogicMixin
 from .tool_logic import ToolLogicMixin
-from .. import options
 from ..data.harvest import HarvestCropSource
 from ..mods.logic.magic_logic import MagicLogicMixin
 from ..mods.logic.mod_skills_levels import get_mod_skill_levels
@@ -77,21 +76,21 @@ def has_level(self, skill: str, level: int) -> StardewRule:
         if level == 0:
             return true_
 
-        if self.options.skill_progression == options.SkillProgression.option_vanilla:
-            return self.logic.skill.can_earn_level(skill, level)
+        if self.content.features.skill_progression.is_progressive:
+            return self.logic.received(f"{skill} Level", level)
 
-        return self.logic.received(f"{skill} Level", level)
+        return self.logic.skill.can_earn_level(skill, level)
 
     def has_previous_level(self, skill: str, level: int) -> StardewRule:
         assert level > 0, f"There is no level before level 0."
         if level == 1:
             return true_
 
-        if self.options.skill_progression == options.SkillProgression.option_vanilla:
-            months = max(1, level - 1)
-            return self.logic.time.has_lived_months(months)
+        if self.content.features.skill_progression.is_progressive:
+            return self.logic.received(f"{skill} Level", level - 1)
 
-        return self.logic.received(f"{skill} Level", level - 1)
+        months = max(1, level - 1)
+        return self.logic.time.has_lived_months(months)
 
     @cache_self1
     def has_farming_level(self, level: int) -> StardewRule:
@@ -102,7 +101,7 @@ def has_total_level(self, level: int, allow_modded_skills: bool = False) -> Star
         if level <= 0:
             return True_()
 
-        if self.options.skill_progression >= options.SkillProgression.option_progressive:
+        if self.content.features.skill_progression.is_progressive:
             skills_items = vanilla_skill_items
             if allow_modded_skills:
                 skills_items += get_mod_skill_levels(self.options.mods)
@@ -148,7 +147,7 @@ def can_get_combat_xp(self) -> StardewRule:
 
     @cached_property
     def can_get_fishing_xp(self) -> StardewRule:
-        if self.options.skill_progression >= options.SkillProgression.option_progressive:
+        if self.content.features.skill_progression.is_progressive:
             return self.logic.skill.can_fish() | self.logic.skill.can_crab_pot
 
         return self.logic.skill.can_fish()
@@ -178,7 +177,9 @@ def can_crab_pot_at(self, region: str) -> StardewRule:
     @cached_property
     def can_crab_pot(self) -> StardewRule:
         crab_pot_rule = self.logic.has(Fishing.bait)
-        if self.options.skill_progression >= options.SkillProgression.option_progressive:
+
+        # We can't use the same rule if skills are vanilla, because fishing levels are required to crab pot, which is required to get fishing levels...
+        if self.content.features.skill_progression.is_progressive:
             crab_pot_rule = crab_pot_rule & self.logic.has(Machine.crab_pot)
         else:
             crab_pot_rule = crab_pot_rule & self.logic.skill.can_get_fishing_xp
@@ -200,14 +201,14 @@ def can_earn_mastery(self, skill: str) -> StardewRule:
         return self.logic.skill.can_earn_level(skill, 11) & self.logic.region.can_reach(Region.mastery_cave)
 
     def has_mastery(self, skill: str) -> StardewRule:
-        if self.options.skill_progression == options.SkillProgression.option_progressive_with_masteries:
+        if self.content.features.skill_progression.are_masteries_shuffled:
             return self.logic.received(f"{skill} Mastery")
 
         return self.logic.skill.can_earn_mastery(skill)
 
     @cached_property
     def can_enter_mastery_cave(self) -> StardewRule:
-        if self.options.skill_progression == options.SkillProgression.option_progressive_with_masteries:
+        if self.content.features.skill_progression.are_masteries_shuffled:
             return self.logic.received(Wallet.mastery_of_the_five_ways)
 
         return self.has_any_skills_maxed(included_modded_skills=False)
diff --git a/worlds/stardew_valley/mods/logic/deepwoods_logic.py b/worlds/stardew_valley/mods/logic/deepwoods_logic.py
index 26704eb7d11b..6e0eadfd5486 100644
--- a/worlds/stardew_valley/mods/logic/deepwoods_logic.py
+++ b/worlds/stardew_valley/mods/logic/deepwoods_logic.py
@@ -1,6 +1,5 @@
 from typing import Union
 
-from ... import options
 from ...logic.base_logic import BaseLogicMixin, BaseLogic
 from ...logic.combat_logic import CombatLogicMixin
 from ...logic.cooking_logic import CookingLogicMixin
@@ -45,9 +44,9 @@ def can_reach_woods_depth(self, depth: int) -> StardewRule:
                          self.logic.received(ModTransportation.woods_obelisk))
 
         tier = int(depth / 25) + 1
-        if self.options.skill_progression >= options.SkillProgression.option_progressive:
-            combat_tier = min(10, max(0, tier + 5))
-            rules.append(self.logic.skill.has_level(Skill.combat, combat_tier))
+        if self.content.features.skill_progression.is_progressive:
+            combat_level = min(10, max(0, tier + 5))
+            rules.append(self.logic.skill.has_level(Skill.combat, combat_level))
 
         return self.logic.and_(*rules)
 
diff --git a/worlds/stardew_valley/mods/logic/skills_logic.py b/worlds/stardew_valley/mods/logic/skills_logic.py
index cb12274dc651..ba9d27741807 100644
--- a/worlds/stardew_valley/mods/logic/skills_logic.py
+++ b/worlds/stardew_valley/mods/logic/skills_logic.py
@@ -13,7 +13,6 @@
 from ...logic.relationship_logic import RelationshipLogicMixin
 from ...logic.tool_logic import ToolLogicMixin
 from ...mods.mod_data import ModNames
-from ...options import SkillProgression
 from ...stardew_rule import StardewRule, False_, True_, And
 from ...strings.building_names import Building
 from ...strings.craftable_names import ModCraftable, ModMachine
@@ -37,7 +36,7 @@ def has_mod_level(self, skill: str, level: int) -> StardewRule:
         if level <= 0:
             return True_()
 
-        if self.options.skill_progression == SkillProgression.option_progressive:
+        if self.content.features.skill_progression.is_progressive:
             return self.logic.received(f"{skill} Level", level)
 
         return self.can_earn_mod_skill_level(skill, level)
@@ -85,13 +84,15 @@ def can_earn_socializing_skill_level(self, level: int) -> StardewRule:
     def can_earn_archaeology_skill_level(self, level: int) -> StardewRule:
         shifter_rule = True_()
         preservation_rule = True_()
-        if self.options.skill_progression == self.options.skill_progression.option_progressive:
+        if self.content.features.skill_progression.is_progressive:
             shifter_rule = self.logic.has(ModCraftable.water_shifter)
             preservation_rule = self.logic.has(ModMachine.hardwood_preservation_chamber)
         if level >= 8:
-            return (self.logic.tool.has_tool(Tool.pan, ToolMaterial.iridium) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.gold)) & shifter_rule & preservation_rule
+            tool_rule = self.logic.tool.has_tool(Tool.pan, ToolMaterial.iridium) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.gold)
+            return tool_rule & shifter_rule & preservation_rule
         if level >= 5:
-            return (self.logic.tool.has_tool(Tool.pan, ToolMaterial.gold) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.iron)) & shifter_rule
+            tool_rule = self.logic.tool.has_tool(Tool.pan, ToolMaterial.gold) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.iron)
+            return tool_rule & shifter_rule
         if level >= 3:
             return self.logic.tool.has_tool(Tool.pan, ToolMaterial.iron) | self.logic.tool.has_tool(Tool.hoe, ToolMaterial.copper)
         return self.logic.tool.has_tool(Tool.pan, ToolMaterial.copper) | self.logic.tool.has_tool(Tool.hoe, ToolMaterial.basic)
diff --git a/worlds/stardew_valley/regions.py b/worlds/stardew_valley/regions.py
index 5b7db5ac79d1..d59439a4879d 100644
--- a/worlds/stardew_valley/regions.py
+++ b/worlds/stardew_valley/regions.py
@@ -2,8 +2,9 @@
 from typing import Iterable, Dict, Protocol, List, Tuple, Set
 
 from BaseClasses import Region, Entrance
+from .content import content_packs, StardewContent
 from .mods.mod_regions import ModDataList, vanilla_connections_to_remove_by_mod
-from .options import EntranceRandomization, ExcludeGingerIsland, StardewValleyOptions, SkillProgression
+from .options import EntranceRandomization, ExcludeGingerIsland, StardewValleyOptions
 from .region_classes import RegionData, ConnectionData, RandomizationFlag, ModificationFlag
 from .strings.entrance_names import Entrance, LogicEntrance
 from .strings.region_names import Region, LogicRegion
@@ -587,7 +588,7 @@ def modify_vanilla_regions(existing_region: RegionData, modified_region: RegionD
     return updated_region
 
 
-def create_regions(region_factory: RegionFactory, random: Random, world_options: StardewValleyOptions) \
+def create_regions(region_factory: RegionFactory, random: Random, world_options: StardewValleyOptions, content: StardewContent) \
         -> Tuple[Dict[str, Region], Dict[str, Entrance], Dict[str, str]]:
     entrances_data, regions_data = create_final_connections_and_regions(world_options)
     regions_by_name: Dict[str: Region] = {region_name: region_factory(region_name, regions_data[region_name].exits) for region_name in regions_data}
@@ -598,7 +599,7 @@ def create_regions(region_factory: RegionFactory, random: Random, world_options:
         if entrance.name in entrances_data
     }
 
-    connections, randomized_data = randomize_connections(random, world_options, regions_data, entrances_data)
+    connections, randomized_data = randomize_connections(random, world_options, content, regions_data, entrances_data)
 
     for connection in connections:
         if connection.name in entrances_by_name:
@@ -606,7 +607,7 @@ def create_regions(region_factory: RegionFactory, random: Random, world_options:
     return regions_by_name, entrances_by_name, randomized_data
 
 
-def randomize_connections(random: Random, world_options: StardewValleyOptions, regions_by_name: Dict[str, RegionData],
+def randomize_connections(random: Random, world_options: StardewValleyOptions, content: StardewContent, regions_by_name: Dict[str, RegionData],
                           connections_by_name: Dict[str, ConnectionData]) -> Tuple[List[ConnectionData], Dict[str, str]]:
     connections_to_randomize: List[ConnectionData] = []
     if world_options.entrance_randomization == EntranceRandomization.option_pelican_town:
@@ -621,7 +622,7 @@ def randomize_connections(random: Random, world_options: StardewValleyOptions, r
     elif world_options.entrance_randomization == EntranceRandomization.option_chaos:
         connections_to_randomize = [connections_by_name[connection] for connection in connections_by_name if
                                     RandomizationFlag.BUILDINGS in connections_by_name[connection].flag]
-        connections_to_randomize = remove_excluded_entrances(connections_to_randomize, world_options)
+        connections_to_randomize = remove_excluded_entrances(connections_to_randomize, content)
 
         # On Chaos, we just add the connections to randomize, unshuffled, and the client does it every day
         randomized_data_for_mod = {}
@@ -630,7 +631,7 @@ def randomize_connections(random: Random, world_options: StardewValleyOptions, r
             randomized_data_for_mod[connection.reverse] = connection.reverse
         return list(connections_by_name.values()), randomized_data_for_mod
 
-    connections_to_randomize = remove_excluded_entrances(connections_to_randomize, world_options)
+    connections_to_randomize = remove_excluded_entrances(connections_to_randomize, content)
     random.shuffle(connections_to_randomize)
     destination_pool = list(connections_to_randomize)
     random.shuffle(destination_pool)
@@ -645,12 +646,11 @@ def randomize_connections(random: Random, world_options: StardewValleyOptions, r
     return randomized_connections_for_generation, randomized_data_for_mod
 
 
-def remove_excluded_entrances(connections_to_randomize: List[ConnectionData], world_options: StardewValleyOptions) -> List[ConnectionData]:
-    exclude_island = world_options.exclude_ginger_island == ExcludeGingerIsland.option_true
-    if exclude_island:
+def remove_excluded_entrances(connections_to_randomize: List[ConnectionData], content: StardewContent) -> List[ConnectionData]:
+    # FIXME remove when regions are handled in content packs
+    if content_packs.ginger_island_content_pack.name not in content.registered_packs:
         connections_to_randomize = [connection for connection in connections_to_randomize if RandomizationFlag.GINGER_ISLAND not in connection.flag]
-    exclude_masteries = world_options.skill_progression != SkillProgression.option_progressive_with_masteries
-    if exclude_masteries:
+    if not content.features.skill_progression.are_masteries_shuffled:
         connections_to_randomize = [connection for connection in connections_to_randomize if RandomizationFlag.MASTERIES not in connection.flag]
 
     return connections_to_randomize
diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py
index e7107e89f948..96f081788041 100644
--- a/worlds/stardew_valley/rules.py
+++ b/worlds/stardew_valley/rules.py
@@ -21,7 +21,7 @@
 from .mods.mod_data import ModNames
 from .options import StardewValleyOptions, Walnutsanity
 from .options import ToolProgression, BuildingProgression, ExcludeGingerIsland, SpecialOrderLocations, Museumsanity, BackpackProgression, Shipsanity, \
-    Monstersanity, Chefsanity, Craftsanity, ArcadeMachineLocations, Cooksanity, SkillProgression
+    Monstersanity, Chefsanity, Craftsanity, ArcadeMachineLocations, Cooksanity
 from .stardew_rule import And, StardewRule, true_
 from .stardew_rule.indirect_connection import look_for_indirect_connection
 from .stardew_rule.rule_explain import explain
@@ -47,7 +47,7 @@
 from .strings.quest_names import Quest
 from .strings.region_names import Region
 from .strings.season_names import Season
-from .strings.skill_names import ModSkill, Skill
+from .strings.skill_names import Skill
 from .strings.tool_names import Tool, ToolMaterial
 from .strings.tv_channel_names import Channel
 from .strings.villager_names import NPC, ModNPC
@@ -70,7 +70,7 @@ def set_rules(world):
     set_ginger_island_rules(logic, multiworld, player, world_options)
 
     set_tool_rules(logic, multiworld, player, world_options)
-    set_skills_rules(logic, multiworld, player, world_options)
+    set_skills_rules(logic, multiworld, player, world_content)
     set_bundle_rules(bundle_rooms, logic, multiworld, player, world_options)
     set_building_rules(logic, multiworld, player, world_options)
     set_cropsanity_rules(logic, multiworld, player, world_content)
@@ -164,58 +164,21 @@ def set_bundle_rules(bundle_rooms: List[BundleRoom], logic: StardewLogic, multiw
         MultiWorldRules.add_rule(multiworld.get_location(room_location, player), And(*room_rules))
 
 
-def set_skills_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
-    mods = world_options.mods
-    if world_options.skill_progression == SkillProgression.option_vanilla:
+def set_skills_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, content: StardewContent):
+    skill_progression = content.features.skill_progression
+    if not skill_progression.is_progressive:
         return
 
-    for i in range(1, 11):
-        set_vanilla_skill_rule_for_level(logic, multiworld, player, i)
-        set_modded_skill_rule_for_level(logic, multiworld, player, mods, i)
+    for skill in content.skills.values():
+        for level, level_name in skill_progression.get_randomized_level_names_by_level(skill):
+            rule = logic.skill.can_earn_level(skill.name, level)
+            location = multiworld.get_location(level_name, player)
+            MultiWorldRules.set_rule(location, rule)
 
-    if world_options.skill_progression == SkillProgression.option_progressive:
-        return
-
-    for skill in [Skill.farming, Skill.fishing, Skill.foraging, Skill.mining, Skill.combat]:
-        MultiWorldRules.set_rule(multiworld.get_location(f"{skill} Mastery", player), logic.skill.can_earn_mastery(skill))
-
-
-def set_vanilla_skill_rule_for_level(logic: StardewLogic, multiworld, player, level: int):
-    set_vanilla_skill_rule(logic, multiworld, player, Skill.farming, level)
-    set_vanilla_skill_rule(logic, multiworld, player, Skill.fishing, level)
-    set_vanilla_skill_rule(logic, multiworld, player, Skill.foraging, level)
-    set_vanilla_skill_rule(logic, multiworld, player, Skill.mining, level)
-    set_vanilla_skill_rule(logic, multiworld, player, Skill.combat, level)
-
-
-def set_modded_skill_rule_for_level(logic: StardewLogic, multiworld, player, mods, level: int):
-    if ModNames.luck_skill in mods:
-        set_modded_skill_rule(logic, multiworld, player, ModSkill.luck, level)
-    if ModNames.magic in mods:
-        set_modded_skill_rule(logic, multiworld, player, ModSkill.magic, level)
-    if ModNames.binning_skill in mods:
-        set_modded_skill_rule(logic, multiworld, player, ModSkill.binning, level)
-    if ModNames.cooking_skill in mods:
-        set_modded_skill_rule(logic, multiworld, player, ModSkill.cooking, level)
-    if ModNames.socializing_skill in mods:
-        set_modded_skill_rule(logic, multiworld, player, ModSkill.socializing, level)
-    if ModNames.archaeology in mods:
-        set_modded_skill_rule(logic, multiworld, player, ModSkill.archaeology, level)
-
-
-def get_skill_level_location(multiworld, player, skill: str, level: int):
-    location_name = f"Level {level} {skill}"
-    return multiworld.get_location(location_name, player)
-
-
-def set_vanilla_skill_rule(logic: StardewLogic, multiworld, player, skill: str, level: int):
-    rule = logic.skill.can_earn_level(skill, level)
-    MultiWorldRules.set_rule(get_skill_level_location(multiworld, player, skill, level), rule)
-
-
-def set_modded_skill_rule(logic: StardewLogic, multiworld, player, skill: str, level: int):
-    rule = logic.skill.can_earn_level(skill, level)
-    MultiWorldRules.set_rule(get_skill_level_location(multiworld, player, skill, level), rule)
+        if skill_progression.is_mastery_randomized(skill):
+            rule = logic.skill.can_earn_mastery(skill.name)
+            location = multiworld.get_location(skill.mastery_name, player)
+            MultiWorldRules.set_rule(location, rule)
 
 
 def set_entrance_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
diff --git a/worlds/stardew_valley/test/TestRegions.py b/worlds/stardew_valley/test/TestRegions.py
index a25feea22085..c2e962d88a7e 100644
--- a/worlds/stardew_valley/test/TestRegions.py
+++ b/worlds/stardew_valley/test/TestRegions.py
@@ -4,6 +4,7 @@
 
 from BaseClasses import get_seed
 from . import SVTestCase, complete_options_with_default
+from .. import create_content
 from ..options import EntranceRandomization, ExcludeGingerIsland, SkillProgression
 from ..regions import vanilla_regions, vanilla_connections, randomize_connections, RandomizationFlag, create_final_connections_and_regions
 from ..strings.entrance_names import Entrance as EntranceName
@@ -63,11 +64,12 @@ def test_entrance_randomization(self):
                 ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
                 SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
             })
+            content = create_content(sv_options)
             seed = get_seed()
             rand = random.Random(seed)
             with self.subTest(flag=flag, msg=f"Seed: {seed}"):
                 entrances, regions = create_final_connections_and_regions(sv_options)
-                _, randomized_connections = randomize_connections(rand, sv_options, regions, entrances)
+                _, randomized_connections = randomize_connections(rand, sv_options, content, regions, entrances)
 
                 for connection in vanilla_connections:
                     if flag in connection.flag:
@@ -90,11 +92,12 @@ def test_entrance_randomization_without_island(self):
                 ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
                 SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
             })
+            content = create_content(sv_options)
             seed = get_seed()
             rand = random.Random(seed)
             with self.subTest(option=option, flag=flag, seed=seed):
                 entrances, regions = create_final_connections_and_regions(sv_options)
-                _, randomized_connections = randomize_connections(rand, sv_options, regions, entrances)
+                _, randomized_connections = randomize_connections(rand, sv_options, content, regions, entrances)
 
                 for connection in vanilla_connections:
                     if flag in connection.flag:
@@ -118,13 +121,14 @@ def test_cannot_put_island_access_on_island(self):
             ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
             SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
         })
+        content = create_content(sv_options)
 
         for i in range(0, 100 if self.skip_long_tests else 10000):
             seed = get_seed()
             rand = random.Random(seed)
             with self.subTest(msg=f"Seed: {seed}"):
                 entrances, regions = create_final_connections_and_regions(sv_options)
-                randomized_connections, randomized_data = randomize_connections(rand, sv_options, regions, entrances)
+                randomized_connections, randomized_data = randomize_connections(rand, sv_options, content, regions, entrances)
                 connections_by_name = {connection.name: connection for connection in randomized_connections}
 
                 blocked_entrances = {EntranceName.use_island_obelisk, EntranceName.boat_to_ginger_island}
diff --git a/worlds/stardew_valley/test/content/__init__.py b/worlds/stardew_valley/test/content/__init__.py
index 4130dae90dc3..c666a3aae14d 100644
--- a/worlds/stardew_valley/test/content/__init__.py
+++ b/worlds/stardew_valley/test/content/__init__.py
@@ -7,7 +7,8 @@
     feature.booksanity.BooksanityDisabled(),
     feature.cropsanity.CropsanityDisabled(),
     feature.fishsanity.FishsanityNone(),
-    feature.friendsanity.FriendsanityNone()
+    feature.friendsanity.FriendsanityNone(),
+    feature.skill_progression.SkillProgressionVanilla(),
 )
 
 
diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index 07a75f21b1de..56138cf582a7 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -3,7 +3,7 @@
 from BaseClasses import get_seed
 from .. import SVTestBase, SVTestCase, allsanity_no_mods_6_x_x, allsanity_mods_6_x_x, complete_options_with_default, solo_multiworld
 from ..assertion import ModAssertMixin, WorldAssertMixin
-from ... import items, Group, ItemClassification
+from ... import items, Group, ItemClassification, create_content
 from ... import options
 from ...items import items_by_group
 from ...options import SkillProgression, Walnutsanity
@@ -128,12 +128,13 @@ def test_mod_entrance_randomization(self):
                 SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
                 options.Mods.internal_name: frozenset(options.Mods.valid_keys)
             })
+            content = create_content(sv_options)
             seed = get_seed()
             rand = random.Random(seed)
             with self.subTest(option=option, flag=flag, seed=seed):
                 final_connections, final_regions = create_final_connections_and_regions(sv_options)
 
-                _, randomized_connections = randomize_connections(rand, sv_options, final_regions, final_connections)
+                _, randomized_connections = randomize_connections(rand, sv_options, content, final_regions, final_connections)
 
                 for connection_name in final_connections:
                     connection = final_connections[connection_name]

From 992657750c30094c8a4b5734104dcda8b0547622 Mon Sep 17 00:00:00 2001
From: Rensen3 <127029481+Rensen3@users.noreply.github.com>
Date: Sun, 1 Dec 2024 04:09:22 +0100
Subject: [PATCH 110/381] YGO06: add Item groups (#3737)

* YGO06: adds item groups

* YGO06: Change lists to sets

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* YGO06: fix imports

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---
 worlds/yugioh06/__init__.py | 26 ++++++++++++++++++--------
 worlds/yugioh06/items.py    | 29 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/worlds/yugioh06/__init__.py b/worlds/yugioh06/__init__.py
index 90bbed1a2174..9070683f33d5 100644
--- a/worlds/yugioh06/__init__.py
+++ b/worlds/yugioh06/__init__.py
@@ -1,6 +1,6 @@
 import os
 import pkgutil
-from typing import Any, ClassVar, Dict, List
+from typing import Any, ClassVar, Dict, List, Set
 
 import settings
 from BaseClasses import Entrance, Item, ItemClassification, Location, MultiWorld, Region, Tutorial
@@ -17,12 +17,14 @@
     draft_opponents,
     excluded_items,
     item_to_index,
-    tier_1_opponents,
     useful,
+    tier_1_opponents,
+    tier_2_opponents,
+    tier_3_opponents,
+    tier_4_opponents,
+    tier_5_opponents,
 )
-from .items import (
-    challenges as challenges,
-)
+from .items import challenges as challenges
 from .locations import (
     Bonuses,
     Campaign_Opponents,
@@ -109,9 +111,17 @@ class Yugioh06World(World):
     for k, v in Required_Cards.items():
         location_name_to_id[k] = v + start_id
 
-    item_name_groups = {
-        "Core Booster": core_booster,
-        "Campaign Boss Beaten": ["Tier 1 Beaten", "Tier 2 Beaten", "Tier 3 Beaten", "Tier 4 Beaten", "Tier 5 Beaten"],
+    item_name_groups: Dict[str, Set[str]] = {
+        "Core Booster": set(core_booster),
+        "Campaign Boss Beaten": {"Tier 1 Beaten", "Tier 2 Beaten", "Tier 3 Beaten", "Tier 4 Beaten", "Tier 5 Beaten"},
+        "Challenge": set(challenges),
+        "Tier 1 Opponent": set(tier_1_opponents),
+        "Tier 2 Opponent": set(tier_2_opponents),
+        "Tier 3 Opponent": set(tier_3_opponents),
+        "Tier 4 Opponent": set(tier_4_opponents),
+        "Tier 5 Opponent": set(tier_5_opponents),
+        "Campaign Opponent": set(tier_1_opponents + tier_2_opponents + tier_3_opponents +
+                             tier_4_opponents + tier_5_opponents)
     }
 
     removed_challenges: List[str]
diff --git a/worlds/yugioh06/items.py b/worlds/yugioh06/items.py
index f0f877fd9f7b..0cfcf32992f2 100644
--- a/worlds/yugioh06/items.py
+++ b/worlds/yugioh06/items.py
@@ -183,6 +183,35 @@
     "Campaign Tier 1 Column 5",
 ]
 
+tier_2_opponents: List[str] = [
+    "Campaign Tier 2 Column 1",
+    "Campaign Tier 2 Column 2",
+    "Campaign Tier 2 Column 3",
+    "Campaign Tier 2 Column 4",
+    "Campaign Tier 2 Column 5",
+]
+
+tier_3_opponents: List[str] = [
+    "Campaign Tier 3 Column 1",
+    "Campaign Tier 3 Column 2",
+    "Campaign Tier 3 Column 3",
+    "Campaign Tier 3 Column 4",
+    "Campaign Tier 3 Column 5",
+]
+
+tier_4_opponents: List[str] = [
+    "Campaign Tier 4 Column 1",
+    "Campaign Tier 4 Column 2",
+    "Campaign Tier 4 Column 3",
+    "Campaign Tier 4 Column 4",
+    "Campaign Tier 4 Column 5",
+]
+
+tier_5_opponents: List[str] = [
+    "Campaign Tier 5 Column 1",
+    "Campaign Tier 5 Column 2",
+]
+
 Banlist_Items: List[str] = [
     "No Banlist",
     "Banlist September 2003",

From 6cfc3a46670232db873d7ce362c9e99e23ebaa03 Mon Sep 17 00:00:00 2001
From: Eric Newport <kethinov@gmail.com>
Date: Sat, 30 Nov 2024 19:10:00 -0800
Subject: [PATCH 111/381] Docs: Improved sm64ex advanced setup docs (#3741)

* Improved sm64ex advanced setup docs

This edit clarifies some things that are not obvious in the version that is currently live on the site.

This should prevent others from needing to go spelunking in Discord chat history to figure out how to do advanced builds.

* Update worlds/sm64ex/docs/setup_en.md

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

* copyediting

---------

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
---
 worlds/sm64ex/docs/setup_en.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/worlds/sm64ex/docs/setup_en.md b/worlds/sm64ex/docs/setup_en.md
index afb5bad50f71..9963d3945a10 100644
--- a/worlds/sm64ex/docs/setup_en.md
+++ b/worlds/sm64ex/docs/setup_en.md
@@ -29,15 +29,25 @@ Then continue to `Using the Launcher`
 
 *Using the Launcher*
 
-1. Go to the page linked for SM64AP-Launcher, and press on the topmost entry
+1. Go to the page linked for SM64AP-Launcher, and press on the topmost entry.
 2. Scroll down, and download the zip file for your OS.
-3. Unpack the zip file in an empty folder
+3. Unpack the zip file in an empty folder.
 4. Run the Launcher. On first start, press `Check Requirements`, which will guide you through the rest of the needed steps.
     - Windows: If you did not use the default install directory for MSYS, close this window, check `Show advanced options` and reopen using `Re-check Requirements`. You can then set the path manually.
-5. When finished, use `Compile default SM64AP build` to continue
-    - Advanced user can use `Show advanced options` to build with custom makeflags (`BETTERCAMERA`, `NODRAWINGDISTANCE`, ...), different repos and branches, and game patches such as 60FPS, Enhanced Moveset and others.
-      - [Available Makeflags](https://github.com/sm64pc/sm64ex/wiki/Build-options)
-      - [Included Game Patches](https://github.com/N00byKing/sm64ex/blob/archipelago/enhancements/README.md)
+5. When finished, use `Compile default SM64AP build` to continue.
+    - **Advanced configuration:** If you want to use additional build options such as Better Camera, No Drawing Distance, etc or apply game patches such as 60FPS, Enhanced Moveset, etc, then use the `Compile custom build` option:
+      - Set a name for your build, e.g. "archipelago" or whatever you like.
+      - Press the `Download Files` button.
+      - Set Make Flags, e.g. `-j8 BETTERCAMERA=1 NODRAWINGDISTANCE=1` to enable Better Camera and No Drawing Distance.
+      - Press `Apply Patches` to select patches to apply. Example patches include:
+        - 60FPS: Improves frame rate.
+        - Enhanced Moveset: Gives Mario new abilities. [Details here](https://github.com/TheGag96/sm64-port).
+        - Nonstop Mode: Makes it possible to fetch multiple stars in a level without exiting the level first.
+      - Press `Create Build`. This will take several minutes.
+      - You can also use the Repository and Branch fields to build with different repos or branches if you want to build using a fork or development version of SM64AP.
+      - For more details, see:
+        - [Available Makeflags](https://github.com/sm64pc/sm64ex/wiki/Build-options)
+        - [Included Game Patches](https://github.com/N00byKing/sm64ex/blob/archipelago/enhancements/README.md)
 6. Press `Download Files` to prepare the build, afterwards `Create Build`.
 7. SM64EX will now be compiled. This can take a while.
 

From 3af2b1dc666cd03a2aa85044b24995adf0360833 Mon Sep 17 00:00:00 2001
From: Kaito Sinclaire <ks@rosenthalcastle.org>
Date: Sat, 30 Nov 2024 19:10:43 -0800
Subject: [PATCH 112/381] id Tech 1 games: Add command line instructions/info
 (#3757)

---
 worlds/doom_1993/docs/setup_en.md | 20 +++++++++++++++++++-
 worlds/doom_ii/docs/setup_en.md   | 20 +++++++++++++++++++-
 worlds/heretic/docs/setup_en.md   | 19 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/worlds/doom_1993/docs/setup_en.md b/worlds/doom_1993/docs/setup_en.md
index 5d96e6a8056e..85061609abbb 100644
--- a/worlds/doom_1993/docs/setup_en.md
+++ b/worlds/doom_1993/docs/setup_en.md
@@ -17,7 +17,7 @@
    You can find the folder in steam by finding the game in your library,
    right-clicking it and choosing **Manage -> Browse Local Files**. The WAD file is in the `/base/` folder.
 
-## Joining a MultiWorld Game
+## Joining a MultiWorld Game (via Launcher)
 
 1. Launch apdoom-launcher.exe
 2. Select `Ultimate DOOM` from the drop-down
@@ -28,6 +28,24 @@
 To continue a game, follow the same connection steps.
 Connecting with a different seed won't erase your progress in other seeds.
 
+## Joining a MultiWorld Game (via command line)
+
+1. In your command line, navigate to the directory where APDOOM is installed.
+2. Run `crispy-apdoom -game doom -apserver <server> -applayer <slot name>`, where:
+    - `<server>` is the Archipelago server address, e.g. "`archipelago.gg:38281`"
+    - `<slot name>` is your slot name; if it contains spaces, surround it with double quotes
+    - If the server has a password, add `-password`, followed by the server password
+3. Enjoy!
+
+Optionally, you can override some randomization settings from the command line:
+- `-apmonsterrando 0` will disable monster rando.
+- `-apitemrando 0` will disable item rando.
+- `-apmusicrando 0` will disable music rando.
+- `-apfliplevels 0` will disable flipping levels.
+- `-apresetlevelondeath 0` will disable resetting the level on death.
+- `-apdeathlinkoff` will force DeathLink off if it's enabled.
+- `-skill <1-5>` changes the game difficulty, from 1 (I'm too young to die) to 5 (Nightmare!)
+
 ## Archipelago Text Client
 
 We recommend having Archipelago's Text Client open on the side to keep track of what items you receive and send.
diff --git a/worlds/doom_ii/docs/setup_en.md b/worlds/doom_ii/docs/setup_en.md
index ec6697c76da2..e444f85bd7c7 100644
--- a/worlds/doom_ii/docs/setup_en.md
+++ b/worlds/doom_ii/docs/setup_en.md
@@ -15,7 +15,7 @@
    You can find the folder in steam by finding the game in your library,
    right clicking it and choosing *Manage→Browse Local Files*. The WAD file is in the `/base/` folder.
 
-## Joining a MultiWorld Game
+## Joining a MultiWorld Game (via Launcher)
 
 1. Launch apdoom-launcher.exe
 2. Select `DOOM II` from the drop-down
@@ -26,6 +26,24 @@
 To continue a game, follow the same connection steps.
 Connecting with a different seed won't erase your progress in other seeds.
 
+## Joining a MultiWorld Game (via command line)
+
+1. In your command line, navigate to the directory where APDOOM is installed.
+2. Run `crispy-apdoom -game doom2 -apserver <server> -applayer <slot name>`, where:
+    - `<server>` is the Archipelago server address, e.g. "`archipelago.gg:38281`"
+    - `<slot name>` is your slot name; if it contains spaces, surround it with double quotes
+    - If the server has a password, add `-password`, followed by the server password
+3. Enjoy!
+
+Optionally, you can override some randomization settings from the command line:
+- `-apmonsterrando 0` will disable monster rando.
+- `-apitemrando 0` will disable item rando.
+- `-apmusicrando 0` will disable music rando.
+- `-apfliplevels 0` will disable flipping levels.
+- `-apresetlevelondeath 0` will disable resetting the level on death.
+- `-apdeathlinkoff` will force DeathLink off if it's enabled.
+- `-skill <1-5>` changes the game difficulty, from 1 (I'm too young to die) to 5 (Nightmare!)
+
 ## Archipelago Text Client
 
 We recommend having Archipelago's Text Client open on the side to keep track of what items you receive and send.
diff --git a/worlds/heretic/docs/setup_en.md b/worlds/heretic/docs/setup_en.md
index 41b7fdab8078..5985dbb0992a 100644
--- a/worlds/heretic/docs/setup_en.md
+++ b/worlds/heretic/docs/setup_en.md
@@ -15,7 +15,7 @@
    You can find the folder in steam by finding the game in your library,
    right clicking it and choosing *Manage→Browse Local Files*. The WAD file is in the `/base/` folder.
 
-## Joining a MultiWorld Game
+## Joining a MultiWorld Game (via Launcher)
 
 1. Launch apdoom-launcher.exe
 2. Choose Heretic in the dropdown
@@ -26,6 +26,23 @@
 To continue a game, follow the same connection steps.
 Connecting with a different seed won't erase your progress in other seeds.
 
+## Joining a MultiWorld Game (via command line)
+
+1. In your command line, navigate to the directory where APDOOM is installed.
+2. Run `crispy-apheretic -apserver <server> -applayer <slot name>`, where:
+    - `<server>` is the Archipelago server address, e.g. "`archipelago.gg:38281`"
+    - `<slot name>` is your slot name; if it contains spaces, surround it with double quotes
+    - If the server has a password, add `-password`, followed by the server password
+3. Enjoy!
+
+Optionally, you can override some randomization settings from the command line:
+- `-apmonsterrando 0` will disable monster rando.
+- `-apitemrando 0` will disable item rando.
+- `-apmusicrando 0` will disable music rando.
+- `-apresetlevelondeath 0` will disable resetting the level on death.
+- `-apdeathlinkoff` will force DeathLink off if it's enabled.
+- `-skill <1-5>` changes the game difficulty, from 1 (thou needeth a wet-nurse) to 5 (black plague possesses thee)
+
 ## Archipelago Text Client
 
 We recommend having Archipelago's Text Client open on the side to keep track of what items you receive and send.

From 472d2d54061d3ebe88a4f2577f9e510445c74bcb Mon Sep 17 00:00:00 2001
From: Jarno <jarnowesthof@gmail.com>
Date: Sun, 1 Dec 2024 04:11:45 +0100
Subject: [PATCH 113/381] Timespinner: Implemented support for universal
 tracker (#3771)

* Implemented slot data interpretation

* Fixed talaria attached to be taken into logic
---
 worlds/timespinner/__init__.py | 83 ++++++++++++++++++++++++++++++++--
 1 file changed, 79 insertions(+), 4 deletions(-)

diff --git a/worlds/timespinner/__init__.py b/worlds/timespinner/__init__.py
index a2a5c7ce9c78..ca31d08326b5 100644
--- a/worlds/timespinner/__init__.py
+++ b/worlds/timespinner/__init__.py
@@ -1,4 +1,4 @@
-from typing import Dict, List, Set, Tuple, TextIO
+from typing import Dict, List, Set, Tuple, TextIO, Any, Optional
 from BaseClasses import Item, Tutorial, ItemClassification
 from .Items import get_item_names_per_category
 from .Items import item_table, starter_melee_weapons, starter_spells, filler_items, starter_progression_items
@@ -55,13 +55,18 @@ def generate_early(self) -> None:
         self.precalculated_weights = PreCalculatedWeights(self.options, self.random)
 
         # in generate_early the start_inventory isnt copied over to precollected_items yet, so we can still modify the options directly
-        if self.options.start_inventory.value.pop('Meyef', 0) > 0:
+        if self.options.start_inventory.value.pop("Meyef", 0) > 0:
             self.options.start_with_meyef.value = Toggle.option_true
-        if self.options.start_inventory.value.pop('Talaria Attachment', 0) > 0:
+        if self.options.start_inventory.value.pop("Talaria Attachment", 0) > 0:
             self.options.quick_seed.value = Toggle.option_true
-        if self.options.start_inventory.value.pop('Jewelry Box', 0) > 0:
+        if self.options.start_inventory.value.pop("Jewelry Box", 0) > 0:
             self.options.start_with_jewelry_box.value = Toggle.option_true
 
+        self.interpret_slot_data(None)
+
+        if self.options.quick_seed:
+            self.multiworld.push_precollected(self.create_item("Talaria Attachment"))
+
     def create_regions(self) -> None: 
         create_regions_and_locations(self.multiworld, self.player, self.options, self.precalculated_weights)
 
@@ -144,6 +149,76 @@ def fill_slot_data(self) -> Dict[str, object]:
             "LakeSereneBridge": self.precalculated_weights.flood_lake_serene_bridge,
             "Lab": self.precalculated_weights.flood_lab
         }
+    
+    def interpret_slot_data(self, slot_data: Optional[Dict[str, Any]]) -> Optional[Dict[str, Any]]:
+        """Used by Universal Tracker to correctly rebuild state"""
+
+        if not slot_data \
+            and hasattr(self.multiworld, "re_gen_passthrough") \
+            and isinstance(self.multiworld.re_gen_passthrough, dict) \
+            and "Timespinner" in self.multiworld.re_gen_passthrough:
+                slot_data = self.multiworld.re_gen_passthrough["Timespinner"]
+
+        if not slot_data:
+            return None
+        
+        self.options.start_with_jewelry_box.value = slot_data["StartWithJewelryBox"]
+        self.options.downloadable_items.value = slot_data["DownloadableItems"]
+        self.options.eye_spy.value = slot_data["EyeSpy"]
+        self.options.start_with_meyef.value = slot_data["StartWithMeyef"]
+        self.options.quick_seed.value = slot_data["QuickSeed"]
+        self.options.specific_keycards.value = slot_data["SpecificKeycards"]
+        self.options.inverted.value = slot_data["Inverted"]
+        self.options.gyre_archives.value = slot_data["GyreArchives"]
+        self.options.cantoran.value = slot_data["Cantoran"]
+        self.options.lore_checks.value = slot_data["LoreChecks"]
+        self.options.boss_rando.value = slot_data["BossRando"]
+        self.options.damage_rando.value = slot_data["DamageRando"]
+        self.options.damage_rando_overrides.value = slot_data["DamageRandoOverrides"]
+        self.options.hp_cap.value = slot_data["HpCap"]
+        self.options.level_cap.value = slot_data["LevelCap"]
+        self.options.extra_earrings_xp.value = slot_data["ExtraEarringsXP"]
+        self.options.boss_healing.value = slot_data["BossHealing"]
+        self.options.shop_fill.value = slot_data["ShopFill"]
+        self.options.shop_warp_shards.value = slot_data["ShopWarpShards"]
+        self.options.shop_multiplier.value = slot_data["ShopMultiplier"]
+        self.options.loot_pool.value = slot_data["LootPool"]
+        self.options.drop_rate_category.value = slot_data["DropRateCategory"]
+        self.options.fixed_drop_rate.value = slot_data["FixedDropRate"]
+        self.options.loot_tier_distro.value = slot_data["LootTierDistro"]
+        self.options.show_bestiary.value = slot_data["ShowBestiary"]
+        self.options.show_drops.value = slot_data["ShowDrops"]
+        self.options.enter_sandman.value = slot_data["EnterSandman"]
+        self.options.dad_percent.value = slot_data["DadPercent"]
+        self.options.rising_tides.value = slot_data["RisingTides"]
+        self.options.unchained_keys.value = slot_data["UnchainedKeys"]
+        self.options.back_to_the_future.value = slot_data["PresentAccessWithWheelAndSpindle"]
+        self.options.traps.value = slot_data["Traps"]
+        self.options.death_link.value = slot_data["DeathLink"]
+        # Readonly slot_data["StinkyMaw"]
+        # data
+        # Readonly slot_data["PersonalItems"]
+        self.precalculated_weights.pyramid_keys_unlock = slot_data["PyramidKeysGate"]
+        self.precalculated_weights.present_key_unlock = slot_data["PresentGate"]
+        self.precalculated_weights.past_key_unlock = slot_data["PastGate"]
+        self.precalculated_weights.time_key_unlock = slot_data["TimeGate"]
+        # rising tides
+        if (slot_data["Basement"] > 1):
+            self.precalculated_weights.flood_basement = True
+        if (slot_data["Basement"] == 2):
+            self.precalculated_weights.flood_basement_high = True
+        self.precalculated_weights.flood_xarion = slot_data["Xarion"]
+        self.precalculated_weights.flood_maw = slot_data["Maw"]
+        self.precalculated_weights.flood_pyramid_shaft = slot_data["PyramidShaft"]
+        self.precalculated_weights.flood_pyramid_back = slot_data["BackPyramid"]
+        self.precalculated_weights.flood_moat = slot_data["CastleMoat"]
+        self.precalculated_weights.flood_courtyard = slot_data["CastleCourtyard"]
+        self.precalculated_weights.flood_lake_desolation = slot_data["LakeDesolation"]
+        self.precalculated_weights.flood_lake_serene = not slot_data["DryLakeSerene"]
+        self.precalculated_weights.flood_lake_serene_bridge = slot_data["LakeSereneBridge"]
+        self.precalculated_weights.flood_lab = slot_data["Lab"]
+
+        return slot_data
 
     def write_spoiler_header(self, spoiler_handle: TextIO) -> None:
         if self.options.unchained_keys:

From 21dbfd2472a517f4885b018c24ef14173d6d6cae Mon Sep 17 00:00:00 2001
From: josephwhite <damasta21th@aol.com>
Date: Sat, 30 Nov 2024 22:33:36 -0500
Subject: [PATCH 114/381] Multiserver: Add argument for timestamping STDOUT
 (#4266)

* core: add server arg for timestamping STDOUT

* Multiserver: Implicitly use default write_mode arg in init_logging

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 MultiServer.py | 6 +++++-
 Utils.py       | 9 +++++----
 settings.py    | 1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/MultiServer.py b/MultiServer.py
index 628817d5977c..80fcd32fd1e3 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -2378,6 +2378,8 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument('--cert_key', help="Path to SSL Certificate Key file")
     parser.add_argument('--loglevel', default=defaults["loglevel"],
                         choices=['debug', 'info', 'warning', 'error', 'critical'])
+    parser.add_argument('--logtime', help="Add timestamps to STDOUT",
+                        default=defaults["logtime"], action='store_true')
     parser.add_argument('--location_check_points', default=defaults["location_check_points"], type=int)
     parser.add_argument('--hint_cost', default=defaults["hint_cost"], type=int)
     parser.add_argument('--disable_item_cheat', default=defaults["disable_item_cheat"], action='store_true')
@@ -2458,7 +2460,9 @@ def load_server_cert(path: str, cert_key: typing.Optional[str]) -> "ssl.SSLConte
 
 
 async def main(args: argparse.Namespace):
-    Utils.init_logging("Server", loglevel=args.loglevel.lower())
+    Utils.init_logging(name="Server",
+                       loglevel=args.loglevel.lower(),
+                       add_timestamp=args.logtime)
 
     ctx = Context(args.host, args.port, args.server_password, args.password, args.location_check_points,
                   args.hint_cost, not args.disable_item_cheat, args.release_mode, args.collect_mode,
diff --git a/Utils.py b/Utils.py
index f5c6ca6414f5..4f99d26ac402 100644
--- a/Utils.py
+++ b/Utils.py
@@ -485,9 +485,9 @@ def get_text_after(text: str, start: str) -> str:
 loglevel_mapping = {'error': logging.ERROR, 'info': logging.INFO, 'warning': logging.WARNING, 'debug': logging.DEBUG}
 
 
-def init_logging(name: str, loglevel: typing.Union[str, int] = logging.INFO, write_mode: str = "w",
-                 log_format: str = "[%(name)s at %(asctime)s]: %(message)s",
-                 exception_logger: typing.Optional[str] = None):
+def init_logging(name: str, loglevel: typing.Union[str, int] = logging.INFO,
+                 write_mode: str = "w", log_format: str = "[%(name)s at %(asctime)s]: %(message)s",
+                 add_timestamp: bool = False, exception_logger: typing.Optional[str] = None):
     import datetime
     loglevel: int = loglevel_mapping.get(loglevel, loglevel)
     log_folder = user_path("logs")
@@ -521,7 +521,8 @@ def filter(self, record: logging.LogRecord) -> bool:
         formatter = logging.Formatter(fmt='[%(asctime)s] %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
         stream_handler = logging.StreamHandler(sys.stdout)
         stream_handler.addFilter(Filter("NoFile", lambda record: not getattr(record, "NoStream", False)))
-        stream_handler.setFormatter(formatter)
+        if add_timestamp:
+            stream_handler.setFormatter(formatter)
         root_logger.addHandler(stream_handler)
 
     # Relay unhandled exceptions to logger.
diff --git a/settings.py b/settings.py
index ccd3458003c2..04d8760c3cd3 100644
--- a/settings.py
+++ b/settings.py
@@ -599,6 +599,7 @@ class LogNetwork(IntEnum):
     savefile: Optional[str] = None
     disable_save: bool = False
     loglevel: str = "info"
+    logtime: bool = False
     server_password: Optional[ServerPassword] = None
     disable_item_cheat: Union[DisableItemCheat, bool] = False
     location_check_points: LocationCheckPoints = LocationCheckPoints(1)

From 1a5d22ca7890175275ef8b77c31cc0dce705d85a Mon Sep 17 00:00:00 2001
From: Benjamin S Wolf <jokeserver@gmail.com>
Date: Sat, 30 Nov 2024 19:51:26 -0800
Subject: [PATCH 115/381] Core: Add new error message for item count when
 defined as a set instead of a dict (#4100)

* Core: New error message if item count is a set

* Apply suggestion for error message

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Apply item count error suggestion

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
---
 Options.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Options.py b/Options.py
index 0d0e6ae1cd95..d3b2e6c1ba11 100644
--- a/Options.py
+++ b/Options.py
@@ -863,6 +863,8 @@ class ItemDict(OptionDict):
     verify_item_name = True
 
     def __init__(self, value: typing.Dict[str, int]):
+        if any(item_count is None for item_count in value.values()):
+            raise Exception("Items must have counts associated with them. Please provide positive integer values in the format \"item\": count .")
         if any(item_count < 1 for item_count in value.values()):
             raise Exception("Cannot have non-positive item counts.")
         super(ItemDict, self).__init__(value)

From ed721dd0c14aec3cb332a010f52bca43fddc2886 Mon Sep 17 00:00:00 2001
From: Alex Nordstrom <a.l.nordstrom@gmail.com>
Date: Sat, 30 Nov 2024 22:58:10 -0500
Subject: [PATCH 116/381] LADX: Implement various upstream adjustments (#3829)

* magnifying lens changes

https://github.com/daid/LADXR/pull/156

* restore enemy visibility in mermaid statue cave

https://github.com/daid/LADXR/pull/155

* mermaid statue scale bugfix

https://github.com/daid/LADXR/pull/163

* restore vanilla map when rooster is an item

https://github.com/daid/LADXR/pull/132

* fix

* fixes to magnifying lens changes

* load marin singing even if you have marin date
https://github.com/daid/LADXR/commit/4feb3099a3f3a144739094f88a4024def6f79767

* Revert "load marin singing even if you have marin date"

This reverts commit a7a546ed3f7a2b9c9bcb095984cc64319a4f7855.

* always patch tradequest
not upstream, but included in this PR because it touches the same parts of the code. https://discord.com/channels/731205301247803413/1227373762412937347

* marin date fix

* fix logic
---
 worlds/ladx/LADXR/generator.py              | 10 ++-
 worlds/ladx/LADXR/locations/birdKey.py      | 17 ------
 worlds/ladx/LADXR/locations/boomerangGuy.py |  5 --
 worlds/ladx/LADXR/logic/overworld.py        | 45 ++++++++------
 worlds/ladx/LADXR/logic/requirements.py     |  3 +
 worlds/ladx/LADXR/patches/maptweaks.py      | 13 ++++
 worlds/ladx/LADXR/patches/songs.py          |  4 ++
 worlds/ladx/LADXR/patches/tradeSequence.py  | 68 ++++++++++++++++++---
 worlds/ladx/Options.py                      |  2 +-
 9 files changed, 110 insertions(+), 57 deletions(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index 69e856f3541b..f0f042c67db8 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -153,7 +153,9 @@ def generateRom(args, world: "LinksAwakeningWorld"):
     if world.ladxr_settings.witch:
         patches.witch.updateWitch(rom)
     patches.softlock.fixAll(rom)
-    patches.maptweaks.tweakMap(rom)
+    if not world.ladxr_settings.rooster:
+        patches.maptweaks.tweakMap(rom)
+        patches.maptweaks.tweakBirdKeyRoom(rom)
     patches.chest.fixChests(rom)
     patches.shop.fixShop(rom)
     patches.rooster.patchRooster(rom)
@@ -176,11 +178,7 @@ def generateRom(args, world: "LinksAwakeningWorld"):
     patches.songs.upgradeMarin(rom)
     patches.songs.upgradeManbo(rom)
     patches.songs.upgradeMamu(rom)
-    if world.ladxr_settings.tradequest:
-        patches.tradeSequence.patchTradeSequence(rom, world.ladxr_settings.boomerang)
-    else:
-        # Monkey bridge patch, always have the bridge there.
-        rom.patch(0x00, 0x333D, assembler.ASM("bit 4, e\njr Z, $05"), b"", fill_nop=True)
+    patches.tradeSequence.patchTradeSequence(rom, world.ladxr_settings)
     patches.bowwow.fixBowwow(rom, everywhere=world.ladxr_settings.bowwow != 'normal')
     if world.ladxr_settings.bowwow != 'normal':
         patches.bowwow.bowwowMapPatches(rom)
diff --git a/worlds/ladx/LADXR/locations/birdKey.py b/worlds/ladx/LADXR/locations/birdKey.py
index 12418c61aa46..0dbdd8653fe2 100644
--- a/worlds/ladx/LADXR/locations/birdKey.py
+++ b/worlds/ladx/LADXR/locations/birdKey.py
@@ -1,23 +1,6 @@
 from .droppedKey import DroppedKey
-from ..roomEditor import RoomEditor
-from ..assembler import ASM
 
 
 class BirdKey(DroppedKey):
     def __init__(self):
         super().__init__(0x27A)
-
-    def patch(self, rom, option, *, multiworld=None):
-        super().patch(rom, option, multiworld=multiworld)
-
-        re = RoomEditor(rom, self.room)
-
-        # Make the bird key accessible without the rooster
-        re.removeObject(1, 6)
-        re.removeObject(2, 6)
-        re.removeObject(3, 5)
-        re.removeObject(3, 6)
-        re.moveObject(1, 5, 2, 6)
-        re.moveObject(2, 5, 3, 6)
-        re.addEntity(3, 5, 0x9D)
-        re.store(rom)
diff --git a/worlds/ladx/LADXR/locations/boomerangGuy.py b/worlds/ladx/LADXR/locations/boomerangGuy.py
index 92d76cebdf5d..23fcc867617b 100644
--- a/worlds/ladx/LADXR/locations/boomerangGuy.py
+++ b/worlds/ladx/LADXR/locations/boomerangGuy.py
@@ -24,11 +24,6 @@ def configure(self, options):
     # But SHIELD, BOMB and MAGIC_POWDER would most likely break things.
     # SWORD and POWER_BRACELET would most likely introduce the lv0 shield/bracelet issue
     def patch(self, rom, option, *, multiworld=None):
-        # Always have the boomerang trade guy enabled (normally you need the magnifier)
-        rom.patch(0x19, 0x05EC, ASM("ld a, [wTradeSequenceItem]\ncp $0E"), ASM("ld a, $0E\ncp $0E"), fill_nop=True)  # show the guy
-        rom.patch(0x00, 0x3199, ASM("ld a, [wTradeSequenceItem]\ncp $0E"), ASM("ld a, $0E\ncp $0E"), fill_nop=True)  # load the proper room layout
-        rom.patch(0x19, 0x05F4, ASM("ld a, [wTradeSequenceItem2]\nand a"), ASM("xor a"), fill_nop=True)
-
         if self.setting == 'trade':
             inv = INVENTORY_MAP[option]
             # Patch the check if you traded back the boomerang (so traded twice)
diff --git a/worlds/ladx/LADXR/logic/overworld.py b/worlds/ladx/LADXR/logic/overworld.py
index 551cf8353f4a..3972796051f9 100644
--- a/worlds/ladx/LADXR/logic/overworld.py
+++ b/worlds/ladx/LADXR/logic/overworld.py
@@ -61,9 +61,9 @@ def __init__(self, options, world_setup, r):
         self._addEntrance("banana_seller", sword_beach, banana_seller, r.bush)
         boomerang_cave = Location("Boomerang Cave")
         if options.boomerang == 'trade':
-            Location().add(BoomerangGuy()).connect(boomerang_cave, OR(BOOMERANG, HOOKSHOT, MAGIC_ROD, PEGASUS_BOOTS, FEATHER, SHOVEL))
+            Location().add(BoomerangGuy()).connect(boomerang_cave, AND(r.shuffled_magnifier, OR(BOOMERANG, HOOKSHOT, MAGIC_ROD, PEGASUS_BOOTS, FEATHER, SHOVEL)))
         elif options.boomerang == 'gift':
-            Location().add(BoomerangGuy()).connect(boomerang_cave, None)
+            Location().add(BoomerangGuy()).connect(boomerang_cave, r.shuffled_magnifier)
         self._addEntrance("boomerang_cave", sword_beach, boomerang_cave, BOMB)
         self._addEntranceRequirementExit("boomerang_cave", None) # if exiting, you do not need bombs
 
@@ -167,7 +167,9 @@ def __init__(self, options, world_setup, r):
         prairie_island_seashell = Location().add(Seashell(0x0A6)).connect(ukuku_prairie, AND(FLIPPERS, r.bush))  # next to lv3
         Location().add(Seashell(0x08B)).connect(ukuku_prairie, r.bush)  # next to seashell house
         Location().add(Seashell(0x0A4)).connect(ukuku_prairie, PEGASUS_BOOTS)  # smash into tree next to phonehouse
-        self._addEntrance("castle_jump_cave", ukuku_prairie, Location().add(Chest(0x1FD)), OR(AND(FEATHER, PEGASUS_BOOTS), ROOSTER)) # left of the castle, 5 holes turned into 3
+        self._addEntrance("castle_jump_cave", ukuku_prairie, Location().add(Chest(0x1FD)), ROOSTER)
+        if not options.rooster:
+            self._addEntranceRequirement("castle_jump_cave", AND(FEATHER, PEGASUS_BOOTS)) # left of the castle, 5 holes turned into 3
         Location().add(Seashell(0x0B9)).connect(ukuku_prairie, POWER_BRACELET)  # under the rock
 
         left_bay_area = Location()
@@ -353,7 +355,7 @@ def __init__(self, options, world_setup, r):
         self._addEntrance("d4", d4_entrance, None, ANGLER_KEY)
         self._addEntranceRequirementExit("d4", FLIPPERS) # if exiting, you can leave with flippers without opening the dungeon
         mambo = Location().connect(Location().add(Song(0x2FD)), AND(OCARINA, FLIPPERS))  # Manbo's Mambo
-        self._addEntrance("mambo", d4_entrance, mambo, FLIPPERS) 
+        self._addEntrance("mambo", d4_entrance, mambo, FLIPPERS)
 
         # Raft game.
         raft_house = Location("Raft House")
@@ -379,7 +381,9 @@ def __init__(self, options, world_setup, r):
         self._addEntrance("rooster_house", outside_rooster_house, None, None)
         bird_cave = Location()
         bird_key = Location().add(BirdKey())
-        bird_cave.connect(bird_key, OR(AND(FEATHER, COUNT(POWER_BRACELET, 2)), ROOSTER))
+        bird_cave.connect(bird_key, ROOSTER)
+        if not options.rooster:
+            bird_cave.connect(bird_key, AND(FEATHER, COUNT(POWER_BRACELET, 2))) # elephant statue added
         if options.logic != "casual":
             bird_cave.connect(lower_right_taltal, None, one_way=True)  # Drop in a hole at bird cave
         self._addEntrance("bird_cave", outside_rooster_house, bird_cave, None)
@@ -468,7 +472,7 @@ def __init__(self, options, world_setup, r):
             swamp.connect(writes_hut_outside, HOOKSHOT, one_way=True) # hookshot the sign in front of writes hut
             graveyard_heartpiece.connect(graveyard_cave_right, FEATHER) # jump to the bottom right tile around the blocks
             graveyard_heartpiece.connect(graveyard_cave_right, OR(HOOKSHOT, BOOMERANG)) # push bottom block, wall clip and hookshot/boomerang corner to grab item
-            
+
             self._addEntranceRequirement("mamu", AND(FEATHER, POWER_BRACELET)) # can clear the gaps at the start with just feather, can reach bottom left sign with a well timed jump while wall clipped
             self._addEntranceRequirement("prairie_madbatter_connector_entrance", AND(OR(FEATHER, ROOSTER), OR(MAGIC_POWDER, BOMB))) # use bombs or powder to get rid of a bush on the other side by jumping across and placing the bomb/powder before you fall into the pit
             fisher_under_bridge.connect(bay_water, AND(TRADING_ITEM_FISHING_HOOK, FLIPPERS)) # can talk to the fisherman from the water when the boat is low (requires swimming up out of the water a bit)
@@ -476,9 +480,10 @@ def __init__(self, options, world_setup, r):
             castle_inside.connect(kanalet_chain_trooper, BOOMERANG, one_way=True) # kill the ball and chain trooper from the left side, then use boomerang to grab the dropped item
             animal_village_bombcave_heartpiece.connect(animal_village_bombcave, AND(PEGASUS_BOOTS, FEATHER)) # jump across horizontal 4 gap to heart piece
             desert_lanmola.connect(desert, BOMB) # use bombs to kill lanmola
-            
+
             d6_connector_left.connect(d6_connector_right, AND(OR(FLIPPERS, PEGASUS_BOOTS), FEATHER))  # jump the gap in underground passage to d6 left side to skip hookshot
-            bird_key.connect(bird_cave, COUNT(POWER_BRACELET, 2))  # corner walk past the one pit on the left side to get to the elephant statue
+            if not options.rooster:
+                bird_key.connect(bird_cave, COUNT(POWER_BRACELET, 2))  # corner walk past the one pit on the left side to get to the elephant statue
             fire_cave_bottom.connect(fire_cave_top, PEGASUS_BOOTS, one_way=True) # flame skip
 
         if options.logic == 'glitched' or options.logic == 'hell':
@@ -502,9 +507,9 @@ def __init__(self, options, world_setup, r):
             tiny_island.connect(left_bay_area, AND(FEATHER, r.bush)) # jesus jump around
             bay_madbatter_connector_exit.connect(bay_madbatter_connector_entrance, FEATHER, one_way=True) # jesus jump (3 screen) through the underground passage leading to martha's bay mad batter
             self._addEntranceRequirement("prairie_madbatter_connector_entrance", AND(FEATHER, POWER_BRACELET)) # villa buffer into the top side of the bush, then pick it up
-            
+
             ukuku_prairie.connect(richard_maze, OR(BOMB, BOOMERANG, MAGIC_POWDER, MAGIC_ROD, SWORD), one_way=True) # break bushes on north side of the maze, and 1 pit buffer into the maze
-            fisher_under_bridge.connect(bay_water, AND(BOMB, FLIPPERS)) # can bomb trigger the item without having the hook 
+            fisher_under_bridge.connect(bay_water, AND(BOMB, FLIPPERS)) # can bomb trigger the item without having the hook
             animal_village.connect(ukuku_prairie, FEATHER) # jesus jump
             below_right_taltal.connect(next_to_castle, FEATHER) # jesus jump (north of kanalet castle phonebooth)
             animal_village_connector_right.connect(animal_village_connector_left, FEATHER) # text clip past the obstacles (can go both ways), feather to wall clip the obstacle without triggering text or shaq jump in bottom right corner if text is off
@@ -519,12 +524,12 @@ def __init__(self, options, world_setup, r):
             obstacle_cave_inside_chest.connect(obstacle_cave_inside, FEATHER) # jump to the rightmost pits + 1 pit buffer to jump across
             obstacle_cave_exit.connect(obstacle_cave_inside, FEATHER) #  1 pit buffer above boots crystals to get past
             lower_right_taltal.connect(hibiscus_item, AND(TRADING_ITEM_PINEAPPLE, BOMB), one_way=True) # bomb trigger papahl from below ledge, requires pineapple
-            
+
             self._addEntranceRequirement("heartpiece_swim_cave", FEATHER)  # jesus jump into the cave entrance after jumping down the ledge, can jesus jump back to the ladder 1 screen below
             self._addEntranceRequirement("mambo", FEATHER)  # jesus jump from (unlocked) d4 entrance to mambo's cave entrance
             outside_raft_house.connect(below_right_taltal, FEATHER, one_way=True) # jesus jump from the ledge at raft to the staircase 1 screen south
 
-            self._addEntranceRequirement("multichest_left", FEATHER) # jesus jump past staircase leading up the mountain 
+            self._addEntranceRequirement("multichest_left", FEATHER) # jesus jump past staircase leading up the mountain
             outside_rooster_house.connect(lower_right_taltal, FEATHER) # jesus jump (1 or 2 screen depending if angler key is used) to staircase leading up the mountain
             d7_platau.connect(water_cave_hole, None, one_way=True) # use save and quit menu to gain control while falling to dodge the water cave hole
             mountain_bridge_staircase.connect(outside_rooster_house, AND(PEGASUS_BOOTS, FEATHER)) # cross bridge to staircase with pit buffer to clip bottom wall and jump across
@@ -547,7 +552,7 @@ def __init__(self, options, world_setup, r):
             graveyard.connect(forest, OR(PEGASUS_BOOTS, HOOKSHOT)) # boots bonk witches hut, or hookshot spam across the pit
             graveyard_cave_left.connect(graveyard_cave_right, HOOKSHOT) # hookshot spam over the pit
             graveyard_cave_right.connect(graveyard_cave_left, PEGASUS_BOOTS, one_way=True) # boots bonk off the cracked block
-            
+
             self._addEntranceRequirementEnter("mamu", AND(PEGASUS_BOOTS, POWER_BRACELET)) # can clear the gaps at the start with multiple pit buffers, can reach bottom left sign with bonking along the bottom wall
             self._addEntranceRequirement("castle_jump_cave", PEGASUS_BOOTS) # pit buffer to clip bottom wall and boots bonk across
             prairie_cave_secret_exit.connect(prairie_cave, AND(BOMB, OR(PEGASUS_BOOTS, HOOKSHOT))) # hookshot spam or boots bonk across pits can go from left to right by pit buffering on top of the bottom wall then boots bonk across
@@ -563,15 +568,15 @@ def __init__(self, options, world_setup, r):
             animal_village.connect(bay_water, FEATHER) # jesus jump (can always reach bay_water with jesus jumping from every way to enter bay_water, so no one_way)
             ukuku_prairie.connect(bay_water, FEATHER, one_way=True) # jesus jump
             bay_water.connect(d5_entrance, FEATHER) # jesus jump into d5 entrance (wall clip), wall clip + jesus jump to get out
-            
+
             crow_gold_leaf.connect(castle_courtyard, BOMB) # bird on tree at left side kanalet, place a bomb against the tree and the crow flies off. With well placed second bomb the crow can be killed
             mermaid_statue.connect(animal_village, AND(TRADING_ITEM_SCALE, FEATHER)) # early mermaid statue by buffering on top of the right ledge, then superjumping to the left (horizontal pixel perfect)
             animal_village_bombcave_heartpiece.connect(animal_village_bombcave, PEGASUS_BOOTS) # boots bonk across bottom wall (both at entrance and in item room)
 
             d6_armos_island.connect(ukuku_prairie, FEATHER) # jesus jump (3 screen) from seashell mansion to armos island
-            armos_fairy_entrance.connect(d6_armos_island, PEGASUS_BOOTS, one_way=True) # jesus jump from top (fairy bomb cave) to armos island with fast falling 
+            armos_fairy_entrance.connect(d6_armos_island, PEGASUS_BOOTS, one_way=True) # jesus jump from top (fairy bomb cave) to armos island with fast falling
             d6_connector_right.connect(d6_connector_left, PEGASUS_BOOTS) # boots bonk across bottom wall at water and pits (can do both ways)
-            
+
             obstacle_cave_entrance.connect(obstacle_cave_inside, OR(HOOKSHOT, AND(FEATHER, PEGASUS_BOOTS, OR(SWORD, MAGIC_ROD, BOW)))) # get past crystal rocks by hookshotting into top pushable block, or boots dashing into top wall where the pushable block is to superjump down
             obstacle_cave_entrance.connect(obstacle_cave_inside, AND(PEGASUS_BOOTS, ROOSTER)) # get past crystal rocks pushing the top pushable block, then boots dashing up picking up the rooster before bonking. Pause buffer until rooster is fully picked up then throw it down before bonking into wall
             d4_entrance.connect(below_right_taltal, FEATHER) # jesus jump a long way
@@ -583,7 +588,7 @@ def __init__(self, options, world_setup, r):
             mountain_bridge_staircase.connect(outside_rooster_house, OR(PEGASUS_BOOTS, FEATHER)) # cross bridge to staircase with pit buffer to clip bottom wall and jump or boots bonk across
             left_right_connector_cave_entrance.connect(left_right_connector_cave_exit, AND(PEGASUS_BOOTS, FEATHER), one_way=True) # boots jump to bottom left corner of pits, pit buffer and jump to left
             left_right_connector_cave_exit.connect(left_right_connector_cave_entrance, AND(ROOSTER, OR(PEGASUS_BOOTS, SWORD, BOW, MAGIC_ROD)), one_way=True)  # pass through the passage in reverse using a boots rooster hop or rooster superjump in the one way passage area
-            
+
         self.start = start_house
         self.egg = windfish_egg
         self.nightmare = nightmare
@@ -659,7 +664,7 @@ def __init__(self, outside, requirement, one_way_enter_requirement="UNSET", one_
         self.requirement = requirement
         self.one_way_enter_requirement = one_way_enter_requirement
         self.one_way_exit_requirement = one_way_exit_requirement
-    
+
     def addRequirement(self, new_requirement):
         self.requirement = OR(self.requirement, new_requirement)
 
@@ -674,9 +679,9 @@ def addEnterRequirement(self, new_requirement):
             self.one_way_enter_requirement = new_requirement
         else:
             self.one_way_enter_requirement = OR(self.one_way_enter_requirement, new_requirement)
-    
+
     def enterIsSet(self):
         return self.one_way_enter_requirement != "UNSET"
-    
+
     def exitIsSet(self):
         return self.one_way_exit_requirement != "UNSET"
diff --git a/worlds/ladx/LADXR/logic/requirements.py b/worlds/ladx/LADXR/logic/requirements.py
index acc969ba938d..a8e57327e78b 100644
--- a/worlds/ladx/LADXR/logic/requirements.py
+++ b/worlds/ladx/LADXR/logic/requirements.py
@@ -265,6 +265,7 @@ def __init__(self, options):
         self.rear_attack_range = OR(MAGIC_ROD, BOW) # mimic
         self.fire = OR(MAGIC_POWDER, MAGIC_ROD) # torches
         self.push_hardhat = OR(SHIELD, SWORD, HOOKSHOT, BOOMERANG)
+        self.shuffled_magnifier = TRADING_ITEM_MAGNIFYING_GLASS
 
         self.boss_requirements = [
             SWORD,  # D1 boss
@@ -293,6 +294,8 @@ def __init__(self, options):
         }
 
         # Adjust for options
+        if not options.tradequest:
+            self.shuffled_magnifier = True
         if options.bowwow != 'normal':
             # We cheat in bowwow mode, we pretend we have the sword, as bowwow can pretty much do all what the sword ca$            # Except for taking out bushes (and crystal pillars are removed)
             self.bush.remove(SWORD)
diff --git a/worlds/ladx/LADXR/patches/maptweaks.py b/worlds/ladx/LADXR/patches/maptweaks.py
index c25dd83dcada..8a5171b3540d 100644
--- a/worlds/ladx/LADXR/patches/maptweaks.py
+++ b/worlds/ladx/LADXR/patches/maptweaks.py
@@ -25,3 +25,16 @@ def addBetaRoom(rom):
     re.store(rom)
 
     rom.room_sprite_data_indoor[0x0FC] = rom.room_sprite_data_indoor[0x1A1]
+
+
+def tweakBirdKeyRoom(rom):
+    # Make the bird key accessible without the rooster
+    re = RoomEditor(rom, 0x27A)
+    re.removeObject(1, 6)
+    re.removeObject(2, 6)
+    re.removeObject(3, 5)
+    re.removeObject(3, 6)
+    re.moveObject(1, 5, 2, 6)
+    re.moveObject(2, 5, 3, 6)
+    re.addEntity(3, 5, 0x9D)
+    re.store(rom)
diff --git a/worlds/ladx/LADXR/patches/songs.py b/worlds/ladx/LADXR/patches/songs.py
index 59ca01c4c8c4..b080cf06bc92 100644
--- a/worlds/ladx/LADXR/patches/songs.py
+++ b/worlds/ladx/LADXR/patches/songs.py
@@ -72,6 +72,10 @@ def upgradeMarin(rom):
         rst  8
     """), fill_nop=True)
 
+    # Load marin singing even if you have the marin date
+    rom.patch(0x03, 0x0A91, ASM("jp nz, $3F8D"), "", fill_nop=True)
+    rom.patch(0x05, 0x0E6E, ASM("jp nz, $7B4B"), "", fill_nop=True)
+
 
 def upgradeManbo(rom):
     # Instead of checking if we have the song, check if we have a specific room flag set
diff --git a/worlds/ladx/LADXR/patches/tradeSequence.py b/worlds/ladx/LADXR/patches/tradeSequence.py
index 5b608977f20d..0eb46ae23ae2 100644
--- a/worlds/ladx/LADXR/patches/tradeSequence.py
+++ b/worlds/ladx/LADXR/patches/tradeSequence.py
@@ -1,7 +1,7 @@
 from ..assembler import ASM
 
 
-def patchTradeSequence(rom, boomerang_option):
+def patchTradeSequence(rom, settings):
     patchTrendy(rom)
     patchPapahlsWife(rom)
     patchYipYip(rom)
@@ -16,7 +16,7 @@ def patchTradeSequence(rom, boomerang_option):
     patchMermaid(rom)
     patchMermaidStatue(rom)
     patchSharedCode(rom)
-    patchVarious(rom, boomerang_option)
+    patchVarious(rom, settings)
     patchInventoryMenu(rom)
 
 
@@ -265,8 +265,11 @@ def patchMermaidStatue(rom):
         and  $10 ; scale
         ret  z
         ldh  a, [$F8]
-        and  $20
+        and  $20 ; ROOM_STATUS_EVENT_2
         ret  nz
+
+        ld hl, wTradeSequenceItem2
+        res 4, [hl] ; take the trade item
     """), fill_nop=True)
 
 
@@ -317,7 +320,7 @@ def patchSharedCode(rom):
     rom.patch(0x07, 0x3F7F, "00" * 7, ASM("ldh a, [$F8]\nor $20\nldh [$F8], a\nret"))
 
 
-def patchVarious(rom, boomerang_option):
+def patchVarious(rom, settings):
     # Make the zora photo work with the magnifier
     rom.patch(0x18, 0x09F3, 0x0A02, ASM("""
         ld   a, [wTradeSequenceItem2]
@@ -330,22 +333,71 @@ def patchVarious(rom, boomerang_option):
         jp   z, $3F8D ; UnloadEntity 
     """), fill_nop=True)
     # Mimic invisibility
-    rom.patch(0x18, 0x2AC8, 0x2ACE, "", fill_nop=True)
+    rom.patch(0x19, 0x2AC0, ASM("""
+        cp   $97
+        jr   z, mermaidStatueCave
+        cp   $98
+        jr   nz, visible
+    mermaidStatueCave:
+        ld   a, [$DB7F]
+        and  a
+        jr   nz, 6
+    visible:
+    """), ASM("""
+        dec  a ; save one byte by only doing one cp
+        or   $01
+        cp   $97
+        jr   nz, visible
+    mermaidStatueCave:
+        ld   a, [wTradeSequenceItem2]
+        and  $20 ; MAGNIFYING_GLASS
+        jr   z, 6
+    visible:
+    """))
+    # Zol invisibility
+    rom.patch(0x06, 0x3BE9, ASM("""
+        cp   $97
+        jr   z, mermaidStatueCave
+        cp   $98
+        ret  nz ; visible
+    mermaidStatueCave:
+        ld   a, [$DB7F]
+        and  a
+        ret  z
+    """), ASM("""
+        dec  a ; save one byte by only doing one cp
+        or   $01
+        cp   $97
+        ret  nz ; visible
+    mermaidStatueCave:
+        ld   a, [wTradeSequenceItem2]
+        and  $20 ; MAGNIFYING_GLASS
+        ret  nz
+    """))
     # Ignore trade quest state for marin at beach
     rom.patch(0x18, 0x219E, 0x21A6, "", fill_nop=True)
     # Shift the magnifier 8 pixels
     rom.patch(0x03, 0x0F68, 0x0F6F, ASM("""
         ldh a, [$F6] ; map room
-        cp  $97 ; check if we are in the maginfier room
+        cp  $97 ; check if we are in the magnifier room
         jp  z, $4F83
     """), fill_nop=True)
     # Something with the photographer
     rom.patch(0x36, 0x0948, 0x0950, "", fill_nop=True)
 
-    if boomerang_option not in {'trade', 'gift'}:  # Boomerang cave is not patched, so adjust it
+    # Boomerang trade guy
+    # if settings.boomerang not in {'trade', 'gift'} or settings.overworld in {'normal', 'nodungeons'}:
+    if settings.tradequest:
+        # Update magnifier checks
         rom.patch(0x19, 0x05EC, ASM("ld a, [wTradeSequenceItem]\ncp $0E\njp nz, $7E61"), ASM("ld a, [wTradeSequenceItem2]\nand $20\njp z, $7E61"))  # show the guy
         rom.patch(0x00, 0x3199, ASM("ld a, [wTradeSequenceItem]\ncp $0E\njr nz, $06"), ASM("ld a, [wTradeSequenceItem2]\nand $20\njr z, $06"))  # load the proper room layout
-        rom.patch(0x19, 0x05F4, 0x05FB, "", fill_nop=True)
+    else:
+        # Monkey bridge patch, always have the bridge there.
+        rom.patch(0x00, 0x333D, ASM("bit 4, e\njr Z, $05"), b"", fill_nop=True)
+        # Always have the boomerang trade guy enabled (magnifier not needed)
+        rom.patch(0x19, 0x05EC, ASM("ld a, [wTradeSequenceItem]\ncp $0E"), ASM("ld a, $0E\ncp $0E"), fill_nop=True)  # show the guy
+        rom.patch(0x00, 0x3199, ASM("ld a, [wTradeSequenceItem]\ncp $0E"), ASM("ld a, $0E\ncp $0E"), fill_nop=True)  # load the proper room layout
+    rom.patch(0x19, 0x05F4, ASM("ld a, [wTradeSequenceItem2]\nand a"), ASM("xor a"), fill_nop=True)
 
 
 def patchInventoryMenu(rom):
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index c5dcc080537c..6c0b866b5071 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -58,7 +58,7 @@ class TextShuffle(DefaultOffToggle):
 class Rooster(DefaultOnToggle, LADXROption):
     """
     [On] Adds the rooster to the item pool. 
-    [Off] The rooster spot is still a check giving an item. But you will never find the rooster. Any rooster spot is accessible without rooster by other means.
+    [Off] The rooster spot is still a check giving an item. But you will never find the rooster. In that case, any rooster spot is accessible without rooster by other means.
     """
     display_name = "Rooster"
     ladxr_name = "rooster"

From 7b755408fa41e72b4ecf0f1e9029fe0c21ab85ee Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Sat, 30 Nov 2024 20:00:06 -0800
Subject: [PATCH 117/381] DS3: Clarify location names for Yoel and Yuria items
 (#3881)

* DS3: Clarify location names for Yoel and Yuria items

* Fix encodings for `detailed_location_descriptions.py`

* Fix one more typo
---
 worlds/dark_souls_3/Bosses.py                 |  8 ++--
 worlds/dark_souls_3/Locations.py              | 28 +++++------
 .../detailed_location_descriptions.py         |  6 ++-
 worlds/dark_souls_3/docs/locations_en.md      | 48 +++++++++----------
 4 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/worlds/dark_souls_3/Bosses.py b/worlds/dark_souls_3/Bosses.py
index fac7d913c338..ce2ba5d1700e 100644
--- a/worlds/dark_souls_3/Bosses.py
+++ b/worlds/dark_souls_3/Bosses.py
@@ -253,10 +253,10 @@ class DS3BossInfo:
     }),
     DS3BossInfo("Lords of Cinder", 4100800, locations = {
         "KFF: Soul of the Lords",
-        "FS: Billed Mask - Yuria after killing KFF boss",
-        "FS: Black Dress - Yuria after killing KFF boss",
-        "FS: Black Gauntlets - Yuria after killing KFF boss",
-        "FS: Black Leggings - Yuria after killing KFF boss"
+        "FS: Billed Mask - shop after killing Yuria",
+        "FS: Black Dress - shop after killing Yuria",
+        "FS: Black Gauntlets - shop after killing Yuria",
+        "FS: Black Leggings - shop after killing Yuria"
     }),
 ]
 
diff --git a/worlds/dark_souls_3/Locations.py b/worlds/dark_souls_3/Locations.py
index 08f4b7cd1a80..cc202c76e8be 100644
--- a/worlds/dark_souls_3/Locations.py
+++ b/worlds/dark_souls_3/Locations.py
@@ -764,29 +764,29 @@ def __init__(
         DS3LocationData("US -> RS", None),
 
         # Yoel/Yuria of Londor
-        DS3LocationData("FS: Soul Arrow - Yoel/Yuria", "Soul Arrow",
+        DS3LocationData("FS: Soul Arrow - Yoel/Yuria shop", "Soul Arrow",
                         static='99,0:-1:50000,110000,70000116:', missable=True, npc=True,
                         shop=True),
-        DS3LocationData("FS: Heavy Soul Arrow - Yoel/Yuria", "Heavy Soul Arrow",
+        DS3LocationData("FS: Heavy Soul Arrow - Yoel/Yuria shop", "Heavy Soul Arrow",
                         static='99,0:-1:50000,110000,70000116:',
                         missable=True, npc=True, shop=True),
-        DS3LocationData("FS: Magic Weapon - Yoel/Yuria", "Magic Weapon",
+        DS3LocationData("FS: Magic Weapon - Yoel/Yuria shop", "Magic Weapon",
                         static='99,0:-1:50000,110000,70000116:', missable=True, npc=True,
                         shop=True),
-        DS3LocationData("FS: Magic Shield - Yoel/Yuria", "Magic Shield",
+        DS3LocationData("FS: Magic Shield - Yoel/Yuria shop", "Magic Shield",
                         static='99,0:-1:50000,110000,70000116:', missable=True, npc=True,
                         shop=True),
-        DS3LocationData("FS: Soul Greatsword - Yoel/Yuria", "Soul Greatsword",
+        DS3LocationData("FS: Soul Greatsword - Yoel/Yuria shop", "Soul Greatsword",
                         static='99,0:-1:50000,110000,70000450,70000475:', missable=True,
                         npc=True, shop=True),
-        DS3LocationData("FS: Dark Hand - Yoel/Yuria", "Dark Hand", missable=True, npc=True),
-        DS3LocationData("FS: Untrue White Ring - Yoel/Yuria", "Untrue White Ring", missable=True,
+        DS3LocationData("FS: Dark Hand - Yuria shop", "Dark Hand", missable=True, npc=True),
+        DS3LocationData("FS: Untrue White Ring - Yuria shop", "Untrue White Ring", missable=True,
                         npc=True),
-        DS3LocationData("FS: Untrue Dark Ring - Yoel/Yuria", "Untrue Dark Ring", missable=True,
+        DS3LocationData("FS: Untrue Dark Ring - Yuria shop", "Untrue Dark Ring", missable=True,
                         npc=True),
-        DS3LocationData("FS: Londor Braille Divine Tome - Yoel/Yuria", "Londor Braille Divine Tome",
+        DS3LocationData("FS: Londor Braille Divine Tome - Yuria shop", "Londor Braille Divine Tome",
                         static='99,0:-1:40000,110000,70000116:', missable=True, npc=True),
-        DS3LocationData("FS: Darkdrift - Yoel/Yuria", "Darkdrift", missable=True, drop=True,
+        DS3LocationData("FS: Darkdrift - kill Yuria", "Darkdrift", missable=True, drop=True,
                         npc=True),  # kill her or kill Soul of Cinder
 
         # Cornyx of the Great Swamp
@@ -2476,13 +2476,13 @@ def __init__(
                         "Firelink Leggings", boss=True, shop=True),
 
         # Yuria (quest, after Soul of Cinder)
-        DS3LocationData("FS: Billed Mask - Yuria after killing KFF boss", "Billed Mask",
+        DS3LocationData("FS: Billed Mask - shop after killing Yuria", "Billed Mask",
                         missable=True, npc=True),
-        DS3LocationData("FS: Black Dress - Yuria after killing KFF boss", "Black Dress",
+        DS3LocationData("FS: Black Dress - shop after killing Yuria", "Black Dress",
                         missable=True, npc=True),
-        DS3LocationData("FS: Black Gauntlets - Yuria after killing KFF boss", "Black Gauntlets",
+        DS3LocationData("FS: Black Gauntlets - shop after killing Yuria", "Black Gauntlets",
                         missable=True, npc=True),
-        DS3LocationData("FS: Black Leggings - Yuria after killing KFF boss", "Black Leggings",
+        DS3LocationData("FS: Black Leggings - shop after killing Yuria", "Black Leggings",
                         missable=True, npc=True),
     ],
 
diff --git a/worlds/dark_souls_3/detailed_location_descriptions.py b/worlds/dark_souls_3/detailed_location_descriptions.py
index e20c700ab1bc..6e6cf1eb0bc8 100644
--- a/worlds/dark_souls_3/detailed_location_descriptions.py
+++ b/worlds/dark_souls_3/detailed_location_descriptions.py
@@ -84,7 +84,11 @@
         table += f"<tr><td>{html.escape(name)}</td><td>{html.escape(description)}</td></tr>\n"
     table += "</table>\n"
 
-    with open(os.path.join(os.path.dirname(__file__), 'docs/locations_en.md'), 'r+') as f:
+    with open(
+        os.path.join(os.path.dirname(__file__), 'docs/locations_en.md'),
+        'r+',
+        encoding='utf-8'
+    ) as f:
         original = f.read()
         start_flag = "<!-- begin location table -->\n"
         start = original.index(start_flag) + len(start_flag)
diff --git a/worlds/dark_souls_3/docs/locations_en.md b/worlds/dark_souls_3/docs/locations_en.md
index ef07b84b2b34..8411b8c42aa0 100644
--- a/worlds/dark_souls_3/docs/locations_en.md
+++ b/worlds/dark_souls_3/docs/locations_en.md
@@ -1020,7 +1020,7 @@ static _Dark Souls III_ randomizer].
 <tr><td>CKG: Drakeblood Helm - tomb, after killing AP mausoleum NPC</td><td>On the Drakeblood Knight after Oceiros fight, after defeating the Drakeblood Knight from the Serpent-Man Summoner</td></tr>
 <tr><td>CKG: Drakeblood Leggings - tomb, after killing AP mausoleum NPC</td><td>On the Drakeblood Knight after Oceiros fight, after defeating the Drakeblood Knight from the Serpent-Man Summoner</td></tr>
 <tr><td>CKG: Estus Shard - balcony</td><td>From the middle level of the first Consumed King&#x27;s Gardens elevator, out the balcony and to the right</td></tr>
-<tr><td>CKG: Human Pine Resin - by lone stairway bottom</td><td>On the right side of the garden, following the wall past the entrance to the shortcut elevator building, in a toxic pool</td></tr>
+<tr><td>CKG: Human Pine Resin - pool by lift</td><td>On the right side of the garden, following the wall past the entrance to the shortcut elevator building, in a toxic pool</td></tr>
 <tr><td>CKG: Human Pine Resin - toxic pool, past rotunda</td><td>In between two platforms near the middle of the garden, by a tree in a toxic pool</td></tr>
 <tr><td>CKG: Magic Stoneplate Ring - mob drop before boss</td><td>Dropped by the Cathedral Knight closest to the Oceiros fog gate</td></tr>
 <tr><td>CKG: Ring of Sacrifice - under balcony</td><td>Along the right wall of the garden, next to the first elevator building</td></tr>
@@ -1181,16 +1181,18 @@ static _Dark Souls III_ randomizer].
 <tr><td>FS: Alluring Skull - Mortician&#x27;s Ashes</td><td>Sold by Handmaid after giving Mortician&#x27;s Ashes</td></tr>
 <tr><td>FS: Arstor&#x27;s Spear - Ludleth for Greatwood</td><td>Boss weapon for Curse-Rotted Greatwood</td></tr>
 <tr><td>FS: Aural Decoy - Orbeck</td><td>Sold by Orbeck</td></tr>
-<tr><td>FS: Billed Mask - Yuria after killing KFF boss</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
-<tr><td>FS: Black Dress - Yuria after killing KFF boss</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
+<tr><td>FS: Billed Mask - shop after killing Yuria</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
+<tr><td>FS: Black Dress - shop after killing Yuria</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
 <tr><td>FS: Black Fire Orb - Karla for Grave Warden Tome</td><td>Sold by Karla after giving her the Grave Warden Pyromancy Tome</td></tr>
 <tr><td>FS: Black Flame - Karla for Grave Warden Tome</td><td>Sold by Karla after giving her the Grave Warden Pyromancy Tome</td></tr>
-<tr><td>FS: Black Gauntlets - Yuria after killing KFF boss</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
+<tr><td>FS: Black Gauntlets - shop after killing Yuria</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
+<tr><td>FS: Black Hand Armor - shop after killing GA NPC</td><td>Sold by Handmaid after killing Black Hand Kumai</td></tr>
+<tr><td>FS: Black Hand Hat - shop after killing GA NPC</td><td>Sold by Handmaid after killing Black Hand Kumai</td></tr>
 <tr><td>FS: Black Iron Armor - shop after killing Tsorig</td><td>Sold by Handmaid after killing Knight Slayer Tsorig in Smouldering Lake</td></tr>
 <tr><td>FS: Black Iron Gauntlets - shop after killing Tsorig</td><td>Sold by Handmaid after killing Knight Slayer Tsorig in Smouldering Lake</td></tr>
 <tr><td>FS: Black Iron Helm - shop after killing Tsorig</td><td>Sold by Handmaid after killing Knight Slayer Tsorig in Smouldering Lake</td></tr>
 <tr><td>FS: Black Iron Leggings - shop after killing Tsorig</td><td>Sold by Handmaid after killing Knight Slayer Tsorig in Smouldering Lake</td></tr>
-<tr><td>FS: Black Leggings - Yuria after killing KFF boss</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
+<tr><td>FS: Black Leggings - shop after killing Yuria</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
 <tr><td>FS: Black Serpent - Ludleth for Wolnir</td><td>Boss weapon for High Lord Wolnir</td></tr>
 <tr><td>FS: Blessed Weapon - Irina for Tome of Lothric</td><td>Sold by Irina after giving her the Braille Divine Tome of Lothric</td></tr>
 <tr><td>FS: Blue Tearstone Ring - Greirat</td><td>Given by Greirat upon rescuing him from the High Wall cell</td></tr>
@@ -1220,8 +1222,8 @@ static _Dark Souls III_ randomizer].
 <tr><td>FS: Dancer&#x27;s Leggings - shop after killing LC entry boss</td><td>Sold by Handmaid after defeating Dancer of the Boreal Valley</td></tr>
 <tr><td>FS: Dark Blade - Karla for Londor Tome</td><td>Sold by Irina or Karla after giving one the Londor Braille Divine Tome</td></tr>
 <tr><td>FS: Dark Edge - Karla</td><td>Sold by Karla after recruiting her, or in her ashes</td></tr>
-<tr><td>FS: Dark Hand - Yoel/Yuria</td><td>Sold by Yuria</td></tr>
-<tr><td>FS: Darkdrift - Yoel/Yuria</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
+<tr><td>FS: Dark Hand - Yuria shop</td><td>Sold by Yuria</td></tr>
+<tr><td>FS: Darkdrift - kill Yuria</td><td>Dropped by Yuria upon death or quest completion.</td></tr>
 <tr><td>FS: Darkmoon Longbow - Ludleth for Aldrich</td><td>Boss weapon for Aldrich</td></tr>
 <tr><td>FS: Dead Again - Karla for Londor Tome</td><td>Sold by Irina or Karla after giving one the Londor Braille Divine Tome</td></tr>
 <tr><td>FS: Deep Protection - Karla for Deep Braille Tome</td><td>Sold by Irina or Karla after giving one the Deep Braille Divine Tome</td></tr>
@@ -1264,6 +1266,9 @@ static _Dark Souls III_ randomizer].
 <tr><td>FS: Exile Gauntlets - shop after killing NPCs in RS</td><td>Sold by Handmaid after killing the exiles just before Farron Keep</td></tr>
 <tr><td>FS: Exile Leggings - shop after killing NPCs in RS</td><td>Sold by Handmaid after killing the exiles just before Farron Keep</td></tr>
 <tr><td>FS: Exile Mask - shop after killing NPCs in RS</td><td>Sold by Handmaid after killing the exiles just before Farron Keep</td></tr>
+<tr><td>FS: Faraam Armor - shop after killing GA NPC</td><td>Sold by Handmaid after killing Lion Knight Albert</td></tr>
+<tr><td>FS: Faraam Boots - shop after killing GA NPC</td><td>Sold by Handmaid after killing Lion Knight Albert</td></tr>
+<tr><td>FS: Faraam Gauntlets - shop after killing GA NPC</td><td>Sold by Handmaid after killing Lion Knight Albert</td></tr>
 <tr><td>FS: Faraam Helm - shop after killing GA NPC</td><td>Sold by Handmaid after killing Lion Knight Albert</td></tr>
 <tr><td>FS: Farron Dart - Orbeck</td><td>Sold by Orbeck</td></tr>
 <tr><td>FS: Farron Dart - shop</td><td>Sold by Handmaid</td></tr>
@@ -1308,7 +1313,7 @@ static _Dark Souls III_ randomizer].
 <tr><td>FS: Heal - Irina</td><td>Sold by Irina after recruiting her, or in her ashes</td></tr>
 <tr><td>FS: Heal Aid - shop</td><td>Sold by Handmaid</td></tr>
 <tr><td>FS: Heavy Soul Arrow - Orbeck</td><td>Sold by Orbeck</td></tr>
-<tr><td>FS: Heavy Soul Arrow - Yoel/Yuria</td><td>Sold by Yoel/Yuria</td></tr>
+<tr><td>FS: Heavy Soul Arrow - Yoel/Yuria shop</td><td>Sold by Yoel/Yuria</td></tr>
 <tr><td>FS: Helm of Favor - shop after killing water reserve minibosses</td><td>Sold by Handmaid after killing Sulyvahn&#x27;s Beasts in Water Reserve</td></tr>
 <tr><td>FS: Hidden Blessing - Dreamchaser&#x27;s Ashes</td><td>Sold by Greirat after pillaging Irithyll</td></tr>
 <tr><td>FS: Hidden Blessing - Greirat from IBV</td><td>Sold by Greirat after pillaging Irithyll</td></tr>
@@ -1338,7 +1343,7 @@ static _Dark Souls III_ randomizer].
 <tr><td>FS: Lift Chamber Key - Leonhard</td><td>Given by Ringfinger Leonhard after acquiring a Pale Tongue.</td></tr>
 <tr><td>FS: Lightning Storm - Ludleth for Nameless</td><td>Boss weapon for Nameless King</td></tr>
 <tr><td>FS: Lloyd&#x27;s Shield Ring - Paladin&#x27;s Ashes</td><td>Sold by Handmaid after giving Paladin&#x27;s Ashes</td></tr>
-<tr><td>FS: Londor Braille Divine Tome - Yoel/Yuria</td><td>Sold by Yuria</td></tr>
+<tr><td>FS: Londor Braille Divine Tome - Yuria shop</td><td>Sold by Yuria</td></tr>
 <tr><td>FS: Lorian&#x27;s Armor - shop after killing GA boss</td><td>Sold by Handmaid after defeating Lothric, Younger Prince</td></tr>
 <tr><td>FS: Lorian&#x27;s Gauntlets - shop after killing GA boss</td><td>Sold by Handmaid after defeating Lothric, Younger Prince</td></tr>
 <tr><td>FS: Lorian&#x27;s Greatsword - Ludleth for Princes</td><td>Boss weapon for Twin Princes</td></tr>
@@ -1347,9 +1352,9 @@ static _Dark Souls III_ randomizer].
 <tr><td>FS: Lothric&#x27;s Holy Sword - Ludleth for Princes</td><td>Boss weapon for Twin Princes</td></tr>
 <tr><td>FS: Magic Barrier - Irina for Tome of Lothric</td><td>Sold by Irina after giving her the Braille Divine Tome of Lothric</td></tr>
 <tr><td>FS: Magic Shield - Orbeck</td><td>Sold by Orbeck</td></tr>
-<tr><td>FS: Magic Shield - Yoel/Yuria</td><td>Sold by Yoel/Yuria</td></tr>
+<tr><td>FS: Magic Shield - Yoel/Yuria shop</td><td>Sold by Yoel/Yuria</td></tr>
 <tr><td>FS: Magic Weapon - Orbeck</td><td>Sold by Orbeck</td></tr>
-<tr><td>FS: Magic Weapon - Yoel/Yuria</td><td>Sold by Yoel/Yuria</td></tr>
+<tr><td>FS: Magic Weapon - Yoel/Yuria shop</td><td>Sold by Yoel/Yuria</td></tr>
 <tr><td>FS: Mail Breaker - Sirris for killing Creighton</td><td>Given by Sirris talking to her in Firelink Shrine after invading and vanquishing Creighton.</td></tr>
 <tr><td>FS: Master&#x27;s Attire - NPC drop</td><td>Dropped by Sword Master</td></tr>
 <tr><td>FS: Master&#x27;s Gloves - NPC drop</td><td>Dropped by Sword Master</td></tr>
@@ -1401,10 +1406,10 @@ static _Dark Souls III_ randomizer].
 <tr><td>FS: Sneering Mask - Yoel&#x27;s room, kill Londor Pale Shade twice</td><td>In Yoel/Yuria&#x27;s area after defeating both Londor Pale Shade invasions</td></tr>
 <tr><td>FS: Soothing Sunlight - Ludleth for Dancer</td><td>Boss weapon for Dancer of the Boreal Valley</td></tr>
 <tr><td>FS: Soul Arrow - Orbeck</td><td>Sold by Orbeck</td></tr>
-<tr><td>FS: Soul Arrow - Yoel/Yuria</td><td>Sold by Yoel/Yuria</td></tr>
+<tr><td>FS: Soul Arrow - Yoel/Yuria shop</td><td>Sold by Yoel/Yuria</td></tr>
 <tr><td>FS: Soul Arrow - shop</td><td>Sold by Handmaid</td></tr>
 <tr><td>FS: Soul Greatsword - Orbeck</td><td>Sold by Orbeck</td></tr>
-<tr><td>FS: Soul Greatsword - Yoel/Yuria</td><td>Sold by Yoel/Yuria after using Draw Out True Strength</td></tr>
+<tr><td>FS: Soul Greatsword - Yoel/Yuria shop</td><td>Sold by Yoel/Yuria after using Draw Out True Strength</td></tr>
 <tr><td>FS: Soul Spear - Orbeck for Logan&#x27;s Scroll</td><td>Sold by Orbeck after giving him Logan&#x27;s Scroll</td></tr>
 <tr><td>FS: Soul of a Deserted Corpse - bell tower door</td><td>Next to the door requiring the Tower Key</td></tr>
 <tr><td>FS: Spook - Orbeck</td><td>Sold by Orbeck</td></tr>
@@ -1427,8 +1432,8 @@ static _Dark Souls III_ randomizer].
 <tr><td>FS: Undead Legion Gauntlet - shop after killing FK boss</td><td>Sold by Handmaid after defeating Abyss Watchers</td></tr>
 <tr><td>FS: Undead Legion Helm - shop after killing FK boss</td><td>Sold by Handmaid after defeating Abyss Watchers</td></tr>
 <tr><td>FS: Undead Legion Leggings - shop after killing FK boss</td><td>Sold by Handmaid after defeating Abyss Watchers</td></tr>
-<tr><td>FS: Untrue Dark Ring - Yoel/Yuria</td><td>Sold by Yuria</td></tr>
-<tr><td>FS: Untrue White Ring - Yoel/Yuria</td><td>Sold by Yuria</td></tr>
+<tr><td>FS: Untrue Dark Ring - Yuria shop</td><td>Sold by Yuria</td></tr>
+<tr><td>FS: Untrue White Ring - Yuria shop</td><td>Sold by Yuria</td></tr>
 <tr><td>FS: Vordt&#x27;s Great Hammer - Ludleth for Vordt</td><td>Boss weapon for Vordt of the Boreal Valley</td></tr>
 <tr><td>FS: Vow of Silence - Karla for Londor Tome</td><td>Sold by Irina or Karla after giving one the Londor Braille Divine Tome</td></tr>
 <tr><td>FS: Washing Pole - Easterner&#x27;s Ashes</td><td>Sold by Handmaid after giving Easterner&#x27;s Ashes</td></tr>
@@ -1477,8 +1482,6 @@ static _Dark Souls III_ randomizer].
 <tr><td>FSBT: Twinkling Titanite - lizard behind Firelink</td><td>Dropped by the Crystal Lizard behind Firelink Shrine. Can be accessed with tree jump by going all the way around the roof, left of the entrance to the rafters, or alternatively dropping down from the Bell Tower.</td></tr>
 <tr><td>FSBT: Very good! Carving - crow for Divine Blessing</td><td>Trade Divine Blessing with crow</td></tr>
 <tr><td>GA: Avelyn - 1F, drop from 3F onto bookshelves</td><td>On top of a bookshelf on the Archive first floor, accessible by going halfway up the stairs to the third floor, dropping down past the Grand Archives Scholar, and then dropping down again</td></tr>
-<tr><td>GA: Black Hand Armor - shop after killing GA NPC</td><td>Sold by Handmaid after killing Black Hand Kumai</td></tr>
-<tr><td>GA: Black Hand Hat - shop after killing GA NPC</td><td>Sold by Handmaid after killing Black Hand Kumai</td></tr>
 <tr><td>GA: Blessed Gem - rafters</td><td>On the rafters high above the Archives, can be accessed by dropping down from the Winged Knight roof area</td></tr>
 <tr><td>GA: Chaos Gem - dark room, lizard</td><td>Dropped by a Crystal Lizard on the Archives first floor in the dark room past the large wax pool</td></tr>
 <tr><td>GA: Cinders of a Lord - Lothric Prince</td><td>Dropped by Twin Princes</td></tr>
@@ -1489,9 +1492,6 @@ static _Dark Souls III_ randomizer].
 <tr><td>GA: Divine Pillars of Light - cage above rafters</td><td>In a cage above the rafters high above the Archives, can be accessed by dropping down from the Winged Knight roof area</td></tr>
 <tr><td>GA: Ember - 5F, by entrance</td><td>On a balcony high in the Archives overlooking the area with the Grand Archives Scholars with a shortcut ladder, on the opposite side from the wax pool</td></tr>
 <tr><td>GA: Estus Shard - dome, far balcony</td><td>On the Archives roof near the three Winged Knights, in a side area overlooking the ocean.</td></tr>
-<tr><td>GA: Faraam Armor - shop after killing GA NPC</td><td>Sold by Handmaid after killing Lion Knight Albert</td></tr>
-<tr><td>GA: Faraam Boots - shop after killing GA NPC</td><td>Sold by Handmaid after killing Lion Knight Albert</td></tr>
-<tr><td>GA: Faraam Gauntlets - shop after killing GA NPC</td><td>Sold by Handmaid after killing Lion Knight Albert</td></tr>
 <tr><td>GA: Fleshbite Ring - up stairs from 4F</td><td>From the first shortcut elevator with the movable bookshelf, past the Scholars right before going outside onto the roof, in an alcove to the right with many Clawed Curse bookshelves</td></tr>
 <tr><td>GA: Golden Wing Crest Shield - outside 5F, NPC drop</td><td>Dropped by Lion Knight Albert before the stairs leading up to Twin Princes</td></tr>
 <tr><td>GA: Heavy Gem - rooftops, lizard</td><td>Dropped by one of the pair of Crystal Lizards, on the right side, found going up a slope past the gargoyle on the Archives roof</td></tr>
@@ -1525,15 +1525,15 @@ static _Dark Souls III_ randomizer].
 <tr><td>GA: Titanite Chunk - 2F, by wax pool</td><td>Up the stairs from the Archives second floor on the right side from the entrance, in a corner near the small wax pool</td></tr>
 <tr><td>GA: Titanite Chunk - 2F, right after dark room</td><td>Exiting from the dark room with the Crystal Lizards on the first floor onto the second floor main room, then taking an immediate right</td></tr>
 <tr><td>GA: Titanite Chunk - 5F, far balcony</td><td>On a balcony outside where Lothric Knight stands on the top floor of the Archives, accessing by going right from the final wax pool or by dropping down from the gargoyle area</td></tr>
-<tr><td>GA: Titanite Chunk - rooftops, balcony</td><td>Going onto the roof and down the first ladder, all the way down the ledge facing the ocean to the right</td></tr>
 <tr><td>GA: Titanite Chunk - rooftops lower, ledge by buttress</td><td>Going onto the roof and down the first ladder, dropping down on either side from the ledge facing the ocean, on a roof ledge to the right</td></tr>
+<tr><td>GA: Titanite Chunk - rooftops, balcony</td><td>Going onto the roof and down the first ladder, all the way down the ledge facing the ocean to the right</td></tr>
 <tr><td>GA: Titanite Chunk - rooftops, just before 5F</td><td>On the Archives roof, after a short dropdown, in the small area where the two Gargoyles attack you</td></tr>
 <tr><td>GA: Titanite Scale - 1F, drop from 2F late onto bookshelves, lizard</td><td>Dropped by a Crystal Lizard on first floor bookshelves. Can be accessed by dropping down to the left at the end of the bridge which is the Crystal Sage&#x27;s final location</td></tr>
 <tr><td>GA: Titanite Scale - 1F, up stairs on bookshelf</td><td>On the Archives first floor, up a movable set of stairs near the large wax pool, on top of a bookshelf</td></tr>
 <tr><td>GA: Titanite Scale - 2F, titanite scale atop bookshelf</td><td>On top of a bookshelf on the Archive second floor, accessible by going halfway up the stairs to the third floor and dropping down near a Grand Archives Scholar</td></tr>
 <tr><td>GA: Titanite Scale - 3F, by ladder to 2F late</td><td>Going from the Crystal Sage&#x27;s location on the third floor to its location on the bridge, on the left side of the ladder you descend, behind a table</td></tr>
 <tr><td>GA: Titanite Scale - 3F, corner up stairs</td><td>From the Grand Archives third floor up past the thralls, in a corner with bookshelves to the left</td></tr>
-<tr><td>GA: Titanite Scale - 5F, chest by exit</td><td>In a chest after the first elevator shortcut with the movable bookshelf, in the area with the Grand Archives Scholars, to the left of the stairwell leading up to the roof</td></tr>
+<tr><td>GA: Titanite Scale - 4F, chest by exit</td><td>In a chest after the first elevator shortcut with the movable bookshelf, in the area with the Grand Archives Scholars, to the left of the stairwell leading up to the roof</td></tr>
 <tr><td>GA: Titanite Scale - dark room, upstairs</td><td>Right after going up the stairs to the Archives second floor, on the left guarded by a Grand Archives Scholar and a sequence of Clawed Curse bookshelves</td></tr>
 <tr><td>GA: Titanite Scale - rooftops lower, path to 2F</td><td>Going onto the roof and down the first ladder, dropping down on either side from the ledge facing the ocean, then going past the corvians all the way to the left and making a jump</td></tr>
 <tr><td>GA: Titanite Slab - 1F, after pulling 2F switch</td><td>In a chest on the Archives first floor, behind a bookshelf moved by pulling a lever in the middle of the second floor between two cursed bookshelves</td></tr>
@@ -1633,7 +1633,7 @@ static _Dark Souls III_ randomizer].
 <tr><td>IBV: Large Soul of a Nameless Soldier - central, by bonfire</td><td>By the Central Irithyll bonfire</td></tr>
 <tr><td>IBV: Large Soul of a Nameless Soldier - central, by second fountain</td><td>Next to the fountain up the stairs from the Central Irithyll bonfire</td></tr>
 <tr><td>IBV: Large Soul of a Nameless Soldier - lake island</td><td>On an island in the lake leading to the Distant Manor bonfire</td></tr>
-<tr><td>IBV: Large Soul of a Nameless Soldier - stairs to plaza</td><td>On the path from Central Irithyll bonfire, before making the left toward Church of Yorshka</td></tr>
+<tr><td>IBV: Large Soul of a Nameless Soldier - path to plaza</td><td>On the path from Central Irithyll bonfire, before making the left toward Church of Yorshka</td></tr>
 <tr><td>IBV: Large Titanite Shard - Distant Manor, under overhang</td><td>Under overhang next to second set of stairs leading from Distant Manor bonfire</td></tr>
 <tr><td>IBV: Large Titanite Shard - ascent, by elevator door</td><td>On the path from the sewer leading up to Pontiff&#x27;s cathedral, to the right of the statue surrounded by dogs</td></tr>
 <tr><td>IBV: Large Titanite Shard - ascent, down ladder in last building</td><td>Outside the final building before Pontiff&#x27;s cathedral, coming from the sewer, dropping down to the left before the entrance</td></tr>
@@ -1701,7 +1701,7 @@ static _Dark Souls III_ randomizer].
 <tr><td>ID: Large Titanite Shard - B1 far, rightmost cell</td><td>In a cell on the far end of the top corridor opposite to the bonfire in Irithyll Dungeon, nearby the Jailer</td></tr>
 <tr><td>ID: Large Titanite Shard - B1 near, by door</td><td>At the end of the top corridor on the bonfire side in Irithyll Dungeon, before the Jailbreaker&#x27;s Key door</td></tr>
 <tr><td>ID: Large Titanite Shard - B3 near, right corner</td><td>In the main Jailer cell block, to the left of the hallway leading to the Path of the Dragon area</td></tr>
-<tr><td>ID: Large Titanite Shard - after bonfire, second cell on right</td><td>In the second cell on the right after Irithyll Dungeon bonfire</td></tr>
+<tr><td>ID: Large Titanite Shard - after bonfire, second cell on left</td><td>In the second cell on the right after Irithyll Dungeon bonfire</td></tr>
 <tr><td>ID: Large Titanite Shard - pit #1</td><td>On the floor where the Giant Slave is standing</td></tr>
 <tr><td>ID: Large Titanite Shard - pit #2</td><td>On the floor where the Giant Slave is standing</td></tr>
 <tr><td>ID: Lightning Blade - B3 lift, middle platform</td><td>On the middle platform riding the elevator up from the Path of the Dragon area</td></tr>

From 62ce42440b703fba2ba544604f51690f388b7f33 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Sat, 30 Nov 2024 23:03:13 -0500
Subject: [PATCH 118/381] Super Metroid: KeyError on invalid item name #4222

---
 worlds/sm/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/worlds/sm/__init__.py b/worlds/sm/__init__.py
index bf9d6d087edd..160b7e4ec78b 100644
--- a/worlds/sm/__init__.py
+++ b/worlds/sm/__init__.py
@@ -313,9 +313,11 @@ def remove(self, state: CollectionState, item: Item) -> bool:
         return super(SMWorld, self).remove(state, item)
 
     def create_item(self, name: str) -> Item:
-        item = next(x for x in ItemManager.Items.values() if x.Name == name)
-        return SMItem(item.Name, ItemClassification.progression if item.Class != 'Minor' else ItemClassification.filler, item.Type, self.item_name_to_id[item.Name],
+        item = next((x for x in ItemManager.Items.values() if x.Name == name), None)
+        if item:
+            return SMItem(item.Name, ItemClassification.progression if item.Class != 'Minor' else ItemClassification.filler, item.Type, self.item_name_to_id[item.Name],
                       player=self.player)
+        raise KeyError(f"Item {name} for {self.player_name} is invalid.")
 
     def get_filler_item_name(self) -> str:
         if self.multiworld.random.randint(0, 100) < self.options.minor_qty.value:

From 284e7797c5523180968016728790bf5128315c61 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Sat, 30 Nov 2024 23:10:43 -0500
Subject: [PATCH 119/381] Adventure: create_item AttributeError -> KeyError
 #4219

---
 worlds/adventure/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/adventure/__init__.py b/worlds/adventure/__init__.py
index ed5ebbd3dc56..4fde1482cfe1 100644
--- a/worlds/adventure/__init__.py
+++ b/worlds/adventure/__init__.py
@@ -446,7 +446,7 @@ def generate_output(self, output_directory: str) -> None:
     # end of ordered Main.py calls
 
     def create_item(self, name: str) -> Item:
-        item_data: ItemData = item_table.get(name)
+        item_data: ItemData = item_table[name]
         return AdventureItem(name, item_data.classification, item_data.id, self.player)
 
     def create_event(self, name: str, classification: ItemClassification) -> Item:

From 17b3ee6eaf326249c477b20ae976794817efc3ee Mon Sep 17 00:00:00 2001
From: Benjamin S Wolf <jokeserver@gmail.com>
Date: Sat, 30 Nov 2024 20:18:00 -0800
Subject: [PATCH 120/381] Core: warn if a yaml is empty (#4117)

* Core: warn if a yaml is empty

* WebHost: ignore empty yaml

Generate: log which yaml documents are empty

* Actually remove empty yamls from weight_cache

* More verbose variable name

---------

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 Generate.py         | 9 ++++++++-
 WebHostLib/check.py | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Generate.py b/Generate.py
index 8aba72abafe9..35c39627b139 100644
--- a/Generate.py
+++ b/Generate.py
@@ -114,7 +114,14 @@ def main(args=None) -> Tuple[argparse.Namespace, int]:
                 os.path.join(args.player_files_path, fname) not in {args.meta_file_path, args.weights_file_path}:
             path = os.path.join(args.player_files_path, fname)
             try:
-                weights_cache[fname] = read_weights_yamls(path)
+                weights_for_file = []
+                for doc_idx, yaml in enumerate(read_weights_yamls(path)):
+                    if yaml is None:
+                        logging.warning(f"Ignoring empty yaml document #{doc_idx + 1} in {fname}")
+                    else:
+                        weights_for_file.append(yaml)
+                weights_cache[fname] = tuple(weights_for_file)
+                        
             except Exception as e:
                 raise ValueError(f"File {fname} is invalid. Please fix your yaml.") from e
 
diff --git a/WebHostLib/check.py b/WebHostLib/check.py
index 97cb797f7a56..4e0cf1178f4b 100644
--- a/WebHostLib/check.py
+++ b/WebHostLib/check.py
@@ -105,8 +105,9 @@ def roll_options(options: Dict[str, Union[dict, str]],
                                                              plando_options=plando_options)
                 else:
                     for i, yaml_data in enumerate(yaml_datas):
-                        rolled_results[f"{filename}/{i + 1}"] = roll_settings(yaml_data,
-                                                                              plando_options=plando_options)
+                        if yaml_data is not None:
+                            rolled_results[f"{filename}/{i + 1}"] = roll_settings(yaml_data,
+                                                                                  plando_options=plando_options)
             except Exception as e:
                 if e.__cause__:
                     results[filename] = f"Failed to generate options in {filename}: {e} - {e.__cause__}"

From ecc3094c70b3ee1f3e18d9299c03198564ec261a Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun, 1 Dec 2024 08:33:43 +0100
Subject: [PATCH 121/381] Launcher: launch without delay on URI without choice
 (#4279)

---
 Launcher.py | 58 +++++++++++++++++------------------------------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index 0b8be232170d..22c0944ab1a4 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -126,12 +126,13 @@ def handle_uri(path: str, launch_args: Tuple[str, ...]) -> None:
         elif component.display_name == "Text Client":
             text_client_component = component
 
-    from kvui import App, Button, BoxLayout, Label, Clock, Window
+    if client_component is None:
+        run_component(text_client_component, *launch_args)
+        return
 
-    class Popup(App):
-        timer_label: Label
-        remaining_time: Optional[int]
+    from kvui import App, Button, BoxLayout, Label, Window
 
+    class Popup(App):
         def __init__(self):
             self.title = "Connect to Multiworld"
             self.icon = r"data/icon.png"
@@ -139,48 +140,25 @@ def __init__(self):
 
         def build(self):
             layout = BoxLayout(orientation="vertical")
+            layout.add_widget(Label(text="Select client to open and connect with."))
+            button_row = BoxLayout(orientation="horizontal", size_hint=(1, 0.4))
 
-            if client_component is None:
-                self.remaining_time = 7
-                label_text = (f"A game client able to parse URIs was not detected for {game}.\n"
-                              f"Launching Text Client in 7 seconds...")
-                self.timer_label = Label(text=label_text)
-                layout.add_widget(self.timer_label)
-                Clock.schedule_interval(self.update_label, 1)
-            else:
-                layout.add_widget(Label(text="Select client to open and connect with."))
-                button_row = BoxLayout(orientation="horizontal", size_hint=(1, 0.4))
-
-                text_client_button = Button(
-                    text=text_client_component.display_name,
-                    on_release=lambda *args: run_component(text_client_component, *launch_args)
-                )
-                button_row.add_widget(text_client_button)
+            text_client_button = Button(
+                text=text_client_component.display_name,
+                on_release=lambda *args: run_component(text_client_component, *launch_args)
+            )
+            button_row.add_widget(text_client_button)
 
-                game_client_button = Button(
-                    text=client_component.display_name,
-                    on_release=lambda *args: run_component(client_component, *launch_args)
-                )
-                button_row.add_widget(game_client_button)
+            game_client_button = Button(
+                text=client_component.display_name,
+                on_release=lambda *args: run_component(client_component, *launch_args)
+            )
+            button_row.add_widget(game_client_button)
 
-                layout.add_widget(button_row)
+            layout.add_widget(button_row)
 
             return layout
 
-        def update_label(self, dt):
-            if self.remaining_time > 1:
-                # countdown the timer and string replace the number
-                self.remaining_time -= 1
-                self.timer_label.text = self.timer_label.text.replace(
-                    str(self.remaining_time + 1), str(self.remaining_time)
-                )
-            else:
-                # our timer is finished so launch text client and close down
-                run_component(text_client_component, *launch_args)
-                Clock.unschedule(self.update_label)
-                App.get_running_app().stop()
-                Window.close()
-
         def _stop(self, *largs):
             # see run_gui Launcher _stop comment for details
             self.root_window.close()

From f26cda07db5cb9046088a6f0c4710071c7bcfc69 Mon Sep 17 00:00:00 2001
From: Emily <35015090+EmilyV99@users.noreply.github.com>
Date: Sun, 1 Dec 2024 09:16:36 -0500
Subject: [PATCH 122/381] Core: Hint Priority fixes (#4315)

* Update hint priority docs

* Update network protocol.md

* Add error on `UpdateHint` trying to change to `HINT_FOUND`

* Update network protocol.md

* fix: precollected hint priority
---
 Main.py                  | 14 +++++++++-----
 MultiServer.py           |  5 +++++
 docs/network protocol.md | 17 +++++++++++------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Main.py b/Main.py
index 3a11181bd99f..d105bd4ad0e5 100644
--- a/Main.py
+++ b/Main.py
@@ -242,6 +242,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
 
             def write_multidata():
                 import NetUtils
+                from NetUtils import HintStatus
                 slot_data = {}
                 client_versions = {}
                 games = {}
@@ -266,10 +267,10 @@ def write_multidata():
                 for slot in multiworld.player_ids:
                     slot_data[slot] = multiworld.worlds[slot].fill_slot_data()
 
-                def precollect_hint(location):
+                def precollect_hint(location: Location, auto_status: HintStatus):
                     entrance = er_hint_data.get(location.player, {}).get(location.address, "")
                     hint = NetUtils.Hint(location.item.player, location.player, location.address,
-                                         location.item.code, False, entrance, location.item.flags, False)
+                                         location.item.code, False, entrance, location.item.flags, auto_status)
                     precollected_hints[location.player].add(hint)
                     if location.item.player not in multiworld.groups:
                         precollected_hints[location.item.player].add(hint)
@@ -288,13 +289,16 @@ def precollect_hint(location):
                             f"{locations_data[location.player][location.address]}")
                         locations_data[location.player][location.address] = \
                             location.item.code, location.item.player, location.item.flags
+                        auto_status = HintStatus.HINT_AVOID if location.item.trap else HintStatus.HINT_PRIORITY
                         if location.name in multiworld.worlds[location.player].options.start_location_hints:
-                            precollect_hint(location)
+                            if not location.item.trap:  # Unspecified status for location hints, except traps
+                                auto_status = HintStatus.HINT_UNSPECIFIED
+                            precollect_hint(location, auto_status)
                         elif location.item.name in multiworld.worlds[location.item.player].options.start_hints:
-                            precollect_hint(location)
+                            precollect_hint(location, auto_status)
                         elif any([location.item.name in multiworld.worlds[player].options.start_hints
                                   for player in multiworld.groups.get(location.item.player, {}).get("players", [])]):
-                            precollect_hint(location)
+                            precollect_hint(location, auto_status)
 
                 # embedded data package
                 data_package = {
diff --git a/MultiServer.py b/MultiServer.py
index 80fcd32fd1e3..2561b0692a3c 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -1929,6 +1929,11 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
                                     [{'cmd': 'InvalidPacket', "type": "arguments",
                                       "text": 'UpdateHint: Invalid Status', "original_cmd": cmd}])
                 return
+            if status == HintStatus.HINT_FOUND:
+                await ctx.send_msgs(client,
+                                    [{'cmd': 'InvalidPacket', "type": "arguments",
+                                      "text": 'UpdateHint: Cannot manually update status to "HINT_FOUND"', "original_cmd": cmd}])
+                return
             new_hint = new_hint.re_prioritize(ctx, status)
             if hint == new_hint:
                 return
diff --git a/docs/network protocol.md b/docs/network protocol.md
index 1c5b2e002289..4331cf971007 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -351,7 +351,7 @@ Sent to the server to update the status of a Hint. The client must be the 'recei
 | ---- | ---- | ----- |
 | player | int | The ID of the player whose location is being hinted for. |
 | location | int | The ID of the location to update the hint for. If no hint exists for this location, the packet is ignored. |
-| status | [HintStatus](#HintStatus) | Optional. If included, sets the status of the hint to this status. |
+| status | [HintStatus](#HintStatus) | Optional. If included, sets the status of the hint to this status. Cannot set `HINT_FOUND`, or change the status from `HINT_FOUND`. |
 
 #### HintStatus
 An enumeration containing the possible hint states.
@@ -359,12 +359,16 @@ An enumeration containing the possible hint states.
 ```python
 import enum
 class HintStatus(enum.IntEnum):
-    HINT_FOUND = 0
-    HINT_UNSPECIFIED = 1
-    HINT_NO_PRIORITY = 10
-    HINT_AVOID = 20
-    HINT_PRIORITY = 30
+    HINT_FOUND = 0        # The location has been collected. Status cannot be changed once found.
+    HINT_UNSPECIFIED = 1  # The receiving player has not specified any status
+    HINT_NO_PRIORITY = 10 # The receiving player has specified that the item is unneeded
+    HINT_AVOID = 20       # The receiving player has specified that the item is detrimental
+    HINT_PRIORITY = 30    # The receiving player has specified that the item is needed
 ```
+- Hints for items with `ItemClassification.trap` default to `HINT_AVOID`.
+- Hints created with `LocationScouts`, `!hint_location`, or similar (hinting a location) default to `HINT_UNSPECIFIED`.
+- Hints created with `!hint` or similar (hinting an item for yourself) default to `HINT_PRIORITY`.
+- Once a hint is collected, its' status is updated to `HINT_FOUND` automatically, and can no longer be changed.
 
 ### StatusUpdate
 Sent to the server to update on the sender's status. Examples include readiness or goal completion. (Example: defeated Ganon in A Link to the Past)
@@ -668,6 +672,7 @@ class Hint(typing.NamedTuple):
     found: bool
     entrance: str = ""
     item_flags: int = 0
+    status: HintStatus = HintStatus.HINT_UNSPECIFIED
 ```
 
 ### Data Package Contents

From b6ab91fe4b5491c1d754aba35885f7b6e1923263 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Mon, 2 Dec 2024 20:50:30 -0500
Subject: [PATCH 123/381] LADX: Remove duplicate Magnifying Lens item (#3684)

* LADX: Magnifying Glass fixes

Removed the duplicate item (Magnifying Lens), and made the real one a filler item.

* Update worlds/ladx/Items.py

Co-authored-by: threeandthreee <alex@3and3.dev>

---------

Co-authored-by: threeandthreee <alex@3and3.dev>
---
 worlds/ladx/Items.py                     | 2 --
 worlds/ladx/LADXR/locations/constants.py | 2 +-
 worlds/ladx/LADXR/locations/items.py     | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/worlds/ladx/Items.py b/worlds/ladx/Items.py
index 1f9358a4f5a6..b9e1eeab3e69 100644
--- a/worlds/ladx/Items.py
+++ b/worlds/ladx/Items.py
@@ -69,7 +69,6 @@ class ItemName:
     BOMB = "Bomb"
     SWORD = "Progressive Sword"
     FLIPPERS = "Flippers"
-    MAGNIFYING_LENS = "Magnifying Lens"
     MEDICINE = "Medicine"
     TAIL_KEY = "Tail Key"
     ANGLER_KEY = "Angler Key"
@@ -191,7 +190,6 @@ class ItemName:
     ItemData(ItemName.BOMB, "BOMB", ItemClassification.progression),
     ItemData(ItemName.SWORD, "SWORD", ItemClassification.progression),
     ItemData(ItemName.FLIPPERS, "FLIPPERS", ItemClassification.progression),
-    ItemData(ItemName.MAGNIFYING_LENS, "MAGNIFYING_LENS", ItemClassification.progression),
     ItemData(ItemName.MEDICINE, "MEDICINE", ItemClassification.useful),
     ItemData(ItemName.TAIL_KEY, "TAIL_KEY", ItemClassification.progression),
     ItemData(ItemName.ANGLER_KEY, "ANGLER_KEY", ItemClassification.progression),
diff --git a/worlds/ladx/LADXR/locations/constants.py b/worlds/ladx/LADXR/locations/constants.py
index 7bb8df5b3515..a0489febc316 100644
--- a/worlds/ladx/LADXR/locations/constants.py
+++ b/worlds/ladx/LADXR/locations/constants.py
@@ -25,7 +25,7 @@
     PEGASUS_BOOTS: 0x05,
     OCARINA: 0x06,
     FEATHER: 0x07, SHOVEL: 0x08, MAGIC_POWDER: 0x09, BOMB: 0x0A, SWORD: 0x0B, FLIPPERS: 0x0C,
-    MAGNIFYING_LENS: 0x0D, MEDICINE: 0x10,
+    MEDICINE: 0x10,
     TAIL_KEY: 0x11, ANGLER_KEY: 0x12, FACE_KEY: 0x13, BIRD_KEY: 0x14, GOLD_LEAF: 0x15,
     RUPEES_50: 0x1B, RUPEES_20: 0x1C, RUPEES_100: 0x1D, RUPEES_200: 0x1E, RUPEES_500: 0x1F,
     SEASHELL: 0x20, MESSAGE: 0x21, GEL: 0x22,
diff --git a/worlds/ladx/LADXR/locations/items.py b/worlds/ladx/LADXR/locations/items.py
index 50186ef2a34c..1ecc331f8580 100644
--- a/worlds/ladx/LADXR/locations/items.py
+++ b/worlds/ladx/LADXR/locations/items.py
@@ -11,7 +11,6 @@
 BOMB = "BOMB"
 SWORD = "SWORD"
 FLIPPERS = "FLIPPERS"
-MAGNIFYING_LENS = "MAGNIFYING_LENS"
 MEDICINE = "MEDICINE"
 TAIL_KEY = "TAIL_KEY"
 ANGLER_KEY = "ANGLER_KEY"

From 81b9a53a376df3f55f76abe941796fc7aef69e89 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Tue, 3 Dec 2024 01:51:10 +0000
Subject: [PATCH 124/381] KH2: Add missing indirect conditions for Final region
 access (#3923)

* KH2: Add missing indirect conditions for Final region access

Entrances to the Final region require being able to reach any one of a
number of locations, but for a location to be reachable, its parent
region must also be reachable, so indirect conditions must be added for
these regions.

* Use World.get_location

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Use World.get_location, for real this time

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/kh2/Rules.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/worlds/kh2/Rules.py b/worlds/kh2/Rules.py
index 4370ad36b540..0f26b56d0e54 100644
--- a/worlds/kh2/Rules.py
+++ b/worlds/kh2/Rules.py
@@ -355,6 +355,16 @@ def __init__(self, world: KH2World) -> None:
             RegionName.Master: lambda state: self.multi_form_region_access(),
             RegionName.Final:  lambda state: self.final_form_region_access(state)
         }
+        # Accessing Final requires being able to reach one of the locations in final_leveling_access, but reaching a
+        # location requires being able to reach the region the location is in, so an indirect condition is required.
+        # The access rules of each of the locations in final_leveling_access do not check for being able to reach other
+        # locations or other regions, so it is only the parent region of each location that needs to be added as an
+        # indirect condition.
+        self.form_region_indirect_condition_regions = {
+            RegionName.Final: {
+                self.world.get_location(location).parent_region for location in final_leveling_access
+            }
+        }
 
     def final_form_region_access(self, state: CollectionState) -> bool:
         """
@@ -388,12 +398,15 @@ def set_kh2_form_rules(self):
         for region_name in drive_form_list:
             if region_name == RegionName.Summon and not self.world.options.SummonLevelLocationToggle:
                 continue
+            indirect_condition_regions = self.form_region_indirect_condition_regions.get(region_name, ())
             # could get the location of each of these, but I feel like that would be less optimal
             region = self.multiworld.get_region(region_name, self.player)
             # if region_name in form_region_rules
             if region_name != RegionName.Summon:
                 for entrance in region.entrances:
                     entrance.access_rule = self.form_region_rules[region_name]
+                    for indirect_condition_region in indirect_condition_regions:
+                        self.multiworld.register_indirect_condition(indirect_condition_region, entrance)
             for loc in region.locations:
                 loc.access_rule = self.form_rules[loc.name]
 

From 18e8d50768eff7ac6416048fd1d39b40551793b7 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Mon, 2 Dec 2024 17:52:20 -0800
Subject: [PATCH 125/381] Pokemon Emerald: Clean up dexsanity spoiler and hints
 (#3832)

* Pokemon Emerald: Clean up dexsanity spoiler and hints

* Pokemon Emerald: Add +, do less hacks

* Pokemon Emerald: Update changelog

* Pokemon Emerald: Replace arrow with word in changelog

* Pokemon Emerald: Fix changelog
---
 worlds/pokemon_emerald/CHANGELOG.md |  1 -
 worlds/pokemon_emerald/__init__.py  | 53 ++++++++++++++++++-----------
 worlds/pokemon_emerald/data.py      | 31 +++++++++++++++++
 3 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/worlds/pokemon_emerald/CHANGELOG.md b/worlds/pokemon_emerald/CHANGELOG.md
index 72005d6f9d3f..0dd874b25029 100644
--- a/worlds/pokemon_emerald/CHANGELOG.md
+++ b/worlds/pokemon_emerald/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 ### Features
 
-- Added many new item and location groups.
 - Added a Swedish translation of the setup guide.
 - The client communicates map transitions to any trackers connected to the slot.
 - Added the player's Normalize Encounter Rates option to slot data for trackers.
diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py
index c99a0c11cdfb..040b89b1af51 100644
--- a/worlds/pokemon_emerald/__init__.py
+++ b/worlds/pokemon_emerald/__init__.py
@@ -629,21 +629,34 @@ def write_spoiler(self, spoiler_handle: TextIO):
 
             spoiler_handle.write(f"\n\nWild Pokemon ({self.player_name}):\n\n")
 
+            slot_to_rod_suffix = {
+                0: " (Old Rod)",
+                1: " (Old Rod)",
+                2: " (Good Rod)",
+                3: " (Good Rod)",
+                4: " (Good Rod)",
+                5: " (Super Rod)",
+                6: " (Super Rod)",
+                7: " (Super Rod)",
+                8: " (Super Rod)",
+                9: " (Super Rod)",
+            }
+
             species_maps = defaultdict(set)
             for map in self.modified_maps.values():
                 if map.land_encounters is not None:
                     for encounter in map.land_encounters.slots:
-                        species_maps[encounter].add(map.name[4:])
+                        species_maps[encounter].add(map.label + " (Land)")
 
                 if map.water_encounters is not None:
                     for encounter in map.water_encounters.slots:
-                        species_maps[encounter].add(map.name[4:])
+                        species_maps[encounter].add(map.label + " (Water)")
 
                 if map.fishing_encounters is not None:
-                    for encounter in map.fishing_encounters.slots:
-                        species_maps[encounter].add(map.name[4:])
+                    for slot, encounter in enumerate(map.fishing_encounters.slots):
+                        species_maps[encounter].add(map.label + slot_to_rod_suffix[slot])
 
-            lines = [f"{emerald_data.species[species].label}: {', '.join(maps)}\n"
+            lines = [f"{emerald_data.species[species].label}: {', '.join(sorted(maps))}\n"
                      for species, maps in species_maps.items()]
             lines.sort()
             for line in lines:
@@ -655,35 +668,35 @@ def extend_hint_information(self, hint_data):
         if self.options.dexsanity:
             from collections import defaultdict
 
-            slot_to_rod = {
-                0: "_OLD_ROD",
-                1: "_OLD_ROD",
-                2: "_GOOD_ROD",
-                3: "_GOOD_ROD",
-                4: "_GOOD_ROD",
-                5: "_SUPER_ROD",
-                6: "_SUPER_ROD",
-                7: "_SUPER_ROD",
-                8: "_SUPER_ROD",
-                9: "_SUPER_ROD",
+            slot_to_rod_suffix = {
+                0: " (Old Rod)",
+                1: " (Old Rod)",
+                2: " (Good Rod)",
+                3: " (Good Rod)",
+                4: " (Good Rod)",
+                5: " (Super Rod)",
+                6: " (Super Rod)",
+                7: " (Super Rod)",
+                8: " (Super Rod)",
+                9: " (Super Rod)",
             }
 
             species_maps = defaultdict(set)
             for map in self.modified_maps.values():
                 if map.land_encounters is not None:
                     for encounter in map.land_encounters.slots:
-                        species_maps[encounter].add(map.name[4:] + "_GRASS")
+                        species_maps[encounter].add(map.label + " (Land)")
 
                 if map.water_encounters is not None:
                     for encounter in map.water_encounters.slots:
-                        species_maps[encounter].add(map.name[4:] + "_WATER")
+                        species_maps[encounter].add(map.label + " (Water)")
 
                 if map.fishing_encounters is not None:
                     for slot, encounter in enumerate(map.fishing_encounters.slots):
-                        species_maps[encounter].add(map.name[4:] + slot_to_rod[slot])
+                        species_maps[encounter].add(map.label + slot_to_rod_suffix[slot])
 
             hint_data[self.player] = {
-                self.location_name_to_id[f"Pokedex - {emerald_data.species[species].label}"]: ", ".join(maps)
+                self.location_name_to_id[f"Pokedex - {emerald_data.species[species].label}"]: ", ".join(sorted(maps))
                 for species, maps in species_maps.items()
             }
 
diff --git a/worlds/pokemon_emerald/data.py b/worlds/pokemon_emerald/data.py
index c7af5ef2284a..d93ff926229b 100644
--- a/worlds/pokemon_emerald/data.py
+++ b/worlds/pokemon_emerald/data.py
@@ -151,6 +151,7 @@ class EncounterTableData(NamedTuple):
 @dataclass
 class MapData:
     name: str
+    label: str
     header_address: int
     land_encounters: Optional[EncounterTableData]
     water_encounters: Optional[EncounterTableData]
@@ -357,6 +358,8 @@ def load_json_data(data_name: str) -> Union[List[Any], Dict[str, Any]]:
 
 
 def _init() -> None:
+    import re
+
     extracted_data: Dict[str, Any] = load_json_data("extracted_data.json")
     data.constants = extracted_data["constants"]
     data.ram_addresses = extracted_data["misc_ram_addresses"]
@@ -366,6 +369,7 @@ def _init() -> None:
 
     # Create map data
     for map_name, map_json in extracted_data["maps"].items():
+        assert isinstance(map_name, str)
         if map_name in IGNORABLE_MAPS:
             continue
 
@@ -389,8 +393,35 @@ def _init() -> None:
                 map_json["fishing_encounters"]["address"]
             )
 
+        # Derive a user-facing label
+        label = []
+        for word in map_name[4:].split("_"):
+            # 1F, B1F, 2R, etc.
+            re_match = re.match("^B?\d+[FRP]$", word)
+            if re_match:
+                label.append(word)
+                continue
+
+            # Route 103, Hall 1, House 5, etc.
+            re_match = re.match("^([A-Z]+)(\d+)$", word)
+            if re_match:
+                label.append(re_match.group(1).capitalize())
+                label.append(re_match.group(2).lstrip("0"))
+                continue
+
+            if word == "OF":
+                label.append("of")
+                continue
+
+            if word == "SS":
+                label.append("S.S.")
+                continue
+
+            label.append(word.capitalize())
+
         data.maps[map_name] = MapData(
             map_name,
+            " ".join(label),
             map_json["header_address"],
             land_encounters,
             water_encounters,

From ffe0221deb41d93b5a2e5a663a43e96beec058db Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Tue, 3 Dec 2024 03:00:56 +0100
Subject: [PATCH 126/381] Core: log process ID (#4290)

---
 Utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Utils.py b/Utils.py
index 4f99d26ac402..50adb18f42be 100644
--- a/Utils.py
+++ b/Utils.py
@@ -557,7 +557,7 @@ def _cleanup():
     import platform
     logging.info(
         f"Archipelago ({__version__}) logging initialized"
-        f" on {platform.platform()}"
+        f" on {platform.platform()} process {os.getpid()}"
         f" running Python {sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
         f"{' (frozen)' if is_frozen() else ''}"
     )

From 6f2e1c2a7ea8395c1674124c1c7e51ffbd1bb7d9 Mon Sep 17 00:00:00 2001
From: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Date: Mon, 2 Dec 2024 21:02:18 -0500
Subject: [PATCH 127/381] Lingo: Optimize imports and remove unused parameter
 (#4305)

---
 worlds/lingo/player_logic.py             | 4 ++--
 worlds/lingo/utils/pickle_static_data.py | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/worlds/lingo/player_logic.py b/worlds/lingo/player_logic.py
index b21735c1f533..83217d7311a3 100644
--- a/worlds/lingo/player_logic.py
+++ b/worlds/lingo/player_logic.py
@@ -412,7 +412,7 @@ def randomize_paintings(self, world: "LingoWorld") -> bool:
             required_painting_rooms += REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS
             req_exits = [painting_id for painting_id, painting in PAINTINGS.items() if painting.required_when_no_doors]
 
-        def is_req_enterable(painting_id: str, painting: Painting) -> bool:
+        def is_req_enterable(painting: Painting) -> bool:
             if painting.exit_only or painting.disable or painting.req_blocked\
                     or painting.room in required_painting_rooms:
                 return False
@@ -433,7 +433,7 @@ def is_req_enterable(painting_id: str, painting: Painting) -> bool:
             return True
 
         req_enterable = [painting_id for painting_id, painting in PAINTINGS.items()
-                         if is_req_enterable(painting_id, painting)]
+                         if is_req_enterable(painting)]
         req_exits += [painting_id for painting_id, painting in PAINTINGS.items()
                       if painting.exit_only and painting.required]
         req_entrances = world.random.sample(req_enterable, len(req_exits))
diff --git a/worlds/lingo/utils/pickle_static_data.py b/worlds/lingo/utils/pickle_static_data.py
index 92bcb7a859ea..cd5c4b41df4b 100644
--- a/worlds/lingo/utils/pickle_static_data.py
+++ b/worlds/lingo/utils/pickle_static_data.py
@@ -11,7 +11,6 @@
 
 import hashlib
 import pickle
-import sys
 import Utils
 
 

From 6896d631db6ab24dfef67538ff7e7a7c18ff560f Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Tue, 3 Dec 2024 00:23:13 -0500
Subject: [PATCH 128/381] Stardew Valley: Fix a bug in equals between Or and
 And rules #4326

---
 worlds/stardew_valley/stardew_rule/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/stardew_valley/stardew_rule/base.py b/worlds/stardew_valley/stardew_rule/base.py
index 3e6eb327ea99..af4c3c35330d 100644
--- a/worlds/stardew_valley/stardew_rule/base.py
+++ b/worlds/stardew_valley/stardew_rule/base.py
@@ -293,7 +293,7 @@ def __repr__(self):
 
     def __eq__(self, other):
         return (isinstance(other, type(self)) and self.combinable_rules == other.combinable_rules and
-                self.simplification_state.original_simplifiable_rules == self.simplification_state.original_simplifiable_rules)
+                self.simplification_state.original_simplifiable_rules == other.simplification_state.original_simplifiable_rules)
 
     def __hash__(self):
         if len(self.combinable_rules) + len(self.simplification_state.original_simplifiable_rules) > 5:

From ac8a206d4685e015494dd67f9a9e7ab2411773b3 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Tue, 3 Dec 2024 00:59:55 -0500
Subject: [PATCH 129/381] LADX: combine warp options (#4325)

* combine warp options

* fix

* fix typo

* mark old options as removed
---
 worlds/ladx/LADXR/generator.py |  6 +++---
 worlds/ladx/Options.py         | 30 ++++++++++++++----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index f0f042c67db8..b402b3d88919 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -58,7 +58,7 @@
 
 from .patches import bank34
 from .utils import formatText
-from ..Options import TrendyGame, Palette
+from ..Options import TrendyGame, Palette, Warps
 from .roomEditor import RoomEditor, Object
 from .patches.aesthetics import rgb_to_bin, bin_to_rgb
 
@@ -416,8 +416,8 @@ def speed():
             for channel in range(3):
                 color[channel] = color[channel] * 31 // 0xbc
 
-    if world.options.warp_improvements:
-        patches.core.addWarpImprovements(rom, world.options.additional_warp_points)
+    if world.options.warps != Warps.option_vanilla:
+        patches.core.addWarpImprovements(rom, world.options.warps == Warps.option_improved_additional)
 
     palette = world.options.palette
     if palette != Palette.option_normal:
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index 6c0b866b5071..863e80fd036b 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -3,7 +3,7 @@
 import os.path
 import typing
 import logging
-from Options import Choice, Toggle, DefaultOnToggle, Range, FreeText, PerGameCommonOptions, OptionGroup
+from Options import Choice, Toggle, DefaultOnToggle, Range, FreeText, PerGameCommonOptions, OptionGroup, Removed
 from collections import defaultdict
 import Utils
 
@@ -486,21 +486,18 @@ def to_ladxr_option(self, all_options):
         return self.ladxr_name, s
 
 
-class WarpImprovements(DefaultOffToggle):
+class Warps(Choice):
     """
-    [On] Adds remake style warp screen to the game. Choose your warp destination on the map after jumping in a portal and press B to select.
-    [Off] No change
+    [Improved] Adds remake style warp screen to the game. Choose your warp destination on the map after jumping in a portal and press B to select.
+    [Improved Additional] Improved warps, and adds a warp point at Crazy Tracy's house (the Mambo teleport spot) and Eagle's Tower.
     """
-    display_name = "Warp Improvements"
+    display_name = "Warps"
+    option_vanilla = 0
+    option_improved = 1
+    option_improved_additional = 2
+    default = option_vanilla
 
 
-class AdditionalWarpPoints(DefaultOffToggle):
-    """
-    [On] (requires warp improvements) Adds a warp point at Crazy Tracy's house (the Mambo teleport spot) and Eagle's Tower
-    [Off] No change
-    """
-    display_name = "Additional Warp Points"
-
 ladx_option_groups = [
     OptionGroup("Goal Options", [
         Goal,
@@ -515,8 +512,7 @@ class AdditionalWarpPoints(DefaultOffToggle):
         ShuffleStoneBeaks
     ]),
     OptionGroup("Warp Points", [
-        WarpImprovements,
-        AdditionalWarpPoints,
+        Warps,
     ]),
     OptionGroup("Miscellaneous", [
         TradeQuest,
@@ -562,8 +558,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     # 'bowwow': Bowwow,
     # 'overworld': Overworld,
     link_palette: LinkPalette
-    warp_improvements: WarpImprovements
-    additional_warp_points: AdditionalWarpPoints
+    warps: Warps
     trendy_game: TrendyGame
     gfxmod: GfxMod
     palette: Palette
@@ -579,3 +574,6 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     nag_messages: NagMessages
     ap_title_screen: APTitleScreen
     boots_controls: BootsControls
+
+    warp_improvements: Removed
+    additional_warp_points: Removed

From 5b0de6b6c77b76a7f40285565d4f688fb662e412 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:51:58 -0500
Subject: [PATCH 130/381] FFMQ: No Longer Allow Inaccessible Useful Items
 (#4323)

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 worlds/ffmq/Regions.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/worlds/ffmq/Regions.py b/worlds/ffmq/Regions.py
index c1d3d619ffaa..4e26be1653a6 100644
--- a/worlds/ffmq/Regions.py
+++ b/worlds/ffmq/Regions.py
@@ -211,9 +211,12 @@ def stage_set_rules(multiworld):
     # If there's no enemies, there's no repeatable income sources
     no_enemies_players = [player for player in multiworld.get_game_players("Final Fantasy Mystic Quest")
                           if multiworld.worlds[player].options.enemies_density == "none"]
-    if (len([item for item in multiworld.itempool if item.classification in (ItemClassification.filler,
-            ItemClassification.trap)]) > len([player for player in no_enemies_players if
-                                              multiworld.worlds[player].options.accessibility == "minimal"]) * 3):
+    if (
+        len([item for item in multiworld.itempool if item.excludable]) >
+        len([player
+             for player in no_enemies_players
+             if multiworld.worlds[player].options.accessibility != "minimal"]) * 3
+    ):
         for player in no_enemies_players:
             for location in vendor_locations:
                 if multiworld.worlds[player].options.accessibility == "full":
@@ -221,11 +224,8 @@ def stage_set_rules(multiworld):
                 else:
                     multiworld.get_location(location, player).access_rule = lambda state: False
     else:
-        # There are not enough junk items to fill non-minimal players' vendors. Just set an item rule not allowing
-        # advancement items so that useful items can be placed.
-        for player in no_enemies_players:
-            for location in vendor_locations:
-                multiworld.get_location(location, player).item_rule = lambda item: not item.advancement
+        raise Exception(f"Not enough filler/trap items for FFMQ players with full and items accessibility. "
+                        f"Add more items or change the 'Enemies Density' option to something besides 'none'")
 
 
 class FFMQLocation(Location):

From f43fa612d502c3b5ed307d97f266e6acc8eaa937 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 4 Dec 2024 05:39:29 +0100
Subject: [PATCH 131/381] The Witness: Another small access rule optimisation
 #4256

---
 worlds/witness/rules.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py
index 323d5943c853..dac1556e46d4 100644
--- a/worlds/witness/rules.py
+++ b/worlds/witness/rules.py
@@ -246,7 +246,22 @@ def convert_requirement_option(requirement: List[Union[CollectionRule, SimpleIte
         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)]
+        # Sort the list by which item you are least likely to have (E.g. last stage of progressive item chains)
+        sorted_item_list = sorted(
+            item_counts.keys(),
+            key=lambda item_name: item_counts[item_name] if ("Progressive" in item_name) else 1.5,
+            reverse=True
+            # 1.5 because you are less likely to have a single stage item than one copy of a 2-stage chain
+            # I did some testing and every part of this genuinely gives a tiiiiny performance boost over not having it!
+        )
+
+        if all(item_count == 1 for item_count in item_counts.values()):
+            # If all counts are one, just use state.has_all
+            item_rules_converted = [lambda state: state.has_all(sorted_item_list, player)]
+        else:
+            # If any count is higher than 1, use state.has_all_counts
+            sorted_item_counts = {item_name: item_counts[item_name] for item_name in sorted_item_list}
+            item_rules_converted = [lambda state: state.has_all_counts(sorted_item_counts, player)]
 
     return collection_rules + item_rules_converted
 

From 769fbc55a9043f323684f6400424167eed2cea80 Mon Sep 17 00:00:00 2001
From: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Date: Wed, 4 Dec 2024 02:51:56 -0500
Subject: [PATCH 132/381] HK: Remove unused variables and imports (#4303)

* Remove unused variables and imports

* Accidental duplication
---
 worlds/hk/Options.py  | 2 +-
 worlds/hk/__init__.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py
index e17abbb7ae47..02f04ab18eef 100644
--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -1,6 +1,6 @@
 import typing
 import re
-from dataclasses import dataclass, make_dataclass
+from dataclasses import make_dataclass
 
 from .ExtractedData import logic_options, starts, pool_options
 from .Rules import cost_terms
diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index aede8e59cca5..81d939dcf1ea 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -340,7 +340,7 @@ def _add(item_name: str, location_name: str, randomized: bool):
 
         for shop, locations in self.created_multi_locations.items():
             for _ in range(len(locations), getattr(self.options, shop_to_option[shop]).value):
-                loc = self.create_location(shop)
+                self.create_location(shop)
                 unfilled_locations += 1
 
         # Balance the pool
@@ -356,7 +356,7 @@ def _add(item_name: str, location_name: str, randomized: bool):
             if shops:
                 for _ in range(additional_shop_items):
                     shop = self.random.choice(shops)
-                    loc = self.create_location(shop)
+                    self.create_location(shop)
                     unfilled_locations += 1
                     if len(self.created_multi_locations[shop]) >= 16:
                         shops.remove(shop)

From 58f22053048b97fd18d07843ea63638657257420 Mon Sep 17 00:00:00 2001
From: nmorale5 <76963132+nmorale5@users.noreply.github.com>
Date: Thu, 5 Dec 2024 01:48:33 -0500
Subject: [PATCH 133/381] Pokemon RB: Fix Incorrect Hidden Item Location in
 Seafoam Islands B2F (#4304)

---
 worlds/pokemon_rb/locations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py
index 943204ceaf75..467139c39e94 100644
--- a/worlds/pokemon_rb/locations.py
+++ b/worlds/pokemon_rb/locations.py
@@ -401,7 +401,7 @@ def __init__(self, flag):
     LocationData("Cerulean Cave B1F-E", "Hidden Item Northeast Rocks", "Ultra Ball", rom_addresses['Hidden_Item_Cerulean_Cave_B1F'], Hidden(22), inclusion=hidden_items),
     LocationData("Power Plant", "Hidden Item Central Dead End", "Max Elixir", rom_addresses['Hidden_Item_Power_Plant_1'], Hidden(23), inclusion=hidden_items),
     LocationData("Power Plant", "Hidden Item Before Zapdos", "PP Up", rom_addresses['Hidden_Item_Power_Plant_2'], Hidden(24), inclusion=hidden_items),
-    LocationData("Seafoam Islands B2F-NW", "Hidden Item Rock", "Nugget", rom_addresses['Hidden_Item_Seafoam_Islands_B2F'], Hidden(25), inclusion=hidden_items),
+    LocationData("Seafoam Islands B2F-SW", "Hidden Item Rock", "Nugget", rom_addresses['Hidden_Item_Seafoam_Islands_B2F'], Hidden(25), inclusion=hidden_items),
     LocationData("Seafoam Islands B4F-W", "Hidden Item Corner Island", "Ultra Ball", rom_addresses['Hidden_Item_Seafoam_Islands_B4F'], Hidden(26), inclusion=hidden_items),
     LocationData("Pokemon Mansion 1F", "Hidden Item Block Near Entrance Carpet", "Moon Stone", rom_addresses['Hidden_Item_Pokemon_Mansion_1F'], Hidden(27), inclusion=hidden_moon_stones),
     LocationData("Pokemon Mansion 3F-SW", "Hidden Item Behind Burglar", "Max Revive", rom_addresses['Hidden_Item_Pokemon_Mansion_3F'], Hidden(28), inclusion=hidden_items),

From 85a0d59f739a199bf4e72612d29183f86d00a66e Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 5 Dec 2024 04:23:26 -0500
Subject: [PATCH 134/381] LADX: text shuffle exclusions (#3919)

* text shuffle exclusions
Exclude owl statues, library books, goal sign, signpost maze, and various rupee prices from text shuffle

* clearer variable name
---
 worlds/ladx/LADXR/generator.py | 44 +++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index b402b3d88919..504dfc78eced 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -340,11 +340,53 @@ def gen_hint():
         patches.enemies.doubleTrouble(rom)
 
     if world.options.text_shuffle:
+        excluded_ids = [
+            # Overworld owl statues
+            0x1B6, 0x1B7, 0x1B8, 0x1B9, 0x1BA, 0x1BB, 0x1BC, 0x1BD, 0x1BE, 0x22D,
+
+            # Dungeon owls
+            0x288, 0x280,  # D1
+            0x28A, 0x289, 0x281,  # D2
+            0x282, 0x28C, 0x28B,  # D3
+            0x283,  # D4
+            0x28D, 0x284,  # D5
+            0x285, 0x28F, 0x28E,  # D6
+            0x291, 0x290, 0x286,  # D7
+            0x293, 0x287, 0x292,  # D8
+            0x263,  # D0
+
+            # Hint books
+            0x267,  # color dungeon
+            0x200, 0x201,
+            0x202, 0x203,
+            0x204, 0x205,
+            0x206, 0x207,
+            0x208, 0x209,
+            0x20A, 0x20B,
+            0x20C,
+            0x20D, 0x20E,
+            0x217, 0x218, 0x219, 0x21A,
+
+            # Goal sign
+            0x1A3,
+
+            # Signpost maze
+            0x1A9, 0x1AA, 0x1AB, 0x1AC, 0x1AD,
+
+            # Prices
+            0x02C, 0x02D, 0x030, 0x031, 0x032, 0x033, # Shop items
+            0x03B, # Trendy Game
+            0x045, # Fisherman
+            0x018, 0x019, # Crazy Tracy
+            0x0DC, # Mamu
+            0x0F0, # Raft ride
+        ]
+        excluded_texts = [ rom.texts[excluded_id] for excluded_id in excluded_ids]
         buckets = defaultdict(list)
         # For each ROM bank, shuffle text within the bank
         for n, data in enumerate(rom.texts._PointerTable__data):
             # Don't muck up which text boxes are questions and which are statements
-            if type(data) != int and data and data != b'\xFF':
+            if type(data) != int and data and data != b'\xFF' and data not in excluded_texts:
                 buckets[(rom.texts._PointerTable__banks[n], data[len(data) - 1] == 0xfe)].append((n, data))
         for bucket in buckets.values():
             # For each bucket, make a copy and shuffle

From d80069385dc6166c2333d2c2360d47861a138d87 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 5 Dec 2024 06:03:16 -0500
Subject: [PATCH 135/381] LADX: tweak in-game hints (#3920)

* dont show local player name in hint

* add option to disable hints

---------

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 worlds/ladx/LADXR/generator.py | 4 +++-
 worlds/ladx/Options.py         | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index 504dfc78eced..046b51815cba 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -266,6 +266,8 @@ def generateRom(args, world: "LinksAwakeningWorld"):
     our_useful_items = [item for item in our_items if ItemClassification.progression in item.classification]
 
     def gen_hint():
+        if not world.options.in_game_hints:
+            return 'Hints are disabled!'
         chance = world.random.uniform(0, 1)
         if chance < JUNK_HINT:
             return None
@@ -286,7 +288,7 @@ def gen_hint():
         else:
             location_name = location.name
 
-        hint = f"{name} {location.item} is at {location_name}"
+        hint = f"{name} {location.item.name} is at {location_name}"
         if location.player != world.player:
             # filter out { and } since they cause issues with string.format later on
             player_name = world.multiworld.player_name[location.player].replace("{", "").replace("}", "")
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index 863e80fd036b..9414a7e3c89b 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -498,6 +498,13 @@ class Warps(Choice):
     default = option_vanilla
 
 
+class InGameHints(DefaultOnToggle):
+    """
+    When enabled, owl statues and library books may indicate the location of your items in the multiworld.
+    """
+    display_name = "In-game Hints"
+
+
 ladx_option_groups = [
     OptionGroup("Goal Options", [
         Goal,
@@ -518,6 +525,7 @@ class Warps(Choice):
         TradeQuest,
         Rooster,
         TrendyGame,
+        InGameHints,
         NagMessages,
         BootsControls
     ]),
@@ -574,6 +582,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     nag_messages: NagMessages
     ap_title_screen: APTitleScreen
     boots_controls: BootsControls
+    in_game_hints: InGameHints
 
     warp_improvements: Removed
     additional_warp_points: Removed

From 4d42814f5d6a7315bb177f76d1f690ff6454b9ef Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 5 Dec 2024 06:06:52 -0500
Subject: [PATCH 136/381] LADX: more item groups, location groups, keysanity
 preset (#3936)

* add groups and a preset

* formatting

* typing

* alias groups for progressive items

* add bush breakers item group

* fix typo

* some manual location groups

* drop dummy dungeon items from groups
---
 worlds/ladx/Items.py     | 136 ++++++++++++++++++++++++++++++++++++++-
 worlds/ladx/Locations.py |  35 +++++++++-
 worlds/ladx/__init__.py  |  24 ++++---
 3 files changed, 184 insertions(+), 11 deletions(-)

diff --git a/worlds/ladx/Items.py b/worlds/ladx/Items.py
index b9e1eeab3e69..2a64c59394e6 100644
--- a/worlds/ladx/Items.py
+++ b/worlds/ladx/Items.py
@@ -26,7 +26,7 @@ class DungeonItemData(ItemData):
     @property
     def dungeon_index(self):
         return int(self.ladxr_id[-1])
-    
+
     @property
     def dungeon_item_type(self):
         s = self.ladxr_id[:-1]
@@ -174,7 +174,7 @@ class ItemName:
     TRADING_ITEM_SCALE = "Scale"
     TRADING_ITEM_MAGNIFYING_GLASS = "Magnifying Glass"
 
-trade_item_prog = ItemClassification.progression 
+trade_item_prog = ItemClassification.progression
 
 links_awakening_items = [
     ItemData(ItemName.POWER_BRACELET, "POWER_BRACELET", ItemClassification.progression),
@@ -303,3 +303,135 @@ class ItemName:
 links_awakening_items_by_name = {
     item.item_name : item for item in links_awakening_items
 }
+
+links_awakening_item_name_groups: typing.Dict[str, typing.Set[str]] = {
+    "Instruments": {
+        "Full Moon Cello",
+        "Conch Horn",
+        "Sea Lily's Bell",
+        "Surf Harp",
+        "Wind Marimba",
+        "Coral Triangle",
+        "Organ of Evening Calm",
+        "Thunder Drum",
+    },
+    "Entrance Keys": {
+        "Tail Key",
+        "Angler Key",
+        "Face Key",
+        "Bird Key",
+        "Slime Key",
+    },
+    "Nightmare Keys": {
+        "Nightmare Key (Angler's Tunnel)",
+        "Nightmare Key (Bottle Grotto)",
+        "Nightmare Key (Catfish's Maw)",
+        "Nightmare Key (Color Dungeon)",
+        "Nightmare Key (Eagle's Tower)",
+        "Nightmare Key (Face Shrine)",
+        "Nightmare Key (Key Cavern)",
+        "Nightmare Key (Tail Cave)",
+        "Nightmare Key (Turtle Rock)",
+    },
+    "Small Keys": {
+        "Small Key (Angler's Tunnel)",
+        "Small Key (Bottle Grotto)",
+        "Small Key (Catfish's Maw)",
+        "Small Key (Color Dungeon)",
+        "Small Key (Eagle's Tower)",
+        "Small Key (Face Shrine)",
+        "Small Key (Key Cavern)",
+        "Small Key (Tail Cave)",
+        "Small Key (Turtle Rock)",
+    },
+    "Compasses": {
+        "Compass (Angler's Tunnel)",
+        "Compass (Bottle Grotto)",
+        "Compass (Catfish's Maw)",
+        "Compass (Color Dungeon)",
+        "Compass (Eagle's Tower)",
+        "Compass (Face Shrine)",
+        "Compass (Key Cavern)",
+        "Compass (Tail Cave)",
+        "Compass (Turtle Rock)",
+    },
+    "Maps": {
+        "Dungeon Map (Angler's Tunnel)",
+        "Dungeon Map (Bottle Grotto)",
+        "Dungeon Map (Catfish's Maw)",
+        "Dungeon Map (Color Dungeon)",
+        "Dungeon Map (Eagle's Tower)",
+        "Dungeon Map (Face Shrine)",
+        "Dungeon Map (Key Cavern)",
+        "Dungeon Map (Tail Cave)",
+        "Dungeon Map (Turtle Rock)",
+    },
+    "Stone Beaks": {
+        "Stone Beak (Angler's Tunnel)",
+        "Stone Beak (Bottle Grotto)",
+        "Stone Beak (Catfish's Maw)",
+        "Stone Beak (Color Dungeon)",
+        "Stone Beak (Eagle's Tower)",
+        "Stone Beak (Face Shrine)",
+        "Stone Beak (Key Cavern)",
+        "Stone Beak (Tail Cave)",
+        "Stone Beak (Turtle Rock)",
+    },
+    "Trading Items": {
+        "Yoshi Doll",
+        "Ribbon",
+        "Dog Food",
+        "Bananas",
+        "Stick",
+        "Honeycomb",
+        "Pineapple",
+        "Hibiscus",
+        "Letter",
+        "Broom",
+        "Fishing Hook",
+        "Necklace",
+        "Scale",
+        "Magnifying Glass",
+    },
+    "Rupees": {
+        "20 Rupees",
+        "50 Rupees",
+        "100 Rupees",
+        "200 Rupees",
+        "500 Rupees",
+    },
+    "Upgrades": {
+        "Max Powder Upgrade",
+        "Max Bombs Upgrade",
+        "Max Arrows Upgrade",
+    },
+    "Songs": {
+        "Ballad of the Wind Fish",
+        "Manbo's Mambo",
+        "Frog's Song of Soul",
+    },
+    "Tunics": {
+        "Red Tunic",
+        "Blue Tunic",
+    },
+    "Bush Breakers": {
+        "Progressive Power Bracelet",
+        "Magic Rod",
+        "Magic Powder",
+        "Bomb",
+        "Progressive Sword",
+        "Boomerang",
+    },
+    "Sword": {
+        "Progressive Sword",
+    },
+    "Shield": {
+        "Progressive Shield",
+    },
+    "Power Bracelet": {
+        "Progressive Power Bracelet",
+    },
+    "Bracelet": {
+        "Progressive Power Bracelet",
+    },
+}
diff --git a/worlds/ladx/Locations.py b/worlds/ladx/Locations.py
index f29355f2ba86..8670738e0869 100644
--- a/worlds/ladx/Locations.py
+++ b/worlds/ladx/Locations.py
@@ -1,5 +1,5 @@
 from BaseClasses import Region, Entrance, Location, CollectionState
-
+import typing
 
 from .LADXR.checkMetadata import checkMetadataTable
 from .Common import *
@@ -25,6 +25,39 @@
 def meta_to_name(meta):
     return f"{meta.name} ({meta.area})"
 
+def get_location_name_groups() -> typing.Dict[str, typing.Set[str]]:
+    groups = {
+        "Instrument Pedestals": {
+            "Full Moon Cello (Tail Cave)",
+            "Conch Horn (Bottle Grotto)",
+            "Sea Lily's Bell (Key Cavern)",
+            "Surf Harp (Angler's Tunnel)",
+            "Wind Marimba (Catfish's Maw)",
+            "Coral Triangle (Face Shrine)",
+            "Organ of Evening Calm (Eagle's Tower)",
+            "Thunder Drum (Turtle Rock)",
+        },
+        "Boss Rewards": {
+            "Moldorm Heart Container (Tail Cave)",
+            "Genie Heart Container (Bottle Grotto)",
+            "Slime Eye Heart Container (Key Cavern)",
+            "Angler Fish Heart Container (Angler's Tunnel)",
+            "Slime Eel Heart Container (Catfish's Maw)",
+            "Facade Heart Container (Face Shrine)",
+            "Evil Eagle Heart Container (Eagle's Tower)",
+            "Hot Head Heart Container (Turtle Rock)",
+            "Tunic Fairy Item 1 (Color Dungeon)",
+            "Tunic Fairy Item 2 (Color Dungeon)",
+        },
+    }
+    # Add region groups
+    for s, v in checkMetadataTable.items():
+        if s == "None":
+            continue
+        groups.setdefault(v.area, set()).add(meta_to_name(v))
+    return groups
+
+links_awakening_location_name_groups = get_location_name_groups()
 
 def get_locations_to_id():
     ret = {
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 2846b40e67d9..7499aca8c404 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -13,7 +13,8 @@
 from worlds.AutoWorld import WebWorld, World
 from .Common import *
 from .Items import (DungeonItemData, DungeonItemType, ItemName, LinksAwakeningItem, TradeItemData,
-                    ladxr_item_to_la_item_name, links_awakening_items, links_awakening_items_by_name)
+                    ladxr_item_to_la_item_name, links_awakening_items, links_awakening_items_by_name,
+                    links_awakening_item_name_groups)
 from .LADXR import generator
 from .LADXR.itempool import ItemPool as LADXRItemPool
 from .LADXR.locations.constants import CHEST_ITEMS
@@ -23,7 +24,8 @@
 from .LADXR.settings import Settings as LADXRSettings
 from .LADXR.worldSetup import WorldSetup as LADXRWorldSetup
 from .Locations import (LinksAwakeningLocation, LinksAwakeningRegion,
-                        create_regions_from_ladxr, get_locations_to_id)
+                        create_regions_from_ladxr, get_locations_to_id,
+                        links_awakening_location_name_groups)
 from .Options import DungeonItemShuffle, ShuffleInstruments, LinksAwakeningOptions, ladx_option_groups
 from .Rom import LADXDeltaPatch, get_base_rom_path
 
@@ -66,6 +68,15 @@ class LinksAwakeningWebWorld(WebWorld):
     )]
     theme = "dirt"
     option_groups = ladx_option_groups
+    options_presets: typing.Dict[str, typing.Dict[str, typing.Any]] = {
+        "Keysanity": {
+            "shuffle_nightmare_keys": "any_world",
+            "shuffle_small_keys": "any_world",
+            "shuffle_maps": "any_world",
+            "shuffle_compasses": "any_world",
+            "shuffle_stone_beaks": "any_world",
+        }
+    }
 
 class LinksAwakeningWorld(World):
     """
@@ -98,12 +109,9 @@ class LinksAwakeningWorld(World):
 
     # Items can be grouped using their names to allow easy checking if any item
     # from that group has been collected. Group names can also be used for !hint
-    item_name_groups = {
-        "Instruments": {
-            "Full Moon Cello", "Conch Horn", "Sea Lily's Bell", "Surf Harp",
-            "Wind Marimba", "Coral Triangle", "Organ of Evening Calm", "Thunder Drum"
-        },
-    }
+    item_name_groups = links_awakening_item_name_groups
+
+    location_name_groups = links_awakening_location_name_groups
 
     prefill_dungeon_items = None
 

From 203d89d1d38102800bfc0aa4c5338f7fc3113dec Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 5 Dec 2024 10:32:45 -0500
Subject: [PATCH 137/381] LADX: upstream logic updates (#3963)

* Fully updates requirements.py to live LADXR (#19)

* Updates dungeon2.py to LADXR-Live (#20)

No logic changes or bugfix are in this file. It is only code cleanup.

* Update dungeon1.py (#21)

- The Three of a Kind with Bomb is moved from Normal to Hard Logic

The rest is code cleanup.

lines 22-25 | 22-26 & 33 | 34 remain different in AP | Upstream with no effective difference

* Fully updates dungeon3.py to LADXR-live (#22)

Logic Changes:
- Hard mode now considers killing the enemies in the top room with pot

Everything else is cleanup.

* Fully update dungeon4.py to LADXR-live logic (#23)

Logic Changes:
- Hard Logic: Removes Feather requirement from grabbing the Pit Key
- Hell logic: new hookshot clip (line 64)
- Hell logic: hookshot spam over the first pit of crossroads, then buffer down (line 69)
- Hell logic: push block left of keyblock up, then shaq jump off the left wall and pause buffer to land on keyblock.
- Hell logic: split zol for more entities, and clip through the block left of keyblock by hookshot spam

The rest is code cleanup

* Updates dungeon5.py mostly to LADXR-Live Logic (#24)

Logic Changes:
- Hell logic: use zoomerang dashing left to get an unclipped boots superjump off the right wall over the block. reverse is push block (line 69)

The rest is cleanup.

The upstream splits the post_gohma region into pre_gohma, gohma and post_gohma. I did not implement this yet as I do not know the implications. To port this the following lines need to be changed (AP | LADXR):
18 | 18-20;
55 | 58;
65 | 68-69

* Fully update dungeon6.py logic (#25)

Logic Changes:
- Hard logic: allow damage boosting past the mini thwomps
- Glitched logic: bomb triggering elephants in two cases

Everything else is cleanup

* Fully update dungeon7.py to LADXR-live logic (#26)

Logic Changes:
- Hard logic: Three of a Kind is now possible with bombs only

Everything else is code cleanup

* Fully updates dungeon8.py to LADXR-live (#27)

Logic change:
- Hard logic: allows to drop the Gibdos into holes as a way to kill them
- Glitched logic: underground section with fire balls jumping up out of lava. Use boots superjump off left wall to jump over the pot blocking the way


The rest is code cleanup

* Fully update dungeonColor.py to LADXR-live (#28)

Logic changes:
- Normal logic: Karakoros now need power bracelet to put them into their holes
- Hard logic: Karakoros without power bracelet but with weapon
- Hell logic: Karakoros with only bombs

Everything else is code cleanup

* Updating overworld.py (#29)

* Updating overworld.py

This tries to update all logic of the Overworld.

Logic changes include:
- Normal logic: requires hookshot or shield to traverse Armos Cave
- Hard logic: Traverse Armos Cave with nothing (formerly normal logic)
- Hard logic: get the animal village bomb cave check with jump and boomerang
- Hard logic: use rooster to go to D7
- Lots of Jesus Rooster Jumps

I stopped counting and need to go over this again.

Also, please investigate line 474 AP because it's removed in LADXR-Upstream and I don't know why.

* remove featherless fisher under bridge from hard

it was moved to hell upstream and its already present in our code

---------

Co-authored-by: Alex Nordstrom <a.l.nordstrom@gmail.com>

* fixes

* add test messages

* Adds Pegasus Boots to the test (#31)

* Fix d6 boss_key logic (#30)

* restore hardmode logic

* higher logic fixes

* add bush requirement to the raft
in case the player needs to farm rupees to play again

---------

Co-authored-by: palex00 <32203971+palex00@users.noreply.github.com>
---
 worlds/ladx/LADXR/logic/dungeon1.py     |  15 +-
 worlds/ladx/LADXR/logic/dungeon2.py     |  14 +-
 worlds/ladx/LADXR/logic/dungeon3.py     |  38 ++--
 worlds/ladx/LADXR/logic/dungeon4.py     |  44 ++--
 worlds/ladx/LADXR/logic/dungeon5.py     |  49 ++---
 worlds/ladx/LADXR/logic/dungeon6.py     |  36 ++--
 worlds/ladx/LADXR/logic/dungeon7.py     |  35 +--
 worlds/ladx/LADXR/logic/dungeon8.py     |  50 +++--
 worlds/ladx/LADXR/logic/dungeonColor.py |  16 +-
 worlds/ladx/LADXR/logic/overworld.py    | 274 ++++++++++++++----------
 worlds/ladx/LADXR/logic/requirements.py |  72 ++++++-
 worlds/ladx/test/TestDungeonLogic.py    |  26 +--
 12 files changed, 399 insertions(+), 270 deletions(-)

diff --git a/worlds/ladx/LADXR/logic/dungeon1.py b/worlds/ladx/LADXR/logic/dungeon1.py
index 82321a1c0d65..645c50d1d5e5 100644
--- a/worlds/ladx/LADXR/logic/dungeon1.py
+++ b/worlds/ladx/LADXR/logic/dungeon1.py
@@ -9,7 +9,7 @@ def __init__(self, options, world_setup, r):
         entrance.add(DungeonChest(0x113), DungeonChest(0x115), DungeonChest(0x10E))
         Location(dungeon=1).add(DroppedKey(0x116)).connect(entrance, OR(BOMB, r.push_hardhat)) # hardhat beetles (can kill with bomb)
         Location(dungeon=1).add(DungeonChest(0x10D)).connect(entrance, OR(r.attack_hookshot_powder, SHIELD)) # moldorm spawn chest
-        stalfos_keese_room = Location(dungeon=1).add(DungeonChest(0x114)).connect(entrance, r.attack_hookshot) # 2 stalfos 2 keese room
+        stalfos_keese_room = Location(dungeon=1).add(DungeonChest(0x114)).connect(entrance, AND(OR(r.attack_skeleton, SHIELD),r.attack_hookshot_powder)) # 2 stalfos 2 keese room
         Location(dungeon=1).add(DungeonChest(0x10C)).connect(entrance, BOMB) # hidden seashell room
         dungeon1_upper_left = Location(dungeon=1).connect(entrance, AND(KEY1, FOUND(KEY1, 3)))
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
@@ -19,21 +19,22 @@ def __init__(self, options, world_setup, r):
         dungeon1_right_side = Location(dungeon=1).connect(entrance, AND(KEY1, FOUND(KEY1, 3)))
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=1).add(OwlStatue(0x10A)).connect(dungeon1_right_side, STONE_BEAK1)
-        Location(dungeon=1).add(DungeonChest(0x10A)).connect(dungeon1_right_side, OR(r.attack_hookshot, SHIELD)) # three of a kind, shield stops the suit from changing
+        dungeon1_3_of_a_kind = Location(dungeon=1).add(DungeonChest(0x10A)).connect(dungeon1_right_side, OR(r.attack_hookshot_no_bomb, SHIELD)) # three of a kind, shield stops the suit from changing
         dungeon1_miniboss = Location(dungeon=1).connect(dungeon1_right_side, AND(r.miniboss_requirements[world_setup.miniboss_mapping[0]], FEATHER))
         dungeon1_boss = Location(dungeon=1).connect(dungeon1_miniboss, NIGHTMARE_KEY1)
-        Location(dungeon=1).add(HeartContainer(0x106), Instrument(0x102)).connect(dungeon1_boss, r.boss_requirements[world_setup.boss_mapping[0]])
+        boss = Location(dungeon=1).add(HeartContainer(0x106), Instrument(0x102)).connect(dungeon1_boss, r.boss_requirements[world_setup.boss_mapping[0]])
 
-        if options.logic not in ('normal', 'casual'):
+        if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
             stalfos_keese_room.connect(entrance, r.attack_hookshot_powder) # stalfos jump away when you press a button.
-
+            dungeon1_3_of_a_kind.connect(dungeon1_right_side, BOMB) # use timed bombs to match the 3 of a kinds
+        
         if options.logic == 'glitched' or options.logic == 'hell':
-            boss_key.connect(entrance, FEATHER)  # super jump
+            boss_key.connect(entrance, r.super_jump_feather)  # super jump
             dungeon1_miniboss.connect(dungeon1_right_side, r.miniboss_requirements[world_setup.miniboss_mapping[0]]) # damage boost or buffer pause over the pit to cross or mushroom
         
         if options.logic == 'hell':
             feather_chest.connect(dungeon1_upper_left, SWORD)  # keep slashing the spiked beetles until they keep moving 1 pixel close towards you and the pit, to get them to fall
-            boss_key.connect(entrance, FOUND(KEY1,3)) # damage boost off the hardhat to cross the pit
+            boss_key.connect(entrance, AND(r.damage_boost, FOUND(KEY1,3))) # damage boost off the hardhat to cross the pit
             
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/dungeon2.py b/worlds/ladx/LADXR/logic/dungeon2.py
index 3bb95edbc8bd..6ee6cc4a8020 100644
--- a/worlds/ladx/LADXR/logic/dungeon2.py
+++ b/worlds/ladx/LADXR/logic/dungeon2.py
@@ -14,7 +14,7 @@ def __init__(self, options, world_setup, r):
         Location(dungeon=2).add(DungeonChest(0x137)).connect(dungeon2_r2, AND(KEY2, FOUND(KEY2, 5), OR(r.rear_attack, r.rear_attack_range)))  # compass chest
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=2).add(OwlStatue(0x133)).connect(dungeon2_r2, STONE_BEAK2)
-        dungeon2_r3 = Location(dungeon=2).add(DungeonChest(0x138)).connect(dungeon2_r2, r.attack_hookshot)  # first chest with key, can hookshot the switch in previous room
+        dungeon2_r3 = Location(dungeon=2).add(DungeonChest(0x138)).connect(dungeon2_r2, r.hit_switch)  # first chest with key, can hookshot the switch in previous room
         dungeon2_r4 = Location(dungeon=2).add(DungeonChest(0x139)).connect(dungeon2_r3, FEATHER)  # button spawn chest
         if options.logic == "casual":
             shyguy_key_drop = Location(dungeon=2).add(DroppedKey(0x134)).connect(dungeon2_r3, AND(FEATHER, OR(r.rear_attack, r.rear_attack_range)))  # shyguy drop key
@@ -39,16 +39,16 @@ def __init__(self, options, world_setup, r):
         
         if options.logic == 'glitched' or options.logic == 'hell':
             dungeon2_ghosts_chest.connect(dungeon2_ghosts_room, SWORD) # use sword to spawn ghosts on other side of the room so they run away (logically irrelevant because of torches at start)
-            dungeon2_r6.connect(miniboss, FEATHER) # superjump to staircase next to hinox. 
+            dungeon2_r6.connect(miniboss, r.super_jump_feather) # superjump to staircase next to hinox. 
             
         if options.logic == 'hell':    
-            dungeon2_map_chest.connect(dungeon2_l2, AND(r.attack_hookshot_powder, PEGASUS_BOOTS)) # use boots to jump over the pits
-            dungeon2_r4.connect(dungeon2_r3, OR(PEGASUS_BOOTS, HOOKSHOT)) # can use both pegasus boots bonks or hookshot spam to cross the pit room
+            dungeon2_map_chest.connect(dungeon2_l2, AND(r.attack_hookshot_powder, r.boots_bonk_pit)) # use boots to jump over the pits
+            dungeon2_r4.connect(dungeon2_r3, OR(r.boots_bonk_pit, r.hookshot_spam_pit)) # can use both pegasus boots bonks or hookshot spam to cross the pit room
             dungeon2_r4.connect(shyguy_key_drop, r.rear_attack_range, one_way=True) # adjust for alternate requirements for dungeon2_r4
-            miniboss.connect(dungeon2_r5, AND(PEGASUS_BOOTS, r.miniboss_requirements[world_setup.miniboss_mapping[1]])) # use boots to dash over the spikes in the 2d section
+            miniboss.connect(dungeon2_r5, AND(r.boots_dash_2d, r.miniboss_requirements[world_setup.miniboss_mapping[1]])) # use boots to dash over the spikes in the 2d section
             dungeon2_pre_stairs_boss.connect(dungeon2_r6, AND(HOOKSHOT, OR(BOW, BOMB, MAGIC_ROD, AND(OCARINA, SONG1)), FOUND(KEY2, 5))) # hookshot clip through the pot using both pol's voice
-            dungeon2_post_stairs_boss.connect(dungeon2_pre_stairs_boss, OR(BOMB, AND(PEGASUS_BOOTS, FEATHER))) # use a bomb to lower the last platform, or boots + feather to cross over top (only relevant in hell logic)
-            dungeon2_pre_boss.connect(dungeon2_post_stairs_boss, AND(PEGASUS_BOOTS, HOOKSHOT)) # boots bonk off bottom wall + hookshot spam across the two 1 tile pits vertically
+            dungeon2_post_stairs_boss.connect(dungeon2_pre_stairs_boss, OR(BOMB, r.boots_jump)) # use a bomb to lower the last platform, or boots + feather to cross over top (only relevant in hell logic)
+            dungeon2_pre_boss.connect(dungeon2_post_stairs_boss, AND(r.boots_bonk_pit, r.hookshot_spam_pit)) # boots bonk off bottom wall + hookshot spam across the two 1 tile pits vertically
             
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/dungeon3.py b/worlds/ladx/LADXR/logic/dungeon3.py
index e65c7da0bafc..33782be16c87 100644
--- a/worlds/ladx/LADXR/logic/dungeon3.py
+++ b/worlds/ladx/LADXR/logic/dungeon3.py
@@ -20,8 +20,8 @@ def __init__(self, options, world_setup, r):
             Location(dungeon=3).add(OwlStatue(0x154)).connect(area_up, STONE_BEAK3)
         dungeon3_raised_blocks_north = Location(dungeon=3).add(DungeonChest(0x14C)) # chest locked behind raised blocks near staircase
         dungeon3_raised_blocks_east = Location(dungeon=3).add(DungeonChest(0x150)) # chest locked behind raised blocks next to slime chest
-        area_up.connect(dungeon3_raised_blocks_north, r.attack_hookshot, one_way=True) # hit switch to reach north chest
-        area_up.connect(dungeon3_raised_blocks_east, r.attack_hookshot, one_way=True) # hit switch to reach east chest
+        area_up.connect(dungeon3_raised_blocks_north, r.hit_switch, one_way=True) # hit switch to reach north chest
+        area_up.connect(dungeon3_raised_blocks_east, r.hit_switch, one_way=True) # hit switch to reach east chest
         
         area_left = Location(dungeon=3).connect(area3, AND(KEY3, FOUND(KEY3, 8)))
         area_left_key_drop = Location(dungeon=3).add(DroppedKey(0x155)).connect(area_left, r.attack_hookshot) # west key drop (no longer requires feather to get across hole), can use boomerang to knock owls into pit
@@ -54,28 +54,30 @@ def __init__(self, options, world_setup, r):
 
         if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
             dungeon3_3_bombite_room.connect(area_right, BOOMERANG) # 3 bombite room from the left side, grab item with boomerang
-            dungeon3_reverse_eye.connect(entrance, HOOKSHOT) # hookshot the chest to get to the right side
-            dungeon3_north_key_drop.connect(area_up, POWER_BRACELET) # use pots to kill the enemies
-            dungeon3_south_key_drop.connect(area_down, POWER_BRACELET) # use pots to kill enemies
+            dungeon3_reverse_eye.connect(entrance, r.hookshot_over_pit) # hookshot the chest to get to the right side
+            dungeon3_north_key_drop.connect(area_up, r.throw_pot) # use pots to kill the enemies
+            dungeon3_south_key_drop.connect(area_down, r.throw_pot) # use pots to kill enemies
+            area_up.connect(dungeon3_raised_blocks_north, r.throw_pot, one_way=True) # use pots to hit the switch
+            area_up.connect(dungeon3_raised_blocks_east, AND(r.throw_pot, r.attack_hookshot_powder), one_way=True) # use pots to hit the switch
 
         if options.logic == 'glitched' or options.logic == 'hell':
-            area2.connect(dungeon3_raised_blocks_east, AND(r.attack_hookshot_powder, FEATHER), one_way=True) # use superjump to get over the bottom left block
-            area3.connect(dungeon3_raised_blocks_north, AND(OR(PEGASUS_BOOTS, HOOKSHOT), FEATHER), one_way=True) # use shagjump (unclipped superjump next to movable block) from north wall to get on the blocks. Instead of boots can also get to that area with a hookshot clip past the movable block
-            area3.connect(dungeon3_zol_stalfos, HOOKSHOT, one_way=True) # hookshot clip through the northern push block next to raised blocks chest to get to the zol
-            dungeon3_nightmare_key_chest.connect(area_right, AND(FEATHER, BOMB)) # superjump to right side 3 gap via top wall and jump the 2 gap
-            dungeon3_post_dodongo_chest.connect(area_right, AND(FEATHER, FOUND(KEY3, 6))) # superjump from keyblock path. use 2 keys to open enough blocks TODO: nag messages to skip a key
+            area2.connect(dungeon3_raised_blocks_east, AND(r.attack_hookshot_powder, r.super_jump_feather), one_way=True) # use superjump to get over the bottom left block
+            area3.connect(dungeon3_raised_blocks_north, AND(OR(PEGASUS_BOOTS, r.hookshot_clip_block), r.shaq_jump), one_way=True) # use shagjump (unclipped superjump next to movable block) from north wall to get on the blocks. Instead of boots can also get to that area with a hookshot clip past the movable block
+            area3.connect(dungeon3_zol_stalfos, r.hookshot_clip_block, one_way=True) # hookshot clip through the northern push block next to raised blocks chest to get to the zol
+            dungeon3_nightmare_key_chest.connect(area_right, AND(r.super_jump_feather, BOMB)) # superjump to right side 3 gap via top wall and jump the 2 gap
+            dungeon3_post_dodongo_chest.connect(area_right, AND(r.super_jump_feather, FOUND(KEY3, 6))) # superjump from keyblock path. use 2 keys to open enough blocks TODO: nag messages to skip a key
         
         if options.logic == 'hell':
-            area2.connect(dungeon3_raised_blocks_east, AND(PEGASUS_BOOTS, OR(BOW, MAGIC_ROD)), one_way=True) # use boots superhop to get over the bottom left block
-            area3.connect(dungeon3_raised_blocks_north, AND(PEGASUS_BOOTS, OR(BOW, MAGIC_ROD)), one_way=True) # use boots superhop off top wall or left wall to get on raised blocks
-            area_up.connect(dungeon3_zol_stalfos, AND(FEATHER, OR(BOW, MAGIC_ROD, SWORD)), one_way=True) # use superjump near top blocks chest to get to zol without boots, keep wall clip on right wall to get a clip on left wall or use obstacles
-            area_left_key_drop.connect(area_left, SHIELD) # knock everything into the pit including the teleporting owls
-            dungeon3_south_key_drop.connect(area_down, SHIELD) # knock everything into the pit including the teleporting owls
-            dungeon3_nightmare_key_chest.connect(area_right, AND(FEATHER, SHIELD)) # superjump into jumping stalfos and shield bump to right ledge
-            dungeon3_nightmare_key_chest.connect(area_right, AND(BOMB, PEGASUS_BOOTS, HOOKSHOT)) # boots bonk across the pits with pit buffering and hookshot to the chest
+            area2.connect(dungeon3_raised_blocks_east, r.boots_superhop, one_way=True) # use boots superhop to get over the bottom left block
+            area3.connect(dungeon3_raised_blocks_north, r.boots_superhop, one_way=True) # use boots superhop off top wall or left wall to get on raised blocks
+            area_up.connect(dungeon3_zol_stalfos, AND(r.super_jump_feather, r.attack_skeleton), one_way=True) # use superjump near top blocks chest to get to zol without boots, keep wall clip on right wall to get a clip on left wall or use obstacles
+            area_left_key_drop.connect(area_left, r.shield_bump) # knock everything into the pit including the teleporting owls
+            dungeon3_south_key_drop.connect(area_down, r.shield_bump) # knock everything into the pit including the teleporting owls
+            dungeon3_nightmare_key_chest.connect(area_right, AND(r.super_jump_feather, r.shield_bump)) # superjump into jumping stalfos and shield bump to right ledge
+            dungeon3_nightmare_key_chest.connect(area_right, AND(BOMB, r.pit_buffer_boots, HOOKSHOT)) # boots bonk across the pits with pit buffering and hookshot to the chest
             compass_chest.connect(dungeon3_3_bombite_room, OR(BOW, MAGIC_ROD, AND(OR(FEATHER, PEGASUS_BOOTS), OR(SWORD, MAGIC_POWDER))), one_way=True) # 3 bombite room from the left side, use a bombite to blow open the wall without bombs
             pre_boss.connect(towards_boss4, AND(r.attack_no_boomerang, FEATHER, POWER_BRACELET)) # use bracelet super bounce glitch to pass through first part underground section
-            pre_boss.connect(towards_boss4, AND(r.attack_no_boomerang, PEGASUS_BOOTS, "MEDICINE2")) # use medicine invulnerability to pass through the 2d section with a boots bonk to reach the staircase
+            pre_boss.connect(towards_boss4, AND(r.attack_no_boomerang, r.boots_bonk_2d_spikepit)) # use medicine invulnerability to pass through the 2d section with a boots bonk to reach the staircase
             
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/dungeon4.py b/worlds/ladx/LADXR/logic/dungeon4.py
index 7d71c89f0c86..a7e06557fa12 100644
--- a/worlds/ladx/LADXR/logic/dungeon4.py
+++ b/worlds/ladx/LADXR/logic/dungeon4.py
@@ -42,32 +42,36 @@ def __init__(self, options, world_setup, r):
         boss = Location(dungeon=4).add(HeartContainer(0x166), Instrument(0x162)).connect(before_boss, AND(NIGHTMARE_KEY4, r.boss_requirements[world_setup.boss_mapping[3]]))
 
         if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
-            sidescroller_key.connect(before_miniboss, AND(FEATHER, BOOMERANG)) # grab the key jumping over the water and boomerang downwards
-            sidescroller_key.connect(before_miniboss, AND(POWER_BRACELET, FLIPPERS)) # kill the zols with the pots in the room to spawn the key
-            rightside_crossroads.connect(entrance, FEATHER) # jump across the corners
-            puddle_crack_block_chest.connect(rightside_crossroads, FEATHER) # jump around the bombable block
-            north_crossroads.connect(entrance, FEATHER) # jump across the corners
-            after_double_lock.connect(entrance, FEATHER) # jump across the corners
-            dungeon4_puddle_before_crossroads.connect(after_double_lock, FEATHER) # With a tight jump feather is enough to cross the puddle without flippers
-            center_puddle_chest.connect(before_miniboss, FEATHER) # With a tight jump feather is enough to cross the puddle without flippers
+            sidescroller_key.connect(before_miniboss, BOOMERANG) # fall off the bridge and boomerang downwards before hitting the water to grab the item
+            sidescroller_key.connect(before_miniboss, AND(r.throw_pot, FLIPPERS)) # kill the zols with the pots in the room to spawn the key
+            rightside_crossroads.connect(entrance, r.tight_jump) # jump across the corners
+            puddle_crack_block_chest.connect(rightside_crossroads, r.tight_jump) # jump around the bombable block
+            north_crossroads.connect(entrance, r.tight_jump) # jump across the corners
+            after_double_lock.connect(entrance, r.tight_jump) # jump across the corners
+            dungeon4_puddle_before_crossroads.connect(after_double_lock, r.tight_jump) # With a tight jump feather is enough to cross the puddle without flippers
+            center_puddle_chest.connect(before_miniboss, r.tight_jump) # With a tight jump feather is enough to cross the puddle without flippers
             miniboss = Location(dungeon=4).connect(terrace_zols_chest, None, one_way=True) # reach flippers chest through the miniboss room without pulling the lever
-            to_the_nightmare_key.connect(left_water_area, FEATHER) # With a tight jump feather is enough to reach the top left switch without flippers, or use flippers for puzzle and boots to get through 2d section
-            before_boss.connect(left_water_area, FEATHER) # jump to the bottom right corner of boss door room
+            to_the_nightmare_key.connect(left_water_area, r.tight_jump) # With a tight jump feather is enough to reach the top left switch without flippers, or use flippers for puzzle and boots to get through 2d section
+            before_boss.connect(left_water_area, r.tight_jump) # jump to the bottom right corner of boss door room
             
         if options.logic == 'glitched' or options.logic == 'hell':    
-            pushable_block_chest.connect(rightside_crossroads, FLIPPERS) # sideways block push to skip bombs
-            sidescroller_key.connect(before_miniboss, AND(FEATHER, OR(r.attack_hookshot_powder, POWER_BRACELET))) # superjump into the hole to grab the key while falling into the water
-            miniboss.connect(before_miniboss, FEATHER) # use jesus jump to transition over the water left of miniboss
+            pushable_block_chest.connect(rightside_crossroads, AND(r.sideways_block_push, FLIPPERS)) # sideways block push to skip bombs
+            sidescroller_key.connect(before_miniboss, AND(r.super_jump_feather, OR(r.attack_hookshot_powder, r.throw_pot))) # superjump into the hole to grab the key while falling into the water
+            miniboss.connect(before_miniboss, r.jesus_jump) # use jesus jump to transition over the water left of miniboss
         
         if options.logic == 'hell':
-            rightside_crossroads.connect(entrance, AND(PEGASUS_BOOTS, HOOKSHOT)) # pit buffer into the wall of the first pit, then boots bonk across the center, hookshot to get to the rightmost pit to a second villa buffer on the rightmost pit
-            pushable_block_chest.connect(rightside_crossroads, OR(PEGASUS_BOOTS, FEATHER)) # use feather to water clip into the top right corner of the bombable block, and sideways block push to gain access. Can boots bonk of top right wall, then water buffer to top of chest and boots bonk to water buffer next to chest
-            after_double_lock.connect(double_locked_room, AND(FOUND(KEY4, 4), PEGASUS_BOOTS), one_way=True) # use boots bonks to cross the water gaps
+            rightside_crossroads.connect(entrance, AND(r.pit_buffer_boots, r.hookshot_spam_pit)) # pit buffer into the wall of the first pit, then boots bonk across the center, hookshot to get to the rightmost pit to a second villa buffer on the rightmost pit
+            rightside_crossroads.connect(after_double_lock, AND(OR(BOMB, BOW), r.hookshot_clip_block)) # split zols for more entities, and clip through the block against the right wall
+            pushable_block_chest.connect(rightside_crossroads, AND(r.sideways_block_push, OR(r.jesus_buffer, r.jesus_jump))) # use feather to water clip into the top right corner of the bombable block, and sideways block push to gain access. Can boots bonk of top right wall, then water buffer to top of chest and boots bonk to water buffer next to chest
+            after_double_lock.connect(double_locked_room, AND(FOUND(KEY4, 4), r.pit_buffer_boots), one_way=True) # use boots bonks to cross the water gaps
+            after_double_lock.connect(entrance, r.pit_buffer_boots) # boots bonk + pit buffer to the bottom
+            after_double_lock.connect(entrance, AND(r.pit_buffer, r.hookshot_spam_pit)) # hookshot spam over the first pit of crossroads, then buffer down
+            dungeon4_puddle_before_crossroads.connect(after_double_lock, AND(r.pit_buffer_boots, HOOKSHOT)) # boots bonk across the water bottom wall to the bottom left corner, then hookshot up
             north_crossroads.connect(entrance, AND(PEGASUS_BOOTS, HOOKSHOT)) # pit buffer into wall of the first pit, then boots bonk towards the top and hookshot spam to get across (easier with Piece of Power)
-            after_double_lock.connect(entrance, PEGASUS_BOOTS) # boots bonk + pit buffer to the bottom
-            dungeon4_puddle_before_crossroads.connect(after_double_lock, AND(PEGASUS_BOOTS, HOOKSHOT)) # boots bonk across the water bottom wall to the bottom left corner, then hookshot up
-            to_the_nightmare_key.connect(left_water_area, AND(FLIPPERS, PEGASUS_BOOTS)) #  Use flippers for puzzle and boots bonk to get through 2d section
-            before_boss.connect(left_water_area, PEGASUS_BOOTS) # boots bonk across bottom wall then boots bonk to the platform before boss door
+            before_miniboss.connect(north_crossroads, AND(r.shaq_jump, r.hookshot_clip_block)) # push block left of keyblock up, then shaq jump off the left wall and pause buffer to land on keyblock. 
+            before_miniboss.connect(north_crossroads, AND(OR(BOMB, BOW), r.hookshot_clip_block)) # split zol for more entities, and clip through the block left of keyblock by hookshot spam
+            to_the_nightmare_key.connect(left_water_area, AND(FLIPPERS, r.boots_bonk)) # use flippers for puzzle and boots bonk to get through 2d section
+            before_boss.connect(left_water_area, r.pit_buffer_boots) # boots bonk across bottom wall then boots bonk to the platform before boss door
             
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/dungeon5.py b/worlds/ladx/LADXR/logic/dungeon5.py
index b8e013066c50..b61e48e255d0 100644
--- a/worlds/ladx/LADXR/logic/dungeon5.py
+++ b/worlds/ladx/LADXR/logic/dungeon5.py
@@ -39,43 +39,44 @@ def __init__(self, options, world_setup, r):
 
         if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
             blade_trap_chest.connect(area2, AND(FEATHER, r.attack_hookshot_powder)) # jump past the blade traps
-            boss_key.connect(after_stalfos, AND(FLIPPERS, FEATHER, PEGASUS_BOOTS)) # boots jump across
+            boss_key.connect(after_stalfos, AND(FLIPPERS, r.boots_jump)) # boots jump across
             after_stalfos.connect(after_keyblock_boss, AND(FEATHER, r.attack_hookshot_powder)) # circumvent stalfos by going past gohma and backwards from boss door
             if butterfly_owl:
-                butterfly_owl.connect(after_stalfos, AND(PEGASUS_BOOTS, STONE_BEAK5)) # boots charge + bonk to cross 2d bridge
-            after_stalfos.connect(staircase_before_boss, AND(PEGASUS_BOOTS, r.attack_hookshot_powder), one_way=True) # pathway from stalfos to staircase: boots charge + bonk to cross bridge, past butterfly room and push the block
-            staircase_before_boss.connect(post_gohma, AND(PEGASUS_BOOTS, HOOKSHOT)) # boots bonk in 2d section to skip feather
-            north_of_crossroads.connect(after_stalfos, HOOKSHOT) # hookshot to the right block to cross pits
-            first_bridge_chest.connect(north_of_crossroads, FEATHER) # tight jump from bottom wall clipped to make it over the pits
+                butterfly_owl.connect(after_stalfos, AND(r.boots_bonk, STONE_BEAK5)) # boots charge + bonk to cross 2d bridge
+            after_stalfos.connect(staircase_before_boss, AND(r.boots_bonk, r.attack_hookshot_powder), one_way=True) # pathway from stalfos to staircase: boots charge + bonk to cross bridge, past butterfly room and push the block
+            staircase_before_boss.connect(post_gohma, AND(r.boots_bonk, HOOKSHOT)) # boots bonk in 2d section to skip feather
+            north_of_crossroads.connect(after_stalfos, r.hookshot_over_pit) # hookshot to the right block to cross pits
+            first_bridge_chest.connect(north_of_crossroads, AND(r.wall_clip, r.tight_jump)) # tight jump from bottom wall clipped to make it over the pits
             after_keyblock_boss.connect(after_stalfos, AND(FEATHER, r.attack_hookshot_powder)) # jump from bottom left to top right, skipping the keyblock 
-            before_boss.connect(after_stalfos, AND(FEATHER, PEGASUS_BOOTS, r.attack_hookshot_powder)) # cross pits room from bottom left to top left with boots jump
+            before_boss.connect(after_stalfos, AND(r.boots_jump, r.attack_hookshot_powder)) # cross pits room from bottom left to top left with boots jump
             
         if options.logic == 'glitched' or options.logic == 'hell':
-            start_hookshot_chest.connect(entrance, FEATHER) # 1 pit buffer to clip bottom wall and jump across the pits
+            start_hookshot_chest.connect(entrance, r.pit_buffer) # 1 pit buffer to clip bottom wall and jump across the pits
             post_gohma.connect(area2, HOOKSHOT) # glitch through the blocks/pots with hookshot. Zoomerang can be used but has no logical implications because of 2d section requiring hookshot
-            north_bridge_chest.connect(north_of_crossroads, FEATHER) # 1 pit buffer to clip bottom wall and jump across the pits
-            east_bridge_chest.connect(first_bridge_chest, FEATHER) # 1 pit buffer to clip bottom wall and jump across the pits
-            #after_stalfos.connect(staircase_before_boss, AND(FEATHER, OR(SWORD, BOW, MAGIC_ROD))) # use the keyblock to get a wall clip in right wall to perform a superjump over the pushable block TODO: nagmessages
-            after_stalfos.connect(staircase_before_boss, AND(PEGASUS_BOOTS, FEATHER, OR(SWORD, BOW, MAGIC_ROD))) # charge a boots dash in bottom right corner to the right, jump before hitting the wall and use weapon to the left side before hitting the wall
+            north_bridge_chest.connect(north_of_crossroads, r.pit_buffer) # 1 pit buffer to clip bottom wall and jump across the pits
+            east_bridge_chest.connect(first_bridge_chest, r.pit_buffer) # 1 pit buffer to clip bottom wall and jump across the pits
+            #after_stalfos.connect(staircase_before_boss, AND(r.text_clip, r.super_jump)) # use the keyblock to get a wall clip in right wall to perform a superjump over the pushable block
+            after_stalfos.connect(staircase_before_boss, r.super_jump_boots) # charge a boots dash in bottom right corner to the right, jump before hitting the wall and use weapon to the left side before hitting the wall
          
         if  options.logic == 'hell':
-            start_hookshot_chest.connect(entrance, PEGASUS_BOOTS) # use pit buffer to clip into the bottom wall and boots bonk off the wall again
-            fourth_stalfos_area.connect(compass, AND(PEGASUS_BOOTS, SWORD)) # do an incredibly hard boots bonk setup to get across the hanging platforms in the 2d section
-            blade_trap_chest.connect(area2, AND(PEGASUS_BOOTS, r.attack_hookshot_powder)) # boots bonk + pit buffer past the blade traps
+            start_hookshot_chest.connect(entrance, r.pit_buffer_boots) # use pit buffer to clip into the bottom wall and boots bonk off the wall again
+            fourth_stalfos_area.connect(compass, AND(r.boots_bonk_2d_hell, SWORD)) # do an incredibly hard boots bonk setup to get across the hanging platforms in the 2d section
+            blade_trap_chest.connect(area2, AND(r.pit_buffer_boots, r.attack_hookshot_powder)) # boots bonk + pit buffer past the blade traps
             post_gohma.connect(area2, AND(PEGASUS_BOOTS, FEATHER, POWER_BRACELET, r.attack_hookshot_powder)) # use boots jump in room with 2 zols + flying arrows to pit buffer above pot, then jump across. Sideways block push + pick up pots to reach post_gohma
-            staircase_before_boss.connect(post_gohma, AND(PEGASUS_BOOTS, FEATHER)) # to pass 2d section, tight jump on left screen: hug left wall on little platform, then dash right off platform and jump while in midair to bonk against right wall
-            after_stalfos.connect(staircase_before_boss, AND(FEATHER, SWORD)) # unclipped superjump in bottom right corner of staircase before boss room, jumping left over the pushable block. reverse is push block
+            staircase_before_boss.connect(post_gohma, r.boots_jump) # to pass 2d section, tight jump on left screen: hug left wall on little platform, then dash right off platform and jump while in midair to bonk against right wall
+            after_stalfos.connect(staircase_before_boss, r.super_jump_sword) # unclipped superjump in bottom right corner of staircase before boss room, jumping left over the pushable block. reverse is push block
             after_stalfos.connect(area2, SWORD) # knock master stalfos down 255 times (about 23 minutes)
-            north_bridge_chest.connect(north_of_crossroads, PEGASUS_BOOTS) # boots bonk across the pits with pit buffering
-            first_bridge_chest.connect(north_of_crossroads, PEGASUS_BOOTS) # get to first chest via the north chest with pit buffering
-            east_bridge_chest.connect(first_bridge_chest, PEGASUS_BOOTS) # boots bonk across the pits with pit buffering
+            after_stalfos.connect(staircase_before_boss, r.zoomerang) # use zoomerang dashing left to get an unclipped boots superjump off the right wall over the block. reverse is push block
+            north_bridge_chest.connect(north_of_crossroads, r.boots_bonk_pit) # boots bonk across the pits with pit buffering
+            first_bridge_chest.connect(north_of_crossroads, r.boots_bonk_pit) # get to first chest via the north chest with pit buffering
+            east_bridge_chest.connect(first_bridge_chest, r.boots_bonk_pit) # boots bonk across the pits with pit buffering
             third_arena.connect(north_of_crossroads, SWORD) # can beat 3rd m.stalfos with 255 sword spins
             m_stalfos_drop.connect(third_arena, AND(FEATHER, SWORD)) # beat master stalfos by knocking it down 255 times x 4 (takes about 1.5h total)
-            m_stalfos_drop.connect(third_arena, AND(PEGASUS_BOOTS, SWORD)) # can reach fourth arena from entrance with pegasus boots and sword
-            boss_key.connect(after_stalfos, FLIPPERS) # pit buffer across
+            m_stalfos_drop.connect(third_arena, AND(r.boots_bonk_2d_hell, SWORD)) # can reach fourth arena from entrance with pegasus boots and sword
+            boss_key.connect(after_stalfos, AND(r.pit_buffer_itemless, FLIPPERS)) # pit buffer across
             if butterfly_owl:
-                after_keyblock_boss.connect(butterfly_owl, STONE_BEAK5, one_way=True) # pit buffer from top right to bottom in right pits room
-            before_boss.connect(after_stalfos, AND(FEATHER, SWORD)) # cross pits room from bottom left to top left by unclipped superjump on bottom wall on top of side wall, then jump across            
+                after_keyblock_boss.connect(butterfly_owl, AND(r.pit_buffer_itemless, STONE_BEAK5), one_way=True) # pit buffer from top right to bottom in right pits room
+            before_boss.connect(after_stalfos, r.super_jump_sword) # cross pits room from bottom left to top left by unclipped superjump on bottom wall on top of side wall, then jump across            
 
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/dungeon6.py b/worlds/ladx/LADXR/logic/dungeon6.py
index d67138b334a6..cde40a6b2df4 100644
--- a/worlds/ladx/LADXR/logic/dungeon6.py
+++ b/worlds/ladx/LADXR/logic/dungeon6.py
@@ -6,8 +6,8 @@
 class Dungeon6:
     def __init__(self, options, world_setup, r, *, raft_game_chest=True):
         entrance = Location(dungeon=6)
-        Location(dungeon=6).add(DungeonChest(0x1CF)).connect(entrance, OR(BOMB, BOW, MAGIC_ROD, COUNT(POWER_BRACELET, 2))) # 50 rupees
-        Location(dungeon=6).add(DungeonChest(0x1C9)).connect(entrance, COUNT(POWER_BRACELET, 2)) # 100 rupees start
+        Location(dungeon=6).add(DungeonChest(0x1CF)).connect(entrance, OR(r.attack_wizrobe, COUNT(POWER_BRACELET, 2))) # 50 rupees
+        elephants_heart_chest = Location(dungeon=6).add(DungeonChest(0x1C9)).connect(entrance, COUNT(POWER_BRACELET, 2)) # 100 rupees start
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=6).add(OwlStatue(0x1BB)).connect(entrance, STONE_BEAK6)
 
@@ -15,9 +15,9 @@ def __init__(self, options, world_setup, r, *, raft_game_chest=True):
         bracelet_chest = Location(dungeon=6).add(DungeonChest(0x1CE)).connect(entrance, AND(BOMB, FEATHER))
 
         # left side
-        Location(dungeon=6).add(DungeonChest(0x1C0)).connect(entrance, AND(POWER_BRACELET, OR(BOMB, BOW, MAGIC_ROD))) # 3 wizrobes raised blocks dont need to hit the switch
+        Location(dungeon=6).add(DungeonChest(0x1C0)).connect(entrance, AND(POWER_BRACELET, r.attack_wizrobe)) # 3 wizrobes raised blocks don't need to hit the switch
         left_side = Location(dungeon=6).add(DungeonChest(0x1B9)).add(DungeonChest(0x1B3)).connect(entrance, AND(POWER_BRACELET, OR(BOMB, BOOMERANG)))
-        Location(dungeon=6).add(DroppedKey(0x1B4)).connect(left_side, OR(BOMB, BOW, MAGIC_ROD)) # 2 wizrobe drop key
+        Location(dungeon=6).add(DroppedKey(0x1B4)).connect(left_side, OR(r.attack_wizrobe, BOW)) # 2 wizrobe drop key, allow bow as only 2
         top_left = Location(dungeon=6).add(DungeonChest(0x1B0)).connect(left_side, COUNT(POWER_BRACELET, 2)) # top left chest horseheads
         if raft_game_chest:
             Location().add(Chest(0x06C)).connect(top_left, POWER_BRACELET)  # seashell chest in raft game
@@ -25,14 +25,15 @@ def __init__(self, options, world_setup, r, *, raft_game_chest=True):
         # right side
         to_miniboss = Location(dungeon=6).connect(entrance, KEY6)
         miniboss = Location(dungeon=6).connect(to_miniboss, AND(BOMB, r.miniboss_requirements[world_setup.miniboss_mapping[5]]))
-        lower_right_side = Location(dungeon=6).add(DungeonChest(0x1BE)).connect(entrance, AND(OR(BOMB, BOW, MAGIC_ROD), COUNT(POWER_BRACELET, 2))) # waterway key
+        lower_right_side = Location(dungeon=6).add(DungeonChest(0x1BE)).connect(entrance, AND(r.attack_wizrobe, COUNT(POWER_BRACELET, 2))) # waterway key
         medicine_chest = Location(dungeon=6).add(DungeonChest(0x1D1)).connect(lower_right_side, FEATHER) # ledge chest medicine
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             lower_right_owl = Location(dungeon=6).add(OwlStatue(0x1D7)).connect(lower_right_side, AND(POWER_BRACELET, STONE_BEAK6))
 
         center_1 = Location(dungeon=6).add(DroppedKey(0x1C3)).connect(miniboss, AND(COUNT(POWER_BRACELET, 2), FEATHER)) # tile room key drop
-        center_2_and_upper_right_side = Location(dungeon=6).add(DungeonChest(0x1B1)).connect(center_1, AND(KEY6, FOUND(KEY6, 2))) # top right chest horseheads
+        center_2_and_upper_right_side = Location(dungeon=6).add(DungeonChest(0x1B1)).connect(center_1, AND(COUNT(POWER_BRACELET, 2), PEGASUS_BOOTS, r.attack_pols_voice, KEY6, FOUND(KEY6, 2))) # top right chest horseheads
         boss_key = Location(dungeon=6).add(DungeonChest(0x1B6)).connect(center_2_and_upper_right_side, AND(AND(KEY6, FOUND(KEY6, 3), HOOKSHOT)))
+        center_2_and_upper_right_side.connect(boss_key, AND(HOOKSHOT, POWER_BRACELET, KEY6, FOUND(KEY6, 3)), one_way=True)        
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=6).add(OwlStatue(0x1B6)).connect(boss_key, STONE_BEAK6)
 
@@ -40,19 +41,22 @@ def __init__(self, options, world_setup, r, *, raft_game_chest=True):
 
         if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
             bracelet_chest.connect(entrance, BOMB) # get through 2d section by "fake" jumping to the ladders
-            center_1.connect(miniboss, AND(COUNT(POWER_BRACELET, 2), PEGASUS_BOOTS)) # use a boots dash to get over the platforms
-            
+            center_1.connect(miniboss, AND(COUNT(POWER_BRACELET, 2), r.boots_dash_2d)) # use a boots dash to get over the platforms
+            center_2_and_upper_right_side.connect(center_1, AND(COUNT(POWER_BRACELET, 2), r.damage_boost, r.attack_pols_voice, FOUND(KEY6, 2))) # damage_boost past the mini_thwomps
+        
         if options.logic == 'glitched' or options.logic == 'hell':
-            entrance.connect(left_side, AND(POWER_BRACELET, FEATHER), one_way=True) # path from entrance to left_side: use superjumps to pass raised blocks
-            lower_right_side.connect(center_2_and_upper_right_side, AND(FEATHER, OR(SWORD, BOW, MAGIC_ROD)), one_way=True) # path from lower_right_side to center_2:  superjump from waterway towards dodongos. superjump next to corner block, so weapons added
-            center_2_and_upper_right_side.connect(center_1, AND(POWER_BRACELET, FEATHER), one_way=True) # going backwards from dodongos, use a shaq jump to pass by keyblock at tile room
-            boss_key.connect(lower_right_side, FEATHER) # superjump from waterway to the left. POWER_BRACELET is implied from lower_right_side
+            elephants_heart_chest.connect(entrance, BOMB) # kill moldorm on screen above wizrobes, then bomb trigger on the right side to break elephant statue to get to the second chest
+            entrance.connect(left_side, AND(POWER_BRACELET, r.super_jump_feather), one_way=True) # path from entrance to left_side: use superjumps to pass raised blocks
+            lower_right_side.connect(center_2_and_upper_right_side, r.super_jump, one_way=True) # path from lower_right_side to center_2:  superjump from waterway towards dodongos. superjump next to corner block, so weapons added
+            center_1.connect(miniboss, AND(r.bomb_trigger, OR(r.boots_dash_2d, FEATHER))) # bomb trigger the elephant statue after the miniboss
+            center_2_and_upper_right_side.connect(center_1, AND(POWER_BRACELET, r.shaq_jump), one_way=True) # going backwards from dodongos, use a shaq jump to pass by keyblock at tile room
+            boss_key.connect(lower_right_side, AND(POWER_BRACELET, r.super_jump_feather)) # superjump from waterway to the left.
 
         if options.logic == 'hell':
-            entrance.connect(left_side, AND(POWER_BRACELET, PEGASUS_BOOTS, OR(BOW, MAGIC_ROD)), one_way=True) # can boots superhop off the top right corner in 3 wizrobe raised blocks room
-            medicine_chest.connect(lower_right_side, AND(PEGASUS_BOOTS, OR(MAGIC_ROD, BOW))) # can boots superhop off the top wall with bow or magic rod
-            center_1.connect(miniboss, AND(COUNT(POWER_BRACELET, 2))) # use a double damage boost from the sparks to get across (first one is free, second one needs to buffer while in midair for spark to get close enough)
-            lower_right_side.connect(center_2_and_upper_right_side, FEATHER, one_way=True) # path from lower_right_side to center_2:  superjump from waterway towards dodongos. superjump next to corner block is super tight to get enough horizontal distance
+            entrance.connect(left_side, AND(POWER_BRACELET, r.boots_superhop), one_way=True) # can boots superhop off the top right corner in 3 wizrobe raised blocks room
+            medicine_chest.connect(lower_right_side, r.boots_superhop) # can boots superhop off the top wall with bow or magic rod
+            center_1.connect(miniboss, AND(r.damage_boost_special, OR(r.bomb_trigger, COUNT(POWER_BRACELET, 2)))) # use a double damage boost from the sparks to get across (first one is free, second one needs to buffer while in midair for spark to get close enough)
+            lower_right_side.connect(center_2_and_upper_right_side, r.super_jump_feather, one_way=True) # path from lower_right_side to center_2:  superjump from waterway towards dodongos. superjump next to corner block is super tight to get enough horizontal distance
             
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/dungeon7.py b/worlds/ladx/LADXR/logic/dungeon7.py
index 594b4d083ca7..6188138f38ef 100644
--- a/worlds/ladx/LADXR/logic/dungeon7.py
+++ b/worlds/ladx/LADXR/logic/dungeon7.py
@@ -14,8 +14,8 @@ def __init__(self, options, world_setup, r):
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=7).add(OwlStatue(0x204)).connect(topright_pillar_area, STONE_BEAK7)
         topright_pillar_area.add(DungeonChest(0x209))  # stone slab chest can be reached by dropping down a hole
-        three_of_a_kind_north = Location(dungeon=7).add(DungeonChest(0x211)).connect(topright_pillar_area, OR(r.attack_hookshot, AND(FEATHER, SHIELD)))  # compass chest; path without feather with hitting switch by falling on the raised blocks. No bracelet because ball does not reset
-        bottomleftF2_area = Location(dungeon=7).connect(topright_pillar_area, r.attack_hookshot)  # area with hinox, be able to hit a switch to reach that area
+        three_of_a_kind_north = Location(dungeon=7).add(DungeonChest(0x211)).connect(topright_pillar_area, OR(AND(r.hit_switch, r.attack_hookshot_no_bomb), AND(OR(BOMB, FEATHER), SHIELD)))  # compass chest; either hit the switch, or have feather to fall on top of raised blocks. No bracelet because ball does not reset
+        bottomleftF2_area = Location(dungeon=7).connect(topright_pillar_area, r.hit_switch)  # area with hinox, be able to hit a switch to reach that area
         topleftF1_chest = Location(dungeon=7).add(DungeonChest(0x201)) # top left chest on F1
         bottomleftF2_area.connect(topleftF1_chest, None, one_way = True)  # drop down in left most holes of hinox room or tile room
         Location(dungeon=7).add(DroppedKey(0x21B)).connect(bottomleftF2_area, r.attack_hookshot) # hinox drop key
@@ -23,9 +23,9 @@ def __init__(self, options, world_setup, r):
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             bottomleft_owl = Location(dungeon=7).add(OwlStatue(0x21C)).connect(bottomleftF2_area, AND(BOMB, STONE_BEAK7))
         nightmare_key = Location(dungeon=7).add(DungeonChest(0x224)).connect(bottomleftF2_area, r.miniboss_requirements[world_setup.miniboss_mapping[6]]) # nightmare key after the miniboss
-        mirror_shield_chest = Location(dungeon=7).add(DungeonChest(0x21A)).connect(bottomleftF2_area, r.attack_hookshot)  # mirror shield chest, need to be able to hit a switch to reach or
+        mirror_shield_chest = Location(dungeon=7).add(DungeonChest(0x21A)).connect(bottomleftF2_area, r.hit_switch)  # mirror shield chest, need to be able to hit a switch to reach or
         bottomleftF2_area.connect(mirror_shield_chest, AND(KEY7, FOUND(KEY7, 3)), one_way = True) # reach mirror shield chest from hinox area by opening keyblock
-        toprightF1_chest = Location(dungeon=7).add(DungeonChest(0x204)).connect(bottomleftF2_area, r.attack_hookshot)  # chest on the F1 right ledge. Added attack_hookshot since switch needs to be hit to get back up
+        toprightF1_chest = Location(dungeon=7).add(DungeonChest(0x204)).connect(bottomleftF2_area, r.hit_switch)  # chest on the F1 right ledge. Added attack_hookshot since switch needs to be hit to get back up
         final_pillar_area = Location(dungeon=7).add(DungeonChest(0x21C)).connect(bottomleftF2_area, AND(BOMB, HOOKSHOT))  # chest that needs to spawn to get to the last pillar
         final_pillar = Location(dungeon=7).connect(final_pillar_area, POWER_BRACELET) # decouple chest from pillar
 
@@ -33,25 +33,28 @@ def __init__(self, options, world_setup, r):
         beamos_horseheads = Location(dungeon=7).add(DungeonChest(0x220)).connect(beamos_horseheads_area, POWER_BRACELET) # 100 rupee chest / medicine chest (DX) behind boss door
         pre_boss = Location(dungeon=7).connect(beamos_horseheads_area, HOOKSHOT) # raised plateau before boss staircase
         boss = Location(dungeon=7).add(HeartContainer(0x223), Instrument(0x22c)).connect(pre_boss, r.boss_requirements[world_setup.boss_mapping[6]])
-                
+
+        if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
+            three_of_a_kind_north.connect(topright_pillar_area, BOMB) # use timed bombs to match the 3 of a kinds (south 3 of a kind room is implicite as normal logic can not reach chest without hookshot)
+            
         if options.logic == 'glitched' or options.logic == 'hell':
-            topright_pillar_area.connect(entrance, AND(FEATHER, SWORD)) # superjump in the center to get on raised blocks, superjump in switch room to right side to walk down. center superjump has to be low so sword added
-            toprightF1_chest.connect(topright_pillar_area, FEATHER) # superjump from F1 switch room
-            topleftF2_area = Location(dungeon=7).connect(topright_pillar_area, FEATHER) # superjump in top left pillar room over the blocks from right to left, to reach tile room
+            topright_pillar_area.connect(entrance, r.super_jump_sword) # superjump in the center to get on raised blocks, superjump in switch room to right side to walk down. center superjump has to be low so sword added
+            toprightF1_chest.connect(topright_pillar_area, r.super_jump_feather) # superjump from F1 switch room
+            topleftF2_area = Location(dungeon=7).connect(topright_pillar_area, r.super_jump_feather) # superjump in top left pillar room over the blocks from right to left, to reach tile room
             topleftF2_area.connect(topleftF1_chest, None, one_way = True) # fall down tile room holes on left side to reach top left chest on ground floor
-            topleftF1_chest.connect(bottomleftF2_area, AND(PEGASUS_BOOTS, FEATHER), one_way = True) # without hitting the switch, jump on raised blocks at f1 pegs chest (0x209), and boots jump to stairs to reach hinox area
-            final_pillar_area.connect(bottomleftF2_area, OR(r.attack_hookshot, POWER_BRACELET, AND(FEATHER, SHIELD))) # sideways block push to get to the chest and pillar, kill requirement for 3 of a kind enemies to access chest. Assumes you do not get ball stuck on raised pegs for bracelet path
+            topleftF1_chest.connect(bottomleftF2_area, r.boots_jump, one_way = True) # without hitting the switch, jump on raised blocks at f1 pegs chest (0x209), and boots jump to stairs to reach hinox area
+            final_pillar_area.connect(bottomleftF2_area, AND(r.sideways_block_push, OR(r.attack_hookshot, POWER_BRACELET, AND(FEATHER, SHIELD)))) # sideways block push to get to the chest and pillar, kill requirement for 3 of a kind enemies to access chest. Assumes you do not get ball stuck on raised pegs for bracelet path
             if options.owlstatues == "both" or options.owlstatues == "dungeon":
-                bottomleft_owl.connect(bottomleftF2_area, STONE_BEAK7) # sideways block push to get to the owl statue
+                bottomleft_owl.connect(bottomleftF2_area, AND(r.sideways_block_push, STONE_BEAK7)) # sideways block push to get to the owl statue
             final_pillar.connect(bottomleftF2_area, BOMB) # bomb trigger pillar
-            pre_boss.connect(final_pillar, FEATHER) # superjump on top of goomba to extend superjump to boss door plateau
+            pre_boss.connect(final_pillar, r.super_jump_feather) # superjump on top of goomba to extend superjump to boss door plateau
             pre_boss.connect(beamos_horseheads_area, None, one_way=True) # can drop down from raised plateau to beamos horseheads area
             
         if options.logic == 'hell':
-            topright_pillar_area.connect(entrance, FEATHER) # superjump in the center to get on raised blocks, has to be low
-            topright_pillar_area.connect(entrance, AND(PEGASUS_BOOTS, OR(BOW, MAGIC_ROD))) # boots superhop in the center to get on raised blocks
-            toprightF1_chest.connect(topright_pillar_area, AND(PEGASUS_BOOTS, OR(BOW, MAGIC_ROD))) # boots superhop from F1 switch room
-            pre_boss.connect(final_pillar, AND(PEGASUS_BOOTS, OR(BOW, MAGIC_ROD))) # boots superhop on top of goomba to extend superhop to boss door plateau
+            topright_pillar_area.connect(entrance, r.super_jump_feather) # superjump in the center to get on raised blocks, has to be low
+            topright_pillar_area.connect(entrance, r.boots_superhop) # boots superhop in the center to get on raised blocks
+            toprightF1_chest.connect(topright_pillar_area, r.boots_superhop) # boots superhop from F1 switch room
+            pre_boss.connect(final_pillar, r.boots_superhop) # boots superhop on top of goomba to extend superhop to boss door plateau
         
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/dungeon8.py b/worlds/ladx/LADXR/logic/dungeon8.py
index 4444ecbb1419..5da2f8234ec4 100644
--- a/worlds/ladx/LADXR/logic/dungeon8.py
+++ b/worlds/ladx/LADXR/logic/dungeon8.py
@@ -11,7 +11,10 @@ def __init__(self, options, world_setup, r, *, back_entrance_heartpiece=True):
 
         # left side
         entrance_left.add(DungeonChest(0x24D)) # zamboni room chest
-        Location(dungeon=8).add(DungeonChest(0x25C)).connect(entrance_left, r.attack_hookshot) # eye magnet chest
+        eye_magnet_chest = Location(dungeon=8).add(DungeonChest(0x25C)) # eye magnet chest bottom left below rolling bones
+        eye_magnet_chest.connect(entrance_left, OR(BOW, MAGIC_ROD, BOOMERANG, AND(FEATHER, r.attack_hookshot))) # damageless roller should be default        
+        if options.hardmode != "ohko":
+            eye_magnet_chest.connect(entrance_left, r.attack_hookshot) # can take a hit
         vire_drop_key = Location(dungeon=8).add(DroppedKey(0x24C)).connect(entrance_left, r.attack_hookshot_no_bomb) # vire drop key
         sparks_chest = Location(dungeon=8).add(DungeonChest(0x255)).connect(entrance_left, OR(HOOKSHOT, FEATHER))  # chest before lvl1 miniboss
         Location(dungeon=8).add(DungeonChest(0x246)).connect(entrance_left, MAGIC_ROD)  # key chest that spawns after creating fire
@@ -30,7 +33,7 @@ def __init__(self, options, world_setup, r, *, back_entrance_heartpiece=True):
         upper_center = Location(dungeon=8).connect(lower_center, AND(KEY8, FOUND(KEY8, 2)))
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=8).add(OwlStatue(0x245)).connect(upper_center, STONE_BEAK8)
-        Location(dungeon=8).add(DroppedKey(0x23E)).connect(upper_center, r.attack_skeleton) # 2 gibdos cracked floor; technically possible to use pits to kill but dumb
+        gibdos_drop_key = Location(dungeon=8).add(DroppedKey(0x23E)).connect(upper_center, r.attack_gibdos) # 2 gibdos cracked floor; technically possible to use pits to kill but dumb
         medicine_chest = Location(dungeon=8).add(DungeonChest(0x235)).connect(upper_center, AND(FEATHER, HOOKSHOT))  # medicine chest
 
         middle_center_1 = Location(dungeon=8).connect(upper_center, BOMB)
@@ -66,33 +69,36 @@ def __init__(self, options, world_setup, r, *, back_entrance_heartpiece=True):
         
         if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
             entrance_left.connect(entrance, BOMB) # use bombs to kill vire and hinox
-            vire_drop_key.connect(entrance_left, BOMB) # use bombs to kill rolling bones and vire
-            bottom_right.connect(slime_chest, FEATHER) # diagonal jump over the pits to reach rolling rock / zamboni
+            up_left.connect(vire_drop_key, BOMB, one_way=True) # use bombs to kill rolling bones and vire, do not allow pathway through hinox with just bombs, as not enough bombs are available
+            bottom_right.connect(slime_chest, r.tight_jump) # diagonal jump over the pits to reach rolling rock / zamboni
+            gibdos_drop_key.connect(upper_center, OR(HOOKSHOT, MAGIC_ROD)) # crack one of the floor tiles and hookshot the gibdos in, or burn the gibdos and make them jump into pit
             up_left.connect(lower_center, AND(BOMB, FEATHER)) # blow up hidden walls from peahat room -> dark room -> eye statue room
             slime_chest.connect(entrance, AND(r.attack_hookshot_powder, POWER_BRACELET))  # kill vire with powder or bombs 
         
         if options.logic == 'glitched' or options.logic == 'hell':
-            sparks_chest.connect(entrance_left, OR(r.attack_hookshot, FEATHER, PEGASUS_BOOTS)) # 1 pit buffer across the pit. Add requirements for all the options to get to this area
-            lower_center.connect(entrance_up, None) # sideways block push in peahat room to get past keyblock
-            miniboss_entrance.connect(lower_center, AND(BOMB, FEATHER, HOOKSHOT)) # blow up hidden wall for darkroom, use feather + hookshot to clip past keyblock in front of stairs
-            miniboss_entrance.connect(lower_center, AND(BOMB, FEATHER, FOUND(KEY8, 7))) # same as above, but without clipping past the keyblock
-            up_left.connect(lower_center, FEATHER) # use jesus jump in refill room left of peahats to clip bottom wall and push bottom block left, to get a place to super jump
-            up_left.connect(upper_center, FEATHER) # from up left you can jesus jump / lava swim around the key door next to the boss.
-            top_left_stairs.connect(up_left, AND(FEATHER, SWORD)) # superjump
-            medicine_chest.connect(upper_center, FEATHER) # jesus super jump
-            up_left.connect(bossdoor, FEATHER, one_way=True) # superjump off the bottom or right wall to jump over to the boss door
+            sparks_chest.connect(entrance_left, r.pit_buffer_itemless) # 1 pit buffer across the pit. 
+            entrance_up.connect(bottomright_pot_chest, r.super_jump_boots, one_way = True) # underground section with fire balls jumping up out of lava. Use boots superjump off left wall to jump over the pot blocking the way
+            lower_center.connect(entrance_up, r.sideways_block_push) # sideways block push in peahat room to get past keyblock
+            miniboss_entrance.connect(lower_center, AND(BOMB, r.bookshot)) # blow up hidden wall for darkroom, use feather + hookshot to clip past keyblock in front of stairs
+            miniboss_entrance.connect(lower_center, AND(BOMB, r.super_jump_feather, FOUND(KEY8, 7))) # same as above, but without clipping past the keyblock
+            up_left.connect(lower_center, r.jesus_jump) # use jesus jump in refill room left of peahats to clip bottom wall and push bottom block left, to get a place to super jump
+            up_left.connect(upper_center, r.jesus_jump) # from up left you can jesus jump / lava swim around the key door next to the boss.
+            top_left_stairs.connect(up_left, r.super_jump_feather) # superjump
+            medicine_chest.connect(upper_center, AND(r.super_jump_feather, r.jesus_jump)) # jesus super jump
+            up_left.connect(bossdoor, r.super_jump_feather, one_way=True) # superjump off the bottom or right wall to jump over to the boss door
 
         if options.logic == 'hell':
             if bottomright_owl:
-                bottomright_owl.connect(entrance, AND(SWORD, POWER_BRACELET, PEGASUS_BOOTS, STONE_BEAK8)) # underground section past mimics, boots bonking across the gap to the ladder
-            bottomright_pot_chest.connect(entrance, AND(SWORD, POWER_BRACELET, PEGASUS_BOOTS)) # underground section past mimics, boots bonking across the gap to the ladder
-            entrance.connect(bottomright_pot_chest, AND(FEATHER, SWORD), one_way=True) # use NW zamboni staircase backwards, subpixel manip for superjump past the pots
-            medicine_chest.connect(upper_center, AND(PEGASUS_BOOTS, HOOKSHOT)) # boots bonk + lava buffer to the bottom wall, then bonk onto the middle section
-            miniboss.connect(miniboss_entrance, AND(PEGASUS_BOOTS, r.miniboss_requirements[world_setup.miniboss_mapping[7]])) # get through 2d section with boots bonks
-            top_left_stairs.connect(map_chest, AND(PEGASUS_BOOTS, MAGIC_ROD)) # boots bonk + lava buffer from map chest to entrance_up, then boots bonk through 2d section
-            nightmare_key.connect(top_left_stairs, AND(PEGASUS_BOOTS, SWORD, FOUND(KEY8, 7))) # use a boots bonk to cross the 2d section + the lava in cueball room
-            bottom_right.connect(entrance_up, AND(POWER_BRACELET, PEGASUS_BOOTS), one_way=True) # take staircase to NW zamboni room, boots bonk onto the lava and water buffer all the way down to push the zamboni
-            bossdoor.connect(entrance_up, AND(PEGASUS_BOOTS, MAGIC_ROD)) # boots bonk through 2d section
+                bottomright_owl.connect(entrance, AND(SWORD, POWER_BRACELET, r.boots_bonk_2d_hell, STONE_BEAK8)) # underground section past mimics, boots bonking across the gap to the ladder
+            bottomright_pot_chest.connect(entrance, AND(SWORD, POWER_BRACELET, r.boots_bonk_2d_hell)) # underground section past mimics, boots bonking across the gap to the ladder
+            entrance.connect(bottomright_pot_chest, r.shaq_jump, one_way=True) # use NW zamboni staircase backwards, and get a naked shaq jump off the bottom wall in the bottom right corner to pass by the pot
+            gibdos_drop_key.connect(upper_center, AND(FEATHER, SHIELD)) # lock gibdos into pits and crack the tile they stand on, then use shield to bump them into the pit
+            medicine_chest.connect(upper_center, AND(r.pit_buffer_boots, HOOKSHOT)) # boots bonk + lava buffer to the bottom wall, then bonk onto the middle section
+            miniboss.connect(miniboss_entrance, AND(r.boots_bonk_2d_hell, r.miniboss_requirements[world_setup.miniboss_mapping[7]])) # get through 2d section with boots bonks
+            top_left_stairs.connect(map_chest, AND(r.jesus_buffer, r.boots_bonk_2d_hell, MAGIC_ROD)) # boots bonk + lava buffer from map chest to entrance_up, then boots bonk through 2d section
+            nightmare_key.connect(top_left_stairs, AND(r.boots_bonk_pit, SWORD, FOUND(KEY8, 7))) # use a boots bonk to cross the 2d section + the lava in cueball room
+            bottom_right.connect(entrance_up, AND(POWER_BRACELET, r.jesus_buffer), one_way=True) # take staircase to NW zamboni room, boots bonk onto the lava and water buffer all the way down to push the zamboni
+            bossdoor.connect(entrance_up, AND(r.boots_bonk_2d_hell, MAGIC_ROD)) # boots bonk through 2d section
             
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/dungeonColor.py b/worlds/ladx/LADXR/logic/dungeonColor.py
index aa58c0bafa91..fc14f70dd7a6 100644
--- a/worlds/ladx/LADXR/logic/dungeonColor.py
+++ b/worlds/ladx/LADXR/logic/dungeonColor.py
@@ -10,7 +10,7 @@ def __init__(self, options, world_setup, r):
         room2.add(DungeonChest(0x314))  # key
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=9).add(OwlStatue(0x308), OwlStatue(0x30F)).connect(room2, STONE_BEAK9)
-        room2_weapon = Location(dungeon=9).connect(room2, r.attack_hookshot)
+        room2_weapon = Location(dungeon=9).connect(room2, AND(r.attack_hookshot, POWER_BRACELET))
         room2_weapon.add(DungeonChest(0x311))  # stone beak
         room2_lights = Location(dungeon=9).connect(room2, OR(r.attack_hookshot, SHIELD))
         room2_lights.add(DungeonChest(0x30F))  # compass chest
@@ -20,22 +20,24 @@ def __init__(self, options, world_setup, r):
         room3 = Location(dungeon=9).connect(room2, AND(KEY9, FOUND(KEY9, 2), r.miniboss_requirements[world_setup.miniboss_mapping["c1"]])) # After the miniboss
         room4 = Location(dungeon=9).connect(room3, POWER_BRACELET)  # need to lift a pot to reveal button
         room4.add(DungeonChest(0x306))  # map
-        room4karakoro = Location(dungeon=9).add(DroppedKey(0x307)).connect(room4, r.attack_hookshot)  # require item to knock Karakoro enemies into shell
+        room4karakoro = Location(dungeon=9).add(DroppedKey(0x307)).connect(room4, AND(r.attack_hookshot, POWER_BRACELET))  # require item to knock Karakoro enemies into shell
         if options.owlstatues == "both" or options.owlstatues == "dungeon":
             Location(dungeon=9).add(OwlStatue(0x30A)).connect(room4, STONE_BEAK9)
         room5 = Location(dungeon=9).connect(room4, OR(r.attack_hookshot, SHIELD)) # lights room
         room6 = Location(dungeon=9).connect(room5, AND(KEY9, FOUND(KEY9, 3))) # room with switch and nightmare door
-        pre_boss = Location(dungeon=9).connect(room6, OR(r.attack_hookshot, AND(PEGASUS_BOOTS, FEATHER)))  # before the boss, require item to hit switch or jump past raised blocks
+        pre_boss = Location(dungeon=9).connect(room6, OR(r.hit_switch, AND(PEGASUS_BOOTS, FEATHER)))  # before the boss, require item to hit switch or jump past raised blocks
         boss = Location(dungeon=9).connect(pre_boss, AND(NIGHTMARE_KEY9, r.boss_requirements[world_setup.boss_mapping[8]]))
         boss.add(TunicFairy(0), TunicFairy(1))
 
         if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
-            room2.connect(entrance, POWER_BRACELET) # throw pots at enemies
-            pre_boss.connect(room6, FEATHER)  # before the boss, jump past raised blocks without boots
+            room2.connect(entrance, r.throw_pot) # throw pots at enemies
+            room2_weapon.connect(room2, r.attack_hookshot_no_bomb) # knock the karakoro into the pit without picking them up. 
+            pre_boss.connect(room6, r.tight_jump) # before the boss, jump past raised blocks without boots
 
         if options.logic == 'hell':
-            room2_weapon.connect(room2, SHIELD) # shield bump karakoro into the holes
-            room4karakoro.connect(room4, SHIELD) # shield bump karakoro into the holes
+            room2_weapon.connect(room2, r.attack_hookshot) # also have a bomb as option to knock the karakoro into the pit without bracelet 
+            room2_weapon.connect(room2, r.shield_bump) # shield bump karakoro into the holes
+            room4karakoro.connect(room4, r.shield_bump) # shield bump karakoro into the holes
             
         self.entrance = entrance
 
diff --git a/worlds/ladx/LADXR/logic/overworld.py b/worlds/ladx/LADXR/logic/overworld.py
index 3972796051f9..54da90f8931d 100644
--- a/worlds/ladx/LADXR/logic/overworld.py
+++ b/worlds/ladx/LADXR/logic/overworld.py
@@ -19,10 +19,13 @@ def __init__(self, options, world_setup, r):
         Location().add(DroppedKey(0x1E4)).connect(rooster_cave, AND(OCARINA, SONG3))
 
         papahl_house = Location("Papahl House")
-        papahl_house.connect(Location().add(TradeSequenceItem(0x2A6, TRADING_ITEM_RIBBON)), TRADING_ITEM_YOSHI_DOLL)
+        mamasha_trade = Location().add(TradeSequenceItem(0x2A6, TRADING_ITEM_RIBBON))
+        papahl_house.connect(mamasha_trade, TRADING_ITEM_YOSHI_DOLL)
 
-        trendy_shop = Location("Trendy Shop").add(TradeSequenceItem(0x2A0, TRADING_ITEM_YOSHI_DOLL))
-        #trendy_shop.connect(Location())
+        trendy_shop = Location("Trendy Shop")
+        trendy_shop.connect(Location().add(TradeSequenceItem(0x2A0, TRADING_ITEM_YOSHI_DOLL)), FOUND("RUPEES", 50))
+        outside_trendy = Location()
+        outside_trendy.connect(mabe_village, r.bush)
 
         self._addEntrance("papahl_house_left", mabe_village, papahl_house, None)
         self._addEntrance("papahl_house_right", mabe_village, papahl_house, None)
@@ -84,7 +87,7 @@ def __init__(self, options, world_setup, r):
         crazy_tracy_hut_inside = Location("Crazy Tracy's House")
         Location().add(KeyLocation("MEDICINE2")).connect(crazy_tracy_hut_inside, FOUND("RUPEES", 50))
         self._addEntrance("crazy_tracy", crazy_tracy_hut, crazy_tracy_hut_inside, None)
-        start_house.connect(crazy_tracy_hut, SONG2, one_way=True) # Manbo's Mambo into the pond outside Tracy
+        start_house.connect(crazy_tracy_hut, AND(OCARINA, SONG2), one_way=True) # Manbo's Mambo into the pond outside Tracy
 
         forest_madbatter = Location("Forest Mad Batter")
         Location().add(MadBatter(0x1E1)).connect(forest_madbatter, MAGIC_POWDER)
@@ -92,7 +95,7 @@ def __init__(self, options, world_setup, r):
         self._addEntranceRequirementExit("forest_madbatter", None) # if exiting, you do not need bracelet
 
         forest_cave = Location("Forest Cave")
-        Location().add(Chest(0x2BD)).connect(forest_cave, SWORD)  # chest in forest cave on route to mushroom
+        forest_cave_crystal_chest = Location().add(Chest(0x2BD)).connect(forest_cave, SWORD)  # chest in forest cave on route to mushroom
         log_cave_heartpiece = Location().add(HeartPiece(0x2AB)).connect(forest_cave, POWER_BRACELET)  # piece of heart in the forest cave on route to the mushroom
         forest_toadstool = Location().add(Toadstool())
         self._addEntrance("toadstool_entrance", forest, forest_cave, None)
@@ -130,6 +133,7 @@ def __init__(self, options, world_setup, r):
         self._addEntranceRequirementExit("d0", None) # if exiting, you do not need bracelet
         ghost_grave = Location().connect(forest, POWER_BRACELET)
         Location().add(Seashell(0x074)).connect(ghost_grave, AND(r.bush, SHOVEL))  # next to grave cave, digging spot
+        graveyard.connect(forest_heartpiece, OR(BOOMERANG, HOOKSHOT), one_way=True) # grab the heart piece surrounded by pits from the north
 
         graveyard_cave_left = Location()
         graveyard_cave_right = Location().connect(graveyard_cave_left, OR(FEATHER, ROOSTER))
@@ -194,6 +198,7 @@ def __init__(self, options, world_setup, r):
         bay_madbatter_connector_exit = Location().connect(bay_madbatter_connector_entrance, FLIPPERS)
         bay_madbatter_connector_outside = Location()
         bay_madbatter = Location().connect(Location().add(MadBatter(0x1E0)), MAGIC_POWDER)
+        outside_bay_madbatter_entrance = Location()
         self._addEntrance("prairie_madbatter_connector_entrance", left_bay_area, bay_madbatter_connector_entrance, AND(OR(FEATHER, ROOSTER), OR(SWORD, MAGIC_ROD, BOOMERANG)))
         self._addEntranceRequirementExit("prairie_madbatter_connector_entrance", AND(OR(FEATHER, ROOSTER), r.bush)) # if exiting, you can pick up the bushes by normal means
         self._addEntrance("prairie_madbatter_connector_exit", bay_madbatter_connector_outside, bay_madbatter_connector_exit, None)
@@ -239,7 +244,8 @@ def __init__(self, options, world_setup, r):
         castle_courtyard = Location()
         castle_frontdoor = Location().connect(castle_courtyard, r.bush)
         castle_frontdoor.connect(ukuku_prairie, "CASTLE_BUTTON") # the button in the castle connector allows access to the castle grounds in ER
-        self._addEntrance("castle_secret_entrance", next_to_castle, castle_secret_entrance_right, OR(BOMB, BOOMERANG, MAGIC_POWDER, MAGIC_ROD, SWORD))
+        self._addEntrance("castle_secret_entrance", next_to_castle, castle_secret_entrance_right, r.pit_bush)
+        self._addEntranceRequirementExit("castle_secret_entrance", None) # leaving doesn't require pit_bush
         self._addEntrance("castle_secret_exit", castle_courtyard, castle_secret_entrance_left, None)
 
         Location().add(HeartPiece(0x078)).connect(bay_water, FLIPPERS)  # in the moat of the castle
@@ -247,7 +253,7 @@ def __init__(self, options, world_setup, r):
         Location().add(KeyLocation("CASTLE_BUTTON")).connect(castle_inside, None)
         castle_top_outside = Location()
         castle_top_inside = Location()
-        self._addEntrance("castle_main_entrance", castle_frontdoor, castle_inside, r.bush)
+        self._addEntrance("castle_main_entrance", castle_frontdoor, castle_inside, None)
         self._addEntrance("castle_upper_left", castle_top_outside, castle_inside, None)
         self._addEntrance("castle_upper_right", castle_top_outside, castle_top_inside, None)
         Location().add(GoldLeaf(0x05A)).connect(castle_courtyard, OR(SWORD, BOW, MAGIC_ROD))  # mad bomber, enemy hiding in the 6 holes
@@ -276,7 +282,8 @@ def __init__(self, options, world_setup, r):
         animal_village.connect(ukuku_prairie, OR(HOOKSHOT, ROOSTER))
         animal_village_connector_left = Location()
         animal_village_connector_right = Location().connect(animal_village_connector_left, PEGASUS_BOOTS)
-        self._addEntrance("prairie_to_animal_connector", ukuku_prairie, animal_village_connector_left, OR(BOMB, BOOMERANG, MAGIC_POWDER, MAGIC_ROD, SWORD)) # passage under river blocked by bush
+        self._addEntrance("prairie_to_animal_connector", ukuku_prairie, animal_village_connector_left, r.pit_bush) # passage under river blocked by bush
+        self._addEntranceRequirementExit("prairie_to_animal_connector", None) # leaving doesn't require pit_bush
         self._addEntrance("animal_to_prairie_connector", animal_village, animal_village_connector_right, None)
         if options.owlstatues == "both" or options.owlstatues == "overworld":
             animal_village.add(OwlStatue(0x0DA))
@@ -284,7 +291,7 @@ def __init__(self, options, world_setup, r):
         desert = Location().connect(animal_village, r.bush)  # Note: We moved the walrus blocking the desert.
         if options.owlstatues == "both" or options.owlstatues == "overworld":
             desert.add(OwlStatue(0x0CF))
-        desert_lanmola = Location().add(AnglerKey()).connect(desert, OR(BOW, SWORD, HOOKSHOT, MAGIC_ROD, BOOMERANG))
+        desert_lanmola = Location().add(AnglerKey()).connect(desert, r.attack_hookshot_no_bomb)
 
         animal_village_bombcave = Location()
         self._addEntrance("animal_cave", desert, animal_village_bombcave, BOMB)
@@ -298,13 +305,15 @@ def __init__(self, options, world_setup, r):
         Location().add(HeartPiece(0x1E8)).connect(desert_cave, BOMB)  # above the quicksand cave
         Location().add(Seashell(0x0FF)).connect(desert, POWER_BRACELET) # bottom right corner of the map
 
-        armos_maze = Location().connect(animal_village, POWER_BRACELET)
-        armos_temple = Location()
+        armos_maze = Location("Armos Maze").connect(animal_village, POWER_BRACELET)
+        armos_temple = Location("Southern Shrine")
         Location().add(FaceKey()).connect(armos_temple, r.miniboss_requirements[world_setup.miniboss_mapping["armos_temple"]])
         if options.owlstatues == "both" or options.owlstatues == "overworld":
             armos_maze.add(OwlStatue(0x08F))
-        self._addEntrance("armos_maze_cave", armos_maze, Location().add(Chest(0x2FC)), None)
-        self._addEntrance("armos_temple", armos_maze, armos_temple, None)
+        outside_armos_cave = Location("Outside Armos Maze Cave").connect(armos_maze, OR(r.attack_hookshot, SHIELD))
+        outside_armos_temple = Location("Outside Southern Shrine").connect(armos_maze, OR(r.attack_hookshot, SHIELD))
+        self._addEntrance("armos_maze_cave", outside_armos_cave, Location().add(Chest(0x2FC)), None)
+        self._addEntrance("armos_temple", outside_armos_temple, armos_temple, None)
 
         armos_fairy_entrance = Location().connect(bay_water, FLIPPERS).connect(animal_village, POWER_BRACELET)
         self._addEntrance("armos_fairy", armos_fairy_entrance, None, BOMB)
@@ -349,17 +358,21 @@ def __init__(self, options, world_setup, r):
         lower_right_taltal.connect(below_right_taltal, FLIPPERS, one_way=True)
 
         heartpiece_swim_cave = Location().connect(Location().add(HeartPiece(0x1F2)), FLIPPERS)
+        outside_swim_cave = Location()
+        below_right_taltal.connect(outside_swim_cave, FLIPPERS)
         self._addEntrance("heartpiece_swim_cave", below_right_taltal, heartpiece_swim_cave, FLIPPERS)  # cave next to level 4
         d4_entrance = Location().connect(below_right_taltal, FLIPPERS)
         lower_right_taltal.connect(d4_entrance, AND(ANGLER_KEY, "ANGLER_KEYHOLE"), one_way=True)
         self._addEntrance("d4", d4_entrance, None, ANGLER_KEY)
         self._addEntranceRequirementExit("d4", FLIPPERS) # if exiting, you can leave with flippers without opening the dungeon
+        outside_mambo = Location("Outside Manbo").connect(d4_entrance, FLIPPERS)
+        inside_mambo = Location("Manbo's Cave")
         mambo = Location().connect(Location().add(Song(0x2FD)), AND(OCARINA, FLIPPERS))  # Manbo's Mambo
         self._addEntrance("mambo", d4_entrance, mambo, FLIPPERS)
 
         # Raft game.
         raft_house = Location("Raft House")
-        Location().add(KeyLocation("RAFT")).connect(raft_house, COUNT("RUPEES", 100))
+        Location().add(KeyLocation("RAFT")).connect(raft_house, AND(r.bush, COUNT("RUPEES", 100))) # add bush requirement for farming in case player has to try again
         raft_return_upper = Location()
         raft_return_lower = Location().connect(raft_return_upper, None, one_way=True)
         outside_raft_house = Location().connect(below_right_taltal, HOOKSHOT).connect(below_right_taltal, FLIPPERS, one_way=True)
@@ -391,10 +404,13 @@ def __init__(self, options, world_setup, r):
 
         multichest_cave = Location()
         multichest_cave_secret = Location().connect(multichest_cave, BOMB)
+        multichest_cave.connect(multichest_cave_secret, BOMB, one_way=True)
         water_cave_hole = Location()  # Location with the hole that drops you onto the hearth piece under water
         if options.logic != "casual":
             water_cave_hole.connect(heartpiece_swim_cave, FLIPPERS, one_way=True)
+        outside_multichest_left = Location()
         multichest_outside = Location().add(Chest(0x01D))  # chest after multichest puzzle outside
+        lower_right_taltal.connect(outside_multichest_left, OR(FLIPPERS, ROOSTER))
         self._addEntrance("multichest_left", lower_right_taltal, multichest_cave, OR(FLIPPERS, ROOSTER))
         self._addEntrance("multichest_right", water_cave_hole, multichest_cave, None)
         self._addEntrance("multichest_top", multichest_outside, multichest_cave_secret, None)
@@ -432,7 +448,7 @@ def __init__(self, options, world_setup, r):
         left_right_connector_cave_exit = Location()
         left_right_connector_cave_entrance.connect(left_right_connector_cave_exit, OR(HOOKSHOT, ROOSTER), one_way=True)  # pass through the underground passage to left side
         taltal_boulder_zone = Location()
-        self._addEntrance("left_to_right_taltalentrance", mountain_bridge_staircase, left_right_connector_cave_entrance, OR(BOMB, BOOMERANG, MAGIC_POWDER, MAGIC_ROD, SWORD))
+        self._addEntrance("left_to_right_taltalentrance", mountain_bridge_staircase, left_right_connector_cave_entrance, r.pit_bush)
         self._addEntrance("left_taltal_entrance", taltal_boulder_zone, left_right_connector_cave_exit, None)
         mountain_heartpiece = Location().add(HeartPiece(0x2BA)) # heartpiece in connecting cave
         left_right_connector_cave_entrance.connect(mountain_heartpiece, BOMB, one_way=True)  # in the connecting cave from right to left. one_way to prevent access to left_side_mountain via glitched logic
@@ -464,130 +480,168 @@ def __init__(self, options, world_setup, r):
         windfish = Location("Windfish").connect(nightmare, AND(MAGIC_POWDER, SWORD, OR(BOOMERANG, BOW)))
 
         if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
-            hookshot_cave.connect(hookshot_cave_chest, AND(FEATHER, PEGASUS_BOOTS)) # boots jump the gap to the chest
-            graveyard_cave_left.connect(graveyard_cave_right, HOOKSHOT, one_way=True) # hookshot the block behind the stairs while over the pit
-            swamp_chest.connect(swamp, None)  # Clip past the flower
+            hookshot_cave.connect(hookshot_cave_chest, r.boots_jump) # boots jump the gap to the chest
+            graveyard_cave_left.connect(graveyard_cave_right, r.hookshot_over_pit, one_way=True) # hookshot the block behind the stairs while over the pit
+            swamp_chest.connect(swamp, r.wall_clip)  # Clip past the flower
             self._addEntranceRequirement("d2", POWER_BRACELET) # clip the top wall to walk between the goponga flower and the wall
             self._addEntranceRequirement("d2", COUNT(SWORD, 2)) # use l2 sword spin to kill goponga flowers
-            swamp.connect(writes_hut_outside, HOOKSHOT, one_way=True) # hookshot the sign in front of writes hut
+            self._addEntranceRequirementExit("d2", r.wall_clip)  # Clip out at d2 entrance door
+            swamp.connect(writes_hut_outside, r.hookshot_over_pit, one_way=True) # hookshot the sign in front of writes hut
             graveyard_heartpiece.connect(graveyard_cave_right, FEATHER) # jump to the bottom right tile around the blocks
-            graveyard_heartpiece.connect(graveyard_cave_right, OR(HOOKSHOT, BOOMERANG)) # push bottom block, wall clip and hookshot/boomerang corner to grab item
+            graveyard_heartpiece.connect(graveyard_cave_right, AND(r.wall_clip, OR(HOOKSHOT, BOOMERANG))) # push bottom block, wall clip and hookshot/boomerang corner to grab item
 
-            self._addEntranceRequirement("mamu", AND(FEATHER, POWER_BRACELET)) # can clear the gaps at the start with just feather, can reach bottom left sign with a well timed jump while wall clipped
+            self._addEntranceRequirement("mamu", AND(r.wall_clip, FEATHER, POWER_BRACELET)) # can clear the gaps at the start with just feather, can reach bottom left sign with a well timed jump while wall clipped
             self._addEntranceRequirement("prairie_madbatter_connector_entrance", AND(OR(FEATHER, ROOSTER), OR(MAGIC_POWDER, BOMB))) # use bombs or powder to get rid of a bush on the other side by jumping across and placing the bomb/powder before you fall into the pit
-            fisher_under_bridge.connect(bay_water, AND(TRADING_ITEM_FISHING_HOOK, FLIPPERS)) # can talk to the fisherman from the water when the boat is low (requires swimming up out of the water a bit)
             crow_gold_leaf.connect(castle_courtyard, POWER_BRACELET) # bird on tree at left side kanalet, can use both rocks to kill the crow removing the kill requirement
             castle_inside.connect(kanalet_chain_trooper, BOOMERANG, one_way=True) # kill the ball and chain trooper from the left side, then use boomerang to grab the dropped item
-            animal_village_bombcave_heartpiece.connect(animal_village_bombcave, AND(PEGASUS_BOOTS, FEATHER)) # jump across horizontal 4 gap to heart piece
+            animal_village_bombcave_heartpiece.connect(animal_village_bombcave, r.boots_jump) # jump across horizontal 4 gap to heart piece
+            animal_village_bombcave_heartpiece.connect(animal_village_bombcave, AND(BOMB, FEATHER, BOOMERANG))  # use jump + boomerang to grab the item from below the ledge
             desert_lanmola.connect(desert, BOMB) # use bombs to kill lanmola
 
+            armos_maze.connect(outside_armos_cave, None) # dodge the armos statues by activating them and running
+            armos_maze.connect(outside_armos_temple, None) # dodge the armos statues by activating them and running
             d6_connector_left.connect(d6_connector_right, AND(OR(FLIPPERS, PEGASUS_BOOTS), FEATHER))  # jump the gap in underground passage to d6 left side to skip hookshot
+            obstacle_cave_exit.connect(obstacle_cave_inside, AND(FEATHER, r.hookshot_over_pit), one_way=True) # one way from right exit to middle, jump past the obstacle, and use hookshot to pull past the double obstacle
             if not options.rooster:
                 bird_key.connect(bird_cave, COUNT(POWER_BRACELET, 2))  # corner walk past the one pit on the left side to get to the elephant statue
-            fire_cave_bottom.connect(fire_cave_top, PEGASUS_BOOTS, one_way=True) # flame skip
+            right_taltal_connector2.connect(right_taltal_connector3, ROOSTER, one_way=True) # jump off the ledge and grab rooster after landing on the pit
+            fire_cave_bottom.connect(fire_cave_top, AND(r.damage_boost_special, PEGASUS_BOOTS), one_way=True) # flame skip
 
         if options.logic == 'glitched' or options.logic == 'hell':
+            papahl_house.connect(mamasha_trade, r.bomb_trigger) # use a bomb trigger to trade with mamasha without having yoshi doll
             #self._addEntranceRequirement("dream_hut", FEATHER) # text clip TODO: require nag messages
-            self._addEntranceRequirementEnter("dream_hut", HOOKSHOT) # clip past the rocks in front of dream hut
-            dream_hut_right.connect(dream_hut_left, FEATHER) # super jump
-            forest.connect(swamp, BOMB)  # bomb trigger tarin
+            self._addEntranceRequirementEnter("dream_hut", r.hookshot_clip) # clip past the rocks in front of dream hut
+            dream_hut_right.connect(dream_hut_left, r.super_jump_feather) # super jump
+            forest.connect(swamp, r.bomb_trigger)  # bomb trigger tarin
             forest.connect(forest_heartpiece, BOMB, one_way=True) # bomb trigger heartpiece
-            self._addEntranceRequirementEnter("hookshot_cave", HOOKSHOT) # clip past the rocks in front of hookshot cave
-            swamp.connect(forest_toadstool, None, one_way=True) # villa buffer from top (swamp phonebooth area) to bottom (toadstool area)
-            writes_hut_outside.connect(swamp, None, one_way=True) # villa buffer from top (writes hut) to bottom (swamp phonebooth area) or damage boost
+            self._addEntranceRequirementEnter("hookshot_cave", r.hookshot_clip) # clip past the rocks in front of hookshot cave
+            swamp.connect(forest_toadstool, r.pit_buffer_itemless, one_way=True) # villa buffer from top (swamp phonebooth area) to bottom (toadstool area)
+            writes_hut_outside.connect(swamp, r.pit_buffer_itemless, one_way=True) # villa buffer from top (writes hut) to bottom (swamp phonebooth area) or damage boost
             graveyard.connect(forest_heartpiece, None, one_way=True) # villa buffer from top.
-            log_cave_heartpiece.connect(forest_cave, FEATHER) # super jump
-            log_cave_heartpiece.connect(forest_cave, BOMB) # bomb trigger
-            graveyard_cave_left.connect(graveyard_heartpiece, BOMB, one_way=True) # bomb trigger the heartpiece from the left side
-            graveyard_heartpiece.connect(graveyard_cave_right, None) # sideways block push from the right staircase.
-
-            prairie_island_seashell.connect(ukuku_prairie, AND(FEATHER, r.bush)) # jesus jump from right side, screen transition on top of the water to reach the island
-            self._addEntranceRequirement("castle_jump_cave", FEATHER) # 1 pit buffer to clip bottom wall and jump across.
-            left_bay_area.connect(ghost_hut_outside, FEATHER) # 1 pit buffer to get across
-            tiny_island.connect(left_bay_area, AND(FEATHER, r.bush)) # jesus jump around
-            bay_madbatter_connector_exit.connect(bay_madbatter_connector_entrance, FEATHER, one_way=True) # jesus jump (3 screen) through the underground passage leading to martha's bay mad batter
-            self._addEntranceRequirement("prairie_madbatter_connector_entrance", AND(FEATHER, POWER_BRACELET)) # villa buffer into the top side of the bush, then pick it up
-
-            ukuku_prairie.connect(richard_maze, OR(BOMB, BOOMERANG, MAGIC_POWDER, MAGIC_ROD, SWORD), one_way=True) # break bushes on north side of the maze, and 1 pit buffer into the maze
-            fisher_under_bridge.connect(bay_water, AND(BOMB, FLIPPERS)) # can bomb trigger the item without having the hook
-            animal_village.connect(ukuku_prairie, FEATHER) # jesus jump
-            below_right_taltal.connect(next_to_castle, FEATHER) # jesus jump (north of kanalet castle phonebooth)
-            animal_village_connector_right.connect(animal_village_connector_left, FEATHER) # text clip past the obstacles (can go both ways), feather to wall clip the obstacle without triggering text or shaq jump in bottom right corner if text is off
-            animal_village_bombcave_heartpiece.connect(animal_village_bombcave, AND(BOMB, OR(HOOKSHOT, FEATHER, PEGASUS_BOOTS))) # bomb trigger from right side, corner walking top right pit is stupid so hookshot or boots added
-            animal_village_bombcave_heartpiece.connect(animal_village_bombcave,  FEATHER) # villa buffer across the pits
-
-            d6_entrance.connect(ukuku_prairie, FEATHER, one_way=True) # jesus jump (2 screen) from d6 entrance bottom ledge to ukuku prairie
-            d6_entrance.connect(armos_fairy_entrance, FEATHER, one_way=True) # jesus jump (2 screen) from d6 entrance top ledge to armos fairy entrance
-            armos_fairy_entrance.connect(d6_armos_island, FEATHER, one_way=True) # jesus jump from top (fairy bomb cave) to armos island
-            armos_fairy_entrance.connect(raft_exit, FEATHER) # jesus jump (2-ish screen) from fairy cave to lower raft connector
-            self._addEntranceRequirementEnter("obstacle_cave_entrance", HOOKSHOT) # clip past the rocks in front of obstacle cave entrance
-            obstacle_cave_inside_chest.connect(obstacle_cave_inside, FEATHER) # jump to the rightmost pits + 1 pit buffer to jump across
-            obstacle_cave_exit.connect(obstacle_cave_inside, FEATHER) #  1 pit buffer above boots crystals to get past
-            lower_right_taltal.connect(hibiscus_item, AND(TRADING_ITEM_PINEAPPLE, BOMB), one_way=True) # bomb trigger papahl from below ledge, requires pineapple
-
-            self._addEntranceRequirement("heartpiece_swim_cave", FEATHER)  # jesus jump into the cave entrance after jumping down the ledge, can jesus jump back to the ladder 1 screen below
-            self._addEntranceRequirement("mambo", FEATHER)  # jesus jump from (unlocked) d4 entrance to mambo's cave entrance
-            outside_raft_house.connect(below_right_taltal, FEATHER, one_way=True) # jesus jump from the ledge at raft to the staircase 1 screen south
-
-            self._addEntranceRequirement("multichest_left", FEATHER) # jesus jump past staircase leading up the mountain
-            outside_rooster_house.connect(lower_right_taltal, FEATHER) # jesus jump (1 or 2 screen depending if angler key is used) to staircase leading up the mountain
+            graveyard.connect(forest, None, one_way=True) # villa buffer from the top twice to get to the main forest area
+            log_cave_heartpiece.connect(forest_cave, r.super_jump_feather) # super jump
+            log_cave_heartpiece.connect(forest_cave, r.bomb_trigger) # bomb trigger
+            graveyard_cave_left.connect(graveyard_heartpiece, r.bomb_trigger, one_way=True) # bomb trigger the heartpiece from the left side
+            graveyard_heartpiece.connect(graveyard_cave_right, r.sideways_block_push) # sideways block push from the right staircase.
+
+            prairie_island_seashell.connect(ukuku_prairie, AND(r.jesus_jump, r.bush)) # jesus jump from right side, screen transition on top of the water to reach the island
+            self._addEntranceRequirement("castle_jump_cave", r.pit_buffer) # 1 pit buffer to clip bottom wall and jump across.
+            left_bay_area.connect(ghost_hut_outside, r.pit_buffer) # 1 pit buffer to get across
+            tiny_island.connect(left_bay_area, AND(r.jesus_jump, r.bush)) # jesus jump around
+            bay_madbatter_connector_exit.connect(bay_madbatter_connector_entrance, r.jesus_jump, one_way=True) # jesus jump (3 screen) through the underground passage leading to martha's bay mad batter
+            left_bay_area.connect(outside_bay_madbatter_entrance, AND(r.pit_buffer, POWER_BRACELET)) # villa buffer into the top side of the bush, then pick it up
+
+            ukuku_prairie.connect(richard_maze, AND(r.pit_buffer_itemless, OR(AND(MAGIC_POWDER, MAX_POWDER_UPGRADE), BOMB, BOOMERANG, MAGIC_ROD, SWORD)), one_way=True) # break bushes on north side of the maze, and 1 pit buffer into the maze
+            richard_maze.connect(ukuku_prairie, AND(r.pit_buffer_itemless, OR(MAGIC_POWDER, BOMB, BOOMERANG, MAGIC_ROD, SWORD)), one_way=True) # same as above (without powder upgrade) in one of the two northern screens of the maze to escape
+            fisher_under_bridge.connect(bay_water, AND(r.bomb_trigger, AND(FEATHER, FLIPPERS))) # up-most left wall is a pit: bomb trigger with it. If photographer is there, clear that first which is why feather is required logically
+            animal_village.connect(ukuku_prairie, r.jesus_jump) # jesus jump
+            below_right_taltal.connect(next_to_castle, r.jesus_jump) # jesus jump (north of kanalet castle phonebooth)
+            #animal_village_connector_right.connect(animal_village_connector_left, AND(r.text_clip, FEATHER)) # text clip past the obstacles (can go both ways), feather to wall clip the obstacle without triggering text
+            animal_village_bombcave_heartpiece.connect(animal_village_bombcave, AND(r.bomb_trigger, OR(HOOKSHOT, FEATHER, r.boots_bonk_pit))) # bomb trigger from right side, corner walking top right pit is stupid so hookshot or boots added
+            animal_village_bombcave_heartpiece.connect(animal_village_bombcave,  r.pit_buffer) # villa buffer across the pits
+
+            d6_entrance.connect(ukuku_prairie, r.jesus_jump, one_way=True) # jesus jump (2 screen) from d6 entrance bottom ledge to ukuku prairie
+            d6_entrance.connect(armos_fairy_entrance, r.jesus_jump, one_way=True) # jesus jump (2 screen) from d6 entrance top ledge to armos fairy entrance
+            d6_connector_left.connect(d6_connector_right, r.jesus_jump) # jesus jump over water; left side is jumpable, or villa buffer if it's easier for you
+            armos_fairy_entrance.connect(d6_armos_island, r.jesus_jump, one_way=True) # jesus jump from top (fairy bomb cave) to armos island
+            armos_fairy_entrance.connect(raft_exit, r.jesus_jump) # jesus jump (2-ish screen) from fairy cave to lower raft connector
+            self._addEntranceRequirementEnter("obstacle_cave_entrance", r.hookshot_clip) # clip past the rocks in front of obstacle cave entrance
+            obstacle_cave_inside_chest.connect(obstacle_cave_inside, r.pit_buffer) # jump to the rightmost pits + 1 pit buffer to jump across
+            obstacle_cave_exit.connect(obstacle_cave_inside, r.pit_buffer) #  1 pit buffer above boots crystals to get past
+            lower_right_taltal.connect(hibiscus_item, AND(TRADING_ITEM_PINEAPPLE, r.bomb_trigger), one_way=True) # bomb trigger papahl from below ledge, requires pineapple
+
+            self._addEntranceRequirement("heartpiece_swim_cave", r.jesus_jump)  # jesus jump into the cave entrance after jumping down the ledge, can jesus jump back to the ladder 1 screen below
+            self._addEntranceRequirement("mambo", r.jesus_jump)  # jesus jump from (unlocked) d4 entrance to mambo's cave entrance
+            outside_raft_house.connect(below_right_taltal, r.jesus_jump, one_way=True) # jesus jump from the ledge at raft to the staircase 1 screen south
+
+            self._addEntranceRequirement("multichest_left", r.jesus_jump) # jesus jump past staircase leading up the mountain
+            outside_rooster_house.connect(lower_right_taltal, r.jesus_jump) # jesus jump (1 or 2 screen depending if angler key is used) to staircase leading up the mountain
             d7_platau.connect(water_cave_hole, None, one_way=True) # use save and quit menu to gain control while falling to dodge the water cave hole
-            mountain_bridge_staircase.connect(outside_rooster_house, AND(PEGASUS_BOOTS, FEATHER)) # cross bridge to staircase with pit buffer to clip bottom wall and jump across
-            bird_key.connect(bird_cave, AND(FEATHER, HOOKSHOT))  # hookshot jump across the big pits room
-            right_taltal_connector2.connect(right_taltal_connector3, None, one_way=True) # 2 seperate pit buffers so not obnoxious to get past the two pit rooms before d7 area. 2nd pits can pit buffer on top right screen, bottom wall to scroll on top of the wall on bottom screen
-            left_right_connector_cave_exit.connect(left_right_connector_cave_entrance, AND(HOOKSHOT, FEATHER), one_way=True)  # pass through the passage in reverse using a superjump to get out of the dead end
-            obstacle_cave_inside.connect(mountain_heartpiece, BOMB, one_way=True) # bomb trigger from boots crystal cave
-            self._addEntranceRequirement("d8", OR(BOMB, AND(OCARINA, SONG3))) # bomb trigger the head and walk trough, or play the ocarina song 3 and walk through
+            mountain_bridge_staircase.connect(outside_rooster_house, AND(r.boots_jump, r.pit_buffer)) # cross bridge to staircase with pit buffer to clip bottom wall and jump across. added boots_jump to not require going through this section with just feather
+            bird_key.connect(bird_cave, r.hookshot_jump)  # hookshot jump across the big pits room
+            right_taltal_connector2.connect(right_taltal_connector3, OR(r.pit_buffer, ROOSTER), one_way=True) # trigger a quick fall on the screen above the exit by transitioning down on the leftmost/rightmost pit and then buffering sq menu for control while in the air. or pick up the rooster while dropping off the ledge at exit
+            left_right_connector_cave_exit.connect(left_right_connector_cave_entrance, AND(HOOKSHOT, r.super_jump_feather), one_way=True)  # pass through the passage in reverse using a superjump to get out of the dead end
+            obstacle_cave_inside.connect(mountain_heartpiece, r.bomb_trigger, one_way=True) # bomb trigger from boots crystal cave
+            self._addEntranceRequirement("d8", OR(r.bomb_trigger, AND(OCARINA, SONG3))) # bomb trigger the head and walk through, or play the ocarina song 3 and walk through
 
         if options.logic == 'hell':
             dream_hut_right.connect(dream_hut, None) # alternate diagonal movement with orthogonal movement to control the mimics. Get them clipped into the walls to walk past
-            swamp.connect(forest_toadstool, None) # damage boost from toadstool area across the pit
-            swamp.connect(forest, AND(r.bush, OR(PEGASUS_BOOTS, HOOKSHOT))) # boots bonk / hookshot spam over the pits right of forest_rear_chest
+            swamp.connect(forest_toadstool, r.damage_boost) # damage boost from toadstool area across the pit
+            swamp.connect(forest, AND(r.bush, OR(r.boots_bonk_pit, r.hookshot_spam_pit))) # boots bonk / hookshot spam over the pits right of forest_rear_chest
             forest.connect(forest_heartpiece, PEGASUS_BOOTS, one_way=True) # boots bonk across the pits
+            forest_cave_crystal_chest.connect(forest_cave, AND(r.super_jump_feather, r.hookshot_clip_block, r.sideways_block_push)) # superjump off the bottom wall to get between block and crystal, than use 3 keese to hookshot clip while facing right to get a sideways blockpush off
             log_cave_heartpiece.connect(forest_cave, BOOMERANG) # clip the boomerang through the corner gaps on top right to grab the item
-            log_cave_heartpiece.connect(forest_cave, AND(ROOSTER, OR(PEGASUS_BOOTS, SWORD, BOW, MAGIC_ROD))) # boots rooster hop in bottom left corner to "superjump" into the area. use buffers after picking up rooster to gain height / time to throw rooster again facing up
-            writes_hut_outside.connect(swamp, None) # damage boost with moblin arrow next to telephone booth
-            writes_cave_left_chest.connect(writes_cave, None) # damage boost off the zol to get across the pit.
-            graveyard.connect(crazy_tracy_hut, HOOKSHOT, one_way=True) # use hookshot spam to clip the rock on the right with the crow
-            graveyard.connect(forest, OR(PEGASUS_BOOTS, HOOKSHOT)) # boots bonk witches hut, or hookshot spam across the pit
-            graveyard_cave_left.connect(graveyard_cave_right, HOOKSHOT) # hookshot spam over the pit
-            graveyard_cave_right.connect(graveyard_cave_left, PEGASUS_BOOTS, one_way=True) # boots bonk off the cracked block
-
-            self._addEntranceRequirementEnter("mamu", AND(PEGASUS_BOOTS, POWER_BRACELET)) # can clear the gaps at the start with multiple pit buffers, can reach bottom left sign with bonking along the bottom wall
-            self._addEntranceRequirement("castle_jump_cave", PEGASUS_BOOTS) # pit buffer to clip bottom wall and boots bonk across
-            prairie_cave_secret_exit.connect(prairie_cave, AND(BOMB, OR(PEGASUS_BOOTS, HOOKSHOT))) # hookshot spam or boots bonk across pits can go from left to right by pit buffering on top of the bottom wall then boots bonk across
-            richard_cave_chest.connect(richard_cave, None) # use the zol on the other side of the pit to damage boost across (requires damage from pit + zol)
-            castle_secret_entrance_right.connect(castle_secret_entrance_left, AND(PEGASUS_BOOTS, "MEDICINE2")) # medicine iframe abuse to get across spikes with a boots bonk
-            left_bay_area.connect(ghost_hut_outside, PEGASUS_BOOTS) # multiple pit buffers to bonk across the bottom wall
-            tiny_island.connect(left_bay_area, AND(PEGASUS_BOOTS, r.bush)) # jesus jump around with boots bonks, then one final bonk off the bottom wall to get on the staircase (needs to be centered correctly)
-            self._addEntranceRequirement("prairie_madbatter_connector_entrance", AND(PEGASUS_BOOTS, OR(MAGIC_POWDER, BOMB, SWORD, MAGIC_ROD, BOOMERANG))) # Boots bonk across the bottom wall, then remove one of the bushes to get on land
-            self._addEntranceRequirementExit("prairie_madbatter_connector_entrance", AND(PEGASUS_BOOTS, r.bush)) # if exiting, you can pick up the bushes by normal means and boots bonk across the bottom wall
+            log_cave_heartpiece.connect(forest_cave, OR(r.super_jump_rooster, r.boots_roosterhop)) # boots rooster hop in bottom left corner to "superjump" into the area. use buffers after picking up rooster to gain height / time to throw rooster again facing up
+            writes_hut_outside.connect(swamp, r.damage_boost) # damage boost with moblin arrow next to telephone booth
+            writes_cave_left_chest.connect(writes_cave, r.damage_boost) # damage boost off the zol to get across the pit.
+            graveyard.connect(crazy_tracy_hut, r.hookshot_spam_pit, one_way=True) # use hookshot spam to clip the rock on the right with the crow
+            graveyard.connect(forest, OR(r.boots_bonk_pit, r.hookshot_spam_pit)) # boots bonk over pits by witches hut, or hookshot spam across the pit
+            graveyard_cave_left.connect(graveyard_cave_right, r.hookshot_spam_pit) # hookshot spam over the pit
+            graveyard_cave_right.connect(graveyard_cave_left, OR(r.damage_boost, r.boots_bonk_pit), one_way=True) # boots bonk off the cracked block, or set up a damage boost with the keese
+
+            self._addEntranceRequirementEnter("mamu", AND(r.pit_buffer_itemless, r.pit_buffer_boots, POWER_BRACELET)) # can clear the gaps at the start with multiple pit buffers, can reach bottom left sign with bonking along the bottom wall
+            self._addEntranceRequirement("castle_jump_cave", r.pit_buffer_boots) # pit buffer to clip bottom wall and boots bonk across
+            prairie_cave_secret_exit.connect(prairie_cave, AND(BOMB, OR(r.boots_bonk_pit, r.hookshot_spam_pit))) # hookshot spam or boots bonk across pits can go from left to right by pit buffering on top of the bottom wall then boots bonk across
+            richard_cave_chest.connect(richard_cave, r.damage_boost) # use the zol on the other side of the pit to damage boost across (requires damage from pit + zol)
+            castle_secret_entrance_right.connect(castle_secret_entrance_left, r.boots_bonk_2d_spikepit) # medicine iframe abuse to get across spikes with a boots bonk
+            left_bay_area.connect(ghost_hut_outside, r.pit_buffer_boots) # multiple pit buffers to bonk across the bottom wall
+            left_bay_area.connect(ukuku_prairie, r.hookshot_clip_block, one_way=True) # clip through the donuts blocking the path next to prairie plateau cave by hookshotting up and killing the two moblins that way which clips you further up two times. This is enough to move right
+            tiny_island.connect(left_bay_area, AND(r.jesus_buffer, r.boots_bonk_pit, r.bush)) # jesus jump around with boots bonks, then one final bonk off the bottom wall to get on the staircase (needs to be centered correctly)
+            left_bay_area.connect(outside_bay_madbatter_entrance, AND(r.pit_buffer_boots, OR(MAGIC_POWDER, SWORD, MAGIC_ROD, BOOMERANG))) # Boots bonk across the bottom wall, then remove one of the bushes to get on land
+            left_bay_area.connect(outside_bay_madbatter_entrance, AND(r.pit_buffer, r.hookshot_spam_pit, r.bush)) # hookshot spam to cross one pit at the top, then buffer until on top of the bush to be able to break it
+            outside_bay_madbatter_entrance.connect(left_bay_area, AND(r.pit_buffer_boots, r.bush), one_way=True) # if exiting, you can pick up the bushes by normal means and boots bonk across the bottom wall
 
             # bay_water connectors, only left_bay_area, ukuku_prairie and animal_village have to be connected with jesus jumps. below_right_taltal, d6_armos_island and armos_fairy_entrance are accounted for via ukuku prairie in glitch logic
-            left_bay_area.connect(bay_water, FEATHER) # jesus jump (can always reach bay_water with jesus jumping from every way to enter bay_water, so no one_way)
-            animal_village.connect(bay_water, FEATHER) # jesus jump (can always reach bay_water with jesus jumping from every way to enter bay_water, so no one_way)
-            ukuku_prairie.connect(bay_water, FEATHER, one_way=True) # jesus jump
-            bay_water.connect(d5_entrance, FEATHER) # jesus jump into d5 entrance (wall clip), wall clip + jesus jump to get out
+            left_bay_area.connect(bay_water, OR(r.jesus_jump, r.jesus_rooster)) # jesus jump/rooster (can always reach bay_water with jesus jumping from every way to enter bay_water, so no one_way)
+            animal_village.connect(bay_water, OR(r.jesus_jump, r.jesus_rooster)) # jesus jump/rooster (can always reach bay_water with jesus jumping from every way to enter bay_water, so no one_way)
+            ukuku_prairie.connect(bay_water, OR(r.jesus_jump, r.jesus_rooster), one_way=True) # jesus jump/rooster
+            bay_water.connect(d5_entrance, OR(r.jesus_jump, r.jesus_rooster)) # jesus jump/rooster into d5 entrance (wall clip), wall clip + jesus jump to get out
 
-            crow_gold_leaf.connect(castle_courtyard, BOMB) # bird on tree at left side kanalet, place a bomb against the tree and the crow flies off. With well placed second bomb the crow can be killed
-            mermaid_statue.connect(animal_village, AND(TRADING_ITEM_SCALE, FEATHER)) # early mermaid statue by buffering on top of the right ledge, then superjumping to the left (horizontal pixel perfect)
-            animal_village_bombcave_heartpiece.connect(animal_village_bombcave, PEGASUS_BOOTS) # boots bonk across bottom wall (both at entrance and in item room)
+            prairie_island_seashell.connect(ukuku_prairie, AND(r.jesus_rooster, r.bush)) # jesus rooster from right side, screen transition on top of the water to reach the island
+            bay_madbatter_connector_exit.connect(bay_madbatter_connector_entrance, r.jesus_rooster, one_way=True) # jesus rooster (3 screen) through the underground passage leading to martha's bay mad batter
+            # fisher_under_bridge.connect(bay_water, AND(TRADING_ITEM_FISHING_HOOK, OR(FEATHER, SWORD, BOW), FLIPPERS)) # just swing/shoot at fisher, if photographer is on screen it is dumb
+            fisher_under_bridge.connect(bay_water, AND(TRADING_ITEM_FISHING_HOOK, FLIPPERS)) # face the fisherman from the left, get within 4 pixels (a range, not exact) of his left side, hold up, and mash a until you get the textbox.
+
+			#TODO: add jesus rooster to trick list
 
-            d6_armos_island.connect(ukuku_prairie, FEATHER) # jesus jump (3 screen) from seashell mansion to armos island
-            armos_fairy_entrance.connect(d6_armos_island, PEGASUS_BOOTS, one_way=True) # jesus jump from top (fairy bomb cave) to armos island with fast falling
-            d6_connector_right.connect(d6_connector_left, PEGASUS_BOOTS) # boots bonk across bottom wall at water and pits (can do both ways)
+            below_right_taltal.connect(next_to_castle, r.jesus_buffer, one_way=True) # face right, boots bonk and get far enough left to jesus buffer / boots bonk across the bottom wall to the stairs
+            crow_gold_leaf.connect(castle_courtyard, BOMB) # bird on tree at left side kanalet, place a bomb against the tree and the crow flies off. With well placed second bomb the crow can be killed
+            mermaid_statue.connect(animal_village, AND(TRADING_ITEM_SCALE, r.super_jump_feather)) # early mermaid statue by buffering on top of the right ledge, then superjumping to the left (horizontal pixel perfect)
+            animal_village_connector_right.connect(animal_village_connector_left, r.shaq_jump) # shaq jump off the obstacle to get through
+            animal_village_connector_left.connect(animal_village_connector_right, r.hookshot_clip_block, one_way=True) # use hookshot with an enemy to clip through the obstacle
+            animal_village_bombcave_heartpiece.connect(animal_village_bombcave, r.pit_buffer_boots) # boots bonk across bottom wall (both at entrance and in item room)
+
+            d6_armos_island.connect(ukuku_prairie, OR(r.jesus_jump, r.jesus_rooster)) # jesus jump / rooster (3 screen) from seashell mansion to armos island
+            armos_fairy_entrance.connect(d6_armos_island, r.jesus_buffer, one_way=True) # jesus jump from top (fairy bomb cave) to armos island with fast falling
+            d6_connector_right.connect(d6_connector_left, r.pit_buffer_boots) # boots bonk across bottom wall at water and pits (can do both ways)
+            d6_entrance.connect(ukuku_prairie, r.jesus_rooster, one_way=True) # jesus rooster (2 screen) from d6 entrance bottom ledge to ukuku prairie
+            d6_entrance.connect(armos_fairy_entrance, r.jesus_rooster, one_way=True) # jesus rooster (2 screen) from d6 entrance top ledge to armos fairy entrance
+            armos_fairy_entrance.connect(d6_armos_island, r.jesus_rooster, one_way=True) # jesus rooster from top (fairy bomb cave) to armos island
+            armos_fairy_entrance.connect(raft_exit, r.jesus_rooster) # jesus rooster (2-ish screen) from fairy cave to lower raft connector
+
+            obstacle_cave_entrance.connect(obstacle_cave_inside, OR(r.hookshot_clip_block, r.shaq_jump)) # get past crystal rocks by hookshotting into top pushable block, or boots dashing into top wall where the pushable block is to superjump down
+            obstacle_cave_entrance.connect(obstacle_cave_inside, r.boots_roosterhop) # get past crystal rocks pushing the top pushable block, then boots dashing up picking up the rooster before bonking. Pause buffer until rooster is fully picked up then throw it down before bonking into wall
+            d4_entrance.connect(below_right_taltal, OR(r.jesus_jump, r.jesus_rooster), one_way=True) # jesus jump/rooster 5 screens to staircase below damp cave
+            lower_right_taltal.connect(below_right_taltal, OR(r.jesus_jump, r.jesus_rooster), one_way=True) # jesus jump/rooster to upper ledges, jump off, enter and exit s+q menu to regain pauses, then jesus jump 4 screens to staircase below damp cave
+            below_right_taltal.connect(outside_swim_cave, r.jesus_rooster) # jesus rooster into the cave entrance after jumping down the ledge, can jesus jump back to the ladder 1 screen below
+            outside_mambo.connect(below_right_taltal, OR(r.jesus_rooster, r.jesus_jump))  # jesus jump/rooster to mambo's cave entrance
+            if options.hardmode != "oracle": # don't take damage from drowning in water. Could get it with more health probably but standard 3 hearts is not enough
+                mambo.connect(inside_mambo, AND(OCARINA, r.bomb_trigger))  # while drowning, buffer a bomb and after it explodes, buffer another bomb out of the save and quit menu.
+            outside_raft_house.connect(below_right_taltal, r.jesus_rooster, one_way=True) # jesus rooster from the ledge at raft to the staircase 1 screen south
+            lower_right_taltal.connect(outside_multichest_left, r.jesus_rooster) # jesus rooster past staircase leading up the mountain
+            outside_rooster_house.connect(lower_right_taltal, r.jesus_rooster, one_way=True) # jesus rooster down to staircase below damp cave
 
-            obstacle_cave_entrance.connect(obstacle_cave_inside, OR(HOOKSHOT, AND(FEATHER, PEGASUS_BOOTS, OR(SWORD, MAGIC_ROD, BOW)))) # get past crystal rocks by hookshotting into top pushable block, or boots dashing into top wall where the pushable block is to superjump down
-            obstacle_cave_entrance.connect(obstacle_cave_inside, AND(PEGASUS_BOOTS, ROOSTER)) # get past crystal rocks pushing the top pushable block, then boots dashing up picking up the rooster before bonking. Pause buffer until rooster is fully picked up then throw it down before bonking into wall
-            d4_entrance.connect(below_right_taltal, FEATHER) # jesus jump a long way
             if options.entranceshuffle in ("default", "simple"): # connector cave from armos d6 area to raft shop may not be randomized to add a flippers path since flippers stop you from jesus jumping
-                below_right_taltal.connect(raft_game, AND(FEATHER, r.attack_hookshot_powder), one_way=True) # jesus jump from heartpiece water cave, around the island and clip past the diagonal gap in the rock, then jesus jump all the way down the waterfall to the chests (attack req for hardlock flippers+feather scenario)
-            outside_raft_house.connect(below_right_taltal, AND(FEATHER, PEGASUS_BOOTS)) #superjump from ledge left to right, can buffer to land on ledge instead of water, then superjump right which is pixel perfect
-            bridge_seashell.connect(outside_rooster_house, AND(PEGASUS_BOOTS, POWER_BRACELET)) # boots bonk
-            bird_key.connect(bird_cave, AND(FEATHER, PEGASUS_BOOTS)) # boots jump above wall, use multiple pit buffers to get across
-            mountain_bridge_staircase.connect(outside_rooster_house, OR(PEGASUS_BOOTS, FEATHER)) # cross bridge to staircase with pit buffer to clip bottom wall and jump or boots bonk across
-            left_right_connector_cave_entrance.connect(left_right_connector_cave_exit, AND(PEGASUS_BOOTS, FEATHER), one_way=True) # boots jump to bottom left corner of pits, pit buffer and jump to left
-            left_right_connector_cave_exit.connect(left_right_connector_cave_entrance, AND(ROOSTER, OR(PEGASUS_BOOTS, SWORD, BOW, MAGIC_ROD)), one_way=True)  # pass through the passage in reverse using a boots rooster hop or rooster superjump in the one way passage area
+                below_right_taltal.connect(raft_game, AND(OR(r.jesus_jump, r.jesus_rooster), r.attack_hookshot_powder), one_way=True) # jesus jump from heartpiece water cave, around the island and clip past the diagonal gap in the rock, then jesus jump all the way down the waterfall to the chests (attack req for hardlock flippers+feather scenario)
+            outside_raft_house.connect(below_right_taltal, AND(r.super_jump, PEGASUS_BOOTS)) #superjump from ledge left to right, can buffer to land on ledge instead of water, then superjump right which is pixel perfect. Boots to get out of wall after landing
+            bridge_seashell.connect(outside_rooster_house, AND(OR(r.hookshot_spam_pit, r.boots_bonk_pit), POWER_BRACELET)) # boots bonk or hookshot spam over the pit to get to the rock
+            bird_key.connect(bird_cave, AND(r.boots_jump, r.pit_buffer)) # boots jump above wall, use multiple pit buffers to get across
+            right_taltal_connector2.connect(right_taltal_connector3, r.pit_buffer_itemless, one_way=True) # 2 separate pit buffers so not obnoxious to get past the two pit rooms before d7 area. 2nd pits can pit buffer on top right screen, bottom wall to scroll on top of the wall on bottom screen
+            mountain_bridge_staircase.connect(outside_rooster_house, r.pit_buffer_boots) # cross bridge to staircase with pit buffer to clip bottom wall and jump or boots bonk across
+            left_right_connector_cave_entrance.connect(left_right_connector_cave_exit, AND(r.boots_jump, r.pit_buffer), one_way=True) # boots jump to bottom left corner of pits, pit buffer and jump to left
+            left_right_connector_cave_exit.connect(left_right_connector_cave_entrance, AND(ROOSTER, OR(r.boots_roosterhop, r.super_jump_rooster)), one_way=True)  # pass through the passage in reverse using a boots rooster hop or rooster superjump in the one way passage area
+
+            windfish.connect(nightmare, AND(SWORD, OR(BOOMERANG, BOW, BOMB, COUNT(SWORD, 2), AND(OCARINA, OR(SONG1, SONG3))))) # sword quick kill blob, can kill dethl with bombs or sword beams, and can use ocarina to freeze one of ganon's bats to skip dethl eye phase
 
         self.start = start_house
         self.egg = windfish_egg
diff --git a/worlds/ladx/LADXR/logic/requirements.py b/worlds/ladx/LADXR/logic/requirements.py
index a8e57327e78b..fa01627a15c3 100644
--- a/worlds/ladx/LADXR/logic/requirements.py
+++ b/worlds/ladx/LADXR/logic/requirements.py
@@ -254,18 +254,62 @@ def isConsumable(item) -> bool:
 class RequirementsSettings:
     def __init__(self, options):
         self.bush = OR(SWORD, MAGIC_POWDER, MAGIC_ROD, POWER_BRACELET, BOOMERANG)
+        self.pit_bush = OR(SWORD, MAGIC_POWDER, MAGIC_ROD, BOOMERANG, BOMB) # unique
         self.attack = OR(SWORD, BOMB, BOW, MAGIC_ROD, BOOMERANG)
-        self.attack_hookshot = OR(SWORD, BOMB, BOW, MAGIC_ROD, BOOMERANG, HOOKSHOT) # switches, hinox, shrouded stalfos
+        self.attack_hookshot = OR(SWORD, BOMB, BOW, MAGIC_ROD, BOOMERANG, HOOKSHOT) # hinox, shrouded stalfos
+        self.hit_switch = OR(SWORD, BOMB, BOW, MAGIC_ROD, BOOMERANG, HOOKSHOT) # hit switches in dungeons
         self.attack_hookshot_powder = OR(SWORD, BOMB, BOW, MAGIC_ROD, BOOMERANG, HOOKSHOT, MAGIC_POWDER) # zols, keese, moldorm
         self.attack_no_bomb = OR(SWORD, BOW, MAGIC_ROD, BOOMERANG, HOOKSHOT) # ?
         self.attack_hookshot_no_bomb = OR(SWORD, BOW, MAGIC_ROD, BOOMERANG, HOOKSHOT) # vire
         self.attack_no_boomerang = OR(SWORD, BOMB, BOW, MAGIC_ROD, HOOKSHOT) # teleporting owls
         self.attack_skeleton = OR(SWORD, BOMB, BOW, BOOMERANG, HOOKSHOT)  # cannot kill skeletons with the fire rod
+        self.attack_gibdos = OR(SWORD, BOMB, BOW, BOOMERANG, AND(MAGIC_ROD, HOOKSHOT)) # gibdos are only stunned with hookshot, but can be burnt to jumping stalfos first with magic rod
+        self.attack_pols_voice = OR(BOMB, MAGIC_ROD, AND(OCARINA, SONG1)) # BOW works, but isn't as reliable as it needs 4 arrows.
+        self.attack_wizrobe = OR(BOMB, MAGIC_ROD) # BOW works, but isn't as reliable as it needs 4 arrows.
+        self.stun_wizrobe = OR(BOOMERANG, MAGIC_POWDER, HOOKSHOT)
         self.rear_attack = OR(SWORD, BOMB) # mimic
         self.rear_attack_range = OR(MAGIC_ROD, BOW) # mimic
         self.fire = OR(MAGIC_POWDER, MAGIC_ROD) # torches
         self.push_hardhat = OR(SHIELD, SWORD, HOOKSHOT, BOOMERANG)
-        self.shuffled_magnifier = TRADING_ITEM_MAGNIFYING_GLASS
+        self.shuffled_magnifier = TRADING_ITEM_MAGNIFYING_GLASS # overwritten if vanilla trade items
+
+        self.throw_pot = POWER_BRACELET # grab pots to kill enemies
+        self.throw_enemy = POWER_BRACELET # grab stunned enemies to kill enemies
+        self.tight_jump = FEATHER # jumps that are possible but are tight to make it across
+        self.super_jump = AND(FEATHER, OR(SWORD, BOW, MAGIC_ROD)) # standard superjump for glitch logic
+        self.super_jump_boots = AND(PEGASUS_BOOTS, FEATHER, OR(SWORD, BOW, MAGIC_ROD)) # boots dash into wall for unclipped superjump
+        self.super_jump_feather = FEATHER # using only feather to align and jump off walls
+        self.super_jump_sword = AND(FEATHER, SWORD) # unclipped superjumps
+        self.super_jump_rooster = AND(ROOSTER, OR(SWORD, BOW, MAGIC_ROD)) # use rooster instead of feather to superjump off walls (only where rooster is allowed to be used)
+        self.shaq_jump = FEATHER # use interactable objects (keyblocks / pushable blocks)
+        self.boots_superhop = AND(PEGASUS_BOOTS, OR(MAGIC_ROD, BOW)) # dash into walls, pause, unpause and use weapon + hold direction away from wall. Only works in peg rooms
+        self.boots_roosterhop = AND(PEGASUS_BOOTS, ROOSTER) # dash towards a wall, pick up the rooster and throw it away from the wall before hitting the wall to get a superjump
+        self.jesus_jump = FEATHER # pause on the frame of hitting liquid (water / lava) to be able to jump again on unpause
+        self.jesus_buffer = PEGASUS_BOOTS # use a boots bonk to get on top of liquid (water / lava), then use buffers to get into positions
+        self.damage_boost_special = options.hardmode == "none" # use damage to cross pits / get through forced barriers without needing an enemy that can be eaten by bowwow
+        self.damage_boost = (options.bowwow == "normal") & (options.hardmode == "none")  # Use damage to cross pits / get through forced barriers
+        self.sideways_block_push = True # wall clip pushable block, get against the edge and push block to move it sideways
+        self.wall_clip = True # push into corners to get further into walls, to avoid collision with enemies along path (see swamp flowers for example) or just getting a better position for jumps
+        self.pit_buffer_itemless = True # walk on top of pits and buffer down
+        self.pit_buffer = FEATHER # jump on top of pits and buffer to cross vertical gaps
+        self.pit_buffer_boots = OR(PEGASUS_BOOTS, FEATHER) # use boots or feather to cross gaps
+        self.boots_jump = AND(PEGASUS_BOOTS, FEATHER) # use boots jumps to cross 4 gap spots or other hard to reach spots
+        self.boots_bonk = PEGASUS_BOOTS # bonk against walls in 2d sections to get to higher places (no pits involved usually)
+        self.boots_bonk_pit = PEGASUS_BOOTS # use boots bonks to cross 1 tile gaps
+        self.boots_bonk_2d_spikepit = AND(PEGASUS_BOOTS, "MEDICINE2") # use iframes from medicine to get a boots dash going in 2d spike pits (kanalet secret passage, d3 2d section to boss)
+        self.boots_bonk_2d_hell = PEGASUS_BOOTS # seperate boots bonks from hell logic which are harder?
+        self.boots_dash_2d = PEGASUS_BOOTS # use boots to dash over 1 tile gaps in 2d sections
+        self.hookshot_spam_pit = HOOKSHOT # use hookshot with spam to cross 1 tile gaps
+        self.hookshot_clip = AND(HOOKSHOT, options.superweapons == False) # use hookshot at specific angles to hookshot past blocks (see forest north log cave, dream shrine entrance for example)
+        self.hookshot_clip_block = HOOKSHOT # use hookshot spam with enemies to clip through entire blocks (d5 room before gohma, d2 pots room before boss)
+        self.hookshot_over_pit = HOOKSHOT # use hookshot while over a pit to reach certain areas (see d3 vacuum room, d5 north of crossroads for example)
+        self.hookshot_jump = AND(HOOKSHOT, FEATHER) # while over pits, on the first frame after the hookshot is retracted you can input a jump to cross big pit gaps
+        self.bookshot = AND(FEATHER, HOOKSHOT) # use feather on A, hookshot on B on the same frame to get a speedy hookshot that can be used to clip past blocks
+        self.bomb_trigger = BOMB # drop two bombs at the same time to trigger cutscenes or pickup items (can use pits, or screen transitions
+        self.shield_bump = SHIELD # use shield to knock back enemies or knock off enemies when used in combination with superjumps
+        self.text_clip = False & options.nagmessages # trigger a text box on keyblock or rock or obstacle while holding diagonal to clip into the side. Removed from logic for now
+        self.jesus_rooster = AND(ROOSTER, options.hardmode != "oracle") # when transitioning on top of water, buffer the rooster out of sq menu to spawn it. Then do an unbuffered pickup of the rooster as soon as you spawn again to pick it up
+        self.zoomerang = AND(PEGASUS_BOOTS, FEATHER, BOOMERANG) # after starting a boots dash, buffer boomerang (on b), feather and the direction you're dashing in to get boosted in certain directions
 
         self.boss_requirements = [
             SWORD,  # D1 boss
@@ -283,7 +327,7 @@ def __init__(self, options):
             "HINOX":            self.attack_hookshot,
             "DODONGO":          BOMB,
             "CUE_BALL":         SWORD,
-            "GHOMA":            OR(BOW, HOOKSHOT),
+            "GHOMA":            OR(BOW, HOOKSHOT, MAGIC_ROD, BOOMERANG),
             "SMASHER":          POWER_BRACELET,
             "GRIM_CREEPER":     self.attack_hookshot_no_bomb,
             "BLAINO":           SWORD,
@@ -295,10 +339,14 @@ def __init__(self, options):
 
         # Adjust for options
         if not options.tradequest:
-            self.shuffled_magnifier = True
-        if options.bowwow != 'normal':
+            self.shuffled_magnifier = True # completing trade quest not required
+        if options.hardmode == "ohko":
+            self.miniboss_requirements["ROLLING_BONES"] = OR(BOW, MAGIC_ROD, BOOMERANG, AND(FEATHER, self.attack_hookshot)) # should not deal with roller damage
+        if options.bowwow != "normal":
             # We cheat in bowwow mode, we pretend we have the sword, as bowwow can pretty much do all what the sword ca$            # Except for taking out bushes (and crystal pillars are removed)
             self.bush.remove(SWORD)
+            self.pit_bush.remove(SWORD)
+            self.hit_switch.remove(SWORD)
         if options.logic == "casual":
             # In casual mode, remove the more complex kill methods
             self.bush.remove(MAGIC_POWDER)
@@ -308,14 +356,18 @@ def __init__(self, options):
             self.attack_hookshot_powder.remove(BOMB)
             self.attack_no_boomerang.remove(BOMB)
             self.attack_skeleton.remove(BOMB)
-        if options.logic == "hard":
+
+        if options.logic == 'hard' or options.logic == 'glitched' or options.logic == 'hell':
+            self.boss_requirements[1] = AND(OR(SWORD, MAGIC_ROD, BOMB), POWER_BRACELET)  # bombs + bracelet genie
             self.boss_requirements[3] = AND(FLIPPERS, OR(SWORD, MAGIC_ROD, BOW, BOMB))  # bomb angler fish
             self.boss_requirements[6] = OR(MAGIC_ROD, AND(BOMB, BOW), COUNT(SWORD, 2), AND(OR(SWORD, HOOKSHOT, BOW), SHIELD))  # evil eagle 3 cycle magic rod / bomb arrows / l2 sword, and bow kill
-        if options.logic == "glitched":
-            self.boss_requirements[3] = AND(FLIPPERS, OR(SWORD, MAGIC_ROD, BOW, BOMB))  # bomb angler fish
+            self.attack_pols_voice = OR(BOMB, MAGIC_ROD, AND(OCARINA, SONG1), AND(self.stun_wizrobe, self.throw_enemy, BOW)) # wizrobe stun has same req as pols voice stun
+            self.attack_wizrobe = OR(BOMB, MAGIC_ROD, AND(self.stun_wizrobe, self.throw_enemy, BOW))
+
+        if options.logic == 'glitched' or options.logic == 'hell':
             self.boss_requirements[6] = OR(MAGIC_ROD, BOMB, BOW, HOOKSHOT, COUNT(SWORD, 2), AND(SWORD, SHIELD))  # evil eagle off screen kill or 3 cycle with bombs
+
         if options.logic == "hell":
-            self.boss_requirements[3] = AND(FLIPPERS, OR(SWORD, MAGIC_ROD, BOW, BOMB))  # bomb angler fish
-            self.boss_requirements[6] = OR(MAGIC_ROD, BOMB, BOW, HOOKSHOT, COUNT(SWORD, 2), AND(SWORD, SHIELD))  # evil eagle off screen kill or 3 cycle with bombs
             self.boss_requirements[7] = OR(MAGIC_ROD, COUNT(SWORD, 2)) # hot head sword beams
+            self.miniboss_requirements["GHOMA"] = OR(BOW, HOOKSHOT, MAGIC_ROD, BOOMERANG, AND(OCARINA, BOMB, OR(SONG1, SONG3)))  # use bombs to kill gohma, with ocarina to get good timings
             self.miniboss_requirements["GIANT_BUZZ_BLOB"] = OR(MAGIC_POWDER, COUNT(SWORD,2)) # use sword beams to damage buzz blob
diff --git a/worlds/ladx/test/TestDungeonLogic.py b/worlds/ladx/test/TestDungeonLogic.py
index b9b9672b9b16..3202afa95bc1 100644
--- a/worlds/ladx/test/TestDungeonLogic.py
+++ b/worlds/ladx/test/TestDungeonLogic.py
@@ -10,7 +10,7 @@ class TestD6(LADXTestBase):
 
     def test_keylogic(self):
         keys = self.get_items_by_name(ItemName.KEY6)
-        self.collect_by_name([ItemName.FACE_KEY, ItemName.HOOKSHOT, ItemName.POWER_BRACELET, ItemName.BOMB, ItemName.FEATHER, ItemName.FLIPPERS])
+        self.collect_by_name([ItemName.FACE_KEY, ItemName.HOOKSHOT, ItemName.POWER_BRACELET, ItemName.BOMB, ItemName.PEGASUS_BOOTS, ItemName.FEATHER, ItemName.FLIPPERS])
         # Can reach an un-keylocked item in the dungeon
         self.assertTrue(self.can_reach_location("L2 Bracelet Chest (Face Shrine)"))
 
@@ -18,18 +18,18 @@ def test_keylogic(self):
         location_1 = "Tile Room Key (Face Shrine)"
         location_2 = "Top Right Horse Heads Chest (Face Shrine)"
         location_3 = "Pot Locked Chest (Face Shrine)"
-        self.assertFalse(self.can_reach_location(location_1))
-        self.assertFalse(self.can_reach_location(location_2))
-        self.assertFalse(self.can_reach_location(location_3))
+        self.assertFalse(self.can_reach_location(location_1), "Tile Room Key, 0 keys")
+        self.assertFalse(self.can_reach_location(location_2), "Top Right Horse Heads Chest, 0 keys")
+        self.assertFalse(self.can_reach_location(location_3), "Pot Locked Chest, 0 keys")
         self.collect(keys[0])
-        self.assertTrue(self.can_reach_location(location_1))
-        self.assertFalse(self.can_reach_location(location_2))
-        self.assertFalse(self.can_reach_location(location_3))
+        self.assertTrue(self.can_reach_location(location_1), "Tile Room Key, 1 key")
+        self.assertFalse(self.can_reach_location(location_2), "Top Right Horse Heads Chest, 1 key")
+        self.assertFalse(self.can_reach_location(location_3), "Pot Locked Chest, 1 key")
         self.collect(keys[1])
-        self.assertTrue(self.can_reach_location(location_1))
-        self.assertTrue(self.can_reach_location(location_2))
-        self.assertFalse(self.can_reach_location(location_3))
+        self.assertTrue(self.can_reach_location(location_1), "Tile Room Key, 2 keys")
+        self.assertTrue(self.can_reach_location(location_2), "Top Right Horse Heads Chest, 2 keys")
+        self.assertFalse(self.can_reach_location(location_3), "Pot Locked Chest, 2 keys")
         self.collect(keys[2])
-        self.assertTrue(self.can_reach_location(location_1))
-        self.assertTrue(self.can_reach_location(location_2))
-        self.assertTrue(self.can_reach_location(location_3))
+        self.assertTrue(self.can_reach_location(location_1), "Tile Room Key, 3 keys")
+        self.assertTrue(self.can_reach_location(location_2), "Top Right Horse Heads Chest, 3 keys")
+        self.assertTrue(self.can_reach_location(location_3), "Pot Locked Chest, 3 keys")

From f4b926ebbe491dc9a064b5d17bdd95051a5c6496 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Thu, 5 Dec 2024 07:33:21 -0800
Subject: [PATCH 138/381] Pokemon Emerald: Exclude sacred ash post champion
 (#4207)

* Pokemon Emerald: Exclude sacred ash post champion

* Pokemon Emerald: Remove .value from toggle option check
---
 worlds/pokemon_emerald/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py
index 040b89b1af51..7b62b9ef73b1 100644
--- a/worlds/pokemon_emerald/__init__.py
+++ b/worlds/pokemon_emerald/__init__.py
@@ -297,6 +297,12 @@ def exclude_locations(location_names: List[str]):
                     "Safari Zone SE - Hidden Item in South Grass 2",
                     "Safari Zone SE - Item in Grass",
                 ])
+
+            # Sacred ash is on Navel Rock, which is locked behind the event tickets
+            if not self.options.event_tickets:
+                exclude_locations([
+                    "Navel Rock Top - Hidden Item Sacred Ash",
+                ])
         elif self.options.goal == Goal.option_steven:
             exclude_locations([
                 "Meteor Falls 1F - Rival Steven",

From ced93022b67532e8172fd217a7d3a7bd205b8177 Mon Sep 17 00:00:00 2001
From: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Date: Fri, 6 Dec 2024 01:15:26 -0500
Subject: [PATCH 139/381] Adventure: Remove unused variables (#4301)

* Remove unused variables

* Provide old parameters to comment
---
 worlds/adventure/Locations.py | 2 --
 worlds/adventure/Regions.py   | 6 +++---
 worlds/adventure/Rom.py       | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/worlds/adventure/Locations.py b/worlds/adventure/Locations.py
index 27e504684cbf..ddaa266e5b74 100644
--- a/worlds/adventure/Locations.py
+++ b/worlds/adventure/Locations.py
@@ -47,8 +47,6 @@ def __init__(self, region, name, location_id, world_positions: [WorldPosition] =
         self.local_item: int = None
 
     def get_random_position(self, random):
-        x: int = None
-        y: int = None
         if self.world_positions is None or len(self.world_positions) == 0:
             if self.room_id is None:
                 return None
diff --git a/worlds/adventure/Regions.py b/worlds/adventure/Regions.py
index e72806ca454f..4e4dd1e7baa1 100644
--- a/worlds/adventure/Regions.py
+++ b/worlds/adventure/Regions.py
@@ -76,10 +76,9 @@ def create_regions(options: PerGameCommonOptions, multiworld: MultiWorld, player
     multiworld.regions.append(credits_room_far_side)
 
     dragon_slay_check = options.dragon_slay_check.value
-    priority_locations = determine_priority_locations(multiworld, dragon_slay_check)
+    priority_locations = determine_priority_locations()
 
     for name, location_data in location_table.items():
-        require_sword = False
         if location_data.region == "Varies":
             if location_data.name == "Slay Yorgle":
                 if not dragon_slay_check:
@@ -154,6 +153,7 @@ def create_regions(options: PerGameCommonOptions, multiworld: MultiWorld, player
 
 
 # Placeholder for adding sets of priority locations at generation, possibly as an option in the future
-def determine_priority_locations(world: MultiWorld, dragon_slay_check: bool) -> {}:
+# def determine_priority_locations(multiworld: MultiWorld, dragon_slay_check: bool) -> {}:
+def determine_priority_locations() -> {}:
     priority_locations = {}
     return priority_locations
diff --git a/worlds/adventure/Rom.py b/worlds/adventure/Rom.py
index ca64e569716a..643f7a6c766c 100644
--- a/worlds/adventure/Rom.py
+++ b/worlds/adventure/Rom.py
@@ -86,9 +86,7 @@ class AdventureDeltaPatch(APPatch, metaclass=AutoPatchRegister):
 
     # locations: [], autocollect: [], seed_name: bytes,
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        patch_only = True
         if "autocollect" in kwargs:
-            patch_only = False
             self.foreign_items: [AdventureForeignItemInfo] = [AdventureForeignItemInfo(loc.short_location_id, loc.room_id, loc.room_x, loc.room_y)
                                   for loc in kwargs["locations"]]
 

From c9625e1b35c36866ee727128fe73808580f37145 Mon Sep 17 00:00:00 2001
From: LeonarthCG <33758848+LeonarthCG@users.noreply.github.com>
Date: Sat, 7 Dec 2024 11:29:27 +0100
Subject: [PATCH 140/381] Saving Princess: implement new game (#3238)

* Saving Princess: initial commit

* settings -> options

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* settings -> options

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* replace RegionData class with List[str]

RegionData was only wrapping a List[str], so we can directly use List[str]

* world: MultiWorld -> multiworld: MultiWorld

* use world's random instead of multiworld's

* use state's has_any and has_all where applicable

* remove unused StartInventory import

* reorder PerGameCommonOptions

* fix relative AutoWorld import

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* clean up double spaces

* local commands -> Local Commands

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

* remove redundant which items section

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

* game info rework

* clean up item count redundancy

* add game to readme and codeowners

* fix get_region_entrance return type

* world.multiworld.get -> world.get

* add more events

added events for the boss kills that open the gate, as well as for system power being restored

these only apply if expanded pool is not selected

* add client/autoupdater to launcher

* reorder commands in game info

* update docs with automated installation info

* add quick links to doc

* Update setup_en.md

* remove standalone saving princess client

* doc fixes

* code improvements and redundant default removal

as suggested by @Exempt-Medic
this includes the removal of events from the item/location name to id, as well as checking for the player name being ASCII

* add option to change launch coammnd

the LaunchCommand option is filled to either the executable or wine with the necessary arguments based on Utils.is_windows

* simplify valid install check

* mod installer improvements

now deletes possible existing files before installing the mod

* add option groups and presets

* add required client version

* update docs about cheat items pop-ups

items sent directly by the server (such as with starting inventory) now have pop-ups just like any other item

* add Steam Input issue to faq

* Saving Princess: BRAINOS requires all weapons

* Saving Princess: Download dll and patch together

Previously, gm-apclientpp.dll was downloaded from its own repo
With this update, the dll is instead extracted from the same zip as the game's patch

* Saving Princess: Add URI launch support

* Saving Princess: goal also requires all weapons

given it's past brainos

* Saving Princess: update docs

automatic connection support was added, docs now reflect this

* Saving Princess: extend([item]) -> append(item)

* Saving Princess: automatic connection validation

also parses the slot, password and host:port into parameters for the game

* Saving Princess: change subprocess .run to .Popen

This keeps the game from freezing the launcher while it is running

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 README.md                                     |   1 +
 docs/CODEOWNERS                               |   3 +
 worlds/saving_princess/Client.py              | 258 ++++++++++++++++++
 worlds/saving_princess/Constants.py           |  97 +++++++
 worlds/saving_princess/Items.py               |  98 +++++++
 worlds/saving_princess/Locations.py           |  82 ++++++
 worlds/saving_princess/Options.py             | 183 +++++++++++++
 worlds/saving_princess/Regions.py             | 110 ++++++++
 worlds/saving_princess/Rules.py               | 132 +++++++++
 worlds/saving_princess/__init__.py            | 174 ++++++++++++
 .../docs/en_Saving Princess.md                |  55 ++++
 worlds/saving_princess/docs/setup_en.md       | 148 ++++++++++
 12 files changed, 1341 insertions(+)
 create mode 100644 worlds/saving_princess/Client.py
 create mode 100644 worlds/saving_princess/Constants.py
 create mode 100644 worlds/saving_princess/Items.py
 create mode 100644 worlds/saving_princess/Locations.py
 create mode 100644 worlds/saving_princess/Options.py
 create mode 100644 worlds/saving_princess/Regions.py
 create mode 100644 worlds/saving_princess/Rules.py
 create mode 100644 worlds/saving_princess/__init__.py
 create mode 100644 worlds/saving_princess/docs/en_Saving Princess.md
 create mode 100644 worlds/saving_princess/docs/setup_en.md

diff --git a/README.md b/README.md
index 2cc3c18aa09d..21a6faaa2698 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,7 @@ Currently, the following games are supported:
 * Mega Man 2
 * Yacht Dice
 * Faxanadu
+* Saving Princess
 
 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 64a1362bf380..1aec57fc90f6 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -142,6 +142,9 @@
 # Risk of Rain 2
 /worlds/ror2/ @kindasneaki
 
+# Saving Princess
+/worlds/saving_princess/ @LeonarthCG
+
 # Shivers
 /worlds/shivers/ @GodlFire
 
diff --git a/worlds/saving_princess/Client.py b/worlds/saving_princess/Client.py
new file mode 100644
index 000000000000..29a97bb667c0
--- /dev/null
+++ b/worlds/saving_princess/Client.py
@@ -0,0 +1,258 @@
+import argparse
+import zipfile
+from io import BytesIO
+
+import bsdiff4
+from datetime import datetime
+import hashlib
+import json
+import logging
+import os
+import requests
+import secrets
+import shutil
+import subprocess
+from tkinter import messagebox
+from typing import Any, Dict, Set
+import urllib
+import urllib.parse
+
+import Utils
+from .Constants import *
+from . import SavingPrincessWorld
+
+files_to_clean: Set[str] = {
+    "D3DX9_43.dll",
+    "data.win",
+    "m_boss.ogg",
+    "m_brainos.ogg",
+    "m_coldarea.ogg",
+    "m_escape.ogg",
+    "m_hotarea.ogg",
+    "m_hsis_dark.ogg",
+    "m_hsis_power.ogg",
+    "m_introarea.ogg",
+    "m_malakhov.ogg",
+    "m_miniboss.ogg",
+    "m_ninja.ogg",
+    "m_purple.ogg",
+    "m_space_idle.ogg",
+    "m_stonearea.ogg",
+    "m_swamp.ogg",
+    "m_zzz.ogg",
+    "options.ini",
+    "Saving Princess v0_8.exe",
+    "splash.png",
+    "gm-apclientpp.dll",
+    "LICENSE",
+    "original_data.win",
+    "versions.json",
+}
+
+file_hashes: Dict[str, str] = {
+    "D3DX9_43.dll": "86e39e9161c3d930d93822f1563c280d",
+    "Saving Princess v0_8.exe": "cc3ad10c782e115d93c5b9fbc5675eaf",
+    "original_data.win": "f97b80204bd9ae535faa5a8d1e5eb6ca",
+}
+
+
+class UrlResponse:
+    def __init__(self, response_code: int, data: Any):
+        self.response_code = response_code
+        self.data = data
+
+
+def get_date(target_asset: str) -> str:
+    """Provided the name of an asset, fetches its update date"""
+    try:
+        with open("versions.json", "r") as versions_json:
+            return json.load(versions_json)[target_asset]
+    except (FileNotFoundError, KeyError, json.decoder.JSONDecodeError):
+        return "2000-01-01T00:00:00Z"  # arbitrary old date
+
+
+def set_date(target_asset: str, date: str) -> None:
+    """Provided the name of an asset and a date, sets it update date"""
+    try:
+        with open("versions.json", "r") as versions_json:
+            versions = json.load(versions_json)
+            versions[target_asset] = date
+    except (FileNotFoundError, KeyError, json.decoder.JSONDecodeError):
+        versions = {target_asset: date}
+    with open("versions.json", "w") as versions_json:
+        json.dump(versions, versions_json)
+
+
+def get_timestamp(date: str) -> float:
+    """Parses a GitHub REST API date into a timestamp"""
+    return datetime.strptime(date, "%Y-%m-%dT%H:%M:%SZ").timestamp()
+
+
+def send_request(request_url: str) -> UrlResponse:
+    """Fetches status code and json response from given url"""
+    response = requests.get(request_url)
+    if response.status_code == 200:  # success
+        try:
+            data = response.json()
+        except requests.exceptions.JSONDecodeError:
+            raise RuntimeError(f"Unable to fetch data. (status code {response.status_code}).")
+    else:
+        data = {}
+    return UrlResponse(response.status_code, data)
+
+
+def update(target_asset: str, url: str) -> bool:
+    """
+    Returns True if the data was fetched and installed
+        (or it was already on the latest version, or the user refused the update)
+    Returns False if rate limit was exceeded
+    """
+    try:
+        logging.info(f"Checking for {target_asset} updates.")
+        response = send_request(url)
+        if response.response_code == 403:  # rate limit exceeded
+            return False
+        assets = response.data[0]["assets"]
+        for asset in assets:
+            if target_asset in asset["name"]:
+                newest_date: str = asset["updated_at"]
+                release_url: str = asset["browser_download_url"]
+                break
+        else:
+            raise RuntimeError(f"Failed to locate {target_asset} amongst the assets.")
+    except (KeyError, IndexError, TypeError, RuntimeError):
+        update_error = f"Failed to fetch latest {target_asset}."
+        messagebox.showerror("Failure", update_error)
+        raise RuntimeError(update_error)
+    try:
+        update_available = get_timestamp(newest_date) > get_timestamp(get_date(target_asset))
+        if update_available and messagebox.askyesnocancel(f"New {target_asset}",
+                                                          "Would you like to install the new version now?"):
+            # unzip and patch
+            with urllib.request.urlopen(release_url) as download:
+                with zipfile.ZipFile(BytesIO(download.read())) as zf:
+                    zf.extractall()
+            patch_game()
+            set_date(target_asset, newest_date)
+    except (ValueError, RuntimeError, urllib.error.HTTPError):
+        update_error = f"Failed to apply update."
+        messagebox.showerror("Failure", update_error)
+        raise RuntimeError(update_error)
+    return True
+
+
+def patch_game() -> None:
+    """Applies the patch to data.win"""
+    logging.info("Proceeding to patch.")
+    with open(PATCH_NAME, "rb") as patch:
+        with open("original_data.win", "rb") as data:
+            patched_data = bsdiff4.patch(data.read(), patch.read())
+        with open("data.win", "wb") as data:
+            data.write(patched_data)
+        logging.info("Done!")
+
+
+def is_install_valid() -> bool:
+    """Checks that the mandatory files that we cannot replace do exist in the current folder"""
+    for file_name, expected_hash in file_hashes.items():
+        if not os.path.exists(file_name):
+            return False
+        with open(file_name, "rb") as clean:
+            current_hash = hashlib.md5(clean.read()).hexdigest()
+        if not secrets.compare_digest(current_hash, expected_hash):
+            return False
+    return True
+
+
+def install() -> None:
+    """Extracts all the game files into the mod installation folder"""
+    logging.info("Mod installation missing or corrupted, proceeding to reinstall.")
+    # get the cab file and extract it into the installation folder
+    with open(SavingPrincessWorld.settings.exe_path, "rb") as exe:
+        # find the cab header
+        logging.info("Looking for cab archive inside exe.")
+        cab_found: bool = False
+        while not cab_found:
+            cab_found = exe.read(1) == b'M' and exe.read(1) == b'S' and exe.read(1) == b'C' and exe.read(1) == b'F'
+        exe.read(4)  # skip reserved1, always 0
+        cab_size: int = int.from_bytes(exe.read(4), "little")  # read size in bytes
+        exe.seek(-12, 1)  # move the cursor back to the start of the cab file
+        logging.info(f"Archive found at offset {hex(exe.seek(0, 1))}, size: {hex(cab_size)}.")
+        logging.info("Extracting cab archive from exe.")
+        with open("saving_princess.cab", "wb") as cab:
+            cab.write(exe.read(cab_size))
+
+    # clean up files from previous installations
+    for file_name in files_to_clean:
+        if os.path.exists(file_name):
+            os.remove(file_name)
+
+    logging.info("Extracting files from cab archive.")
+    if Utils.is_windows:
+        subprocess.run(["Extrac32", "/Y", "/E", "saving_princess.cab"])
+    else:
+        if shutil.which("wine") is not None:
+            subprocess.run(["wine", "Extrac32", "/Y", "/E", "saving_princess.cab"])
+        elif shutil.which("7z") is not None:
+            subprocess.run(["7z", "e", "saving_princess.cab"])
+        else:
+            error = "Could not find neither wine nor 7z.\n\nPlease install either the wine or the p7zip package."
+            messagebox.showerror("Missing package!", f"Error: {error}")
+            raise RuntimeError(error)
+    os.remove("saving_princess.cab")  # delete the cab file
+
+    shutil.copyfile("data.win", "original_data.win")  # and make a copy of data.win
+    logging.info("Done!")
+
+
+def launch(*args: str) -> Any:
+    """Check args, then the mod installation, then launch the game"""
+    name: str = ""
+    password: str = ""
+    server: str = ""
+    if args:
+        parser = argparse.ArgumentParser(description=f"{GAME_NAME} Client Launcher")
+        parser.add_argument("url", type=str, nargs="?", help="Archipelago Webhost uri to auto connect to.")
+        args = parser.parse_args(args)
+
+        # handle if text client is launched using the "archipelago://name:pass@host:port" url from webhost
+        if args.url:
+            url = urllib.parse.urlparse(args.url)
+            if url.scheme == "archipelago":
+                server = f'--server="{url.hostname}:{url.port}"'
+                if url.username:
+                    name = f'--name="{urllib.parse.unquote(url.username)}"'
+                if url.password:
+                    password = f'--password="{urllib.parse.unquote(url.password)}"'
+            else:
+                parser.error(f"bad url, found {args.url}, expected url in form of archipelago://archipelago.gg:38281")
+
+    Utils.init_logging(CLIENT_NAME, exception_logger="Client")
+
+    os.chdir(SavingPrincessWorld.settings.install_folder)
+
+    # check that the mod installation is valid
+    if not is_install_valid():
+        if messagebox.askyesnocancel(f"Mod installation missing or corrupted!",
+                                     "Would you like to reinstall now?"):
+            install()
+        # if there is no mod installation, and we are not installing it, then there isn't much to do
+        else:
+            return
+
+    # check for updates
+    if not update(DOWNLOAD_NAME, DOWNLOAD_URL):
+        messagebox.showinfo("Rate limit exceeded",
+                            "GitHub REST API limit exceeded, could not check for updates.\n\n"
+                            "This will not prevent the game from being played if it was already playable.")
+
+    # and try to launch the game
+    if SavingPrincessWorld.settings.launch_game:
+        logging.info("Launching game.")
+        try:
+            subprocess.Popen(f"{SavingPrincessWorld.settings.launch_command} {name} {password} {server}")
+        except FileNotFoundError:
+            error = ("Could not run the game!\n\n"
+                     "Please check that launch_command in options.yaml or host.yaml is set up correctly.")
+            messagebox.showerror("Command error!", f"Error: {error}")
+            raise RuntimeError(error)
diff --git a/worlds/saving_princess/Constants.py b/worlds/saving_princess/Constants.py
new file mode 100644
index 000000000000..0dde18779727
--- /dev/null
+++ b/worlds/saving_princess/Constants.py
@@ -0,0 +1,97 @@
+GAME_NAME: str = "Saving Princess"
+BASE_ID: int = 0x53565052494E  # SVPRIN
+
+# client installation data
+CLIENT_NAME = f"{GAME_NAME.replace(' ', '')}Client"
+GAME_HASH = "35a111d0149fae1f04b7b3fea42c5319"
+PATCH_NAME = "saving_princess_basepatch.bsdiff4"
+DOWNLOAD_NAME = "saving_princess_archipelago.zip"
+DOWNLOAD_URL = "https://api.github.com/repos/LeonarthCG/saving-princess-archipelago/releases"
+
+# item names
+ITEM_WEAPON_CHARGE: str = "Powered Blaster"
+ITEM_WEAPON_FIRE: str = "Flamethrower"
+ITEM_WEAPON_ICE: str = "Ice Spreadshot"
+ITEM_WEAPON_VOLT: str = "Volt Laser"
+ITEM_MAX_HEALTH: str = "Life Extension"
+ITEM_MAX_AMMO: str = "Clip Extension"
+ITEM_RELOAD_SPEED: str = "Faster Reload"
+ITEM_SPECIAL_AMMO: str = "Special Extension"
+ITEM_JACKET: str = "Jacket"
+
+EP_ITEM_GUARD_GONE: str = "Cave Key"
+EP_ITEM_CLIFF_GONE: str = "Volcanic Key"
+EP_ITEM_ACE_GONE: str = "Arctic Key"
+EP_ITEM_SNAKE_GONE: str = "Swamp Key"
+EP_ITEM_POWER_ON: str = "System Power"
+
+FILLER_ITEM_HEAL: str = "Full Heal"
+FILLER_ITEM_QUICK_FIRE: str = "Quick-fire Mode"
+FILLER_ITEM_ACTIVE_CAMO: str = "Active Camouflage"
+
+TRAP_ITEM_ICE: str = "Ice Trap"
+TRAP_ITEM_SHAKES: str = "Shake Trap"
+TRAP_ITEM_NINJA: str = "Ninja Trap"
+
+EVENT_ITEM_GUARD_GONE: str = "Guard neutralized"
+EVENT_ITEM_CLIFF_GONE: str = "Cliff neutralized"
+EVENT_ITEM_ACE_GONE: str = "Ace neutralized"
+EVENT_ITEM_SNAKE_GONE: str = "Snake neutralized"
+EVENT_ITEM_POWER_ON: str = "Power restored"
+EVENT_ITEM_VICTORY: str = "PRINCESS"
+
+# location names, EP stands for Expanded Pool
+LOCATION_CAVE_AMMO: str = "Cave: After Wallboss"
+LOCATION_CAVE_RELOAD: str = "Cave: Balcony"
+LOCATION_CAVE_HEALTH: str = "Cave: Spike pit"
+LOCATION_CAVE_WEAPON: str = "Cave: Powered Blaster chest"
+LOCATION_VOLCANIC_RELOAD: str = "Volcanic: Hot coals"
+LOCATION_VOLCANIC_HEALTH: str = "Volcanic: Under bridge"
+LOCATION_VOLCANIC_AMMO: str = "Volcanic: Behind wall"
+LOCATION_VOLCANIC_WEAPON: str = "Volcanic: Flamethrower chest"
+LOCATION_ARCTIC_AMMO: str = "Arctic: Before pipes"
+LOCATION_ARCTIC_RELOAD: str = "Arctic: After Guard"
+LOCATION_ARCTIC_HEALTH: str = "Arctic: Under snow"
+LOCATION_ARCTIC_WEAPON: str = "Arctic: Ice Spreadshot chest"
+LOCATION_JACKET: str = "Arctic: Jacket chest"
+LOCATION_HUB_AMMO: str = "Hub: Hidden near Arctic"
+LOCATION_HUB_HEALTH: str = "Hub: Hidden near Cave"
+LOCATION_HUB_RELOAD: str = "Hub: Hidden near Swamp"
+LOCATION_SWAMP_AMMO: str = "Swamp: Bramble room"
+LOCATION_SWAMP_HEALTH: str = "Swamp: Down the chimney"
+LOCATION_SWAMP_RELOAD: str = "Swamp: Wall maze"
+LOCATION_SWAMP_SPECIAL: str = "Swamp: Special Extension chest"
+LOCATION_ELECTRICAL_RELOAD: str = "Electrical: Near generator"
+LOCATION_ELECTRICAL_HEALTH: str = "Electrical: Behind wall"
+LOCATION_ELECTRICAL_AMMO: str = "Electrical: Before Malakhov"
+LOCATION_ELECTRICAL_WEAPON: str = "Electrical: Volt Laser chest"
+
+EP_LOCATION_CAVE_MINIBOSS: str = "Cave: Wallboss (Boss)"
+EP_LOCATION_CAVE_BOSS: str = "Cave: Guard (Boss)"
+EP_LOCATION_VOLCANIC_BOSS: str = "Volcanic: Cliff (Boss)"
+EP_LOCATION_ARCTIC_BOSS: str = "Arctic: Ace (Boss)"
+EP_LOCATION_HUB_CONSOLE: str = "Hub: Console login"
+EP_LOCATION_HUB_NINJA_SCARE: str = "Hub: Ninja scare (Boss?)"
+EP_LOCATION_SWAMP_BOSS: str = "Swamp: Snake (Boss)"
+EP_LOCATION_ELEVATOR_NINJA_FIGHT: str = "Elevator: Ninja (Boss)"
+EP_LOCATION_ELECTRICAL_EXTRA: str = "Electrical: Tesla orb"
+EP_LOCATION_ELECTRICAL_MINIBOSS: str = "Electrical: Generator (Boss)"
+EP_LOCATION_ELECTRICAL_BOSS: str = "Electrical: Malakhov (Boss)"
+EP_LOCATION_ELECTRICAL_FINAL_BOSS: str = "Electrical: BRAINOS (Boss)"
+
+EVENT_LOCATION_GUARD_GONE: str = "Cave status"
+EVENT_LOCATION_CLIFF_GONE: str = "Volcanic status"
+EVENT_LOCATION_ACE_GONE: str = "Arctic status"
+EVENT_LOCATION_SNAKE_GONE: str = "Swamp status"
+EVENT_LOCATION_POWER_ON: str = "Generator status"
+EVENT_LOCATION_VICTORY: str = "Mission objective"
+
+# region names
+REGION_MENU: str = "Menu"
+REGION_CAVE: str = "Cave"
+REGION_VOLCANIC: str = "Volcanic"
+REGION_ARCTIC: str = "Arctic"
+REGION_HUB: str = "Hub"
+REGION_SWAMP: str = "Swamp"
+REGION_ELECTRICAL: str = "Electrical"
+REGION_ELECTRICAL_POWERED: str = "Electrical (Power On)"
diff --git a/worlds/saving_princess/Items.py b/worlds/saving_princess/Items.py
new file mode 100644
index 000000000000..4c1fe78a9c72
--- /dev/null
+++ b/worlds/saving_princess/Items.py
@@ -0,0 +1,98 @@
+from typing import Optional, Dict, Tuple
+
+from BaseClasses import Item, ItemClassification as ItemClass
+
+from .Constants import *
+
+
+class SavingPrincessItem(Item):
+    game: str = GAME_NAME
+
+
+class ItemData:
+    item_class: ItemClass
+    code: Optional[int]
+    count: int  # Number of copies for the item that will be made of class item_class
+    count_extra: int  # Number of extra copies for the item that will be made as useful
+
+    def __init__(self, item_class: ItemClass, code: Optional[int] = None, count: int = 1, count_extra: int = 0):
+        self.item_class = item_class
+
+        self.code = code
+        if code is not None:
+            self.code += BASE_ID
+
+        # if this is filler, a trap or an event, ignore the count
+        if self.item_class == ItemClass.filler or self.item_class == ItemClass.trap or code is None:
+            self.count = 0
+            self.count_extra = 0
+        else:
+            self.count = count
+            self.count_extra = count_extra
+
+    def create_item(self, player: int):
+        return SavingPrincessItem(item_data_names[self], self.item_class, self.code, player)
+
+
+item_dict_weapons: Dict[str, ItemData] = {
+    ITEM_WEAPON_CHARGE: ItemData(ItemClass.progression, 0),
+    ITEM_WEAPON_FIRE: ItemData(ItemClass.progression, 1),
+    ITEM_WEAPON_ICE: ItemData(ItemClass.progression, 2),
+    ITEM_WEAPON_VOLT: ItemData(ItemClass.progression, 3),
+}
+
+item_dict_upgrades: Dict[str, ItemData] = {
+    ITEM_MAX_HEALTH: ItemData(ItemClass.progression, 4, 2, 4),
+    ITEM_MAX_AMMO: ItemData(ItemClass.progression, 5, 2, 4),
+    ITEM_RELOAD_SPEED: ItemData(ItemClass.progression, 6, 4, 2),
+    ITEM_SPECIAL_AMMO: ItemData(ItemClass.useful, 7),
+}
+
+item_dict_base: Dict[str, ItemData] = {
+    **item_dict_weapons,
+    **item_dict_upgrades,
+    ITEM_JACKET: ItemData(ItemClass.useful, 8),
+}
+
+item_dict_keys: Dict[str, ItemData] = {
+    EP_ITEM_GUARD_GONE: ItemData(ItemClass.progression, 9),
+    EP_ITEM_CLIFF_GONE: ItemData(ItemClass.progression, 10),
+    EP_ITEM_ACE_GONE: ItemData(ItemClass.progression, 11),
+    EP_ITEM_SNAKE_GONE: ItemData(ItemClass.progression, 12),
+}
+
+item_dict_expanded: Dict[str, ItemData] = {
+    **item_dict_base,
+    **item_dict_keys,
+    EP_ITEM_POWER_ON: ItemData(ItemClass.progression, 13),
+}
+
+item_dict_filler: Dict[str, ItemData] = {
+    FILLER_ITEM_HEAL: ItemData(ItemClass.filler, 14),
+    FILLER_ITEM_QUICK_FIRE: ItemData(ItemClass.filler, 15),
+    FILLER_ITEM_ACTIVE_CAMO: ItemData(ItemClass.filler, 16),
+}
+
+item_dict_traps: Dict[str, ItemData] = {
+    TRAP_ITEM_ICE: ItemData(ItemClass.trap, 17),
+    TRAP_ITEM_SHAKES: ItemData(ItemClass.trap, 18),
+    TRAP_ITEM_NINJA: ItemData(ItemClass.trap, 19),
+}
+
+item_dict_events: Dict[str, ItemData] = {
+    EVENT_ITEM_GUARD_GONE: ItemData(ItemClass.progression),
+    EVENT_ITEM_CLIFF_GONE: ItemData(ItemClass.progression),
+    EVENT_ITEM_ACE_GONE: ItemData(ItemClass.progression),
+    EVENT_ITEM_SNAKE_GONE: ItemData(ItemClass.progression),
+    EVENT_ITEM_POWER_ON: ItemData(ItemClass.progression),
+    EVENT_ITEM_VICTORY: ItemData(ItemClass.progression),
+}
+
+item_dict: Dict[str, ItemData] = {
+    **item_dict_expanded,
+    **item_dict_filler,
+    **item_dict_traps,
+    **item_dict_events,
+}
+
+item_data_names: Dict[ItemData, str] = {value: key for key, value in item_dict.items()}
diff --git a/worlds/saving_princess/Locations.py b/worlds/saving_princess/Locations.py
new file mode 100644
index 000000000000..bc7b0f0d6efd
--- /dev/null
+++ b/worlds/saving_princess/Locations.py
@@ -0,0 +1,82 @@
+from typing import Optional, Dict
+
+from BaseClasses import Location
+
+from .Constants import *
+
+
+class SavingPrincessLocation(Location):
+    game: str = GAME_NAME
+
+
+class LocData:
+    code: Optional[int]
+
+    def __init__(self, code: Optional[int] = None):
+        if code is not None:
+            self.code = code + BASE_ID
+        else:
+            self.code = None
+
+
+location_dict_base: Dict[str, LocData] = {
+    LOCATION_CAVE_AMMO:         LocData(0),
+    LOCATION_CAVE_RELOAD:       LocData(1),
+    LOCATION_CAVE_HEALTH:       LocData(2),
+    LOCATION_CAVE_WEAPON:       LocData(3),
+    LOCATION_VOLCANIC_RELOAD:   LocData(4),
+    LOCATION_VOLCANIC_HEALTH:   LocData(5),
+    LOCATION_VOLCANIC_AMMO:     LocData(6),
+    LOCATION_VOLCANIC_WEAPON:   LocData(7),
+    LOCATION_ARCTIC_AMMO:       LocData(8),
+    LOCATION_ARCTIC_RELOAD:     LocData(9),
+    LOCATION_ARCTIC_HEALTH:     LocData(10),
+    LOCATION_ARCTIC_WEAPON:     LocData(11),
+    LOCATION_JACKET:            LocData(12),
+    LOCATION_HUB_AMMO:          LocData(13),
+    LOCATION_HUB_HEALTH:        LocData(14),
+    LOCATION_HUB_RELOAD:        LocData(15),
+    LOCATION_SWAMP_AMMO:        LocData(16),
+    LOCATION_SWAMP_HEALTH:      LocData(17),
+    LOCATION_SWAMP_RELOAD:      LocData(18),
+    LOCATION_SWAMP_SPECIAL:     LocData(19),
+    LOCATION_ELECTRICAL_RELOAD: LocData(20),
+    LOCATION_ELECTRICAL_HEALTH: LocData(21),
+    LOCATION_ELECTRICAL_AMMO:   LocData(22),
+    LOCATION_ELECTRICAL_WEAPON: LocData(23),
+}
+
+location_dict_expanded: Dict[str, LocData] = {
+    **location_dict_base,
+    EP_LOCATION_CAVE_MINIBOSS:          LocData(24),
+    EP_LOCATION_CAVE_BOSS:              LocData(25),
+    EP_LOCATION_VOLCANIC_BOSS:          LocData(26),
+    EP_LOCATION_ARCTIC_BOSS:            LocData(27),
+    EP_LOCATION_HUB_CONSOLE:            LocData(28),
+    EP_LOCATION_HUB_NINJA_SCARE:        LocData(29),
+    EP_LOCATION_SWAMP_BOSS:             LocData(30),
+    EP_LOCATION_ELEVATOR_NINJA_FIGHT:   LocData(31),
+    EP_LOCATION_ELECTRICAL_EXTRA:       LocData(32),
+    EP_LOCATION_ELECTRICAL_MINIBOSS:    LocData(33),
+    EP_LOCATION_ELECTRICAL_BOSS:        LocData(34),
+    EP_LOCATION_ELECTRICAL_FINAL_BOSS:  LocData(35),
+}
+
+location_dict_event_expanded: Dict[str, LocData] = {
+    EVENT_LOCATION_VICTORY: LocData(),
+}
+
+# most event locations are only relevant without expanded pool
+location_dict_events: Dict[str, LocData] = {
+    EVENT_LOCATION_GUARD_GONE:      LocData(),
+    EVENT_LOCATION_CLIFF_GONE:      LocData(),
+    EVENT_LOCATION_ACE_GONE:        LocData(),
+    EVENT_LOCATION_SNAKE_GONE:      LocData(),
+    EVENT_LOCATION_POWER_ON:        LocData(),
+    **location_dict_event_expanded,
+}
+
+location_dict: Dict[str, LocData] = {
+    **location_dict_expanded,
+    **location_dict_events,
+}
diff --git a/worlds/saving_princess/Options.py b/worlds/saving_princess/Options.py
new file mode 100644
index 000000000000..75135a1d15bb
--- /dev/null
+++ b/worlds/saving_princess/Options.py
@@ -0,0 +1,183 @@
+from dataclasses import dataclass
+from typing import Dict, Any
+
+from Options import PerGameCommonOptions, DeathLink, StartInventoryPool, Choice, DefaultOnToggle, Range, Toggle, \
+    OptionGroup
+
+
+class ExpandedPool(DefaultOnToggle):
+    """
+    Determines if places other than chests and special weapons will be locations.
+    This includes boss fights as well as powering the tesla orb and completing the console login.
+    In Expanded Pool, system power is instead restored when receiving the System Power item.
+    Similarly, the final area door will open once the four Key items, one for each main area, have been found.
+    """
+    display_name = "Expanded Item Pool"
+
+
+class InstantSaving(DefaultOnToggle):
+    """
+    When enabled, save points activate with no delay when touched.
+    This makes saving much faster, at the cost of being unable to pick and choose when to save in order to save warp.
+    """
+    display_name = "Instant Saving"
+
+
+class SprintAvailability(Choice):
+    """
+    Determines under which conditions the debug sprint is made accessible to the player.
+    To sprint, hold down Ctrl if playing on keyboard, or Left Bumper if on gamepad (remappable).
+    With Jacket: you will not be able to sprint until after the Jacket item has been found.
+    """
+    display_name = "Sprint Availability"
+    option_never_available = 0
+    option_always_available = 1
+    option_available_with_jacket = 2
+    default = option_available_with_jacket
+
+
+class CliffWeaponUpgrade(Choice):
+    """
+    Determines which weapon Cliff uses against you, base or upgraded.
+    This does not change the available strategies all that much.
+    Vanilla: Cliff adds fire to his grenades if Ace has been defeated.
+    If playing with the expanded pool, the Arctic Key will trigger the change instead.
+    """
+    display_name = "Cliff Weapon Upgrade"
+    option_never_upgraded = 0
+    option_always_upgraded = 1
+    option_vanilla = 2
+    default = option_always_upgraded
+
+
+class AceWeaponUpgrade(Choice):
+    """
+    Determines which weapon Ace uses against you, base or upgraded.
+    Ace with his base weapon is very hard to dodge, the upgraded weapon offers a more balanced experience.
+    Vanilla: Ace uses ice attacks if Cliff has been defeated.
+    If playing with the expanded pool, the Volcanic Key will trigger the change instead.
+    """
+    display_name = "Ace Weapon Upgrade"
+    option_never_upgraded = 0
+    option_always_upgraded = 1
+    option_vanilla = 2
+    default = option_always_upgraded
+
+
+class ScreenShakeIntensity(Range):
+    """
+    Percentage multiplier for screen shake effects.
+    0% means the screen will not shake at all.
+    100% means the screen shake will be the same as in vanilla.
+    """
+    display_name = "Screen Shake Intensity %"
+    range_start = 0
+    range_end = 100
+    default = 50
+
+
+class IFramesDuration(Range):
+    """
+    Percentage multiplier for Portia's invincibility frames.
+    0% means you will have no invincibility frames.
+    100% means invincibility frames will be the same as vanilla.
+    """
+    display_name = "IFrame Duration %"
+    range_start = 0
+    range_end = 400
+    default = 100
+
+
+class TrapChance(Range):
+    """
+    Likelihood of a filler item becoming a trap.
+    """
+    display_name = "Trap Chance"
+    range_start = 0
+    range_end = 100
+    default = 50
+
+
+class MusicShuffle(Toggle):
+    """
+    Enables music shuffling.
+    The title screen song is not shuffled, as it plays before the client connects.
+    """
+    display_name = "Music Shuffle"
+
+
+@dataclass
+class SavingPrincessOptions(PerGameCommonOptions):
+    # generation options
+    start_inventory_from_pool: StartInventoryPool
+    expanded_pool: ExpandedPool
+    trap_chance: TrapChance
+    # gameplay options
+    death_link: DeathLink
+    instant_saving: InstantSaving
+    sprint_availability: SprintAvailability
+    cliff_weapon_upgrade: CliffWeaponUpgrade
+    ace_weapon_upgrade: AceWeaponUpgrade
+    iframes_duration: IFramesDuration
+    # aesthetic options
+    shake_intensity: ScreenShakeIntensity
+    music_shuffle: MusicShuffle
+
+
+groups = [
+    OptionGroup("Generation Options", [
+        ExpandedPool,
+        TrapChance,
+    ]),
+    OptionGroup("Gameplay Options", [
+        DeathLink,
+        InstantSaving,
+        SprintAvailability,
+        CliffWeaponUpgrade,
+        AceWeaponUpgrade,
+        IFramesDuration,
+    ]),
+    OptionGroup("Aesthetic Options", [
+        ScreenShakeIntensity,
+        MusicShuffle,
+    ]),
+]
+
+presets = {
+    "Vanilla-like": {
+        "expanded_pool": False,
+        "trap_chance": 0,
+        "death_link": False,
+        "instant_saving": False,
+        "sprint_availability": SprintAvailability.option_never_available,
+        "cliff_weapon_upgrade": CliffWeaponUpgrade.option_vanilla,
+        "ace_weapon_upgrade": AceWeaponUpgrade.option_vanilla,
+        "iframes_duration": 100,
+        "shake_intensity": 100,
+        "music_shuffle": False,
+    },
+    "Easy": {
+        "expanded_pool": True,
+        "trap_chance": 0,
+        "death_link": False,
+        "instant_saving": True,
+        "sprint_availability": SprintAvailability.option_always_available,
+        "cliff_weapon_upgrade": CliffWeaponUpgrade.option_never_upgraded,
+        "ace_weapon_upgrade": AceWeaponUpgrade.option_always_upgraded,
+        "iframes_duration": 200,
+        "shake_intensity": 50,
+        "music_shuffle": False,
+    },
+    "Hard": {
+        "expanded_pool": True,
+        "trap_chance": 100,
+        "death_link": True,
+        "instant_saving": True,
+        "sprint_availability": SprintAvailability.option_never_available,
+        "cliff_weapon_upgrade": CliffWeaponUpgrade.option_always_upgraded,
+        "ace_weapon_upgrade": AceWeaponUpgrade.option_never_upgraded,
+        "iframes_duration": 50,
+        "shake_intensity": 100,
+        "music_shuffle": False,
+    }
+}
diff --git a/worlds/saving_princess/Regions.py b/worlds/saving_princess/Regions.py
new file mode 100644
index 000000000000..b67bda9b2784
--- /dev/null
+++ b/worlds/saving_princess/Regions.py
@@ -0,0 +1,110 @@
+from typing import List, Dict
+
+from BaseClasses import MultiWorld, Region, Entrance
+
+from . import Locations
+from .Constants import *
+
+
+region_dict: Dict[str, List[str]] = {
+    REGION_MENU: [],
+    REGION_CAVE: [
+        LOCATION_CAVE_AMMO,
+        LOCATION_CAVE_RELOAD,
+        LOCATION_CAVE_HEALTH,
+        LOCATION_CAVE_WEAPON,
+        EP_LOCATION_CAVE_MINIBOSS,
+        EP_LOCATION_CAVE_BOSS,
+        EVENT_LOCATION_GUARD_GONE,
+    ],
+    REGION_VOLCANIC: [
+        LOCATION_VOLCANIC_RELOAD,
+        LOCATION_VOLCANIC_HEALTH,
+        LOCATION_VOLCANIC_AMMO,
+        LOCATION_VOLCANIC_WEAPON,
+        EP_LOCATION_VOLCANIC_BOSS,
+        EVENT_LOCATION_CLIFF_GONE,
+    ],
+    REGION_ARCTIC: [
+        LOCATION_ARCTIC_AMMO,
+        LOCATION_ARCTIC_RELOAD,
+        LOCATION_ARCTIC_HEALTH,
+        LOCATION_ARCTIC_WEAPON,
+        LOCATION_JACKET,
+        EP_LOCATION_ARCTIC_BOSS,
+        EVENT_LOCATION_ACE_GONE,
+    ],
+    REGION_HUB: [
+        LOCATION_HUB_AMMO,
+        LOCATION_HUB_HEALTH,
+        LOCATION_HUB_RELOAD,
+        EP_LOCATION_HUB_CONSOLE,
+        EP_LOCATION_HUB_NINJA_SCARE,
+    ],
+    REGION_SWAMP: [
+        LOCATION_SWAMP_AMMO,
+        LOCATION_SWAMP_HEALTH,
+        LOCATION_SWAMP_RELOAD,
+        LOCATION_SWAMP_SPECIAL,
+        EP_LOCATION_SWAMP_BOSS,
+        EVENT_LOCATION_SNAKE_GONE,
+    ],
+    REGION_ELECTRICAL: [
+        EP_LOCATION_ELEVATOR_NINJA_FIGHT,
+        LOCATION_ELECTRICAL_WEAPON,
+        EP_LOCATION_ELECTRICAL_MINIBOSS,
+        EP_LOCATION_ELECTRICAL_EXTRA,
+        EVENT_LOCATION_POWER_ON,
+    ],
+    REGION_ELECTRICAL_POWERED: [
+        LOCATION_ELECTRICAL_RELOAD,
+        LOCATION_ELECTRICAL_HEALTH,
+        LOCATION_ELECTRICAL_AMMO,
+        EP_LOCATION_ELECTRICAL_BOSS,
+        EP_LOCATION_ELECTRICAL_FINAL_BOSS,
+        EVENT_LOCATION_VICTORY,
+    ],
+}
+
+
+def set_region_locations(region: Region, location_names: List[str], is_pool_expanded: bool):
+    location_pool = {**Locations.location_dict_base, **Locations.location_dict_events}
+    if is_pool_expanded:
+        location_pool = {**Locations.location_dict_expanded, **Locations.location_dict_event_expanded}
+    region.locations = [
+        Locations.SavingPrincessLocation(
+            region.player,
+            name,
+            Locations.location_dict[name].code,
+            region
+        ) for name in location_names if name in location_pool.keys()
+    ]
+
+
+def create_regions(multiworld: MultiWorld, player: int, is_pool_expanded: bool):
+    for region_name, location_names in region_dict.items():
+        region = Region(region_name, player, multiworld)
+        set_region_locations(region, location_names, is_pool_expanded)
+        multiworld.regions.append(region)
+    connect_regions(multiworld, player)
+
+
+def connect_regions(multiworld: MultiWorld, player: int):
+    # and add a connection from the menu to the hub region
+    menu = multiworld.get_region(REGION_MENU, player)
+    hub = multiworld.get_region(REGION_HUB, player)
+    connection = Entrance(player, f"{REGION_HUB} entrance", menu)
+    menu.exits.append(connection)
+    connection.connect(hub)
+
+    # now add an entrance from every other region to hub
+    for region_name in [REGION_CAVE, REGION_VOLCANIC, REGION_ARCTIC, REGION_SWAMP, REGION_ELECTRICAL]:
+        connection = Entrance(player, f"{region_name} entrance", hub)
+        hub.exits.append(connection)
+        connection.connect(multiworld.get_region(region_name, player))
+
+    # and finally, the connection between the final region and its powered version
+    electrical = multiworld.get_region(REGION_ELECTRICAL, player)
+    connection = Entrance(player, f"{REGION_ELECTRICAL_POWERED} entrance", electrical)
+    electrical.exits.append(connection)
+    connection.connect(multiworld.get_region(REGION_ELECTRICAL_POWERED, player))
diff --git a/worlds/saving_princess/Rules.py b/worlds/saving_princess/Rules.py
new file mode 100644
index 000000000000..3ee8a4f2c433
--- /dev/null
+++ b/worlds/saving_princess/Rules.py
@@ -0,0 +1,132 @@
+from typing import TYPE_CHECKING
+from BaseClasses import CollectionState, Location, Entrance
+from worlds.generic.Rules import set_rule
+from .Constants import *
+if TYPE_CHECKING:
+    from . import SavingPrincessWorld
+
+
+def set_rules(world: "SavingPrincessWorld"):
+    def get_location(name: str) -> Location:
+        return world.get_location(name)
+
+    def get_region_entrance(name: str) -> Entrance:
+        return world.get_entrance(f"{name} entrance")
+
+    def can_hover(state: CollectionState) -> bool:
+        # portia can hover if she has a weapon other than the powered blaster and 4 reload speed upgrades
+        return (
+                state.has(ITEM_RELOAD_SPEED, world.player, 4)
+                and state.has_any({ITEM_WEAPON_FIRE, ITEM_WEAPON_ICE, ITEM_WEAPON_VOLT}, world.player)
+        )
+
+    # guarantees that the player will have some upgrades before having to face the area bosses, except for cave
+    def nice_check(state: CollectionState) -> bool:
+        return (
+                state.has(ITEM_MAX_HEALTH, world.player)
+                and state.has(ITEM_MAX_AMMO, world.player)
+                and state.has(ITEM_RELOAD_SPEED, world.player, 2)
+        )
+
+    # same as above, but for the final area
+    def super_nice_check(state: CollectionState) -> bool:
+        return (
+                state.has(ITEM_MAX_HEALTH, world.player, 2)
+                and state.has(ITEM_MAX_AMMO, world.player, 2)
+                and state.has(ITEM_RELOAD_SPEED, world.player, 4)
+                and state.has(ITEM_WEAPON_CHARGE, world.player)
+                # at least one special weapon, other than powered blaster
+                and state.has_any({ITEM_WEAPON_FIRE, ITEM_WEAPON_ICE, ITEM_WEAPON_VOLT}, world.player)
+        )
+
+    # all special weapons required so that the boss' weapons can be targeted
+    def all_weapons(state: CollectionState) -> bool:
+        return state.has_all({ITEM_WEAPON_FIRE, ITEM_WEAPON_ICE, ITEM_WEAPON_VOLT}, world.player)
+
+    def is_gate_unlocked(state: CollectionState) -> bool:
+        # the gate unlocks with all 4 boss keys, although this only applies to extended pool
+        if world.is_pool_expanded:
+            # in expanded, the final area requires all the boss keys
+            return (
+                    state.has_all(
+                        {EP_ITEM_GUARD_GONE, EP_ITEM_CLIFF_GONE, EP_ITEM_ACE_GONE, EP_ITEM_SNAKE_GONE},
+                        world.player
+                    ) and super_nice_check(state)
+            )
+        else:
+            # in base pool, check that the main area bosses can be defeated
+            return state.has_all(
+                        {EVENT_ITEM_GUARD_GONE, EVENT_ITEM_CLIFF_GONE, EVENT_ITEM_ACE_GONE, EVENT_ITEM_SNAKE_GONE},
+                        world.player
+                    ) and super_nice_check(state)
+
+    def is_power_on(state: CollectionState) -> bool:
+        # in expanded pool, the power item is what determines this, else it happens when the generator is powered
+        return state.has(EP_ITEM_POWER_ON if world.is_pool_expanded else EVENT_ITEM_POWER_ON, world.player)
+
+    # set the location rules
+    # this is behind the blast door to arctic
+    set_rule(get_location(LOCATION_HUB_AMMO), lambda state: state.has(ITEM_WEAPON_CHARGE, world.player))
+    # these are behind frozen doors
+    for location_name in [LOCATION_ARCTIC_HEALTH, LOCATION_JACKET]:
+        set_rule(get_location(location_name), lambda state: state.has(ITEM_WEAPON_FIRE, world.player))
+    # these would require damage boosting otherwise
+    set_rule(get_location(LOCATION_VOLCANIC_RELOAD),
+             lambda state: state.has(ITEM_WEAPON_ICE, world.player) or can_hover(state))
+    set_rule(get_location(LOCATION_SWAMP_AMMO), lambda state: can_hover(state))
+    if world.is_pool_expanded:
+        # does not spawn until the guard has been defeated
+        set_rule(get_location(EP_LOCATION_HUB_NINJA_SCARE), lambda state: state.has(EP_ITEM_GUARD_GONE, world.player))
+    # generator cannot be turned on without the volt laser
+    set_rule(
+        get_location(EP_LOCATION_ELECTRICAL_EXTRA if world.is_pool_expanded else EVENT_LOCATION_POWER_ON),
+        lambda state: state.has(ITEM_WEAPON_VOLT, world.player)
+    )
+    # the roller is not very intuitive to get past without 4 ammo
+    set_rule(get_location(LOCATION_CAVE_WEAPON), lambda state: state.has(ITEM_MAX_AMMO, world.player))
+    set_rule(
+        get_location(EP_LOCATION_CAVE_BOSS if world.is_pool_expanded else EVENT_LOCATION_GUARD_GONE),
+        lambda state: state.has(ITEM_MAX_AMMO, world.player)
+    )
+
+    # guarantee some upgrades to be found before bosses
+    boss_locations = [LOCATION_VOLCANIC_WEAPON, LOCATION_ARCTIC_WEAPON, LOCATION_SWAMP_SPECIAL]
+    if world.is_pool_expanded:
+        boss_locations += [EP_LOCATION_VOLCANIC_BOSS, EP_LOCATION_ARCTIC_BOSS, EP_LOCATION_SWAMP_BOSS]
+    else:
+        boss_locations += [EVENT_LOCATION_CLIFF_GONE, EVENT_LOCATION_ACE_GONE, EVENT_LOCATION_SNAKE_GONE]
+    for location_name in boss_locations:
+        set_rule(get_location(location_name), lambda state: nice_check(state))
+
+    # set the basic access rules for the regions, these are all behind blast doors
+    for region_name in [REGION_VOLCANIC, REGION_ARCTIC, REGION_SWAMP]:
+        set_rule(get_region_entrance(region_name), lambda state: state.has(ITEM_WEAPON_CHARGE, world.player))
+
+    # now for the final area regions, which have different rules based on if ep is on
+    set_rule(get_region_entrance(REGION_ELECTRICAL), lambda state: is_gate_unlocked(state))
+    set_rule(get_region_entrance(REGION_ELECTRICAL_POWERED), lambda state: is_power_on(state))
+
+    # brainos requires all weapons, cannot destroy the cannons otherwise
+    if world.is_pool_expanded:
+        set_rule(get_location(EP_LOCATION_ELECTRICAL_FINAL_BOSS), lambda state: all_weapons(state))
+    # and we need to beat brainos to beat the game
+    set_rule(get_location(EVENT_LOCATION_VICTORY), lambda state: all_weapons(state))
+
+    # if not expanded pool, place the events for the boss kills and generator
+    if not world.is_pool_expanded:
+        # accessible with no items
+        cave_item = world.create_item(EVENT_ITEM_GUARD_GONE)
+        get_location(EVENT_LOCATION_GUARD_GONE).place_locked_item(cave_item)
+        volcanic_item = world.create_item(EVENT_ITEM_CLIFF_GONE)
+        get_location(EVENT_LOCATION_CLIFF_GONE).place_locked_item(volcanic_item)
+        arctic_item = world.create_item(EVENT_ITEM_ACE_GONE)
+        get_location(EVENT_LOCATION_ACE_GONE).place_locked_item(arctic_item)
+        swamp_item = world.create_item(EVENT_ITEM_SNAKE_GONE)
+        get_location(EVENT_LOCATION_SNAKE_GONE).place_locked_item(swamp_item)
+        power_item = world.create_item(EVENT_ITEM_POWER_ON)
+        get_location(EVENT_LOCATION_POWER_ON).place_locked_item(power_item)
+
+    # and, finally, set the victory event
+    victory_item = world.create_item(EVENT_ITEM_VICTORY)
+    get_location(EVENT_LOCATION_VICTORY).place_locked_item(victory_item)
+    world.multiworld.completion_condition[world.player] = lambda state: state.has(EVENT_ITEM_VICTORY, world.player)
diff --git a/worlds/saving_princess/__init__.py b/worlds/saving_princess/__init__.py
new file mode 100644
index 000000000000..4109f356fd2e
--- /dev/null
+++ b/worlds/saving_princess/__init__.py
@@ -0,0 +1,174 @@
+from typing import ClassVar, Dict, Any, Type, List, Union
+
+import Utils
+from BaseClasses import Tutorial, ItemClassification as ItemClass
+from Options import PerGameCommonOptions, OptionError
+from settings import Group, UserFilePath, LocalFolderPath, Bool
+from worlds.AutoWorld import World, WebWorld
+from worlds.LauncherComponents import components, Component, launch_subprocess, Type as ComponentType
+from . import Options, Items, Locations
+from .Constants import *
+
+
+def launch_client(*args: str):
+    from .Client import launch
+    launch_subprocess(launch(*args), name=CLIENT_NAME)
+
+
+components.append(
+    Component(f"{GAME_NAME} Client", game_name=GAME_NAME, func=launch_client, component_type=ComponentType.CLIENT, supports_uri=True)
+)
+
+
+class SavingPrincessSettings(Group):
+    class GamePath(UserFilePath):
+        """Path to the game executable from which files are extracted"""
+        description = "the Saving Princess game executable"
+        is_exe = True
+        md5s = [GAME_HASH]
+
+    class InstallFolder(LocalFolderPath):
+        """Path to the mod installation folder"""
+        description = "the folder to install Saving Princess Archipelago to"
+
+    class LaunchGame(Bool):
+        """Set this to false to never autostart the game"""
+
+    class LaunchCommand(str):
+        """
+        The console command that will be used to launch the game
+        The command will be executed with the installation folder as the current directory
+        """
+
+    exe_path: GamePath = GamePath("Saving Princess.exe")
+    install_folder: InstallFolder = InstallFolder("Saving Princess")
+    launch_game: Union[LaunchGame, bool] = True
+    launch_command: LaunchCommand = LaunchCommand('"Saving Princess v0_8.exe"' if Utils.is_windows
+                                                  else 'wine "Saving Princess v0_8.exe"')
+
+
+class SavingPrincessWeb(WebWorld):
+    theme = "partyTime"
+    bug_report_page = "https://github.com/LeonarthCG/saving-princess-archipelago/issues"
+    setup_en = Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up Saving Princess for Archipelago multiworld.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["LeonarthCG"]
+    )
+    tutorials = [setup_en]
+    options_presets = Options.presets
+    option_groups = Options.groups
+
+
+class SavingPrincessWorld(World):
+    """ 
+    Explore a space station crawling with rogue machines and even rival bounty hunters
+    with the same objective as you - but with far, far different intentions!
+
+    Expand your arsenal as you collect upgrades to your trusty arm cannon and armor!
+    """  # Excerpt from itch
+    game = GAME_NAME
+    web = SavingPrincessWeb()
+    required_client_version = (0, 5, 0)
+
+    topology_present = False
+
+    item_name_to_id = {
+        key: value.code for key, value in (Items.item_dict.items() - Items.item_dict_events.items())
+    }
+    location_name_to_id = {
+        key: value.code for key, value in (Locations.location_dict.items() - Locations.location_dict_events.items())
+    }
+
+    item_name_groups = {
+        "Weapons": {key for key in Items.item_dict_weapons.keys()},
+        "Upgrades": {key for key in Items.item_dict_upgrades.keys()},
+        "Keys": {key for key in Items.item_dict_keys.keys()},
+        "Filler": {key for key in Items.item_dict_filler.keys()},
+        "Traps": {key for key in Items.item_dict_traps.keys()},
+    }
+
+    options_dataclass: ClassVar[Type[PerGameCommonOptions]] = Options.SavingPrincessOptions
+    options: Options.SavingPrincessOptions
+    settings_key = "saving_princess_settings"
+    settings: ClassVar[SavingPrincessSettings]
+
+    is_pool_expanded: bool = False
+    music_table: List[int] = list(range(16))
+
+    def generate_early(self) -> None:
+        if not self.player_name.isascii():
+            raise OptionError(f"{self.player_name}'s name must be only ASCII.")
+        self.is_pool_expanded = self.options.expanded_pool > 0
+        if self.options.music_shuffle:
+            self.random.shuffle(self.music_table)
+            # find zzz and purple and swap them back to their original positions
+            for song_id in [9, 13]:
+                song_index = self.music_table.index(song_id)
+                t = self.music_table[song_id]
+                self.music_table[song_id] = song_id
+                self.music_table[song_index] = t
+
+    def create_regions(self) -> None:
+        from .Regions import create_regions
+        create_regions(self.multiworld, self.player, self.is_pool_expanded)
+
+    def create_items(self) -> None:
+        items_made: int = 0
+
+        # now, for each item
+        item_dict = Items.item_dict_expanded if self.is_pool_expanded else Items.item_dict_base
+        for item_name, item_data in item_dict.items():
+            # create count copies of the item
+            for i in range(item_data.count):
+                self.multiworld.itempool.append(self.create_item(item_name))
+            items_made += item_data.count
+            # and create count_extra useful copies of the item
+            original_item_class: ItemClass = item_data.item_class
+            item_data.item_class = ItemClass.useful
+            for i in range(item_data.count_extra):
+                self.multiworld.itempool.append(self.create_item(item_name))
+            item_data.item_class = original_item_class
+            items_made += item_data.count_extra
+
+        # get the number of unfilled locations, that is, locations for items - items generated
+        location_count = len(Locations.location_dict_base)
+        if self.is_pool_expanded:
+            location_count = len(Locations.location_dict_expanded)
+        junk_count: int = location_count - items_made
+
+        # and generate as many junk items as unfilled locations
+        for i in range(junk_count):
+            self.multiworld.itempool.append(self.create_item(self.get_filler_item_name()))
+
+    def create_item(self, name: str) -> Items.SavingPrincessItem:
+        return Items.item_dict[name].create_item(self.player)
+
+    def get_filler_item_name(self) -> str:
+        filler_list = list(Items.item_dict_filler.keys())
+        # check if this is going to be a trap
+        if self.random.randint(0, 99) < self.options.trap_chance:
+            filler_list = list(Items.item_dict_traps.keys())
+        # and return one of the names at random
+        return self.random.choice(filler_list)
+
+    def set_rules(self):
+        from .Rules import set_rules
+        set_rules(self)
+
+    def fill_slot_data(self) -> Dict[str, Any]:
+        slot_data = self.options.as_dict(
+            "death_link",
+            "expanded_pool",
+            "instant_saving",
+            "sprint_availability",
+            "cliff_weapon_upgrade",
+            "ace_weapon_upgrade",
+            "shake_intensity",
+            "iframes_duration",
+        )
+        slot_data["music_table"] = self.music_table
+        return slot_data
diff --git a/worlds/saving_princess/docs/en_Saving Princess.md b/worlds/saving_princess/docs/en_Saving Princess.md
new file mode 100644
index 000000000000..3eb6b9831c38
--- /dev/null
+++ b/worlds/saving_princess/docs/en_Saving Princess.md	
@@ -0,0 +1,55 @@
+# Saving Princess
+
+## Quick Links
+- [Setup Guide](/tutorial/Saving%20Princess/setup/en)
+- [Options Page](/games/Saving%20Princess/player-options)
+- [Saving Princess Archipelago GitHub](https://github.com/LeonarthCG/saving-princess-archipelago)
+
+## What changes have been made?
+
+The game has had several changes made to add new features and prevent issues. The most important changes are the following:
+- There is an in-game connection settings menu, autotracker and client console.
+- New save files are created and used automatically for each seed and slot played.
+- The game window can now be dragged and a new integer scaling option has been added.
+
+## What items and locations get shuffled?
+
+The chest contents and special weapons are the items and locations that get shuffled.
+
+Additionally, there are new items to work as filler and traps, ranging from a full health and ammo restore to spawning a Ninja on top of you.
+
+The Expanded Pool option, which is enabled by default, adds a few more items and locations:
+- Completing the intro sequence, powering the generator with the Volt Laser and defeating each boss become locations.
+- 4 Keys will be shuffled, which serve to open the door to the final area in place of defeating the main area bosses.
+- A System Power item will be shuffled, which restores power to the final area instead of this happening when the generator is powered.
+
+## What does another world's item look like in Saving Princess?
+
+Some locations, such as boss kills, have no visual representation, but those that do will have the Archipelago icon.
+
+Once the item is picked up, a textbox will inform you of the item that was found as well as the player that will be receiving it.
+
+These textboxes will have colored backgrounds and comments about the item category.
+For example, progression items will have a purple background and say "Looks plenty important!".
+
+## When the player receives an item, what happens?
+
+When you receive an item, a textbox will show up.
+This textbox shows both which item you got and which player sent it to you.
+
+If you send an item to yourself, however, the sending player will be omitted.
+
+## Unique Local Commands
+
+The following commands are only available when using the in-game console in Saving Princess:
+- `/help` Returns the help listing.
+- `/options` Lists currently applied options.
+- `/resync` Manually triggers a resync. This also resends all found locations.
+- `/unstuck` Sets save point to the first save point. Portia is then killed.
+- `/deathlink [on|off]` Toggles or sets death link mode.
+- `/instantsaving [on|off]` Toggles or sets instant saving.
+- `/sprint {never|always|jacket}` Sets sprint mode.
+- `/cliff {never|always|vanilla}` Sets Cliff's weapon upgrade condition.
+- `/ace {never|always|vanilla}` Sets Ace's weapon upgrade condition.
+- `/iframes n` Sets the iframe duration % multiplier to n, where 0 <= n <= 400.
+- `/shake n` Sets the shake intensity % multiplier to n, where 0 <= n <= 100.
diff --git a/worlds/saving_princess/docs/setup_en.md b/worlds/saving_princess/docs/setup_en.md
new file mode 100644
index 000000000000..5f7cfb49f560
--- /dev/null
+++ b/worlds/saving_princess/docs/setup_en.md
@@ -0,0 +1,148 @@
+# Saving Princess Setup Guide
+
+## Quick Links
+- [Game Info](/games/Saving%20Princess/info/en)
+- [Options Page](/games/Saving%20Princess/player-options)
+- [Saving Princess Archipelago GitHub](https://github.com/LeonarthCG/saving-princess-archipelago)
+
+## Installation Procedures
+
+### Automated Installation
+
+*These instructions have only been tested on Windows and Ubuntu.*
+
+Once everything is set up, it is recommended to continue launching the game through this method, as it will check for any updates to the mod and automatically apply them.
+This is also the method used by the Automatic Connection described further below.
+
+1. Purchase and download [Saving Princess](https://brainos.itch.io/savingprincess)
+2. Download and install the latest [Archipelago release](https://github.com/ArchipelagoMW/Archipelago/releases/latest)
+3. Launch `ArchipelagoLauncher` and click on "Saving Princess Client"
+   * You will probably need to scroll down on the Clients column to see it
+4. Follow the prompts
+   * On Linux, you will need one of either Wine or 7z for the automated installation
+
+When launching the game, Windows machines will simply run the executable. For any other OS, the launcher defaults to trying to run the game through Wine. You can change this by modifying the `launch_command` in `options.yaml` or `host.yaml`, under the `saving_princess_settings` section.
+
+### Manual Windows Installation
+
+Required software:
+- Saving Princess, found at its [itch.io Store Page](https://brainos.itch.io/savingprincess)
+- `saving_princess_basepatch.bsdiff4` and `gm-apclientpp.dll`, from [saving_princess_archipelago.zip](https://github.com/LeonarthCG/saving-princess-archipelago/releases/latest)
+- Software that can decompress the previous files, such as [7-zip](https://www.7-zip.org/download.html)
+- A way to apply `.bsdiff4` patches, such as [bspatch](https://www.romhacking.net/utilities/929/)
+
+Steps:
+1. Extract all files from `Saving Princess.exe`, as if it were a `.7z` file
+   * Feel free to rename `Saving Princess.exe` to `Saving Princess.exe.7z` if needed
+   * If installed through the itch app, you can find the installation directory from the game's page, pressing the cog button, then "Manage" and finally "Open folder in explorer"
+2. Extract all files from `saving_princess_archipelago.zip` into the same directory as the files extracted in the previous step
+   * This should include, at least, `saving_princess_basepatch.bsdiff4` and `gm-apclientpp.dll`
+3. If you don't have `original_data.win`, copy `data.win` and rename its copy to `original_data.win`
+   * By keeping an unmodified copy of `data.win`, you will have an easier time updating in the future
+4. Apply the `saving_princess_basepatch.bsdiff4` patch using your patching software
+5. To launch the game, run `Saving Princess v0_8.exe`
+
+### Manual Linux Installation
+
+*These instructions have only been tested on Ubuntu.*
+
+The game does run mostly well through Wine, so it is possible to play on Linux, although there are some minor sprite displacement and sound issues from time to time.
+
+You can follow the instructions for Windows with very few changes:
+
+* Using the `p7zip-full` package to decompress the file.
+```
+7z e 'Saving Princess.exe'
+```
+* And the `bsdiff` package for patching.
+```
+bspatch original_data.win data.win saving_princess_basepatch.bsdiff4
+```
+
+## Configuring your YAML file
+
+### What is a YAML file and why do I need one?
+
+See the guide on setting up a basic YAML at the Archipelago setup
+guide: [Basic Multiworld Setup Guide](/tutorial/Archipelago/setup/en).
+
+### Where do I get a YAML file?
+
+You can customize your options by visiting the [Saving Princess Player Options Page](/games/Saving%20Princess/player-options).
+
+### Verifying your YAML file
+
+If you would like to validate your config file to make sure it works, you may do so on the YAML Validator page. YAML
+validator page: [YAML Validation page](/check).
+
+## Joining a MultiWorld Game
+
+### Automatic Connection on archipelago.gg
+
+1. Go to the room page of the MultiWorld you are going to join.
+2. Click on your slot name on the left side.
+3. Click the "Saving Princess Client" button in the prompt.
+   * This launches the same client described in the Automated Installation section.
+4. Upon reaching the title screen, a connection attempt will automatically be started.
+
+Note that this updates your Saving Princess saved connection details, which are described in the Manual Connection section.
+
+### Manual Connection
+
+After launching the game, enter the Archipelago options menu through the in-game button with the Archipelago icon.
+From here, enter the different menus and type in the following details in their respective fields:
+- **server:port** (e.g. `archipelago.gg:38281`)
+   * If hosting on the website, this detail will be shown in your created room.
+- **slot name** (e.g. `Player`)
+   * This is your player name, which you chose along with your player options.
+- **password** (e.g. `123456`)
+  * If the room does not have a password, it can be left empty.
+
+This configuration persists through launches and even updates.
+
+With your settings filled, start a connection attempt by pressing on the title screen's "CONNECT!" button.
+
+Once connected, the button will become one of either "NEW GAME" or "CONTINUE".
+The game automatically keeps a save file for each seed and slot combination, so you do not need to manually move or delete save files.
+
+All that's left is pressing on the button again to start playing. If you are waiting for a countdown, press "NEW GAME" when the countdown finishes.
+
+## Gameplay Questions
+
+### Do I need to save the game before I stop playing?
+
+It is safe to close the game at any point while playing, your progress will be kept.
+
+### What happens if I lose connection?
+
+If a disconnection occurs, you will see the HUD connection indicator go grey.
+From here, the game will automatically try to reconnect.
+You can tell it succeeded if the indicator regains its color.
+
+If the game is unable to reconnect, save and restart.
+
+Although you can keep playing while disconnected, you won't get any items until you reconnect, not even items found in your own game.
+Once reconnected, however, all of your progress will sync up.
+
+### I got an item, but it did not say who sent it to me
+
+Items sent to you by yourself do not list the sender.
+
+Additionally, if you get an item while already having the max for that item (for example, you have 9 ammo and get sent a Clip Extension), no message will be shown at all.
+
+### I pressed the release/collect button, but nothing happened
+
+It is likely that you do not have release or collect permissions, or that there is nothing to release or collect.
+Another option is that your connection was interrupted.
+
+If you would still like to use release or collect, refer to [this section of the server commands page](https://archipelago.gg/tutorial/Archipelago/commands/en#collect/release).
+
+You may use the in-game console to execute the commands, if your slot has permissions to do so.
+
+### I am trying to configure my controller, but the menu keeps closing itself
+
+Steam Input will make your controller behave as a keyboard and mouse even while not playing any Steam games.
+
+To fix this, simply close Steam while playing Saving Princess.
+
+Another option is to disable Steam Input under `Steam -> Settings -> Controller -> External Gamepad Settings`

From 6c69f590cf18d1224445ee86da7c85c7663f5fb7 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Sun, 8 Dec 2024 02:22:56 +0100
Subject: [PATCH 141/381] WebHost: fix host room not updating (ports in) slot
 table (#4308)

---
 WebHostLib/templates/hostRoom.html | 11 +++++++++--
 WebHostLib/templates/macros.html   |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WebHostLib/templates/hostRoom.html b/WebHostLib/templates/hostRoom.html
index 8e76dafc12fa..c5996d181ee0 100644
--- a/WebHostLib/templates/hostRoom.html
+++ b/WebHostLib/templates/hostRoom.html
@@ -178,8 +178,15 @@
               })
               .then(text => new DOMParser().parseFromString(text, 'text/html'))
               .then(newDocument => {
-                let el = newDocument.getElementById("host-room-info");
-                document.getElementById("host-room-info").innerHTML = el.innerHTML;
+                ["host-room-info", "slots-table"].forEach(function(id) {
+                  const newEl = newDocument.getElementById(id);
+                  const oldEl = document.getElementById(id);
+                  if (oldEl && newEl) {
+                    oldEl.innerHTML = newEl.innerHTML;
+                  } else if (newEl) {
+                    console.warn(`Did not find element to replace for ${id}`)
+                  }
+                });
             });
           }
 
diff --git a/WebHostLib/templates/macros.html b/WebHostLib/templates/macros.html
index 6b2a4b0ed784..b95b8820a72f 100644
--- a/WebHostLib/templates/macros.html
+++ b/WebHostLib/templates/macros.html
@@ -8,7 +8,7 @@
 {%- endmacro %}
 {% macro list_patches_room(room) %}
     {% if room.seed.slots %}
-        <table>
+        <table id="slots-table">
             <thead>
                 <tr>
                     <th>Id</th>

From e3b5451672c694c12974801f5c89cc172db3ff5a Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sun, 8 Dec 2024 14:43:16 -0500
Subject: [PATCH 142/381] CI: cap pytest-subtest version (#4344)

---
 .github/workflows/unittests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index 88b5d12987ad..9db9de9b4042 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pytest pytest-subtests pytest-xdist
+        pip install pytest "pytest-subtests<0.14.0" pytest-xdist
         python ModuleUpdate.py --yes --force --append "WebHostLib/requirements.txt"
         python Launcher.py --update_settings  # make sure host.yaml exists for tests
     - name: Unittests

From a948697f3a2387d13862a194690c39af8da2dbd8 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Mon, 9 Dec 2024 00:57:34 +0000
Subject: [PATCH 143/381] Raft: Place locked items in create_items and fix
 get_pre_fill_items (#4250)

* Raft: Place locked items in create_items and fix get_pre_fill_items

`pre_fill` runs after item plando, and item plando could place an item
at a location where Raft was intending to place a locked item, which
would crash generation.

This patch moves the placement of these locked items earlier, into
`create_items`.

Setting items into `multiworld.raft_frequencyItemsPerPlayer` for each
player has been replaced with passing `frequencyItems` to the new
`place_frequencyItems` function.

`setLocationItem` and `setLocationItemFromRegion` have been moved into
the new `place_frequencyItems` function so that they can capture the
`frequencyItems` argument variable.

The `get_pre_fill_items` function could return a list of all previously
placed items across the entire multiworld which was not correct. It
should have returned the items in
`multiworld.raft_frequencyItemsPerPlayer[self.player]`. Now that these
items are placed in `create_items` instead of `pre_fill`,
`get_pre_fill_items` is no longer necessary and has been removed.

* self.multiworld.get_location -> self.get_location

Changed the occurences in the modified code.
---
 worlds/raft/__init__.py | 68 +++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/worlds/raft/__init__.py b/worlds/raft/__init__.py
index 71d5d1c7e44b..3e33b417c04b 100644
--- a/worlds/raft/__init__.py
+++ b/worlds/raft/__init__.py
@@ -57,10 +57,6 @@ def create_items(self):
                 frequencyItems.append(raft_item)
             else:
                 pool.append(raft_item)
-        if isFillingFrequencies:
-            if not hasattr(self.multiworld, "raft_frequencyItemsPerPlayer"):
-                self.multiworld.raft_frequencyItemsPerPlayer = {}
-            self.multiworld.raft_frequencyItemsPerPlayer[self.player] = frequencyItems
 
         extraItemNamePool = []
         extras = len(location_table) - len(item_table) - 1 # Victory takes up 1 unaccounted-for slot
@@ -109,17 +105,15 @@ def create_items(self):
         self.multiworld.get_location("Utopia Complete", self.player).place_locked_item(
             RaftItem("Victory", ItemClassification.progression, None, player=self.player))
 
+        if frequencyItems:
+            self.place_frequencyItems(frequencyItems)
+
     def set_rules(self):
         set_rules(self.multiworld, self.player)
 
     def create_regions(self):
         create_regions(self.multiworld, self.player)
     
-    def get_pre_fill_items(self):
-        if self.options.island_frequency_locations.is_filling_frequencies_in_world():
-            return [loc.item for loc in self.multiworld.get_filled_locations()]
-        return []
-    
     def create_item_replaceAsNecessary(self, name: str) -> Item:
         isFrequency = "Frequency" in name
         shouldUseProgressive = bool((isFrequency and self.options.island_frequency_locations == self.options.island_frequency_locations.option_progressive)
@@ -152,23 +146,34 @@ def collect_item(self, state, item, remove=False):
 
         return super(RaftWorld, self).collect_item(state, item, remove)
 
-    def pre_fill(self):
+    def place_frequencyItems(self, frequencyItems):
+        def setLocationItem(location: str, itemName: str):
+            itemToUse = next(filter(lambda itm: itm.name == itemName, frequencyItems))
+            frequencyItems.remove(itemToUse)
+            self.get_location(location).place_locked_item(itemToUse)
+
+        def setLocationItemFromRegion(region: str, itemName: str):
+            itemToUse = next(filter(lambda itm: itm.name == itemName, frequencyItems))
+            frequencyItems.remove(itemToUse)
+            location = self.random.choice(list(loc for loc in location_table if loc["region"] == region))
+            self.get_location(location["name"]).place_locked_item(itemToUse)
+
         if self.options.island_frequency_locations == self.options.island_frequency_locations.option_vanilla:
-            self.setLocationItem("Radio Tower Frequency to Vasagatan", "Vasagatan Frequency")
-            self.setLocationItem("Vasagatan Frequency to Balboa", "Balboa Island Frequency")
-            self.setLocationItem("Relay Station quest", "Caravan Island Frequency")
-            self.setLocationItem("Caravan Island Frequency to Tangaroa", "Tangaroa Frequency")
-            self.setLocationItem("Tangaroa Frequency to Varuna Point", "Varuna Point Frequency")
-            self.setLocationItem("Varuna Point Frequency to Temperance", "Temperance Frequency")
-            self.setLocationItem("Temperance Frequency to Utopia", "Utopia Frequency")
+            setLocationItem("Radio Tower Frequency to Vasagatan", "Vasagatan Frequency")
+            setLocationItem("Vasagatan Frequency to Balboa", "Balboa Island Frequency")
+            setLocationItem("Relay Station quest", "Caravan Island Frequency")
+            setLocationItem("Caravan Island Frequency to Tangaroa", "Tangaroa Frequency")
+            setLocationItem("Tangaroa Frequency to Varuna Point", "Varuna Point Frequency")
+            setLocationItem("Varuna Point Frequency to Temperance", "Temperance Frequency")
+            setLocationItem("Temperance Frequency to Utopia", "Utopia Frequency")
         elif self.options.island_frequency_locations == self.options.island_frequency_locations.option_random_on_island:
-            self.setLocationItemFromRegion("RadioTower", "Vasagatan Frequency")
-            self.setLocationItemFromRegion("Vasagatan", "Balboa Island Frequency")
-            self.setLocationItemFromRegion("BalboaIsland", "Caravan Island Frequency")
-            self.setLocationItemFromRegion("CaravanIsland", "Tangaroa Frequency")
-            self.setLocationItemFromRegion("Tangaroa", "Varuna Point Frequency")
-            self.setLocationItemFromRegion("Varuna Point", "Temperance Frequency")
-            self.setLocationItemFromRegion("Temperance", "Utopia Frequency")
+            setLocationItemFromRegion("RadioTower", "Vasagatan Frequency")
+            setLocationItemFromRegion("Vasagatan", "Balboa Island Frequency")
+            setLocationItemFromRegion("BalboaIsland", "Caravan Island Frequency")
+            setLocationItemFromRegion("CaravanIsland", "Tangaroa Frequency")
+            setLocationItemFromRegion("Tangaroa", "Varuna Point Frequency")
+            setLocationItemFromRegion("Varuna Point", "Temperance Frequency")
+            setLocationItemFromRegion("Temperance", "Utopia Frequency")
         elif self.options.island_frequency_locations in [
             self.options.island_frequency_locations.option_random_island_order,
             self.options.island_frequency_locations.option_random_on_island_random_order
@@ -201,22 +206,11 @@ def pre_fill(self):
                     currentLocation = availableLocationList[0] # Utopia (only one left in list)
                 availableLocationList.remove(currentLocation)
                 if self.options.island_frequency_locations == self.options.island_frequency_locations.option_random_island_order:
-                    self.setLocationItem(locationToVanillaFrequencyLocationMap[previousLocation], locationToFrequencyItemMap[currentLocation])
+                    setLocationItem(locationToVanillaFrequencyLocationMap[previousLocation], locationToFrequencyItemMap[currentLocation])
                 elif self.options.island_frequency_locations == self.options.island_frequency_locations.option_random_on_island_random_order:
-                    self.setLocationItemFromRegion(previousLocation, locationToFrequencyItemMap[currentLocation])
+                    setLocationItemFromRegion(previousLocation, locationToFrequencyItemMap[currentLocation])
                 previousLocation = currentLocation
     
-    def setLocationItem(self, location: str, itemName: str):
-        itemToUse = next(filter(lambda itm: itm.name == itemName, self.multiworld.raft_frequencyItemsPerPlayer[self.player]))
-        self.multiworld.raft_frequencyItemsPerPlayer[self.player].remove(itemToUse)
-        self.multiworld.get_location(location, self.player).place_locked_item(itemToUse)
-    
-    def setLocationItemFromRegion(self, region: str, itemName: str):
-        itemToUse = next(filter(lambda itm: itm.name == itemName, self.multiworld.raft_frequencyItemsPerPlayer[self.player]))
-        self.multiworld.raft_frequencyItemsPerPlayer[self.player].remove(itemToUse)
-        location = self.random.choice(list(loc for loc in location_table if loc["region"] == region))
-        self.multiworld.get_location(location["name"], self.player).place_locked_item(itemToUse)
-    
     def fill_slot_data(self):
         return {
             "IslandGenerationDistance": self.options.island_generation_distance.value,

From 5b4d7c752670b9cdf79258792e8045d968a54e96 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sun, 8 Dec 2024 19:58:49 -0500
Subject: [PATCH 144/381] TUNIC: Add Shield to Ladder Storage logic (#4146)

---
 worlds/tunic/__init__.py | 5 +++++
 worlds/tunic/options.py  | 2 +-
 worlds/tunic/rules.py    | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index d1430aac1895..4c62b18b140f 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -286,6 +286,11 @@ def remove_filler(amount: int) -> None:
                 tunic_items.append(self.create_item(page, ItemClassification.progression | ItemClassification.useful))
                 items_to_create[page] = 0
 
+        # logically relevant if you have ladder storage enabled
+        if self.options.ladder_storage and not self.options.ladder_storage_without_items:
+            tunic_items.append(self.create_item("Shield", ItemClassification.progression))
+            items_to_create["Shield"] = 0
+
         if self.options.maskless:
             tunic_items.append(self.create_item("Scavenger Mask", ItemClassification.useful))
             items_to_create["Scavenger Mask"] = 0
diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index cdd37a889461..f1d53362f4c9 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -216,7 +216,7 @@ class LadderStorage(Choice):
 
 class LadderStorageWithoutItems(Toggle):
     """
-    If disabled, you logically require Stick, Sword, or Magic Orb to perform Ladder Storage.
+    If disabled, you logically require Stick, Sword, Magic Orb, or Shield to perform Ladder Storage.
     If enabled, you will be expected to perform Ladder Storage without progression items.
     This can be done with the plushie code, a Golden Coin, Prayer, and many other options.
 
diff --git a/worlds/tunic/rules.py b/worlds/tunic/rules.py
index aa69666daeb6..58c987acbcee 100644
--- a/worlds/tunic/rules.py
+++ b/worlds/tunic/rules.py
@@ -18,6 +18,7 @@
 prayer = "Pages 24-25 (Prayer)"
 holy_cross = "Pages 42-43 (Holy Cross)"
 icebolt = "Pages 52-53 (Icebolt)"
+shield = "Shield"
 key = "Key"
 house_key = "Old House Key"
 vault_key = "Fortress Vault Key"
@@ -82,7 +83,7 @@ def can_ladder_storage(state: CollectionState, world: "TunicWorld") -> bool:
         return False
     if world.options.ladder_storage_without_items:
         return True
-    return has_stick(state, world.player) or state.has(grapple, world.player)
+    return has_stick(state, world.player) or state.has_any((grapple, shield), world.player)
 
 
 def has_mask(state: CollectionState, world: "TunicWorld") -> bool:

From 1f712d9a8754103e2bbeb13075f460ff366d55df Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sun, 8 Dec 2024 19:59:40 -0500
Subject: [PATCH 145/381] Various Worlds: use / explicitly for pkgutil (#4232)

---
 worlds/kdl3/regions.py              | 2 +-
 worlds/kdl3/rom.py                  | 8 ++++----
 worlds/ladx/LADXR/patches/bank34.py | 2 +-
 worlds/ladx/LADXR/patches/bank3e.py | 2 +-
 worlds/lingo/static_logic.py        | 2 +-
 worlds/minecraft/Constants.py       | 2 +-
 worlds/mm2/rom.py                   | 2 +-
 worlds/shivers/Constants.py         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/worlds/kdl3/regions.py b/worlds/kdl3/regions.py
index c47e5dee4095..af5208d365f0 100644
--- a/worlds/kdl3/regions.py
+++ b/worlds/kdl3/regions.py
@@ -57,7 +57,7 @@ def generate_valid_level(world: "KDL3World", level: int, stage: int,
 
 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")))
+    room_data = orjson.loads(get_data(__name__, "data/Rooms.json"))
     rooms: Dict[str, KDL3Room] = dict()
     for room_entry in room_data:
         room = KDL3Room(room_entry["name"], world.player, world.multiworld, None, room_entry["level"],
diff --git a/worlds/kdl3/rom.py b/worlds/kdl3/rom.py
index 3dd10ce1c43f..741ea0083027 100644
--- a/worlds/kdl3/rom.py
+++ b/worlds/kdl3/rom.py
@@ -313,7 +313,7 @@ def handle_level_sprites(stages: List[Tuple[int, ...]], sprites: List[bytearray]
 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"))
+    patch = get_data(__name__, "data/APHeartStar.bsdiff4")
     patched = bytearray(bsdiff4.patch(decompressed, patch))
     rom.write_bytes(0x1AF7DF, patched)
     patched[0:0] = [0xE3, 0xFF]
@@ -327,10 +327,10 @@ def write_consumable_sprites(rom: RomData, consumables: bool, stars: bool) -> No
     decompressed = hal_decompress(compressed)
     patched = bytearray(decompressed)
     if consumables:
-        patch = get_data(__name__, os.path.join("data", "APConsumable.bsdiff4"))
+        patch = get_data(__name__, "data/APConsumable.bsdiff4")
         patched = bytearray(bsdiff4.patch(bytes(patched), patch))
     if stars:
-        patch = get_data(__name__, os.path.join("data", "APStars.bsdiff4"))
+        patch = get_data(__name__, "data/APStars.bsdiff4")
         patched = bytearray(bsdiff4.patch(bytes(patched), patch))
     patched[0:0] = [0xE3, 0xFF]
     patched.append(0xFF)
@@ -380,7 +380,7 @@ def get_source_data(cls) -> 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")))
+                     get_data(__name__, "data/kdl3_basepatch.bsdiff4"))
 
     # Write open world patch
     if world.options.open_world:
diff --git a/worlds/ladx/LADXR/patches/bank34.py b/worlds/ladx/LADXR/patches/bank34.py
index 31b9ca124436..e88727e868c6 100644
--- a/worlds/ladx/LADXR/patches/bank34.py
+++ b/worlds/ladx/LADXR/patches/bank34.py
@@ -75,7 +75,7 @@ def addBank34(rom, item_list):
     .notCavesA:
         add  hl, de
         ret
-    """ + pkgutil.get_data(__name__, os.path.join("bank3e.asm", "message.asm")).decode().replace("\r", ""), 0x4000), fill_nop=True)
+    """ + pkgutil.get_data(__name__, "bank3e.asm/message.asm").decode().replace("\r", ""), 0x4000), fill_nop=True)
 
     nextItemLookup = ItemNameStringBufferStart
     nameLookup = {
diff --git a/worlds/ladx/LADXR/patches/bank3e.py b/worlds/ladx/LADXR/patches/bank3e.py
index 7e690349a335..632fffa7e63e 100644
--- a/worlds/ladx/LADXR/patches/bank3e.py
+++ b/worlds/ladx/LADXR/patches/bank3e.py
@@ -56,7 +56,7 @@ def addBank3E(rom, seed, player_id, player_name_list):
     """))
 
     def get_asm(name):
-        return pkgutil.get_data(__name__, os.path.join("bank3e.asm", name)).decode().replace("\r", "")
+        return pkgutil.get_data(__name__, "bank3e.asm/" + name).decode().replace("\r", "")
 
     rom.patch(0x3E, 0x0000, 0x2F00, ASM("""
         call MainJumpTable
diff --git a/worlds/lingo/static_logic.py b/worlds/lingo/static_logic.py
index 74eea449f228..9925e9582a2c 100644
--- a/worlds/lingo/static_logic.py
+++ b/worlds/lingo/static_logic.py
@@ -107,7 +107,7 @@ def find_class(self, module, name):
                 return getattr(safe_builtins, name)
             raise pickle.UnpicklingError(f"global '{module}.{name}' is forbidden")
 
-    file = pkgutil.get_data(__name__, os.path.join("data", "generated.dat"))
+    file = pkgutil.get_data(__name__, "data/generated.dat")
     pickdata = RenameUnpickler(BytesIO(file)).load()
         
     HASHES.update(pickdata["HASHES"])
diff --git a/worlds/minecraft/Constants.py b/worlds/minecraft/Constants.py
index 0d1101e802fd..1f7b6fa6acef 100644
--- a/worlds/minecraft/Constants.py
+++ b/worlds/minecraft/Constants.py
@@ -3,7 +3,7 @@
 import pkgutil
 
 def load_data_file(*args) -> dict:
-    fname = os.path.join("data", *args)
+    fname = "/".join(["data", *args])
     return json.loads(pkgutil.get_data(__name__, fname).decode())
 
 # For historical reasons, these values are different.
diff --git a/worlds/mm2/rom.py b/worlds/mm2/rom.py
index cac0a8706007..e37c5bc2a148 100644
--- a/worlds/mm2/rom.py
+++ b/worlds/mm2/rom.py
@@ -126,7 +126,7 @@ def write_bytes(self, offset: int, value: Iterable[int]) -> None:
 
 
 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")))
+    patch.write_file("mm2_basepatch.bsdiff4", pkgutil.get_data(__name__, "data/mm2_basepatch.bsdiff4"))
     # text writing
     patch.write_bytes(0x37E2A, MM2TextEntry("FOR           ", 0xCB).resolve())
     patch.write_bytes(0x37EAA, MM2TextEntry("GET EQUIPPED  ", 0x0B).resolve())
diff --git a/worlds/shivers/Constants.py b/worlds/shivers/Constants.py
index 0b00cecec3ec..95b3c2d56ad9 100644
--- a/worlds/shivers/Constants.py
+++ b/worlds/shivers/Constants.py
@@ -3,7 +3,7 @@
 import pkgutil
 
 def load_data_file(*args) -> dict:
-    fname = os.path.join("data", *args)
+    fname = "/".join(["data", *args])
     return json.loads(pkgutil.get_data(__name__, fname).decode())
 
 location_id_offset: int = 27000

From 26f9720e69d33af5f55950d4bc197460f39df3ab Mon Sep 17 00:00:00 2001
From: Louis M <prog@tioui.com>
Date: Sun, 8 Dec 2024 20:18:00 -0500
Subject: [PATCH 146/381] Aquaria: mega refactoring (#3810)

This PR is mainly refactoring. Here is what changed:
- Changing item names so that each words are capitalized (`Energy Form` instead of `Energy form`)
- Removing duplication of string literal by using:
  - Constants for items and locations,
  - Region's name attribute for entrances,
- Clarify some documentations,
- Adding some region to be more representative of the game and to remove listing of locations in the rules (prioritize entrance rules over individual location rules).

This is the other minor modifications that are not refactoring:
- Adding an early bind song option since that can be used to exit starting area.
- Changing Sun God to Lumerean God to be coherent with the other gods.
- Changing Home Water to Home Waters and Open Water to Open Waters to be coherent with the game.
- Removing a rules to have an attack to go in Mithalas Cathedral since you can to get some checks in it without an attack.
- Adding some options to slot data to be used with Poptracker.
- Fixing a little but still potentially logic breaking bug.
---
 worlds/aquaria/Items.py                       |  440 ++++--
 worlds/aquaria/Locations.py                   |  800 +++++++----
 worlds/aquaria/Options.py                     |   52 +-
 worlds/aquaria/Regions.py                     | 1190 ++++++++---------
 worlds/aquaria/__init__.py                    |   82 +-
 worlds/aquaria/docs/en_Aquaria.md             |    2 +-
 worlds/aquaria/test/__init__.py               |  405 +++---
 worlds/aquaria/test/test_beast_form_access.py |   24 +-
 ...test_beast_form_or_arnassi_armor_access.py |   46 +-
 worlds/aquaria/test/test_bind_song_access.py  |   33 +-
 .../test/test_bind_song_option_access.py      |   40 +-
 .../aquaria/test/test_confined_home_water.py  |    9 +-
 worlds/aquaria/test/test_dual_song_access.py  |   17 +-
 .../aquaria/test/test_energy_form_access.py   |   29 +-
 .../test_energy_form_or_dual_form_access.py   |  132 +-
 worlds/aquaria/test/test_fish_form_access.py  |   39 +-
 worlds/aquaria/test/test_li_song_access.py    |   55 +-
 worlds/aquaria/test/test_light_access.py      |   99 +-
 .../aquaria/test/test_nature_form_access.py   |   79 +-
 ...st_no_progression_hard_hidden_locations.py |   51 +-
 .../test_progression_hard_hidden_locations.py |   51 +-
 .../aquaria/test/test_spirit_form_access.py   |   38 +-
 worlds/aquaria/test/test_sun_form_access.py   |   24 +-
 .../test_unconfine_home_water_via_both.py     |    9 +-
 ...st_unconfine_home_water_via_energy_door.py |    9 +-
 ...st_unconfine_home_water_via_transturtle.py |    9 +-
 26 files changed, 2119 insertions(+), 1645 deletions(-)

diff --git a/worlds/aquaria/Items.py b/worlds/aquaria/Items.py
index f822d675e6e7..88ac7c76e0a3 100644
--- a/worlds/aquaria/Items.py
+++ b/worlds/aquaria/Items.py
@@ -59,156 +59,316 @@ class ItemData:
     type: ItemType
     group: ItemGroup
 
-    def __init__(self, id: int, count: int, type: ItemType, group: ItemGroup):
+    def __init__(self, aId: int, count: int, aType: ItemType, group: ItemGroup):
         """
         Initialisation of the item data
-        @param id: The item ID
+        @param aId: The item ID
         @param count: the number of items in the pool
-        @param type: the importance type of the item
+        @param aType: the importance type of the item
         @param group: the usage of the item in the game
         """
-        self.id = id
+        self.id = aId
         self.count = count
-        self.type = type
+        self.type = aType
         self.group = group
 
+class ItemNames:
+    """
+    Constants used to represent the mane of every items.
+    """
+    # Normal items
+    ANEMONE = "Anemone"
+    ARNASSI_STATUE = "Arnassi Statue"
+    BIG_SEED = "Big Seed"
+    GLOWING_SEED = "Glowing Seed"
+    BLACK_PEARL = "Black Pearl"
+    BABY_BLASTER = "Baby Blaster"
+    CRAB_ARMOR = "Crab Armor"
+    BABY_DUMBO = "Baby Dumbo"
+    TOOTH = "Tooth"
+    ENERGY_STATUE = "Energy Statue"
+    KROTITE_ARMOR = "Krotite Armor"
+    GOLDEN_STARFISH = "Golden Starfish"
+    GOLDEN_GEAR = "Golden Gear"
+    JELLY_BEACON = "Jelly Beacon"
+    JELLY_COSTUME = "Jelly Costume"
+    JELLY_PLANT = "Jelly Plant"
+    MITHALAS_DOLL = "Mithalas Doll"
+    MITHALAN_DRESS = "Mithalan Dress"
+    MITHALAS_BANNER = "Mithalas Banner"
+    MITHALAS_POT = "Mithalas Pot"
+    MUTANT_COSTUME = "Mutant Costume"
+    BABY_NAUTILUS = "Baby Nautilus"
+    BABY_PIRANHA = "Baby Piranha"
+    ARNASSI_ARMOR = "Arnassi Armor"
+    SEED_BAG = "Seed Bag"
+    KING_S_SKULL = "King's Skull"
+    SONG_PLANT_SPORE = "Song Plant Spore"
+    STONE_HEAD = "Stone Head"
+    SUN_KEY = "Sun Key"
+    GIRL_COSTUME = "Girl Costume"
+    ODD_CONTAINER = "Odd Container"
+    TRIDENT = "Trident"
+    TURTLE_EGG = "Turtle Egg"
+    JELLY_EGG = "Jelly Egg"
+    URCHIN_COSTUME = "Urchin Costume"
+    BABY_WALKER = "Baby Walker"
+    VEDHA_S_CURE_ALL = "Vedha's Cure-All"
+    ZUUNA_S_PEROGI = "Zuuna's Perogi"
+    ARCANE_POULTICE = "Arcane Poultice"
+    BERRY_ICE_CREAM = "Berry Ice Cream"
+    BUTTERY_SEA_LOAF = "Buttery Sea Loaf"
+    COLD_BORSCHT = "Cold Borscht"
+    COLD_SOUP = "Cold Soup"
+    CRAB_CAKE = "Crab Cake"
+    DIVINE_SOUP = "Divine Soup"
+    DUMBO_ICE_CREAM = "Dumbo Ice Cream"
+    FISH_OIL = "Fish Oil"
+    GLOWING_EGG = "Glowing Egg"
+    HAND_ROLL = "Hand Roll"
+    HEALING_POULTICE = "Healing Poultice"
+    HEARTY_SOUP = "Hearty Soup"
+    HOT_BORSCHT = "Hot Borscht"
+    HOT_SOUP = "Hot Soup"
+    ICE_CREAM = "Ice Cream"
+    LEADERSHIP_ROLL = "Leadership Roll"
+    LEAF_POULTICE = "Leaf Poultice"
+    LEECHING_POULTICE = "Leeching Poultice"
+    LEGENDARY_CAKE = "Legendary Cake"
+    LOAF_OF_LIFE = "Loaf of Life"
+    LONG_LIFE_SOUP = "Long Life Soup"
+    MAGIC_SOUP = "Magic Soup"
+    MUSHROOM_X_2 = "Mushroom x 2"
+    PEROGI = "Perogi"
+    PLANT_LEAF = "Plant Leaf"
+    PLUMP_PEROGI = "Plump Perogi"
+    POISON_LOAF = "Poison Loaf"
+    POISON_SOUP = "Poison Soup"
+    RAINBOW_MUSHROOM = "Rainbow Mushroom"
+    RAINBOW_SOUP = "Rainbow Soup"
+    RED_BERRY = "Red Berry"
+    RED_BULB_X_2 = "Red Bulb x 2"
+    ROTTEN_CAKE = "Rotten Cake"
+    ROTTEN_LOAF_X_8 = "Rotten Loaf x 8"
+    ROTTEN_MEAT = "Rotten Meat"
+    ROYAL_SOUP = "Royal Soup"
+    SEA_CAKE = "Sea Cake"
+    SEA_LOAF = "Sea Loaf"
+    SHARK_FIN_SOUP = "Shark Fin Soup"
+    SIGHT_POULTICE = "Sight Poultice"
+    SMALL_BONE_X_2 = "Small Bone x 2"
+    SMALL_EGG = "Small Egg"
+    SMALL_TENTACLE_X_2 = "Small Tentacle x 2"
+    SPECIAL_BULB = "Special Bulb"
+    SPECIAL_CAKE = "Special Cake"
+    SPICY_MEAT_X_2 = "Spicy Meat x 2"
+    SPICY_ROLL = "Spicy Roll"
+    SPICY_SOUP = "Spicy Soup"
+    SPIDER_ROLL = "Spider Roll"
+    SWAMP_CAKE = "Swamp Cake"
+    TASTY_CAKE = "Tasty Cake"
+    TASTY_ROLL = "Tasty Roll"
+    TOUGH_CAKE = "Tough Cake"
+    TURTLE_SOUP = "Turtle Soup"
+    VEDHA_SEA_CRISP = "Vedha Sea Crisp"
+    VEGGIE_CAKE = "Veggie Cake"
+    VEGGIE_ICE_CREAM = "Veggie Ice Cream"
+    VEGGIE_SOUP = "Veggie Soup"
+    VOLCANO_ROLL = "Volcano Roll"
+    HEALTH_UPGRADE = "Health Upgrade"
+    WOK = "Wok"
+    EEL_OIL_X_2 = "Eel Oil x 2"
+    FISH_MEAT_X_2 = "Fish Meat x 2"
+    FISH_OIL_X_3 = "Fish Oil x 3"
+    GLOWING_EGG_X_2 = "Glowing Egg x 2"
+    HEALING_POULTICE_X_2 = "Healing Poultice x 2"
+    HOT_SOUP_X_2 = "Hot Soup x 2"
+    LEADERSHIP_ROLL_X_2 = "Leadership Roll x 2"
+    LEAF_POULTICE_X_3 = "Leaf Poultice x 3"
+    PLANT_LEAF_X_2 = "Plant Leaf x 2"
+    PLANT_LEAF_X_3 = "Plant Leaf x 3"
+    ROTTEN_MEAT_X_2 = "Rotten Meat x 2"
+    ROTTEN_MEAT_X_8 = "Rotten Meat x 8"
+    SEA_LOAF_X_2 = "Sea Loaf x 2"
+    SMALL_BONE_X_3 = "Small Bone x 3"
+    SMALL_EGG_X_2 = "Small Egg x 2"
+    LI_AND_LI_SONG = "Li and Li Song"
+    SHIELD_SONG = "Shield Song"
+    BEAST_FORM = "Beast Form"
+    SUN_FORM = "Sun Form"
+    NATURE_FORM = "Nature Form"
+    ENERGY_FORM = "Energy Form"
+    BIND_SONG = "Bind Song"
+    FISH_FORM = "Fish Form"
+    SPIRIT_FORM = "Spirit Form"
+    DUAL_FORM = "Dual Form"
+    TRANSTURTLE_VEIL_TOP_LEFT = "Transturtle Veil top left"
+    TRANSTURTLE_VEIL_TOP_RIGHT = "Transturtle Veil top right"
+    TRANSTURTLE_OPEN_WATERS = "Transturtle Open Waters top right"
+    TRANSTURTLE_KELP_FOREST = "Transturtle Kelp Forest bottom left"
+    TRANSTURTLE_HOME_WATERS = "Transturtle Home Waters"
+    TRANSTURTLE_ABYSS = "Transturtle Abyss right"
+    TRANSTURTLE_BODY = "Transturtle Final Boss"
+    TRANSTURTLE_SIMON_SAYS = "Transturtle Simon Says"
+    TRANSTURTLE_ARNASSI_RUINS = "Transturtle Arnassi Ruins"
+    # Events name
+    BODY_TONGUE_CLEARED = "Body Tongue cleared"
+    HAS_SUN_CRYSTAL = "Has Sun Crystal"
+    FALLEN_GOD_BEATED = "Fallen God beated"
+    MITHALAN_GOD_BEATED = "Mithalan God beated"
+    DRUNIAN_GOD_BEATED = "Drunian God beated"
+    LUMEREAN_GOD_BEATED = "Lumerean God beated"
+    THE_GOLEM_BEATED = "The Golem beated"
+    NAUTILUS_PRIME_BEATED = "Nautilus Prime beated"
+    BLASTER_PEG_PRIME_BEATED = "Blaster Peg Prime beated"
+    MERGOG_BEATED = "Mergog beated"
+    MITHALAN_PRIESTS_BEATED = "Mithalan priests beated"
+    OCTOPUS_PRIME_BEATED = "Octopus Prime beated"
+    CRABBIUS_MAXIMUS_BEATED = "Crabbius Maximus beated"
+    MANTIS_SHRIMP_PRIME_BEATED = "Mantis Shrimp Prime beated"
+    KING_JELLYFISH_GOD_PRIME_BEATED = "King Jellyfish God Prime beated"
+    VICTORY = "Victory"
+    FIRST_SECRET_OBTAINED = "First Secret obtained"
+    SECOND_SECRET_OBTAINED = "Second Secret obtained"
+    THIRD_SECRET_OBTAINED = "Third Secret obtained"
 
 """Information data for every (not event) item."""
 item_table = {
     #       name:           ID,    Nb,   Item Type,        Item Group
-    "Anemone": ItemData(698000, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_anemone
-    "Arnassi Statue": ItemData(698001, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_arnassi_statue
-    "Big Seed": ItemData(698002, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_big_seed
-    "Glowing Seed": ItemData(698003, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_bio_seed
-    "Black Pearl": ItemData(698004, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_blackpearl
-    "Baby Blaster": ItemData(698005, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_blaster
-    "Crab Armor": ItemData(698006, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_crab_costume
-    "Baby Dumbo": ItemData(698007, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_dumbo
-    "Tooth": ItemData(698008, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_energy_boss
-    "Energy Statue": ItemData(698009, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_energy_statue
-    "Krotite Armor": ItemData(698010, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_energy_temple
-    "Golden Starfish": ItemData(698011, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_gold_star
-    "Golden Gear": ItemData(698012, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_golden_gear
-    "Jelly Beacon": ItemData(698013, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_jelly_beacon
-    "Jelly Costume": ItemData(698014, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_jelly_costume
-    "Jelly Plant": ItemData(698015, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_jelly_plant
-    "Mithalas Doll": ItemData(698016, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithala_doll
-    "Mithalan Dress": ItemData(698017, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithalan_costume
-    "Mithalas Banner": ItemData(698018, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithalas_banner
-    "Mithalas Pot": ItemData(698019, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithalas_pot
-    "Mutant Costume": ItemData(698020, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mutant_costume
-    "Baby Nautilus": ItemData(698021, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_nautilus
-    "Baby Piranha": ItemData(698022, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_piranha
-    "Arnassi Armor": ItemData(698023, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_seahorse_costume
-    "Seed Bag": ItemData(698024, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_seed_bag
-    "King's Skull": ItemData(698025, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_skull
-    "Song Plant Spore": ItemData(698026, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_spore_seed
-    "Stone Head": ItemData(698027, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_stone_head
-    "Sun Key": ItemData(698028, 1, ItemType.NORMAL, ItemGroup.COLLECTIBLE),  # collectible_sun_key
-    "Girl Costume": ItemData(698029, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_teen_costume
-    "Odd Container": ItemData(698030, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_treasure_chest
-    "Trident": ItemData(698031, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_trident_head
-    "Turtle Egg": ItemData(698032, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_turtle_egg
-    "Jelly Egg": ItemData(698033, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_upsidedown_seed
-    "Urchin Costume": ItemData(698034, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_urchin_costume
-    "Baby Walker": ItemData(698035, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_walker
-    "Vedha's Cure-All-All": ItemData(698036, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_Vedha'sCure-All
-    "Zuuna's perogi": ItemData(698037, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_Zuuna'sperogi
-    "Arcane poultice": ItemData(698038, 7, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_arcanepoultice
-    "Berry ice cream": ItemData(698039, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_berryicecream
-    "Buttery sea loaf": ItemData(698040, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_butterysealoaf
-    "Cold borscht": ItemData(698041, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_coldborscht
-    "Cold soup": ItemData(698042, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_coldsoup
-    "Crab cake": ItemData(698043, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_crabcake
-    "Divine soup": ItemData(698044, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_divinesoup
-    "Dumbo ice cream": ItemData(698045, 3, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_dumboicecream
-    "Fish oil": ItemData(698046, 2, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_fishoil
-    "Glowing egg": ItemData(698047, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_glowingegg
-    "Hand roll": ItemData(698048, 5, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_handroll
-    "Healing poultice": ItemData(698049, 4, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_healingpoultice
-    "Hearty soup": ItemData(698050, 5, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_heartysoup
-    "Hot borscht": ItemData(698051, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_hotborscht
-    "Hot soup": ItemData(698052, 3, ItemType.PROGRESSION, ItemGroup.RECIPE),  # ingredient_hotsoup
-    "Ice cream": ItemData(698053, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_icecream
-    "Leadership roll": ItemData(698054, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_leadershiproll
-    "Leaf poultice": ItemData(698055, 5, ItemType.PROGRESSION, ItemGroup.RECIPE),  # ingredient_leafpoultice
-    "Leeching poultice": ItemData(698056, 4, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_leechingpoultice
-    "Legendary cake": ItemData(698057, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_legendarycake
-    "Loaf of life": ItemData(698058, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_loafoflife
-    "Long life soup": ItemData(698059, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_longlifesoup
-    "Magic soup": ItemData(698060, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_magicsoup
-    "Mushroom x 2": ItemData(698061, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_mushroom
-    "Perogi": ItemData(698062, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_perogi
-    "Plant leaf": ItemData(698063, 3, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_plantleaf
-    "Plump perogi": ItemData(698064, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_plumpperogi
-    "Poison loaf": ItemData(698065, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_poisonloaf
-    "Poison soup": ItemData(698066, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_poisonsoup
-    "Rainbow mushroom": ItemData(698067, 4, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_rainbowmushroom
-    "Rainbow soup": ItemData(698068, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_rainbowsoup
-    "Red berry": ItemData(698069, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_redberry
-    "Red bulb x 2": ItemData(698070, 3, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_redbulb
-    "Rotten cake": ItemData(698071, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_rottencake
-    "Rotten loaf x 8": ItemData(698072, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_rottenloaf
-    "Rotten meat": ItemData(698073, 5, ItemType.JUNK, ItemGroup.INGREDIENT),  # ingredient_rottenmeat
-    "Royal soup": ItemData(698074, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_royalsoup
-    "Sea cake": ItemData(698075, 4, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_seacake
-    "Sea loaf": ItemData(698076, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_sealoaf
-    "Shark fin soup": ItemData(698077, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_sharkfinsoup
-    "Sight poultice": ItemData(698078, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_sightpoultice
-    "Small bone x 2": ItemData(698079, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smallbone
-    "Small egg": ItemData(698080, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smallegg
-    "Small tentacle x 2": ItemData(698081, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smalltentacle
-    "Special bulb": ItemData(698082, 5, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_specialbulb
-    "Special cake": ItemData(698083, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_specialcake
-    "Spicy meat x 2": ItemData(698084, 3, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_spicymeat
-    "Spicy roll": ItemData(698085, 11, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_spicyroll
-    "Spicy soup": ItemData(698086, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_spicysoup
-    "Spider roll": ItemData(698087, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_spiderroll
-    "Swamp cake": ItemData(698088, 3, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_swampcake
-    "Tasty cake": ItemData(698089, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_tastycake
-    "Tasty roll": ItemData(698090, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_tastyroll
-    "Tough cake": ItemData(698091, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_toughcake
-    "Turtle soup": ItemData(698092, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_turtlesoup
-    "Vedha sea crisp": ItemData(698093, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_vedhaseacrisp
-    "Veggie cake": ItemData(698094, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_veggiecake
-    "Veggie ice cream": ItemData(698095, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_veggieicecream
-    "Veggie soup": ItemData(698096, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_veggiesoup
-    "Volcano roll": ItemData(698097, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_volcanoroll
-    "Health upgrade": ItemData(698098, 5, ItemType.NORMAL, ItemGroup.HEALTH),  # upgrade_health_?
-    "Wok": ItemData(698099, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # upgrade_wok
-    "Eel oil x 2": ItemData(698100, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_eeloil
-    "Fish meat x 2": ItemData(698101, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_fishmeat
-    "Fish oil x 3": ItemData(698102, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_fishoil
-    "Glowing egg x 2": ItemData(698103, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_glowingegg
-    "Healing poultice x 2": ItemData(698104, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_healingpoultice
-    "Hot soup x 2": ItemData(698105, 1, ItemType.PROGRESSION, ItemGroup.RECIPE),  # ingredient_hotsoup
-    "Leadership roll x 2": ItemData(698106, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_leadershiproll
-    "Leaf poultice x 3": ItemData(698107, 2, ItemType.PROGRESSION, ItemGroup.RECIPE),  # ingredient_leafpoultice
-    "Plant leaf x 2": ItemData(698108, 2, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_plantleaf
-    "Plant leaf x 3": ItemData(698109, 4, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_plantleaf
-    "Rotten meat x 2": ItemData(698110, 1, ItemType.JUNK, ItemGroup.INGREDIENT),  # ingredient_rottenmeat
-    "Rotten meat x 8": ItemData(698111, 1, ItemType.JUNK, ItemGroup.INGREDIENT),  # ingredient_rottenmeat
-    "Sea loaf x 2": ItemData(698112, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_sealoaf
-    "Small bone x 3": ItemData(698113, 3, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smallbone
-    "Small egg x 2": ItemData(698114, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smallegg
-    "Li and Li song": ItemData(698115, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_li
-    "Shield song": ItemData(698116, 1, ItemType.NORMAL, ItemGroup.SONG),  # song_shield
-    "Beast form": ItemData(698117, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_beast
-    "Sun form": ItemData(698118, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_sun
-    "Nature form": ItemData(698119, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_nature
-    "Energy form": ItemData(698120, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_energy
-    "Bind song": ItemData(698121, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_bind
-    "Fish form": ItemData(698122, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_fish
-    "Spirit form": ItemData(698123, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_spirit
-    "Dual form": ItemData(698124, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_dual
-    "Transturtle Veil top left": ItemData(698125, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_veil01
-    "Transturtle Veil top right": ItemData(698126, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_veil02
-    "Transturtle Open Water top right": ItemData(698127, 1, ItemType.PROGRESSION,
-                                                 ItemGroup.TURTLE),  # transport_openwater03
-    "Transturtle Forest bottom left": ItemData(698128, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_forest04
-    "Transturtle Home Water": ItemData(698129, 1, ItemType.NORMAL, ItemGroup.TURTLE),  # transport_mainarea
-    "Transturtle Abyss right": ItemData(698130, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_abyss03
-    "Transturtle Final Boss": ItemData(698131, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_finalboss
-    "Transturtle Simon Says": ItemData(698132, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_forest05
-    "Transturtle Arnassi Ruins": ItemData(698133, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_seahorse
+    ItemNames.ANEMONE: ItemData(698000, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_anemone
+    ItemNames.ARNASSI_STATUE: ItemData(698001, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_arnassi_statue
+    ItemNames.BIG_SEED: ItemData(698002, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_big_seed
+    ItemNames.GLOWING_SEED: ItemData(698003, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_bio_seed
+    ItemNames.BLACK_PEARL: ItemData(698004, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_blackpearl
+    ItemNames.BABY_BLASTER: ItemData(698005, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_blaster
+    ItemNames.CRAB_ARMOR: ItemData(698006, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_crab_costume
+    ItemNames.BABY_DUMBO: ItemData(698007, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_dumbo
+    ItemNames.TOOTH: ItemData(698008, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_energy_boss
+    ItemNames.ENERGY_STATUE: ItemData(698009, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_energy_statue
+    ItemNames.KROTITE_ARMOR: ItemData(698010, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_energy_temple
+    ItemNames.GOLDEN_STARFISH: ItemData(698011, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_gold_star
+    ItemNames.GOLDEN_GEAR: ItemData(698012, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_golden_gear
+    ItemNames.JELLY_BEACON: ItemData(698013, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_jelly_beacon
+    ItemNames.JELLY_COSTUME: ItemData(698014, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_jelly_costume
+    ItemNames.JELLY_PLANT: ItemData(698015, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_jelly_plant
+    ItemNames.MITHALAS_DOLL: ItemData(698016, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithala_doll
+    ItemNames.MITHALAN_DRESS: ItemData(698017, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithalan_costume
+    ItemNames.MITHALAS_BANNER: ItemData(698018, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithalas_banner
+    ItemNames.MITHALAS_POT: ItemData(698019, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mithalas_pot
+    ItemNames.MUTANT_COSTUME: ItemData(698020, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_mutant_costume
+    ItemNames.BABY_NAUTILUS: ItemData(698021, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_nautilus
+    ItemNames.BABY_PIRANHA: ItemData(698022, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # collectible_piranha
+    ItemNames.ARNASSI_ARMOR: ItemData(698023, 1, ItemType.PROGRESSION, ItemGroup.UTILITY),  # collectible_seahorse_costume
+    ItemNames.SEED_BAG: ItemData(698024, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_seed_bag
+    ItemNames.KING_S_SKULL: ItemData(698025, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_skull
+    ItemNames.SONG_PLANT_SPORE: ItemData(698026, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_spore_seed
+    ItemNames.STONE_HEAD: ItemData(698027, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_stone_head
+    ItemNames.SUN_KEY: ItemData(698028, 1, ItemType.NORMAL, ItemGroup.COLLECTIBLE),  # collectible_sun_key
+    ItemNames.GIRL_COSTUME: ItemData(698029, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_teen_costume
+    ItemNames.ODD_CONTAINER: ItemData(698030, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_treasure_chest
+    ItemNames.TRIDENT: ItemData(698031, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_trident_head
+    ItemNames.TURTLE_EGG: ItemData(698032, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_turtle_egg
+    ItemNames.JELLY_EGG: ItemData(698033, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_upsidedown_seed
+    ItemNames.URCHIN_COSTUME: ItemData(698034, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_urchin_costume
+    ItemNames.BABY_WALKER: ItemData(698035, 1, ItemType.JUNK, ItemGroup.COLLECTIBLE),  # collectible_walker
+    ItemNames.VEDHA_S_CURE_ALL: ItemData(698036, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_Vedha'sCure-All
+    ItemNames.ZUUNA_S_PEROGI: ItemData(698037, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_Zuuna'sperogi
+    ItemNames.ARCANE_POULTICE: ItemData(698038, 7, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_arcanepoultice
+    ItemNames.BERRY_ICE_CREAM: ItemData(698039, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_berryicecream
+    ItemNames.BUTTERY_SEA_LOAF: ItemData(698040, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_butterysealoaf
+    ItemNames.COLD_BORSCHT: ItemData(698041, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_coldborscht
+    ItemNames.COLD_SOUP: ItemData(698042, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_coldsoup
+    ItemNames.CRAB_CAKE: ItemData(698043, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_crabcake
+    ItemNames.DIVINE_SOUP: ItemData(698044, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_divinesoup
+    ItemNames.DUMBO_ICE_CREAM: ItemData(698045, 3, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_dumboicecream
+    ItemNames.FISH_OIL: ItemData(698046, 2, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_fishoil
+    ItemNames.GLOWING_EGG: ItemData(698047, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_glowingegg
+    ItemNames.HAND_ROLL: ItemData(698048, 5, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_handroll
+    ItemNames.HEALING_POULTICE: ItemData(698049, 4, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_healingpoultice
+    ItemNames.HEARTY_SOUP: ItemData(698050, 5, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_heartysoup
+    ItemNames.HOT_BORSCHT: ItemData(698051, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_hotborscht
+    ItemNames.HOT_SOUP: ItemData(698052, 3, ItemType.PROGRESSION, ItemGroup.RECIPE),  # ingredient_hotsoup
+    ItemNames.ICE_CREAM: ItemData(698053, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_icecream
+    ItemNames.LEADERSHIP_ROLL: ItemData(698054, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_leadershiproll
+    ItemNames.LEAF_POULTICE: ItemData(698055, 5, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_leafpoultice
+    ItemNames.LEECHING_POULTICE: ItemData(698056, 4, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_leechingpoultice
+    ItemNames.LEGENDARY_CAKE: ItemData(698057, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_legendarycake
+    ItemNames.LOAF_OF_LIFE: ItemData(698058, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_loafoflife
+    ItemNames.LONG_LIFE_SOUP: ItemData(698059, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_longlifesoup
+    ItemNames.MAGIC_SOUP: ItemData(698060, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_magicsoup
+    ItemNames.MUSHROOM_X_2: ItemData(698061, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_mushroom
+    ItemNames.PEROGI: ItemData(698062, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_perogi
+    ItemNames.PLANT_LEAF: ItemData(698063, 3, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_plantleaf
+    ItemNames.PLUMP_PEROGI: ItemData(698064, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_plumpperogi
+    ItemNames.POISON_LOAF: ItemData(698065, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_poisonloaf
+    ItemNames.POISON_SOUP: ItemData(698066, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_poisonsoup
+    ItemNames.RAINBOW_MUSHROOM: ItemData(698067, 4, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_rainbowmushroom
+    ItemNames.RAINBOW_SOUP: ItemData(698068, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_rainbowsoup
+    ItemNames.RED_BERRY: ItemData(698069, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_redberry
+    ItemNames.RED_BULB_X_2: ItemData(698070, 3, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_redbulb
+    ItemNames.ROTTEN_CAKE: ItemData(698071, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_rottencake
+    ItemNames.ROTTEN_LOAF_X_8: ItemData(698072, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_rottenloaf
+    ItemNames.ROTTEN_MEAT: ItemData(698073, 5, ItemType.JUNK, ItemGroup.INGREDIENT),  # ingredient_rottenmeat
+    ItemNames.ROYAL_SOUP: ItemData(698074, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_royalsoup
+    ItemNames.SEA_CAKE: ItemData(698075, 4, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_seacake
+    ItemNames.SEA_LOAF: ItemData(698076, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_sealoaf
+    ItemNames.SHARK_FIN_SOUP: ItemData(698077, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_sharkfinsoup
+    ItemNames.SIGHT_POULTICE: ItemData(698078, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_sightpoultice
+    ItemNames.SMALL_BONE_X_2: ItemData(698079, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smallbone
+    ItemNames.SMALL_EGG: ItemData(698080, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smallegg
+    ItemNames.SMALL_TENTACLE_X_2: ItemData(698081, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smalltentacle
+    ItemNames.SPECIAL_BULB: ItemData(698082, 5, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_specialbulb
+    ItemNames.SPECIAL_CAKE: ItemData(698083, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_specialcake
+    ItemNames.SPICY_MEAT_X_2: ItemData(698084, 3, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_spicymeat
+    ItemNames.SPICY_ROLL: ItemData(698085, 11, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_spicyroll
+    ItemNames.SPICY_SOUP: ItemData(698086, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_spicysoup
+    ItemNames.SPIDER_ROLL: ItemData(698087, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_spiderroll
+    ItemNames.SWAMP_CAKE: ItemData(698088, 3, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_swampcake
+    ItemNames.TASTY_CAKE: ItemData(698089, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_tastycake
+    ItemNames.TASTY_ROLL: ItemData(698090, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_tastyroll
+    ItemNames.TOUGH_CAKE: ItemData(698091, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_toughcake
+    ItemNames.TURTLE_SOUP: ItemData(698092, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_turtlesoup
+    ItemNames.VEDHA_SEA_CRISP: ItemData(698093, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_vedhaseacrisp
+    ItemNames.VEGGIE_CAKE: ItemData(698094, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_veggiecake
+    ItemNames.VEGGIE_ICE_CREAM: ItemData(698095, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_veggieicecream
+    ItemNames.VEGGIE_SOUP: ItemData(698096, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_veggiesoup
+    ItemNames.VOLCANO_ROLL: ItemData(698097, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_volcanoroll
+    ItemNames.HEALTH_UPGRADE: ItemData(698098, 5, ItemType.NORMAL, ItemGroup.HEALTH),  # upgrade_health_?
+    ItemNames.WOK: ItemData(698099, 1, ItemType.NORMAL, ItemGroup.UTILITY),  # upgrade_wok
+    ItemNames.EEL_OIL_X_2: ItemData(698100, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_eeloil
+    ItemNames.FISH_MEAT_X_2: ItemData(698101, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_fishmeat
+    ItemNames.FISH_OIL_X_3: ItemData(698102, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_fishoil
+    ItemNames.GLOWING_EGG_X_2: ItemData(698103, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_glowingegg
+    ItemNames.HEALING_POULTICE_X_2: ItemData(698104, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_healingpoultice
+    ItemNames.HOT_SOUP_X_2: ItemData(698105, 1, ItemType.PROGRESSION, ItemGroup.RECIPE),  # ingredient_hotsoup
+    ItemNames.LEADERSHIP_ROLL_X_2: ItemData(698106, 1, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_leadershiproll
+    ItemNames.LEAF_POULTICE_X_3: ItemData(698107, 2, ItemType.NORMAL, ItemGroup.RECIPE),  # ingredient_leafpoultice
+    ItemNames.PLANT_LEAF_X_2: ItemData(698108, 2, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_plantleaf
+    ItemNames.PLANT_LEAF_X_3: ItemData(698109, 4, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_plantleaf
+    ItemNames.ROTTEN_MEAT_X_2: ItemData(698110, 1, ItemType.JUNK, ItemGroup.INGREDIENT),  # ingredient_rottenmeat
+    ItemNames.ROTTEN_MEAT_X_8: ItemData(698111, 1, ItemType.JUNK, ItemGroup.INGREDIENT),  # ingredient_rottenmeat
+    ItemNames.SEA_LOAF_X_2: ItemData(698112, 1, ItemType.JUNK, ItemGroup.RECIPE),  # ingredient_sealoaf
+    ItemNames.SMALL_BONE_X_3: ItemData(698113, 3, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smallbone
+    ItemNames.SMALL_EGG_X_2: ItemData(698114, 1, ItemType.NORMAL, ItemGroup.INGREDIENT),  # ingredient_smallegg
+    ItemNames.LI_AND_LI_SONG: ItemData(698115, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_li
+    ItemNames.SHIELD_SONG: ItemData(698116, 1, ItemType.NORMAL, ItemGroup.SONG),  # song_shield
+    ItemNames.BEAST_FORM: ItemData(698117, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_beast
+    ItemNames.SUN_FORM: ItemData(698118, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_sun
+    ItemNames.NATURE_FORM: ItemData(698119, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_nature
+    ItemNames.ENERGY_FORM: ItemData(698120, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_energy
+    ItemNames.BIND_SONG: ItemData(698121, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_bind
+    ItemNames.FISH_FORM: ItemData(698122, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_fish
+    ItemNames.SPIRIT_FORM: ItemData(698123, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_spirit
+    ItemNames.DUAL_FORM: ItemData(698124, 1, ItemType.PROGRESSION, ItemGroup.SONG),  # song_dual
+    ItemNames.TRANSTURTLE_VEIL_TOP_LEFT: ItemData(698125, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_veil01
+    ItemNames.TRANSTURTLE_VEIL_TOP_RIGHT: ItemData(698126, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_veil02
+    ItemNames.TRANSTURTLE_OPEN_WATERS: ItemData(698127, 1, ItemType.PROGRESSION,
+                                                ItemGroup.TURTLE),  # transport_openwater03
+    ItemNames.TRANSTURTLE_KELP_FOREST: ItemData(698128, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),
+    # transport_forest04
+    ItemNames.TRANSTURTLE_HOME_WATERS: ItemData(698129, 1, ItemType.NORMAL, ItemGroup.TURTLE),  # transport_mainarea
+    ItemNames.TRANSTURTLE_ABYSS: ItemData(698130, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_abyss03
+    ItemNames.TRANSTURTLE_BODY: ItemData(698131, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_finalboss
+    ItemNames.TRANSTURTLE_SIMON_SAYS: ItemData(698132, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_forest05
+    ItemNames.TRANSTURTLE_ARNASSI_RUINS: ItemData(698133, 1, ItemType.PROGRESSION, ItemGroup.TURTLE),  # transport_seahorse
 }
diff --git a/worlds/aquaria/Locations.py b/worlds/aquaria/Locations.py
index f6e098103fdc..832d22f4ac87 100644
--- a/worlds/aquaria/Locations.py
+++ b/worlds/aquaria/Locations.py
@@ -26,476 +26,785 @@ def __init__(self, player: int, name="", code=None, parent=None) -> None:
         self.event = code is None
 
 
-class AquariaLocations:
+class AquariaLocationNames:
+    """
+    Constants used to represent every name of every locations.
+    """
+
+    VERSE_CAVE_RIGHT_AREA_BULB_IN_THE_SKELETON_ROOM = "Verse Cave right area, bulb in the skeleton room"
+    VERSE_CAVE_RIGHT_AREA_BULB_IN_THE_PATH_RIGHT_OF_THE_SKELETON_ROOM = \
+        "Verse Cave right area, bulb in the path right of the skeleton room"
+    VERSE_CAVE_RIGHT_AREA_BIG_SEED = "Verse Cave right area, Big Seed"
+    VERSE_CAVE_LEFT_AREA_THE_NAIJA_HINT_ABOUT_THE_SHIELD_ABILITY = \
+        "Verse Cave left area, the Naija hint about the shield ability"
+    VERSE_CAVE_LEFT_AREA_BULB_IN_THE_CENTER_PART = "Verse Cave left area, bulb in the center part"
+    VERSE_CAVE_LEFT_AREA_BULB_IN_THE_RIGHT_PART = "Verse Cave left area, bulb in the right part"
+    VERSE_CAVE_LEFT_AREA_BULB_UNDER_THE_ROCK_AT_THE_END_OF_THE_PATH = \
+        "Verse Cave left area, bulb under the rock at the end of the path"
+    HOME_WATERS_BULB_BELOW_THE_GROUPER_FISH = "Home Waters, bulb below the grouper fish"
+    HOME_WATERS_BULB_IN_THE_LITTLE_ROOM_ABOVE_THE_GROUPER_FISH = \
+        "Home Waters, bulb in the little room above the grouper fish"
+    HOME_WATERS_BULB_IN_THE_END_OF_THE_PATH_CLOSE_TO_THE_VERSE_CAVE = \
+        "Home Waters, bulb in the end of the path close to the Verse Cave"
+    HOME_WATERS_BULB_IN_THE_TOP_LEFT_PATH = "Home Waters, bulb in the top left path"
+    HOME_WATERS_BULB_CLOSE_TO_NAIJA_S_HOME = "Home Waters, bulb close to Naija's Home"
+    HOME_WATERS_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH_FROM_THE_VERSE_CAVE = \
+        "Home Waters, bulb under the rock in the left path from the Verse Cave"
+    HOME_WATERS_BULB_IN_THE_PATH_BELOW_NAUTILUS_PRIME = "Home Waters, bulb in the path below Nautilus Prime"
+    HOME_WATERS_BULB_IN_THE_BOTTOM_LEFT_ROOM = "Home Waters, bulb in the bottom left room"
+    HOME_WATERS_NAUTILUS_EGG = "Home Waters, Nautilus Egg"
+    HOME_WATERS_TRANSTURTLE = "Home Waters, Transturtle"
+    NAIJA_S_HOME_BULB_AFTER_THE_ENERGY_DOOR = "Naija's Home, bulb after the energy door"
+    NAIJA_S_HOME_BULB_UNDER_THE_ROCK_AT_THE_RIGHT_OF_THE_MAIN_PATH = \
+        "Naija's Home, bulb under the rock at the right of the main path"
+    SONG_CAVE_ERULIAN_SPIRIT = "Song Cave, Erulian spirit"
+    SONG_CAVE_BULB_IN_THE_TOP_RIGHT_PART = "Song Cave, bulb in the top right part"
+    SONG_CAVE_BULB_IN_THE_BIG_ANEMONE_ROOM = "Song Cave, bulb in the big anemone room"
+    SONG_CAVE_BULB_IN_THE_PATH_TO_THE_SINGING_STATUES = "Song Cave, bulb in the path to the singing statues"
+    SONG_CAVE_BULB_UNDER_THE_ROCK_IN_THE_PATH_TO_THE_SINGING_STATUES = \
+        "Song Cave, bulb under the rock in the path to the singing statues"
+    SONG_CAVE_BULB_UNDER_THE_ROCK_CLOSE_TO_THE_SONG_DOOR = "Song Cave, bulb under the rock close to the song door"
+    SONG_CAVE_VERSE_EGG = "Song Cave, Verse Egg"
+    SONG_CAVE_JELLY_BEACON = "Song Cave, Jelly Beacon"
+    SONG_CAVE_ANEMONE_SEED = "Song Cave, Anemone Seed"
+    ENERGY_TEMPLE_FIRST_AREA_BEATING_THE_ENERGY_STATUE = "Energy Temple first area, beating the Energy Statue"
+    ENERGY_TEMPLE_FIRST_AREA_BULB_IN_THE_BOTTOM_ROOM_BLOCKED_BY_A_ROCK =\
+        "Energy Temple first area, bulb in the bottom room blocked by a rock"
+    ENERGY_TEMPLE_ENERGY_IDOL = "Energy Temple, Energy Idol"
+    ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK = "Energy Temple second area, bulb under the rock"
+    ENERGY_TEMPLE_BOTTOM_ENTRANCE_KROTITE_ARMOR = "Energy Temple bottom entrance, Krotite Armor"
+    ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH = "Energy Temple third area, bulb in the bottom path"
+    ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH = "Energy Temple boss area, Fallen God Tooth"
+    ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG = "Energy Temple blaster room, Blaster Egg"
+    OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH = \
+        "Open Waters top left area, bulb under the rock in the right path"
+    OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH = \
+        "Open Waters top left area, bulb under the rock in the left path"
+    OPEN_WATERS_TOP_LEFT_AREA_BULB_TO_THE_RIGHT_OF_THE_SAVE_CRYSTAL = \
+        "Open Waters top left area, bulb to the right of the save crystal"
+    OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_SMALL_PATH_BEFORE_MITHALAS = \
+        "Open Waters top right area, bulb in the small path before Mithalas"
+    OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_PATH_FROM_THE_LEFT_ENTRANCE = \
+        "Open Waters top right area, bulb in the path from the left entrance"
+    OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_CLEARING_CLOSE_TO_THE_BOTTOM_EXIT = \
+        "Open Waters top right area, bulb in the clearing close to the bottom exit"
+    OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_BIG_CLEARING_CLOSE_TO_THE_SAVE_CRYSTAL = \
+        "Open Waters top right area, bulb in the big clearing close to the save crystal"
+    OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_BIG_CLEARING_TO_THE_TOP_EXIT = \
+        "Open Waters top right area, bulb in the big clearing to the top exit"
+    OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_TURTLE_ROOM = "Open Waters top right area, bulb in the turtle room"
+    OPEN_WATERS_TOP_RIGHT_AREA_TRANSTURTLE = "Open Waters top right area, Transturtle"
+    OPEN_WATERS_TOP_RIGHT_AREA_FIRST_URN_IN_THE_MITHALAS_EXIT = \
+        "Open Waters top right area, first urn in the Mithalas exit"
+    OPEN_WATERS_TOP_RIGHT_AREA_SECOND_URN_IN_THE_MITHALAS_EXIT = \
+        "Open Waters top right area, second urn in the Mithalas exit"
+    OPEN_WATERS_TOP_RIGHT_AREA_THIRD_URN_IN_THE_MITHALAS_EXIT = \
+        "Open Waters top right area, third urn in the Mithalas exit"
+    OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_BEHIND_THE_CHOMPER_FISH = \
+        "Open Waters bottom left area, bulb behind the chomper fish"
+    OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_INSIDE_THE_LOWEST_FISH_PASS = \
+        "Open Waters bottom left area, bulb inside the lowest fish pass"
+    OPEN_WATERS_SKELETON_PATH_BULB_CLOSE_TO_THE_RIGHT_EXIT = "Open Waters skeleton path, bulb close to the right exit"
+    OPEN_WATERS_SKELETON_PATH_BULB_BEHIND_THE_CHOMPER_FISH = "Open Waters skeleton path, bulb behind the chomper fish"
+    OPEN_WATERS_SKELETON_PATH_KING_SKULL = "Open Waters skeleton path, King Skull"
+    ARNASSI_RUINS_BULB_IN_THE_RIGHT_PART = "Arnassi Ruins, bulb in the right part"
+    ARNASSI_RUINS_BULB_IN_THE_LEFT_PART = "Arnassi Ruins, bulb in the left part"
+    ARNASSI_RUINS_BULB_IN_THE_CENTER_PART = "Arnassi Ruins, bulb in the center part"
+    ARNASSI_RUINS_SONG_PLANT_SPORE = "Arnassi Ruins, Song Plant Spore"
+    ARNASSI_RUINS_ARNASSI_ARMOR = "Arnassi Ruins, Arnassi Armor"
+    ARNASSI_RUINS_ARNASSI_STATUE = "Arnassi Ruins, Arnassi Statue"
+    ARNASSI_RUINS_TRANSTURTLE = "Arnassi Ruins, Transturtle"
+    ARNASSI_RUINS_CRAB_ARMOR = "Arnassi Ruins, Crab Armor"
+    SIMON_SAYS_AREA_BEATING_SIMON_SAYS = "Simon Says area, beating Simon Says"
+    SIMON_SAYS_AREA_TRANSTURTLE = "Simon Says area, Transturtle"
+    MITHALAS_CITY_FIRST_BULB_IN_THE_LEFT_CITY_PART = "Mithalas City, first bulb in the left city part"
+    MITHALAS_CITY_SECOND_BULB_IN_THE_LEFT_CITY_PART = "Mithalas City, second bulb in the left city part"
+    MITHALAS_CITY_BULB_IN_THE_RIGHT_PART = "Mithalas City, bulb in the right part"
+    MITHALAS_CITY_BULB_AT_THE_TOP_OF_THE_CITY = "Mithalas City, bulb at the top of the city"
+    MITHALAS_CITY_FIRST_BULB_IN_A_BROKEN_HOME = "Mithalas City, first bulb in a broken home"
+    MITHALAS_CITY_SECOND_BULB_IN_A_BROKEN_HOME = "Mithalas City, second bulb in a broken home"
+    MITHALAS_CITY_BULB_IN_THE_BOTTOM_LEFT_PART = "Mithalas City, bulb in the bottom left part"
+    MITHALAS_CITY_FIRST_BULB_IN_ONE_OF_THE_HOMES = "Mithalas City, first bulb in one of the homes"
+    MITHALAS_CITY_SECOND_BULB_IN_ONE_OF_THE_HOMES = "Mithalas City, second bulb in one of the homes"
+    MITHALAS_CITY_FIRST_URN_IN_ONE_OF_THE_HOMES = "Mithalas City, first urn in one of the homes"
+    MITHALAS_CITY_SECOND_URN_IN_ONE_OF_THE_HOMES = "Mithalas City, second urn in one of the homes"
+    MITHALAS_CITY_FIRST_URN_IN_THE_CITY_RESERVE = "Mithalas City, first urn in the city reserve"
+    MITHALAS_CITY_SECOND_URN_IN_THE_CITY_RESERVE = "Mithalas City, second urn in the city reserve"
+    MITHALAS_CITY_THIRD_URN_IN_THE_CITY_RESERVE = "Mithalas City, third urn in the city reserve"
+    MITHALAS_CITY_FIRST_BULB_AT_THE_END_OF_THE_TOP_PATH = "Mithalas City, first bulb at the end of the top path"
+    MITHALAS_CITY_SECOND_BULB_AT_THE_END_OF_THE_TOP_PATH = "Mithalas City, second bulb at the end of the top path"
+    MITHALAS_CITY_BULB_IN_THE_TOP_PATH = "Mithalas City, bulb in the top path"
+    MITHALAS_CITY_MITHALAS_POT = "Mithalas City, Mithalas Pot"
+    MITHALAS_CITY_URN_IN_THE_CASTLE_FLOWER_TUBE_ENTRANCE = "Mithalas City, urn in the Castle flower tube entrance"
+    MITHALAS_CITY_DOLL = "Mithalas City, Doll"
+    MITHALAS_CITY_URN_INSIDE_A_HOME_FISH_PASS = "Mithalas City, urn inside a home fish pass"
+    MITHALAS_CITY_CASTLE_BULB_IN_THE_FLESH_HOLE = "Mithalas City Castle, bulb in the flesh hole"
+    MITHALAS_CITY_CASTLE_BLUE_BANNER = "Mithalas City Castle, Blue Banner"
+    MITHALAS_CITY_CASTLE_URN_IN_THE_BEDROOM = "Mithalas City Castle, urn in the bedroom"
+    MITHALAS_CITY_CASTLE_FIRST_URN_OF_THE_SINGLE_LAMP_PATH = "Mithalas City Castle, first urn of the single lamp path"
+    MITHALAS_CITY_CASTLE_SECOND_URN_OF_THE_SINGLE_LAMP_PATH = "Mithalas City Castle, second urn of the single lamp path"
+    MITHALAS_CITY_CASTLE_URN_IN_THE_BOTTOM_ROOM = "Mithalas City Castle, urn in the bottom room"
+    MITHALAS_CITY_CASTLE_FIRST_URN_ON_THE_ENTRANCE_PATH = "Mithalas City Castle, first urn on the entrance path"
+    MITHALAS_CITY_CASTLE_SECOND_URN_ON_THE_ENTRANCE_PATH = "Mithalas City Castle, second urn on the entrance path"
+    MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS = "Mithalas City Castle, beating the Priests"
+    MITHALAS_CITY_CASTLE_TRIDENT_HEAD = "Mithalas City Castle, Trident Head"
+    MITHALAS_CATHEDRAL_BULB_IN_THE_FLESH_ROOM_WITH_FLEAS = "Mithalas Cathedral, bulb in the flesh room with fleas"
+    MITHALAS_CATHEDRAL_MITHALAN_DRESS = "Mithalas Cathedral, Mithalan Dress"
+    MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_TOP_RIGHT_ROOM = "Mithalas Cathedral, first urn in the top right room"
+    MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_TOP_RIGHT_ROOM = "Mithalas Cathedral, second urn in the top right room"
+    MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_TOP_RIGHT_ROOM = "Mithalas Cathedral, third urn in the top right room"
+    MITHALAS_CATHEDRAL_URN_BEHIND_THE_FLESH_VEIN = "Mithalas Cathedral, urn behind the flesh vein"
+    MITHALAS_CATHEDRAL_URN_IN_THE_TOP_LEFT_EYES_BOSS_ROOM = "Mithalas Cathedral, urn in the top left eyes boss room"
+    MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN =\
+        "Mithalas Cathedral, first urn in the path behind the flesh vein"
+    MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN =\
+        "Mithalas Cathedral, second urn in the path behind the flesh vein"
+    MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN =\
+        "Mithalas Cathedral, third urn in the path behind the flesh vein"
+    MITHALAS_CATHEDRAL_FOURTH_URN_IN_THE_TOP_RIGHT_ROOM = "Mithalas Cathedral, fourth urn in the top right room"
+    MITHALAS_CATHEDRAL_URN_BELOW_THE_LEFT_ENTRANCE = "Mithalas Cathedral, urn below the left entrance"
+    MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_BOTTOM_RIGHT_PATH = "Mithalas Cathedral, first urn in the bottom right path"
+    MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_BOTTOM_RIGHT_PATH = "Mithalas Cathedral, second urn in the bottom right path"
+    CATHEDRAL_UNDERGROUND_BULB_IN_THE_CENTER_PART = "Cathedral Underground, bulb in the center part"
+    CATHEDRAL_UNDERGROUND_FIRST_BULB_IN_THE_TOP_LEFT_PART = "Cathedral Underground, first bulb in the top left part"
+    CATHEDRAL_UNDERGROUND_SECOND_BULB_IN_THE_TOP_LEFT_PART = "Cathedral Underground, second bulb in the top left part"
+    CATHEDRAL_UNDERGROUND_THIRD_BULB_IN_THE_TOP_LEFT_PART = "Cathedral Underground, third bulb in the top left part"
+    CATHEDRAL_UNDERGROUND_BULB_CLOSE_TO_THE_SAVE_CRYSTAL = "Cathedral Underground, bulb close to the save crystal"
+    CATHEDRAL_UNDERGROUND_BULB_IN_THE_BOTTOM_RIGHT_PATH = "Cathedral Underground, bulb in the bottom right path"
+    MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD = "Mithalas boss area, beating Mithalan God"
+    KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_BOTTOM_LEFT_CLEARING =\
+        "Kelp Forest top left area, bulb in the bottom left clearing"
+    KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_PATH_DOWN_FROM_THE_TOP_LEFT_CLEARING =\
+        "Kelp Forest top left area, bulb in the path down from the top left clearing"
+    KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_TOP_LEFT_CLEARING = "Kelp Forest top left area, bulb in the top left clearing"
+    KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG = "Kelp Forest top left area, Jelly Egg"
+    KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG = "Kelp Forest top left area, bulb close to the Verse Egg"
+    KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG = "Kelp Forest top left area, Verse Egg"
+    KELP_FOREST_TOP_RIGHT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH =\
+        "Kelp Forest top right area, bulb under the rock in the right path"
+    KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_LEFT_OF_THE_CENTER_CLEARING =\
+        "Kelp Forest top right area, bulb at the left of the center clearing"
+    KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_BIG_ROOM =\
+        "Kelp Forest top right area, bulb in the left path's big room"
+    KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_SMALL_ROOM =\
+        "Kelp Forest top right area, bulb in the left path's small room"
+    KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_CENTER_CLEARING =\
+        "Kelp Forest top right area, bulb at the top of the center clearing"
+    KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL = "Kelp Forest top right area, Black Pearl"
+    KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_TOP_FISH_PASS = "Kelp Forest top right area, bulb in the top fish pass"
+    KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE = "Kelp Forest bottom left area, Transturtle"
+    KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS =\
+        "Kelp Forest bottom left area, bulb close to the spirit crystals"
+    KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY = "Kelp Forest bottom left area, Walker Baby"
+    KELP_FOREST_BOTTOM_LEFT_AREA_FISH_CAVE_PUZZLE = "Kelp Forest bottom left area, Fish Cave puzzle"
+    KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER = "Kelp Forest bottom right area, Odd Container"
+    KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD = "Kelp Forest boss area, beating Drunian God"
+    KELP_FOREST_BOSS_ROOM_BULB_AT_THE_BOTTOM_OF_THE_AREA = "Kelp Forest boss room, bulb at the bottom of the area"
+    KELP_FOREST_SPRITE_CAVE_BULB_INSIDE_THE_FISH_PASS = "Kelp Forest sprite cave, bulb inside the fish pass"
+    KELP_FOREST_SPRITE_CAVE_BULB_IN_THE_SECOND_ROOM = "Kelp Forest sprite cave, bulb in the second room"
+    KELP_FOREST_SPRITE_CAVE_SEED_BAG = "Kelp Forest sprite cave, Seed Bag"
+    MERMOG_CAVE_BULB_IN_THE_LEFT_PART_OF_THE_CAVE = "Mermog cave, bulb in the left part of the cave"
+    MERMOG_CAVE_PIRANHA_EGG = "Mermog cave, Piranha Egg"
+    THE_VEIL_TOP_LEFT_AREA_IN_LI_S_CAVE = "The Veil top left area, In Li's cave"
+    THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH =\
+        "The Veil top left area, bulb under the rock in the top right path"
+    THE_VEIL_TOP_LEFT_AREA_BULB_HIDDEN_BEHIND_THE_BLOCKING_ROCK =\
+        "The Veil top left area, bulb hidden behind the blocking rock"
+    THE_VEIL_TOP_LEFT_AREA_TRANSTURTLE = "The Veil top left area, Transturtle"
+    THE_VEIL_TOP_LEFT_AREA_BULB_INSIDE_THE_FISH_PASS = "The Veil top left area, bulb inside the fish pass"
+    TURTLE_CAVE_TURTLE_EGG = "Turtle cave, Turtle Egg"
+    TURTLE_CAVE_BULB_IN_BUBBLE_CLIFF = "Turtle cave, bulb in Bubble Cliff"
+    TURTLE_CAVE_URCHIN_COSTUME = "Turtle cave, Urchin Costume"
+    THE_VEIL_TOP_RIGHT_AREA_BULB_IN_THE_MIDDLE_OF_THE_WALL_JUMP_CLIFF = \
+        "The Veil top right area, bulb in the middle of the wall jump cliff"
+    THE_VEIL_TOP_RIGHT_AREA_GOLDEN_STARFISH = "The Veil top right area, Golden Starfish"
+    THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL = \
+        "The Veil top right area, bulb at the top of the waterfall"
+    THE_VEIL_TOP_RIGHT_AREA_TRANSTURTLE = "The Veil top right area, Transturtle"
+    THE_VEIL_BOTTOM_AREA_BULB_IN_THE_LEFT_PATH = "The Veil bottom area, bulb in the left path"
+    THE_VEIL_BOTTOM_AREA_BULB_IN_THE_SPIRIT_PATH = "The Veil bottom area, bulb in the spirit path"
+    THE_VEIL_BOTTOM_AREA_VERSE_EGG = "The Veil bottom area, Verse Egg"
+    THE_VEIL_BOTTOM_AREA_STONE_HEAD = "The Veil bottom area, Stone Head"
+    OCTOPUS_CAVE_DUMBO_EGG = "Octopus Cave, Dumbo Egg"
+    OCTOPUS_CAVE_BULB_IN_THE_PATH_BELOW_THE_OCTOPUS_CAVE_PATH =\
+        "Octopus Cave, bulb in the path below the Octopus Cave path"
+    SUN_TEMPLE_BULB_IN_THE_TOP_LEFT_PART = "Sun Temple, bulb in the top left part"
+    SUN_TEMPLE_BULB_IN_THE_TOP_RIGHT_PART = "Sun Temple, bulb in the top right part"
+    SUN_TEMPLE_BULB_AT_THE_TOP_OF_THE_HIGH_DARK_ROOM = "Sun Temple, bulb at the top of the high dark room"
+    SUN_TEMPLE_GOLDEN_GEAR = "Sun Temple, Golden Gear"
+    SUN_TEMPLE_FIRST_BULB_OF_THE_TEMPLE = "Sun Temple, first bulb of the temple"
+    SUN_TEMPLE_BULB_ON_THE_RIGHT_PART = "Sun Temple, bulb on the right part"
+    SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART = "Sun Temple, bulb in the hidden room of the right part"
+    SUN_TEMPLE_SUN_KEY = "Sun Temple, Sun Key"
+    SUN_TEMPLE_BOSS_PATH_FIRST_PATH_BULB = "Sun Temple boss path, first path bulb"
+    SUN_TEMPLE_BOSS_PATH_SECOND_PATH_BULB = "Sun Temple boss path, second path bulb"
+    SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB = "Sun Temple boss path, first cliff bulb"
+    SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB = "Sun Temple boss path, second cliff bulb"
+    SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD = "Sun Temple boss area, beating Lumerean God"
+    ABYSS_LEFT_AREA_BULB_IN_HIDDEN_PATH_ROOM = "Abyss left area, bulb in hidden path room"
+    ABYSS_LEFT_AREA_BULB_IN_THE_RIGHT_PART = "Abyss left area, bulb in the right part"
+    ABYSS_LEFT_AREA_GLOWING_SEED = "Abyss left area, Glowing Seed"
+    ABYSS_LEFT_AREA_GLOWING_PLANT = "Abyss left area, Glowing Plant"
+    ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS = "Abyss left area, bulb in the bottom fish pass"
+    ABYSS_RIGHT_AREA_BULB_IN_THE_MIDDLE_PATH = "Abyss right area, bulb in the middle path"
+    ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_MIDDLE_PATH =\
+        "Abyss right area, bulb behind the rock in the middle path"
+    ABYSS_RIGHT_AREA_BULB_IN_THE_LEFT_GREEN_ROOM = "Abyss right area, bulb in the left green room"
+    ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM = "Abyss right area, bulb behind the rock in the whale room"
+    ABYSS_RIGHT_AREA_TRANSTURTLE = "Abyss right area, Transturtle"
+    ICE_CAVERN_BULB_IN_THE_ROOM_TO_THE_RIGHT = "Ice Cavern, bulb in the room to the right"
+    ICE_CAVERN_FIRST_BULB_IN_THE_TOP_EXIT_ROOM = "Ice Cavern, first bulb in the top exit room"
+    ICE_CAVERN_SECOND_BULB_IN_THE_TOP_EXIT_ROOM = "Ice Cavern, second bulb in the top exit room"
+    ICE_CAVERN_THIRD_BULB_IN_THE_TOP_EXIT_ROOM = "Ice Cavern, third bulb in the top exit room"
+    ICE_CAVERN_BULB_IN_THE_LEFT_ROOM = "Ice Cavern, bulb in the left room"
+    BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL = "Bubble Cave, bulb in the left cave wall"
+    BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL =\
+        "Bubble Cave, bulb in the right cave wall (behind the ice crystal)"
+    BUBBLE_CAVE_VERSE_EGG = "Bubble Cave, Verse Egg"
+    KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY =\
+        "King Jellyfish Cave, bulb in the right path from King Jelly"
+    KING_JELLYFISH_CAVE_JELLYFISH_COSTUME = "King Jellyfish Cave, Jellyfish Costume"
+    THE_WHALE_VERSE_EGG = "The Whale, Verse Egg"
+    SUNKEN_CITY_RIGHT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL = "Sunken City right area, crate close to the save crystal"
+    SUNKEN_CITY_RIGHT_AREA_CRATE_IN_THE_LEFT_BOTTOM_ROOM = "Sunken City right area, crate in the left bottom room"
+    SUNKEN_CITY_LEFT_AREA_CRATE_IN_THE_LITTLE_PIPE_ROOM = "Sunken City left area, crate in the little pipe room"
+    SUNKEN_CITY_LEFT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL = "Sunken City left area, crate close to the save crystal"
+    SUNKEN_CITY_LEFT_AREA_CRATE_BEFORE_THE_BEDROOM = "Sunken City left area, crate before the bedroom"
+    SUNKEN_CITY_LEFT_AREA_GIRL_COSTUME = "Sunken City left area, Girl Costume"
+    SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA = "Sunken City, bulb on top of the boss area"
+    THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE = "The Body center area, breaking Li's cage"
+    THE_BODY_CENTER_AREA_BULB_ON_THE_MAIN_PATH_BLOCKING_TUBE = \
+        "The Body center area, bulb on the main path blocking tube"
+    THE_BODY_LEFT_AREA_FIRST_BULB_IN_THE_TOP_FACE_ROOM = "The Body left area, first bulb in the top face room"
+    THE_BODY_LEFT_AREA_SECOND_BULB_IN_THE_TOP_FACE_ROOM = "The Body left area, second bulb in the top face room"
+    THE_BODY_LEFT_AREA_BULB_BELOW_THE_WATER_STREAM = "The Body left area, bulb below the water stream"
+    THE_BODY_LEFT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_TOP_FACE_ROOM = \
+        "The Body left area, bulb in the top path to the top face room"
+    THE_BODY_LEFT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM = "The Body left area, bulb in the bottom face room"
+    THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_FACE_ROOM = "The Body right area, bulb in the top face room"
+    THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_BOTTOM_FACE_ROOM = \
+        "The Body right area, bulb in the top path to the bottom face room"
+    THE_BODY_RIGHT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM = "The Body right area, bulb in the bottom face room"
+    THE_BODY_BOTTOM_AREA_BULB_IN_THE_JELLY_ZAP_ROOM = "The Body bottom area, bulb in the Jelly Zap room"
+    THE_BODY_BOTTOM_AREA_BULB_IN_THE_NAUTILUS_ROOM = "The Body bottom area, bulb in the nautilus room"
+    THE_BODY_BOTTOM_AREA_MUTANT_COSTUME = "The Body bottom area, Mutant Costume"
+    FINAL_BOSS_AREA_FIRST_BULB_IN_THE_TURTLE_ROOM = "Final Boss area, first bulb in the turtle room"
+    FINAL_BOSS_AREA_SECOND_BULB_IN_THE_TURTLE_ROOM = "Final Boss area, second bulb in the turtle room"
+    FINAL_BOSS_AREA_THIRD_BULB_IN_THE_TURTLE_ROOM = "Final Boss area, third bulb in the turtle room"
+    FINAL_BOSS_AREA_TRANSTURTLE = "Final Boss area, Transturtle"
+    FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM = "Final Boss area, bulb in the boss third form room"
+    BEATING_FALLEN_GOD = "Beating Fallen God"
+    BEATING_MITHALAN_GOD = "Beating Mithalan God"
+    BEATING_DRUNIAN_GOD = "Beating Drunian God"
+    BEATING_LUMEREAN_GOD = "Beating Lumerean God"
+    BEATING_THE_GOLEM = "Beating the Golem"
+    BEATING_NAUTILUS_PRIME = "Beating Nautilus Prime"
+    BEATING_BLASTER_PEG_PRIME = "Beating Blaster Peg Prime"
+    BEATING_MERGOG = "Beating Mergog"
+    BEATING_MITHALAN_PRIESTS = "Beating Mithalan priests"
+    BEATING_OCTOPUS_PRIME = "Beating Octopus Prime"
+    BEATING_CRABBIUS_MAXIMUS = "Beating Crabbius Maximus"
+    BEATING_MANTIS_SHRIMP_PRIME = "Beating Mantis Shrimp Prime"
+    BEATING_KING_JELLYFISH_GOD_PRIME = "Beating King Jellyfish God Prime"
+    FIRST_SECRET = "First Secret"
+    SECOND_SECRET = "Second Secret"
+    THIRD_SECRET = "Third Secret"
+    SUNKEN_CITY_CLEARED = "Sunken City cleared"
+    SUN_CRYSTAL = "Sun Crystal"
+    OBJECTIVE_COMPLETE = "Objective complete"
 
+
+class AquariaLocations:
     locations_verse_cave_r = {
-        "Verse Cave, bulb in the skeleton room": 698107,
-        "Verse Cave, bulb in the path right of the skeleton room": 698108,
-        "Verse Cave right area, Big Seed": 698175,
+        AquariaLocationNames.VERSE_CAVE_RIGHT_AREA_BULB_IN_THE_SKELETON_ROOM: 698107,
+        AquariaLocationNames.VERSE_CAVE_RIGHT_AREA_BULB_IN_THE_PATH_RIGHT_OF_THE_SKELETON_ROOM: 698108,
+        AquariaLocationNames.VERSE_CAVE_RIGHT_AREA_BIG_SEED: 698175,
     }
 
     locations_verse_cave_l = {
-        "Verse Cave, the Naija hint about the shield ability": 698200,
-        "Verse Cave left area, bulb in the center part": 698021,
-        "Verse Cave left area, bulb in the right part": 698022,
-        "Verse Cave left area, bulb under the rock at the end of the path": 698023,
+        AquariaLocationNames.VERSE_CAVE_LEFT_AREA_THE_NAIJA_HINT_ABOUT_THE_SHIELD_ABILITY: 698200,
+        AquariaLocationNames.VERSE_CAVE_LEFT_AREA_BULB_IN_THE_CENTER_PART: 698021,
+        AquariaLocationNames.VERSE_CAVE_LEFT_AREA_BULB_IN_THE_RIGHT_PART: 698022,
+        AquariaLocationNames.VERSE_CAVE_LEFT_AREA_BULB_UNDER_THE_ROCK_AT_THE_END_OF_THE_PATH: 698023,
     }
 
     locations_home_water = {
-        "Home Water, bulb below the grouper fish": 698058,
-        "Home Water, bulb in the path below Nautilus Prime": 698059,
-        "Home Water, bulb in the little room above the grouper fish": 698060,
-        "Home Water, bulb in the end of the path close to the Verse Cave": 698061,
-        "Home Water, bulb in the top left path": 698062,
-        "Home Water, bulb in the bottom left room": 698063,
-        "Home Water, bulb close to Naija's Home": 698064,
-        "Home Water, bulb under the rock in the left path from the Verse Cave": 698065,
+        AquariaLocationNames.HOME_WATERS_BULB_BELOW_THE_GROUPER_FISH: 698058,
+        AquariaLocationNames.HOME_WATERS_BULB_IN_THE_LITTLE_ROOM_ABOVE_THE_GROUPER_FISH: 698060,
+        AquariaLocationNames.HOME_WATERS_BULB_IN_THE_END_OF_THE_PATH_CLOSE_TO_THE_VERSE_CAVE: 698061,
+        AquariaLocationNames.HOME_WATERS_BULB_IN_THE_TOP_LEFT_PATH: 698062,
+        AquariaLocationNames.HOME_WATERS_BULB_CLOSE_TO_NAIJA_S_HOME: 698064,
+        AquariaLocationNames.HOME_WATERS_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH_FROM_THE_VERSE_CAVE: 698065,
+    }
+
+    locations_home_water_behind_rocks = {
+        AquariaLocationNames.HOME_WATERS_BULB_IN_THE_PATH_BELOW_NAUTILUS_PRIME: 698059,
+        AquariaLocationNames.HOME_WATERS_BULB_IN_THE_BOTTOM_LEFT_ROOM: 698063,
     }
 
     locations_home_water_nautilus = {
-        "Home Water, Nautilus Egg": 698194,
+        AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG: 698194,
     }
 
     locations_home_water_transturtle = {
-        "Home Water, Transturtle": 698213,
+        AquariaLocationNames.HOME_WATERS_TRANSTURTLE: 698213,
     }
 
     locations_naija_home = {
-        "Naija's Home, bulb after the energy door": 698119,
-        "Naija's Home, bulb under the rock at the right of the main path": 698120,
+        AquariaLocationNames.NAIJA_S_HOME_BULB_AFTER_THE_ENERGY_DOOR: 698119,
+        AquariaLocationNames.NAIJA_S_HOME_BULB_UNDER_THE_ROCK_AT_THE_RIGHT_OF_THE_MAIN_PATH: 698120,
     }
 
     locations_song_cave = {
-        "Song Cave, Erulian spirit": 698206,
-        "Song Cave, bulb in the top right part": 698071,
-        "Song Cave, bulb in the big anemone room": 698072,
-        "Song Cave, bulb in the path to the singing statues": 698073,
-        "Song Cave, bulb under the rock in the path to the singing statues": 698074,
-        "Song Cave, bulb under the rock close to the song door": 698075,
-        "Song Cave, Verse Egg": 698160,
-        "Song Cave, Jelly Beacon": 698178,
-        "Song Cave, Anemone Seed": 698162,
+        AquariaLocationNames.SONG_CAVE_ERULIAN_SPIRIT: 698206,
+        AquariaLocationNames.SONG_CAVE_BULB_IN_THE_TOP_RIGHT_PART: 698071,
+        AquariaLocationNames.SONG_CAVE_BULB_IN_THE_BIG_ANEMONE_ROOM: 698072,
+        AquariaLocationNames.SONG_CAVE_BULB_IN_THE_PATH_TO_THE_SINGING_STATUES: 698073,
+        AquariaLocationNames.SONG_CAVE_BULB_UNDER_THE_ROCK_IN_THE_PATH_TO_THE_SINGING_STATUES: 698074,
+        AquariaLocationNames.SONG_CAVE_BULB_UNDER_THE_ROCK_CLOSE_TO_THE_SONG_DOOR: 698075,
+        AquariaLocationNames.SONG_CAVE_VERSE_EGG: 698160,
+        AquariaLocationNames.SONG_CAVE_JELLY_BEACON: 698178,
+        AquariaLocationNames.SONG_CAVE_ANEMONE_SEED: 698162,
     }
 
     locations_energy_temple_1 = {
-        "Energy Temple first area, beating the Energy Statue": 698205,
-        "Energy Temple first area, bulb in the bottom room blocked by a rock": 698027,
+        AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BEATING_THE_ENERGY_STATUE: 698205,
+        AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BULB_IN_THE_BOTTOM_ROOM_BLOCKED_BY_A_ROCK: 698027,
     }
 
     locations_energy_temple_idol = {
-        "Energy Temple first area, Energy Idol": 698170,
+        AquariaLocationNames.ENERGY_TEMPLE_ENERGY_IDOL: 698170,
     }
 
     locations_energy_temple_2 = {
-        "Energy Temple second area, bulb under the rock": 698028,
+        AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK: 698028,
+        # This can be accessible via locations_energy_temple_altar too
     }
 
     locations_energy_temple_altar = {
-        "Energy Temple bottom entrance, Krotite Armor": 698163,
+        AquariaLocationNames.ENERGY_TEMPLE_BOTTOM_ENTRANCE_KROTITE_ARMOR: 698163,
     }
 
     locations_energy_temple_3 = {
-        "Energy Temple third area, bulb in the bottom path": 698029,
+        AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH: 698029,
     }
 
     locations_energy_temple_boss = {
-        "Energy Temple boss area, Fallen God Tooth": 698169,
+        AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH: 698169,
     }
 
     locations_energy_temple_blaster_room = {
-        "Energy Temple blaster room, Blaster Egg": 698195,
+        AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG: 698195,
     }
 
     locations_openwater_tl = {
-        "Open Water top left area, bulb under the rock in the right path": 698001,
-        "Open Water top left area, bulb under the rock in the left path": 698002,
-        "Open Water top left area, bulb to the right of the save crystal": 698003,
+        AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH: 698001,
+        AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH: 698002,
+        AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_TO_THE_RIGHT_OF_THE_SAVE_CRYSTAL: 698003,
     }
 
     locations_openwater_tr = {
-        "Open Water top right area, bulb in the small path before Mithalas": 698004,
-        "Open Water top right area, bulb in the path from the left entrance": 698005,
-        "Open Water top right area, bulb in the clearing close to the bottom exit": 698006,
-        "Open Water top right area, bulb in the big clearing close to the save crystal": 698007,
-        "Open Water top right area, bulb in the big clearing to the top exit": 698008,
-        "Open Water top right area, first urn in the Mithalas exit": 698148,
-        "Open Water top right area, second urn in the Mithalas exit": 698149,
-        "Open Water top right area, third urn in the Mithalas exit": 698150,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_SMALL_PATH_BEFORE_MITHALAS: 698004,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_PATH_FROM_THE_LEFT_ENTRANCE: 698005,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_CLEARING_CLOSE_TO_THE_BOTTOM_EXIT: 698006,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_BIG_CLEARING_CLOSE_TO_THE_SAVE_CRYSTAL: 698007,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_BIG_CLEARING_TO_THE_TOP_EXIT: 698008,
     }
 
     locations_openwater_tr_turtle = {
-        "Open Water top right area, bulb in the turtle room": 698009,
-        "Open Water top right area, Transturtle": 698211,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_TURTLE_ROOM: 698009,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_TRANSTURTLE: 698211,
+    }
+
+    locations_openwater_tr_urns = {
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_FIRST_URN_IN_THE_MITHALAS_EXIT: 698148,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_SECOND_URN_IN_THE_MITHALAS_EXIT: 698149,
+        AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_THIRD_URN_IN_THE_MITHALAS_EXIT: 698150,
     }
 
     locations_openwater_bl = {
-        "Open Water bottom left area, bulb behind the chomper fish": 698011,
-        "Open Water bottom left area, bulb inside the lowest fish pass": 698010,
+        AquariaLocationNames.OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_BEHIND_THE_CHOMPER_FISH: 698011,
+        AquariaLocationNames.OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_INSIDE_THE_LOWEST_FISH_PASS: 698010,
     }
 
     locations_skeleton_path = {
-        "Open Water skeleton path, bulb close to the right exit": 698012,
-        "Open Water skeleton path, bulb behind the chomper fish": 698013,
+        AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_BULB_CLOSE_TO_THE_RIGHT_EXIT: 698012,
+        AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_BULB_BEHIND_THE_CHOMPER_FISH: 698013,
     }
 
     locations_skeleton_path_sc = {
-        "Open Water skeleton path, King Skull": 698177,
+        AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_KING_SKULL: 698177,
     }
 
     locations_arnassi = {
-        "Arnassi Ruins, bulb in the right part": 698014,
-        "Arnassi Ruins, bulb in the left part": 698015,
-        "Arnassi Ruins, bulb in the center part": 698016,
-        "Arnassi Ruins, Song Plant Spore": 698179,
-        "Arnassi Ruins, Arnassi Armor": 698191,
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_RIGHT_PART: 698014,
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_LEFT_PART: 698015,
+        AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_CENTER_PART: 698016,
+        AquariaLocationNames.ARNASSI_RUINS_SONG_PLANT_SPORE: 698179,
+        AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR: 698191,
     }
 
-    locations_arnassi_path = {
-        "Arnassi Ruins, Arnassi Statue": 698164,
+    locations_arnassi_cave = {
+        AquariaLocationNames.ARNASSI_RUINS_ARNASSI_STATUE: 698164,
     }
 
     locations_arnassi_cave_transturtle = {
-        "Arnassi Ruins, Transturtle": 698217,
+        AquariaLocationNames.ARNASSI_RUINS_TRANSTURTLE: 698217,
     }
 
     locations_arnassi_crab_boss = {
-        "Arnassi Ruins, Crab Armor": 698187,
+        AquariaLocationNames.ARNASSI_RUINS_CRAB_ARMOR: 698187,
     }
 
     locations_simon = {
-        "Simon Says area, beating Simon Says": 698156,
-        "Simon Says area, Transturtle": 698216,
+        AquariaLocationNames.SIMON_SAYS_AREA_BEATING_SIMON_SAYS: 698156,
+        AquariaLocationNames.SIMON_SAYS_AREA_TRANSTURTLE: 698216,
     }
 
     locations_mithalas_city = {
-        "Mithalas City, first bulb in the left city part": 698030,
-        "Mithalas City, second bulb in the left city part": 698035,
-        "Mithalas City, bulb in the right part": 698031,
-        "Mithalas City, bulb at the top of the city": 698033,
-        "Mithalas City, first bulb in a broken home": 698034,
-        "Mithalas City, second bulb in a broken home": 698041,
-        "Mithalas City, bulb in the bottom left part": 698037,
-        "Mithalas City, first bulb in one of the homes": 698038,
-        "Mithalas City, second bulb in one of the homes": 698039,
-        "Mithalas City, first urn in one of the homes": 698123,
-        "Mithalas City, second urn in one of the homes": 698124,
-        "Mithalas City, first urn in the city reserve": 698125,
-        "Mithalas City, second urn in the city reserve": 698126,
-        "Mithalas City, third urn in the city reserve": 698127,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_THE_LEFT_CITY_PART: 698030,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_THE_LEFT_CITY_PART: 698035,
+        AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_RIGHT_PART: 698031,
+        AquariaLocationNames.MITHALAS_CITY_BULB_AT_THE_TOP_OF_THE_CITY: 698033,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_A_BROKEN_HOME: 698034,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_A_BROKEN_HOME: 698041,
+        AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_BOTTOM_LEFT_PART: 698037,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_ONE_OF_THE_HOMES: 698038,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_ONE_OF_THE_HOMES: 698039,
+    }
+
+    locations_mithalas_city_urns = {
+        AquariaLocationNames.MITHALAS_CITY_FIRST_URN_IN_ONE_OF_THE_HOMES: 698123,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_URN_IN_ONE_OF_THE_HOMES: 698124,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_URN_IN_THE_CITY_RESERVE: 698125,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_URN_IN_THE_CITY_RESERVE: 698126,
+        AquariaLocationNames.MITHALAS_CITY_THIRD_URN_IN_THE_CITY_RESERVE: 698127,
     }
 
     locations_mithalas_city_top_path = {
-        "Mithalas City, first bulb at the end of the top path": 698032,
-        "Mithalas City, second bulb at the end of the top path": 698040,
-        "Mithalas City, bulb in the top path": 698036,
-        "Mithalas City, Mithalas Pot": 698174,
-        "Mithalas City, urn in the Castle flower tube entrance": 698128,
+        AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_AT_THE_END_OF_THE_TOP_PATH: 698032,
+        AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_AT_THE_END_OF_THE_TOP_PATH: 698040,
+        AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_TOP_PATH: 698036,
+        AquariaLocationNames.MITHALAS_CITY_MITHALAS_POT: 698174,
+        AquariaLocationNames.MITHALAS_CITY_URN_IN_THE_CASTLE_FLOWER_TUBE_ENTRANCE: 698128,
     }
 
     locations_mithalas_city_fishpass = {
-        "Mithalas City, Doll": 698173,
-        "Mithalas City, urn inside a home fish pass": 698129,
+        AquariaLocationNames.MITHALAS_CITY_DOLL: 698173,
+        AquariaLocationNames.MITHALAS_CITY_URN_INSIDE_A_HOME_FISH_PASS: 698129,
+    }
+
+    locations_mithalas_castle = {
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_BULB_IN_THE_FLESH_HOLE: 698042,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_BLUE_BANNER: 698165,
+    }
+
+    locations_mithalas_castle_urns = {
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_URN_IN_THE_BEDROOM: 698130,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_FIRST_URN_OF_THE_SINGLE_LAMP_PATH: 698131,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_SECOND_URN_OF_THE_SINGLE_LAMP_PATH: 698132,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_URN_IN_THE_BOTTOM_ROOM: 698133,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_FIRST_URN_ON_THE_ENTRANCE_PATH: 698134,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_SECOND_URN_ON_THE_ENTRANCE_PATH: 698135,
     }
 
-    locations_cathedral_l = {
-        "Mithalas City Castle, bulb in the flesh hole": 698042,
-        "Mithalas City Castle, Blue Banner": 698165,
-        "Mithalas City Castle, urn in the bedroom": 698130,
-        "Mithalas City Castle, first urn of the single lamp path": 698131,
-        "Mithalas City Castle, second urn of the single lamp path": 698132,
-        "Mithalas City Castle, urn in the bottom room": 698133,
-        "Mithalas City Castle, first urn on the entrance path": 698134,
-        "Mithalas City Castle, second urn on the entrance path": 698135,
+    locations_mithalas_castle_tube = {
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS: 698208,
     }
 
-    locations_cathedral_l_tube = {
-        "Mithalas City Castle, beating the Priests": 698208,
+    locations_mithalas_castle_sc = {
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_TRIDENT_HEAD: 698183,
     }
 
-    locations_cathedral_l_sc = {
-        "Mithalas City Castle, Trident Head": 698183,
+    locations_cathedral_top_start = {
+        AquariaLocationNames.MITHALAS_CATHEDRAL_BULB_IN_THE_FLESH_ROOM_WITH_FLEAS: 698139,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS: 698189,
     }
 
-    locations_cathedral_r = {
-        "Mithalas Cathedral, first urn in the top right room": 698136,
-        "Mithalas Cathedral, second urn in the top right room": 698137,
-        "Mithalas Cathedral, third urn in the top right room": 698138,
-        "Mithalas Cathedral, urn in the flesh room with fleas": 698139,
-        "Mithalas Cathedral, first urn in the bottom right path": 698140,
-        "Mithalas Cathedral, second urn in the bottom right path": 698141,
-        "Mithalas Cathedral, urn behind the flesh vein": 698142,
-        "Mithalas Cathedral, urn in the top left eyes boss room": 698143,
-        "Mithalas Cathedral, first urn in the path behind the flesh vein": 698144,
-        "Mithalas Cathedral, second urn in the path behind the flesh vein": 698145,
-        "Mithalas Cathedral, third urn in the path behind the flesh vein": 698146,
-        "Mithalas Cathedral, fourth urn in the top right room": 698147,
-        "Mithalas Cathedral, Mithalan Dress": 698189,
-        "Mithalas Cathedral, urn below the left entrance": 698198,
+    locations_cathedral_top_start_urns = {
+        AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_TOP_RIGHT_ROOM: 698136,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_TOP_RIGHT_ROOM: 698137,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_TOP_RIGHT_ROOM: 698138,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_URN_BEHIND_THE_FLESH_VEIN: 698142,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_URN_IN_THE_TOP_LEFT_EYES_BOSS_ROOM: 698143,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN: 698144,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN: 698145,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN: 698146,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_FOURTH_URN_IN_THE_TOP_RIGHT_ROOM: 698147,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_URN_BELOW_THE_LEFT_ENTRANCE: 698198,
+    }
+
+    locations_cathedral_top_end = {
+        AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_BOTTOM_RIGHT_PATH: 698140,
+        AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_BOTTOM_RIGHT_PATH: 698141,
     }
 
     locations_cathedral_underground = {
-        "Cathedral Underground, bulb in the center part": 698113,
-        "Cathedral Underground, first bulb in the top left part": 698114,
-        "Cathedral Underground, second bulb in the top left part": 698115,
-        "Cathedral Underground, third bulb in the top left part": 698116,
-        "Cathedral Underground, bulb close to the save crystal": 698117,
-        "Cathedral Underground, bulb in the bottom right path": 698118,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_IN_THE_CENTER_PART: 698113,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_FIRST_BULB_IN_THE_TOP_LEFT_PART: 698114,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_SECOND_BULB_IN_THE_TOP_LEFT_PART: 698115,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_THIRD_BULB_IN_THE_TOP_LEFT_PART: 698116,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_CLOSE_TO_THE_SAVE_CRYSTAL: 698117,
+        AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_IN_THE_BOTTOM_RIGHT_PATH: 698118,
     }
 
     locations_cathedral_boss = {
-        "Mithalas boss area, beating Mithalan God": 698202,
+        AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD: 698202,
     }
 
     locations_forest_tl = {
-        "Kelp Forest top left area, bulb in the bottom left clearing": 698044,
-        "Kelp Forest top left area, bulb in the path down from the top left clearing": 698045,
-        "Kelp Forest top left area, bulb in the top left clearing": 698046,
-        "Kelp Forest top left area, Jelly Egg": 698185,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_BOTTOM_LEFT_CLEARING: 698044,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_PATH_DOWN_FROM_THE_TOP_LEFT_CLEARING: 698045,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_TOP_LEFT_CLEARING: 698046,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG: 698185,
     }
 
-    locations_forest_tl_fp = {
-        "Kelp Forest top left area, bulb close to the Verse Egg": 698047,
-        "Kelp Forest top left area, Verse Egg": 698158,
+    locations_forest_tl_verse_egg_room = {
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG: 698047,
+        AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG: 698158,
     }
 
     locations_forest_tr = {
-        "Kelp Forest top right area, bulb under the rock in the right path": 698048,
-        "Kelp Forest top right area, bulb at the left of the center clearing": 698049,
-        "Kelp Forest top right area, bulb in the left path's big room": 698051,
-        "Kelp Forest top right area, bulb in the left path's small room": 698052,
-        "Kelp Forest top right area, bulb at the top of the center clearing": 698053,
-        "Kelp Forest top right area, Black Pearl": 698167,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH: 698048,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_LEFT_OF_THE_CENTER_CLEARING: 698049,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_BIG_ROOM: 698051,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_SMALL_ROOM: 698052,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_CENTER_CLEARING: 698053,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL: 698167,
     }
 
     locations_forest_tr_fp = {
-        "Kelp Forest top right area, bulb in the top fish pass": 698050,
+        AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_TOP_FISH_PASS: 698050,
     }
 
     locations_forest_bl = {
-        "Kelp Forest bottom left area, Transturtle": 698212,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE: 698212,
     }
 
     locations_forest_bl_sc = {
-        "Kelp Forest bottom left area, bulb close to the spirit crystals": 698054,
-        "Kelp Forest bottom left area, Walker Baby": 698186,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS: 698054,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY: 698186,
+    }
+
+    locations_forest_fish_cave = {
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_FISH_CAVE_PUZZLE: 698207,
     }
 
     locations_forest_br = {
-        "Kelp Forest bottom right area, Odd Container": 698168,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER: 698168,
     }
 
     locations_forest_boss = {
-        "Kelp Forest boss area, beating Drunian God": 698204,
+        AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD: 698204,
     }
 
     locations_forest_boss_entrance = {
-        "Kelp Forest boss room, bulb at the bottom of the area": 698055,
-    }
-
-    locations_forest_fish_cave = {
-        "Kelp Forest bottom left area, Fish Cave puzzle": 698207,
+        AquariaLocationNames.KELP_FOREST_BOSS_ROOM_BULB_AT_THE_BOTTOM_OF_THE_AREA: 698055,
     }
 
-    locations_forest_sprite_cave = {
-        "Kelp Forest sprite cave, bulb inside the fish pass": 698056,
+    locations_sprite_cave = {
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_INSIDE_THE_FISH_PASS: 698056,
     }
 
-    locations_forest_sprite_cave_tube = {
-        "Kelp Forest sprite cave, bulb in the second room": 698057,
-        "Kelp Forest sprite cave, Seed Bag": 698176,
+    locations_sprite_cave_tube = {
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_IN_THE_SECOND_ROOM: 698057,
+        AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_SEED_BAG: 698176,
     }
 
     locations_mermog_cave = {
-        "Mermog cave, bulb in the left part of the cave": 698121,
+        AquariaLocationNames.MERMOG_CAVE_BULB_IN_THE_LEFT_PART_OF_THE_CAVE: 698121,
     }
 
     locations_mermog_boss = {
-        "Mermog cave, Piranha Egg": 698197,
+        AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG: 698197,
     }
 
     locations_veil_tl = {
-        "The Veil top left area, In Li's cave": 698199,
-        "The Veil top left area, bulb under the rock in the top right path": 698078,
-        "The Veil top left area, bulb hidden behind the blocking rock": 698076,
-        "The Veil top left area, Transturtle": 698209,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_IN_LI_S_CAVE: 698199,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH: 698078,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_HIDDEN_BEHIND_THE_BLOCKING_ROCK: 698076,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_TRANSTURTLE: 698209,
     }
 
     locations_veil_tl_fp = {
-        "The Veil top left area, bulb inside the fish pass": 698077,
+        AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_INSIDE_THE_FISH_PASS: 698077,
     }
 
     locations_turtle_cave = {
-        "Turtle cave, Turtle Egg": 698184,
+        AquariaLocationNames.TURTLE_CAVE_TURTLE_EGG: 698184,
     }
 
     locations_turtle_cave_bubble = {
-        "Turtle cave, bulb in Bubble Cliff": 698000,
-        "Turtle cave, Urchin Costume": 698193,
+        AquariaLocationNames.TURTLE_CAVE_BULB_IN_BUBBLE_CLIFF: 698000,
+        AquariaLocationNames.TURTLE_CAVE_URCHIN_COSTUME: 698193,
     }
 
     locations_veil_tr_r = {
-        "The Veil top right area, bulb in the middle of the wall jump cliff": 698079,
-        "The Veil top right area, Golden Starfish": 698180,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_IN_THE_MIDDLE_OF_THE_WALL_JUMP_CLIFF: 698079,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_GOLDEN_STARFISH: 698180,
     }
 
     locations_veil_tr_l = {
-        "The Veil top right area, bulb at the top of the waterfall": 698080,
-        "The Veil top right area, Transturtle": 698210,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL: 698080,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_TRANSTURTLE: 698210,
     }
 
-    locations_veil_bl = {
-        "The Veil bottom area, bulb in the left path": 698082,
+    locations_veil_b = {
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_LEFT_PATH: 698082,
     }
 
     locations_veil_b_sc = {
-        "The Veil bottom area, bulb in the spirit path": 698081,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_SPIRIT_PATH: 698081,
     }
 
-    locations_veil_bl_fp = {
-        "The Veil bottom area, Verse Egg": 698157,
+    locations_veil_b_fp = {
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_VERSE_EGG: 698157,
     }
 
     locations_veil_br = {
-        "The Veil bottom area, Stone Head": 698181,
+        AquariaLocationNames.THE_VEIL_BOTTOM_AREA_STONE_HEAD: 698181,
     }
 
     locations_octo_cave_t = {
-        "Octopus Cave, Dumbo Egg": 698196,
+        AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG: 698196,
     }
 
     locations_octo_cave_b = {
-        "Octopus Cave, bulb in the path below the Octopus Cave path": 698122,
+        AquariaLocationNames.OCTOPUS_CAVE_BULB_IN_THE_PATH_BELOW_THE_OCTOPUS_CAVE_PATH: 698122,
     }
 
     locations_sun_temple_l = {
-        "Sun Temple, bulb in the top left part": 698094,
-        "Sun Temple, bulb in the top right part": 698095,
-        "Sun Temple, bulb at the top of the high dark room": 698096,
-        "Sun Temple, Golden Gear": 698171,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_LEFT_PART: 698094,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_RIGHT_PART: 698095,
+        AquariaLocationNames.SUN_TEMPLE_BULB_AT_THE_TOP_OF_THE_HIGH_DARK_ROOM: 698096,
+        AquariaLocationNames.SUN_TEMPLE_GOLDEN_GEAR: 698171,
     }
 
     locations_sun_temple_r = {
-        "Sun Temple, first bulb of the temple": 698091,
-        "Sun Temple, bulb on the right part": 698092,
-        "Sun Temple, bulb in the hidden room of the right part": 698093,
-        "Sun Temple, Sun Key": 698182,
+        AquariaLocationNames.SUN_TEMPLE_FIRST_BULB_OF_THE_TEMPLE: 698091,
+        AquariaLocationNames.SUN_TEMPLE_BULB_ON_THE_RIGHT_PART: 698092,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART: 698093,
+        AquariaLocationNames.SUN_TEMPLE_SUN_KEY: 698182,
     }
 
     locations_sun_temple_boss_path = {
-        "Sun Worm path, first path bulb": 698017,
-        "Sun Worm path, second path bulb": 698018,
-        "Sun Worm path, first cliff bulb": 698019,
-        "Sun Worm path, second cliff bulb": 698020,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_PATH_BULB: 698017,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_PATH_BULB: 698018,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB: 698019,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB: 698020,
     }
 
     locations_sun_temple_boss = {
-        "Sun Temple boss area, beating Sun God": 698203,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD: 698203,
     }
 
     locations_abyss_l = {
-        "Abyss left area, bulb in hidden path room": 698024,
-        "Abyss left area, bulb in the right part": 698025,
-        "Abyss left area, Glowing Seed": 698166,
-        "Abyss left area, Glowing Plant": 698172,
+        AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_HIDDEN_PATH_ROOM: 698024,
+        AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_RIGHT_PART: 698025,
+        AquariaLocationNames.ABYSS_LEFT_AREA_GLOWING_SEED: 698166,
+        AquariaLocationNames.ABYSS_LEFT_AREA_GLOWING_PLANT: 698172,
     }
 
     locations_abyss_lb = {
-        "Abyss left area, bulb in the bottom fish pass": 698026,
+        AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS: 698026,
     }
 
     locations_abyss_r = {
-        "Abyss right area, bulb behind the rock in the whale room": 698109,
-        "Abyss right area, bulb in the middle path": 698110,
-        "Abyss right area, bulb behind the rock in the middle path": 698111,
-        "Abyss right area, bulb in the left green room": 698112,
+        AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_MIDDLE_PATH: 698110,
+        AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_MIDDLE_PATH: 698111,
+        AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_LEFT_GREEN_ROOM: 698112,
+    }
+
+    locations_abyss_r_whale = {
+        AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM: 698109,
     }
 
     locations_abyss_r_transturtle = {
-        "Abyss right area, Transturtle": 698214,
+        AquariaLocationNames.ABYSS_RIGHT_AREA_TRANSTURTLE: 698214,
     }
 
     locations_ice_cave = {
-        "Ice Cave, bulb in the room to the right": 698083,
-        "Ice Cave, first bulb in the top exit room": 698084,
-        "Ice Cave, second bulb in the top exit room": 698085,
-        "Ice Cave, third bulb in the top exit room": 698086,
-        "Ice Cave, bulb in the left room": 698087,
+        AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_ROOM_TO_THE_RIGHT: 698083,
+        AquariaLocationNames.ICE_CAVERN_FIRST_BULB_IN_THE_TOP_EXIT_ROOM: 698084,
+        AquariaLocationNames.ICE_CAVERN_SECOND_BULB_IN_THE_TOP_EXIT_ROOM: 698085,
+        AquariaLocationNames.ICE_CAVERN_THIRD_BULB_IN_THE_TOP_EXIT_ROOM: 698086,
+        AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_LEFT_ROOM: 698087,
     }
 
     locations_bubble_cave = {
-        "Bubble Cave, bulb in the left cave wall": 698089,
-        "Bubble Cave, bulb in the right cave wall (behind the ice crystal)": 698090,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL: 698089,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL: 698090,
     }
 
     locations_bubble_cave_boss = {
-        "Bubble Cave, Verse Egg": 698161,
+        AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG: 698161,
     }
 
     locations_king_jellyfish_cave = {
-        "King Jellyfish Cave, bulb in the right path from King Jelly": 698088,
-        "King Jellyfish Cave, Jellyfish Costume": 698188,
+        AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY: 698088,
+        AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME: 698188,
     }
 
     locations_whale = {
-        "The Whale, Verse Egg": 698159,
+        AquariaLocationNames.THE_WHALE_VERSE_EGG: 698159,
     }
 
     locations_sunken_city_r = {
-        "Sunken City right area, crate close to the save crystal": 698154,
-        "Sunken City right area, crate in the left bottom room": 698155,
+        AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL: 698154,
+        AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_IN_THE_LEFT_BOTTOM_ROOM: 698155,
     }
 
     locations_sunken_city_l = {
-        "Sunken City left area, crate in the little pipe room": 698151,
-        "Sunken City left area, crate close to the save crystal": 698152,
-        "Sunken City left area, crate before the bedroom": 698153,
+        AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_IN_THE_LITTLE_PIPE_ROOM: 698151,
+        AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL: 698152,
+        AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_BEFORE_THE_BEDROOM: 698153,
     }
 
     locations_sunken_city_l_bedroom = {
-        "Sunken City left area, Girl Costume": 698192,
+        AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_GIRL_COSTUME: 698192,
     }
 
     locations_sunken_city_boss = {
-        "Sunken City, bulb on top of the boss area": 698043,
+        AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA: 698043,
     }
 
     locations_body_c = {
-        "The Body center area, breaking Li's cage": 698201,
-        "The Body center area, bulb on the main path blocking tube": 698097,
+        AquariaLocationNames.THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE: 698201,
+        AquariaLocationNames.THE_BODY_CENTER_AREA_BULB_ON_THE_MAIN_PATH_BLOCKING_TUBE: 698097,
     }
 
     locations_body_l = {
-        "The Body left area, first bulb in the top face room": 698066,
-        "The Body left area, second bulb in the top face room": 698069,
-        "The Body left area, bulb below the water stream": 698067,
-        "The Body left area, bulb in the top path to the top face room": 698068,
-        "The Body left area, bulb in the bottom face room": 698070,
+        AquariaLocationNames.THE_BODY_LEFT_AREA_FIRST_BULB_IN_THE_TOP_FACE_ROOM: 698066,
+        AquariaLocationNames.THE_BODY_LEFT_AREA_SECOND_BULB_IN_THE_TOP_FACE_ROOM: 698069,
+        AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_BELOW_THE_WATER_STREAM: 698067,
+        AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_TOP_FACE_ROOM: 698068,
+        AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM: 698070,
     }
 
     locations_body_rt = {
-        "The Body right area, bulb in the top face room": 698100,
+        AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_FACE_ROOM: 698100,
     }
 
     locations_body_rb = {
-        "The Body right area, bulb in the top path to the bottom face room": 698098,
-        "The Body right area, bulb in the bottom face room": 698099,
+        AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_BOTTOM_FACE_ROOM: 698098,
+        AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM: 698099,
     }
 
     locations_body_b = {
-        "The Body bottom area, bulb in the Jelly Zap room": 698101,
-        "The Body bottom area, bulb in the nautilus room": 698102,
-        "The Body bottom area, Mutant Costume": 698190,
+        AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_JELLY_ZAP_ROOM: 698101,
+        AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_NAUTILUS_ROOM: 698102,
+        AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME: 698190,
     }
 
     locations_final_boss_tube = {
-        "Final Boss area, first bulb in the turtle room": 698103,
-        "Final Boss area, second bulb in the turtle room": 698104,
-        "Final Boss area, third bulb in the turtle room": 698105,
-        "Final Boss area, Transturtle": 698215,
+        AquariaLocationNames.FINAL_BOSS_AREA_FIRST_BULB_IN_THE_TURTLE_ROOM: 698103,
+        AquariaLocationNames.FINAL_BOSS_AREA_SECOND_BULB_IN_THE_TURTLE_ROOM: 698104,
+        AquariaLocationNames.FINAL_BOSS_AREA_THIRD_BULB_IN_THE_TURTLE_ROOM: 698105,
+        AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE: 698215,
     }
 
     locations_final_boss = {
-        "Final Boss area, bulb in the boss third form room": 698106,
+        AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM: 698106,
     }
 
 
@@ -503,11 +812,12 @@ class AquariaLocations:
     **AquariaLocations.locations_openwater_tl,
     **AquariaLocations.locations_openwater_tr,
     **AquariaLocations.locations_openwater_tr_turtle,
+    **AquariaLocations.locations_openwater_tr_urns,
     **AquariaLocations.locations_openwater_bl,
     **AquariaLocations.locations_skeleton_path,
     **AquariaLocations.locations_skeleton_path_sc,
     **AquariaLocations.locations_arnassi,
-    **AquariaLocations.locations_arnassi_path,
+    **AquariaLocations.locations_arnassi_cave,
     **AquariaLocations.locations_arnassi_cave_transturtle,
     **AquariaLocations.locations_arnassi_crab_boss,
     **AquariaLocations.locations_sun_temple_l,
@@ -519,6 +829,7 @@ class AquariaLocations:
     **AquariaLocations.locations_abyss_l,
     **AquariaLocations.locations_abyss_lb,
     **AquariaLocations.locations_abyss_r,
+    **AquariaLocations.locations_abyss_r_whale,
     **AquariaLocations.locations_abyss_r_transturtle,
     **AquariaLocations.locations_energy_temple_1,
     **AquariaLocations.locations_energy_temple_2,
@@ -528,16 +839,20 @@ class AquariaLocations:
     **AquariaLocations.locations_energy_temple_altar,
     **AquariaLocations.locations_energy_temple_idol,
     **AquariaLocations.locations_mithalas_city,
+    **AquariaLocations.locations_mithalas_city_urns,
     **AquariaLocations.locations_mithalas_city_top_path,
     **AquariaLocations.locations_mithalas_city_fishpass,
-    **AquariaLocations.locations_cathedral_l,
-    **AquariaLocations.locations_cathedral_l_tube,
-    **AquariaLocations.locations_cathedral_l_sc,
-    **AquariaLocations.locations_cathedral_r,
+    **AquariaLocations.locations_mithalas_castle,
+    **AquariaLocations.locations_mithalas_castle_urns,
+    **AquariaLocations.locations_mithalas_castle_tube,
+    **AquariaLocations.locations_mithalas_castle_sc,
+    **AquariaLocations.locations_cathedral_top_start,
+    **AquariaLocations.locations_cathedral_top_start_urns,
+    **AquariaLocations.locations_cathedral_top_end,
     **AquariaLocations.locations_cathedral_underground,
     **AquariaLocations.locations_cathedral_boss,
     **AquariaLocations.locations_forest_tl,
-    **AquariaLocations.locations_forest_tl_fp,
+    **AquariaLocations.locations_forest_tl_verse_egg_room,
     **AquariaLocations.locations_forest_tr,
     **AquariaLocations.locations_forest_tr_fp,
     **AquariaLocations.locations_forest_bl,
@@ -545,10 +860,11 @@ class AquariaLocations:
     **AquariaLocations.locations_forest_br,
     **AquariaLocations.locations_forest_boss,
     **AquariaLocations.locations_forest_boss_entrance,
-    **AquariaLocations.locations_forest_sprite_cave,
-    **AquariaLocations.locations_forest_sprite_cave_tube,
+    **AquariaLocations.locations_sprite_cave,
+    **AquariaLocations.locations_sprite_cave_tube,
     **AquariaLocations.locations_forest_fish_cave,
     **AquariaLocations.locations_home_water,
+    **AquariaLocations.locations_home_water_behind_rocks,
     **AquariaLocations.locations_home_water_transturtle,
     **AquariaLocations.locations_home_water_nautilus,
     **AquariaLocations.locations_body_l,
@@ -565,9 +881,9 @@ class AquariaLocations:
     **AquariaLocations.locations_turtle_cave_bubble,
     **AquariaLocations.locations_veil_tr_r,
     **AquariaLocations.locations_veil_tr_l,
-    **AquariaLocations.locations_veil_bl,
+    **AquariaLocations.locations_veil_b,
     **AquariaLocations.locations_veil_b_sc,
-    **AquariaLocations.locations_veil_bl_fp,
+    **AquariaLocations.locations_veil_b_fp,
     **AquariaLocations.locations_veil_br,
     **AquariaLocations.locations_ice_cave,
     **AquariaLocations.locations_king_jellyfish_cave,
diff --git a/worlds/aquaria/Options.py b/worlds/aquaria/Options.py
index 8c0142debff0..c73c108a9544 100644
--- a/worlds/aquaria/Options.py
+++ b/worlds/aquaria/Options.py
@@ -15,7 +15,10 @@ class IngredientRandomizer(Choice):
     """
     display_name = "Randomize Ingredients"
     option_off = 0
+    alias_false = 0
     option_common_ingredients = 1
+    alias_on = 1
+    alias_true = 1
     option_all_ingredients = 2
     default = 0
 
@@ -29,14 +32,43 @@ class TurtleRandomizer(Choice):
     """Randomize the transportation turtle."""
     display_name = "Turtle Randomizer"
     option_none = 0
+    alias_off = 0
+    alias_false = 0
     option_all = 1
     option_all_except_final = 2
+    alias_on = 2
+    alias_true = 2
     default = 2
 
 
-class EarlyEnergyForm(DefaultOnToggle):
-    """ Force the Energy Form to be in a location early in the game """
-    display_name = "Early Energy Form"
+class EarlyBindSong(Choice):
+    """
+    Force the Bind song to be in a location early in the multiworld (or directly in your world if Early and Local is
+    selected).
+    """
+    display_name = "Early Bind song"
+    option_off = 0
+    alias_false = 0
+    option_early = 1
+    alias_on = 1
+    alias_true = 1
+    option_early_and_local = 2
+    default = 1
+
+
+class EarlyEnergyForm(Choice):
+    """
+    Force the Energy form to be in a location early in the multiworld (or directly in your world if Early and Local is
+    selected).
+    """
+    display_name = "Early Energy form"
+    option_off = 0
+    alias_false = 0
+    option_early = 1
+    alias_on = 1
+    alias_true = 1
+    option_early_and_local = 2
+    default = 1
 
 
 class AquarianTranslation(Toggle):
@@ -47,7 +79,7 @@ class AquarianTranslation(Toggle):
 class BigBossesToBeat(Range):
     """
     The number of big bosses to beat before having access to the creator (the final boss). The big bosses are
-    "Fallen God", "Mithalan God", "Drunian God", "Sun God" and "The Golem".
+    "Fallen God", "Mithalan God", "Drunian God", "Lumerean God" and "The Golem".
     """
     display_name = "Big bosses to beat"
     range_start = 0
@@ -104,7 +136,7 @@ class LightNeededToGetToDarkPlaces(DefaultOnToggle):
     display_name = "Light needed to get to dark places"
 
 
-class BindSongNeededToGetUnderRockBulb(Toggle):
+class BindSongNeededToGetUnderRockBulb(DefaultOnToggle):
     """
     Make sure that the bind song can be acquired before having to obtain sing bulbs under rocks.
     """
@@ -121,13 +153,18 @@ class BlindGoal(Toggle):
 
 class UnconfineHomeWater(Choice):
     """
-    Open the way out of the Home Water area so that Naija can go to open water and beyond without the bind song.
+    Open the way out of the Home Waters area so that Naija can go to open water and beyond without the bind song.
+    Note that if you turn this option off, it is recommended to turn on the Early Energy form and Early Bind Song
+    options.
     """
-    display_name = "Unconfine Home Water Area"
+    display_name = "Unconfine Home Waters Area"
     option_off = 0
+    alias_false = 0
     option_via_energy_door = 1
     option_via_transturtle = 2
     option_via_both = 3
+    alias_on = 3
+    alias_true = 3
     default = 0
 
 
@@ -142,6 +179,7 @@ class AquariaOptions(PerGameCommonOptions):
     big_bosses_to_beat: BigBossesToBeat
     turtle_randomizer: TurtleRandomizer
     early_energy_form: EarlyEnergyForm
+    early_bind_song: EarlyBindSong
     light_needed_to_get_to_dark_places: LightNeededToGetToDarkPlaces
     bind_song_needed_to_get_under_rock_bulb: BindSongNeededToGetUnderRockBulb
     unconfine_home_water: UnconfineHomeWater
diff --git a/worlds/aquaria/Regions.py b/worlds/aquaria/Regions.py
index 7a41e0d0c864..40170e0c3262 100755
--- a/worlds/aquaria/Regions.py
+++ b/worlds/aquaria/Regions.py
@@ -5,10 +5,10 @@
 """
 
 from typing import Dict, Optional
-from BaseClasses import MultiWorld, Region, Entrance, ItemClassification, CollectionState
-from .Items import AquariaItem
-from .Locations import AquariaLocations, AquariaLocation
-from .Options import AquariaOptions
+from BaseClasses import MultiWorld, Region, Entrance, Item, ItemClassification, CollectionState
+from .Items import AquariaItem, ItemNames
+from .Locations import AquariaLocations, AquariaLocation, AquariaLocationNames
+from .Options import AquariaOptions, UnconfineHomeWater
 from worlds.generic.Rules import add_rule, set_rule
 
 
@@ -16,28 +16,28 @@
 
 def _has_hot_soup(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the hotsoup item"""
-    return state.has_any({"Hot soup", "Hot soup x 2"}, player)
+    return state.has_any({ItemNames.HOT_SOUP, ItemNames.HOT_SOUP_X_2}, player)
 
 
 def _has_tongue_cleared(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the Body tongue cleared item"""
-    return state.has("Body tongue cleared", player)
+    return state.has(ItemNames.BODY_TONGUE_CLEARED, player)
 
 
 def _has_sun_crystal(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the Sun crystal item"""
-    return state.has("Has sun crystal", player) and _has_bind_song(state, player)
+    return state.has(ItemNames.HAS_SUN_CRYSTAL, player) and _has_bind_song(state, player)
 
 
 def _has_li(state: CollectionState, player: int) -> bool:
     """`player` in `state` has Li in its team"""
-    return state.has("Li and Li song", player)
+    return state.has(ItemNames.LI_AND_LI_SONG, player)
 
 
 def _has_damaging_item(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the shield song item"""
-    return state.has_any({"Energy form", "Nature form", "Beast form", "Li and Li song", "Baby Nautilus",
-                          "Baby Piranha", "Baby Blaster"}, player)
+    return state.has_any({ItemNames.ENERGY_FORM, ItemNames.NATURE_FORM, ItemNames.BEAST_FORM, ItemNames.LI_AND_LI_SONG,
+                          ItemNames.BABY_NAUTILUS, ItemNames.BABY_PIRANHA, ItemNames.BABY_BLASTER}, player)
 
 
 def _has_energy_attack_item(state: CollectionState, player: int) -> bool:
@@ -47,22 +47,22 @@ def _has_energy_attack_item(state: CollectionState, player: int) -> bool:
 
 def _has_shield_song(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the shield song item"""
-    return state.has("Shield song", player)
+    return state.has(ItemNames.SHIELD_SONG, player)
 
 
 def _has_bind_song(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the bind song item"""
-    return state.has("Bind song", player)
+    return state.has(ItemNames.BIND_SONG, player)
 
 
 def _has_energy_form(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the energy form item"""
-    return state.has("Energy form", player)
+    return state.has(ItemNames.ENERGY_FORM, player)
 
 
 def _has_beast_form(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the beast form item"""
-    return state.has("Beast form", player)
+    return state.has(ItemNames.BEAST_FORM, player)
 
 
 def _has_beast_and_soup_form(state: CollectionState, player: int) -> bool:
@@ -72,55 +72,61 @@ def _has_beast_and_soup_form(state: CollectionState, player: int) -> bool:
 
 def _has_beast_form_or_arnassi_armor(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the beast form item"""
-    return _has_beast_form(state, player) or state.has("Arnassi Armor", player)
+    return _has_beast_form(state, player) or state.has(ItemNames.ARNASSI_ARMOR, player)
 
 
 def _has_nature_form(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the nature form item"""
-    return state.has("Nature form", player)
+    return state.has(ItemNames.NATURE_FORM, player)
 
 
 def _has_sun_form(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the sun form item"""
-    return state.has("Sun form", player)
+    return state.has(ItemNames.SUN_FORM, player)
 
 
 def _has_light(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the light item"""
-    return state.has("Baby Dumbo", player) or _has_sun_form(state, player)
+    return state.has(ItemNames.BABY_DUMBO, player) or _has_sun_form(state, player)
 
 
 def _has_dual_form(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the dual form item"""
-    return _has_li(state, player) and state.has("Dual form", player)
+    return _has_li(state, player) and state.has(ItemNames.DUAL_FORM, player)
 
 
 def _has_fish_form(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the fish form item"""
-    return state.has("Fish form", player)
+    return state.has(ItemNames.FISH_FORM, player)
 
 
 def _has_spirit_form(state: CollectionState, player: int) -> bool:
     """`player` in `state` has the spirit form item"""
-    return state.has("Spirit form", player)
+    return state.has(ItemNames.SPIRIT_FORM, player)
 
 
 def _has_big_bosses(state: CollectionState, player: int) -> bool:
     """`player` in `state` has beated every big bosses"""
-    return state.has_all({"Fallen God beated", "Mithalan God beated", "Drunian God beated",
-                          "Sun God beated", "The Golem beated"}, player)
+    return state.has_all({ItemNames.FALLEN_GOD_BEATED, ItemNames.MITHALAN_GOD_BEATED, ItemNames.DRUNIAN_GOD_BEATED,
+                          ItemNames.LUMEREAN_GOD_BEATED, ItemNames.THE_GOLEM_BEATED}, player)
 
 
 def _has_mini_bosses(state: CollectionState, player: int) -> bool:
     """`player` in `state` has beated every big bosses"""
-    return state.has_all({"Nautilus Prime beated", "Blaster Peg Prime beated", "Mergog beated",
-                          "Mithalan priests beated", "Octopus Prime beated", "Crabbius Maximus beated",
-                          "Mantis Shrimp Prime beated", "King Jellyfish God Prime beated"}, player)
+    return state.has_all({ItemNames.NAUTILUS_PRIME_BEATED, ItemNames.BLASTER_PEG_PRIME_BEATED, ItemNames.MERGOG_BEATED,
+                          ItemNames.MITHALAN_PRIESTS_BEATED, ItemNames.OCTOPUS_PRIME_BEATED,
+                          ItemNames.CRABBIUS_MAXIMUS_BEATED, ItemNames.MANTIS_SHRIMP_PRIME_BEATED,
+                          ItemNames.KING_JELLYFISH_GOD_PRIME_BEATED}, player)
 
 
 def _has_secrets(state: CollectionState, player: int) -> bool:
-    return state.has_all({"First secret obtained", "Second secret obtained", "Third secret obtained"}, player)
+    """The secrets have been acquired in the `state` of the `player`"""
+    return state.has_all({ItemNames.FIRST_SECRET_OBTAINED, ItemNames.SECOND_SECRET_OBTAINED,
+                          ItemNames.THIRD_SECRET_OBTAINED}, player)
 
+def _item_not_advancement(item: Item):
+    """The `item` is not an advancement item"""
+    return not item.advancement
 
 class AquariaRegions:
     """
@@ -130,6 +136,7 @@ class AquariaRegions:
     verse_cave_r: Region
     verse_cave_l: Region
     home_water: Region
+    home_water_behind_rocks: Region
     home_water_nautilus: Region
     home_water_transturtle: Region
     naija_home: Region
@@ -138,33 +145,40 @@ class AquariaRegions:
     energy_temple_2: Region
     energy_temple_3: Region
     energy_temple_boss: Region
+    energy_temple_4: Region
     energy_temple_idol: Region
     energy_temple_blaster_room: Region
     energy_temple_altar: Region
     openwater_tl: Region
     openwater_tr: Region
     openwater_tr_turtle: Region
+    openwater_tr_urns: Region
     openwater_bl: Region
     openwater_br: Region
     skeleton_path: Region
     skeleton_path_sc: Region
     arnassi: Region
     arnassi_cave_transturtle: Region
-    arnassi_path: Region
+    arnassi_cave: Region
     arnassi_crab_boss: Region
     simon: Region
     mithalas_city: Region
+    mithalas_city_urns: Region
     mithalas_city_top_path: Region
     mithalas_city_fishpass: Region
-    cathedral_l: Region
-    cathedral_l_tube: Region
-    cathedral_l_sc: Region
-    cathedral_r: Region
+    mithalas_castle: Region
+    mithalas_castle_urns: Region
+    mithalas_castle_tube: Region
+    mithalas_castle_sc: Region
+    cathedral_top: Region
+    cathedral_top_start: Region
+    cathedral_top_start_urns: Region
+    cathedral_top_end: Region
     cathedral_underground: Region
     cathedral_boss_l: Region
     cathedral_boss_r: Region
     forest_tl: Region
-    forest_tl_fp: Region
+    forest_tl_verse_egg_room: Region
     forest_tr: Region
     forest_tr_fp: Region
     forest_bl: Region
@@ -172,24 +186,26 @@ class AquariaRegions:
     forest_br: Region
     forest_boss: Region
     forest_boss_entrance: Region
-    forest_sprite_cave: Region
-    forest_sprite_cave_tube: Region
+    sprite_cave: Region
+    sprite_cave_tube: Region
     mermog_cave: Region
     mermog_boss: Region
     forest_fish_cave: Region
     veil_tl: Region
     veil_tl_fp: Region
     veil_tr_l: Region
+    veil_tr_l_fp: Region
     veil_tr_r: Region
-    veil_bl: Region
+    veil_b: Region
     veil_b_sc: Region
-    veil_bl_fp: Region
+    veil_b_fp: Region
     veil_br: Region
     octo_cave_t: Region
     octo_cave_b: Region
     turtle_cave: Region
     turtle_cave_bubble: Region
     sun_temple_l: Region
+    sun_temple_l_entrance: Region
     sun_temple_r: Region
     sun_temple_boss_path: Region
     sun_temple_boss: Region
@@ -198,13 +214,16 @@ class AquariaRegions:
     abyss_r: Region
     abyss_r_transturtle: Region
     ice_cave: Region
+    frozen_feil: Region
     bubble_cave: Region
     bubble_cave_boss: Region
     king_jellyfish_cave: Region
+    abyss_r_whale: Region
     whale: Region
     first_secret: Region
     sunken_city_l: Region
-    sunken_city_r: Region
+    sunken_city_l_crates: Region
+    sunken_city_r_crates: Region
     sunken_city_boss: Region
     sunken_city_l_bedroom: Region
     body_c: Region
@@ -250,11 +269,13 @@ def __create_home_water_area(self) -> None:
                                               AquariaLocations.locations_verse_cave_r)
         self.verse_cave_l = self.__add_region("Verse Cave left area",
                                               AquariaLocations.locations_verse_cave_l)
-        self.home_water = self.__add_region("Home Water", AquariaLocations.locations_home_water)
-        self.home_water_nautilus = self.__add_region("Home Water, Nautilus nest",
+        self.home_water = self.__add_region("Home Waters", AquariaLocations.locations_home_water)
+        self.home_water_nautilus = self.__add_region("Home Waters, Nautilus nest",
                                                      AquariaLocations.locations_home_water_nautilus)
-        self.home_water_transturtle = self.__add_region("Home Water, turtle room",
+        self.home_water_transturtle = self.__add_region("Home Waters, turtle room",
                                                         AquariaLocations.locations_home_water_transturtle)
+        self.home_water_behind_rocks = self.__add_region("Home Waters, behind rock",
+                                                         AquariaLocations.locations_home_water_behind_rocks)
         self.naija_home = self.__add_region("Naija's Home", AquariaLocations.locations_naija_home)
         self.song_cave = self.__add_region("Song Cave", AquariaLocations.locations_song_cave)
 
@@ -276,29 +297,32 @@ def __create_energy_temple(self) -> None:
                                                     AquariaLocations.locations_energy_temple_idol)
         self.energy_temple_blaster_room = self.__add_region("Energy Temple blaster room",
                                                             AquariaLocations.locations_energy_temple_blaster_room)
+        self.energy_temple_4 = self.__add_region("Energy Temple after boss path", None)
 
     def __create_openwater(self) -> None:
         """
         Create the `openwater_*`, `skeleton_path`, `arnassi*` and `simon`
         regions
         """
-        self.openwater_tl = self.__add_region("Open Water top left area",
+        self.openwater_tl = self.__add_region("Open Waters top left area",
                                               AquariaLocations.locations_openwater_tl)
-        self.openwater_tr = self.__add_region("Open Water top right area",
+        self.openwater_tr = self.__add_region("Open Waters top right area",
                                               AquariaLocations.locations_openwater_tr)
-        self.openwater_tr_turtle = self.__add_region("Open Water top right area, turtle room",
+        self.openwater_tr_turtle = self.__add_region("Open Waters top right area, turtle room",
                                                      AquariaLocations.locations_openwater_tr_turtle)
-        self.openwater_bl = self.__add_region("Open Water bottom left area",
+        self.openwater_tr_urns = self.__add_region("Open Waters top right area, Mithalas entrance",
+                                                   AquariaLocations.locations_openwater_tr_urns)
+        self.openwater_bl = self.__add_region("Open Waters bottom left area",
                                               AquariaLocations.locations_openwater_bl)
-        self.openwater_br = self.__add_region("Open Water bottom right area", None)
-        self.skeleton_path = self.__add_region("Open Water skeleton path",
+        self.openwater_br = self.__add_region("Open Waters bottom right area", None)
+        self.skeleton_path = self.__add_region("Open Waters skeleton path",
                                                AquariaLocations.locations_skeleton_path)
-        self.skeleton_path_sc = self.__add_region("Open Water skeleton path spirit crystal",
+        self.skeleton_path_sc = self.__add_region("Open Waters skeleton path spirit crystal",
                                                   AquariaLocations.locations_skeleton_path_sc)
         self.arnassi = self.__add_region("Arnassi Ruins", AquariaLocations.locations_arnassi)
-        self.arnassi_path = self.__add_region("Arnassi Ruins, back entrance path",
-                                              AquariaLocations.locations_arnassi_path)
-        self.arnassi_cave_transturtle = self.__add_region("Arnassi Ruins, transturtle area",
+        self.arnassi_cave = self.__add_region("Arnassi Ruins cave",
+                                              AquariaLocations.locations_arnassi_cave)
+        self.arnassi_cave_transturtle = self.__add_region("Arnassi Ruins cave, transturtle area",
                                                           AquariaLocations.locations_arnassi_cave_transturtle)
         self.arnassi_crab_boss = self.__add_region("Arnassi Ruins, Crabbius Maximus lair",
                                                    AquariaLocations.locations_arnassi_crab_boss)
@@ -309,22 +333,29 @@ def __create_mithalas(self) -> None:
         """
         self.mithalas_city = self.__add_region("Mithalas City",
                                                AquariaLocations.locations_mithalas_city)
+        self.mithalas_city_urns = self.__add_region("Mithalas City urns", AquariaLocations.locations_mithalas_city_urns)
         self.mithalas_city_fishpass = self.__add_region("Mithalas City fish pass",
                                                         AquariaLocations.locations_mithalas_city_fishpass)
         self.mithalas_city_top_path = self.__add_region("Mithalas City top path",
                                                         AquariaLocations.locations_mithalas_city_top_path)
-        self.cathedral_l = self.__add_region("Mithalas castle", AquariaLocations.locations_cathedral_l)
-        self.cathedral_l_tube = self.__add_region("Mithalas castle, plant tube entrance",
-                                                  AquariaLocations.locations_cathedral_l_tube)
-        self.cathedral_l_sc = self.__add_region("Mithalas castle spirit crystal",
-                                                AquariaLocations.locations_cathedral_l_sc)
-        self.cathedral_r = self.__add_region("Mithalas Cathedral",
-                                             AquariaLocations.locations_cathedral_r)
+        self.mithalas_castle = self.__add_region("Mithalas castle", AquariaLocations.locations_mithalas_castle)
+        self.mithalas_castle_urns = self.__add_region("Mithalas castle urns",
+                                                      AquariaLocations.locations_mithalas_castle_urns)
+        self.mithalas_castle_tube = self.__add_region("Mithalas castle, plant tube entrance",
+                                                      AquariaLocations.locations_mithalas_castle_tube)
+        self.mithalas_castle_sc = self.__add_region("Mithalas castle spirit crystal",
+                                                    AquariaLocations.locations_mithalas_castle_sc)
+        self.cathedral_top_start = self.__add_region("Mithalas Cathedral start",
+                                                     AquariaLocations.locations_cathedral_top_start)
+        self.cathedral_top_start_urns = self.__add_region("Mithalas Cathedral start urns",
+                                                          AquariaLocations.locations_cathedral_top_start_urns)
+        self.cathedral_top_end = self.__add_region("Mithalas Cathedral end",
+                                                   AquariaLocations.locations_cathedral_top_end)
         self.cathedral_underground = self.__add_region("Mithalas Cathedral underground",
                                                        AquariaLocations.locations_cathedral_underground)
-        self.cathedral_boss_r = self.__add_region("Mithalas Cathedral, Mithalan God room", None)
-        self.cathedral_boss_l = self.__add_region("Mithalas Cathedral, after Mithalan God room",
+        self.cathedral_boss_l = self.__add_region("Mithalas Cathedral, after Mithalan God",
                                                   AquariaLocations.locations_cathedral_boss)
+        self.cathedral_boss_r = self.__add_region("Mithalas Cathedral, before Mithalan God", None)
 
     def __create_forest(self) -> None:
         """
@@ -332,8 +363,8 @@ def __create_forest(self) -> None:
         """
         self.forest_tl = self.__add_region("Kelp Forest top left area",
                                            AquariaLocations.locations_forest_tl)
-        self.forest_tl_fp = self.__add_region("Kelp Forest top left area fish pass",
-                                              AquariaLocations.locations_forest_tl_fp)
+        self.forest_tl_verse_egg_room = self.__add_region("Kelp Forest top left area fish pass",
+                                                          AquariaLocations.locations_forest_tl_verse_egg_room)
         self.forest_tr = self.__add_region("Kelp Forest top right area",
                                            AquariaLocations.locations_forest_tr)
         self.forest_tr_fp = self.__add_region("Kelp Forest top right area fish pass",
@@ -344,21 +375,21 @@ def __create_forest(self) -> None:
                                               AquariaLocations.locations_forest_bl_sc)
         self.forest_br = self.__add_region("Kelp Forest bottom right area",
                                            AquariaLocations.locations_forest_br)
-        self.forest_sprite_cave = self.__add_region("Kelp Forest spirit cave",
-                                                    AquariaLocations.locations_forest_sprite_cave)
-        self.forest_sprite_cave_tube = self.__add_region("Kelp Forest spirit cave after the plant tube",
-                                                         AquariaLocations.locations_forest_sprite_cave_tube)
+        self.sprite_cave = self.__add_region("Sprite cave",
+                                             AquariaLocations.locations_sprite_cave)
+        self.sprite_cave_tube = self.__add_region("Sprite cave after the plant tube",
+                                                  AquariaLocations.locations_sprite_cave_tube)
         self.forest_boss = self.__add_region("Kelp Forest Drunian God room",
                                              AquariaLocations.locations_forest_boss)
         self.forest_boss_entrance = self.__add_region("Kelp Forest Drunian God room entrance",
                                                       AquariaLocations.locations_forest_boss_entrance)
-        self.mermog_cave = self.__add_region("Kelp Forest Mermog cave",
+        self.mermog_cave = self.__add_region("Mermog cave",
                                              AquariaLocations.locations_mermog_cave)
-        self.mermog_boss = self.__add_region("Kelp Forest Mermog cave boss",
+        self.mermog_boss = self.__add_region("Mermog cave boss",
                                              AquariaLocations.locations_mermog_boss)
         self.forest_fish_cave = self.__add_region("Kelp Forest fish cave",
                                                   AquariaLocations.locations_forest_fish_cave)
-        self.simon = self.__add_region("Kelp Forest, Simon's room", AquariaLocations.locations_simon)
+        self.simon = self.__add_region("Simon Says area", AquariaLocations.locations_simon)
 
     def __create_veil(self) -> None:
         """
@@ -373,18 +404,19 @@ def __create_veil(self) -> None:
                                                     AquariaLocations.locations_turtle_cave_bubble)
         self.veil_tr_l = self.__add_region("The Veil top right area, left of temple",
                                            AquariaLocations.locations_veil_tr_l)
+        self.veil_tr_l_fp = self.__add_region("The Veil top right area, fish pass left of temple", None)
         self.veil_tr_r = self.__add_region("The Veil top right area, right of temple",
                                            AquariaLocations.locations_veil_tr_r)
         self.octo_cave_t = self.__add_region("Octopus Cave top entrance",
                                              AquariaLocations.locations_octo_cave_t)
         self.octo_cave_b = self.__add_region("Octopus Cave bottom entrance",
                                              AquariaLocations.locations_octo_cave_b)
-        self.veil_bl = self.__add_region("The Veil bottom left area",
-                                         AquariaLocations.locations_veil_bl)
+        self.veil_b = self.__add_region("The Veil bottom left area",
+                                        AquariaLocations.locations_veil_b)
         self.veil_b_sc = self.__add_region("The Veil bottom spirit crystal area",
                                            AquariaLocations.locations_veil_b_sc)
-        self.veil_bl_fp = self.__add_region("The Veil bottom left area, in the sunken ship",
-                                            AquariaLocations.locations_veil_bl_fp)
+        self.veil_b_fp = self.__add_region("The Veil bottom left area, in the sunken ship",
+                                           AquariaLocations.locations_veil_b_fp)
         self.veil_br = self.__add_region("The Veil bottom right area",
                                          AquariaLocations.locations_veil_br)
 
@@ -394,6 +426,7 @@ def __create_sun_temple(self) -> None:
         """
         self.sun_temple_l = self.__add_region("Sun Temple left area",
                                               AquariaLocations.locations_sun_temple_l)
+        self.sun_temple_l_entrance = self.__add_region("Sun Temple left area entrance", None)
         self.sun_temple_r = self.__add_region("Sun Temple right area",
                                               AquariaLocations.locations_sun_temple_r)
         self.sun_temple_boss_path = self.__add_region("Sun Temple before boss area",
@@ -412,24 +445,29 @@ def __create_abyss(self) -> None:
         self.abyss_r = self.__add_region("Abyss right area", AquariaLocations.locations_abyss_r)
         self.abyss_r_transturtle = self.__add_region("Abyss right area, transturtle",
                                                      AquariaLocations.locations_abyss_r_transturtle)
-        self.ice_cave = self.__add_region("Ice Cave", AquariaLocations.locations_ice_cave)
+        self.abyss_r_whale = self.__add_region("Abyss right area, outside the whale",
+                                               AquariaLocations.locations_abyss_r_whale)
+        self.ice_cave = self.__add_region("Ice Cavern", AquariaLocations.locations_ice_cave)
+        self.frozen_feil = self.__add_region("Frozen Veil", None)
         self.bubble_cave = self.__add_region("Bubble Cave", AquariaLocations.locations_bubble_cave)
         self.bubble_cave_boss = self.__add_region("Bubble Cave boss area", AquariaLocations.locations_bubble_cave_boss)
         self.king_jellyfish_cave = self.__add_region("Abyss left area, King jellyfish cave",
                                                      AquariaLocations.locations_king_jellyfish_cave)
         self.whale = self.__add_region("Inside the whale", AquariaLocations.locations_whale)
-        self.first_secret = self.__add_region("First secret area", None)
+        self.first_secret = self.__add_region("First Secret area", None)
 
     def __create_sunken_city(self) -> None:
         """
         Create the `sunken_city_*` regions
         """
-        self.sunken_city_l = self.__add_region("Sunken City left area",
-                                               AquariaLocations.locations_sunken_city_l)
+        self.sunken_city_l = self.__add_region("Sunken City left area", None)
+        self.sunken_city_l_crates = self.__add_region("Sunken City left area",
+                                                      AquariaLocations.locations_sunken_city_l)
         self.sunken_city_l_bedroom = self.__add_region("Sunken City left area, bedroom",
                                                        AquariaLocations.locations_sunken_city_l_bedroom)
-        self.sunken_city_r = self.__add_region("Sunken City right area",
-                                               AquariaLocations.locations_sunken_city_r)
+        self.sunken_city_r = self.__add_region("Sunken City right area", None)
+        self.sunken_city_r_crates = self.__add_region("Sunken City right area crates",
+                                                      AquariaLocations.locations_sunken_city_r)
         self.sunken_city_boss = self.__add_region("Sunken City boss area",
                                                   AquariaLocations.locations_sunken_city_boss)
 
@@ -454,249 +492,194 @@ def __create_body(self) -> None:
                                             AquariaLocations.locations_final_boss)
         self.final_boss_end = self.__add_region("The Body, final boss area", None)
 
-    def __connect_one_way_regions(self, source_name: str, destination_name: str,
-                                  source_region: Region,
-                                  destination_region: Region, rule=None) -> None:
+    def get_entrance_name(self, from_region: Region, to_region: Region):
+        """
+        Return the name of an entrance between `from_region` and `to_region`
+        """
+        return from_region.name + " to " + to_region.name
+
+    def __connect_one_way_regions(self, source_region: Region, destination_region: Region, rule=None) -> None:
         """
         Connect from the `source_region` to the `destination_region`
         """
-        entrance = Entrance(source_region.player, source_name + " to " + destination_name, source_region)
+        entrance = Entrance(self.player, self.get_entrance_name(source_region, destination_region), source_region)
         source_region.exits.append(entrance)
         entrance.connect(destination_region)
         if rule is not None:
             set_rule(entrance, rule)
 
-    def __connect_regions(self, source_name: str, destination_name: str,
-                          source_region: Region,
+    def __connect_regions(self, source_region: Region,
                           destination_region: Region, rule=None) -> None:
         """
         Connect the `source_region` and the `destination_region` (two-way)
         """
-        self.__connect_one_way_regions(source_name, destination_name, source_region, destination_region, rule)
-        self.__connect_one_way_regions(destination_name, source_name, destination_region, source_region, rule)
+        self.__connect_one_way_regions(source_region, destination_region, rule)
+        self.__connect_one_way_regions(destination_region, source_region, rule)
 
     def __connect_home_water_regions(self) -> None:
         """
         Connect entrances of the different regions around `home_water`
         """
-        self.__connect_one_way_regions("Menu", "Verse Cave right area",
-                                       self.menu, self.verse_cave_r)
-        self.__connect_regions("Verse Cave left area", "Verse Cave right area",
-                               self.verse_cave_l, self.verse_cave_r)
-        self.__connect_regions("Verse Cave", "Home Water", self.verse_cave_l, self.home_water)
-        self.__connect_regions("Home Water", "Haija's home", self.home_water, self.naija_home)
-        self.__connect_regions("Home Water", "Song Cave", self.home_water, self.song_cave)
-        self.__connect_regions("Home Water", "Home Water, nautilus nest",
-                               self.home_water, self.home_water_nautilus,
-                               lambda state: _has_energy_attack_item(state, self.player) and
-                                             _has_bind_song(state, self.player))
-        self.__connect_regions("Home Water", "Home Water transturtle room",
-                               self.home_water, self.home_water_transturtle)
-        self.__connect_regions("Home Water", "Energy Temple first area",
-                               self.home_water, self.energy_temple_1,
+        self.__connect_one_way_regions(self.menu, self.verse_cave_r)
+        self.__connect_regions(self.verse_cave_l, self.verse_cave_r)
+        self.__connect_regions(self.verse_cave_l, self.home_water)
+        self.__connect_regions(self.home_water, self.naija_home)
+        self.__connect_regions(self.home_water, self.song_cave)
+        self.__connect_regions(self.home_water, self.home_water_behind_rocks,
                                lambda state: _has_bind_song(state, self.player))
-        self.__connect_regions("Home Water", "Energy Temple_altar",
-                               self.home_water, self.energy_temple_altar,
+        self.__connect_regions(self.home_water_behind_rocks, self.home_water_nautilus,
+                               lambda state: _has_energy_attack_item(state, self.player))
+        self.__connect_regions(self.home_water, self.home_water_transturtle)
+        self.__connect_regions(self.home_water_behind_rocks, self.energy_temple_1)
+        self.__connect_regions(self.home_water_behind_rocks, self.energy_temple_altar,
                                lambda state: _has_energy_attack_item(state, self.player) and
                                              _has_bind_song(state, self.player))
-        self.__connect_regions("Energy Temple first area", "Energy Temple second area",
-                               self.energy_temple_1, self.energy_temple_2,
+        self.__connect_regions(self.energy_temple_1, self.energy_temple_2,
                                lambda state: _has_energy_form(state, self.player))
-        self.__connect_regions("Energy Temple first area", "Energy Temple idol room",
-                               self.energy_temple_1, self.energy_temple_idol,
+        self.__connect_regions(self.energy_temple_1, self.energy_temple_idol,
                                lambda state: _has_fish_form(state, self.player))
-        self.__connect_regions("Energy Temple idol room", "Energy Temple boss area",
-                               self.energy_temple_idol, self.energy_temple_boss,
+        self.__connect_regions(self.energy_temple_idol, self.energy_temple_boss,
                                lambda state: _has_energy_attack_item(state, self.player) and
                                              _has_fish_form(state, self.player))
-        self.__connect_one_way_regions("Energy Temple first area", "Energy Temple boss area",
-                                       self.energy_temple_1, self.energy_temple_boss,
-                                       lambda state: _has_beast_form(state, self.player) and
+        self.__connect_one_way_regions(self.energy_temple_1, self.energy_temple_4,
+                                       lambda state: _has_beast_form(state, self.player))
+        self.__connect_one_way_regions(self.energy_temple_4, self.energy_temple_1)
+        self.__connect_regions(self.energy_temple_4, self.energy_temple_boss,
+                               lambda state: _has_energy_attack_item(state, self.player))
+        self.__connect_regions(self.energy_temple_2, self.energy_temple_3)
+        self.__connect_one_way_regions(self.energy_temple_3, self.energy_temple_boss,
+                                       lambda state: _has_bind_song(state, self.player) and
                                                      _has_energy_attack_item(state, self.player))
-        self.__connect_one_way_regions("Energy Temple boss area", "Energy Temple first area",
-                                       self.energy_temple_boss, self.energy_temple_1,
-                                       lambda state: _has_energy_attack_item(state, self.player))
-        self.__connect_regions("Energy Temple second area", "Energy Temple third area",
-                               self.energy_temple_2, self.energy_temple_3,
-                               lambda state: _has_energy_form(state, self.player))
-        self.__connect_regions("Energy Temple boss area", "Energy Temple blaster room",
-                               self.energy_temple_boss, self.energy_temple_blaster_room,
-                               lambda state: _has_nature_form(state, self.player) and
-                                             _has_bind_song(state, self.player) and
-                                             _has_energy_attack_item(state, self.player))
-        self.__connect_regions("Energy Temple first area", "Energy Temple blaster room",
-                               self.energy_temple_1, self.energy_temple_blaster_room,
-                               lambda state: _has_nature_form(state, self.player) and
-                                             _has_bind_song(state, self.player) and
-                                             _has_energy_attack_item(state, self.player) and
-                                             _has_beast_form(state, self.player))
-        self.__connect_regions("Home Water", "Open Water top left area",
-                               self.home_water, self.openwater_tl)
+        self.__connect_one_way_regions(self.energy_temple_4, self.energy_temple_blaster_room,
+                                       lambda state: _has_nature_form(state, self.player) and
+                                                     _has_bind_song(state, self.player) and
+                                                     _has_energy_attack_item(state, self.player))
+        self.__connect_regions(self.home_water, self.openwater_tl)
 
     def __connect_open_water_regions(self) -> None:
         """
         Connect entrances of the different regions around open water
         """
-        self.__connect_regions("Open Water top left area", "Open Water top right area",
-                               self.openwater_tl, self.openwater_tr)
-        self.__connect_regions("Open Water top left area", "Open Water bottom left area",
-                               self.openwater_tl, self.openwater_bl)
-        self.__connect_regions("Open Water top left area", "forest bottom right area",
-                               self.openwater_tl, self.forest_br)
-        self.__connect_regions("Open Water top right area", "Open Water top right area, turtle room",
-                               self.openwater_tr, self.openwater_tr_turtle,
-                               lambda state: _has_beast_form_or_arnassi_armor(state, self.player))
-        self.__connect_regions("Open Water top right area", "Open Water bottom right area",
-                               self.openwater_tr, self.openwater_br)
-        self.__connect_regions("Open Water top right area", "Mithalas City",
-                               self.openwater_tr, self.mithalas_city)
-        self.__connect_regions("Open Water top right area", "Veil bottom left area",
-                               self.openwater_tr, self.veil_bl)
-        self.__connect_one_way_regions("Open Water top right area", "Veil bottom right",
-                                       self.openwater_tr, self.veil_br,
+        self.__connect_regions(self.openwater_tl, self.openwater_tr)
+        self.__connect_regions(self.openwater_tl, self.openwater_bl)
+        self.__connect_regions(self.openwater_tl, self.forest_br)
+        self.__connect_one_way_regions(self.openwater_tr, self.openwater_tr_turtle,
                                        lambda state: _has_beast_form_or_arnassi_armor(state, self.player))
-        self.__connect_one_way_regions("Veil bottom right", "Open Water top right area",
-                                       self.veil_br, self.openwater_tr)
-        self.__connect_regions("Open Water bottom left area", "Open Water bottom right area",
-                               self.openwater_bl, self.openwater_br)
-        self.__connect_regions("Open Water bottom left area", "Skeleton path",
-                               self.openwater_bl, self.skeleton_path)
-        self.__connect_regions("Abyss left area", "Open Water bottom left area",
-                               self.abyss_l, self.openwater_bl)
-        self.__connect_regions("Skeleton path", "skeleton_path_sc",
-                               self.skeleton_path, self.skeleton_path_sc,
+        self.__connect_one_way_regions(self.openwater_tr_turtle, self.openwater_tr)
+        self.__connect_one_way_regions(self.openwater_tr, self.openwater_tr_urns,
+                                       lambda state: _has_bind_song(state, self.player) or
+                                                     _has_damaging_item(state, self.player))
+        self.__connect_regions(self.openwater_tr, self.openwater_br)
+        self.__connect_regions(self.openwater_tr, self.mithalas_city)
+        self.__connect_regions(self.openwater_tr, self.veil_b)
+        self.__connect_one_way_regions(self.openwater_tr, self.veil_br,
+                                       lambda state: _has_beast_form_or_arnassi_armor(state, self.player))
+        self.__connect_one_way_regions(self.veil_br, self.openwater_tr)
+        self.__connect_regions(self.openwater_bl, self.openwater_br)
+        self.__connect_regions(self.openwater_bl, self.skeleton_path)
+        self.__connect_regions(self.abyss_l, self.openwater_bl)
+        self.__connect_regions(self.skeleton_path, self.skeleton_path_sc,
                                lambda state: _has_spirit_form(state, self.player))
-        self.__connect_regions("Abyss right area", "Open Water bottom right area",
-                               self.abyss_r, self.openwater_br)
-        self.__connect_one_way_regions("Open Water bottom right area", "Arnassi",
-                                       self.openwater_br, self.arnassi,
+        self.__connect_regions(self.abyss_r, self.openwater_br)
+        self.__connect_one_way_regions(self.openwater_br, self.arnassi,
                                        lambda state: _has_beast_form(state, self.player))
-        self.__connect_one_way_regions("Arnassi", "Open Water bottom right area",
-                                       self.arnassi, self.openwater_br)
-        self.__connect_regions("Arnassi", "Arnassi path",
-                               self.arnassi, self.arnassi_path)
-        self.__connect_regions("Arnassi ruins, transturtle area", "Arnassi path",
-                               self.arnassi_cave_transturtle, self.arnassi_path,
+        self.__connect_one_way_regions(self.arnassi, self.openwater_br)
+        self.__connect_regions(self.arnassi, self.arnassi_cave)
+        self.__connect_regions(self.arnassi_cave_transturtle, self.arnassi_cave,
                                lambda state: _has_fish_form(state, self.player))
-        self.__connect_one_way_regions("Arnassi path", "Arnassi crab boss area",
-                                       self.arnassi_path, self.arnassi_crab_boss,
+        self.__connect_one_way_regions(self.arnassi_cave, self.arnassi_crab_boss,
                                        lambda state: _has_beast_form_or_arnassi_armor(state, self.player) and
                                                      (_has_energy_attack_item(state, self.player) or
                                                       _has_nature_form(state, self.player)))
-        self.__connect_one_way_regions("Arnassi crab boss area", "Arnassi path",
-                                       self.arnassi_crab_boss, self.arnassi_path)
+        self.__connect_one_way_regions(self.arnassi_crab_boss, self.arnassi_cave)
 
     def __connect_mithalas_regions(self) -> None:
         """
         Connect entrances of the different regions around Mithalas
         """
-        self.__connect_one_way_regions("Mithalas City", "Mithalas City top path",
-                                       self.mithalas_city, self.mithalas_city_top_path,
+        self.__connect_one_way_regions(self.mithalas_city, self.mithalas_city_urns,
+                                       lambda state: _has_damaging_item(state, self.player))
+        self.__connect_one_way_regions(self.mithalas_city, self.mithalas_city_top_path,
                                        lambda state: _has_beast_form_or_arnassi_armor(state, self.player))
-        self.__connect_one_way_regions("Mithalas City_top_path", "Mithalas City",
-                                       self.mithalas_city_top_path, self.mithalas_city)
-        self.__connect_regions("Mithalas City", "Mithalas City home with fishpass",
-                               self.mithalas_city, self.mithalas_city_fishpass,
+        self.__connect_one_way_regions(self.mithalas_city_top_path, self.mithalas_city)
+        self.__connect_regions(self.mithalas_city, self.mithalas_city_fishpass,
                                lambda state: _has_fish_form(state, self.player))
-        self.__connect_regions("Mithalas City", "Mithalas castle",
-                               self.mithalas_city, self.cathedral_l)
-        self.__connect_one_way_regions("Mithalas City top path", "Mithalas castle, flower tube",
-                                       self.mithalas_city_top_path,
-                                       self.cathedral_l_tube,
+        self.__connect_regions(self.mithalas_city, self.mithalas_castle)
+        self.__connect_one_way_regions(self.mithalas_city_top_path,
+                                       self.mithalas_castle_tube,
                                        lambda state: _has_nature_form(state, self.player) and
                                                      _has_energy_attack_item(state, self.player))
-        self.__connect_one_way_regions("Mithalas castle, flower tube area", "Mithalas City top path",
-                                       self.cathedral_l_tube,
+        self.__connect_one_way_regions(self.mithalas_castle_tube,
                                        self.mithalas_city_top_path,
                                        lambda state: _has_nature_form(state, self.player))
-        self.__connect_one_way_regions("Mithalas castle flower tube area", "Mithalas castle, spirit crystals",
-                                       self.cathedral_l_tube, self.cathedral_l_sc,
+        self.__connect_one_way_regions(self.mithalas_castle_tube, self.mithalas_castle_sc,
                                        lambda state: _has_spirit_form(state, self.player))
-        self.__connect_one_way_regions("Mithalas castle_flower tube area", "Mithalas castle",
-                                       self.cathedral_l_tube, self.cathedral_l,
+        self.__connect_one_way_regions(self.mithalas_castle_tube, self.mithalas_castle,
                                        lambda state: _has_spirit_form(state, self.player))
-        self.__connect_regions("Mithalas castle", "Mithalas castle, spirit crystals",
-                               self.cathedral_l, self.cathedral_l_sc,
+        self.__connect_one_way_regions(self.mithalas_castle, self.mithalas_castle_urns,
+                                       lambda state: _has_damaging_item(state, self.player))
+        self.__connect_regions(self.mithalas_castle, self.mithalas_castle_sc,
                                lambda state: _has_spirit_form(state, self.player))
-        self.__connect_one_way_regions("Mithalas castle", "Cathedral boss right area",
-                                       self.cathedral_l, self.cathedral_boss_r,
+        self.__connect_one_way_regions(self.mithalas_castle, self.cathedral_boss_r,
                                        lambda state: _has_beast_form(state, self.player))
-        self.__connect_one_way_regions("Cathedral boss left area", "Mithalas castle",
-                                       self.cathedral_boss_l, self.cathedral_l,
+        self.__connect_one_way_regions(self.cathedral_boss_l, self.mithalas_castle,
                                        lambda state: _has_beast_form(state, self.player))
-        self.__connect_regions("Mithalas castle", "Mithalas Cathedral underground",
-                               self.cathedral_l, self.cathedral_underground,
+        self.__connect_regions(self.mithalas_castle, self.cathedral_underground,
                                lambda state: _has_beast_form(state, self.player))
-        self.__connect_one_way_regions("Mithalas castle", "Mithalas Cathedral",
-                                       self.cathedral_l, self.cathedral_r,
-                                       lambda state: _has_bind_song(state, self.player) and
-                                                     _has_energy_attack_item(state, self.player))
-        self.__connect_one_way_regions("Mithalas Cathedral", "Mithalas Cathedral underground",
-                                       self.cathedral_r, self.cathedral_underground)
-        self.__connect_one_way_regions("Mithalas Cathedral underground", "Mithalas Cathedral",
-                                       self.cathedral_underground, self.cathedral_r,
+        self.__connect_one_way_regions(self.mithalas_castle, self.cathedral_top_start,
+                                       lambda state: _has_bind_song(state, self.player))
+        self.__connect_one_way_regions(self.cathedral_top_start, self.cathedral_top_start_urns,
+                                       lambda state: _has_damaging_item(state, self.player))
+        self.__connect_regions(self.cathedral_top_start, self.cathedral_top_end,
+                               lambda state: _has_energy_attack_item(state, self.player))
+        self.__connect_one_way_regions(self.cathedral_underground, self.cathedral_top_end,
                                        lambda state: _has_beast_form(state, self.player) and
-                                                     _has_energy_attack_item(state, self.player))
-        self.__connect_one_way_regions("Mithalas Cathedral underground", "Cathedral boss right area",
-                                       self.cathedral_underground, self.cathedral_boss_r)
-        self.__connect_one_way_regions("Cathedral boss right area", "Mithalas Cathedral underground",
-                                       self.cathedral_boss_r, self.cathedral_underground,
+                                                     _has_damaging_item(state, self.player))
+        self.__connect_one_way_regions(self.cathedral_top_end, self.cathedral_underground,
+                                       lambda state: _has_energy_attack_item(state, self.player)
+                                       )
+        self.__connect_one_way_regions(self.cathedral_underground, self.cathedral_boss_r)
+        self.__connect_one_way_regions(self.cathedral_boss_r, self.cathedral_underground,
                                        lambda state: _has_beast_form(state, self.player))
-        self.__connect_one_way_regions("Cathedral boss right area", "Cathedral boss left area",
-                                       self.cathedral_boss_r, self.cathedral_boss_l,
+        self.__connect_one_way_regions(self.cathedral_boss_r, self.cathedral_boss_l,
                                        lambda state: _has_bind_song(state, self.player) and
                                                      _has_energy_attack_item(state, self.player))
-        self.__connect_one_way_regions("Cathedral boss left area", "Cathedral boss right area",
-                                       self.cathedral_boss_l, self.cathedral_boss_r)
+        self.__connect_one_way_regions(self.cathedral_boss_l, self.cathedral_boss_r)
 
     def __connect_forest_regions(self) -> None:
         """
         Connect entrances of the different regions around the Kelp Forest
         """
-        self.__connect_regions("Forest bottom right", "Veil bottom left area",
-                               self.forest_br, self.veil_bl)
-        self.__connect_regions("Forest bottom right", "Forest bottom left area",
-                               self.forest_br, self.forest_bl)
-        self.__connect_one_way_regions("Forest bottom left area", "Forest bottom left area, spirit crystals",
-                                       self.forest_bl, self.forest_bl_sc,
+        self.__connect_regions(self.forest_br, self.veil_b)
+        self.__connect_regions(self.forest_br, self.forest_bl)
+        self.__connect_one_way_regions(self.forest_bl, self.forest_bl_sc,
                                        lambda state: _has_energy_attack_item(state, self.player) or
                                                      _has_fish_form(state, self.player))
-        self.__connect_one_way_regions("Forest bottom left area, spirit crystals", "Forest bottom left area",
-                                       self.forest_bl_sc, self.forest_bl)
-        self.__connect_regions("Forest bottom right", "Forest top right area",
-                               self.forest_br, self.forest_tr)
-        self.__connect_regions("Forest bottom left area", "Forest fish cave",
-                               self.forest_bl, self.forest_fish_cave)
-        self.__connect_regions("Forest bottom left area", "Forest top left area",
-                               self.forest_bl, self.forest_tl)
-        self.__connect_regions("Forest bottom left area", "Forest boss entrance",
-                               self.forest_bl, self.forest_boss_entrance,
+        self.__connect_one_way_regions(self.forest_bl_sc, self.forest_bl)
+        self.__connect_regions(self.forest_br, self.forest_tr)
+        self.__connect_regions(self.forest_bl, self.forest_fish_cave)
+        self.__connect_regions(self.forest_bl, self.forest_tl)
+        self.__connect_regions(self.forest_bl, self.forest_boss_entrance,
                                lambda state: _has_nature_form(state, self.player))
-        self.__connect_regions("Forest top left area", "Forest top left area, fish pass",
-                               self.forest_tl, self.forest_tl_fp,
-                               lambda state: _has_nature_form(state, self.player) and
-                                             _has_bind_song(state, self.player) and
-                                             _has_energy_attack_item(state, self.player) and
-                                             _has_fish_form(state, self.player))
-        self.__connect_regions("Forest top left area", "Forest top right area",
-                               self.forest_tl, self.forest_tr)
-        self.__connect_regions("Forest top left area", "Forest boss entrance",
-                               self.forest_tl, self.forest_boss_entrance)
-        self.__connect_regions("Forest boss area", "Forest boss entrance",
-                               self.forest_boss, self.forest_boss_entrance,
-                               lambda state: _has_energy_attack_item(state, self.player))
-        self.__connect_regions("Forest top right area", "Forest top right area fish pass",
-                               self.forest_tr, self.forest_tr_fp,
+        self.__connect_one_way_regions(self.forest_tl, self.forest_tl_verse_egg_room,
+                                       lambda state: _has_nature_form(state, self.player) and
+                                                     _has_bind_song(state, self.player) and
+                                                     _has_energy_attack_item(state, self.player) and
+                                                     _has_fish_form(state, self.player))
+        self.__connect_one_way_regions(self.forest_tl_verse_egg_room, self.forest_tl,
+                                       lambda state: _has_fish_form(state, self.player))
+        self.__connect_regions(self.forest_tl, self.forest_tr)
+        self.__connect_regions(self.forest_tl, self.forest_boss_entrance)
+        self.__connect_one_way_regions(self.forest_boss_entrance, self.forest_boss,
+                                       lambda state: _has_energy_attack_item(state, self.player))
+        self.__connect_one_way_regions(self.forest_boss, self.forest_boss_entrance)
+        self.__connect_regions(self.forest_tr, self.forest_tr_fp,
                                lambda state: _has_fish_form(state, self.player))
-        self.__connect_regions("Forest top right area", "Forest sprite cave",
-                               self.forest_tr, self.forest_sprite_cave)
-        self.__connect_regions("Forest sprite cave", "Forest sprite cave flower tube",
-                               self.forest_sprite_cave, self.forest_sprite_cave_tube,
+        self.__connect_regions(self.forest_tr, self.sprite_cave)
+        self.__connect_regions(self.sprite_cave, self.sprite_cave_tube,
                                lambda state: _has_nature_form(state, self.player))
-        self.__connect_regions("Forest top right area", "Mermog cave",
-                               self.forest_tr_fp, self.mermog_cave)
-        self.__connect_regions("Fermog cave", "Fermog boss",
-                               self.mermog_cave, self.mermog_boss,
+        self.__connect_regions(self.forest_tr_fp, self.mermog_cave)
+        self.__connect_regions(self.mermog_cave, self.mermog_boss,
                                lambda state: _has_beast_form(state, self.player) and
                                              _has_energy_attack_item(state, self.player))
 
@@ -704,113 +687,94 @@ def __connect_veil_regions(self) -> None:
         """
         Connect entrances of the different regions around The Veil
         """
-        self.__connect_regions("Veil bottom left area", "Veil bottom left area, fish pass",
-                               self.veil_bl, self.veil_bl_fp,
+        self.__connect_regions(self.veil_b, self.veil_b_fp,
                                lambda state: _has_fish_form(state, self.player) and
-                                             _has_bind_song(state, self.player) and
-                                             _has_damaging_item(state, self.player))
-        self.__connect_regions("Veil bottom left area", "Veil bottom area spirit crystals path",
-                               self.veil_bl, self.veil_b_sc,
+                                             _has_bind_song(state, self.player))
+        self.__connect_regions(self.veil_b, self.veil_b_sc,
                                lambda state: _has_spirit_form(state, self.player))
-        self.__connect_regions("Veil bottom area spirit crystals path", "Veil bottom right",
-                               self.veil_b_sc, self.veil_br,
+        self.__connect_regions(self.veil_b_sc, self.veil_br,
                                lambda state: _has_spirit_form(state, self.player))
-        self.__connect_regions("Veil bottom right", "Veil top left area",
-                               self.veil_br, self.veil_tl)
-        self.__connect_regions("Veil top left area", "Veil_top left area, fish pass",
-                               self.veil_tl, self.veil_tl_fp,
+        self.__connect_regions(self.veil_br, self.veil_tl)
+        self.__connect_regions(self.veil_tl, self.veil_tl_fp,
                                lambda state: _has_fish_form(state, self.player))
-        self.__connect_regions("Veil top left area", "Veil right of sun temple",
-                               self.veil_tl, self.veil_tr_r)
-        self.__connect_regions("Veil top left area", "Turtle cave",
-                               self.veil_tl, self.turtle_cave)
-        self.__connect_regions("Turtle cave", "Turtle cave Bubble Cliff",
-                               self.turtle_cave, self.turtle_cave_bubble)
-        self.__connect_regions("Veil right of sun temple", "Sun Temple right area",
-                               self.veil_tr_r, self.sun_temple_r)
-        self.__connect_one_way_regions("Sun Temple right area", "Sun Temple left area",
-                                       self.sun_temple_r, self.sun_temple_l,
+        self.__connect_regions(self.veil_tl, self.veil_tr_r)
+        self.__connect_regions(self.veil_tl, self.turtle_cave)
+        self.__connect_regions(self.turtle_cave, self.turtle_cave_bubble)
+        self.__connect_regions(self.veil_tr_r, self.sun_temple_r)
+
+        self.__connect_one_way_regions(self.sun_temple_r, self.sun_temple_l_entrance,
                                        lambda state: _has_bind_song(state, self.player) or
                                                      _has_light(state, self.player))
-        self.__connect_one_way_regions("Sun Temple left area", "Sun Temple right area",
-                                       self.sun_temple_l, self.sun_temple_r,
+        self.__connect_one_way_regions(self.sun_temple_l_entrance, self.sun_temple_r,
                                        lambda state: _has_light(state, self.player))
-        self.__connect_regions("Sun Temple left area", "Veil left of sun temple",
-                               self.sun_temple_l, self.veil_tr_l)
-        self.__connect_regions("Sun Temple left area", "Sun Temple before boss area",
-                               self.sun_temple_l, self.sun_temple_boss_path)
-        self.__connect_regions("Sun Temple before boss area", "Sun Temple boss area",
-                               self.sun_temple_boss_path, self.sun_temple_boss,
+        self.__connect_regions(self.sun_temple_l_entrance, self.veil_tr_l)
+        self.__connect_regions(self.sun_temple_l, self.sun_temple_l_entrance)
+        self.__connect_one_way_regions(self.sun_temple_l, self.sun_temple_boss_path)
+        self.__connect_one_way_regions(self.sun_temple_boss_path, self.sun_temple_l)
+        self.__connect_regions(self.sun_temple_boss_path, self.sun_temple_boss,
                                lambda state: _has_energy_attack_item(state, self.player))
-        self.__connect_one_way_regions("Sun Temple boss area", "Veil left of sun temple",
-                                       self.sun_temple_boss, self.veil_tr_l)
-        self.__connect_regions("Veil left of sun temple", "Octo cave top path",
-                               self.veil_tr_l, self.octo_cave_t,
-                               lambda state: _has_fish_form(state, self.player) and
-                                             _has_sun_form(state, self.player) and
-                                             _has_beast_form(state, self.player) and
-                                             _has_energy_attack_item(state, self.player))
-        self.__connect_regions("Veil left of sun temple", "Octo cave bottom path",
-                               self.veil_tr_l, self.octo_cave_b,
+        self.__connect_one_way_regions(self.sun_temple_boss, self.veil_tr_l)
+        self.__connect_regions(self.veil_tr_l, self.veil_tr_l_fp,
                                lambda state: _has_fish_form(state, self.player))
+        self.__connect_one_way_regions(self.veil_tr_l_fp, self.octo_cave_t,
+                                       lambda state: _has_sun_form(state, self.player) and
+                                                     _has_beast_form(state, self.player) and
+                                                     _has_energy_attack_item(state, self.player))
+        self.__connect_one_way_regions(self.octo_cave_t, self.veil_tr_l_fp)
+        self.__connect_regions(self.veil_tr_l_fp, self.octo_cave_b)
 
     def __connect_abyss_regions(self) -> None:
         """
         Connect entrances of the different regions around The Abyss
         """
-        self.__connect_regions("Abyss left area", "Abyss bottom of left area",
-                               self.abyss_l, self.abyss_lb,
+        self.__connect_regions(self.abyss_l, self.abyss_lb,
                                lambda state: _has_nature_form(state, self.player))
-        self.__connect_regions("Abyss left bottom area", "Sunken City right area",
-                               self.abyss_lb, self.sunken_city_r,
+        self.__connect_regions(self.abyss_lb, self.sunken_city_r,
                                lambda state: _has_li(state, self.player))
-        self.__connect_one_way_regions("Abyss left bottom area", "Body center area",
-                                       self.abyss_lb, self.body_c,
+        self.__connect_one_way_regions(self.abyss_lb, self.body_c,
                                        lambda state: _has_tongue_cleared(state, self.player))
-        self.__connect_one_way_regions("Body center area", "Abyss left bottom area",
-                                       self.body_c, self.abyss_lb)
-        self.__connect_regions("Abyss left area", "King jellyfish cave",
-                               self.abyss_l, self.king_jellyfish_cave,
-                               lambda state: (_has_energy_form(state, self.player) and
-                                              _has_beast_form(state, self.player)) or
-                                              _has_dual_form(state, self.player))
-        self.__connect_regions("Abyss left area", "Abyss right area",
-                               self.abyss_l, self.abyss_r)
-        self.__connect_regions("Abyss right area", "Abyss right area, transturtle",
-                                       self.abyss_r, self.abyss_r_transturtle)
-        self.__connect_regions("Abyss right area", "Inside the whale",
-                               self.abyss_r, self.whale,
+        self.__connect_one_way_regions(self.body_c, self.abyss_lb)
+        self.__connect_one_way_regions(self.abyss_l, self.king_jellyfish_cave,
+                                       lambda state: _has_dual_form(state, self.player) or
+                                                     (_has_energy_form(state, self.player) and
+                                                      _has_beast_form(state, self.player)))
+        self.__connect_one_way_regions(self.king_jellyfish_cave, self.abyss_l)
+        self.__connect_regions(self.abyss_l, self.abyss_r)
+        self.__connect_regions(self.abyss_r, self.abyss_r_whale,
                                lambda state: _has_spirit_form(state, self.player) and
                                              _has_sun_form(state, self.player))
-        self.__connect_regions("Abyss right area", "First secret area",
-                               self.abyss_r, self.first_secret,
+        self.__connect_regions(self.abyss_r_whale, self.whale)
+        self.__connect_regions(self.abyss_r, self.abyss_r_transturtle)
+        self.__connect_regions(self.abyss_r, self.first_secret,
                                lambda state: _has_spirit_form(state, self.player) and
                                              _has_sun_form(state, self.player) and
                                              _has_bind_song(state, self.player) and
                                              _has_energy_attack_item(state, self.player))
-        self.__connect_regions("Abyss right area", "Ice Cave",
-                               self.abyss_r, self.ice_cave,
+        self.__connect_regions(self.abyss_r, self.ice_cave,
                                lambda state: _has_spirit_form(state, self.player))
-        self.__connect_regions("Ice cave", "Bubble Cave",
-                               self.ice_cave, self.bubble_cave,
-                               lambda state: _has_beast_form(state, self.player) or
-                                             _has_hot_soup(state, self.player))
-        self.__connect_regions("Bubble Cave boss area", "Bubble Cave",
-                               self.bubble_cave, self.bubble_cave_boss,
-                               lambda state: _has_nature_form(state, self.player) and _has_bind_song(state, self.player)
-                               )
+        self.__connect_regions(self.ice_cave, self.frozen_feil)
+        self.__connect_one_way_regions(self.frozen_feil, self.bubble_cave,
+                                       lambda state: _has_beast_form(state, self.player) or
+                                                     _has_hot_soup(state, self.player))
+        self.__connect_one_way_regions(self.bubble_cave, self.frozen_feil)
+        self.__connect_one_way_regions(self.bubble_cave, self.bubble_cave_boss,
+                                       lambda state: _has_nature_form(state, self.player) and
+                                                     _has_bind_song(state, self.player)
+                                       )
+        self.__connect_one_way_regions(self.bubble_cave_boss, self.bubble_cave)
 
     def __connect_sunken_city_regions(self) -> None:
         """
         Connect entrances of the different regions around The Sunken City
         """
-        self.__connect_regions("Sunken City right area", "Sunken City left area",
-                               self.sunken_city_r, self.sunken_city_l)
-        self.__connect_regions("Sunken City left area", "Sunken City bedroom",
-                               self.sunken_city_l, self.sunken_city_l_bedroom,
+        self.__connect_regions(self.sunken_city_r, self.sunken_city_l)
+        self.__connect_one_way_regions(self.sunken_city_r, self.sunken_city_r_crates,
+                                       lambda state: _has_energy_attack_item(state, self.player))
+        self.__connect_regions(self.sunken_city_l, self.sunken_city_l_bedroom,
                                lambda state: _has_spirit_form(state, self.player))
-        self.__connect_regions("Sunken City left area", "Sunken City boss area",
-                               self.sunken_city_l, self.sunken_city_boss,
+        self.__connect_one_way_regions(self.sunken_city_l, self.sunken_city_l_crates,
+                                       lambda state: _has_energy_attack_item(state, self.player))
+        self.__connect_regions(self.sunken_city_l, self.sunken_city_boss,
                                lambda state: _has_beast_form(state, self.player) and
                                              _has_sun_form(state, self.player) and
                                              _has_energy_attack_item(state, self.player) and
@@ -820,62 +784,55 @@ def __connect_body_regions(self) -> None:
         """
         Connect entrances of the different regions around The Body
         """
-        self.__connect_regions("Body center area", "Body left area",
-                               self.body_c, self.body_l,
-                               lambda state: _has_energy_form(state, self.player))
-        self.__connect_regions("Body center area", "Body right area top path",
-                               self.body_c, self.body_rt)
-        self.__connect_regions("Body center area", "Body right area bottom path",
-                               self.body_c, self.body_rb,
-                               lambda state: _has_energy_form(state, self.player))
-        self.__connect_regions("Body center area", "Body bottom area",
-                               self.body_c, self.body_b,
+        self.__connect_one_way_regions(self.body_c, self.body_l,
+                                       lambda state: _has_energy_form(state, self.player))
+        self.__connect_one_way_regions(self.body_l, self.body_c)
+        self.__connect_regions(self.body_c, self.body_rt)
+        self.__connect_one_way_regions(self.body_c, self.body_rb,
+                                       lambda state: _has_energy_form(state, self.player))
+        self.__connect_one_way_regions(self.body_rb, self.body_c)
+        self.__connect_regions(self.body_c, self.body_b,
                                lambda state: _has_dual_form(state, self.player))
-        self.__connect_regions("Body bottom area", "Final Boss area",
-                               self.body_b, self.final_boss_loby,
+        self.__connect_regions(self.body_b, self.final_boss_loby,
                                lambda state: _has_dual_form(state, self.player))
-        self.__connect_regions("Before Final Boss", "Final Boss tube",
-                               self.final_boss_loby, self.final_boss_tube,
+        self.__connect_regions(self.final_boss_loby, self.final_boss_tube,
                                lambda state: _has_nature_form(state, self.player))
-        self.__connect_one_way_regions("Before Final Boss", "Final Boss",
-                                       self.final_boss_loby, self.final_boss,
+        self.__connect_one_way_regions(self.final_boss_loby, self.final_boss,
                                        lambda state: _has_energy_form(state, self.player) and
                                                      _has_dual_form(state, self.player) and
                                                      _has_sun_form(state, self.player) and
                                                      _has_bind_song(state, self.player))
-        self.__connect_one_way_regions("final boss third form area", "final boss end",
-                                       self.final_boss, self.final_boss_end)
+        self.__connect_one_way_regions(self.final_boss, self.final_boss_end)
 
-    def __connect_transturtle(self, item_source: str, item_target: str, region_source: Region,
-                              region_target: Region) -> None:
+    def __connect_transturtle(self, item_target: str, region_source: Region, region_target: Region) -> None:
         """Connect a single transturtle to another one"""
-        if item_source != item_target:
-            self.__connect_one_way_regions(item_source, item_target, region_source, region_target,
+        if region_source != region_target:
+            self.__connect_one_way_regions(region_source, region_target,
                                            lambda state: state.has(item_target, self.player))
 
-    def _connect_transturtle_to_other(self, item: str, region: Region) -> None:
+    def _connect_transturtle_to_other(self, region: Region) -> None:
         """Connect a single transturtle to all others"""
-        self.__connect_transturtle(item, "Transturtle Veil top left", region, self.veil_tl)
-        self.__connect_transturtle(item, "Transturtle Veil top right", region, self.veil_tr_l)
-        self.__connect_transturtle(item, "Transturtle Open Water top right", region, self.openwater_tr_turtle)
-        self.__connect_transturtle(item, "Transturtle Forest bottom left", region, self.forest_bl)
-        self.__connect_transturtle(item, "Transturtle Home Water", region, self.home_water_transturtle)
-        self.__connect_transturtle(item, "Transturtle Abyss right", region, self.abyss_r_transturtle)
-        self.__connect_transturtle(item, "Transturtle Final Boss", region, self.final_boss_tube)
-        self.__connect_transturtle(item, "Transturtle Simon Says", region, self.simon)
-        self.__connect_transturtle(item, "Transturtle Arnassi Ruins", region, self.arnassi_cave_transturtle)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_VEIL_TOP_LEFT, region, self.veil_tl)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_VEIL_TOP_RIGHT, region, self.veil_tr_l)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_OPEN_WATERS, region, self.openwater_tr_turtle)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_KELP_FOREST, region, self.forest_bl)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_HOME_WATERS, region, self.home_water_transturtle)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_ABYSS, region, self.abyss_r_transturtle)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_BODY, region, self.final_boss_tube)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_SIMON_SAYS, region, self.simon)
+        self.__connect_transturtle(ItemNames.TRANSTURTLE_ARNASSI_RUINS, region, self.arnassi_cave_transturtle)
 
     def __connect_transturtles(self) -> None:
         """Connect every transturtle with others"""
-        self._connect_transturtle_to_other("Transturtle Veil top left", self.veil_tl)
-        self._connect_transturtle_to_other("Transturtle Veil top right", self.veil_tr_l)
-        self._connect_transturtle_to_other("Transturtle Open Water top right", self.openwater_tr_turtle)
-        self._connect_transturtle_to_other("Transturtle Forest bottom left", self.forest_bl)
-        self._connect_transturtle_to_other("Transturtle Home Water", self.home_water_transturtle)
-        self._connect_transturtle_to_other("Transturtle Abyss right", self.abyss_r_transturtle)
-        self._connect_transturtle_to_other("Transturtle Final Boss", self.final_boss_tube)
-        self._connect_transturtle_to_other("Transturtle Simon Says", self.simon)
-        self._connect_transturtle_to_other("Transturtle Arnassi Ruins", self.arnassi_cave_transturtle)
+        self._connect_transturtle_to_other(self.veil_tl)
+        self._connect_transturtle_to_other(self.veil_tr_l)
+        self._connect_transturtle_to_other(self.openwater_tr_turtle)
+        self._connect_transturtle_to_other(self.forest_bl)
+        self._connect_transturtle_to_other(self.home_water_transturtle)
+        self._connect_transturtle_to_other(self.abyss_r_transturtle)
+        self._connect_transturtle_to_other(self.final_boss_tube)
+        self._connect_transturtle_to_other(self.simon)
+        self._connect_transturtle_to_other(self.arnassi_cave_transturtle)
 
     def connect_regions(self) -> None:
         """
@@ -910,20 +867,20 @@ def __add_event_big_bosses(self) -> None:
         Add every bit bosses (other than the creator) events to the `world`
         """
         self.__add_event_location(self.energy_temple_boss,
-                                  "Beating Fallen God",
-                                  "Fallen God beated")
+                                  AquariaLocationNames.BEATING_FALLEN_GOD,
+                                  ItemNames.FALLEN_GOD_BEATED)
         self.__add_event_location(self.cathedral_boss_l,
-                                  "Beating Mithalan God",
-                                  "Mithalan God beated")
+                                  AquariaLocationNames.BEATING_MITHALAN_GOD,
+                                  ItemNames.MITHALAN_GOD_BEATED)
         self.__add_event_location(self.forest_boss,
-                                  "Beating Drunian God",
-                                  "Drunian God beated")
+                                  AquariaLocationNames.BEATING_DRUNIAN_GOD,
+                                  ItemNames.DRUNIAN_GOD_BEATED)
         self.__add_event_location(self.sun_temple_boss,
-                                  "Beating Sun God",
-                                  "Sun God beated")
+                                  AquariaLocationNames.BEATING_LUMEREAN_GOD,
+                                  ItemNames.LUMEREAN_GOD_BEATED)
         self.__add_event_location(self.sunken_city_boss,
-                                  "Beating the Golem",
-                                  "The Golem beated")
+                                  AquariaLocationNames.BEATING_THE_GOLEM,
+                                  ItemNames.THE_GOLEM_BEATED)
 
     def __add_event_mini_bosses(self) -> None:
         """
@@ -931,43 +888,44 @@ def __add_event_mini_bosses(self) -> None:
         events to the `world`
         """
         self.__add_event_location(self.home_water_nautilus,
-                                  "Beating Nautilus Prime",
-                                  "Nautilus Prime beated")
+                                  AquariaLocationNames.BEATING_NAUTILUS_PRIME,
+                                  ItemNames.NAUTILUS_PRIME_BEATED)
         self.__add_event_location(self.energy_temple_blaster_room,
-                                  "Beating Blaster Peg Prime",
-                                  "Blaster Peg Prime beated")
+                                  AquariaLocationNames.BEATING_BLASTER_PEG_PRIME,
+                                  ItemNames.BLASTER_PEG_PRIME_BEATED)
         self.__add_event_location(self.mermog_boss,
-                                  "Beating Mergog",
-                                  "Mergog beated")
-        self.__add_event_location(self.cathedral_l_tube,
-                                  "Beating Mithalan priests",
-                                  "Mithalan priests beated")
+                                  AquariaLocationNames.BEATING_MERGOG,
+                                  ItemNames.MERGOG_BEATED)
+        self.__add_event_location(self.mithalas_castle_tube,
+                                  AquariaLocationNames.BEATING_MITHALAN_PRIESTS,
+                                  ItemNames.MITHALAN_PRIESTS_BEATED)
         self.__add_event_location(self.octo_cave_t,
-                                  "Beating Octopus Prime",
-                                  "Octopus Prime beated")
+                                  AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+                                  ItemNames.OCTOPUS_PRIME_BEATED)
         self.__add_event_location(self.arnassi_crab_boss,
-                                  "Beating Crabbius Maximus",
-                                  "Crabbius Maximus beated")
+                                  AquariaLocationNames.BEATING_CRABBIUS_MAXIMUS,
+                                  ItemNames.CRABBIUS_MAXIMUS_BEATED)
         self.__add_event_location(self.bubble_cave_boss,
-                                  "Beating Mantis Shrimp Prime",
-                                  "Mantis Shrimp Prime beated")
+                                  AquariaLocationNames.BEATING_MANTIS_SHRIMP_PRIME,
+                                  ItemNames.MANTIS_SHRIMP_PRIME_BEATED)
         self.__add_event_location(self.king_jellyfish_cave,
-                                  "Beating King Jellyfish God Prime",
-                                  "King Jellyfish God Prime beated")
+                                  AquariaLocationNames.BEATING_KING_JELLYFISH_GOD_PRIME,
+                                  ItemNames.KING_JELLYFISH_GOD_PRIME_BEATED)
 
     def __add_event_secrets(self) -> None:
         """
         Add secrets events to the `world`
         """
-        self.__add_event_location(self.first_secret,  # Doit ajouter une région pour le "first secret"
-                                  "First secret",
-                                  "First secret obtained")
+        self.__add_event_location(self.first_secret,
+                                  # Doit ajouter une région pour le AquariaLocationNames.FIRST_SECRET
+                                  AquariaLocationNames.FIRST_SECRET,
+                                  ItemNames.FIRST_SECRET_OBTAINED)
         self.__add_event_location(self.mithalas_city,
-                                  "Second secret",
-                                  "Second secret obtained")
+                                  AquariaLocationNames.SECOND_SECRET,
+                                  ItemNames.SECOND_SECRET_OBTAINED)
         self.__add_event_location(self.sun_temple_l,
-                                  "Third secret",
-                                  "Third secret obtained")
+                                  AquariaLocationNames.THIRD_SECRET,
+                                  ItemNames.THIRD_SECRET_OBTAINED)
 
     def add_event_locations(self) -> None:
         """
@@ -977,287 +935,236 @@ def add_event_locations(self) -> None:
         self.__add_event_big_bosses()
         self.__add_event_secrets()
         self.__add_event_location(self.sunken_city_boss,
-                                  "Sunken City cleared",
-                                  "Body tongue cleared")
+                                  AquariaLocationNames.SUNKEN_CITY_CLEARED,
+                                  ItemNames.BODY_TONGUE_CLEARED)
         self.__add_event_location(self.sun_temple_r,
-                                  "Sun Crystal",
-                                  "Has sun crystal")
-        self.__add_event_location(self.final_boss_end, "Objective complete",
-                                  "Victory")
-
-    def __adjusting_urns_rules(self) -> None:
-        """Since Urns need to be broken, add a damaging item to rules"""
-        add_rule(self.multiworld.get_location("Open Water top right area, first urn in the Mithalas exit", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(
-            self.multiworld.get_location("Open Water top right area, second urn in the Mithalas exit", self.player),
-            lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Open Water top right area, third urn in the Mithalas exit", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, first urn in one of the homes", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, second urn in one of the homes", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, first urn in the city reserve", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, second urn in the city reserve", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, third urn in the city reserve", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, urn in the Castle flower tube entrance", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City Castle, urn in the bedroom", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City Castle, first urn of the single lamp path", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City Castle, second urn of the single lamp path", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City Castle, urn in the bottom room", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City Castle, first urn on the entrance path", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City Castle, second urn on the entrance path", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, urn inside a home fish pass", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-
-    def __adjusting_crates_rules(self) -> None:
-        """Since Crate need to be broken, add a damaging item to rules"""
-        add_rule(self.multiworld.get_location("Sunken City right area, crate close to the save crystal", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Sunken City right area, crate in the left bottom room", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Sunken City left area, crate in the little pipe room", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Sunken City left area, crate close to the save crystal", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Sunken City left area, crate before the bedroom", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
+                                  AquariaLocationNames.SUN_CRYSTAL,
+                                  ItemNames.HAS_SUN_CRYSTAL)
+        self.__add_event_location(self.final_boss_end, AquariaLocationNames.OBJECTIVE_COMPLETE,
+                                  ItemNames.VICTORY)
 
     def __adjusting_soup_rules(self) -> None:
         """
         Modify rules for location that need soup
         """
-        add_rule(self.multiworld.get_location("Turtle cave, Urchin Costume", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.TURTLE_CAVE_URCHIN_COSTUME, self.player),
                  lambda state: _has_hot_soup(state, self.player))
-        add_rule(self.multiworld.get_location("The Veil top right area, bulb at the top of the waterfall", self.player),
-                 lambda state: _has_beast_and_soup_form(state, self.player))
+        add_rule(self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB, self.player),
+                 lambda state: _has_beast_and_soup_form(state, self.player) or
+                               state.has(ItemNames.LUMEREAN_GOD_BEATED, self.player), combine="or")
+        add_rule(self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB, self.player),
+                 lambda state: _has_beast_and_soup_form(state, self.player) or
+                               state.has(ItemNames.LUMEREAN_GOD_BEATED, self.player), combine="or")
+        add_rule(
+            self.multiworld.get_location(AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+                                         self.player),
+            lambda state: _has_beast_and_soup_form(state, self.player))
 
     def __adjusting_under_rock_location(self) -> None:
         """
         Modify rules implying bind song needed for bulb under rocks
         """
-        add_rule(self.multiworld.get_location("Home Water, bulb under the rock in the left path from the Verse Cave",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Verse Cave left area, bulb under the rock at the end of the path",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Naija's Home, bulb under the rock at the right of the main path",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Song Cave, bulb under the rock in the path to the singing statues",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Song Cave, bulb under the rock close to the song door",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Energy Temple second area, bulb under the rock",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Open Water top left area, bulb under the rock in the right path",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Open Water top left area, bulb under the rock in the left path",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Kelp Forest top right area, bulb under the rock in the right path",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("The Veil top left area, bulb under the rock in the top right path",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Abyss right area, bulb behind the rock in the whale room",
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.HOME_WATERS_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH_FROM_THE_VERSE_CAVE,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.VERSE_CAVE_LEFT_AREA_BULB_UNDER_THE_ROCK_AT_THE_END_OF_THE_PATH,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.NAIJA_S_HOME_BULB_UNDER_THE_ROCK_AT_THE_RIGHT_OF_THE_MAIN_PATH,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.SONG_CAVE_BULB_UNDER_THE_ROCK_IN_THE_PATH_TO_THE_SINGING_STATUES,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(AquariaLocationNames.SONG_CAVE_BULB_UNDER_THE_ROCK_CLOSE_TO_THE_SONG_DOOR,
                                               self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Abyss right area, bulb in the middle path",
+        add_rule(self.multiworld.get_location(AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK,
                                               self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("The Veil top left area, bulb under the rock in the top right path",
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(
+            self.multiworld.get_location(AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM,
+                                         self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_MIDDLE_PATH,
                                               self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH,
+            self.player), lambda state: _has_bind_song(state, self.player))
 
     def __adjusting_light_in_dark_place_rules(self) -> None:
-        add_rule(self.multiworld.get_location("Kelp Forest top right area, Black Pearl", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL, self.player),
                  lambda state: _has_light(state, self.player))
-        add_rule(self.multiworld.get_location("Kelp Forest bottom right area, Odd Container", self.player),
-                 lambda state: _has_light(state, self.player))
-        add_rule(self.multiworld.get_entrance("Body center area to Abyss left bottom area", self.player),
-                 lambda state: _has_light(state, self.player))
-        add_rule(self.multiworld.get_entrance("Veil left of sun temple to Octo cave top path", self.player),
+        add_rule(
+            self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER, self.player),
+            lambda state: _has_light(state, self.player))
+        add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.sun_temple_l_entrance, self.sun_temple_l),
+                                              self.player), lambda state: _has_light(state, self.player) or
+                                                                          _has_sun_crystal(state, self.player))
+        add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.sun_temple_boss_path, self.sun_temple_l),
+                                              self.player), lambda state: _has_light(state, self.player) or
+                                                                          _has_sun_crystal(state, self.player))
+        add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.abyss_r_transturtle, self.abyss_r),
+                                              self.player),
                  lambda state: _has_light(state, self.player))
-        add_rule(self.multiworld.get_entrance("Open Water bottom right area to Abyss right area", self.player),
+        add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.body_c, self.abyss_lb), self.player),
                  lambda state: _has_light(state, self.player))
-        add_rule(self.multiworld.get_entrance("Open Water bottom left area to Abyss left area", self.player),
+        add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.openwater_br, self.abyss_r), self.player),
                  lambda state: _has_light(state, self.player))
-        add_rule(self.multiworld.get_entrance("Veil left of sun temple to Sun Temple left area", self.player),
-                 lambda state: _has_light(state, self.player) or _has_sun_crystal(state, self.player))
-        add_rule(self.multiworld.get_entrance("Abyss right area, transturtle to Abyss right area", self.player),
+        add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.openwater_bl, self.abyss_l), self.player),
                  lambda state: _has_light(state, self.player))
 
     def __adjusting_manual_rules(self) -> None:
-        add_rule(self.multiworld.get_location("Mithalas Cathedral, Mithalan Dress", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS, self.player),
                  lambda state: _has_beast_form(state, self.player))
-        add_rule(
-            self.multiworld.get_location("Open Water bottom left area, bulb inside the lowest fish pass", self.player),
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_INSIDE_THE_LOWEST_FISH_PASS, self.player),
             lambda state: _has_fish_form(state, self.player))
-        add_rule(self.multiworld.get_location("Kelp Forest bottom left area, Walker Baby", self.player),
-                 lambda state: _has_spirit_form(state, self.player))
         add_rule(
-            self.multiworld.get_location("The Veil top left area, bulb hidden behind the blocking rock", self.player),
+            self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY, self.player),
+            lambda state: _has_spirit_form(state, self.player))
+        add_rule(
+            self.multiworld.get_location(
+                AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_HIDDEN_BEHIND_THE_BLOCKING_ROCK, self.player),
             lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Turtle cave, Turtle Egg", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.TURTLE_CAVE_TURTLE_EGG, self.player),
                  lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Abyss left area, bulb in the bottom fish pass", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS,
+                                              self.player),
                  lambda state: _has_fish_form(state, self.player))
-        add_rule(self.multiworld.get_location("Song Cave, Anemone Seed", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.SONG_CAVE_ANEMONE_SEED, self.player),
                  lambda state: _has_nature_form(state, self.player))
-        add_rule(self.multiworld.get_location("Song Cave, Verse Egg", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.SONG_CAVE_VERSE_EGG, self.player),
                  lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Verse Cave right area, Big Seed", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.VERSE_CAVE_RIGHT_AREA_BIG_SEED, self.player),
                  lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Arnassi Ruins, Song Plant Spore", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.ARNASSI_RUINS_SONG_PLANT_SPORE, self.player),
                  lambda state: _has_beast_form_or_arnassi_armor(state, self.player))
-        add_rule(self.multiworld.get_location("Energy Temple first area, bulb in the bottom room blocked by a rock",
-                                              self.player), lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Home Water, bulb in the bottom left room", self.player),
-                 lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Home Water, bulb in the path below Nautilus Prime", self.player),
-                 lambda state: _has_bind_song(state, self.player))
-        add_rule(self.multiworld.get_location("Naija's Home, bulb after the energy door", self.player),
-                 lambda state: _has_energy_attack_item(state, self.player))
-        add_rule(self.multiworld.get_location("Abyss right area, bulb behind the rock in the whale room", self.player),
-                 lambda state: _has_spirit_form(state, self.player) and
-                               _has_sun_form(state, self.player))
-        add_rule(self.multiworld.get_location("Arnassi Ruins, Arnassi Armor", self.player),
+        add_rule(self.multiworld.get_location(
+            AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BULB_IN_THE_BOTTOM_ROOM_BLOCKED_BY_A_ROCK,
+            self.player), lambda state: _has_bind_song(state, self.player))
+        add_rule(
+            self.multiworld.get_location(AquariaLocationNames.NAIJA_S_HOME_BULB_AFTER_THE_ENERGY_DOOR, self.player),
+            lambda state: _has_energy_attack_item(state, self.player))
+        add_rule(self.multiworld.get_location(AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR, self.player),
                  lambda state: _has_fish_form(state, self.player) or
                                _has_beast_and_soup_form(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, urn inside a home fish pass", self.player),
-                 lambda state: _has_damaging_item(state, self.player))
-        add_rule(self.multiworld.get_location("Mithalas City, urn in the Castle flower tube entrance", self.player),
+        add_rule(
+            self.multiworld.get_location(AquariaLocationNames.MITHALAS_CITY_URN_INSIDE_A_HOME_FISH_PASS, self.player),
+            lambda state: _has_damaging_item(state, self.player))
+        add_rule(self.multiworld.get_location(AquariaLocationNames.MITHALAS_CITY_URN_IN_THE_CASTLE_FLOWER_TUBE_ENTRANCE,
+                                              self.player),
                  lambda state: _has_damaging_item(state, self.player))
         add_rule(self.multiworld.get_location(
-            "The Veil top right area, bulb in the middle of the wall jump cliff", self.player
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_IN_THE_MIDDLE_OF_THE_WALL_JUMP_CLIFF, self.player
         ), lambda state: _has_beast_form_or_arnassi_armor(state, self.player))
-        add_rule(self.multiworld.get_location("Kelp Forest top left area, Jelly Egg", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG, self.player),
                  lambda state: _has_beast_form(state, self.player))
-        add_rule(self.multiworld.get_location("Sun Worm path, first cliff bulb", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB, self.player),
                  lambda state: state.has("Sun God beated", self.player))
-        add_rule(self.multiworld.get_location("Sun Worm path, second cliff bulb", self.player),
+        add_rule(self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB, self.player),
                  lambda state: state.has("Sun God beated", self.player))
-        add_rule(self.multiworld.get_location("The Body center area, breaking Li's cage", self.player),
-                 lambda state: _has_tongue_cleared(state, self.player))
+        add_rule(
+            self.multiworld.get_location(AquariaLocationNames.THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE, self.player),
+            lambda state: _has_tongue_cleared(state, self.player))
         add_rule(self.multiworld.get_location(
-                 "Open Water top right area, bulb in the small path before Mithalas",
-                 self.player), lambda state: _has_bind_song(state, self.player)
+            AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_SMALL_PATH_BEFORE_MITHALAS,
+            self.player), lambda state: _has_bind_song(state, self.player)
         )
 
     def __no_progression_hard_or_hidden_location(self) -> None:
-        self.multiworld.get_location("Energy Temple boss area, Fallen God Tooth",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Mithalas boss area, beating Mithalan God",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Kelp Forest boss area, beating Drunian God",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Sun Temple boss area, beating Sun God",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Sunken City, bulb on top of the boss area",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Home Water, Nautilus Egg",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Energy Temple blaster room, Blaster Egg",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Mithalas City Castle, beating the Priests",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Mermog cave, Piranha Egg",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Octopus Cave, Dumbo Egg",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("King Jellyfish Cave, bulb in the right path from King Jelly",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("King Jellyfish Cave, Jellyfish Costume",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Final Boss area, bulb in the boss third form room",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Sun Worm path, first cliff bulb",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Sun Worm path, second cliff bulb",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("The Veil top right area, bulb at the top of the waterfall",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Bubble Cave, bulb in the left cave wall",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Bubble Cave, Verse Egg",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Kelp Forest bottom left area, bulb close to the spirit crystals",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Kelp Forest bottom left area, Walker Baby",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Sun Temple, Sun Key",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("The Body bottom area, Mutant Costume",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Sun Temple, bulb in the hidden room of the right part",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
-        self.multiworld.get_location("Arnassi Ruins, Arnassi Armor",
-                                     self.player).item_rule = \
-            lambda item: not item.advancement
+        self.multiworld.get_location(AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(
+            AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+            self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(
+            AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS,
+            self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_SUN_KEY,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART,
+                                     self.player).item_rule = _item_not_advancement
+        self.multiworld.get_location(AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
+                                     self.player).item_rule = _item_not_advancement
 
     def adjusting_rules(self, options: AquariaOptions) -> None:
         """
         Modify rules for single location or optional rules
         """
-        self.multiworld.get_entrance("Before Final Boss to Final Boss", self.player)
-        self.__adjusting_urns_rules()
-        self.__adjusting_crates_rules()
-        self.__adjusting_soup_rules()
         self.__adjusting_manual_rules()
+        self.__adjusting_soup_rules()
         if options.light_needed_to_get_to_dark_places:
             self.__adjusting_light_in_dark_place_rules()
         if options.bind_song_needed_to_get_under_rock_bulb:
             self.__adjusting_under_rock_location()
 
         if options.mini_bosses_to_beat.value > 0:
-            add_rule(self.multiworld.get_entrance("Before Final Boss to Final Boss", self.player),
-                     lambda state: _has_mini_bosses(state, self.player))
+            add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_loby, self.final_boss),
+                                                  self.player), lambda state: _has_mini_bosses(state, self.player))
         if options.big_bosses_to_beat.value > 0:
-            add_rule(self.multiworld.get_entrance("Before Final Boss to Final Boss", self.player),
-                     lambda state: _has_big_bosses(state, self.player))
-        if options.objective.value == 1:
-            add_rule(self.multiworld.get_entrance("Before Final Boss to Final Boss", self.player),
-                     lambda state: _has_secrets(state, self.player))
-        if options.unconfine_home_water.value in [0, 1]:
-            add_rule(self.multiworld.get_entrance("Home Water to Home Water transturtle room", self.player),
-                     lambda state: _has_bind_song(state, self.player))
-        if options.unconfine_home_water.value in [0, 2]:
-            add_rule(self.multiworld.get_entrance("Home Water to Open Water top left area", self.player),
-                     lambda state: _has_bind_song(state, self.player) and _has_energy_attack_item(state, self.player))
-        if options.early_energy_form:
-            self.multiworld.early_items[self.player]["Energy form"] = 1
-
+            add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_loby, self.final_boss),
+                                                  self.player), lambda state: _has_big_bosses(state, self.player))
+        if options.objective.value == options.objective.option_obtain_secrets_and_kill_the_creator:
+            add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.final_boss_loby, self.final_boss),
+                                                  self.player), lambda state: _has_secrets(state, self.player))
+        if (options.unconfine_home_water.value == UnconfineHomeWater.option_via_energy_door or
+                options.unconfine_home_water.value == UnconfineHomeWater.option_off):
+            add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.home_water, self.home_water_transturtle),
+                                                  self.player), lambda state: _has_bind_song(state, self.player))
+        if (options.unconfine_home_water.value == UnconfineHomeWater.option_via_transturtle or
+                options.unconfine_home_water.value == UnconfineHomeWater.option_off):
+            add_rule(self.multiworld.get_entrance(self.get_entrance_name(self.home_water, self.openwater_tl),
+                                                  self.player),
+                     lambda state: _has_bind_song(state, self.player) and
+                                   _has_energy_attack_item(state, self.player))
         if options.no_progression_hard_or_hidden_locations:
             self.__no_progression_hard_or_hidden_location()
 
@@ -1292,9 +1199,9 @@ def __add_open_water_regions_to_world(self) -> None:
         self.multiworld.regions.append(self.skeleton_path)
         self.multiworld.regions.append(self.skeleton_path_sc)
         self.multiworld.regions.append(self.arnassi)
-        self.multiworld.regions.append(self.arnassi_path)
-        self.multiworld.regions.append(self.arnassi_crab_boss)
+        self.multiworld.regions.append(self.arnassi_cave)
         self.multiworld.regions.append(self.arnassi_cave_transturtle)
+        self.multiworld.regions.append(self.arnassi_crab_boss)
         self.multiworld.regions.append(self.simon)
 
     def __add_mithalas_regions_to_world(self) -> None:
@@ -1304,10 +1211,12 @@ def __add_mithalas_regions_to_world(self) -> None:
         self.multiworld.regions.append(self.mithalas_city)
         self.multiworld.regions.append(self.mithalas_city_top_path)
         self.multiworld.regions.append(self.mithalas_city_fishpass)
-        self.multiworld.regions.append(self.cathedral_l)
-        self.multiworld.regions.append(self.cathedral_l_tube)
-        self.multiworld.regions.append(self.cathedral_l_sc)
-        self.multiworld.regions.append(self.cathedral_r)
+        self.multiworld.regions.append(self.mithalas_castle)
+        self.multiworld.regions.append(self.mithalas_castle_tube)
+        self.multiworld.regions.append(self.mithalas_castle_sc)
+        self.multiworld.regions.append(self.cathedral_top_start)
+        self.multiworld.regions.append(self.cathedral_top_start_urns)
+        self.multiworld.regions.append(self.cathedral_top_end)
         self.multiworld.regions.append(self.cathedral_underground)
         self.multiworld.regions.append(self.cathedral_boss_l)
         self.multiworld.regions.append(self.cathedral_boss_r)
@@ -1317,7 +1226,7 @@ def __add_forest_regions_to_world(self) -> None:
         Add every region around the kelp forest to the `world`
         """
         self.multiworld.regions.append(self.forest_tl)
-        self.multiworld.regions.append(self.forest_tl_fp)
+        self.multiworld.regions.append(self.forest_tl_verse_egg_room)
         self.multiworld.regions.append(self.forest_tr)
         self.multiworld.regions.append(self.forest_tr_fp)
         self.multiworld.regions.append(self.forest_bl)
@@ -1325,8 +1234,8 @@ def __add_forest_regions_to_world(self) -> None:
         self.multiworld.regions.append(self.forest_br)
         self.multiworld.regions.append(self.forest_boss)
         self.multiworld.regions.append(self.forest_boss_entrance)
-        self.multiworld.regions.append(self.forest_sprite_cave)
-        self.multiworld.regions.append(self.forest_sprite_cave_tube)
+        self.multiworld.regions.append(self.sprite_cave)
+        self.multiworld.regions.append(self.sprite_cave_tube)
         self.multiworld.regions.append(self.mermog_cave)
         self.multiworld.regions.append(self.mermog_boss)
         self.multiworld.regions.append(self.forest_fish_cave)
@@ -1338,16 +1247,18 @@ def __add_veil_regions_to_world(self) -> None:
         self.multiworld.regions.append(self.veil_tl)
         self.multiworld.regions.append(self.veil_tl_fp)
         self.multiworld.regions.append(self.veil_tr_l)
+        self.multiworld.regions.append(self.veil_tr_l_fp)
         self.multiworld.regions.append(self.veil_tr_r)
-        self.multiworld.regions.append(self.veil_bl)
+        self.multiworld.regions.append(self.veil_b)
         self.multiworld.regions.append(self.veil_b_sc)
-        self.multiworld.regions.append(self.veil_bl_fp)
+        self.multiworld.regions.append(self.veil_b_fp)
         self.multiworld.regions.append(self.veil_br)
         self.multiworld.regions.append(self.octo_cave_t)
         self.multiworld.regions.append(self.octo_cave_b)
         self.multiworld.regions.append(self.turtle_cave)
         self.multiworld.regions.append(self.turtle_cave_bubble)
         self.multiworld.regions.append(self.sun_temple_l)
+        self.multiworld.regions.append(self.sun_temple_l_entrance)
         self.multiworld.regions.append(self.sun_temple_r)
         self.multiworld.regions.append(self.sun_temple_boss_path)
         self.multiworld.regions.append(self.sun_temple_boss)
@@ -1359,6 +1270,7 @@ def __add_abyss_regions_to_world(self) -> None:
         self.multiworld.regions.append(self.abyss_l)
         self.multiworld.regions.append(self.abyss_lb)
         self.multiworld.regions.append(self.abyss_r)
+        self.multiworld.regions.append(self.abyss_r_whale)
         self.multiworld.regions.append(self.abyss_r_transturtle)
         self.multiworld.regions.append(self.ice_cave)
         self.multiworld.regions.append(self.bubble_cave)
diff --git a/worlds/aquaria/__init__.py b/worlds/aquaria/__init__.py
index f620bf6d7306..1f7b956bb34b 100644
--- a/worlds/aquaria/__init__.py
+++ b/worlds/aquaria/__init__.py
@@ -7,9 +7,10 @@
 from typing import List, Dict, ClassVar, Any
 from worlds.AutoWorld import World, WebWorld
 from BaseClasses import Tutorial, MultiWorld, ItemClassification
-from .Items import item_table, AquariaItem, ItemType, ItemGroup
-from .Locations import location_table
-from .Options import AquariaOptions
+from .Items import item_table, AquariaItem, ItemType, ItemGroup, ItemNames
+from .Locations import location_table, AquariaLocationNames
+from .Options import (AquariaOptions, IngredientRandomizer, TurtleRandomizer, EarlyBindSong, EarlyEnergyForm,
+                      UnconfineHomeWater, Objective)
 from .Regions import AquariaRegions
 
 
@@ -65,15 +66,15 @@ class AquariaWorld(World):
     web: WebWorld = AquariaWeb()
     "The web page generation informations"
 
-    item_name_to_id: ClassVar[Dict[str, int]] =\
+    item_name_to_id: ClassVar[Dict[str, int]] = \
         {name: data.id for name, data in item_table.items()}
     "The name and associated ID of each item of the world"
 
     item_name_groups = {
-        "Damage": {"Energy form", "Nature form", "Beast form",
-                   "Li and Li song", "Baby Nautilus", "Baby Piranha",
-                   "Baby Blaster"},
-        "Light": {"Sun form", "Baby Dumbo"}
+        "Damage": {ItemNames.ENERGY_FORM, ItemNames.NATURE_FORM, ItemNames.BEAST_FORM,
+                   ItemNames.LI_AND_LI_SONG, ItemNames.BABY_NAUTILUS, ItemNames.BABY_PIRANHA,
+                   ItemNames.BABY_BLASTER},
+        "Light": {ItemNames.SUN_FORM, ItemNames.BABY_DUMBO}
     }
     """Grouping item make it easier to find them"""
 
@@ -148,23 +149,32 @@ def get_filler_item_name(self):
     def create_items(self) -> None:
         """Create every item in the world"""
         precollected = [item.name for item in self.multiworld.precollected_items[self.player]]
-        if self.options.turtle_randomizer.value > 0:
-            if self.options.turtle_randomizer.value == 2:
-                self.__pre_fill_item("Transturtle Final Boss", "Final Boss area, Transturtle", precollected)
+        if self.options.turtle_randomizer.value != TurtleRandomizer.option_none:
+            if self.options.turtle_randomizer.value == TurtleRandomizer.option_all_except_final:
+                self.__pre_fill_item(ItemNames.TRANSTURTLE_BODY, AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE,
+                                     precollected)
         else:
-            self.__pre_fill_item("Transturtle Veil top left", "The Veil top left area, Transturtle", precollected)
-            self.__pre_fill_item("Transturtle Veil top right", "The Veil top right area, Transturtle", precollected)
-            self.__pre_fill_item("Transturtle Open Water top right", "Open Water top right area, Transturtle",
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_VEIL_TOP_LEFT,
+                                 AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_TRANSTURTLE, precollected)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_VEIL_TOP_RIGHT,
+                                 AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_TRANSTURTLE, precollected)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_OPEN_WATERS,
+                                 AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_TRANSTURTLE,
                                  precollected)
-            self.__pre_fill_item("Transturtle Forest bottom left", "Kelp Forest bottom left area, Transturtle",
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_KELP_FOREST,
+                                 AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE,
+                                 precollected)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_HOME_WATERS, AquariaLocationNames.HOME_WATERS_TRANSTURTLE,
+                                 precollected)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_ABYSS, AquariaLocationNames.ABYSS_RIGHT_AREA_TRANSTURTLE,
+                                 precollected)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_BODY, AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE,
                                  precollected)
-            self.__pre_fill_item("Transturtle Home Water", "Home Water, Transturtle", precollected)
-            self.__pre_fill_item("Transturtle Abyss right", "Abyss right area, Transturtle", precollected)
-            self.__pre_fill_item("Transturtle Final Boss", "Final Boss area, Transturtle", precollected)
             # The last two are inverted because in the original game, they are special turtle that communicate directly
-            self.__pre_fill_item("Transturtle Simon Says", "Arnassi Ruins, Transturtle", precollected,
-                                 ItemClassification.progression)
-            self.__pre_fill_item("Transturtle Arnassi Ruins", "Simon Says area, Transturtle", precollected)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_SIMON_SAYS, AquariaLocationNames.ARNASSI_RUINS_TRANSTURTLE,
+                                 precollected, ItemClassification.progression)
+            self.__pre_fill_item(ItemNames.TRANSTURTLE_ARNASSI_RUINS, AquariaLocationNames.SIMON_SAYS_AREA_TRANSTURTLE,
+                                 precollected)
         for name, data in item_table.items():
             if name not in self.exclude:
                 for i in range(data.count):
@@ -175,10 +185,17 @@ def set_rules(self) -> None:
         """
         Launched when the Multiworld generator is ready to generate rules
         """
-
+        if self.options.early_energy_form == EarlyEnergyForm.option_early:
+            self.multiworld.early_items[self.player][ItemNames.ENERGY_FORM] = 1
+        elif self.options.early_energy_form == EarlyEnergyForm.option_early_and_local:
+            self.multiworld.local_early_items[self.player][ItemNames.ENERGY_FORM] = 1
+        if self.options.early_bind_song == EarlyBindSong.option_early:
+            self.multiworld.early_items[self.player][ItemNames.BIND_SONG] = 1
+        elif self.options.early_bind_song == EarlyBindSong.option_early_and_local:
+            self.multiworld.local_early_items[self.player][ItemNames.BIND_SONG] = 1
         self.regions.adjusting_rules(self.options)
         self.multiworld.completion_condition[self.player] = lambda \
-            state: state.has("Victory", self.player)
+                state: state.has(ItemNames.VICTORY, self.player)
 
     def generate_basic(self) -> None:
         """
@@ -186,13 +203,13 @@ def generate_basic(self) -> None:
         Used to fill then `ingredients_substitution` list
         """
         simple_ingredients_substitution = [i for i in range(27)]
-        if self.options.ingredient_randomizer.value > 0:
-            if self.options.ingredient_randomizer.value == 1:
+        if self.options.ingredient_randomizer.value > IngredientRandomizer.option_off:
+            if self.options.ingredient_randomizer.value == IngredientRandomizer.option_common_ingredients:
                 simple_ingredients_substitution.pop(-1)
                 simple_ingredients_substitution.pop(-1)
                 simple_ingredients_substitution.pop(-1)
             self.random.shuffle(simple_ingredients_substitution)
-            if self.options.ingredient_randomizer.value == 1:
+            if self.options.ingredient_randomizer.value == IngredientRandomizer.option_common_ingredients:
                 simple_ingredients_substitution.extend([24, 25, 26])
         dishes_substitution = [i for i in range(27, 76)]
         if self.options.dish_randomizer:
@@ -205,14 +222,19 @@ def fill_slot_data(self) -> Dict[str, Any]:
         return {"ingredientReplacement": self.ingredients_substitution,
                 "aquarian_translate": bool(self.options.aquarian_translation.value),
                 "blind_goal": bool(self.options.blind_goal.value),
-                "secret_needed": self.options.objective.value > 0,
+                "secret_needed":
+                    self.options.objective.value == Objective.option_obtain_secrets_and_kill_the_creator,
                 "minibosses_to_kill": self.options.mini_bosses_to_beat.value,
                 "bigbosses_to_kill": self.options.big_bosses_to_beat.value,
                 "skip_first_vision": bool(self.options.skip_first_vision.value),
-                "unconfine_home_water_energy_door": self.options.unconfine_home_water.value in [1, 3],
-                "unconfine_home_water_transturtle": self.options.unconfine_home_water.value in [2, 3],
+                "unconfine_home_water_energy_door":
+                    self.options.unconfine_home_water.value == UnconfineHomeWater.option_via_energy_door
+                    or self.options.unconfine_home_water.value == UnconfineHomeWater.option_via_both,
+                "unconfine_home_water_transturtle":
+                    self.options.unconfine_home_water.value == UnconfineHomeWater.option_via_transturtle
+                    or self.options.unconfine_home_water.value == UnconfineHomeWater.option_via_both,
                 "bind_song_needed_to_get_under_rock_bulb": bool(self.options.bind_song_needed_to_get_under_rock_bulb),
                 "no_progression_hard_or_hidden_locations": bool(self.options.no_progression_hard_or_hidden_locations),
                 "light_needed_to_get_to_dark_places": bool(self.options.light_needed_to_get_to_dark_places),
-                "turtle_randomizer": self.options.turtle_randomizer.value,
+                "turtle_randomizer": self.options.turtle_randomizer.value
                 }
diff --git a/worlds/aquaria/docs/en_Aquaria.md b/worlds/aquaria/docs/en_Aquaria.md
index c3e5f54dd66a..836a942be741 100644
--- a/worlds/aquaria/docs/en_Aquaria.md
+++ b/worlds/aquaria/docs/en_Aquaria.md
@@ -24,7 +24,7 @@ The locations in the randomizer are:
     * Beating Mithalan God boss
     * Fish Cave puzzle
     * Beating Drunian God boss
-    * Beating Sun God boss
+    * Beating Lumerean God boss
     * Breaking Li cage in the body
 
 Note that, unlike the vanilla game, when opening sing bulbs, Mithalas urns and Sunken City crates,
diff --git a/worlds/aquaria/test/__init__.py b/worlds/aquaria/test/__init__.py
index 8c4f64c3452c..05f46fc76259 100644
--- a/worlds/aquaria/test/__init__.py
+++ b/worlds/aquaria/test/__init__.py
@@ -6,211 +6,212 @@
 
 
 from test.bases import WorldTestBase
+from ..Locations import AquariaLocationNames
 
 # Every location accessible after the home water.
 after_home_water_locations = [
-    "Sun Crystal",
-    "Home Water, Transturtle",
-    "Open Water top left area, bulb under the rock in the right path",
-    "Open Water top left area, bulb under the rock in the left path",
-    "Open Water top left area, bulb to the right of the save crystal",
-    "Open Water top right area, bulb in the small path before Mithalas",
-    "Open Water top right area, bulb in the path from the left entrance",
-    "Open Water top right area, bulb in the clearing close to the bottom exit",
-    "Open Water top right area, bulb in the big clearing close to the save crystal",
-    "Open Water top right area, bulb in the big clearing to the top exit",
-    "Open Water top right area, first urn in the Mithalas exit",
-    "Open Water top right area, second urn in the Mithalas exit",
-    "Open Water top right area, third urn in the Mithalas exit",
-    "Open Water top right area, bulb in the turtle room",
-    "Open Water top right area, Transturtle",
-    "Open Water bottom left area, bulb behind the chomper fish",
-    "Open Water bottom left area, bulb inside the lowest fish pass",
-    "Open Water skeleton path, bulb close to the right exit",
-    "Open Water skeleton path, bulb behind the chomper fish",
-    "Open Water skeleton path, King Skull",
-    "Arnassi Ruins, bulb in the right part",
-    "Arnassi Ruins, bulb in the left part",
-    "Arnassi Ruins, bulb in the center part",
-    "Arnassi Ruins, Song Plant Spore",
-    "Arnassi Ruins, Arnassi Armor",
-    "Arnassi Ruins, Arnassi Statue",
-    "Arnassi Ruins, Transturtle",
-    "Arnassi Ruins, Crab Armor",
-    "Simon Says area, Transturtle",
-    "Mithalas City, first bulb in the left city part",
-    "Mithalas City, second bulb in the left city part",
-    "Mithalas City, bulb in the right part",
-    "Mithalas City, bulb at the top of the city",
-    "Mithalas City, first bulb in a broken home",
-    "Mithalas City, second bulb in a broken home",
-    "Mithalas City, bulb in the bottom left part",
-    "Mithalas City, first bulb in one of the homes",
-    "Mithalas City, second bulb in one of the homes",
-    "Mithalas City, first urn in one of the homes",
-    "Mithalas City, second urn in one of the homes",
-    "Mithalas City, first urn in the city reserve",
-    "Mithalas City, second urn in the city reserve",
-    "Mithalas City, third urn in the city reserve",
-    "Mithalas City, first bulb at the end of the top path",
-    "Mithalas City, second bulb at the end of the top path",
-    "Mithalas City, bulb in the top path",
-    "Mithalas City, Mithalas Pot",
-    "Mithalas City, urn in the Castle flower tube entrance",
-    "Mithalas City, Doll",
-    "Mithalas City, urn inside a home fish pass",
-    "Mithalas City Castle, bulb in the flesh hole",
-    "Mithalas City Castle, Blue Banner",
-    "Mithalas City Castle, urn in the bedroom",
-    "Mithalas City Castle, first urn of the single lamp path",
-    "Mithalas City Castle, second urn of the single lamp path",
-    "Mithalas City Castle, urn in the bottom room",
-    "Mithalas City Castle, first urn on the entrance path",
-    "Mithalas City Castle, second urn on the entrance path",
-    "Mithalas City Castle, beating the Priests",
-    "Mithalas City Castle, Trident Head",
-    "Mithalas Cathedral, first urn in the top right room",
-    "Mithalas Cathedral, second urn in the top right room",
-    "Mithalas Cathedral, third urn in the top right room",
-    "Mithalas Cathedral, urn in the flesh room with fleas",
-    "Mithalas Cathedral, first urn in the bottom right path",
-    "Mithalas Cathedral, second urn in the bottom right path",
-    "Mithalas Cathedral, urn behind the flesh vein",
-    "Mithalas Cathedral, urn in the top left eyes boss room",
-    "Mithalas Cathedral, first urn in the path behind the flesh vein",
-    "Mithalas Cathedral, second urn in the path behind the flesh vein",
-    "Mithalas Cathedral, third urn in the path behind the flesh vein",
-    "Mithalas Cathedral, fourth urn in the top right room",
-    "Mithalas Cathedral, Mithalan Dress",
-    "Mithalas Cathedral, urn below the left entrance",
-    "Cathedral Underground, bulb in the center part",
-    "Cathedral Underground, first bulb in the top left part",
-    "Cathedral Underground, second bulb in the top left part",
-    "Cathedral Underground, third bulb in the top left part",
-    "Cathedral Underground, bulb close to the save crystal",
-    "Cathedral Underground, bulb in the bottom right path",
-    "Mithalas boss area, beating Mithalan God",
-    "Kelp Forest top left area, bulb in the bottom left clearing",
-    "Kelp Forest top left area, bulb in the path down from the top left clearing",
-    "Kelp Forest top left area, bulb in the top left clearing",
-    "Kelp Forest top left area, Jelly Egg",
-    "Kelp Forest top left area, bulb close to the Verse Egg",
-    "Kelp Forest top left area, Verse Egg",
-    "Kelp Forest top right area, bulb under the rock in the right path",
-    "Kelp Forest top right area, bulb at the left of the center clearing",
-    "Kelp Forest top right area, bulb in the left path's big room",
-    "Kelp Forest top right area, bulb in the left path's small room",
-    "Kelp Forest top right area, bulb at the top of the center clearing",
-    "Kelp Forest top right area, Black Pearl",
-    "Kelp Forest top right area, bulb in the top fish pass",
-    "Kelp Forest bottom left area, bulb close to the spirit crystals",
-    "Kelp Forest bottom left area, Walker Baby",
-    "Kelp Forest bottom left area, Transturtle",
-    "Kelp Forest bottom right area, Odd Container",
-    "Kelp Forest boss area, beating Drunian God",
-    "Kelp Forest boss room, bulb at the bottom of the area",
-    "Kelp Forest bottom left area, Fish Cave puzzle",
-    "Kelp Forest sprite cave, bulb inside the fish pass",
-    "Kelp Forest sprite cave, bulb in the second room",
-    "Kelp Forest sprite cave, Seed Bag",
-    "Mermog cave, bulb in the left part of the cave",
-    "Mermog cave, Piranha Egg",
-    "The Veil top left area, In Li's cave",
-    "The Veil top left area, bulb under the rock in the top right path",
-    "The Veil top left area, bulb hidden behind the blocking rock",
-    "The Veil top left area, Transturtle",
-    "The Veil top left area, bulb inside the fish pass",
-    "Turtle cave, Turtle Egg",
-    "Turtle cave, bulb in Bubble Cliff",
-    "Turtle cave, Urchin Costume",
-    "The Veil top right area, bulb in the middle of the wall jump cliff",
-    "The Veil top right area, Golden Starfish",
-    "The Veil top right area, bulb at the top of the waterfall",
-    "The Veil top right area, Transturtle",
-    "The Veil bottom area, bulb in the left path",
-    "The Veil bottom area, bulb in the spirit path",
-    "The Veil bottom area, Verse Egg",
-    "The Veil bottom area, Stone Head",
-    "Octopus Cave, Dumbo Egg",
-    "Octopus Cave, bulb in the path below the Octopus Cave path",
-    "Bubble Cave, bulb in the left cave wall",
-    "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
-    "Bubble Cave, Verse Egg",
-    "Sun Temple, bulb in the top left part",
-    "Sun Temple, bulb in the top right part",
-    "Sun Temple, bulb at the top of the high dark room",
-    "Sun Temple, Golden Gear",
-    "Sun Temple, first bulb of the temple",
-    "Sun Temple, bulb on the right part",
-    "Sun Temple, bulb in the hidden room of the right part",
-    "Sun Temple, Sun Key",
-    "Sun Worm path, first path bulb",
-    "Sun Worm path, second path bulb",
-    "Sun Worm path, first cliff bulb",
-    "Sun Worm path, second cliff bulb",
-    "Sun Temple boss area, beating Sun God",
-    "Abyss left area, bulb in hidden path room",
-    "Abyss left area, bulb in the right part",
-    "Abyss left area, Glowing Seed",
-    "Abyss left area, Glowing Plant",
-    "Abyss left area, bulb in the bottom fish pass",
-    "Abyss right area, bulb behind the rock in the whale room",
-    "Abyss right area, bulb in the middle path",
-    "Abyss right area, bulb behind the rock in the middle path",
-    "Abyss right area, bulb in the left green room",
-    "Abyss right area, Transturtle",
-    "Ice Cave, bulb in the room to the right",
-    "Ice Cave, first bulb in the top exit room",
-    "Ice Cave, second bulb in the top exit room",
-    "Ice Cave, third bulb in the top exit room",
-    "Ice Cave, bulb in the left room",
-    "King Jellyfish Cave, bulb in the right path from King Jelly",
-    "King Jellyfish Cave, Jellyfish Costume",
-    "The Whale, Verse Egg",
-    "Sunken City right area, crate close to the save crystal",
-    "Sunken City right area, crate in the left bottom room",
-    "Sunken City left area, crate in the little pipe room",
-    "Sunken City left area, crate close to the save crystal",
-    "Sunken City left area, crate before the bedroom",
-    "Sunken City left area, Girl Costume",
-    "Sunken City, bulb on top of the boss area",
-    "The Body center area, breaking Li's cage",
-    "The Body center area, bulb on the main path blocking tube",
-    "The Body left area, first bulb in the top face room",
-    "The Body left area, second bulb in the top face room",
-    "The Body left area, bulb below the water stream",
-    "The Body left area, bulb in the top path to the top face room",
-    "The Body left area, bulb in the bottom face room",
-    "The Body right area, bulb in the top face room",
-    "The Body right area, bulb in the top path to the bottom face room",
-    "The Body right area, bulb in the bottom face room",
-    "The Body bottom area, bulb in the Jelly Zap room",
-    "The Body bottom area, bulb in the nautilus room",
-    "The Body bottom area, Mutant Costume",
-    "Final Boss area, first bulb in the turtle room",
-    "Final Boss area, second bulb in the turtle room",
-    "Final Boss area, third bulb in the turtle room",
-    "Final Boss area, Transturtle",
-    "Final Boss area, bulb in the boss third form room",
-    "Simon Says area, beating Simon Says",
-    "Beating Fallen God",
-    "Beating Mithalan God",
-    "Beating Drunian God",
-    "Beating Sun God",
-    "Beating the Golem",
-    "Beating Nautilus Prime",
-    "Beating Blaster Peg Prime",
-    "Beating Mergog",
-    "Beating Mithalan priests",
-    "Beating Octopus Prime",
-    "Beating Crabbius Maximus",
-    "Beating Mantis Shrimp Prime",
-    "Beating King Jellyfish God Prime",
-    "First secret",
-    "Second secret",
-    "Third secret",
-    "Sunken City cleared",
-    "Objective complete",
+    AquariaLocationNames.SUN_CRYSTAL,
+    AquariaLocationNames.HOME_WATERS_TRANSTURTLE,
+    AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH,
+    AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH,
+    AquariaLocationNames.OPEN_WATERS_TOP_LEFT_AREA_BULB_TO_THE_RIGHT_OF_THE_SAVE_CRYSTAL,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_SMALL_PATH_BEFORE_MITHALAS,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_PATH_FROM_THE_LEFT_ENTRANCE,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_CLEARING_CLOSE_TO_THE_BOTTOM_EXIT,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_BIG_CLEARING_CLOSE_TO_THE_SAVE_CRYSTAL,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_BIG_CLEARING_TO_THE_TOP_EXIT,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_FIRST_URN_IN_THE_MITHALAS_EXIT,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_SECOND_URN_IN_THE_MITHALAS_EXIT,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_THIRD_URN_IN_THE_MITHALAS_EXIT,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_BULB_IN_THE_TURTLE_ROOM,
+    AquariaLocationNames.OPEN_WATERS_TOP_RIGHT_AREA_TRANSTURTLE,
+    AquariaLocationNames.OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_BEHIND_THE_CHOMPER_FISH,
+    AquariaLocationNames.OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_INSIDE_THE_LOWEST_FISH_PASS,
+    AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_BULB_CLOSE_TO_THE_RIGHT_EXIT,
+    AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_BULB_BEHIND_THE_CHOMPER_FISH,
+    AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_KING_SKULL,
+    AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_RIGHT_PART,
+    AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_LEFT_PART,
+    AquariaLocationNames.ARNASSI_RUINS_BULB_IN_THE_CENTER_PART,
+    AquariaLocationNames.ARNASSI_RUINS_SONG_PLANT_SPORE,
+    AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
+    AquariaLocationNames.ARNASSI_RUINS_ARNASSI_STATUE,
+    AquariaLocationNames.ARNASSI_RUINS_TRANSTURTLE,
+    AquariaLocationNames.ARNASSI_RUINS_CRAB_ARMOR,
+    AquariaLocationNames.SIMON_SAYS_AREA_TRANSTURTLE,
+    AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_THE_LEFT_CITY_PART,
+    AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_THE_LEFT_CITY_PART,
+    AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_RIGHT_PART,
+    AquariaLocationNames.MITHALAS_CITY_BULB_AT_THE_TOP_OF_THE_CITY,
+    AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_A_BROKEN_HOME,
+    AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_A_BROKEN_HOME,
+    AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_BOTTOM_LEFT_PART,
+    AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_IN_ONE_OF_THE_HOMES,
+    AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_IN_ONE_OF_THE_HOMES,
+    AquariaLocationNames.MITHALAS_CITY_FIRST_URN_IN_ONE_OF_THE_HOMES,
+    AquariaLocationNames.MITHALAS_CITY_SECOND_URN_IN_ONE_OF_THE_HOMES,
+    AquariaLocationNames.MITHALAS_CITY_FIRST_URN_IN_THE_CITY_RESERVE,
+    AquariaLocationNames.MITHALAS_CITY_SECOND_URN_IN_THE_CITY_RESERVE,
+    AquariaLocationNames.MITHALAS_CITY_THIRD_URN_IN_THE_CITY_RESERVE,
+    AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_AT_THE_END_OF_THE_TOP_PATH,
+    AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_AT_THE_END_OF_THE_TOP_PATH,
+    AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_TOP_PATH,
+    AquariaLocationNames.MITHALAS_CITY_MITHALAS_POT,
+    AquariaLocationNames.MITHALAS_CITY_URN_IN_THE_CASTLE_FLOWER_TUBE_ENTRANCE,
+    AquariaLocationNames.MITHALAS_CITY_DOLL,
+    AquariaLocationNames.MITHALAS_CITY_URN_INSIDE_A_HOME_FISH_PASS,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_BULB_IN_THE_FLESH_HOLE,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_BLUE_BANNER,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_URN_IN_THE_BEDROOM,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_FIRST_URN_OF_THE_SINGLE_LAMP_PATH,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_SECOND_URN_OF_THE_SINGLE_LAMP_PATH,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_URN_IN_THE_BOTTOM_ROOM,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_FIRST_URN_ON_THE_ENTRANCE_PATH,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_SECOND_URN_ON_THE_ENTRANCE_PATH,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+    AquariaLocationNames.MITHALAS_CITY_CASTLE_TRIDENT_HEAD,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_TOP_RIGHT_ROOM,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_TOP_RIGHT_ROOM,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_TOP_RIGHT_ROOM,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_BOTTOM_RIGHT_PATH,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_BOTTOM_RIGHT_PATH,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_URN_BEHIND_THE_FLESH_VEIN,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_URN_IN_THE_TOP_LEFT_EYES_BOSS_ROOM,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_FIRST_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_SECOND_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_THIRD_URN_IN_THE_PATH_BEHIND_THE_FLESH_VEIN,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_FOURTH_URN_IN_THE_TOP_RIGHT_ROOM,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_URN_BELOW_THE_LEFT_ENTRANCE,
+    AquariaLocationNames.MITHALAS_CATHEDRAL_BULB_IN_THE_FLESH_ROOM_WITH_FLEAS,
+    AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_IN_THE_CENTER_PART,
+    AquariaLocationNames.CATHEDRAL_UNDERGROUND_FIRST_BULB_IN_THE_TOP_LEFT_PART,
+    AquariaLocationNames.CATHEDRAL_UNDERGROUND_SECOND_BULB_IN_THE_TOP_LEFT_PART,
+    AquariaLocationNames.CATHEDRAL_UNDERGROUND_THIRD_BULB_IN_THE_TOP_LEFT_PART,
+    AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_CLOSE_TO_THE_SAVE_CRYSTAL,
+    AquariaLocationNames.CATHEDRAL_UNDERGROUND_BULB_IN_THE_BOTTOM_RIGHT_PATH,
+    AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD,
+    AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_BOTTOM_LEFT_CLEARING,
+    AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_PATH_DOWN_FROM_THE_TOP_LEFT_CLEARING,
+    AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_IN_THE_TOP_LEFT_CLEARING,
+    AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG,
+    AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG,
+    AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG,
+    AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_UNDER_THE_ROCK_IN_THE_RIGHT_PATH,
+    AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_LEFT_OF_THE_CENTER_CLEARING,
+    AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_BIG_ROOM,
+    AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_LEFT_PATH_S_SMALL_ROOM,
+    AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_CENTER_CLEARING,
+    AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL,
+    AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_TOP_FISH_PASS,
+    AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS,
+    AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY,
+    AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_TRANSTURTLE,
+    AquariaLocationNames.KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER,
+    AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD,
+    AquariaLocationNames.KELP_FOREST_BOSS_ROOM_BULB_AT_THE_BOTTOM_OF_THE_AREA,
+    AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_FISH_CAVE_PUZZLE,
+    AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_INSIDE_THE_FISH_PASS,
+    AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_IN_THE_SECOND_ROOM,
+    AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_SEED_BAG,
+    AquariaLocationNames.MERMOG_CAVE_BULB_IN_THE_LEFT_PART_OF_THE_CAVE,
+    AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+    AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_IN_LI_S_CAVE,
+    AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_UNDER_THE_ROCK_IN_THE_TOP_RIGHT_PATH,
+    AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_HIDDEN_BEHIND_THE_BLOCKING_ROCK,
+    AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_TRANSTURTLE,
+    AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_INSIDE_THE_FISH_PASS,
+    AquariaLocationNames.TURTLE_CAVE_TURTLE_EGG,
+    AquariaLocationNames.TURTLE_CAVE_BULB_IN_BUBBLE_CLIFF,
+    AquariaLocationNames.TURTLE_CAVE_URCHIN_COSTUME,
+    AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_IN_THE_MIDDLE_OF_THE_WALL_JUMP_CLIFF,
+    AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_GOLDEN_STARFISH,
+    AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+    AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_TRANSTURTLE,
+    AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_LEFT_PATH,
+    AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_SPIRIT_PATH,
+    AquariaLocationNames.THE_VEIL_BOTTOM_AREA_VERSE_EGG,
+    AquariaLocationNames.THE_VEIL_BOTTOM_AREA_STONE_HEAD,
+    AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+    AquariaLocationNames.OCTOPUS_CAVE_BULB_IN_THE_PATH_BELOW_THE_OCTOPUS_CAVE_PATH,
+    AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+    AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+    AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+    AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_LEFT_PART,
+    AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_RIGHT_PART,
+    AquariaLocationNames.SUN_TEMPLE_BULB_AT_THE_TOP_OF_THE_HIGH_DARK_ROOM,
+    AquariaLocationNames.SUN_TEMPLE_GOLDEN_GEAR,
+    AquariaLocationNames.SUN_TEMPLE_FIRST_BULB_OF_THE_TEMPLE,
+    AquariaLocationNames.SUN_TEMPLE_BULB_ON_THE_RIGHT_PART,
+    AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART,
+    AquariaLocationNames.SUN_TEMPLE_SUN_KEY,
+    AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_PATH_BULB,
+    AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_PATH_BULB,
+    AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
+    AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB,
+    AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
+    AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_HIDDEN_PATH_ROOM,
+    AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_RIGHT_PART,
+    AquariaLocationNames.ABYSS_LEFT_AREA_GLOWING_SEED,
+    AquariaLocationNames.ABYSS_LEFT_AREA_GLOWING_PLANT,
+    AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS,
+    AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM,
+    AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_MIDDLE_PATH,
+    AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_MIDDLE_PATH,
+    AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_LEFT_GREEN_ROOM,
+    AquariaLocationNames.ABYSS_RIGHT_AREA_TRANSTURTLE,
+    AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_ROOM_TO_THE_RIGHT,
+    AquariaLocationNames.ICE_CAVERN_FIRST_BULB_IN_THE_TOP_EXIT_ROOM,
+    AquariaLocationNames.ICE_CAVERN_SECOND_BULB_IN_THE_TOP_EXIT_ROOM,
+    AquariaLocationNames.ICE_CAVERN_THIRD_BULB_IN_THE_TOP_EXIT_ROOM,
+    AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_LEFT_ROOM,
+    AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY,
+    AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME,
+    AquariaLocationNames.THE_WHALE_VERSE_EGG,
+    AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+    AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_IN_THE_LEFT_BOTTOM_ROOM,
+    AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_IN_THE_LITTLE_PIPE_ROOM,
+    AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+    AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_BEFORE_THE_BEDROOM,
+    AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_GIRL_COSTUME,
+    AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+    AquariaLocationNames.THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE,
+    AquariaLocationNames.THE_BODY_CENTER_AREA_BULB_ON_THE_MAIN_PATH_BLOCKING_TUBE,
+    AquariaLocationNames.THE_BODY_LEFT_AREA_FIRST_BULB_IN_THE_TOP_FACE_ROOM,
+    AquariaLocationNames.THE_BODY_LEFT_AREA_SECOND_BULB_IN_THE_TOP_FACE_ROOM,
+    AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_BELOW_THE_WATER_STREAM,
+    AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_TOP_FACE_ROOM,
+    AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+    AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_FACE_ROOM,
+    AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_BOTTOM_FACE_ROOM,
+    AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+    AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_JELLY_ZAP_ROOM,
+    AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_NAUTILUS_ROOM,
+    AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+    AquariaLocationNames.FINAL_BOSS_AREA_FIRST_BULB_IN_THE_TURTLE_ROOM,
+    AquariaLocationNames.FINAL_BOSS_AREA_SECOND_BULB_IN_THE_TURTLE_ROOM,
+    AquariaLocationNames.FINAL_BOSS_AREA_THIRD_BULB_IN_THE_TURTLE_ROOM,
+    AquariaLocationNames.FINAL_BOSS_AREA_TRANSTURTLE,
+    AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+    AquariaLocationNames.SIMON_SAYS_AREA_BEATING_SIMON_SAYS,
+    AquariaLocationNames.BEATING_FALLEN_GOD,
+    AquariaLocationNames.BEATING_MITHALAN_GOD,
+    AquariaLocationNames.BEATING_DRUNIAN_GOD,
+    AquariaLocationNames.BEATING_LUMEREAN_GOD,
+    AquariaLocationNames.BEATING_THE_GOLEM,
+    AquariaLocationNames.BEATING_NAUTILUS_PRIME,
+    AquariaLocationNames.BEATING_BLASTER_PEG_PRIME,
+    AquariaLocationNames.BEATING_MERGOG,
+    AquariaLocationNames.BEATING_MITHALAN_PRIESTS,
+    AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+    AquariaLocationNames.BEATING_CRABBIUS_MAXIMUS,
+    AquariaLocationNames.BEATING_MANTIS_SHRIMP_PRIME,
+    AquariaLocationNames.BEATING_KING_JELLYFISH_GOD_PRIME,
+    AquariaLocationNames.FIRST_SECRET,
+    AquariaLocationNames.SECOND_SECRET,
+    AquariaLocationNames.THIRD_SECRET,
+    AquariaLocationNames.SUNKEN_CITY_CLEARED,
+    AquariaLocationNames.OBJECTIVE_COMPLETE,
 ]
 
 class AquariaTestBase(WorldTestBase):
diff --git a/worlds/aquaria/test/test_beast_form_access.py b/worlds/aquaria/test/test_beast_form_access.py
index c09586269d38..684c33115ffc 100644
--- a/worlds/aquaria/test/test_beast_form_access.py
+++ b/worlds/aquaria/test/test_beast_form_access.py
@@ -5,6 +5,8 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
 
 
 class BeastFormAccessTest(AquariaTestBase):
@@ -13,16 +15,16 @@ class BeastFormAccessTest(AquariaTestBase):
     def test_beast_form_location(self) -> None:
         """Test locations that require beast form"""
         locations = [
-            "Mermog cave, Piranha Egg",
-            "Kelp Forest top left area, Jelly Egg",
-            "Mithalas Cathedral, Mithalan Dress",
-            "The Veil top right area, bulb at the top of the waterfall",
-            "Sunken City, bulb on top of the boss area",
-            "Octopus Cave, Dumbo Egg",
-            "Beating the Golem",
-            "Beating Mergog",
-            "Beating Octopus Prime",
-            "Sunken City cleared",
+            AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS,
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+            AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.BEATING_MERGOG,
+            AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED,
         ]
-        items = [["Beast form"]]
+        items = [[ItemNames.BEAST_FORM]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_beast_form_or_arnassi_armor_access.py b/worlds/aquaria/test/test_beast_form_or_arnassi_armor_access.py
index fa4c6923400a..4c93c309a119 100644
--- a/worlds/aquaria/test/test_beast_form_or_arnassi_armor_access.py
+++ b/worlds/aquaria/test/test_beast_form_or_arnassi_armor_access.py
@@ -5,6 +5,8 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
 
 
 class BeastForArnassiArmormAccessTest(AquariaTestBase):
@@ -13,27 +15,27 @@ class BeastForArnassiArmormAccessTest(AquariaTestBase):
     def test_beast_form_arnassi_armor_location(self) -> None:
         """Test locations that require beast form or arnassi armor"""
         locations = [
-            "Mithalas City Castle, beating the Priests",
-            "Arnassi Ruins, Crab Armor",
-            "Arnassi Ruins, Song Plant Spore",
-            "Mithalas City, first bulb at the end of the top path",
-            "Mithalas City, second bulb at the end of the top path",
-            "Mithalas City, bulb in the top path",
-            "Mithalas City, Mithalas Pot",
-            "Mithalas City, urn in the Castle flower tube entrance",
-            "Mermog cave, Piranha Egg",
-            "Mithalas Cathedral, Mithalan Dress",
-            "Kelp Forest top left area, Jelly Egg",
-            "The Veil top right area, bulb in the middle of the wall jump cliff",
-            "The Veil top right area, bulb at the top of the waterfall",
-            "Sunken City, bulb on top of the boss area",
-            "Octopus Cave, Dumbo Egg",
-            "Beating the Golem",
-            "Beating Mergog",
-            "Beating Crabbius Maximus",
-            "Beating Octopus Prime",
-            "Beating Mithalan priests",
-            "Sunken City cleared"
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+            AquariaLocationNames.ARNASSI_RUINS_CRAB_ARMOR,
+            AquariaLocationNames.ARNASSI_RUINS_SONG_PLANT_SPORE,
+            AquariaLocationNames.MITHALAS_CITY_FIRST_BULB_AT_THE_END_OF_THE_TOP_PATH,
+            AquariaLocationNames.MITHALAS_CITY_SECOND_BULB_AT_THE_END_OF_THE_TOP_PATH,
+            AquariaLocationNames.MITHALAS_CITY_BULB_IN_THE_TOP_PATH,
+            AquariaLocationNames.MITHALAS_CITY_MITHALAS_POT,
+            AquariaLocationNames.MITHALAS_CITY_URN_IN_THE_CASTLE_FLOWER_TUBE_ENTRANCE,
+            AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+            AquariaLocationNames.MITHALAS_CATHEDRAL_MITHALAN_DRESS,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_JELLY_EGG,
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_IN_THE_MIDDLE_OF_THE_WALL_JUMP_CLIFF,
+            AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+            AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.BEATING_MERGOG,
+            AquariaLocationNames.BEATING_CRABBIUS_MAXIMUS,
+            AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+            AquariaLocationNames.BEATING_MITHALAN_PRIESTS,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED
         ]
-        items = [["Beast form", "Arnassi Armor"]]
+        items = [[ItemNames.BEAST_FORM, ItemNames.ARNASSI_ARMOR]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_bind_song_access.py b/worlds/aquaria/test/test_bind_song_access.py
index 05f96edb9192..689f487c644e 100644
--- a/worlds/aquaria/test/test_bind_song_access.py
+++ b/worlds/aquaria/test/test_bind_song_access.py
@@ -6,31 +6,36 @@
 """
 
 from . import AquariaTestBase, after_home_water_locations
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import UnconfineHomeWater, EarlyBindSong
 
 
 class BindSongAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of locations with and without the bind song"""
     options = {
         "bind_song_needed_to_get_under_rock_bulb": False,
+        "unconfine_home_water": UnconfineHomeWater.option_off,
+        "early_bind_song": EarlyBindSong.option_off
     }
 
     def test_bind_song_location(self) -> None:
         """Test locations that require Bind song"""
         locations = [
-            "Verse Cave right area, Big Seed",
-            "Home Water, bulb in the path below Nautilus Prime",
-            "Home Water, bulb in the bottom left room",
-            "Home Water, Nautilus Egg",
-            "Song Cave, Verse Egg",
-            "Energy Temple first area, beating the Energy Statue",
-            "Energy Temple first area, bulb in the bottom room blocked by a rock",
-            "Energy Temple first area, Energy Idol",
-            "Energy Temple second area, bulb under the rock",
-            "Energy Temple bottom entrance, Krotite Armor",
-            "Energy Temple third area, bulb in the bottom path",
-            "Energy Temple boss area, Fallen God Tooth",
-            "Energy Temple blaster room, Blaster Egg",
+            AquariaLocationNames.VERSE_CAVE_RIGHT_AREA_BIG_SEED,
+            AquariaLocationNames.HOME_WATERS_BULB_IN_THE_PATH_BELOW_NAUTILUS_PRIME,
+            AquariaLocationNames.HOME_WATERS_BULB_IN_THE_BOTTOM_LEFT_ROOM,
+            AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG,
+            AquariaLocationNames.SONG_CAVE_VERSE_EGG,
+            AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BEATING_THE_ENERGY_STATUE,
+            AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BULB_IN_THE_BOTTOM_ROOM_BLOCKED_BY_A_ROCK,
+            AquariaLocationNames.ENERGY_TEMPLE_ENERGY_IDOL,
+            AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK,
+            AquariaLocationNames.ENERGY_TEMPLE_BOTTOM_ENTRANCE_KROTITE_ARMOR,
+            AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
+            AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+            AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
             *after_home_water_locations
         ]
-        items = [["Bind song"]]
+        items = [[ItemNames.BIND_SONG]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_bind_song_option_access.py b/worlds/aquaria/test/test_bind_song_option_access.py
index e391eef101bf..74dfa2ed7094 100644
--- a/worlds/aquaria/test/test_bind_song_option_access.py
+++ b/worlds/aquaria/test/test_bind_song_option_access.py
@@ -7,6 +7,8 @@
 
 from . import AquariaTestBase
 from .test_bind_song_access import after_home_water_locations
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
 
 
 class BindSongOptionAccessTest(AquariaTestBase):
@@ -18,25 +20,25 @@ class BindSongOptionAccessTest(AquariaTestBase):
     def test_bind_song_location(self) -> None:
         """Test locations that require Bind song with the bind song needed option activated"""
         locations = [
-            "Verse Cave right area, Big Seed",
-            "Verse Cave left area, bulb under the rock at the end of the path",
-            "Home Water, bulb under the rock in the left path from the Verse Cave",
-            "Song Cave, bulb under the rock close to the song door",
-            "Song Cave, bulb under the rock in the path to the singing statues",
-            "Naija's Home, bulb under the rock at the right of the main path",
-            "Home Water, bulb in the path below Nautilus Prime",
-            "Home Water, bulb in the bottom left room",
-            "Home Water, Nautilus Egg",
-            "Song Cave, Verse Egg",
-            "Energy Temple first area, beating the Energy Statue",
-            "Energy Temple first area, bulb in the bottom room blocked by a rock",
-            "Energy Temple first area, Energy Idol",
-            "Energy Temple second area, bulb under the rock",
-            "Energy Temple bottom entrance, Krotite Armor",
-            "Energy Temple third area, bulb in the bottom path",
-            "Energy Temple boss area, Fallen God Tooth",
-            "Energy Temple blaster room, Blaster Egg",
+            AquariaLocationNames.VERSE_CAVE_RIGHT_AREA_BIG_SEED,
+            AquariaLocationNames.VERSE_CAVE_LEFT_AREA_BULB_UNDER_THE_ROCK_AT_THE_END_OF_THE_PATH,
+            AquariaLocationNames.HOME_WATERS_BULB_UNDER_THE_ROCK_IN_THE_LEFT_PATH_FROM_THE_VERSE_CAVE,
+            AquariaLocationNames.SONG_CAVE_BULB_UNDER_THE_ROCK_CLOSE_TO_THE_SONG_DOOR,
+            AquariaLocationNames.SONG_CAVE_BULB_UNDER_THE_ROCK_IN_THE_PATH_TO_THE_SINGING_STATUES,
+            AquariaLocationNames.NAIJA_S_HOME_BULB_UNDER_THE_ROCK_AT_THE_RIGHT_OF_THE_MAIN_PATH,
+            AquariaLocationNames.HOME_WATERS_BULB_IN_THE_PATH_BELOW_NAUTILUS_PRIME,
+            AquariaLocationNames.HOME_WATERS_BULB_IN_THE_BOTTOM_LEFT_ROOM,
+            AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG,
+            AquariaLocationNames.SONG_CAVE_VERSE_EGG,
+            AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BEATING_THE_ENERGY_STATUE,
+            AquariaLocationNames.ENERGY_TEMPLE_FIRST_AREA_BULB_IN_THE_BOTTOM_ROOM_BLOCKED_BY_A_ROCK,
+            AquariaLocationNames.ENERGY_TEMPLE_ENERGY_IDOL,
+            AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK,
+            AquariaLocationNames.ENERGY_TEMPLE_BOTTOM_ENTRANCE_KROTITE_ARMOR,
+            AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
+            AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+            AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
             *after_home_water_locations
         ]
-        items = [["Bind song"]]
+        items = [[ItemNames.BIND_SONG]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_confined_home_water.py b/worlds/aquaria/test/test_confined_home_water.py
index 89c51ac5c775..d809a3d5cb68 100644
--- a/worlds/aquaria/test/test_confined_home_water.py
+++ b/worlds/aquaria/test/test_confined_home_water.py
@@ -5,16 +5,17 @@
 """
 
 from . import AquariaTestBase
+from ..Options import UnconfineHomeWater, EarlyEnergyForm
 
 
 class ConfinedHomeWaterAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of region with the unconfine home water option disabled"""
     options = {
-        "unconfine_home_water": 0,
-        "early_energy_form": False
+        "unconfine_home_water": UnconfineHomeWater.option_off,
+        "early_energy_form": EarlyEnergyForm.option_off
     }
 
     def test_confine_home_water_location(self) -> None:
         """Test region accessible with confined home water"""
-        self.assertFalse(self.can_reach_region("Open Water top left area"), "Can reach Open Water top left area")
-        self.assertFalse(self.can_reach_region("Home Water, turtle room"), "Can reach Home Water, turtle room")
+        self.assertFalse(self.can_reach_region("Open Waters top left area"), "Can reach Open Waters top left area")
+        self.assertFalse(self.can_reach_region("Home Waters, turtle room"), "Can reach Home Waters, turtle room")
diff --git a/worlds/aquaria/test/test_dual_song_access.py b/worlds/aquaria/test/test_dual_song_access.py
index bb9b2e739604..448d9df0ef3e 100644
--- a/worlds/aquaria/test/test_dual_song_access.py
+++ b/worlds/aquaria/test/test_dual_song_access.py
@@ -5,22 +5,25 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import TurtleRandomizer
 
 
 class LiAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of locations with and without the dual song"""
     options = {
-        "turtle_randomizer": 1,
+        "turtle_randomizer": TurtleRandomizer.option_all,
     }
 
     def test_li_song_location(self) -> None:
         """Test locations that require the dual song"""
         locations = [
-            "The Body bottom area, bulb in the Jelly Zap room",
-            "The Body bottom area, bulb in the nautilus room",
-            "The Body bottom area, Mutant Costume",
-            "Final Boss area, bulb in the boss third form room",
-            "Objective complete"
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_JELLY_ZAP_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_NAUTILUS_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+            AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+            AquariaLocationNames.OBJECTIVE_COMPLETE
         ]
-        items = [["Dual form"]]
+        items = [[ItemNames.DUAL_FORM]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_energy_form_access.py b/worlds/aquaria/test/test_energy_form_access.py
index b443166823bc..7eeb7c2e73c4 100644
--- a/worlds/aquaria/test/test_energy_form_access.py
+++ b/worlds/aquaria/test/test_energy_form_access.py
@@ -6,28 +6,31 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import EarlyEnergyForm
 
 
 class EnergyFormAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of locations with and without the energy form"""
     options = {
-        "early_energy_form": False,
+        "early_energy_form": EarlyEnergyForm.option_off
     }
 
     def test_energy_form_location(self) -> None:
         """Test locations that require Energy form"""
         locations = [
-            "Energy Temple second area, bulb under the rock",
-            "Energy Temple third area, bulb in the bottom path",
-            "The Body left area, first bulb in the top face room",
-            "The Body left area, second bulb in the top face room",
-            "The Body left area, bulb below the water stream",
-            "The Body left area, bulb in the top path to the top face room",
-            "The Body left area, bulb in the bottom face room",
-            "The Body right area, bulb in the top path to the bottom face room",
-            "The Body right area, bulb in the bottom face room",
-            "Final Boss area, bulb in the boss third form room",
-            "Objective complete",
+            AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK,
+            AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_FIRST_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_SECOND_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_BELOW_THE_WATER_STREAM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+            AquariaLocationNames.OBJECTIVE_COMPLETE,
         ]
-        items = [["Energy form"]]
+        items = [[ItemNames.ENERGY_FORM]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_energy_form_or_dual_form_access.py b/worlds/aquaria/test/test_energy_form_or_dual_form_access.py
index 8a765bc4e4e2..ba04405eea59 100644
--- a/worlds/aquaria/test/test_energy_form_or_dual_form_access.py
+++ b/worlds/aquaria/test/test_energy_form_or_dual_form_access.py
@@ -5,88 +5,74 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import EarlyEnergyForm, TurtleRandomizer
 
 
 class EnergyFormDualFormAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of locations with and without the energy form and dual form (and Li)"""
     options = {
-        "early_energy_form": False,
+        "early_energy_form": EarlyEnergyForm.option_off,
+        "turtle_randomizer": TurtleRandomizer.option_all
     }
 
     def test_energy_form_or_dual_form_location(self) -> None:
         """Test locations that require Energy form or dual form"""
         locations = [
-            "Naija's Home, bulb after the energy door",
-            "Home Water, Nautilus Egg",
-            "Energy Temple second area, bulb under the rock",
-            "Energy Temple bottom entrance, Krotite Armor",
-            "Energy Temple third area, bulb in the bottom path",
-            "Energy Temple blaster room, Blaster Egg",
-            "Energy Temple boss area, Fallen God Tooth",
-            "Mithalas City Castle, beating the Priests",
-            "Mithalas boss area, beating Mithalan God",
-            "Mithalas Cathedral, first urn in the top right room",
-            "Mithalas Cathedral, second urn in the top right room",
-            "Mithalas Cathedral, third urn in the top right room",
-            "Mithalas Cathedral, urn in the flesh room with fleas",
-            "Mithalas Cathedral, first urn in the bottom right path",
-            "Mithalas Cathedral, second urn in the bottom right path",
-            "Mithalas Cathedral, urn behind the flesh vein",
-            "Mithalas Cathedral, urn in the top left eyes boss room",
-            "Mithalas Cathedral, first urn in the path behind the flesh vein",
-            "Mithalas Cathedral, second urn in the path behind the flesh vein",
-            "Mithalas Cathedral, third urn in the path behind the flesh vein",
-            "Mithalas Cathedral, fourth urn in the top right room",
-            "Mithalas Cathedral, Mithalan Dress",
-            "Mithalas Cathedral, urn below the left entrance",
-            "Kelp Forest top left area, bulb close to the Verse Egg",
-            "Kelp Forest top left area, Verse Egg",
-            "Kelp Forest boss area, beating Drunian God",
-            "Mermog cave, Piranha Egg",
-            "Octopus Cave, Dumbo Egg",
-            "Sun Temple boss area, beating Sun God",
-            "King Jellyfish Cave, bulb in the right path from King Jelly",
-            "King Jellyfish Cave, Jellyfish Costume",
-            "Sunken City right area, crate close to the save crystal",
-            "Sunken City right area, crate in the left bottom room",
-            "Sunken City left area, crate in the little pipe room",
-            "Sunken City left area, crate close to the save crystal",
-            "Sunken City left area, crate before the bedroom",
-            "Sunken City left area, Girl Costume",
-            "Sunken City, bulb on top of the boss area",
-            "The Body center area, breaking Li's cage",
-            "The Body center area, bulb on the main path blocking tube",
-            "The Body left area, first bulb in the top face room",
-            "The Body left area, second bulb in the top face room",
-            "The Body left area, bulb below the water stream",
-            "The Body left area, bulb in the top path to the top face room",
-            "The Body left area, bulb in the bottom face room",
-            "The Body right area, bulb in the top face room",
-            "The Body right area, bulb in the top path to the bottom face room",
-            "The Body right area, bulb in the bottom face room",
-            "The Body bottom area, bulb in the Jelly Zap room",
-            "The Body bottom area, bulb in the nautilus room",
-            "The Body bottom area, Mutant Costume",
-            "Final Boss area, bulb in the boss third form room",
-            "Final Boss area, first bulb in the turtle room",
-            "Final Boss area, second bulb in the turtle room",
-            "Final Boss area, third bulb in the turtle room",
-            "Final Boss area, Transturtle",
-            "Beating Fallen God",
-            "Beating Blaster Peg Prime",
-            "Beating Mithalan God",
-            "Beating Drunian God",
-            "Beating Sun God",
-            "Beating the Golem",
-            "Beating Nautilus Prime",
-            "Beating Mergog",
-            "Beating Mithalan priests",
-            "Beating Octopus Prime",
-            "Beating King Jellyfish God Prime",
-            "Beating the Golem",
-            "Sunken City cleared",
-            "First secret",
-            "Objective complete"
+            AquariaLocationNames.NAIJA_S_HOME_BULB_AFTER_THE_ENERGY_DOOR,
+            AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG,
+            AquariaLocationNames.ENERGY_TEMPLE_SECOND_AREA_BULB_UNDER_THE_ROCK,
+            AquariaLocationNames.ENERGY_TEMPLE_BOTTOM_ENTRANCE_KROTITE_ARMOR,
+            AquariaLocationNames.ENERGY_TEMPLE_THIRD_AREA_BULB_IN_THE_BOTTOM_PATH,
+            AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+            AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+            AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG,
+            AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD,
+            AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
+            AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY,
+            AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME,
+            AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_IN_THE_LEFT_BOTTOM_ROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_IN_THE_LITTLE_PIPE_ROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_BEFORE_THE_BEDROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_GIRL_COSTUME,
+            AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+            AquariaLocationNames.THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE,
+            AquariaLocationNames.THE_BODY_CENTER_AREA_BULB_ON_THE_MAIN_PATH_BLOCKING_TUBE,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_FIRST_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_SECOND_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_BELOW_THE_WATER_STREAM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_JELLY_ZAP_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_NAUTILUS_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+            AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+            AquariaLocationNames.BEATING_FALLEN_GOD,
+            AquariaLocationNames.BEATING_BLASTER_PEG_PRIME,
+            AquariaLocationNames.BEATING_MITHALAN_GOD,
+            AquariaLocationNames.BEATING_DRUNIAN_GOD,
+            AquariaLocationNames.BEATING_LUMEREAN_GOD,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.BEATING_NAUTILUS_PRIME,
+            AquariaLocationNames.BEATING_MERGOG,
+            AquariaLocationNames.BEATING_MITHALAN_PRIESTS,
+            AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+            AquariaLocationNames.BEATING_KING_JELLYFISH_GOD_PRIME,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED,
+            AquariaLocationNames.FIRST_SECRET,
+            AquariaLocationNames.OBJECTIVE_COMPLETE
         ]
-        items = [["Energy form", "Dual form", "Li and Li song", "Body tongue cleared"]]
+        items = [[ItemNames.ENERGY_FORM, ItemNames.DUAL_FORM, ItemNames.LI_AND_LI_SONG, ItemNames.BODY_TONGUE_CLEARED]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_fish_form_access.py b/worlds/aquaria/test/test_fish_form_access.py
index 40b15a87cd35..3cbc750c7039 100644
--- a/worlds/aquaria/test/test_fish_form_access.py
+++ b/worlds/aquaria/test/test_fish_form_access.py
@@ -5,33 +5,36 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import TurtleRandomizer
 
 
 class FishFormAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of locations with and without the fish form"""
     options = {
-        "turtle_randomizer": 1,
+        "turtle_randomizer": TurtleRandomizer.option_all,
     }
 
     def test_fish_form_location(self) -> None:
         """Test locations that require fish form"""
         locations = [
-            "The Veil top left area, bulb inside the fish pass",
-            "Energy Temple first area, Energy Idol",
-            "Mithalas City, Doll",
-            "Mithalas City, urn inside a home fish pass",
-            "Kelp Forest top right area, bulb in the top fish pass",
-            "The Veil bottom area, Verse Egg",
-            "Open Water bottom left area, bulb inside the lowest fish pass",
-            "Kelp Forest top left area, bulb close to the Verse Egg",
-            "Kelp Forest top left area, Verse Egg",
-            "Mermog cave, bulb in the left part of the cave",
-            "Mermog cave, Piranha Egg",
-            "Beating Mergog",
-            "Octopus Cave, Dumbo Egg",
-            "Octopus Cave, bulb in the path below the Octopus Cave path",
-            "Beating Octopus Prime",
-            "Abyss left area, bulb in the bottom fish pass"
+            AquariaLocationNames.THE_VEIL_TOP_LEFT_AREA_BULB_INSIDE_THE_FISH_PASS,
+            AquariaLocationNames.ENERGY_TEMPLE_ENERGY_IDOL,
+            AquariaLocationNames.MITHALAS_CITY_DOLL,
+            AquariaLocationNames.MITHALAS_CITY_URN_INSIDE_A_HOME_FISH_PASS,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BULB_IN_THE_TOP_FISH_PASS,
+            AquariaLocationNames.THE_VEIL_BOTTOM_AREA_VERSE_EGG,
+            AquariaLocationNames.OPEN_WATERS_BOTTOM_LEFT_AREA_BULB_INSIDE_THE_LOWEST_FISH_PASS,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG,
+            AquariaLocationNames.MERMOG_CAVE_BULB_IN_THE_LEFT_PART_OF_THE_CAVE,
+            AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+            AquariaLocationNames.BEATING_MERGOG,
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.OCTOPUS_CAVE_BULB_IN_THE_PATH_BELOW_THE_OCTOPUS_CAVE_PATH,
+            AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+            AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS
         ]
-        items = [["Fish form"]]
+        items = [[ItemNames.FISH_FORM]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_li_song_access.py b/worlds/aquaria/test/test_li_song_access.py
index f615fb10c640..6c8d6e5eebba 100644
--- a/worlds/aquaria/test/test_li_song_access.py
+++ b/worlds/aquaria/test/test_li_song_access.py
@@ -5,41 +5,44 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import TurtleRandomizer
 
 
 class LiAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of locations with and without Li"""
     options = {
-        "turtle_randomizer": 1,
+        "turtle_randomizer": TurtleRandomizer.option_all,
     }
 
     def test_li_song_location(self) -> None:
         """Test locations that require Li"""
         locations = [
-            "Sunken City right area, crate close to the save crystal",
-            "Sunken City right area, crate in the left bottom room",
-            "Sunken City left area, crate in the little pipe room",
-            "Sunken City left area, crate close to the save crystal",
-            "Sunken City left area, crate before the bedroom",
-            "Sunken City left area, Girl Costume",
-            "Sunken City, bulb on top of the boss area",
-            "The Body center area, breaking Li's cage",
-            "The Body center area, bulb on the main path blocking tube",
-            "The Body left area, first bulb in the top face room",
-            "The Body left area, second bulb in the top face room",
-            "The Body left area, bulb below the water stream",
-            "The Body left area, bulb in the top path to the top face room",
-            "The Body left area, bulb in the bottom face room",
-            "The Body right area, bulb in the top face room",
-            "The Body right area, bulb in the top path to the bottom face room",
-            "The Body right area, bulb in the bottom face room",
-            "The Body bottom area, bulb in the Jelly Zap room",
-            "The Body bottom area, bulb in the nautilus room",
-            "The Body bottom area, Mutant Costume",
-            "Final Boss area, bulb in the boss third form room",
-            "Beating the Golem",
-            "Sunken City cleared",
-            "Objective complete"
+            AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_IN_THE_LEFT_BOTTOM_ROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_IN_THE_LITTLE_PIPE_ROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_BEFORE_THE_BEDROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_GIRL_COSTUME,
+            AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+            AquariaLocationNames.THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE,
+            AquariaLocationNames.THE_BODY_CENTER_AREA_BULB_ON_THE_MAIN_PATH_BLOCKING_TUBE,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_FIRST_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_SECOND_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_BELOW_THE_WATER_STREAM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_JELLY_ZAP_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_NAUTILUS_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+            AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED,
+            AquariaLocationNames.OBJECTIVE_COMPLETE
         ]
-        items = [["Li and Li song", "Body tongue cleared"]]
+        items = [[ItemNames.LI_AND_LI_SONG, ItemNames.BODY_TONGUE_CLEARED]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_light_access.py b/worlds/aquaria/test/test_light_access.py
index 29d37d790b20..ca668505f7d2 100644
--- a/worlds/aquaria/test/test_light_access.py
+++ b/worlds/aquaria/test/test_light_access.py
@@ -5,12 +5,15 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import TurtleRandomizer
 
 
 class LightAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of locations with and without light"""
     options = {
-        "turtle_randomizer": 1,
+        "turtle_randomizer": TurtleRandomizer.option_all,
         "light_needed_to_get_to_dark_places": True,
     }
 
@@ -19,52 +22,52 @@ def test_light_location(self) -> None:
         locations = [
             # Since the `assertAccessDependency` sweep for events even if I tell it not to, those location cannot be
             # tested.
-            # "Third secret",
-            # "Sun Temple, bulb in the top left part",
-            # "Sun Temple, bulb in the top right part",
-            # "Sun Temple, bulb at the top of the high dark room",
-            # "Sun Temple, Golden Gear",
-            # "Sun Worm path, first path bulb",
-            # "Sun Worm path, second path bulb",
-            # "Sun Worm path, first cliff bulb",
-            "Octopus Cave, Dumbo Egg",
-            "Kelp Forest bottom right area, Odd Container",
-            "Kelp Forest top right area, Black Pearl",
-            "Abyss left area, bulb in hidden path room",
-            "Abyss left area, bulb in the right part",
-            "Abyss left area, Glowing Seed",
-            "Abyss left area, Glowing Plant",
-            "Abyss left area, bulb in the bottom fish pass",
-            "Abyss right area, bulb behind the rock in the whale room",
-            "Abyss right area, bulb in the middle path",
-            "Abyss right area, bulb behind the rock in the middle path",
-            "Abyss right area, bulb in the left green room",
-            "Ice Cave, bulb in the room to the right",
-            "Ice Cave, first bulb in the top exit room",
-            "Ice Cave, second bulb in the top exit room",
-            "Ice Cave, third bulb in the top exit room",
-            "Ice Cave, bulb in the left room",
-            "Bubble Cave, bulb in the left cave wall",
-            "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
-            "Bubble Cave, Verse Egg",
-            "Beating Mantis Shrimp Prime",
-            "King Jellyfish Cave, bulb in the right path from King Jelly",
-            "King Jellyfish Cave, Jellyfish Costume",
-            "Beating King Jellyfish God Prime",
-            "The Whale, Verse Egg",
-            "First secret",
-            "Sunken City right area, crate close to the save crystal",
-            "Sunken City right area, crate in the left bottom room",
-            "Sunken City left area, crate in the little pipe room",
-            "Sunken City left area, crate close to the save crystal",
-            "Sunken City left area, crate before the bedroom",
-            "Sunken City left area, Girl Costume",
-            "Sunken City, bulb on top of the boss area",
-            "Sunken City cleared",
-            "Beating the Golem",
-            "Beating Octopus Prime",
-            "Final Boss area, bulb in the boss third form room",
-            "Objective complete",
+            # AquariaLocationNames.THIRD_SECRET,
+            # AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_LEFT_PART,
+            # AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_TOP_RIGHT_PART,
+            # AquariaLocationNames.SUN_TEMPLE_BULB_AT_THE_TOP_OF_THE_HIGH_DARK_ROOM,
+            # AquariaLocationNames.SUN_TEMPLE_GOLDEN_GEAR,
+            # AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_PATH_BULB,
+            # AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_PATH_BULB,
+            # AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.KELP_FOREST_BOTTOM_RIGHT_AREA_ODD_CONTAINER,
+            AquariaLocationNames.KELP_FOREST_TOP_RIGHT_AREA_BLACK_PEARL,
+            AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_HIDDEN_PATH_ROOM,
+            AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_RIGHT_PART,
+            AquariaLocationNames.ABYSS_LEFT_AREA_GLOWING_SEED,
+            AquariaLocationNames.ABYSS_LEFT_AREA_GLOWING_PLANT,
+            AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS,
+            AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM,
+            AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_MIDDLE_PATH,
+            AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_MIDDLE_PATH,
+            AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_IN_THE_LEFT_GREEN_ROOM,
+            AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_ROOM_TO_THE_RIGHT,
+            AquariaLocationNames.ICE_CAVERN_FIRST_BULB_IN_THE_TOP_EXIT_ROOM,
+            AquariaLocationNames.ICE_CAVERN_SECOND_BULB_IN_THE_TOP_EXIT_ROOM,
+            AquariaLocationNames.ICE_CAVERN_THIRD_BULB_IN_THE_TOP_EXIT_ROOM,
+            AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_LEFT_ROOM,
+            AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+            AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+            AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+            AquariaLocationNames.BEATING_MANTIS_SHRIMP_PRIME,
+            AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY,
+            AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME,
+            AquariaLocationNames.BEATING_KING_JELLYFISH_GOD_PRIME,
+            AquariaLocationNames.THE_WHALE_VERSE_EGG,
+            AquariaLocationNames.FIRST_SECRET,
+            AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_IN_THE_LEFT_BOTTOM_ROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_IN_THE_LITTLE_PIPE_ROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_BEFORE_THE_BEDROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_GIRL_COSTUME,
+            AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+            AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+            AquariaLocationNames.OBJECTIVE_COMPLETE,
         ]
-        items = [["Sun form", "Baby Dumbo", "Has sun crystal"]]
+        items = [[ItemNames.SUN_FORM, ItemNames.BABY_DUMBO, ItemNames.HAS_SUN_CRYSTAL]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_nature_form_access.py b/worlds/aquaria/test/test_nature_form_access.py
index 1d3b8f4150eb..61aebaef4816 100644
--- a/worlds/aquaria/test/test_nature_form_access.py
+++ b/worlds/aquaria/test/test_nature_form_access.py
@@ -5,53 +5,56 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
+from ..Options import TurtleRandomizer
 
 
 class NatureFormAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of locations with and without the nature form"""
     options = {
-        "turtle_randomizer": 1,
+        "turtle_randomizer": TurtleRandomizer.option_all,
     }
 
     def test_nature_form_location(self) -> None:
         """Test locations that require nature form"""
         locations = [
-            "Song Cave, Anemone Seed",
-            "Energy Temple blaster room, Blaster Egg",
-            "Beating Blaster Peg Prime",
-            "Kelp Forest top left area, Verse Egg",
-            "Kelp Forest top left area, bulb close to the Verse Egg",
-            "Mithalas City Castle, beating the Priests",
-            "Kelp Forest sprite cave, bulb in the second room",
-            "Kelp Forest sprite cave, Seed Bag",
-            "Beating Mithalan priests",
-            "Abyss left area, bulb in the bottom fish pass",
-            "Bubble Cave, Verse Egg",
-            "Beating Mantis Shrimp Prime",
-            "Sunken City right area, crate close to the save crystal",
-            "Sunken City right area, crate in the left bottom room",
-            "Sunken City left area, crate in the little pipe room",
-            "Sunken City left area, crate close to the save crystal",
-            "Sunken City left area, crate before the bedroom",
-            "Sunken City left area, Girl Costume",
-            "Sunken City, bulb on top of the boss area",
-            "Beating the Golem",
-            "Sunken City cleared",
-            "The Body center area, breaking Li's cage",
-            "The Body center area, bulb on the main path blocking tube",
-            "The Body left area, first bulb in the top face room",
-            "The Body left area, second bulb in the top face room",
-            "The Body left area, bulb below the water stream",
-            "The Body left area, bulb in the top path to the top face room",
-            "The Body left area, bulb in the bottom face room",
-            "The Body right area, bulb in the top face room",
-            "The Body right area, bulb in the top path to the bottom face room",
-            "The Body right area, bulb in the bottom face room",
-            "The Body bottom area, bulb in the Jelly Zap room",
-            "The Body bottom area, bulb in the nautilus room",
-            "The Body bottom area, Mutant Costume",
-            "Final Boss area, bulb in the boss third form room",
-            "Objective complete"
+            AquariaLocationNames.SONG_CAVE_ANEMONE_SEED,
+            AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+            AquariaLocationNames.BEATING_BLASTER_PEG_PRIME,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_VERSE_EGG,
+            AquariaLocationNames.KELP_FOREST_TOP_LEFT_AREA_BULB_CLOSE_TO_THE_VERSE_EGG,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+            AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_BULB_IN_THE_SECOND_ROOM,
+            AquariaLocationNames.KELP_FOREST_SPRITE_CAVE_SEED_BAG,
+            AquariaLocationNames.BEATING_MITHALAN_PRIESTS,
+            AquariaLocationNames.ABYSS_LEFT_AREA_BULB_IN_THE_BOTTOM_FISH_PASS,
+            AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+            AquariaLocationNames.BEATING_MANTIS_SHRIMP_PRIME,
+            AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.SUNKEN_CITY_RIGHT_AREA_CRATE_IN_THE_LEFT_BOTTOM_ROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_IN_THE_LITTLE_PIPE_ROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_CLOSE_TO_THE_SAVE_CRYSTAL,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_CRATE_BEFORE_THE_BEDROOM,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_GIRL_COSTUME,
+            AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED,
+            AquariaLocationNames.THE_BODY_CENTER_AREA_BREAKING_LI_S_CAGE,
+            AquariaLocationNames.THE_BODY_CENTER_AREA_BULB_ON_THE_MAIN_PATH_BLOCKING_TUBE,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_FIRST_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_SECOND_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_BELOW_THE_WATER_STREAM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_LEFT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_TOP_PATH_TO_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_RIGHT_AREA_BULB_IN_THE_BOTTOM_FACE_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_JELLY_ZAP_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_BULB_IN_THE_NAUTILUS_ROOM,
+            AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+            AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+            AquariaLocationNames.OBJECTIVE_COMPLETE
         ]
-        items = [["Nature form"]]
+        items = [[ItemNames.NATURE_FORM]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py b/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
index 517af3028dd2..65139088f27c 100644
--- a/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
+++ b/worlds/aquaria/test/test_no_progression_hard_hidden_locations.py
@@ -6,6 +6,7 @@
 
 from . import AquariaTestBase
 from BaseClasses import ItemClassification
+from ..Locations import AquariaLocationNames
 
 
 class UNoProgressionHardHiddenTest(AquariaTestBase):
@@ -15,31 +16,31 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
     }
 
     unfillable_locations = [
-        "Energy Temple boss area, Fallen God Tooth",
-        "Mithalas boss area, beating Mithalan God",
-        "Kelp Forest boss area, beating Drunian God",
-        "Sun Temple boss area, beating Sun God",
-        "Sunken City, bulb on top of the boss area",
-        "Home Water, Nautilus Egg",
-        "Energy Temple blaster room, Blaster Egg",
-        "Mithalas City Castle, beating the Priests",
-        "Mermog cave, Piranha Egg",
-        "Octopus Cave, Dumbo Egg",
-        "King Jellyfish Cave, bulb in the right path from King Jelly",
-        "King Jellyfish Cave, Jellyfish Costume",
-        "Final Boss area, bulb in the boss third form room",
-        "Sun Worm path, first cliff bulb",
-        "Sun Worm path, second cliff bulb",
-        "The Veil top right area, bulb at the top of the waterfall",
-        "Bubble Cave, bulb in the left cave wall",
-        "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
-        "Bubble Cave, Verse Egg",
-        "Kelp Forest bottom left area, bulb close to the spirit crystals",
-        "Kelp Forest bottom left area, Walker Baby",
-        "Sun Temple, Sun Key",
-        "The Body bottom area, Mutant Costume",
-        "Sun Temple, bulb in the hidden room of the right part",
-        "Arnassi Ruins, Arnassi Armor",
+        AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+        AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD,
+        AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
+        AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+        AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG,
+        AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+        AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+        AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+        AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY,
+        AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME,
+        AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+        AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY,
+        AquariaLocationNames.SUN_TEMPLE_SUN_KEY,
+        AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART,
+        AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
     ]
 
     def test_unconfine_home_water_both_location_fillable(self) -> None:
diff --git a/worlds/aquaria/test/test_progression_hard_hidden_locations.py b/worlds/aquaria/test/test_progression_hard_hidden_locations.py
index a1493c5d0f39..f6ac8e0e17e2 100644
--- a/worlds/aquaria/test/test_progression_hard_hidden_locations.py
+++ b/worlds/aquaria/test/test_progression_hard_hidden_locations.py
@@ -5,6 +5,7 @@
 """
 
 from . import AquariaTestBase
+from ..Locations import AquariaLocationNames
 
 
 class UNoProgressionHardHiddenTest(AquariaTestBase):
@@ -14,31 +15,31 @@ class UNoProgressionHardHiddenTest(AquariaTestBase):
     }
 
     unfillable_locations = [
-        "Energy Temple boss area, Fallen God Tooth",
-        "Mithalas boss area, beating Mithalan God",
-        "Kelp Forest boss area, beating Drunian God",
-        "Sun Temple boss area, beating Sun God",
-        "Sunken City, bulb on top of the boss area",
-        "Home Water, Nautilus Egg",
-        "Energy Temple blaster room, Blaster Egg",
-        "Mithalas City Castle, beating the Priests",
-        "Mermog cave, Piranha Egg",
-        "Octopus Cave, Dumbo Egg",
-        "King Jellyfish Cave, bulb in the right path from King Jelly",
-        "King Jellyfish Cave, Jellyfish Costume",
-        "Final Boss area, bulb in the boss third form room",
-        "Sun Worm path, first cliff bulb",
-        "Sun Worm path, second cliff bulb",
-        "The Veil top right area, bulb at the top of the waterfall",
-        "Bubble Cave, bulb in the left cave wall",
-        "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
-        "Bubble Cave, Verse Egg",
-        "Kelp Forest bottom left area, bulb close to the spirit crystals",
-        "Kelp Forest bottom left area, Walker Baby",
-        "Sun Temple, Sun Key",
-        "The Body bottom area, Mutant Costume",
-        "Sun Temple, bulb in the hidden room of the right part",
-        "Arnassi Ruins, Arnassi Armor",
+        AquariaLocationNames.ENERGY_TEMPLE_BOSS_AREA_FALLEN_GOD_TOOTH,
+        AquariaLocationNames.MITHALAS_BOSS_AREA_BEATING_MITHALAN_GOD,
+        AquariaLocationNames.KELP_FOREST_BOSS_AREA_BEATING_DRUNIAN_GOD,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_AREA_BEATING_LUMEREAN_GOD,
+        AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+        AquariaLocationNames.HOME_WATERS_NAUTILUS_EGG,
+        AquariaLocationNames.ENERGY_TEMPLE_BLASTER_ROOM_BLASTER_EGG,
+        AquariaLocationNames.MITHALAS_CITY_CASTLE_BEATING_THE_PRIESTS,
+        AquariaLocationNames.MERMOG_CAVE_PIRANHA_EGG,
+        AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+        AquariaLocationNames.KING_JELLYFISH_CAVE_BULB_IN_THE_RIGHT_PATH_FROM_KING_JELLY,
+        AquariaLocationNames.KING_JELLYFISH_CAVE_JELLYFISH_COSTUME,
+        AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_FIRST_CLIFF_BULB,
+        AquariaLocationNames.SUN_TEMPLE_BOSS_PATH_SECOND_CLIFF_BULB,
+        AquariaLocationNames.THE_VEIL_TOP_RIGHT_AREA_BULB_AT_THE_TOP_OF_THE_WATERFALL,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+        AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+        AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_BULB_CLOSE_TO_THE_SPIRIT_CRYSTALS,
+        AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY,
+        AquariaLocationNames.SUN_TEMPLE_SUN_KEY,
+        AquariaLocationNames.THE_BODY_BOTTOM_AREA_MUTANT_COSTUME,
+        AquariaLocationNames.SUN_TEMPLE_BULB_IN_THE_HIDDEN_ROOM_OF_THE_RIGHT_PART,
+        AquariaLocationNames.ARNASSI_RUINS_ARNASSI_ARMOR,
     ]
 
     def test_unconfine_home_water_both_location_fillable(self) -> None:
diff --git a/worlds/aquaria/test/test_spirit_form_access.py b/worlds/aquaria/test/test_spirit_form_access.py
index 7e31de9905e9..834661e0bd4d 100644
--- a/worlds/aquaria/test/test_spirit_form_access.py
+++ b/worlds/aquaria/test/test_spirit_form_access.py
@@ -5,6 +5,8 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
 
 
 class SpiritFormAccessTest(AquariaTestBase):
@@ -13,23 +15,23 @@ class SpiritFormAccessTest(AquariaTestBase):
     def test_spirit_form_location(self) -> None:
         """Test locations that require spirit form"""
         locations = [
-            "The Veil bottom area, bulb in the spirit path",
-            "Mithalas City Castle, Trident Head",
-            "Open Water skeleton path, King Skull",
-            "Kelp Forest bottom left area, Walker Baby",
-            "Abyss right area, bulb behind the rock in the whale room",
-            "The Whale, Verse Egg",
-            "Ice Cave, bulb in the room to the right",
-            "Ice Cave, first bulb in the top exit room",
-            "Ice Cave, second bulb in the top exit room",
-            "Ice Cave, third bulb in the top exit room",
-            "Ice Cave, bulb in the left room",
-            "Bubble Cave, bulb in the left cave wall",
-            "Bubble Cave, bulb in the right cave wall (behind the ice crystal)",
-            "Bubble Cave, Verse Egg",
-            "Sunken City left area, Girl Costume",
-            "Beating Mantis Shrimp Prime",
-            "First secret",
+            AquariaLocationNames.THE_VEIL_BOTTOM_AREA_BULB_IN_THE_SPIRIT_PATH,
+            AquariaLocationNames.MITHALAS_CITY_CASTLE_TRIDENT_HEAD,
+            AquariaLocationNames.OPEN_WATERS_SKELETON_PATH_KING_SKULL,
+            AquariaLocationNames.KELP_FOREST_BOTTOM_LEFT_AREA_WALKER_BABY,
+            AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM,
+            AquariaLocationNames.THE_WHALE_VERSE_EGG,
+            AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_ROOM_TO_THE_RIGHT,
+            AquariaLocationNames.ICE_CAVERN_FIRST_BULB_IN_THE_TOP_EXIT_ROOM,
+            AquariaLocationNames.ICE_CAVERN_SECOND_BULB_IN_THE_TOP_EXIT_ROOM,
+            AquariaLocationNames.ICE_CAVERN_THIRD_BULB_IN_THE_TOP_EXIT_ROOM,
+            AquariaLocationNames.ICE_CAVERN_BULB_IN_THE_LEFT_ROOM,
+            AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_LEFT_CAVE_WALL,
+            AquariaLocationNames.BUBBLE_CAVE_BULB_IN_THE_RIGHT_CAVE_WALL_BEHIND_THE_ICE_CRYSTAL,
+            AquariaLocationNames.BUBBLE_CAVE_VERSE_EGG,
+            AquariaLocationNames.SUNKEN_CITY_LEFT_AREA_GIRL_COSTUME,
+            AquariaLocationNames.BEATING_MANTIS_SHRIMP_PRIME,
+            AquariaLocationNames.FIRST_SECRET,
         ]
-        items = [["Spirit form"]]
+        items = [[ItemNames.SPIRIT_FORM]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_sun_form_access.py b/worlds/aquaria/test/test_sun_form_access.py
index 394d5e4b27ae..b37cceeed9c3 100644
--- a/worlds/aquaria/test/test_sun_form_access.py
+++ b/worlds/aquaria/test/test_sun_form_access.py
@@ -5,6 +5,8 @@
 """
 
 from . import AquariaTestBase
+from ..Items import ItemNames
+from ..Locations import AquariaLocationNames
 
 
 class SunFormAccessTest(AquariaTestBase):
@@ -13,16 +15,16 @@ class SunFormAccessTest(AquariaTestBase):
     def test_sun_form_location(self) -> None:
         """Test locations that require sun form"""
         locations = [
-            "First secret",
-            "The Whale, Verse Egg",
-            "Abyss right area, bulb behind the rock in the whale room",
-            "Octopus Cave, Dumbo Egg",
-            "Beating Octopus Prime",
-            "Sunken City, bulb on top of the boss area",
-            "Beating the Golem",
-            "Sunken City cleared",
-            "Final Boss area, bulb in the boss third form room",
-            "Objective complete"
+            AquariaLocationNames.FIRST_SECRET,
+            AquariaLocationNames.THE_WHALE_VERSE_EGG,
+            AquariaLocationNames.ABYSS_RIGHT_AREA_BULB_BEHIND_THE_ROCK_IN_THE_WHALE_ROOM,
+            AquariaLocationNames.OCTOPUS_CAVE_DUMBO_EGG,
+            AquariaLocationNames.BEATING_OCTOPUS_PRIME,
+            AquariaLocationNames.SUNKEN_CITY_BULB_ON_TOP_OF_THE_BOSS_AREA,
+            AquariaLocationNames.BEATING_THE_GOLEM,
+            AquariaLocationNames.SUNKEN_CITY_CLEARED,
+            AquariaLocationNames.FINAL_BOSS_AREA_BULB_IN_THE_BOSS_THIRD_FORM_ROOM,
+            AquariaLocationNames.OBJECTIVE_COMPLETE
         ]
-        items = [["Sun form"]]
+        items = [[ItemNames.SUN_FORM]]
         self.assertAccessDependency(locations, items)
diff --git a/worlds/aquaria/test/test_unconfine_home_water_via_both.py b/worlds/aquaria/test/test_unconfine_home_water_via_both.py
index 5b8689bc53a2..038e27782a16 100644
--- a/worlds/aquaria/test/test_unconfine_home_water_via_both.py
+++ b/worlds/aquaria/test/test_unconfine_home_water_via_both.py
@@ -6,16 +6,17 @@
 """
 
 from . import AquariaTestBase
+from ..Options import UnconfineHomeWater, EarlyEnergyForm
 
 
 class UnconfineHomeWaterBothAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of region with the unconfine home water option enabled"""
     options = {
-        "unconfine_home_water": 3,
-        "early_energy_form": False
+        "unconfine_home_water": UnconfineHomeWater.option_via_both,
+        "early_energy_form": EarlyEnergyForm.option_off
     }
 
     def test_unconfine_home_water_both_location(self) -> None:
         """Test locations accessible with unconfined home water via energy door and transportation turtle"""
-        self.assertTrue(self.can_reach_region("Open Water top left area"), "Cannot reach Open Water top left area")
-        self.assertTrue(self.can_reach_region("Home Water, turtle room"), "Cannot reach Home Water, turtle room")
+        self.assertTrue(self.can_reach_region("Open Waters top left area"), "Cannot reach Open Waters top left area")
+        self.assertTrue(self.can_reach_region("Home Waters, turtle room"), "Cannot reach Home Waters, turtle room")
diff --git a/worlds/aquaria/test/test_unconfine_home_water_via_energy_door.py b/worlds/aquaria/test/test_unconfine_home_water_via_energy_door.py
index 37a5c98610b5..269a4b33837e 100644
--- a/worlds/aquaria/test/test_unconfine_home_water_via_energy_door.py
+++ b/worlds/aquaria/test/test_unconfine_home_water_via_energy_door.py
@@ -5,16 +5,17 @@
 """
 
 from . import AquariaTestBase
+from ..Options import UnconfineHomeWater, EarlyEnergyForm
 
 
 class UnconfineHomeWaterEnergyDoorAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of region with the unconfine home water option enabled"""
     options = {
-        "unconfine_home_water": 1,
-        "early_energy_form": False
+        "unconfine_home_water": UnconfineHomeWater.option_via_energy_door,
+        "early_energy_form": EarlyEnergyForm.option_off
     }
 
     def test_unconfine_home_water_energy_door_location(self) -> None:
         """Test locations accessible with unconfined home water via energy door"""
-        self.assertTrue(self.can_reach_region("Open Water top left area"), "Cannot reach Open Water top left area")
-        self.assertFalse(self.can_reach_region("Home Water, turtle room"), "Can reach Home Water, turtle room")
+        self.assertTrue(self.can_reach_region("Open Waters top left area"), "Cannot reach Open Waters top left area")
+        self.assertFalse(self.can_reach_region("Home Waters, turtle room"), "Can reach Home Waters, turtle room")
diff --git a/worlds/aquaria/test/test_unconfine_home_water_via_transturtle.py b/worlds/aquaria/test/test_unconfine_home_water_via_transturtle.py
index da4c83c2bc7f..b8efb82471c4 100644
--- a/worlds/aquaria/test/test_unconfine_home_water_via_transturtle.py
+++ b/worlds/aquaria/test/test_unconfine_home_water_via_transturtle.py
@@ -5,16 +5,17 @@
 """
 
 from . import AquariaTestBase
+from ..Options import UnconfineHomeWater, EarlyEnergyForm
 
 
 class UnconfineHomeWaterTransturtleAccessTest(AquariaTestBase):
     """Unit test used to test accessibility of region with the unconfine home water option enabled"""
     options = {
-        "unconfine_home_water": 2,
-        "early_energy_form": False
+        "unconfine_home_water": UnconfineHomeWater.option_via_transturtle,
+        "early_energy_form": EarlyEnergyForm.option_off
     }
 
     def test_unconfine_home_water_transturtle_location(self) -> None:
         """Test locations accessible with unconfined home water via transportation turtle"""
-        self.assertTrue(self.can_reach_region("Home Water, turtle room"), "Cannot reach Home Water, turtle room")
-        self.assertFalse(self.can_reach_region("Open Water top left area"), "Can reach Open Water top left area")
+        self.assertTrue(self.can_reach_region("Home Waters, turtle room"), "Cannot reach Home Waters, turtle room")
+        self.assertFalse(self.can_reach_region("Open Waters top left area"), "Can reach Open Waters top left area")

From 51c4fe8f67511850a7d26fe07a183242683034f1 Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Sun, 8 Dec 2024 21:00:30 -0500
Subject: [PATCH 147/381] Stardew Valley: Fix a bug where walnutsanity would
 get deactivated even tho ginger island got forced activated (and move some
 files) (#4311)

---
 worlds/stardew_valley/__init__.py             |  40 +-
 worlds/stardew_valley/items.py                |  32 +-
 worlds/stardew_valley/logic/walnut_logic.py   |  22 +-
 worlds/stardew_valley/option_groups.py        |  76 ----
 worlds/stardew_valley/options/__init__.py     |   6 +
 .../stardew_valley/options/forced_options.py  |  48 +++
 .../stardew_valley/options/option_groups.py   |  68 ++++
 .../stardew_valley/{ => options}/options.py   |  23 +-
 worlds/stardew_valley/options/presets.py      | 371 +++++++++++++++++
 worlds/stardew_valley/presets.py              | 376 ------------------
 worlds/stardew_valley/rules.py                |  10 +-
 .../strings/ap_names/ap_option_names.py       |  35 +-
 .../strings/ap_names/mods/__init__.py         |   0
 worlds/stardew_valley/test/TestBooksanity.py  |   1 -
 worlds/stardew_valley/test/TestOptions.py     |  34 +-
 .../stardew_valley/test/TestOptionsPairs.py   |  19 +-
 worlds/stardew_valley/test/TestRegions.py     |   9 +-
 .../stardew_valley/test/TestWalnutsanity.py   |  12 +-
 worlds/stardew_valley/test/__init__.py        |  59 +--
 worlds/stardew_valley/test/mods/TestMods.py   |   5 +-
 .../test/options/TestForcedOptions.py         |  84 ++++
 .../test/{ => options}/TestPresets.py         |  10 +-
 .../stardew_valley/test/options/__init__.py   |   0
 worlds/stardew_valley/test/options/utils.py   |  68 ++++
 .../test/stability/TestUniversalTracker.py    |   4 +-
 25 files changed, 752 insertions(+), 660 deletions(-)
 delete mode 100644 worlds/stardew_valley/option_groups.py
 create mode 100644 worlds/stardew_valley/options/__init__.py
 create mode 100644 worlds/stardew_valley/options/forced_options.py
 create mode 100644 worlds/stardew_valley/options/option_groups.py
 rename worlds/stardew_valley/{ => options}/options.py (97%)
 create mode 100644 worlds/stardew_valley/options/presets.py
 delete mode 100644 worlds/stardew_valley/presets.py
 create mode 100644 worlds/stardew_valley/strings/ap_names/mods/__init__.py
 create mode 100644 worlds/stardew_valley/test/options/TestForcedOptions.py
 rename worlds/stardew_valley/test/{ => options}/TestPresets.py (86%)
 create mode 100644 worlds/stardew_valley/test/options/__init__.py
 create mode 100644 worlds/stardew_valley/test/options/utils.py

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 34c617f5013a..6ba0e35e0a3a 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -3,7 +3,7 @@
 from typing import Dict, Any, Iterable, Optional, Union, List, TextIO
 
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
-from Options import PerGameCommonOptions, Accessibility
+from Options import PerGameCommonOptions
 from worlds.AutoWorld import World, WebWorld
 from . import rules
 from .bundles.bundle_room import BundleRoom
@@ -15,10 +15,11 @@
 from .logic.bundle_logic import BundleLogic
 from .logic.logic import StardewLogic
 from .logic.time_logic import MAX_MONTHS
-from .option_groups import sv_option_groups
-from .options import StardewValleyOptions, SeasonRandomization, Goal, BundleRandomization, BundlePrice, EnabledFillerBuffs, NumberOfMovementBuffs, \
-    BackpackProgression, BuildingProgression, ExcludeGingerIsland, TrapItems, EntranceRandomization, FarmType, Walnutsanity
-from .presets import sv_options_presets
+from .options import StardewValleyOptions, SeasonRandomization, Goal, BundleRandomization, EnabledFillerBuffs, NumberOfMovementBuffs, \
+    BuildingProgression, ExcludeGingerIsland, TrapItems, EntranceRandomization, FarmType, Walnutsanity
+from .options.forced_options import force_change_options_if_incompatible
+from .options.option_groups import sv_option_groups
+from .options.presets import sv_options_presets
 from .regions import create_regions
 from .rules import set_rules
 from .stardew_rule import True_, StardewRule, HasProgressionPercent, true_
@@ -112,36 +113,9 @@ def interpret_slot_data(self, slot_data: Dict[str, Any]) -> Optional[int]:
         return seed
 
     def generate_early(self):
-        self.force_change_options_if_incompatible()
+        force_change_options_if_incompatible(self.options, self.player, self.player_name)
         self.content = create_content(self.options)
 
-    def force_change_options_if_incompatible(self):
-        goal_is_walnut_hunter = self.options.goal == Goal.option_greatest_walnut_hunter
-        goal_is_perfection = self.options.goal == Goal.option_perfection
-        goal_is_island_related = goal_is_walnut_hunter or goal_is_perfection
-        exclude_ginger_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true
-
-        if goal_is_island_related and exclude_ginger_island:
-            self.options.exclude_ginger_island.value = ExcludeGingerIsland.option_false
-            goal_name = self.options.goal.current_key
-            logger.warning(
-                f"Goal '{goal_name}' requires Ginger Island. Exclude Ginger Island setting forced to 'False' for player {self.player} ({self.player_name})")
-
-        if exclude_ginger_island and self.options.walnutsanity != Walnutsanity.preset_none:
-            self.options.walnutsanity.value = Walnutsanity.preset_none
-            logger.warning(
-                f"Walnutsanity requires Ginger Island. Ginger Island was excluded from {self.player} ({self.player_name})'s world, so walnutsanity was force disabled")
-
-        if goal_is_perfection and self.options.accessibility == Accessibility.option_minimal:
-            self.options.accessibility.value = Accessibility.option_full
-            logger.warning(
-                f"Goal 'Perfection' requires full accessibility. Accessibility setting forced to 'Full' for player {self.player} ({self.player_name})")
-
-        elif self.options.goal == Goal.option_allsanity and self.options.accessibility == Accessibility.option_minimal:
-            self.options.accessibility.value = Accessibility.option_full
-            logger.warning(
-                f"Goal 'Allsanity' requires full accessibility. Accessibility setting forced to 'Full' for player {self.player} ({self.player_name})")
-
     def create_regions(self):
         def create_region(name: str, exits: Iterable[str]) -> Region:
             region = Region(name, self.player, self.multiworld)
diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py
index 3d852a37f402..6ac827f869cc 100644
--- a/worlds/stardew_valley/items.py
+++ b/worlds/stardew_valley/items.py
@@ -17,7 +17,7 @@
 from .options import StardewValleyOptions, TrapItems, FestivalLocations, ExcludeGingerIsland, SpecialOrderLocations, SeasonRandomization, Museumsanity, \
     BuildingProgression, ToolProgression, ElevatorProgression, BackpackProgression, ArcadeMachineLocations, Monstersanity, Goal, \
     Chefsanity, Craftsanity, BundleRandomization, EntranceRandomization, Shipsanity, Walnutsanity, EnabledFillerBuffs
-from .strings.ap_names.ap_option_names import OptionName
+from .strings.ap_names.ap_option_names import BuffOptionName, WalnutsanityOptionName
 from .strings.ap_names.ap_weapon_names import APWeapon
 from .strings.ap_names.buff_names import Buff
 from .strings.ap_names.community_upgrade_names import CommunityUpgrade
@@ -538,16 +538,16 @@ def create_walnuts(item_factory: StardewItemFactory, options: StardewValleyOptio
     num_penta_walnuts = 1
     # https://stardewvalleywiki.com/Golden_Walnut
     # Totals should be accurate, but distribution is slightly offset to make room for baseline walnuts
-    if OptionName.walnutsanity_puzzles in walnutsanity:  # 61
+    if WalnutsanityOptionName.puzzles in walnutsanity:  # 61
         num_single_walnuts += 6  # 6
         num_triple_walnuts += 5  # 15
         num_penta_walnuts += 8  # 40
-    if OptionName.walnutsanity_bushes in walnutsanity:  # 25
+    if WalnutsanityOptionName.bushes in walnutsanity:  # 25
         num_single_walnuts += 16  # 16
         num_triple_walnuts += 3  # 9
-    if OptionName.walnutsanity_dig_spots in walnutsanity:  # 18
+    if WalnutsanityOptionName.dig_spots in walnutsanity:  # 18
         num_single_walnuts += 18  # 18
-    if OptionName.walnutsanity_repeatables in walnutsanity:  # 33
+    if WalnutsanityOptionName.repeatables in walnutsanity:  # 33
         num_single_walnuts += 30  # 30
         num_triple_walnuts += 1  # 3
 
@@ -833,27 +833,27 @@ def get_all_filler_items(include_traps: bool, exclude_ginger_island: bool) -> Li
 
 def get_allowed_player_buffs(buff_option: EnabledFillerBuffs) -> List[ItemData]:
     allowed_buffs = []
-    if OptionName.buff_luck in buff_option:
+    if BuffOptionName.luck in buff_option:
         allowed_buffs.append(item_table[Buff.luck])
-    if OptionName.buff_damage in buff_option:
+    if BuffOptionName.damage in buff_option:
         allowed_buffs.append(item_table[Buff.damage])
-    if OptionName.buff_defense in buff_option:
+    if BuffOptionName.defense in buff_option:
         allowed_buffs.append(item_table[Buff.defense])
-    if OptionName.buff_immunity in buff_option:
+    if BuffOptionName.immunity in buff_option:
         allowed_buffs.append(item_table[Buff.immunity])
-    if OptionName.buff_health in buff_option:
+    if BuffOptionName.health in buff_option:
         allowed_buffs.append(item_table[Buff.health])
-    if OptionName.buff_energy in buff_option:
+    if BuffOptionName.energy in buff_option:
         allowed_buffs.append(item_table[Buff.energy])
-    if OptionName.buff_bite in buff_option:
+    if BuffOptionName.bite in buff_option:
         allowed_buffs.append(item_table[Buff.bite_rate])
-    if OptionName.buff_fish_trap in buff_option:
+    if BuffOptionName.fish_trap in buff_option:
         allowed_buffs.append(item_table[Buff.fish_trap])
-    if OptionName.buff_fishing_bar in buff_option:
+    if BuffOptionName.fishing_bar in buff_option:
         allowed_buffs.append(item_table[Buff.fishing_bar])
-    if OptionName.buff_quality in buff_option:
+    if BuffOptionName.quality in buff_option:
         allowed_buffs.append(item_table[Buff.quality])
-    if OptionName.buff_glow in buff_option:
+    if BuffOptionName.glow in buff_option:
         allowed_buffs.append(item_table[Buff.glow])
     return allowed_buffs
 
diff --git a/worlds/stardew_valley/logic/walnut_logic.py b/worlds/stardew_valley/logic/walnut_logic.py
index 14fe1c339090..4ab3b46f70d9 100644
--- a/worlds/stardew_valley/logic/walnut_logic.py
+++ b/worlds/stardew_valley/logic/walnut_logic.py
@@ -7,10 +7,10 @@
 from .has_logic import HasLogicMixin
 from .received_logic import ReceivedLogicMixin
 from .region_logic import RegionLogicMixin
-from ..strings.ap_names.event_names import Event
 from ..options import ExcludeGingerIsland, Walnutsanity
 from ..stardew_rule import StardewRule, False_, True_
-from ..strings.ap_names.ap_option_names import OptionName
+from ..strings.ap_names.ap_option_names import WalnutsanityOptionName
+from ..strings.ap_names.event_names import Event
 from ..strings.craftable_names import Furniture
 from ..strings.crop_names import Fruit
 from ..strings.metal_names import Mineral, Fossil
@@ -25,7 +25,7 @@ def __init__(self, *args, **kwargs):
 
 
 class WalnutLogic(BaseLogic[Union[WalnutLogicMixin, ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, CombatLogicMixin,
-                                  AbilityLogicMixin]]):
+AbilityLogicMixin]]):
 
     def has_walnut(self, number: int) -> StardewRule:
         if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true:
@@ -44,22 +44,22 @@ def has_walnut(self, number: int) -> StardewRule:
         total_walnuts = puzzle_walnuts + bush_walnuts + dig_walnuts + repeatable_walnuts
         walnuts_to_receive = 0
         walnuts_to_collect = number
-        if OptionName.walnutsanity_puzzles in self.options.walnutsanity:
+        if WalnutsanityOptionName.puzzles in self.options.walnutsanity:
             puzzle_walnut_rate = puzzle_walnuts / total_walnuts
             puzzle_walnuts_required = round(puzzle_walnut_rate * number)
             walnuts_to_receive += puzzle_walnuts_required
             walnuts_to_collect -= puzzle_walnuts_required
-        if OptionName.walnutsanity_bushes in self.options.walnutsanity:
+        if WalnutsanityOptionName.bushes in self.options.walnutsanity:
             bush_walnuts_rate = bush_walnuts / total_walnuts
             bush_walnuts_required = round(bush_walnuts_rate * number)
             walnuts_to_receive += bush_walnuts_required
             walnuts_to_collect -= bush_walnuts_required
-        if OptionName.walnutsanity_dig_spots in self.options.walnutsanity:
+        if WalnutsanityOptionName.dig_spots in self.options.walnutsanity:
             dig_walnuts_rate = dig_walnuts / total_walnuts
             dig_walnuts_required = round(dig_walnuts_rate * number)
             walnuts_to_receive += dig_walnuts_required
             walnuts_to_collect -= dig_walnuts_required
-        if OptionName.walnutsanity_repeatables in self.options.walnutsanity:
+        if WalnutsanityOptionName.repeatables in self.options.walnutsanity:
             repeatable_walnuts_rate = repeatable_walnuts / total_walnuts
             repeatable_walnuts_required = round(repeatable_walnuts_rate * number)
             walnuts_to_receive += repeatable_walnuts_required
@@ -104,9 +104,9 @@ def can_get_walnuts(self, number: int) -> StardewRule:
             return reach_entire_island
         gems = (Mineral.amethyst, Mineral.aquamarine, Mineral.emerald, Mineral.ruby, Mineral.topaz)
         return reach_entire_island & self.logic.has(Fruit.banana) & self.logic.has_all(*gems) & \
-               self.logic.ability.can_mine_perfectly() & self.logic.ability.can_fish_perfectly() & \
-               self.logic.has(Furniture.flute_block) & self.logic.has(Seed.melon) & self.logic.has(Seed.wheat) & \
-               self.logic.has(Seed.garlic) & self.can_complete_field_office()
+            self.logic.ability.can_mine_perfectly() & self.logic.ability.can_fish_perfectly() & \
+            self.logic.has(Furniture.flute_block) & self.logic.has(Seed.melon) & self.logic.has(Seed.wheat) & \
+            self.logic.has(Seed.garlic) & self.can_complete_field_office()
 
     @cached_property
     def can_start_field_office(self) -> StardewRule:
@@ -132,4 +132,4 @@ def can_complete_bat_collection(self) -> StardewRule:
 
     def can_complete_field_office(self) -> StardewRule:
         return self.can_complete_large_animal_collection() & self.can_complete_snake_collection() & \
-               self.can_complete_frog_collection() & self.can_complete_bat_collection()
+            self.can_complete_frog_collection() & self.can_complete_bat_collection()
diff --git a/worlds/stardew_valley/option_groups.py b/worlds/stardew_valley/option_groups.py
deleted file mode 100644
index d0f052348a7e..000000000000
--- a/worlds/stardew_valley/option_groups.py
+++ /dev/null
@@ -1,76 +0,0 @@
-import logging
-
-from Options import DeathLink, ProgressionBalancing, Accessibility
-from .options import (Goal, StartingMoney, ProfitMargin, BundleRandomization, BundlePrice,
-                      EntranceRandomization, SeasonRandomization, Cropsanity, BackpackProgression,
-                      ToolProgression, ElevatorProgression, SkillProgression, BuildingProgression,
-                      FestivalLocations, ArcadeMachineLocations, SpecialOrderLocations,
-                      QuestLocations, Fishsanity, Museumsanity, Friendsanity, FriendsanityHeartSize,
-                      NumberOfMovementBuffs, EnabledFillerBuffs, ExcludeGingerIsland, TrapItems,
-                      MultipleDaySleepEnabled, MultipleDaySleepCost, ExperienceMultiplier,
-                      FriendshipMultiplier, DebrisMultiplier, QuickStart, Gifting, FarmType,
-                      Monstersanity, Shipsanity, Cooksanity, Chefsanity, Craftsanity, Mods, Booksanity, Walnutsanity, BundlePlando)
-
-sv_option_groups = []
-try:
-    from Options import OptionGroup
-except:
-    logging.warning("Old AP Version, OptionGroup not available.")
-else:
-    sv_option_groups = [
-        OptionGroup("General", [
-            Goal,
-            FarmType,
-            BundleRandomization,
-            BundlePrice,
-            EntranceRandomization,
-            ExcludeGingerIsland,
-        ]),
-        OptionGroup("Major Unlocks", [
-            SeasonRandomization,
-            Cropsanity,
-            BackpackProgression,
-            ToolProgression,
-            ElevatorProgression,
-            SkillProgression,
-            BuildingProgression,
-        ]),
-        OptionGroup("Extra Shuffling", [
-            FestivalLocations,
-            ArcadeMachineLocations,
-            SpecialOrderLocations,
-            QuestLocations,
-            Fishsanity,
-            Museumsanity,
-            Friendsanity,
-            FriendsanityHeartSize,
-            Monstersanity,
-            Shipsanity,
-            Cooksanity,
-            Chefsanity,
-            Craftsanity,
-            Booksanity,
-            Walnutsanity,
-        ]),
-        OptionGroup("Multipliers and Buffs", [
-            StartingMoney,
-            ProfitMargin,
-            ExperienceMultiplier,
-            FriendshipMultiplier,
-            DebrisMultiplier,
-            NumberOfMovementBuffs,
-            EnabledFillerBuffs,
-            TrapItems,
-            MultipleDaySleepEnabled,
-            MultipleDaySleepCost,
-            QuickStart,
-        ]),
-        OptionGroup("Advanced Options", [
-            Gifting,
-            DeathLink,
-            Mods,
-            BundlePlando,
-            ProgressionBalancing,
-            Accessibility,
-        ]),
-    ]
diff --git a/worlds/stardew_valley/options/__init__.py b/worlds/stardew_valley/options/__init__.py
new file mode 100644
index 000000000000..d1436b00dff7
--- /dev/null
+++ b/worlds/stardew_valley/options/__init__.py
@@ -0,0 +1,6 @@
+from .options import StardewValleyOption, Goal, FarmType, StartingMoney, ProfitMargin, BundleRandomization, BundlePrice, EntranceRandomization, \
+    SeasonRandomization, Cropsanity, BackpackProgression, ToolProgression, ElevatorProgression, SkillProgression, BuildingProgression, FestivalLocations, \
+    ArcadeMachineLocations, SpecialOrderLocations, QuestLocations, Fishsanity, Museumsanity, Monstersanity, Shipsanity, Cooksanity, Chefsanity, Craftsanity, \
+    Friendsanity, FriendsanityHeartSize, Booksanity, Walnutsanity, NumberOfMovementBuffs, EnabledFillerBuffs, ExcludeGingerIsland, TrapItems, \
+    MultipleDaySleepEnabled, MultipleDaySleepCost, ExperienceMultiplier, FriendshipMultiplier, DebrisMultiplier, QuickStart, Gifting, Mods, BundlePlando, \
+    StardewValleyOptions
diff --git a/worlds/stardew_valley/options/forced_options.py b/worlds/stardew_valley/options/forced_options.py
new file mode 100644
index 000000000000..84cdc936b3f1
--- /dev/null
+++ b/worlds/stardew_valley/options/forced_options.py
@@ -0,0 +1,48 @@
+import logging
+
+import Options as ap_options
+from . import options
+
+logger = logging.getLogger(__name__)
+
+
+def force_change_options_if_incompatible(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
+    force_ginger_island_inclusion_when_goal_is_ginger_island_related(world_options, player, player_name)
+    force_walnutsanity_deactivation_when_ginger_island_is_excluded(world_options, player, player_name)
+    force_accessibility_to_full_when_goal_requires_all_locations(player, player_name, world_options)
+
+
+def force_ginger_island_inclusion_when_goal_is_ginger_island_related(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
+    goal_is_walnut_hunter = world_options.goal == options.Goal.option_greatest_walnut_hunter
+    goal_is_perfection = world_options.goal == options.Goal.option_perfection
+    goal_is_island_related = goal_is_walnut_hunter or goal_is_perfection
+    ginger_island_is_excluded = world_options.exclude_ginger_island == options.ExcludeGingerIsland.option_true
+
+    if goal_is_island_related and ginger_island_is_excluded:
+        world_options.exclude_ginger_island.value = options.ExcludeGingerIsland.option_false
+        goal_name = world_options.goal.current_option_name
+        logger.warning(f"Goal '{goal_name}' requires Ginger Island. "
+                       f"Exclude Ginger Island option forced to 'False' for player {player} ({player_name})")
+
+
+def force_walnutsanity_deactivation_when_ginger_island_is_excluded(world_options: options.StardewValleyOptions, player: int, player_name: str):
+    ginger_island_is_excluded = world_options.exclude_ginger_island == options.ExcludeGingerIsland.option_true
+    walnutsanity_is_active = world_options.walnutsanity != options.Walnutsanity.preset_none
+
+    if ginger_island_is_excluded and walnutsanity_is_active:
+        world_options.walnutsanity.value = options.Walnutsanity.preset_none
+        logger.warning(f"Walnutsanity requires Ginger Island. "
+                       f"Ginger Island was excluded from {player} ({player_name})'s world, so walnutsanity was force disabled")
+
+
+def force_accessibility_to_full_when_goal_requires_all_locations(player, player_name, world_options):
+    goal_is_allsanity = world_options.goal == options.Goal.option_allsanity
+    goal_is_perfection = world_options.goal == options.Goal.option_perfection
+    goal_requires_all_locations = goal_is_allsanity or goal_is_perfection
+    accessibility_is_minimal = world_options.accessibility == ap_options.Accessibility.option_minimal
+
+    if goal_requires_all_locations and accessibility_is_minimal:
+        world_options.accessibility.value = ap_options.Accessibility.option_full
+        goal_name = world_options.goal.current_option_name
+        logger.warning(f"Goal '{goal_name}' requires full accessibility. "
+                       f"Accessibility option forced to 'Full' for player {player} ({player_name})")
diff --git a/worlds/stardew_valley/options/option_groups.py b/worlds/stardew_valley/options/option_groups.py
new file mode 100644
index 000000000000..bcb9bee77ff4
--- /dev/null
+++ b/worlds/stardew_valley/options/option_groups.py
@@ -0,0 +1,68 @@
+import logging
+
+import Options as ap_options
+from . import options
+
+sv_option_groups = []
+try:
+    from Options import OptionGroup
+except ImportError:
+    logging.warning("Old AP Version, OptionGroup not available.")
+else:
+    sv_option_groups = [
+        OptionGroup("General", [
+            options.Goal,
+            options.FarmType,
+            options.BundleRandomization,
+            options.BundlePrice,
+            options.EntranceRandomization,
+            options.ExcludeGingerIsland,
+        ]),
+        OptionGroup("Major Unlocks", [
+            options.SeasonRandomization,
+            options.Cropsanity,
+            options.BackpackProgression,
+            options.ToolProgression,
+            options.ElevatorProgression,
+            options.SkillProgression,
+            options.BuildingProgression,
+        ]),
+        OptionGroup("Extra Shuffling", [
+            options.FestivalLocations,
+            options.ArcadeMachineLocations,
+            options.SpecialOrderLocations,
+            options.QuestLocations,
+            options.Fishsanity,
+            options.Museumsanity,
+            options.Friendsanity,
+            options.FriendsanityHeartSize,
+            options.Monstersanity,
+            options.Shipsanity,
+            options.Cooksanity,
+            options.Chefsanity,
+            options.Craftsanity,
+            options.Booksanity,
+            options.Walnutsanity,
+        ]),
+        OptionGroup("Multipliers and Buffs", [
+            options.StartingMoney,
+            options.ProfitMargin,
+            options.ExperienceMultiplier,
+            options.FriendshipMultiplier,
+            options.DebrisMultiplier,
+            options.NumberOfMovementBuffs,
+            options.EnabledFillerBuffs,
+            options.TrapItems,
+            options.MultipleDaySleepEnabled,
+            options.MultipleDaySleepCost,
+            options.QuickStart,
+        ]),
+        OptionGroup("Advanced Options", [
+            options.Gifting,
+            ap_options.DeathLink,
+            options.Mods,
+            options.BundlePlando,
+            ap_options.ProgressionBalancing,
+            ap_options.Accessibility,
+        ]),
+    ]
diff --git a/worlds/stardew_valley/options.py b/worlds/stardew_valley/options/options.py
similarity index 97%
rename from worlds/stardew_valley/options.py
rename to worlds/stardew_valley/options/options.py
index 5369e88a2dcb..5d3b25b4da13 100644
--- a/worlds/stardew_valley/options.py
+++ b/worlds/stardew_valley/options/options.py
@@ -4,9 +4,9 @@
 from typing import Protocol, ClassVar
 
 from Options import Range, NamedRange, Toggle, Choice, OptionSet, PerGameCommonOptions, DeathLink, OptionList, Visibility
-from .mods.mod_data import ModNames
-from .strings.ap_names.ap_option_names import OptionName
-from .strings.bundle_names import all_cc_bundle_names
+from ..mods.mod_data import ModNames
+from ..strings.ap_names.ap_option_names import BuffOptionName, WalnutsanityOptionName
+from ..strings.bundle_names import all_cc_bundle_names
 
 
 class StardewValleyOption(Protocol):
@@ -582,8 +582,10 @@ class Walnutsanity(OptionSet):
     """
     internal_name = "walnutsanity"
     display_name = "Walnutsanity"
-    valid_keys = frozenset({OptionName.walnutsanity_puzzles, OptionName.walnutsanity_bushes, OptionName.walnutsanity_dig_spots,
-                            OptionName.walnutsanity_repeatables, })
+    valid_keys = frozenset({
+        WalnutsanityOptionName.puzzles, WalnutsanityOptionName.bushes, WalnutsanityOptionName.dig_spots,
+        WalnutsanityOptionName.repeatables,
+    })
     preset_none = frozenset()
     preset_all = valid_keys
     default = preset_none
@@ -622,12 +624,14 @@ class EnabledFillerBuffs(OptionSet):
     """
     internal_name = "enabled_filler_buffs"
     display_name = "Enabled Filler Buffs"
-    valid_keys = frozenset({OptionName.buff_luck, OptionName.buff_damage, OptionName.buff_defense, OptionName.buff_immunity, OptionName.buff_health,
-                            OptionName.buff_energy, OptionName.buff_bite, OptionName.buff_fish_trap, OptionName.buff_fishing_bar})
-                            # OptionName.buff_quality, OptionName.buff_glow}) # Disabled these two buffs because they are too hard to make on the mod side
+    valid_keys = frozenset({
+        BuffOptionName.luck, BuffOptionName.damage, BuffOptionName.defense, BuffOptionName.immunity, BuffOptionName.health,
+        BuffOptionName.energy, BuffOptionName.bite, BuffOptionName.fish_trap, BuffOptionName.fishing_bar,
+    })
+    # OptionName.buff_quality, OptionName.buff_glow}) # Disabled these two buffs because they are too hard to make on the mod side
     preset_none = frozenset()
     preset_all = valid_keys
-    default = frozenset({OptionName.buff_luck, OptionName.buff_defense, OptionName.buff_bite})
+    default = frozenset({BuffOptionName.luck, BuffOptionName.defense, BuffOptionName.bite})
 
 
 class ExcludeGingerIsland(Toggle):
@@ -762,7 +766,6 @@ class Gifting(Toggle):
                  ModNames.wellwick, ModNames.shiko, ModNames.delores, ModNames.riley,
                  ModNames.boarding_house}
 
-
 if 'unittest' in sys.modules.keys() or 'pytest' in sys.modules.keys():
     disabled_mods = {}
 
diff --git a/worlds/stardew_valley/options/presets.py b/worlds/stardew_valley/options/presets.py
new file mode 100644
index 000000000000..c2c210e5ca6e
--- /dev/null
+++ b/worlds/stardew_valley/options/presets.py
@@ -0,0 +1,371 @@
+from typing import Any, Dict
+
+import Options as ap_options
+from . import options
+from ..strings.ap_names.ap_option_names import WalnutsanityOptionName
+
+# @formatter:off
+all_random_settings = {
+    "progression_balancing":                        "random",
+    "accessibility":                                "random",
+    options.Goal.internal_name:                     "random",
+    options.FarmType.internal_name:                 "random",
+    options.StartingMoney.internal_name:            "random",
+    options.ProfitMargin.internal_name:             "random",
+    options.BundleRandomization.internal_name:      "random",
+    options.BundlePrice.internal_name:              "random",
+    options.EntranceRandomization.internal_name:    "random",
+    options.SeasonRandomization.internal_name:      "random",
+    options.Cropsanity.internal_name:               "random",
+    options.BackpackProgression.internal_name:      "random",
+    options.ToolProgression.internal_name:          "random",
+    options.ElevatorProgression.internal_name:      "random",
+    options.SkillProgression.internal_name:         "random",
+    options.BuildingProgression.internal_name:      "random",
+    options.FestivalLocations.internal_name:        "random",
+    options.ArcadeMachineLocations.internal_name:   "random",
+    options.SpecialOrderLocations.internal_name:    "random",
+    options.QuestLocations.internal_name:           "random",
+    options.Fishsanity.internal_name:               "random",
+    options.Museumsanity.internal_name:             "random",
+    options.Monstersanity.internal_name:            "random",
+    options.Shipsanity.internal_name:               "random",
+    options.Cooksanity.internal_name:               "random",
+    options.Chefsanity.internal_name:               "random",
+    options.Craftsanity.internal_name:              "random",
+    options.Friendsanity.internal_name:             "random",
+    options.FriendsanityHeartSize.internal_name:    "random",
+    options.Booksanity.internal_name:               "random",
+    options.NumberOfMovementBuffs.internal_name:    "random",
+    options.ExcludeGingerIsland.internal_name:      "random",
+    options.TrapItems.internal_name:                "random",
+    options.MultipleDaySleepEnabled.internal_name:  "random",
+    options.MultipleDaySleepCost.internal_name:     "random",
+    options.ExperienceMultiplier.internal_name:     "random",
+    options.FriendshipMultiplier.internal_name:     "random",
+    options.DebrisMultiplier.internal_name:         "random",
+    options.QuickStart.internal_name:               "random",
+    options.Gifting.internal_name:                  "random",
+    "death_link":                                   "random",
+}
+
+easy_settings = {
+    options.Goal.internal_name:                     options.Goal.option_community_center,
+    options.FarmType.internal_name:                 "random",
+    options.StartingMoney.internal_name:            "very rich",
+    options.ProfitMargin.internal_name:             "double",
+    options.BundleRandomization.internal_name:      options.BundleRandomization.option_thematic,
+    options.BundlePrice.internal_name:              options.BundlePrice.option_cheap,
+    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_disabled,
+    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized_not_winter,
+    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:      options.BackpackProgression.option_early_progressive,
+    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive_very_cheap,
+    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive,
+    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive,
+    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive_very_cheap,
+    options.FestivalLocations.internal_name:        options.FestivalLocations.option_easy,
+    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_disabled,
+    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_vanilla_very_short,
+    options.QuestLocations.internal_name:           "minimum",
+    options.Fishsanity.internal_name:               options.Fishsanity.option_only_easy_fish,
+    options.Museumsanity.internal_name:             options.Museumsanity.option_milestones,
+    options.Monstersanity.internal_name:            options.Monstersanity.option_one_per_category,
+    options.Shipsanity.internal_name:               options.Shipsanity.option_none,
+    options.Cooksanity.internal_name:               options.Cooksanity.option_none,
+    options.Chefsanity.internal_name:               options.Chefsanity.option_none,
+    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:             options.Friendsanity.option_none,
+    options.FriendsanityHeartSize.internal_name:    4,
+    options.Booksanity.internal_name:               options.Booksanity.option_none,
+    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_none,
+    options.NumberOfMovementBuffs.internal_name:    8,
+    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
+    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
+    options.TrapItems.internal_name:                options.TrapItems.option_easy,
+    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:     "free",
+    options.ExperienceMultiplier.internal_name:     "triple",
+    options.FriendshipMultiplier.internal_name:     "quadruple",
+    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_quarter,
+    options.QuickStart.internal_name:               options.QuickStart.option_true,
+    options.Gifting.internal_name:                  options.Gifting.option_true,
+    "death_link":                                   "false",
+}
+
+medium_settings = {
+    options.Goal.internal_name:                     options.Goal.option_community_center,
+    options.FarmType.internal_name:                 "random",
+    options.StartingMoney.internal_name:            "rich",
+    options.ProfitMargin.internal_name:             150,
+    options.BundleRandomization.internal_name:      options.BundleRandomization.option_remixed,
+    options.BundlePrice.internal_name:              options.BundlePrice.option_normal,
+    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_non_progression,
+    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized,
+    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:      options.BackpackProgression.option_early_progressive,
+    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive_cheap,
+    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive,
+    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive,
+    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive_cheap,
+    options.FestivalLocations.internal_name:        options.FestivalLocations.option_hard,
+    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_victories_easy,
+    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_board_short,
+    options.QuestLocations.internal_name:           "normal",
+    options.Fishsanity.internal_name:               options.Fishsanity.option_exclude_legendaries,
+    options.Museumsanity.internal_name:             options.Museumsanity.option_milestones,
+    options.Monstersanity.internal_name:            options.Monstersanity.option_one_per_monster,
+    options.Shipsanity.internal_name:               options.Shipsanity.option_none,
+    options.Cooksanity.internal_name:               options.Cooksanity.option_none,
+    options.Chefsanity.internal_name:               options.Chefsanity.option_queen_of_sauce,
+    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:             options.Friendsanity.option_starting_npcs,
+    options.FriendsanityHeartSize.internal_name:    4,
+    options.Booksanity.internal_name:               options.Booksanity.option_power_skill,
+    options.Walnutsanity.internal_name:             [WalnutsanityOptionName.puzzles],
+    options.NumberOfMovementBuffs.internal_name:    6,
+    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
+    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
+    options.TrapItems.internal_name:                options.TrapItems.option_medium,
+    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:     "free",
+    options.ExperienceMultiplier.internal_name:     "double",
+    options.FriendshipMultiplier.internal_name:     "triple",
+    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_half,
+    options.QuickStart.internal_name:               options.QuickStart.option_true,
+    options.Gifting.internal_name:                  options.Gifting.option_true,
+    "death_link":                                   "false",
+}
+
+hard_settings = {
+    options.Goal.internal_name:                     options.Goal.option_grandpa_evaluation,
+    options.FarmType.internal_name:                 "random",
+    options.StartingMoney.internal_name:            "extra",
+    options.ProfitMargin.internal_name:             "normal",
+    options.BundleRandomization.internal_name:      options.BundleRandomization.option_remixed,
+    options.BundlePrice.internal_name:              options.BundlePrice.option_expensive,
+    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_buildings_without_house,
+    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized,
+    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:      options.BackpackProgression.option_progressive,
+    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive,
+    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive_from_previous_floor,
+    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive_with_masteries,
+    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive,
+    options.FestivalLocations.internal_name:        options.FestivalLocations.option_hard,
+    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_full_shuffling,
+    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_board_qi_short,
+    options.QuestLocations.internal_name:           "lots",
+    options.Fishsanity.internal_name:               options.Fishsanity.option_all,
+    options.Museumsanity.internal_name:             options.Museumsanity.option_all,
+    options.Monstersanity.internal_name:            options.Monstersanity.option_progressive_goals,
+    options.Shipsanity.internal_name:               options.Shipsanity.option_crops,
+    options.Cooksanity.internal_name:               options.Cooksanity.option_queen_of_sauce,
+    options.Chefsanity.internal_name:               options.Chefsanity.option_qos_and_purchases,
+    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:             options.Friendsanity.option_all,
+    options.FriendsanityHeartSize.internal_name:    4,
+    options.Booksanity.internal_name:               options.Booksanity.option_all,
+    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_all,
+    options.NumberOfMovementBuffs.internal_name:    4,
+    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.default,
+    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_false,
+    options.TrapItems.internal_name:                options.TrapItems.option_hard,
+    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:     "cheap",
+    options.ExperienceMultiplier.internal_name:     "vanilla",
+    options.FriendshipMultiplier.internal_name:     "double",
+    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_vanilla,
+    options.QuickStart.internal_name:               options.QuickStart.option_true,
+    options.Gifting.internal_name:                  options.Gifting.option_true,
+    "death_link":                                   "true",
+}
+
+nightmare_settings = {
+    options.Goal.internal_name:                     options.Goal.option_community_center,
+    options.FarmType.internal_name:                 "random",
+    options.StartingMoney.internal_name:            "vanilla",
+    options.ProfitMargin.internal_name:             "half",
+    options.BundleRandomization.internal_name:      options.BundleRandomization.option_shuffled,
+    options.BundlePrice.internal_name:              options.BundlePrice.option_very_expensive,
+    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_buildings,
+    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized,
+    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:      options.BackpackProgression.option_progressive,
+    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive,
+    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive_from_previous_floor,
+    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive_with_masteries,
+    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive,
+    options.FestivalLocations.internal_name:        options.FestivalLocations.option_hard,
+    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_full_shuffling,
+    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_board_qi,
+    options.QuestLocations.internal_name:           "maximum",
+    options.Fishsanity.internal_name:               options.Fishsanity.option_special,
+    options.Museumsanity.internal_name:             options.Museumsanity.option_all,
+    options.Monstersanity.internal_name:            options.Monstersanity.option_split_goals,
+    options.Shipsanity.internal_name:               options.Shipsanity.option_full_shipment_with_fish,
+    options.Cooksanity.internal_name:               options.Cooksanity.option_queen_of_sauce,
+    options.Chefsanity.internal_name:               options.Chefsanity.option_qos_and_purchases,
+    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:             options.Friendsanity.option_all_with_marriage,
+    options.FriendsanityHeartSize.internal_name:    4,
+    options.Booksanity.internal_name:               options.Booksanity.option_all,
+    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_all,
+    options.NumberOfMovementBuffs.internal_name:    2,
+    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_none,
+    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_false,
+    options.TrapItems.internal_name:                options.TrapItems.option_hell,
+    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:     "expensive",
+    options.ExperienceMultiplier.internal_name:     "half",
+    options.FriendshipMultiplier.internal_name:     "vanilla",
+    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_vanilla,
+    options.QuickStart.internal_name:               options.QuickStart.option_false,
+    options.Gifting.internal_name:                  options.Gifting.option_true,
+    "death_link":                                   "true",
+}
+
+short_settings = {
+    options.Goal.internal_name:                     options.Goal.option_bottom_of_the_mines,
+    options.FarmType.internal_name:                 "random",
+    options.StartingMoney.internal_name:            "filthy rich",
+    options.ProfitMargin.internal_name:             "quadruple",
+    options.BundleRandomization.internal_name:      options.BundleRandomization.option_remixed,
+    options.BundlePrice.internal_name:              options.BundlePrice.option_minimum,
+    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_disabled,
+    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized_not_winter,
+    options.Cropsanity.internal_name:               options.Cropsanity.option_disabled,
+    options.BackpackProgression.internal_name:      options.BackpackProgression.option_early_progressive,
+    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive_very_cheap,
+    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive,
+    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive,
+    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive_very_cheap,
+    options.FestivalLocations.internal_name:        options.FestivalLocations.option_disabled,
+    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_disabled,
+    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_vanilla_very_short,
+    options.QuestLocations.internal_name:           "none",
+    options.Fishsanity.internal_name:               options.Fishsanity.option_none,
+    options.Museumsanity.internal_name:             options.Museumsanity.option_none,
+    options.Monstersanity.internal_name:            options.Monstersanity.option_none,
+    options.Shipsanity.internal_name:               options.Shipsanity.option_none,
+    options.Cooksanity.internal_name:               options.Cooksanity.option_none,
+    options.Chefsanity.internal_name:               options.Chefsanity.option_none,
+    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:             options.Friendsanity.option_none,
+    options.FriendsanityHeartSize.internal_name:    4,
+    options.Booksanity.internal_name:               options.Booksanity.option_none,
+    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_none,
+    options.NumberOfMovementBuffs.internal_name:    10,
+    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
+    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
+    options.TrapItems.internal_name:                options.TrapItems.option_easy,
+    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.option_true,
+    options.MultipleDaySleepCost.internal_name:     "free",
+    options.ExperienceMultiplier.internal_name:     "quadruple",
+    options.FriendshipMultiplier.internal_name:     800,
+    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.option_none,
+    options.QuickStart.internal_name:               options.QuickStart.option_true,
+    options.Gifting.internal_name:                  options.Gifting.option_true,
+    "death_link":                                  "false",
+}
+
+minsanity_settings = {
+    options.Goal.internal_name:                     options.Goal.default,
+    options.FarmType.internal_name:                 "random",
+    options.StartingMoney.internal_name:            options.StartingMoney.default,
+    options.ProfitMargin.internal_name:             options.ProfitMargin.default,
+    options.BundleRandomization.internal_name:      options.BundleRandomization.default,
+    options.BundlePrice.internal_name:              options.BundlePrice.default,
+    options.EntranceRandomization.internal_name:    options.EntranceRandomization.default,
+    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_disabled,
+    options.Cropsanity.internal_name:               options.Cropsanity.option_disabled,
+    options.BackpackProgression.internal_name:      options.BackpackProgression.option_vanilla,
+    options.ToolProgression.internal_name:          options.ToolProgression.option_vanilla,
+    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_vanilla,
+    options.SkillProgression.internal_name:         options.SkillProgression.option_vanilla,
+    options.BuildingProgression.internal_name:      options.BuildingProgression.option_vanilla,
+    options.FestivalLocations.internal_name:        options.FestivalLocations.option_disabled,
+    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_disabled,
+    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_vanilla_very_short,
+    options.QuestLocations.internal_name:           "none",
+    options.Fishsanity.internal_name:               options.Fishsanity.option_none,
+    options.Museumsanity.internal_name:             options.Museumsanity.option_none,
+    options.Monstersanity.internal_name:            options.Monstersanity.option_none,
+    options.Shipsanity.internal_name:               options.Shipsanity.option_none,
+    options.Cooksanity.internal_name:               options.Cooksanity.option_none,
+    options.Chefsanity.internal_name:               options.Chefsanity.option_none,
+    options.Craftsanity.internal_name:              options.Craftsanity.option_none,
+    options.Friendsanity.internal_name:             options.Friendsanity.option_none,
+    options.FriendsanityHeartSize.internal_name:    options.FriendsanityHeartSize.default,
+    options.Booksanity.internal_name:               options.Booksanity.option_none,
+    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_none,
+    options.NumberOfMovementBuffs.internal_name:    options.NumberOfMovementBuffs.default,
+    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.default,
+    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,
+    options.TrapItems.internal_name:                options.TrapItems.default,
+    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.default,
+    options.MultipleDaySleepCost.internal_name:     options.MultipleDaySleepCost.default,
+    options.ExperienceMultiplier.internal_name:     options.ExperienceMultiplier.default,
+    options.FriendshipMultiplier.internal_name:     options.FriendshipMultiplier.default,
+    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.default,
+    options.QuickStart.internal_name:               options.QuickStart.default,
+    options.Gifting.internal_name:                  options.Gifting.default,
+    "death_link":                                   ap_options.DeathLink.default,
+}
+
+allsanity_settings = {
+    options.Goal.internal_name:                     options.Goal.default,
+    options.FarmType.internal_name:                 "random",
+    options.StartingMoney.internal_name:            options.StartingMoney.default,
+    options.ProfitMargin.internal_name:             options.ProfitMargin.default,
+    options.BundleRandomization.internal_name:      options.BundleRandomization.default,
+    options.BundlePrice.internal_name:              options.BundlePrice.default,
+    options.EntranceRandomization.internal_name:    options.EntranceRandomization.option_buildings,
+    options.SeasonRandomization.internal_name:      options.SeasonRandomization.option_randomized,
+    options.Cropsanity.internal_name:               options.Cropsanity.option_enabled,
+    options.BackpackProgression.internal_name:      options.BackpackProgression.option_early_progressive,
+    options.ToolProgression.internal_name:          options.ToolProgression.option_progressive,
+    options.ElevatorProgression.internal_name:      options.ElevatorProgression.option_progressive,
+    options.SkillProgression.internal_name:         options.SkillProgression.option_progressive_with_masteries,
+    options.BuildingProgression.internal_name:      options.BuildingProgression.option_progressive,
+    options.FestivalLocations.internal_name:        options.FestivalLocations.option_hard,
+    options.ArcadeMachineLocations.internal_name:   options.ArcadeMachineLocations.option_full_shuffling,
+    options.SpecialOrderLocations.internal_name:    options.SpecialOrderLocations.option_board_qi,
+    options.QuestLocations.internal_name:           "maximum",
+    options.Fishsanity.internal_name:               options.Fishsanity.option_all,
+    options.Museumsanity.internal_name:             options.Museumsanity.option_all,
+    options.Monstersanity.internal_name:            options.Monstersanity.option_progressive_goals,
+    options.Shipsanity.internal_name:               options.Shipsanity.option_everything,
+    options.Cooksanity.internal_name:               options.Cooksanity.option_all,
+    options.Chefsanity.internal_name:               options.Chefsanity.option_all,
+    options.Craftsanity.internal_name:              options.Craftsanity.option_all,
+    options.Friendsanity.internal_name:             options.Friendsanity.option_all,
+    options.FriendsanityHeartSize.internal_name:    1,
+    options.Booksanity.internal_name:               options.Booksanity.option_all,
+    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_all,
+    options.NumberOfMovementBuffs.internal_name:    12,
+    options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
+    options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_false,
+    options.TrapItems.internal_name:                options.TrapItems.default,
+    options.MultipleDaySleepEnabled.internal_name:  options.MultipleDaySleepEnabled.default,
+    options.MultipleDaySleepCost.internal_name:     options.MultipleDaySleepCost.default,
+    options.ExperienceMultiplier.internal_name:     options.ExperienceMultiplier.default,
+    options.FriendshipMultiplier.internal_name:     options.FriendshipMultiplier.default,
+    options.DebrisMultiplier.internal_name:         options.DebrisMultiplier.default,
+    options.QuickStart.internal_name:               options.QuickStart.default,
+    options.Gifting.internal_name:                  options.Gifting.default,
+    "death_link":                                   ap_options.DeathLink.default,
+}
+# @formatter:on
+
+
+sv_options_presets: Dict[str, Dict[str, Any]] = {
+    "All random": all_random_settings,
+    "Easy": easy_settings,
+    "Medium": medium_settings,
+    "Hard": hard_settings,
+    "Nightmare": nightmare_settings,
+    "Short": short_settings,
+    "Minsanity": minsanity_settings,
+    "Allsanity": allsanity_settings,
+}
diff --git a/worlds/stardew_valley/presets.py b/worlds/stardew_valley/presets.py
deleted file mode 100644
index 62672f29e424..000000000000
--- a/worlds/stardew_valley/presets.py
+++ /dev/null
@@ -1,376 +0,0 @@
-from typing import Any, Dict
-
-from Options import Accessibility, ProgressionBalancing, DeathLink
-from .options import Goal, StartingMoney, ProfitMargin, BundleRandomization, BundlePrice, EntranceRandomization, SeasonRandomization, Cropsanity, \
-    BackpackProgression, ToolProgression, ElevatorProgression, SkillProgression, BuildingProgression, FestivalLocations, ArcadeMachineLocations, \
-    SpecialOrderLocations, QuestLocations, Fishsanity, Museumsanity, Friendsanity, FriendsanityHeartSize, NumberOfMovementBuffs, ExcludeGingerIsland, TrapItems, \
-    MultipleDaySleepEnabled, MultipleDaySleepCost, ExperienceMultiplier, FriendshipMultiplier, DebrisMultiplier, QuickStart, \
-    Gifting, FarmType, Monstersanity, Shipsanity, Cooksanity, Chefsanity, Craftsanity, Booksanity, Walnutsanity, EnabledFillerBuffs
-
-# @formatter:off
-from .strings.ap_names.ap_option_names import OptionName
-
-all_random_settings = {
-    "progression_balancing":                "random",
-    "accessibility":                        "random",
-    Goal.internal_name:                     "random",
-    FarmType.internal_name:                 "random",
-    StartingMoney.internal_name:            "random",
-    ProfitMargin.internal_name:             "random",
-    BundleRandomization.internal_name:      "random",
-    BundlePrice.internal_name:              "random",
-    EntranceRandomization.internal_name:    "random",
-    SeasonRandomization.internal_name:      "random",
-    Cropsanity.internal_name:               "random",
-    BackpackProgression.internal_name:      "random",
-    ToolProgression.internal_name:          "random",
-    ElevatorProgression.internal_name:      "random",
-    SkillProgression.internal_name:         "random",
-    BuildingProgression.internal_name:      "random",
-    FestivalLocations.internal_name:        "random",
-    ArcadeMachineLocations.internal_name:   "random",
-    SpecialOrderLocations.internal_name:    "random",
-    QuestLocations.internal_name:           "random",
-    Fishsanity.internal_name:               "random",
-    Museumsanity.internal_name:             "random",
-    Monstersanity.internal_name:            "random",
-    Shipsanity.internal_name:               "random",
-    Cooksanity.internal_name:               "random",
-    Chefsanity.internal_name:               "random",
-    Craftsanity.internal_name:              "random",
-    Friendsanity.internal_name:             "random",
-    FriendsanityHeartSize.internal_name:    "random",
-    Booksanity.internal_name:               "random",
-    NumberOfMovementBuffs.internal_name:    "random",
-    ExcludeGingerIsland.internal_name:      "random",
-    TrapItems.internal_name:                "random",
-    MultipleDaySleepEnabled.internal_name:  "random",
-    MultipleDaySleepCost.internal_name:     "random",
-    ExperienceMultiplier.internal_name:     "random",
-    FriendshipMultiplier.internal_name:     "random",
-    DebrisMultiplier.internal_name:         "random",
-    QuickStart.internal_name:               "random",
-    Gifting.internal_name:                  "random",
-    "death_link":                           "random",
-}
-
-easy_settings = {
-    Goal.internal_name:                     Goal.option_community_center,
-    FarmType.internal_name:                 "random",
-    StartingMoney.internal_name:            "very rich",
-    ProfitMargin.internal_name:             "double",
-    BundleRandomization.internal_name:      BundleRandomization.option_thematic,
-    BundlePrice.internal_name:              BundlePrice.option_cheap,
-    EntranceRandomization.internal_name:    EntranceRandomization.option_disabled,
-    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized_not_winter,
-    Cropsanity.internal_name:               Cropsanity.option_enabled,
-    BackpackProgression.internal_name:      BackpackProgression.option_early_progressive,
-    ToolProgression.internal_name:          ToolProgression.option_progressive_very_cheap,
-    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive,
-    SkillProgression.internal_name:         SkillProgression.option_progressive,
-    BuildingProgression.internal_name:      BuildingProgression.option_progressive_very_cheap,
-    FestivalLocations.internal_name:        FestivalLocations.option_easy,
-    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_disabled,
-    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_vanilla_very_short,
-    QuestLocations.internal_name:           "minimum",
-    Fishsanity.internal_name:               Fishsanity.option_only_easy_fish,
-    Museumsanity.internal_name:             Museumsanity.option_milestones,
-    Monstersanity.internal_name:            Monstersanity.option_one_per_category,
-    Shipsanity.internal_name:               Shipsanity.option_none,
-    Cooksanity.internal_name:               Cooksanity.option_none,
-    Chefsanity.internal_name:               Chefsanity.option_none,
-    Craftsanity.internal_name:              Craftsanity.option_none,
-    Friendsanity.internal_name:             Friendsanity.option_none,
-    FriendsanityHeartSize.internal_name:    4,
-    Booksanity.internal_name:               Booksanity.option_none,
-    Walnutsanity.internal_name:             Walnutsanity.preset_none,
-    NumberOfMovementBuffs.internal_name:    8,
-    EnabledFillerBuffs.internal_name:       EnabledFillerBuffs.preset_all,
-    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_true,
-    TrapItems.internal_name:                TrapItems.option_easy,
-    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
-    MultipleDaySleepCost.internal_name:     "free",
-    ExperienceMultiplier.internal_name:     "triple",
-    FriendshipMultiplier.internal_name:     "quadruple",
-    DebrisMultiplier.internal_name:         DebrisMultiplier.option_quarter,
-    QuickStart.internal_name:               QuickStart.option_true,
-    Gifting.internal_name:                  Gifting.option_true,
-    "death_link":                           "false",
-}
-
-medium_settings = {
-    Goal.internal_name:                     Goal.option_community_center,
-    FarmType.internal_name:                 "random",
-    StartingMoney.internal_name:            "rich",
-    ProfitMargin.internal_name:             150,
-    BundleRandomization.internal_name:      BundleRandomization.option_remixed,
-    BundlePrice.internal_name:              BundlePrice.option_normal,
-    EntranceRandomization.internal_name:    EntranceRandomization.option_non_progression,
-    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized,
-    Cropsanity.internal_name:               Cropsanity.option_enabled,
-    BackpackProgression.internal_name:      BackpackProgression.option_early_progressive,
-    ToolProgression.internal_name:          ToolProgression.option_progressive_cheap,
-    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive,
-    SkillProgression.internal_name:         SkillProgression.option_progressive,
-    BuildingProgression.internal_name:      BuildingProgression.option_progressive_cheap,
-    FestivalLocations.internal_name:        FestivalLocations.option_hard,
-    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_victories_easy,
-    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_board_short,
-    QuestLocations.internal_name:           "normal",
-    Fishsanity.internal_name:               Fishsanity.option_exclude_legendaries,
-    Museumsanity.internal_name:             Museumsanity.option_milestones,
-    Monstersanity.internal_name:            Monstersanity.option_one_per_monster,
-    Shipsanity.internal_name:               Shipsanity.option_none,
-    Cooksanity.internal_name:               Cooksanity.option_none,
-    Chefsanity.internal_name:               Chefsanity.option_queen_of_sauce,
-    Craftsanity.internal_name:              Craftsanity.option_none,
-    Friendsanity.internal_name:             Friendsanity.option_starting_npcs,
-    FriendsanityHeartSize.internal_name:    4,
-    Booksanity.internal_name:               Booksanity.option_power_skill,
-    Walnutsanity.internal_name:             [OptionName.walnutsanity_puzzles],
-    NumberOfMovementBuffs.internal_name:    6,
-    EnabledFillerBuffs.internal_name:       EnabledFillerBuffs.preset_all,
-    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_true,
-    TrapItems.internal_name:                TrapItems.option_medium,
-    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
-    MultipleDaySleepCost.internal_name:     "free",
-    ExperienceMultiplier.internal_name:     "double",
-    FriendshipMultiplier.internal_name:     "triple",
-    DebrisMultiplier.internal_name:         DebrisMultiplier.option_half,
-    QuickStart.internal_name:               QuickStart.option_true,
-    Gifting.internal_name:                  Gifting.option_true,
-    "death_link":                           "false",
-}
-
-hard_settings = {
-    Goal.internal_name:                     Goal.option_grandpa_evaluation,
-    FarmType.internal_name:                 "random",
-    StartingMoney.internal_name:            "extra",
-    ProfitMargin.internal_name:             "normal",
-    BundleRandomization.internal_name:      BundleRandomization.option_remixed,
-    BundlePrice.internal_name:              BundlePrice.option_expensive,
-    EntranceRandomization.internal_name:    EntranceRandomization.option_buildings_without_house,
-    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized,
-    Cropsanity.internal_name:               Cropsanity.option_enabled,
-    BackpackProgression.internal_name:      BackpackProgression.option_progressive,
-    ToolProgression.internal_name:          ToolProgression.option_progressive,
-    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive_from_previous_floor,
-    SkillProgression.internal_name:         SkillProgression.option_progressive_with_masteries,
-    BuildingProgression.internal_name:      BuildingProgression.option_progressive,
-    FestivalLocations.internal_name:        FestivalLocations.option_hard,
-    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_full_shuffling,
-    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_board_qi_short,
-    QuestLocations.internal_name:           "lots",
-    Fishsanity.internal_name:               Fishsanity.option_all,
-    Museumsanity.internal_name:             Museumsanity.option_all,
-    Monstersanity.internal_name:            Monstersanity.option_progressive_goals,
-    Shipsanity.internal_name:               Shipsanity.option_crops,
-    Cooksanity.internal_name:               Cooksanity.option_queen_of_sauce,
-    Chefsanity.internal_name:               Chefsanity.option_qos_and_purchases,
-    Craftsanity.internal_name:              Craftsanity.option_none,
-    Friendsanity.internal_name:             Friendsanity.option_all,
-    FriendsanityHeartSize.internal_name:    4,
-    Booksanity.internal_name:               Booksanity.option_all,
-    Walnutsanity.internal_name:             Walnutsanity.preset_all,
-    NumberOfMovementBuffs.internal_name:    4,
-    EnabledFillerBuffs.internal_name:       EnabledFillerBuffs.default,
-    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_false,
-    TrapItems.internal_name:                TrapItems.option_hard,
-    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
-    MultipleDaySleepCost.internal_name:     "cheap",
-    ExperienceMultiplier.internal_name:     "vanilla",
-    FriendshipMultiplier.internal_name:     "double",
-    DebrisMultiplier.internal_name:         DebrisMultiplier.option_vanilla,
-    QuickStart.internal_name:               QuickStart.option_true,
-    Gifting.internal_name:                  Gifting.option_true,
-    "death_link":                           "true",
-}
-
-nightmare_settings = {
-    Goal.internal_name:                     Goal.option_community_center,
-    FarmType.internal_name:                 "random",
-    StartingMoney.internal_name:            "vanilla",
-    ProfitMargin.internal_name:             "half",
-    BundleRandomization.internal_name:      BundleRandomization.option_shuffled,
-    BundlePrice.internal_name:              BundlePrice.option_very_expensive,
-    EntranceRandomization.internal_name:    EntranceRandomization.option_buildings,
-    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized,
-    Cropsanity.internal_name:               Cropsanity.option_enabled,
-    BackpackProgression.internal_name:      BackpackProgression.option_progressive,
-    ToolProgression.internal_name:          ToolProgression.option_progressive,
-    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive_from_previous_floor,
-    SkillProgression.internal_name:         SkillProgression.option_progressive_with_masteries,
-    BuildingProgression.internal_name:      BuildingProgression.option_progressive,
-    FestivalLocations.internal_name:        FestivalLocations.option_hard,
-    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_full_shuffling,
-    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_board_qi,
-    QuestLocations.internal_name:           "maximum",
-    Fishsanity.internal_name:               Fishsanity.option_special,
-    Museumsanity.internal_name:             Museumsanity.option_all,
-    Monstersanity.internal_name:            Monstersanity.option_split_goals,
-    Shipsanity.internal_name:               Shipsanity.option_full_shipment_with_fish,
-    Cooksanity.internal_name:               Cooksanity.option_queen_of_sauce,
-    Chefsanity.internal_name:               Chefsanity.option_qos_and_purchases,
-    Craftsanity.internal_name:              Craftsanity.option_none,
-    Friendsanity.internal_name:             Friendsanity.option_all_with_marriage,
-    FriendsanityHeartSize.internal_name:    4,
-    Booksanity.internal_name:               Booksanity.option_all,
-    Walnutsanity.internal_name:             Walnutsanity.preset_all,
-    NumberOfMovementBuffs.internal_name:    2,
-    EnabledFillerBuffs.internal_name:       EnabledFillerBuffs.preset_none,
-    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_false,
-    TrapItems.internal_name:                TrapItems.option_hell,
-    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
-    MultipleDaySleepCost.internal_name:     "expensive",
-    ExperienceMultiplier.internal_name:     "half",
-    FriendshipMultiplier.internal_name:     "vanilla",
-    DebrisMultiplier.internal_name:         DebrisMultiplier.option_vanilla,
-    QuickStart.internal_name:               QuickStart.option_false,
-    Gifting.internal_name:                  Gifting.option_true,
-    "death_link":                           "true",
-}
-
-short_settings = {
-    Goal.internal_name:                     Goal.option_bottom_of_the_mines,
-    FarmType.internal_name:                 "random",
-    StartingMoney.internal_name:            "filthy rich",
-    ProfitMargin.internal_name:             "quadruple",
-    BundleRandomization.internal_name:      BundleRandomization.option_remixed,
-    BundlePrice.internal_name:              BundlePrice.option_minimum,
-    EntranceRandomization.internal_name:    EntranceRandomization.option_disabled,
-    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized_not_winter,
-    Cropsanity.internal_name:               Cropsanity.option_disabled,
-    BackpackProgression.internal_name:      BackpackProgression.option_early_progressive,
-    ToolProgression.internal_name:          ToolProgression.option_progressive_very_cheap,
-    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive,
-    SkillProgression.internal_name:         SkillProgression.option_progressive,
-    BuildingProgression.internal_name:      BuildingProgression.option_progressive_very_cheap,
-    FestivalLocations.internal_name:        FestivalLocations.option_disabled,
-    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_disabled,
-    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_vanilla_very_short,
-    QuestLocations.internal_name:           "none",
-    Fishsanity.internal_name:               Fishsanity.option_none,
-    Museumsanity.internal_name:             Museumsanity.option_none,
-    Monstersanity.internal_name:            Monstersanity.option_none,
-    Shipsanity.internal_name:               Shipsanity.option_none,
-    Cooksanity.internal_name:               Cooksanity.option_none,
-    Chefsanity.internal_name:               Chefsanity.option_none,
-    Craftsanity.internal_name:              Craftsanity.option_none,
-    Friendsanity.internal_name:             Friendsanity.option_none,
-    FriendsanityHeartSize.internal_name:    4,
-    Booksanity.internal_name:               Booksanity.option_none,
-    Walnutsanity.internal_name:             Walnutsanity.preset_none,
-    NumberOfMovementBuffs.internal_name:    10,
-    EnabledFillerBuffs.internal_name:       EnabledFillerBuffs.preset_all,
-    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_true,
-    TrapItems.internal_name:                TrapItems.option_easy,
-    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
-    MultipleDaySleepCost.internal_name:     "free",
-    ExperienceMultiplier.internal_name:     "quadruple",
-    FriendshipMultiplier.internal_name:     800,
-    DebrisMultiplier.internal_name:         DebrisMultiplier.option_none,
-    QuickStart.internal_name:               QuickStart.option_true,
-    Gifting.internal_name:                  Gifting.option_true,
-    "death_link":                           "false",
-}
-
-minsanity_settings = {
-    Goal.internal_name:                     Goal.default,
-    FarmType.internal_name:                 "random",
-    StartingMoney.internal_name:            StartingMoney.default,
-    ProfitMargin.internal_name:             ProfitMargin.default,
-    BundleRandomization.internal_name:      BundleRandomization.default,
-    BundlePrice.internal_name:              BundlePrice.default,
-    EntranceRandomization.internal_name:    EntranceRandomization.default,
-    SeasonRandomization.internal_name:      SeasonRandomization.option_disabled,
-    Cropsanity.internal_name:               Cropsanity.option_disabled,
-    BackpackProgression.internal_name:      BackpackProgression.option_vanilla,
-    ToolProgression.internal_name:          ToolProgression.option_vanilla,
-    ElevatorProgression.internal_name:      ElevatorProgression.option_vanilla,
-    SkillProgression.internal_name:         SkillProgression.option_vanilla,
-    BuildingProgression.internal_name:      BuildingProgression.option_vanilla,
-    FestivalLocations.internal_name:        FestivalLocations.option_disabled,
-    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_disabled,
-    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_vanilla_very_short,
-    QuestLocations.internal_name:           "none",
-    Fishsanity.internal_name:               Fishsanity.option_none,
-    Museumsanity.internal_name:             Museumsanity.option_none,
-    Monstersanity.internal_name:            Monstersanity.option_none,
-    Shipsanity.internal_name:               Shipsanity.option_none,
-    Cooksanity.internal_name:               Cooksanity.option_none,
-    Chefsanity.internal_name:               Chefsanity.option_none,
-    Craftsanity.internal_name:              Craftsanity.option_none,
-    Friendsanity.internal_name:             Friendsanity.option_none,
-    FriendsanityHeartSize.internal_name:    FriendsanityHeartSize.default,
-    Booksanity.internal_name:               Booksanity.option_none,
-    Walnutsanity.internal_name:             Walnutsanity.preset_none,
-    NumberOfMovementBuffs.internal_name:    NumberOfMovementBuffs.default,
-    EnabledFillerBuffs.internal_name:       EnabledFillerBuffs.default,
-    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_true,
-    TrapItems.internal_name:                TrapItems.default,
-    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.default,
-    MultipleDaySleepCost.internal_name:     MultipleDaySleepCost.default,
-    ExperienceMultiplier.internal_name:     ExperienceMultiplier.default,
-    FriendshipMultiplier.internal_name:     FriendshipMultiplier.default,
-    DebrisMultiplier.internal_name:         DebrisMultiplier.default,
-    QuickStart.internal_name:               QuickStart.default,
-    Gifting.internal_name:                  Gifting.default,
-    "death_link":                           DeathLink.default,
-}
-
-allsanity_settings = {
-    Goal.internal_name:                     Goal.default,
-    FarmType.internal_name:                 "random",
-    StartingMoney.internal_name:            StartingMoney.default,
-    ProfitMargin.internal_name:             ProfitMargin.default,
-    BundleRandomization.internal_name:      BundleRandomization.default,
-    BundlePrice.internal_name:              BundlePrice.default,
-    EntranceRandomization.internal_name:    EntranceRandomization.option_buildings,
-    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized,
-    Cropsanity.internal_name:               Cropsanity.option_enabled,
-    BackpackProgression.internal_name:      BackpackProgression.option_early_progressive,
-    ToolProgression.internal_name:          ToolProgression.option_progressive,
-    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive,
-    SkillProgression.internal_name:         SkillProgression.option_progressive_with_masteries,
-    BuildingProgression.internal_name:      BuildingProgression.option_progressive,
-    FestivalLocations.internal_name:        FestivalLocations.option_hard,
-    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_full_shuffling,
-    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_board_qi,
-    QuestLocations.internal_name:           "maximum",
-    Fishsanity.internal_name:               Fishsanity.option_all,
-    Museumsanity.internal_name:             Museumsanity.option_all,
-    Monstersanity.internal_name:            Monstersanity.option_progressive_goals,
-    Shipsanity.internal_name:               Shipsanity.option_everything,
-    Cooksanity.internal_name:               Cooksanity.option_all,
-    Chefsanity.internal_name:               Chefsanity.option_all,
-    Craftsanity.internal_name:              Craftsanity.option_all,
-    Friendsanity.internal_name:             Friendsanity.option_all,
-    FriendsanityHeartSize.internal_name:    1,
-    Booksanity.internal_name:               Booksanity.option_all,
-    Walnutsanity.internal_name:             Walnutsanity.preset_all,
-    NumberOfMovementBuffs.internal_name:    12,
-    EnabledFillerBuffs.internal_name:       EnabledFillerBuffs.preset_all,
-    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_false,
-    TrapItems.internal_name:                TrapItems.default,
-    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.default,
-    MultipleDaySleepCost.internal_name:     MultipleDaySleepCost.default,
-    ExperienceMultiplier.internal_name:     ExperienceMultiplier.default,
-    FriendshipMultiplier.internal_name:     FriendshipMultiplier.default,
-    DebrisMultiplier.internal_name:         DebrisMultiplier.default,
-    QuickStart.internal_name:               QuickStart.default,
-    Gifting.internal_name:                  Gifting.default,
-    "death_link":                           DeathLink.default,
-}
-# @formatter:on
-
-
-sv_options_presets: Dict[str, Dict[str, Any]] = {
-    "All random": all_random_settings,
-    "Easy": easy_settings,
-    "Medium": medium_settings,
-    "Hard": hard_settings,
-    "Nightmare": nightmare_settings,
-    "Short": short_settings,
-    "Minsanity": minsanity_settings,
-    "Allsanity": allsanity_settings,
-}
diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py
index 96f081788041..54afc31eb892 100644
--- a/worlds/stardew_valley/rules.py
+++ b/worlds/stardew_valley/rules.py
@@ -25,7 +25,7 @@
 from .stardew_rule import And, StardewRule, true_
 from .stardew_rule.indirect_connection import look_for_indirect_connection
 from .stardew_rule.rule_explain import explain
-from .strings.ap_names.ap_option_names import OptionName
+from .strings.ap_names.ap_option_names import WalnutsanityOptionName
 from .strings.ap_names.community_upgrade_names import CommunityUpgrade
 from .strings.ap_names.mods.mod_items import SVEQuestItem, SVERunes
 from .strings.ap_names.transport_names import Transportation
@@ -436,7 +436,7 @@ def set_walnut_rules(logic: StardewLogic, multiworld, player, world_options: Sta
 
 
 def set_walnut_puzzle_rules(logic: StardewLogic, multiworld, player, world_options):
-    if OptionName.walnutsanity_puzzles not in world_options.walnutsanity:
+    if WalnutsanityOptionName.puzzles not in world_options.walnutsanity:
         return
 
     MultiWorldRules.add_rule(multiworld.get_location("Open Golden Coconut", player), logic.has(Geode.golden_coconut))
@@ -463,14 +463,14 @@ def set_walnut_puzzle_rules(logic: StardewLogic, multiworld, player, world_optio
 
 
 def set_walnut_bushes_rules(logic, multiworld, player, world_options):
-    if OptionName.walnutsanity_bushes not in world_options.walnutsanity:
+    if WalnutsanityOptionName.bushes not in world_options.walnutsanity:
         return
     # I don't think any of the bushes require something special, but that might change with ER
     return
 
 
 def set_walnut_dig_spot_rules(logic, multiworld, player, world_options):
-    if OptionName.walnutsanity_dig_spots not in world_options.walnutsanity:
+    if WalnutsanityOptionName.dig_spots not in world_options.walnutsanity:
         return
 
     for dig_spot_walnut in locations.locations_by_tag[LocationTags.WALNUTSANITY_DIG]:
@@ -483,7 +483,7 @@ def set_walnut_dig_spot_rules(logic, multiworld, player, world_options):
 
 
 def set_walnut_repeatable_rules(logic, multiworld, player, world_options):
-    if OptionName.walnutsanity_repeatables not in world_options.walnutsanity:
+    if WalnutsanityOptionName.repeatables not in world_options.walnutsanity:
         return
     for i in range(1, 6):
         MultiWorldRules.set_rule(multiworld.get_location(f"Fishing Walnut {i}", player), logic.tool.has_fishing_rod(1))
diff --git a/worlds/stardew_valley/strings/ap_names/ap_option_names.py b/worlds/stardew_valley/strings/ap_names/ap_option_names.py
index a5cc10f7d7b8..7ff2cc783d11 100644
--- a/worlds/stardew_valley/strings/ap_names/ap_option_names.py
+++ b/worlds/stardew_valley/strings/ap_names/ap_option_names.py
@@ -1,16 +1,19 @@
-class OptionName:
-    walnutsanity_puzzles = "Puzzles"
-    walnutsanity_bushes = "Bushes"
-    walnutsanity_dig_spots = "Dig Spots"
-    walnutsanity_repeatables = "Repeatables"
-    buff_luck = "Luck"
-    buff_damage = "Damage"
-    buff_defense = "Defense"
-    buff_immunity = "Immunity"
-    buff_health = "Health"
-    buff_energy = "Energy"
-    buff_bite = "Bite Rate"
-    buff_fish_trap = "Fish Trap"
-    buff_fishing_bar = "Fishing Bar Size"
-    buff_quality = "Quality"
-    buff_glow = "Glow"
+class WalnutsanityOptionName:
+    puzzles = "Puzzles"
+    bushes = "Bushes"
+    dig_spots = "Dig Spots"
+    repeatables = "Repeatables"
+
+
+class BuffOptionName:
+    luck = "Luck"
+    damage = "Damage"
+    defense = "Defense"
+    immunity = "Immunity"
+    health = "Health"
+    energy = "Energy"
+    bite = "Bite Rate"
+    fish_trap = "Fish Trap"
+    fishing_bar = "Fishing Bar Size"
+    quality = "Quality"
+    glow = "Glow"
diff --git a/worlds/stardew_valley/strings/ap_names/mods/__init__.py b/worlds/stardew_valley/strings/ap_names/mods/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/worlds/stardew_valley/test/TestBooksanity.py b/worlds/stardew_valley/test/TestBooksanity.py
index 3ca52f5728c1..942f35d961a9 100644
--- a/worlds/stardew_valley/test/TestBooksanity.py
+++ b/worlds/stardew_valley/test/TestBooksanity.py
@@ -1,6 +1,5 @@
 from . import SVTestBase
 from ..options import ExcludeGingerIsland, Booksanity, Shipsanity
-from ..strings.ap_names.ap_option_names import OptionName
 from ..strings.book_names import Book, LostBook
 
 power_books = [Book.animal_catalogue, Book.book_of_mysteries,
diff --git a/worlds/stardew_valley/test/TestOptions.py b/worlds/stardew_valley/test/TestOptions.py
index 9db7f06ff5a5..2cd83f013ae5 100644
--- a/worlds/stardew_valley/test/TestOptions.py
+++ b/worlds/stardew_valley/test/TestOptions.py
@@ -1,6 +1,6 @@
 import itertools
 
-from Options import NamedRange, Accessibility
+from Options import NamedRange
 from . import SVTestCase, allsanity_no_mods_6_x_x, allsanity_mods_6_x_x, solo_multiworld
 from .assertion import WorldAssertMixin
 from .long.option_names import all_option_choices
@@ -54,23 +54,6 @@ def test_given_goal_when_generate_then_victory_is_in_correct_location(self):
                 victory = multi_world.find_item("Victory", 1)
                 self.assertEqual(victory.name, location)
 
-    def test_given_perfection_goal_when_generate_then_accessibility_is_forced_to_full(self):
-        """There is a bug with the current victory condition of the perfection goal that can create unwinnable seeds if the accessibility is set to minimal and
-        the world gets flooded with progression items through plando. This will increase the amount of collected progression items pass the total amount
-        calculated for the world when creating the item pool. This will cause the victory condition to be met before all locations are collected, so some could
-        be left inaccessible, which in practice will make the seed unwinnable. 
-        """
-        for accessibility in Accessibility.options.keys():
-            world_options = {Goal.internal_name: Goal.option_perfection, "accessibility": accessibility}
-            with self.solo_world_sub_test(f"Accessibility: {accessibility}", world_options) as (_, world):
-                self.assertEqual(world.options.accessibility, Accessibility.option_full)
-
-    def test_given_allsanity_goal_when_generate_then_accessibility_is_forced_to_full(self):
-        for accessibility in Accessibility.options.keys():
-            world_options = {Goal.internal_name: Goal.option_allsanity, "accessibility": accessibility}
-            with self.solo_world_sub_test(f"Accessibility: {accessibility}", world_options) as (_, world):
-                self.assertEqual(world.options.accessibility, Accessibility.option_full)
-
 
 class TestSeasonRandomization(SVTestCase):
     def test_given_disabled_when_generate_then_all_seasons_are_precollected(self):
@@ -144,7 +127,7 @@ def test_given_progressive_when_generate_then_tool_upgrades_are_locations(self):
 
 class TestGenerateAllOptionsWithExcludeGingerIsland(WorldAssertMixin, SVTestCase):
 
-    def test_given_choice_when_generate_exclude_ginger_island(self):
+    def test_given_choice_when_generate_exclude_ginger_island_then_ginger_island_is_properly_excluded(self):
         for option, option_choice in all_option_choices:
             if option is ExcludeGingerIsland:
                 continue
@@ -163,19 +146,6 @@ def test_given_choice_when_generate_exclude_ginger_island(self):
                 self.assert_basic_checks(multiworld)
                 self.assert_no_ginger_island_content(multiworld)
 
-    def test_given_island_related_goal_then_override_exclude_ginger_island(self):
-        island_goals = ["greatest_walnut_hunter", "perfection"]
-        for goal, exclude_island in itertools.product(island_goals, ExcludeGingerIsland.options):
-            world_options = {
-                Goal: goal,
-                ExcludeGingerIsland: exclude_island
-            }
-
-            with self.solo_world_sub_test(f"Goal: {goal}, {ExcludeGingerIsland.internal_name}: {exclude_island}", world_options) \
-                    as (multiworld, stardew_world):
-                self.assertEqual(stardew_world.options.exclude_ginger_island, ExcludeGingerIsland.option_false)
-                self.assert_basic_checks(multiworld)
-
 
 class TestTraps(SVTestCase):
     def test_given_no_traps_when_generate_then_no_trap_in_pool(self):
diff --git a/worlds/stardew_valley/test/TestOptionsPairs.py b/worlds/stardew_valley/test/TestOptionsPairs.py
index d953696e887d..d489ab1ff282 100644
--- a/worlds/stardew_valley/test/TestOptionsPairs.py
+++ b/worlds/stardew_valley/test/TestOptionsPairs.py
@@ -1,13 +1,12 @@
 from . import SVTestBase
 from .assertion import WorldAssertMixin
 from .. import options
-from ..options import Goal, QuestLocations
 
 
 class TestCrypticNoteNoQuests(WorldAssertMixin, SVTestBase):
     options = {
-        Goal.internal_name: Goal.option_cryptic_note,
-        QuestLocations.internal_name: "none"
+        options.Goal.internal_name: options.Goal.option_cryptic_note,
+        options.QuestLocations.internal_name: "none"
     }
 
     def test_given_option_pair_then_basic_checks(self):
@@ -16,8 +15,8 @@ def test_given_option_pair_then_basic_checks(self):
 
 class TestCompleteCollectionNoQuests(WorldAssertMixin, SVTestBase):
     options = {
-        Goal.internal_name: Goal.option_complete_collection,
-        QuestLocations.internal_name: "none"
+        options.Goal.internal_name: options.Goal.option_complete_collection,
+        options.QuestLocations.internal_name: "none"
     }
 
     def test_given_option_pair_then_basic_checks(self):
@@ -26,8 +25,8 @@ def test_given_option_pair_then_basic_checks(self):
 
 class TestProtectorOfTheValleyNoQuests(WorldAssertMixin, SVTestBase):
     options = {
-        Goal.internal_name: Goal.option_protector_of_the_valley,
-        QuestLocations.internal_name: "none"
+        options.Goal.internal_name: options.Goal.option_protector_of_the_valley,
+        options.QuestLocations.internal_name: "none"
     }
 
     def test_given_option_pair_then_basic_checks(self):
@@ -36,8 +35,8 @@ def test_given_option_pair_then_basic_checks(self):
 
 class TestCraftMasterNoQuests(WorldAssertMixin, SVTestBase):
     options = {
-        Goal.internal_name: Goal.option_craft_master,
-        QuestLocations.internal_name: "none"
+        options.Goal.internal_name: options.Goal.option_craft_master,
+        options.QuestLocations.internal_name: "none"
     }
 
     def test_given_option_pair_then_basic_checks(self):
@@ -46,7 +45,7 @@ def test_given_option_pair_then_basic_checks(self):
 
 class TestCraftMasterNoSpecialOrder(WorldAssertMixin, SVTestBase):
     options = {
-        options.Goal.internal_name: Goal.option_craft_master,
+        options.Goal.internal_name: options.Goal.option_craft_master,
         options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.alias_disabled,
         options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
         options.Craftsanity.internal_name: options.Craftsanity.option_none
diff --git a/worlds/stardew_valley/test/TestRegions.py b/worlds/stardew_valley/test/TestRegions.py
index c2e962d88a7e..bd1b67297473 100644
--- a/worlds/stardew_valley/test/TestRegions.py
+++ b/worlds/stardew_valley/test/TestRegions.py
@@ -3,7 +3,8 @@
 from typing import Set
 
 from BaseClasses import get_seed
-from . import SVTestCase, complete_options_with_default
+from . import SVTestCase
+from .options.utils import fill_dataclass_with_default
 from .. import create_content
 from ..options import EntranceRandomization, ExcludeGingerIsland, SkillProgression
 from ..regions import vanilla_regions, vanilla_connections, randomize_connections, RandomizationFlag, create_final_connections_and_regions
@@ -59,7 +60,7 @@ def test_entrance_randomization(self):
                              (EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION),
                              (EntranceRandomization.option_buildings_without_house, RandomizationFlag.BUILDINGS),
                              (EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]:
-            sv_options = complete_options_with_default({
+            sv_options = fill_dataclass_with_default({
                 EntranceRandomization.internal_name: option,
                 ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
                 SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
@@ -87,7 +88,7 @@ def test_entrance_randomization_without_island(self):
                              (EntranceRandomization.option_buildings_without_house, RandomizationFlag.BUILDINGS),
                              (EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]:
 
-            sv_options = complete_options_with_default({
+            sv_options = fill_dataclass_with_default({
                 EntranceRandomization.internal_name: option,
                 ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
                 SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
@@ -116,7 +117,7 @@ def test_entrance_randomization_without_island(self):
                                  f"Connections are duplicated in randomization.")
 
     def test_cannot_put_island_access_on_island(self):
-        sv_options = complete_options_with_default({
+        sv_options = fill_dataclass_with_default({
             EntranceRandomization.internal_name: EntranceRandomization.option_buildings,
             ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
             SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
diff --git a/worlds/stardew_valley/test/TestWalnutsanity.py b/worlds/stardew_valley/test/TestWalnutsanity.py
index e1ab348def41..c1e8c2c8f095 100644
--- a/worlds/stardew_valley/test/TestWalnutsanity.py
+++ b/worlds/stardew_valley/test/TestWalnutsanity.py
@@ -1,6 +1,6 @@
 from . import SVTestBase
 from ..options import ExcludeGingerIsland, Walnutsanity
-from ..strings.ap_names.ap_option_names import OptionName
+from ..strings.ap_names.ap_option_names import WalnutsanityOptionName
 
 
 class TestWalnutsanityNone(SVTestBase):
@@ -49,7 +49,7 @@ def test_logic_received_walnuts(self):
 class TestWalnutsanityPuzzles(SVTestBase):
     options = {
         ExcludeGingerIsland: ExcludeGingerIsland.option_false,
-        Walnutsanity: frozenset({OptionName.walnutsanity_puzzles}),
+        Walnutsanity: frozenset({WalnutsanityOptionName.puzzles}),
     }
 
     def test_only_puzzle_walnut_locations(self):
@@ -90,7 +90,7 @@ def test_field_office_locations_require_professor_snail(self):
 class TestWalnutsanityBushes(SVTestBase):
     options = {
         ExcludeGingerIsland: ExcludeGingerIsland.option_false,
-        Walnutsanity: frozenset({OptionName.walnutsanity_bushes}),
+        Walnutsanity: frozenset({WalnutsanityOptionName.bushes}),
     }
 
     def test_only_bush_walnut_locations(self):
@@ -108,7 +108,7 @@ def test_only_bush_walnut_locations(self):
 class TestWalnutsanityPuzzlesAndBushes(SVTestBase):
     options = {
         ExcludeGingerIsland: ExcludeGingerIsland.option_false,
-        Walnutsanity: frozenset({OptionName.walnutsanity_puzzles, OptionName.walnutsanity_bushes}),
+        Walnutsanity: frozenset({WalnutsanityOptionName.puzzles, WalnutsanityOptionName.bushes}),
     }
 
     def test_only_bush_walnut_locations(self):
@@ -136,7 +136,7 @@ def test_logic_received_walnuts(self):
 class TestWalnutsanityDigSpots(SVTestBase):
     options = {
         ExcludeGingerIsland: ExcludeGingerIsland.option_false,
-        Walnutsanity: frozenset({OptionName.walnutsanity_dig_spots}),
+        Walnutsanity: frozenset({WalnutsanityOptionName.dig_spots}),
     }
 
     def test_only_dig_spots_walnut_locations(self):
@@ -154,7 +154,7 @@ def test_only_dig_spots_walnut_locations(self):
 class TestWalnutsanityRepeatables(SVTestBase):
     options = {
         ExcludeGingerIsland: ExcludeGingerIsland.option_false,
-        Walnutsanity: frozenset({OptionName.walnutsanity_repeatables}),
+        Walnutsanity: frozenset({WalnutsanityOptionName.repeatables}),
     }
 
     def test_only_repeatable_walnut_locations(self):
diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py
index 1a312e569d11..de0ed97882e3 100644
--- a/worlds/stardew_valley/test/__init__.py
+++ b/worlds/stardew_valley/test/__init__.py
@@ -2,18 +2,17 @@
 import os
 import threading
 import unittest
-from argparse import Namespace
 from contextlib import contextmanager
 from typing import Dict, ClassVar, Iterable, Tuple, Optional, List, Union, Any
 
-from BaseClasses import MultiWorld, CollectionState, PlandoOptions, get_seed, Location, Item
-from Options import VerifyKeys
+from BaseClasses import MultiWorld, CollectionState, get_seed, Location, Item
 from test.bases import WorldTestBase
 from test.general import gen_steps, setup_solo_multiworld as setup_base_solo_multiworld
 from worlds.AutoWorld import call_all
 from .assertion import RuleAssertMixin
+from .options.utils import fill_namespace_with_default, parse_class_option_keys, fill_dataclass_with_default
 from .. import StardewValleyWorld, options, StardewItem
-from ..options import StardewValleyOptions, StardewValleyOption
+from ..options import StardewValleyOption
 
 logger = logging.getLogger(__name__)
 
@@ -360,15 +359,7 @@ def setup_solo_multiworld(test_options: Optional[Dict[Union[str, StardewValleyOp
     multiworld = setup_base_solo_multiworld(StardewValleyWorld, (), seed=seed)
     # print(f"Seed: {multiworld.seed}") # Uncomment to print the seed for every test
 
-    args = Namespace()
-    for name, option in StardewValleyWorld.options_dataclass.type_hints.items():
-        value = option.from_any(test_options.get(name, option.default))
-
-        if issubclass(option, VerifyKeys):
-            # Values should already be verified, but just in case...
-            value.verify(StardewValleyWorld, "Tester", PlandoOptions.bosses)
-
-        setattr(args, name, {1: value})
+    args = fill_namespace_with_default(test_options)
     multiworld.set_options(args)
 
     if "start_inventory" in test_options:
@@ -388,24 +379,6 @@ def setup_solo_multiworld(test_options: Optional[Dict[Union[str, StardewValleyOp
     return multiworld
 
 
-def parse_class_option_keys(test_options: Optional[Dict]) -> dict:
-    """ Now the option class is allowed as key. """
-    if test_options is None:
-        return {}
-    parsed_options = {}
-
-    for option, value in test_options.items():
-        if hasattr(option, "internal_name"):
-            assert option.internal_name not in test_options, "Defined two times by class and internal_name"
-            parsed_options[option.internal_name] = value
-        else:
-            assert option in StardewValleyOptions.type_hints, \
-                f"All keys of world_options must be a possible Stardew Valley option, {option} is not."
-            parsed_options[option] = value
-
-    return parsed_options
-
-
 def search_world_cache(cache: Dict[frozenset, MultiWorld], frozen_options: frozenset) -> Optional[MultiWorld]:
     try:
         return cache[frozen_options]
@@ -421,16 +394,6 @@ def add_to_world_cache(cache: Dict[frozenset, MultiWorld], frozen_options: froze
     cache[frozen_options] = multi_world
 
 
-def complete_options_with_default(options_to_complete=None) -> StardewValleyOptions:
-    if options_to_complete is None:
-        options_to_complete = {}
-
-    for name, option in StardewValleyOptions.type_hints.items():
-        options_to_complete[name] = option.from_any(options_to_complete.get(name, option.default))
-
-    return StardewValleyOptions(**options_to_complete)
-
-
 def setup_multiworld(test_options: Iterable[Dict[str, int]] = None, seed=None) -> MultiWorld:  # noqa
     if test_options is None:
         test_options = []
@@ -442,22 +405,10 @@ def setup_multiworld(test_options: Iterable[Dict[str, int]] = None, seed=None) -
     for i in range(1, len(test_options) + 1):
         multiworld.game[i] = StardewValleyWorld.game
         multiworld.player_name.update({i: f"Tester{i}"})
-    args = create_args(test_options)
+    args = fill_namespace_with_default(test_options)
     multiworld.set_options(args)
 
     for step in gen_steps:
         call_all(multiworld, step)
 
     return multiworld
-
-
-def create_args(test_options):
-    args = Namespace()
-    for name, option in StardewValleyWorld.options_dataclass.type_hints.items():
-        options = {}
-        for i in range(1, len(test_options) + 1):
-            player_options = test_options[i - 1]
-            value = option(player_options[name]) if name in player_options else option.from_any(option.default)
-            options.update({i: value})
-        setattr(args, name, options)
-    return args
diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index 56138cf582a7..89f82870e4a7 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -1,7 +1,8 @@
 import random
 
 from BaseClasses import get_seed
-from .. import SVTestBase, SVTestCase, allsanity_no_mods_6_x_x, allsanity_mods_6_x_x, complete_options_with_default, solo_multiworld
+from .. import SVTestBase, SVTestCase, allsanity_no_mods_6_x_x, allsanity_mods_6_x_x, solo_multiworld, \
+    fill_dataclass_with_default
 from ..assertion import ModAssertMixin, WorldAssertMixin
 from ... import items, Group, ItemClassification, create_content
 from ... import options
@@ -122,7 +123,7 @@ def test_mod_entrance_randomization(self):
                              (options.EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION),
                              (options.EntranceRandomization.option_buildings_without_house, RandomizationFlag.BUILDINGS),
                              (options.EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]:
-            sv_options = complete_options_with_default({
+            sv_options = fill_dataclass_with_default({
                 options.EntranceRandomization.internal_name: option,
                 options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
                 SkillProgression.internal_name: SkillProgression.option_progressive_with_masteries,
diff --git a/worlds/stardew_valley/test/options/TestForcedOptions.py b/worlds/stardew_valley/test/options/TestForcedOptions.py
new file mode 100644
index 000000000000..4c8f0f42c389
--- /dev/null
+++ b/worlds/stardew_valley/test/options/TestForcedOptions.py
@@ -0,0 +1,84 @@
+import itertools
+import unittest
+
+import Options as ap_options
+from .utils import fill_dataclass_with_default
+from ... import options
+from ...options.forced_options import force_change_options_if_incompatible
+
+
+class TestGoalsRequiringAllLocationsOverrideAccessibility(unittest.TestCase):
+
+    def test_given_goal_requiring_all_locations_when_generate_then_accessibility_is_forced_to_full(self):
+        """There is a bug with the current victory condition of the perfection goal that can create unwinnable seeds if the accessibility is set to minimal and
+        the world gets flooded with progression items through plando. This will increase the amount of collected progression items pass the total amount
+        calculated for the world when creating the item pool. This will cause the victory condition to be met before all locations are collected, so some could
+        be left inaccessible, which in practice will make the seed unwinnable.
+        """
+
+        for goal in [options.Goal.option_perfection, options.Goal.option_allsanity]:
+            for accessibility in ap_options.Accessibility.options.keys():
+                with self.subTest(f"Goal: {options.Goal.get_option_name(goal)} Accessibility: {accessibility}"):
+                    world_options = fill_dataclass_with_default({
+                        options.Goal: goal,
+                        "accessibility": accessibility
+                    })
+
+                    force_change_options_if_incompatible(world_options, 1, "Tester")
+
+                    self.assertEqual(world_options.accessibility.value, ap_options.Accessibility.option_full)
+
+
+class TestGingerIslandRelatedGoalsOverrideGingerIslandExclusion(unittest.TestCase):
+
+    def test_given_island_related_goal_when_generate_then_override_exclude_ginger_island(self):
+        for goal in [options.Goal.option_greatest_walnut_hunter, options.Goal.option_perfection]:
+            for exclude_island in options.ExcludeGingerIsland.options:
+                with self.subTest(f"Goal: {options.Goal.get_option_name(goal)} Exclude Ginger Island: {exclude_island}"):
+                    world_options = fill_dataclass_with_default({
+                        options.Goal: goal,
+                        options.ExcludeGingerIsland: exclude_island
+                    })
+
+                    force_change_options_if_incompatible(world_options, 1, "Tester")
+
+                    self.assertEqual(world_options.exclude_ginger_island.value, options.ExcludeGingerIsland.option_false)
+
+
+class TestGingerIslandExclusionOverridesWalnutsanity(unittest.TestCase):
+
+    def test_given_ginger_island_excluded_when_generate_then_walnutsanity_is_forced_disabled(self):
+        walnutsanity_options = options.Walnutsanity.valid_keys
+        for walnutsanity in (
+                walnutsanity
+                for r in range(len(walnutsanity_options) + 1)
+                for walnutsanity in itertools.combinations(walnutsanity_options, r)
+        ):
+            with self.subTest(f"Walnutsanity: {walnutsanity}"):
+                world_options = fill_dataclass_with_default({
+                    options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_true,
+                    options.Walnutsanity: walnutsanity
+                })
+
+                force_change_options_if_incompatible(world_options, 1, "Tester")
+
+                self.assertEqual(world_options.walnutsanity.value, options.Walnutsanity.preset_none)
+
+    def test_given_ginger_island_related_goal_and_ginger_island_excluded_when_generate_then_walnutsanity_is_not_changed(self):
+        for goal in [options.Goal.option_greatest_walnut_hunter, options.Goal.option_perfection]:
+            walnutsanity_options = options.Walnutsanity.valid_keys
+            for original_walnutsanity_choice in (
+                    set(walnutsanity)
+                    for r in range(len(walnutsanity_options) + 1)
+                    for walnutsanity in itertools.combinations(walnutsanity_options, r)
+            ):
+                with self.subTest(f"Goal: {options.Goal.get_option_name(goal)} Walnutsanity: {original_walnutsanity_choice}"):
+                    world_options = fill_dataclass_with_default({
+                        options.Goal: goal,
+                        options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_true,
+                        options.Walnutsanity: original_walnutsanity_choice
+                    })
+
+                    force_change_options_if_incompatible(world_options, 1, "Tester")
+
+                    self.assertEqual(world_options.walnutsanity.value, original_walnutsanity_choice)
diff --git a/worlds/stardew_valley/test/TestPresets.py b/worlds/stardew_valley/test/options/TestPresets.py
similarity index 86%
rename from worlds/stardew_valley/test/TestPresets.py
rename to worlds/stardew_valley/test/options/TestPresets.py
index 2bb1c7fbaeaf..9384acd77060 100644
--- a/worlds/stardew_valley/test/TestPresets.py
+++ b/worlds/stardew_valley/test/options/TestPresets.py
@@ -1,9 +1,7 @@
-import builtins
-import inspect
-
 from Options import PerGameCommonOptions, OptionSet
-from . import SVTestCase
-from .. import sv_options_presets, StardewValleyOptions
+from .. import SVTestCase
+from ...options import StardewValleyOptions
+from ...options.presets import sv_options_presets
 
 
 class TestPresets(SVTestCase):
@@ -18,4 +16,4 @@ def test_all_presets_explicitly_set_all_options(self):
             with self.subTest(f"{preset_name}"):
                 for option_name in mandatory_option_names:
                     with self.subTest(f"{preset_name} -> {option_name}"):
-                        self.assertIn(option_name, sv_options_presets[preset_name])
\ No newline at end of file
+                        self.assertIn(option_name, sv_options_presets[preset_name])
diff --git a/worlds/stardew_valley/test/options/__init__.py b/worlds/stardew_valley/test/options/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/worlds/stardew_valley/test/options/utils.py b/worlds/stardew_valley/test/options/utils.py
new file mode 100644
index 000000000000..9f02105da84f
--- /dev/null
+++ b/worlds/stardew_valley/test/options/utils.py
@@ -0,0 +1,68 @@
+from argparse import Namespace
+from typing import Any, Iterable
+
+from BaseClasses import PlandoOptions
+from Options import VerifyKeys
+from ... import StardewValleyWorld
+from ...options import StardewValleyOptions, StardewValleyOption
+
+
+def parse_class_option_keys(test_options: dict[str | StardewValleyOption, Any] | None) -> dict:
+    """ Now the option class is allowed as key. """
+    if test_options is None:
+        return {}
+    parsed_options = {}
+
+    for option, value in test_options.items():
+        if hasattr(option, "internal_name"):
+            assert option.internal_name not in test_options, "Defined two times by class and internal_name"
+            parsed_options[option.internal_name] = value
+        else:
+            assert option in StardewValleyOptions.type_hints, \
+                f"All keys of world_options must be a possible Stardew Valley option, {option} is not."
+            parsed_options[option] = value
+
+    return parsed_options
+
+
+def fill_dataclass_with_default(test_options: dict[str | StardewValleyOption, Any] | None) -> StardewValleyOptions:
+    test_options = parse_class_option_keys(test_options)
+
+    filled_options = {}
+    for option_name, option_class in StardewValleyOptions.type_hints.items():
+
+        value = option_class.from_any(test_options.get(option_name, option_class.default))
+
+        if issubclass(option_class, VerifyKeys):
+            # Values should already be verified, but just in case...
+            value.verify(StardewValleyWorld, "Tester", PlandoOptions.bosses)
+
+        filled_options[option_name] = value
+
+    return StardewValleyOptions(**filled_options)
+
+
+def fill_namespace_with_default(test_options: dict[str, Any] | Iterable[dict[str, Any]]) -> Namespace:
+    if isinstance(test_options, dict):
+        test_options = [test_options]
+
+    args = Namespace()
+    for option_name, option_class in StardewValleyOptions.type_hints.items():
+        all_players_option = {}
+
+        for player_id, player_options in enumerate(test_options):
+            # Player id starts at 1
+            player_id += 1
+            player_name = f"Tester{player_id}"
+
+            value = option_class.from_any(player_options.get(option_name, option_class.default))
+
+            if issubclass(option_class, VerifyKeys):
+                # Values should already be verified, but just in case...
+                value.verify(StardewValleyWorld, player_name, PlandoOptions.bosses)
+
+            all_players_option[player_id] = value
+
+        setattr(args, option_name, all_players_option)
+
+    return args
diff --git a/worlds/stardew_valley/test/stability/TestUniversalTracker.py b/worlds/stardew_valley/test/stability/TestUniversalTracker.py
index 3e334098341d..4655b37adf07 100644
--- a/worlds/stardew_valley/test/stability/TestUniversalTracker.py
+++ b/worlds/stardew_valley/test/stability/TestUniversalTracker.py
@@ -1,7 +1,7 @@
 import unittest
 from unittest.mock import Mock
 
-from .. import SVTestBase, create_args, allsanity_mods_6_x_x
+from .. import SVTestBase, allsanity_mods_6_x_x, fill_namespace_with_default
 from ... import STARDEW_VALLEY, FarmType, BundleRandomization, EntranceRandomization
 
 
@@ -29,7 +29,7 @@ def test_all_locations_and_items_are_the_same_between_two_generations(self):
 
         fake_context = Mock()
         fake_context.re_gen_passthrough = {STARDEW_VALLEY: ut_data}
-        args = create_args({0: self.options})
+        args = fill_namespace_with_default({0: self.options})
         args.outputpath = None
         args.outputname = None
         args.multi = 1

From aa22b62b41226b62734988da0b5dcd6f5bff7a33 Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:17:25 -0500
Subject: [PATCH 148/381] Stardew Valley: Force deactivation of Mr. Qi's
 special orders when ginger island is deactivated (#4348)

---
 .../stardew_valley/options/forced_options.py  | 12 +++++++
 .../test/options/TestForcedOptions.py         | 31 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/worlds/stardew_valley/options/forced_options.py b/worlds/stardew_valley/options/forced_options.py
index 84cdc936b3f1..7429f3cbfc65 100644
--- a/worlds/stardew_valley/options/forced_options.py
+++ b/worlds/stardew_valley/options/forced_options.py
@@ -9,6 +9,7 @@
 def force_change_options_if_incompatible(world_options: options.StardewValleyOptions, player: int, player_name: str) -> None:
     force_ginger_island_inclusion_when_goal_is_ginger_island_related(world_options, player, player_name)
     force_walnutsanity_deactivation_when_ginger_island_is_excluded(world_options, player, player_name)
+    force_qi_special_orders_deactivation_when_ginger_island_is_excluded(world_options, player, player_name)
     force_accessibility_to_full_when_goal_requires_all_locations(player, player_name, world_options)
 
 
@@ -35,6 +36,17 @@ def force_walnutsanity_deactivation_when_ginger_island_is_excluded(world_options
                        f"Ginger Island was excluded from {player} ({player_name})'s world, so walnutsanity was force disabled")
 
 
+def force_qi_special_orders_deactivation_when_ginger_island_is_excluded(world_options: options.StardewValleyOptions, player: int, player_name: str):
+    ginger_island_is_excluded = world_options.exclude_ginger_island == options.ExcludeGingerIsland.option_true
+    qi_board_is_active = world_options.special_order_locations.value & options.SpecialOrderLocations.value_qi
+
+    if ginger_island_is_excluded and qi_board_is_active:
+        original_option_name = world_options.special_order_locations.current_option_name
+        world_options.special_order_locations.value -= options.SpecialOrderLocations.value_qi
+        logger.warning(f"Mr. Qi's Special Orders requires Ginger Island. "
+                       f"Ginger Island was excluded from {player} ({player_name})'s world, so Special Order Locations was changed from {original_option_name} to {world_options.special_order_locations.current_option_name}")
+
+
 def force_accessibility_to_full_when_goal_requires_all_locations(player, player_name, world_options):
     goal_is_allsanity = world_options.goal == options.Goal.option_allsanity
     goal_is_perfection = world_options.goal == options.Goal.option_perfection
diff --git a/worlds/stardew_valley/test/options/TestForcedOptions.py b/worlds/stardew_valley/test/options/TestForcedOptions.py
index 4c8f0f42c389..c32def6c6ca8 100644
--- a/worlds/stardew_valley/test/options/TestForcedOptions.py
+++ b/worlds/stardew_valley/test/options/TestForcedOptions.py
@@ -82,3 +82,34 @@ def test_given_ginger_island_related_goal_and_ginger_island_excluded_when_genera
                     force_change_options_if_incompatible(world_options, 1, "Tester")
 
                     self.assertEqual(world_options.walnutsanity.value, original_walnutsanity_choice)
+
+
+class TestGingerIslandExclusionOverridesQisSpecialOrders(unittest.TestCase):
+
+    def test_given_ginger_island_excluded_when_generate_then_qis_special_orders_are_forced_disabled(self):
+        special_order_options = options.SpecialOrderLocations.options
+        for special_order in special_order_options.keys():
+            with self.subTest(f"Special order: {special_order}"):
+                world_options = fill_dataclass_with_default({
+                    options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_true,
+                    options.SpecialOrderLocations: special_order
+                })
+
+                force_change_options_if_incompatible(world_options, 1, "Tester")
+
+                self.assertEqual(world_options.special_order_locations.value & options.SpecialOrderLocations.value_qi, 0)
+
+    def test_given_ginger_island_related_goal_and_ginger_island_excluded_when_generate_then_special_orders_is_not_changed(self):
+        for goal in [options.Goal.option_greatest_walnut_hunter, options.Goal.option_perfection]:
+            special_order_options = options.SpecialOrderLocations.options
+            for special_order, original_special_order_value in special_order_options.items():
+                with self.subTest(f"Special order: {special_order}"):
+                    world_options = fill_dataclass_with_default({
+                        options.Goal: goal,
+                        options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_true,
+                        options.SpecialOrderLocations: special_order
+                    })
+
+                    force_change_options_if_incompatible(world_options, 1, "Tester")
+
+                    self.assertEqual(world_options.special_order_locations.value, original_special_order_value)

From 0b3d34ab24ffab023800e6230ca95e840cdcb683 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Tue, 10 Dec 2024 02:25:09 +0100
Subject: [PATCH 149/381] CI: update scan-build to v19 (#4338)

---
 .github/workflows/scan-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/scan-build.yml b/.github/workflows/scan-build.yml
index 5234d862b4d3..ac842070625f 100644
--- a/.github/workflows/scan-build.yml
+++ b/.github/workflows/scan-build.yml
@@ -40,10 +40,10 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x ./llvm.sh
-        sudo ./llvm.sh 17
+        sudo ./llvm.sh 19
     - name: Install scan-build command
       run: |
-        sudo apt install clang-tools-17
+        sudo apt install clang-tools-19
     - name: Get a recent python
       uses: actions/setup-python@v5
       with:
@@ -56,7 +56,7 @@ jobs:
     - name: scan-build
       run: |
         source venv/bin/activate
-        scan-build-17 --status-bugs -o scan-build-reports -disable-checker deadcode.DeadStores python setup.py build -y
+        scan-build-19 --status-bugs -o scan-build-reports -disable-checker deadcode.DeadStores python setup.py build -y
     - name: Store report
       if: failure()
       uses: actions/upload-artifact@v4

From 4a5ba756b6d0d26b40a8c3ca5bb3ea3e1ed931b3 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Tue, 10 Dec 2024 02:44:41 +0100
Subject: [PATCH 150/381] WebHost: Set Generator memory limit to 4GiB (#4319)

* WebHost: Set Generator memory limit to 4GiB

* WebHost: make generator memory limit configurable, better naming

* Update WebHostLib/__init__.py

Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>

* Update docs/webhost configuration sample.yaml

---------

Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
---
 WebHostLib/__init__.py                 |  2 ++
 WebHostLib/autolauncher.py             | 21 ++++++++++++++++++---
 docs/webhost configuration sample.yaml | 10 ++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py
index 9b2b6736f13c..9c713419c986 100644
--- a/WebHostLib/__init__.py
+++ b/WebHostLib/__init__.py
@@ -39,6 +39,8 @@
 app.config["JOB_THRESHOLD"] = 1
 # after what time in seconds should generation be aborted, freeing the queue slot. Can be set to None to disable.
 app.config["JOB_TIME"] = 600
+# memory limit for generator processes in bytes
+app.config["GENERATOR_MEMORY_LIMIT"] = 4294967296
 app.config['SESSION_PERMANENT'] = True
 
 # waitress uses one thread for I/O, these are for processing of views that then get sent
diff --git a/WebHostLib/autolauncher.py b/WebHostLib/autolauncher.py
index 08a1309ebc73..8ba093e014c5 100644
--- a/WebHostLib/autolauncher.py
+++ b/WebHostLib/autolauncher.py
@@ -6,6 +6,7 @@
 import typing
 from datetime import timedelta, datetime
 from threading import Event, Thread
+from typing import Any
 from uuid import UUID
 
 from pony.orm import db_session, select, commit
@@ -53,7 +54,21 @@ def launch_generator(pool: multiprocessing.pool.Pool, generation: Generation):
         generation.state = STATE_STARTED
 
 
-def init_db(pony_config: dict):
+def init_generator(config: dict[str, Any]) -> None:
+    try:
+        import resource
+    except ModuleNotFoundError:
+        pass  # unix only module
+    else:
+        # set soft limit for memory to from config (default 4GiB)
+        soft_limit = config["GENERATOR_MEMORY_LIMIT"]
+        old_limit, hard_limit = resource.getrlimit(resource.RLIMIT_AS)
+        if soft_limit != old_limit:
+            resource.setrlimit(resource.RLIMIT_AS, (soft_limit, hard_limit))
+            logging.debug(f"Changed AS mem limit {old_limit} -> {soft_limit}")
+        del resource, soft_limit, hard_limit
+
+    pony_config = config["PONY"]
     db.bind(**pony_config)
     db.generate_mapping()
 
@@ -105,8 +120,8 @@ def keep_running():
         try:
             with Locker("autogen"):
 
-                with multiprocessing.Pool(config["GENERATORS"], initializer=init_db,
-                                          initargs=(config["PONY"],), maxtasksperchild=10) as generator_pool:
+                with multiprocessing.Pool(config["GENERATORS"], initializer=init_generator,
+                                          initargs=(config,), maxtasksperchild=10) as generator_pool:
                     with db_session:
                         to_start = select(generation for generation in Generation if generation.state == STATE_STARTED)
 
diff --git a/docs/webhost configuration sample.yaml b/docs/webhost configuration sample.yaml
index afb87b399643..93094f1ce73f 100644
--- a/docs/webhost configuration sample.yaml	
+++ b/docs/webhost configuration sample.yaml	
@@ -27,8 +27,14 @@
 # If you wish to deploy, uncomment the following line and set it to something not easily guessable.
 # SECRET_KEY: "Your secret key here"
 
-# TODO
-#JOB_THRESHOLD: 2
+# Slot limit to post a generation to Generator process pool instead of rolling directly in WebHost process
+#JOB_THRESHOLD: 1
+
+# After what time in seconds should generation be aborted, freeing the queue slot. Can be set to None to disable.
+#JOB_TIME: 600
+
+# Memory limit for Generator processes in bytes, -1 for unlimited. Currently only works on Linux.
+#GENERATOR_MEMORY_LIMIT: 4294967296
 
 # waitress uses one thread for I/O, these are for processing of view that get sent
 #WAITRESS_THREADS: 10

From f79657b41a8aa7904193331b7ae181e0ff9ab967 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Tue, 10 Dec 2024 19:53:42 +0100
Subject: [PATCH 151/381] WebHost: disable abbreviations for argparse (#4352)

---
 WebHost.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebHost.py b/WebHost.py
index 3790a5f6f4d2..768eeb512289 100644
--- a/WebHost.py
+++ b/WebHost.py
@@ -34,7 +34,7 @@ def get_app() -> "Flask":
         app.config.from_file(configpath, yaml.safe_load)
         logging.info(f"Updated config from {configpath}")
     # inside get_app() so it's usable in systems like gunicorn, which do not run WebHost.py, but import it.
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(allow_abbrev=False)
     parser.add_argument('--config_override', default=None,
                         help="Path to yaml config file that overrules config.yaml.")
     args = parser.parse_known_args()[0]

From 3fb0b57d19b9c223107308c84605e05e6b16e1cf Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Tue, 10 Dec 2024 20:09:36 +0100
Subject: [PATCH 152/381] Core: fix exceptions coming from LocationStore
 (#4358)

* Speedups: add instructions for ASAN

* Speedups: move typevars out of classes

* Speedups, NetUtils: raise correct exceptions

* Speedups: double-check malloc

* Tests: more LocationStore tests
---
 NetUtils.py                          |  2 ++
 _speedups.pyx                        | 43 ++++++++++++++++++----------
 _speedups.pyxbld                     | 18 ++++++++----
 test/netutils/test_location_store.py | 41 ++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 20 deletions(-)

diff --git a/NetUtils.py b/NetUtils.py
index ec6ff3eb1d81..196a030f4969 100644
--- a/NetUtils.py
+++ b/NetUtils.py
@@ -410,6 +410,8 @@ def get_checked(self, state: typing.Dict[typing.Tuple[int, int], typing.Set[int]
         checked = state[team, slot]
         if not checked:
             # This optimizes the case where everyone connects to a fresh game at the same time.
+            if slot not in self:
+                raise KeyError(slot)
             return []
         return [location_id for
                 location_id in self[slot] if
diff --git a/_speedups.pyx b/_speedups.pyx
index dc039e336500..2ad1a2953a2b 100644
--- a/_speedups.pyx
+++ b/_speedups.pyx
@@ -69,6 +69,14 @@ cdef struct IndexEntry:
     size_t count
 
 
+if TYPE_CHECKING:
+    State = Dict[Tuple[int, int], Set[int]]
+else:
+    State = Union[Tuple[int, int], Set[int], defaultdict]
+
+T = TypeVar('T')
+
+
 @cython.auto_pickle(False)
 cdef class LocationStore:
     """Compact store for locations and their items in a MultiServer"""
@@ -137,10 +145,16 @@ cdef class LocationStore:
             warnings.warn("Game has no locations")
 
         # allocate the arrays and invalidate index (0xff...)
-        self.entries = <LocationEntry*>self._mem.alloc(count, sizeof(LocationEntry))
+        if count:
+            # leaving entries as NULL if there are none, makes potential memory errors more visible
+            self.entries = <LocationEntry*>self._mem.alloc(count, sizeof(LocationEntry))
         self.sender_index = <IndexEntry*>self._mem.alloc(max_sender + 1, sizeof(IndexEntry))
         self._raw_proxies = <PyObject**>self._mem.alloc(max_sender + 1, sizeof(PyObject*))
 
+        assert (not self.entries) == (not count)
+        assert self.sender_index
+        assert self._raw_proxies
+
         # build entries and index
         cdef size_t i = 0
         for sender, locations in sorted(locations_dict.items()):
@@ -190,8 +204,6 @@ cdef class LocationStore:
             raise KeyError(key)
         return <object>self._raw_proxies[key]
 
-    T = TypeVar('T')
-
     def get(self, key: int, default: T) -> Union[PlayerLocationProxy, T]:
         # calling into self.__getitem__ here is slow, but this is not used in MultiServer
         try:
@@ -246,12 +258,11 @@ cdef class LocationStore:
                         all_locations[sender].add(entry.location)
         return all_locations
 
-    if TYPE_CHECKING:
-        State = Dict[Tuple[int, int], Set[int]]
-    else:
-        State = Union[Tuple[int, int], Set[int], defaultdict]
-
     def get_checked(self, state: State, team: int, slot: int) -> List[int]:
+        cdef ap_player_t sender = slot
+        if sender < 0 or sender >= self.sender_index_size:
+            raise KeyError(slot)
+
         # This used to validate checks actually exist. A remnant from the past.
         # If the order of locations becomes relevant at some point, we could not do sorted(set), so leaving it.
         cdef set checked = state[team, slot]
@@ -263,7 +274,6 @@ cdef class LocationStore:
 
         # Unless the set is close to empty, it's cheaper to use the python set directly, so we do that.
         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
         return [entry.location for
@@ -273,9 +283,11 @@ cdef class LocationStore:
     def get_missing(self, state: State, team: int, slot: int) -> List[int]:
         cdef LocationEntry* entry
         cdef ap_player_t sender = slot
+        if sender < 0 or sender >= self.sender_index_size:
+            raise KeyError(slot)
+        cdef set checked = state[team, 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]
         if not len(checked):
             # Skip `in` if none have been checked.
             # This optimizes the case where everyone connects to a fresh game at the same time.
@@ -290,9 +302,11 @@ cdef class LocationStore:
     def get_remaining(self, state: State, team: int, slot: int) -> List[Tuple[int, int]]:
         cdef LocationEntry* entry
         cdef ap_player_t sender = slot
+        if sender < 0 or sender >= self.sender_index_size:
+            raise KeyError(slot)
+        cdef set checked = state[team, 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.receiver, entry.item) for
                         entry in self.entries[start:start+count] if
                         entry.location not in checked])
@@ -328,7 +342,8 @@ cdef class PlayerLocationProxy:
         cdef LocationEntry* entry = NULL
         # binary search
         cdef size_t l = self._store.sender_index[self._player].start
-        cdef size_t r = l + self._store.sender_index[self._player].count
+        cdef size_t e = l + self._store.sender_index[self._player].count
+        cdef size_t r = e
         cdef size_t m
         while l < r:
             m = (l + r) // 2
@@ -337,7 +352,7 @@ cdef class PlayerLocationProxy:
                 l = m + 1
             else:
                 r = m
-        if entry:  # count != 0
+        if l < e:
             entry = self._store.entries + l
             if entry.location == loc:
                 return entry
@@ -349,8 +364,6 @@ cdef class PlayerLocationProxy:
             return entry.item, entry.receiver, entry.flags
         raise KeyError(f"No location {key} for player {self._player}")
 
-    T = TypeVar('T')
-
     def get(self, key: int, default: T) -> Union[Tuple[int, int, int], T]:
         cdef LocationEntry* entry = self._get(key)
         if entry:
diff --git a/_speedups.pyxbld b/_speedups.pyxbld
index 974eaed03b6a..98f9734614cc 100644
--- a/_speedups.pyxbld
+++ b/_speedups.pyxbld
@@ -3,8 +3,16 @@ import os
 
 def make_ext(modname, pyxfilename):
     from distutils.extension import Extension
-    return Extension(name=modname,
-                     sources=[pyxfilename],
-                     depends=["intset.h"],
-                     include_dirs=[os.getcwd()],
-                     language="c")
+    return Extension(
+        name=modname,
+        sources=[pyxfilename],
+        depends=["intset.h"],
+        include_dirs=[os.getcwd()],
+        language="c",
+        # to enable ASAN and debug build:
+        # extra_compile_args=["-fsanitize=address", "-UNDEBUG", "-Og", "-g"],
+        # extra_objects=["-fsanitize=address"],
+        # NOTE: we can not put -lasan at the front of link args, so needs to be run with
+        #       LD_PRELOAD=/usr/lib/libasan.so ASAN_OPTIONS=detect_leaks=0 path/to/exe
+        # NOTE: this can't find everything unless libpython and cymem are also built with ASAN
+    )
diff --git a/test/netutils/test_location_store.py b/test/netutils/test_location_store.py
index 1b984015844d..264f35b3cc65 100644
--- a/test/netutils/test_location_store.py
+++ b/test/netutils/test_location_store.py
@@ -115,6 +115,7 @@ def test_find_item(self) -> None:
         def test_get_for_player(self) -> None:
             self.assertEqual(self.store.get_for_player(3), {4: {9}})
             self.assertEqual(self.store.get_for_player(1), {1: {13}, 2: {22, 23}})
+            self.assertEqual(self.store.get_for_player(9999), {})
 
         def test_get_checked(self) -> None:
             self.assertEqual(self.store.get_checked(full_state, 0, 1), [11, 12, 13])
@@ -122,18 +123,48 @@ def test_get_checked(self) -> None:
             self.assertEqual(self.store.get_checked(empty_state, 0, 1), [])
             self.assertEqual(self.store.get_checked(full_state, 0, 3), [9])
 
+        def test_get_checked_exception(self) -> None:
+            with self.assertRaises(KeyError):
+                self.store.get_checked(empty_state, 0, 9999)
+            bad_state = {(0, 6): {1}}
+            with self.assertRaises(KeyError):
+                self.store.get_checked(bad_state, 0, 6)
+            bad_state = {(0, 9999): set()}
+            with self.assertRaises(KeyError):
+                self.store.get_checked(bad_state, 0, 9999)
+
         def test_get_missing(self) -> None:
             self.assertEqual(self.store.get_missing(full_state, 0, 1), [])
             self.assertEqual(self.store.get_missing(one_state, 0, 1), [11, 13])
             self.assertEqual(self.store.get_missing(empty_state, 0, 1), [11, 12, 13])
             self.assertEqual(self.store.get_missing(empty_state, 0, 3), [9])
 
+        def test_get_missing_exception(self) -> None:
+            with self.assertRaises(KeyError):
+                self.store.get_missing(empty_state, 0, 9999)
+            bad_state = {(0, 6): {1}}
+            with self.assertRaises(KeyError):
+                self.store.get_missing(bad_state, 0, 6)
+            bad_state = {(0, 9999): set()}
+            with self.assertRaises(KeyError):
+                self.store.get_missing(bad_state, 0, 9999)
+
         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), [(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_get_remaining_exception(self) -> None:
+            with self.assertRaises(KeyError):
+                self.store.get_remaining(empty_state, 0, 9999)
+            bad_state = {(0, 6): {1}}
+            with self.assertRaises(KeyError):
+                self.store.get_missing(bad_state, 0, 6)
+            bad_state = {(0, 9999): set()}
+            with self.assertRaises(KeyError):
+                self.store.get_remaining(bad_state, 0, 9999)
+
         def test_location_set_intersection(self) -> None:
             locations = {10, 11, 12}
             locations.intersection_update(self.store[1])
@@ -181,6 +212,16 @@ def test_no_locations(self) -> None:
                 })
                 self.assertEqual(len(store), 1)
                 self.assertEqual(len(store[1]), 0)
+                self.assertEqual(sorted(store.find_item(set(), 1)), [])
+                self.assertEqual(sorted(store.find_item({1}, 1)), [])
+                self.assertEqual(sorted(store.find_item({1, 2}, 1)), [])
+                self.assertEqual(store.get_for_player(1), {})
+                self.assertEqual(store.get_checked(empty_state, 0, 1), [])
+                self.assertEqual(store.get_checked(full_state, 0, 1), [])
+                self.assertEqual(store.get_missing(empty_state, 0, 1), [])
+                self.assertEqual(store.get_missing(full_state, 0, 1), [])
+                self.assertEqual(store.get_remaining(empty_state, 0, 1), [])
+                self.assertEqual(store.get_remaining(full_state, 0, 1), [])
 
         def test_no_locations_for_1(self) -> None:
             store = self.type({

From 781100a571fe7e4850272a8899c5ef9d078f19d8 Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:26:33 -0500
Subject: [PATCH 153/381] CI: remove version restriction on pytest-subtests
 (#4356)

This reverts commit e3b5451672c694c12974801f5c89cc172db3ff5a.
---
 .github/workflows/unittests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index 9db9de9b4042..88b5d12987ad 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pytest "pytest-subtests<0.14.0" pytest-xdist
+        pip install pytest pytest-subtests pytest-xdist
         python ModuleUpdate.py --yes --force --append "WebHostLib/requirements.txt"
         python Launcher.py --update_settings  # make sure host.yaml exists for tests
     - name: Unittests

From 5dd19fccd0dc89966095c93c3fdb3ad72b4bea08 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Tue, 10 Dec 2024 20:35:36 +0100
Subject: [PATCH 154/381] MultiServer/CommonClient: We forgot about Item Links
 again (Hint Priority) (#4314)

* Vi don't forget about itemlinks challenge difficulty impossible

* People other than Vi also don't forget about ItemLinks challenge difficulty impossible
---
 MultiServer.py | 2 +-
 NetUtils.py    | 2 +-
 kvui.py        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MultiServer.py b/MultiServer.py
index 2561b0692a3c..0601e179152c 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -1914,7 +1914,7 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
             hint = ctx.get_hint(client.team, player, location)
             if not hint:
                 return  # Ignored safely
-            if hint.receiving_player != client.slot:
+            if client.slot not in ctx.slot_set(hint.receiving_player):
                 await ctx.send_msgs(client,
                                     [{'cmd': 'InvalidPacket', "type": "arguments", "text": 'UpdateHint: No Permission',
                                       "original_cmd": cmd}])
diff --git a/NetUtils.py b/NetUtils.py
index 196a030f4969..a961850639a0 100644
--- a/NetUtils.py
+++ b/NetUtils.py
@@ -232,7 +232,7 @@ def _handle_text(self, node: JSONMessagePart):
 
     def _handle_player_id(self, node: JSONMessagePart):
         player = int(node["text"])
-        node["color"] = 'magenta' if player == self.ctx.slot else 'yellow'
+        node["color"] = 'magenta' if self.ctx.slot_concerns_self(player) else 'yellow'
         node["text"] = self.ctx.player_names[player]
         return self._handle_color(node)
 
diff --git a/kvui.py b/kvui.py
index d98fc7ed9ab8..b2ab004e274a 100644
--- a/kvui.py
+++ b/kvui.py
@@ -371,7 +371,7 @@ def on_touch_down(self, touch):
                     if self.hint["status"] == HintStatus.HINT_FOUND:
                         return
                     ctx = App.get_running_app().ctx
-                    if ctx.slot == self.hint["receiving_player"]:  # If this player owns this hint
+                    if ctx.slot_concerns_self(self.hint["receiving_player"]):  # If this player owns this hint
                         # open a dropdown
                         self.dropdown.open(self.ids["status"])
                 elif self.selected:
@@ -800,7 +800,7 @@ def refresh_hints(self, hints):
             hint_status_node = self.parser.handle_node({"type": "color",
                                                         "color": status_colors.get(hint["status"], "red"),
                                                         "text": status_names.get(hint["status"], "Unknown")})
-            if hint["status"] != HintStatus.HINT_FOUND and hint["receiving_player"] == ctx.slot:
+            if hint["status"] != HintStatus.HINT_FOUND and ctx.slot_concerns_self(hint["receiving_player"]):
                 hint_status_node = f"[u]{hint_status_node}[/u]"
             data.append({
                 "receiving": {"text": self.parser.handle_node({"type": "player_id", "text": hint["receiving_player"]})},

From 925fb967d3274e64a8f88b73d81b97ce51c6d0d2 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 10 Dec 2024 14:36:38 -0500
Subject: [PATCH 155/381] Lingo: Fix number hunt issues on panels mode (#4342)

---
 worlds/lingo/data/generated.dat          | Bin 149230 -> 149485 bytes
 worlds/lingo/test/TestDatafile.py        |   7 ++++++-
 worlds/lingo/utils/pickle_static_data.py |  16 ++++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/worlds/lingo/data/generated.dat b/worlds/lingo/data/generated.dat
index 9abb0276c8b5ac2fb1e81eff1e2c2cc06489ddec..8b159d4ae4ac7c565e2372b1cc43d7a349b2ca7c 100644
GIT binary patch
delta 5053
zcma)<dt6j?7Qi_d<^qli6e1|#@RAV;1O!0^MP4H)kf8a<jB<3i5g-FT)?n0pq>ZV~
zz$q=awm#WI(@LE!b3fMlM#V=7mV~xjuDu_tpWUAOJLfkby0xG64}ahJp7T5RchB#4
z@71r?`+m8>cbOCXK-uFD%Lk#q8C0}XK!DEfHL0WwzfFM<+%pLFb42aXo*(4lfkVs?
zhGF9&hO95nHiMtbH5k70q~G4YTBk@_?Og7}mxsV^*y@^NfVB$f@oFTjfe2g>1v!-I
zgImoIfNw{^FE9)DMMDnEa{U?&Qx$j<r^dosXv3~pSOuTB%tq(}Ij3bV_+wEV<hd`F
z8zwL2+9Vvn5^Nt1CNUV|VJa+fEsTeM`$D;^HVy9ffxUP#3tkt)vT^Y4t*gx$4-Y{o
z9vBZf%3cEoSfJ1+Bh+2plno{wtietB@UwejcMLZafDQ7|&jiV0m|%hw$agI?!781&
z(od72geHXGlwugmQ*~Ny)U9pw_7rX7YkE;#T>k(Jaz&KD6(5?S_K~gUuKG@gT_k<*
z{9N$E0)(udb>j9)C~#%XfQ??T*VQ%~)+w+7XWk2TcoDDM3%O#5uYgP)@1(1?0%APH
zazqdDskxA$)8b<UemED#-dN<=?xlsJ%?#l>jTiX58D4;GxM>~);+%Pqq~wO-<MTx8
z#MnL$CM)qVICMTt_Uf+4N5&tQ6vKf3qYFw#C@x3?gR9X3&Ay_TE3ghu1Hq?O_|V^n
zTFC8~R16cipr>dn4p;@HN^X>E{wnCBS2_o|tQ+B&C$wUw6UK;Pi4#VPVYd?=g=;vz
z8Agd=akG%u@Qr5Ct|5syt_9L)T+{;TG``jXk0@*8i4f~@twHGLNwr%x!<{-ZSN{kj
z`av`f+5tsA(JAhgeZ3ea;@%zNz|C+~z6v`AKn4yx2uWg?co2q(!Fo`f)eL-F{`&MF
z#EM`255X|CcCd$smVudvAX{B3dF3I9Q5}+Z9)ehPtK^G^AVJ+H+5a$%Q1#*fiMjcQ
zVT?Y4d6b8TJ=(GViNUz-Fa)c!WWu4tkfpvU+4l%cQrjfYIszr?Cz5v^fg<%s$#4`(
zRaKl7QT(x^;vG<b6av+N9+9NR_iz|~d=x^|B~rjKvD}bwo|$kA;?$QU-*XI-_2omz
z(-Mu25!*u0(kh<tgU7(2S~-HB9fNpvje%!}9*3doUdg885UYQMnPv}je7iH$F>aR*
zw;YFo`X71%363)vA$a~cM5v(=T;=EEFj~!zWX@~_lUgPD(N@v!#gfkwuaq2e0>-Nw
zCC@nl+1^hvk8*tb_U-uA2^g-vD1)Dipt@Uf@=3^14@h2mQuq^+-#sacbx8I(CH!!4
zltoKRPC<fx9W&idEWUFJg7KMC5ait~t>e_Yp?KjGgm?#v$5iypQF3e``nSOVHJk+w
zZxan&I+TN=MvNmMEC`$0AV{CsBcn+=`nRgMuMPav4IIGJB1wHw@)vF5kkG4Mtg6px
z2vg|=A^48dFwjQNv)ryeWtEE!r4`lYDyy@Yo<)AI$ynbq^Fnj=%~AR;xTATM^DXr^
zN9nC1qx#~?YV%FO2Fuk(r?xFtWT<>n;vARTgRtwg*wRf#nuqEc@pSx2a?%+XrEZs8
zeFoCiy^^<|5!-%A@)yKsCC8r?d{A=LS(u=jhjGo_#4{!TbQTiTVe#yf&WZX{5}2#c
zL5A8YdB-`Js9ux&(>W+qha_^&r1yk3N#61vWU7x#{)l++2+oOkUp%?jlbG*%U#yv4
zBjUcA--lxT3}$&MYWhPs_B{{5`u35OK{f_A<tjlq-VeNS(s?lA$$TXQUpfzi;{r?T
zYUbCOt=7tgW<yR*RZZQzhAO8$xVJV{R8=jiz>f3c>%2isLjQIch}rGp_`Q;^gyM{L
zD1c@7Y&!(aT$e5`x=j34q|lbzeNzl&4b_V(>S~?ZjhLs5jr^^cmyD&}8pD7NaRg-z
zyrTmm{FqnJwSeYeZIqJeEw8cy9UTy9<Ba7!8FqcSrLu0WA-}4orp~<{j>@(6&97;w
ztGE1jST0weUpeo$qH@7{aoTT<s&r-DYDej-f&Mp^qS9g;99^RaV#5WvUEWd?K6U{{
zcJt8-knHA`4<NN$kNE&nWT7TmSroE5E@uT}<51-`_pLYK&R$cpy2N*<YpCMa6RjoF
zKem^7whN+gtT01m^SF2)TBTLHA3Qu7op!Ih#g+B$j@j_)B{1~6S^e!p@e1dAw4wjS
z8=QF&A}iQ8{?BdT=<ja>hkth)8u7qI@vY*^Jd9qQ;@jZnxK8mkar4Yh@v358iH)7&
zqv+<>dU96c<xcS}Vb2>9jZN3VyQg(xTO#|3fB9zTyIavDb|<F4E@w(!_T+AbVwa-u
zo9mzp=+#agx0CiNK(td=R$5Y0+%rRLSPUj~L7(nRi(TtkhS;y+-CpceLazfL_XsQE
zAY@vj(`ffBzpKPu^r0Kw)|H#4<mL7Dvd>=mB~z#L*0R4|GxMhORKem);+@V7;fnIC
zdzMX{-g_e7oVcmHX?fi@#o2t)?Yg{)1*Y=e`QFqFyI1kV;+vM`!w*LHkyCTB%gQHF
zf==9v#-}btHo}IHmm#T}#c?y>M>$GA_deNh{bd-Nxj+jPXV=o9JxoJ^Rz!nY3l@VG
zO}x%B+tSanUrQttO6E1qKtrYFj7$9(0>gZoTMIns4~F~-zwU`p8WRJqWYPm+)UJxL
z(Br7;;Rtv=$fpnlHE5sV$wVc?_X~=t?pRu(H^;u@iQ3l`^AX0XeZ$76eMibyDD8Wq
zK1Bb-StFG2zSl?u@ciqzYJ^gK@4tAG_5%e1xy+B!{7hy5n_t)%HIFQzf~Xu24J1;C
zf{8qd1`&A?4JOiMVOf%rY*U31pHv?T7(~FT`AVZF6TzmhH2uj$vhkPZHZpzL+%C-k
zGEr=TqzNVy%_fA6Q5#GuMkp<m^M?|Kk&Gn@&%%&oWk~K2PS+wR@EjM2lqQ-?0-G3V
zV#y@3F|sjgaim7zH>pZ6I+GPcVZ2ODAU~2*6QxNaGm1?z8>2RoRJu@FD$!^`4O*Hz
zn2x_BD<hSREPSRz{HMp1qEv>DamO+#J%=V{5#{m3aoCokq!wh8F|nDz=~^zCLSd|0
zo-_qyirARg*u5uLSnJJoOPqz1Sr=i^NF~iSS>~5eeklh^rI|wJPBvxIOeIssW|}n9
z$&|C1A<Zl@Q`y`t%{^qMv6&-H1)00p+-H+&E~)9P%+ky!GlPvq8jZ|MHV;ViAemWg
zs->wVb2pm>(pbsNW>e3`s4XOQk5Kl$6VR5b7;_hqsSrk6OmrX75~BNw{y;QWP=mHq
zpg84?WX!@?wI()3Z5e)^sze4Zr-+4fSGXf9F(OS#AFzrdRa9>^(St;5usTf%3VMV@
zEs3>63wZiE+?=MwjkS}hr`UR;2BOD^77}eBT12#wXtAIMZIeKH;W%1GDF&O9e`zfg
zUn=5O4c+l4Nj*f9Hxo7T<SiW3o+i`8>070FhK!BPv(h|AW*M93rFntO3O3uMd5I6}
z!>nGGYC9#ZWV1t>on%(A*(J^EWLC3z1255S?2!Q%1s>tRpQU+=%y2gQq}fkqEt|hc
zbAZe`Ht$IDS2B;XImpJS9VTTL%HF@cW|6thkXKz_S5bYx*;%;$s7j4J;(k(}OjpK7
z9H;chMS6qQ$`!OzayTQ0_wa{wCCt_?e_aqmVKZOv18FXjX<^gJ#;A3XLZP%vL{AW1
zCVEm(gZ43}X@4iPnJ0cC%@s0R*!)A9&&WI_Oq5moT&gcgJ<Um9N%OrNuDRaKP*VH-
E2V2JSga7~l

delta 4981
zcmaKudsviZ7Qi_l%m)YvCUOywK|lsXE`ovvDk1`d0t(*98|ujLrI0g>+NMHzDQzrm
z29Kt-*4kE2hGy$CZLM8wy&&EYQ`AJQZP(h?*4k%#T(kB)=Y{dI7yg*{_x;X!&v(A}
zeZOJ;_Pp<njlNAz2n5(41W)$IxrN}Z^O{grQHh^KK^PwH4+mIc+GfZmQe9t1!1ta~
z-i(G8aJqKtVZ8!?NwM&>5*mp?wJ?@*U-yp#fKm*IhkPh?O^Syp3hc($6JR|Y#B>9!
zg-(~t09Sz0eQ-|_jN{5)UPZ;@FeVk^T|);$2tW-MCqt1KUPy*1P~*Cu47YrhvC%lQ
z7WCNP0tVOMEa>Y4yKwYq*e8bXM~hof!`M0omWkqdd62K{(!0C!c6H^!SRL3frV#GP
z)Qlqd6{KKG5eyZ>wIaxX6j#4uSgR8ix0ga0cZZ&3kRz#QS-kOjAq<ypYBmJBJj>xr
zA6fMFba+cf?&cWRz(Y7-8wBE|L<q+6Q1Evdt6-BC>~dY24I32ks0*vX4o&z&HH;HO
z_B_bNt^Fa$wR#>zdg4n-&<9&gkcw~5fFS(V1Ver7x{89S1*J}WJ_4d}%tDC9&IplK
zuoe1Z(?S@4KgEjswk(A0%Gw0nTqE@C8c0`i`68djb2TtgF(zQVS&mmtqDo4w=rpkm
z1}M`KFox<rKL&;<3leBGjmnY)m)M8>zG9xMuN6)M!B-7%DadPDf`<p*Duq&-8N3e4
z#pqhN4tn{C*)GdwX!V3QF{c?G7Q^yp7%7H#o8ejLz|mVEOAO1l2-$)Awun`^lY*lV
zhSRtdA)Cg%2+t@s-d1j8-Bt+jq}t8fVUmtoyS@|B0zkp=7AWyiGCVxiIiGamjmM!F
z_qT|%lI1e*fw%iXD25z@bTJeif<!S`4v7;NiXX_UuMR<ixC%H7iK;om!$S+joWqc(
zS|zVO4DsrE$t{N=L3K*LbQn_9cO(ZMfix8&d2YcGc-SwLIm^St9_Ki)H3ENo1j5u(
znefLWFiPDm+2<%sP!CG3ItpcKr{q0Hp+vpGyrmV&)mu_;Y!$n2ZG~XfD~fL>M7kR7
z<|w?@3gK!Ei!H}Qv)%(ZZ^$u7Qc?1(V=&ZjY&3al(BMdWJsfL}i=+1GG0>~k9Ko-T
zL9%Mo^X!N=7^Lo!T-XK)e%qL7cB13vo=C^&y*hlc4MP2{y8|hX_7UOuSsTQtJ~3S7
zr#2X=rVM1xISxf?rR4VG;yro!I1Ewex<#J4Nb)BqMKJk<=w-P(7>t$^FvNQei!8^@
zKlH`lpMb&Yrh77e78&XeDbi0uzWT;J!RJnj;P0dmHyERSEZO^%*!I4$++pb{Nb##>
zrsqs>#MJe}9j74NyFp6F$%B#DN#bT4&B$_;wT5EgY3QfkW`Rkk#X?sM;-DxI@8}a1
zf-6r$h@ZDx#*uXNZd397(-5fEZ~#w<q_`$`l7FSyVlwH=tLsdQtj<z8<=Sg9)3+U>
z8gs>~C^yq@eC^T)5{>R)uZr5`_ZOjeSWfh>FfBFJ-5*_WH(F3zV{W)Vy2KsD*V-Y>
zZ>{?}$#Ly`2zIrLt*<xG4N!MRyhBZr)6PJax<T^dGmx!1CBJn>9FGqr|CM;J<iQ<+
zUzPl52aHwo6S?NQ#MzQ>cR;G@oy<P%tf-%s!o2t_j8NZ{y!$K^s~wVWp9Q0OM{>z$
z!VgO2{1-oiT=g-@mx*sl)}Isa_t|vLnR-t2OkXzQxt!;q)Gv#f4++-y7GK4F=f!gD
z&!h~p@wll#3BfUe;Eg5c!GIs0hY0+hJ~p0*{+Qb-s8dkC;BrfSjm2cO(kABDFRHgJ
zv@JrvP6)^2g-STu>0^2)6vAxW*$E+4=4^43+2W%_p+jN!&Cpla>Xubo9&>7UW1cdW
z`QKt*GB)hN7zSN{5LMQ|<O>iJ$UK+s1vCfi<CIiyd6&8P!UY(Z&l!)nGwgnq=32`F
z{rE-o^_K2_I4XPfA75{?G??!X<13dTEa`3`*`A*`xDRI1ZFK7#<t@QMchgns%;vZ<
zG87vwLSNbc9Nc&jGJE*QMHt${zg&c2Jv{OfWXMW$WNA^!>bN#43|Ay54|PB29BjFC
zcS`P6h{LV~CD0wMClg?}$LzccvDoxE1jTcgT)P)_Y1QU~hsR2%-K$`EZA16+RN?h&
zpbxlT#eDG}D)6%SYUhGgm~**j>1Y1mrRV7XUiz85^s?wo{OB@_O6D8Pa~HMReJ9jg
z8}xY=Q?-*Cr(cuZjnBixF7Y2m&cGR65G8pQuILi~CfU!zz3!Y@c(qG>r?cn%iNlpY
zg137i#V!rRpgcu&8?jgMy><DM3-Ts*-*XO%J&VQfegs_~c@7`kxu!g&m%D)2xp*9M
z6?*mDRcxQT1F>;~d%W1PlzUEs+$~37RQS}DPJ`XEa#~q;1J&-OvFj>}CKnXk>*Y#&
zjW3%r`CcvGMX#!Y$?hsR@fw6S@=|a`dFDMUil^T@QO7T8_s>B2xSY*L-mWVsE-dQV
z4EElf?^Rk{dS6>U{D$<LJvBeCqH+Qy=)|*VeEc%xI#i)Jcj-MW4xAn@k5dA=m$M4(
zUqDW7p%y0&vAI*z)3Cu@Yc`n!%<pKCbh*UbuB8gl!sw%f)GRHScs20>m+nglj%psL
z{Or?wV!Q|axuQW?mD=Y}F1;BB?T8qS9!FIVN1uHmK1L8^(~jctG-ZVEF^Z|(vEfE<
zj<xYb?F7Yqgt2NT*%-9bq<n?a+KGA*ox!SfWq^MNi9S64EUrmc>gJx~Nm?fbg1O8E
zX)clJ$L4c32Ca)!2$j1+6iRfJD2(VDQGcQ@h$4u-%*Dw=m7$G)5@w}S`!fafB4E}2
zBF)!iV%U5m&9`I*vbiD6-^uv1xhc&LWMbL;Lz;h*iDUC48-sR>RJ>5yzxojlBD_tM
zK=e~ChGi(x<L+>}_6r4m!v#D>akGjTj45n9rO}Z|Wuvk&Xg;LU@Vntk7&<Z(y|I@}
z^(UXnsR7ailF4Ed#KxdKL@HY-tuN6?K{hS8I~am@GL%g5V|{3*vT8thw~e60e3}wT
zRKQcB@MNYkY+^K-A~t$X*9MX?3S-q`rHLm~!e$T~yZ6LuYlF%1xYIb1bs}qnqgn~Z
z1;doc#=&yt5Sm%eDJjyVk(tCMU78Fs6>Ku48BV5>O_nqx$V_1~QkonxQ`zK7Gn&ja
zHe(v48cS+At9)q+$jo3fUYa5@Rcwl-DIxO+n+ejCl9|b-Oqxk#X0e&f#-LS_nk|&w
ze=M#Vt{BEmAyX}kHkD`|(KMp@MAL~D2(oE21d5aX2pN+wR&6F5gEkw#8LkWro<k8c
z=g#ep%tL*alASl7B8#Zr0;0u4CZak)b{+kOusV(Pq!*HYjHrfai6EP1#%)<jQjSKZ
zfntvm*@zYqEhSn^w2Y{ZXt^MpRxgmggqGkhS&F{V!k1bDB|IS#teUMmVHv3vG<!MG
zN}l~V2el{2tm5<)(ySuW$fkQ2pCr@7<|&!8hRjoJ)=Kkq9;wx=o{?$;nKf*lm1ZNE
zwQQb~W)qopY&PSSZ1ETl8EB@!GaT3=%~mpl*=&<$JDK%tc1ZIwnGI}yEzK)ro@MhY
z8-uoslwBx$@5=gRCX2qHuEA1WH{awmZak`^m3<9Yk5Hz>yg`XCh(w$ACePJ&%VCck
z_TjA&N>t;1dF2v=v6=7mo;2^1*}~=nHU{kgDHKZkkZ3E>M?~8M*|d*2O*=^DMV|Pn
nG>6D+XLDGZqhxjn6KmC4rD`Mf5+@y(rd<vluJ=YN!vg*d&|S&{

diff --git a/worlds/lingo/test/TestDatafile.py b/worlds/lingo/test/TestDatafile.py
index 60acb3e85e96..a01ff4171786 100644
--- a/worlds/lingo/test/TestDatafile.py
+++ b/worlds/lingo/test/TestDatafile.py
@@ -1,7 +1,7 @@
 import os
 import unittest
 
-from ..static_logic import HASHES
+from ..static_logic import HASHES, PANELS_BY_ROOM
 from ..utils.pickle_static_data import hash_file
 
 
@@ -14,3 +14,8 @@ def test_check_hashes(self) -> None:
                          "LL1.yaml hash does not match generated.dat. Please regenerate using 'python worlds/lingo/utils/pickle_static_data.py'")
         self.assertEqual(ids_file_hash, HASHES["ids.yaml"],
                          "ids.yaml hash does not match generated.dat. Please regenerate using 'python worlds/lingo/utils/pickle_static_data.py'")
+
+    def test_panel_doors_are_set(self) -> None:
+        # This panel is defined earlier in the file than the panel door, so we want to check that the panel door is
+        # correctly applied.
+        self.assertNotEqual(PANELS_BY_ROOM["Outside The Agreeable"]["FIVE (1)"].panel_door, None)
diff --git a/worlds/lingo/utils/pickle_static_data.py b/worlds/lingo/utils/pickle_static_data.py
index cd5c4b41df4b..df82a12861a4 100644
--- a/worlds/lingo/utils/pickle_static_data.py
+++ b/worlds/lingo/utils/pickle_static_data.py
@@ -111,6 +111,16 @@ def load_static_data(ll1_path, ids_path):
     with open(ll1_path, "r") as file:
         config = Utils.parse_yaml(file)
 
+        # We have to process all panel doors first so that panels can see what panel doors they're in even if they're
+        # defined earlier in the file than the panel door.
+        for room_name, room_data in config.items():
+            if "panel_doors" in room_data:
+                PANEL_DOORS_BY_ROOM[room_name] = dict()
+
+                for panel_door_name, panel_door_data in room_data["panel_doors"].items():
+                    process_panel_door(room_name, panel_door_name, panel_door_data)
+
+        # Process the rest of the room.
         for room_name, room_data in config.items():
             process_room(room_name, room_data)
 
@@ -515,12 +525,6 @@ def process_room(room_name, room_data):
         for source_room, doors in room_data["entrances"].items():
             process_entrance(source_room, doors, room_obj)
 
-    if "panel_doors" in room_data:
-        PANEL_DOORS_BY_ROOM[room_name] = dict()
-
-        for panel_door_name, panel_door_data in room_data["panel_doors"].items():
-            process_panel_door(room_name, panel_door_name, panel_door_data)
-
     if "panels" in room_data:
         PANELS_BY_ROOM[room_name] = dict()
 

From 704f14ffcd80d32a4c0ffed4bdf4cf38324b0dc5 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:37:54 -0500
Subject: [PATCH 156/381] Core: Add toggles_as_bools to options.as_dict (#3770)

* Add toggles_as_bools to options.as_dict

* Update Options.py

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

* Add param to docstring

* if -> elif

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 Options.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Options.py b/Options.py
index d3b2e6c1ba11..4e26a0d56c5c 100644
--- a/Options.py
+++ b/Options.py
@@ -754,7 +754,7 @@ def __init__(self, value: int) -> None:
         elif value > self.range_end and value not in self.special_range_names.values():
             raise Exception(f"{value} is higher than maximum {self.range_end} for option {self.__class__.__name__} " +
                             f"and is also not one of the supported named special values: {self.special_range_names}")
-        
+
         # See docstring
         for key in self.special_range_names:
             if key != key.lower():
@@ -1180,7 +1180,7 @@ def __len__(self) -> int:
 class Accessibility(Choice):
     """
     Set rules for reachability of your items/locations.
-    
+
     **Full:** ensure everything can be reached and acquired.
 
     **Minimal:** ensure what is needed to reach your goal can be acquired.
@@ -1198,7 +1198,7 @@ class Accessibility(Choice):
 class ItemsAccessibility(Accessibility):
     """
     Set rules for reachability of your items/locations.
-    
+
     **Full:** ensure everything can be reached and acquired.
 
     **Minimal:** ensure what is needed to reach your goal can be acquired.
@@ -1249,12 +1249,16 @@ class CommonOptions(metaclass=OptionsMetaProperty):
     progression_balancing: ProgressionBalancing
     accessibility: Accessibility
 
-    def as_dict(self, *option_names: str, casing: str = "snake") -> typing.Dict[str, typing.Any]:
+    def as_dict(self,
+                *option_names: str,
+                casing: typing.Literal["snake", "camel", "pascal", "kebab"] = "snake",
+                toggles_as_bools: bool = False) -> typing.Dict[str, typing.Any]:
         """
         Returns a dictionary of [str, Option.value]
 
         :param option_names: names of the options to return
         :param casing: case of the keys to return. Supports `snake`, `camel`, `pascal`, `kebab`
+        :param toggles_as_bools: whether toggle options should be output as bools instead of strings
         """
         assert option_names, "options.as_dict() was used without any option names."
         option_results = {}
@@ -1276,6 +1280,8 @@ def as_dict(self, *option_names: str, casing: str = "snake") -> typing.Dict[str,
                 value = getattr(self, option_name).value
                 if isinstance(value, set):
                     value = sorted(value)
+                elif toggles_as_bools and issubclass(type(self).type_hints[option_name], Toggle):
+                    value = bool(value)
                 option_results[display_name] = value
             else:
                 raise ValueError(f"{option_name} not found in {tuple(type(self).type_hints)}")

From 54a0a5ac0002ff1edf858441891625600b69e812 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Tue, 10 Dec 2024 21:06:06 +0100
Subject: [PATCH 157/381] The Witness: Put progression + useful on some items.
 (#4027)

* proguseful

* ruff

* variable rename

* variable rename

* Better (?) comment

* Better way to do this? I guess

* sure

* ruff

* Eh, it's not worth it. Here's the much simpler version

* don't need this now

* Improve some classification checks while we're at it

* Only proguseful obelisk keys if eps are individual
---
 worlds/witness/player_items.py | 48 +++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/worlds/witness/player_items.py b/worlds/witness/player_items.py
index 831e614f21c4..d1b951fa8e15 100644
--- a/worlds/witness/player_items.py
+++ b/worlds/witness/player_items.py
@@ -7,6 +7,7 @@
 from BaseClasses import Item, ItemClassification, MultiWorld
 
 from .data import static_items as static_witness_items
+from .data import static_logic as static_witness_logic
 from .data.item_definition_classes import (
     DoorItemDefinition,
     ItemCategory,
@@ -53,9 +54,8 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic,
         # Remove all progression items that aren't actually in the game.
         self.item_data = {
             name: data for (name, data) in self.item_data.items()
-            if data.classification not in
-               {ItemClassification.progression, ItemClassification.progression_skip_balancing}
-               or name in player_logic.PROGRESSION_ITEMS_ACTUALLY_IN_THE_GAME
+            if ItemClassification.progression not in data.classification
+            or name in player_logic.PROGRESSION_ITEMS_ACTUALLY_IN_THE_GAME
         }
 
         # Downgrade door items
@@ -72,7 +72,7 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic,
         # Add progression items to the mandatory item list.
         progression_dict = {
             name: data for (name, data) in self.item_data.items()
-            if data.classification in {ItemClassification.progression, ItemClassification.progression_skip_balancing}
+            if ItemClassification.progression in data.classification
         }
         for item_name, item_data in progression_dict.items():
             if isinstance(item_data.definition, ProgressiveItemDefinition):
@@ -100,6 +100,46 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic,
             self.item_data[location_name] = ItemData(None, ItemDefinition(0, ItemCategory.EVENT),
                                                      ItemClassification.progression, False)
 
+        # Determine which items should be progression + useful, if they exist in some capacity.
+        # Note: Some of these may need to be updated for the "independent symbols" PR.
+        self._proguseful_items = {
+            "Dots", "Stars", "Shapers", "Black/White Squares",
+            "Caves Shortcuts", "Caves Mountain Shortcut (Door)", "Caves Swamp Shortcut (Door)",
+            "Boat",
+        }
+
+        if self._world.options.shuffle_EPs == "individual":
+            self._proguseful_items |= {
+                "Town Obelisk Key",  # Most checks
+                "Monastery Obelisk Key",  # Most sphere 1 checks, and also super dense ("Jackpot" vibes)}
+            }
+
+        if self._world.options.shuffle_discarded_panels:
+            # Discards only give a moderate amount of checks, but are very spread out and a lot of them are in sphere 1.
+            # Thus, you really want to have the discard-unlocking item as quickly as possible.
+
+            if self._world.options.puzzle_randomization in ("none", "sigma_normal"):
+                self._proguseful_items.add("Triangles")
+            elif self._world.options.puzzle_randomization == "sigma_expert":
+                self._proguseful_items.add("Arrows")
+            # Discards require two symbols in Variety, so the "sphere 1 unlocking power" of Arrows is not there.
+        if self._world.options.puzzle_randomization == "sigma_expert":
+            self._proguseful_items.add("Triangles")
+            self._proguseful_items.add("Full Dots")
+            self._proguseful_items.add("Stars + Same Colored Symbol")
+            self._proguseful_items.discard("Stars")  # Stars are not that useful on their own.
+        if self._world.options.puzzle_randomization == "umbra_variety":
+            self._proguseful_items.add("Triangles")
+
+        # This needs to be improved when the improved independent&progressive symbols PR is merged
+        for item in list(self._proguseful_items):
+            self._proguseful_items.add(static_witness_logic.get_parent_progressive_item(item))
+
+        for item_name, item_data in self.item_data.items():
+            if item_name in self._proguseful_items:
+                item_data.classification |= ItemClassification.useful
+
+
     def get_mandatory_items(self) -> Dict[str, int]:
         """
         Returns the list of items that must be in the pool for the game to successfully generate.

From 9a37a136a1ab02c561b704a144b6424eac5db416 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Tue, 10 Dec 2024 21:13:45 +0100
Subject: [PATCH 158/381] The Witness: Add more panels to the "doors: panels"
 mode (#2916)

* Add more panels that should be panels

* Make it so the caves panel items don't exist in early caves

* Remove unused import

* oops

* Remove Jungle to Monastery Garden from usefulification list

* Add a basic test

* ruff

---------

Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
---
 worlds/witness/data/WitnessItems.txt          | 12 ++++++--
 .../Door_Shuffle/Complex_Door_Panels.txt      |  5 ++++
 .../settings/Door_Shuffle/Simple_Panels.txt   |  4 +--
 worlds/witness/data/settings/Early_Caves.txt  |  6 +++-
 .../data/settings/Early_Caves_Start.txt       |  6 +++-
 worlds/witness/player_items.py                |  7 +++--
 worlds/witness/player_logic.py                | 12 ++++++--
 worlds/witness/test/test_door_shuffle.py      | 28 ++++++++++++++++++-
 8 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/worlds/witness/data/WitnessItems.txt b/worlds/witness/data/WitnessItems.txt
index 782fa9c3d226..57aee28e45b6 100644
--- a/worlds/witness/data/WitnessItems.txt
+++ b/worlds/witness/data/WitnessItems.txt
@@ -56,6 +56,7 @@ Doors:
 1119 - Quarry Stoneworks Entry (Panel) - 0x01E5A,0x01E59
 1120 - Quarry Stoneworks Ramp Controls (Panel) - 0x03678,0x03676
 1122 - Quarry Stoneworks Lift Controls (Panel) - 0x03679,0x03675
+1123 - Quarry Stoneworks Stairs (Panel) - 0x03677
 1125 - Quarry Boathouse Ramp Height Control (Panel) - 0x03852
 1127 - Quarry Boathouse Ramp Horizontal Control (Panel) - 0x03858
 1129 - Quarry Boathouse Hook Control (Panel) - 0x275FA
@@ -84,6 +85,7 @@ Doors:
 1205 - Treehouse Laser House Door Timer (Panel) - 0x2700B,0x17CBC
 1208 - Treehouse Drawbridge (Panel) - 0x037FF
 1175 - Jungle Popup Wall (Panel) - 0x17CAB
+1178 - Jungle Monastery Garden Shortcut (Panel) - 0x17CAA
 1180 - Bunker Entry (Panel) - 0x17C2E
 1183 - Bunker Tinted Glass Door (Panel) - 0x0A099
 1186 - Bunker Elevator Control (Panel) - 0x0A079
@@ -94,12 +96,15 @@ Doors:
 1195 - Swamp Rotating Bridge (Panel) - 0x181F5
 1196 - Swamp Long Bridge (Panel) - 0x17E2B
 1197 - Swamp Maze Controls (Panel) - 0x17C0A,0x17E07
+1199 - Swamp Laser Shortcut (Panel) - 0x17C05
 1220 - Mountain Floor 1 Light Bridge (Panel) - 0x09E39
 1225 - Mountain Floor 2 Light Bridge Near (Panel) - 0x09E86
 1230 - Mountain Floor 2 Light Bridge Far (Panel) - 0x09ED8
 1235 - Mountain Floor 2 Elevator Control (Panel) - 0x09EEB
 1240 - Caves Entry (Panel) - 0x00FF8
 1242 - Caves Elevator Controls (Panel) - 0x335AB,0x335AC,0x3369D
+1243 - Caves Mountain Shortcut (Panel) - 0x021D7
+1244 - Caves Swamp Shortcut (Panel) - 0x17CF2
 1245 - Challenge Entry (Panel) - 0x0A16E
 1250 - Tunnels Entry (Panel) - 0x039B4
 1255 - Tunnels Town Shortcut (Panel) - 0x09E85
@@ -250,19 +255,20 @@ Doors:
 2101 - Outside Tutorial Outpost Panels - 0x0A171,0x04CA4
 2105 - Desert Panels - 0x09FAA,0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B,0x0C339,0x0A249,0x0A015,0x09FA0,0x09F86
 2110 - Quarry Outside Panels - 0x17C09,0x09E57,0x17CC4
-2115 - Quarry Stoneworks Panels - 0x01E5A,0x01E59,0x03678,0x03676,0x03679,0x03675
+2115 - Quarry Stoneworks Panels - 0x01E5A,0x01E59,0x03678,0x03676,0x03679,0x03675,0x03677
 2120 - Quarry Boathouse Panels - 0x03852,0x03858,0x275FA
 2122 - Keep Hedge Maze Panels - 0x00139,0x019DC,0x019E7,0x01A0F
 2125 - Monastery Panels - 0x09D9B,0x00C92,0x00B10
+2127 - Jungle Panels - 0x17CAB,0x17CAA
 2130 - Town Church & RGB House Panels - 0x28998,0x28A0D,0x334D8
 2135 - Town Maze Panels - 0x2896A,0x28A79
 2137 - Town Dockside House Panels - 0x0A0C8,0x09F98
 2140 - Windmill & Theater Panels - 0x17D02,0x00815,0x17F5F,0x17F89,0x0A168,0x33AB2
 2145 - Treehouse Panels - 0x0A182,0x0288C,0x02886,0x2700B,0x17CBC,0x037FF
 2150 - Bunker Panels - 0x34BC5,0x34BC6,0x0A079,0x0A099,0x17C2E
-2155 - Swamp Panels - 0x00609,0x18488,0x181F5,0x17E2B,0x17C0A,0x17E07,0x17C0D,0x0056E
+2155 - Swamp Panels - 0x00609,0x18488,0x181F5,0x17E2B,0x17C0A,0x17E07,0x17C0D,0x0056E,0x17C05
 2160 - Mountain Panels - 0x09ED8,0x09E86,0x09E39,0x09EEB
-2165 - Caves Panels - 0x3369D,0x00FF8,0x0A16E,0x335AB,0x335AC
+2165 - Caves Panels - 0x3369D,0x00FF8,0x0A16E,0x335AB,0x335AC,0x021D7,0x17CF2
 2170 - Tunnels Panels - 0x09E85,0x039B4
 
 2200 - Desert Obelisk Key - 0x0332B,0x03367,0x28B8A,0x037B6,0x037B2,0x000F7,0x3351D,0x0053C,0x00771,0x335C8,0x335C9,0x337F8,0x037BB,0x220E4,0x220E5,0x334B9,0x334BC,0x22106,0x0A14C,0x0A14D,0x00359
diff --git a/worlds/witness/data/settings/Door_Shuffle/Complex_Door_Panels.txt b/worlds/witness/data/settings/Door_Shuffle/Complex_Door_Panels.txt
index 63d8a58d2676..6c3b328691f9 100644
--- a/worlds/witness/data/settings/Door_Shuffle/Complex_Door_Panels.txt
+++ b/worlds/witness/data/settings/Door_Shuffle/Complex_Door_Panels.txt
@@ -9,6 +9,7 @@ Desert Flood Room Entry (Panel)
 Quarry Entry 1 (Panel)
 Quarry Entry 2 (Panel)
 Quarry Stoneworks Entry (Panel)
+Quarry Stoneworks Stairs (Panel)
 Shadows Door Timer (Panel)
 Keep Hedge Maze 1 (Panel)
 Keep Hedge Maze 2 (Panel)
@@ -28,11 +29,15 @@ Treehouse Third Door (Panel)
 Treehouse Laser House Door Timer (Panel)
 Treehouse Drawbridge (Panel)
 Jungle Popup Wall (Panel)
+Jungle Monastery Garden Shortcut (Panel)
 Bunker Entry (Panel)
 Bunker Tinted Glass Door (Panel)
 Swamp Entry (Panel)
 Swamp Platform Shortcut (Panel)
+Swamp Laser Shortcut (Panel)
 Caves Entry (Panel)
+Caves Mountain Shortcut (Panel)
+Caves Swamp Shortcut (Panel)
 Challenge Entry (Panel)
 Tunnels Entry (Panel)
 Tunnels Town Shortcut (Panel)
\ No newline at end of file
diff --git a/worlds/witness/data/settings/Door_Shuffle/Simple_Panels.txt b/worlds/witness/data/settings/Door_Shuffle/Simple_Panels.txt
index 23501d20d3a7..f9b8b1b43ae7 100644
--- a/worlds/witness/data/settings/Door_Shuffle/Simple_Panels.txt
+++ b/worlds/witness/data/settings/Door_Shuffle/Simple_Panels.txt
@@ -7,6 +7,7 @@ Quarry Stoneworks Panels
 Quarry Boathouse Panels
 Keep Hedge Maze Panels
 Monastery Panels
+Jungle Panels
 Town Church & RGB House Panels
 Town Maze Panels
 Windmill & Theater Panels
@@ -18,5 +19,4 @@ Mountain Panels
 Caves Panels
 Tunnels Panels
 Glass Factory Entry (Panel)
-Shadows Door Timer (Panel)
-Jungle Popup Wall (Panel)
\ No newline at end of file
+Shadows Door Timer (Panel)
\ No newline at end of file
diff --git a/worlds/witness/data/settings/Early_Caves.txt b/worlds/witness/data/settings/Early_Caves.txt
index 48c8056bc7b6..df1e7b114a47 100644
--- a/worlds/witness/data/settings/Early_Caves.txt
+++ b/worlds/witness/data/settings/Early_Caves.txt
@@ -3,4 +3,8 @@ Caves Shortcuts
 
 Remove Items:
 Caves Mountain Shortcut (Door)
-Caves Swamp Shortcut (Door)
\ No newline at end of file
+Caves Swamp Shortcut (Door)
+
+Forbidden Doors:
+0x021D7 (Caves Mountain Shortcut Panel)
+0x17CF2 (Caves Swamp Shortcut Panel)
\ No newline at end of file
diff --git a/worlds/witness/data/settings/Early_Caves_Start.txt b/worlds/witness/data/settings/Early_Caves_Start.txt
index a16a6d02bb9f..bc79007fa54b 100644
--- a/worlds/witness/data/settings/Early_Caves_Start.txt
+++ b/worlds/witness/data/settings/Early_Caves_Start.txt
@@ -6,4 +6,8 @@ Caves Shortcuts
 
 Remove Items:
 Caves Mountain Shortcut (Door)
-Caves Swamp Shortcut (Door)
\ No newline at end of file
+Caves Swamp Shortcut (Door)
+
+Forbidden Doors:
+0x021D7 (Caves Mountain Shortcut Panel)
+0x17CF2 (Caves Swamp Shortcut Panel)
\ No newline at end of file
diff --git a/worlds/witness/player_items.py b/worlds/witness/player_items.py
index d1b951fa8e15..2fb987bb456a 100644
--- a/worlds/witness/player_items.py
+++ b/worlds/witness/player_items.py
@@ -227,10 +227,13 @@ def get_door_ids_in_pool(self) -> List[int]:
         Returns the total set of all door IDs that are controlled by items in the pool.
         """
         output: List[int] = []
-        for item_name, item_data in dict(self.item_data.items()).items():
+
+        for item_name, item_data in self.item_data.items():
             if not isinstance(item_data.definition, DoorItemDefinition):
                 continue
-            output += [int(hex_string, 16) for hex_string in item_data.definition.panel_id_hexes]
+
+            output += [int(hex_string, 16) for hex_string in item_data.definition.panel_id_hexes
+                       if hex_string not in self._logic.FORBIDDEN_DOORS]
 
         return output
 
diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index 58f15532f58c..9e6c9597382b 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -82,6 +82,7 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in
         self.PARENT_ITEM_COUNT_PER_BASE_ITEM: Dict[str, int] = defaultdict(lambda: 1)
         self.PROGRESSIVE_LISTS: Dict[str, List[str]] = {}
         self.DOOR_ITEMS_BY_ID: Dict[str, List[str]] = {}
+        self.FORBIDDEN_DOORS: Set[str] = set()
 
         self.STARTING_INVENTORY: Set[str] = set()
 
@@ -192,8 +193,9 @@ def reduce_req_within_region(self, entity_hex: str) -> WitnessRule:
         for subset in these_items:
             self.BASE_PROGESSION_ITEMS_ACTUALLY_IN_THE_GAME.update(subset)
 
-        # Handle door entities (door shuffle)
-        if entity_hex in self.DOOR_ITEMS_BY_ID:
+        # If this entity is opened by a door item that exists in the itempool, add that item to its requirements.
+        # Also, remove any original power requirements this entity might have had.
+        if entity_hex in self.DOOR_ITEMS_BY_ID and entity_hex not in self.FORBIDDEN_DOORS:
             # If this entity is opened by a door item that exists in the itempool, add that item to its requirements.
             door_items = frozenset({frozenset([item]) for item in self.DOOR_ITEMS_BY_ID[entity_hex]})
 
@@ -329,6 +331,10 @@ def make_single_adjustment(self, adj_type: str, line: str) -> None:
                     if entity_hex in self.DOOR_ITEMS_BY_ID and item_name in self.DOOR_ITEMS_BY_ID[entity_hex]:
                         self.DOOR_ITEMS_BY_ID[entity_hex].remove(item_name)
 
+        if adj_type == "Forbidden Doors":
+            entity_hex = line[:7]
+            self.FORBIDDEN_DOORS.add(entity_hex)
+
         if adj_type == "Starting Inventory":
             self.STARTING_INVENTORY.add(line)
 
@@ -704,7 +710,7 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None:
 
                 self.make_single_adjustment(current_adjustment_type, line)
 
-        for entity_id in self.COMPLETELY_DISABLED_ENTITIES:
+        for entity_id in self.COMPLETELY_DISABLED_ENTITIES | self.FORBIDDEN_DOORS:
             if entity_id in self.DOOR_ITEMS_BY_ID:
                 del self.DOOR_ITEMS_BY_ID[entity_id]
 
diff --git a/worlds/witness/test/test_door_shuffle.py b/worlds/witness/test/test_door_shuffle.py
index 0e38c32d69e2..d593a84bdb8f 100644
--- a/worlds/witness/test/test_door_shuffle.py
+++ b/worlds/witness/test/test_door_shuffle.py
@@ -1,4 +1,4 @@
-from ..test import WitnessTestBase
+from ..test import WitnessMultiworldTestBase, WitnessTestBase
 
 
 class TestIndividualDoors(WitnessTestBase):
@@ -22,3 +22,29 @@ def test_swamp_laser_shortcut(self) -> None:
             ],
             only_check_listed=True,
         )
+
+
+class TestForbiddenDoors(WitnessMultiworldTestBase):
+    options_per_world = [
+        {
+            "early_caves": "off",
+        },
+        {
+            "early_caves": "add_to_pool",
+        },
+    ]
+
+    common_options = {
+        "shuffle_doors": "panels",
+        "shuffle_postgame": True,
+    }
+
+    def test_forbidden_doors(self) -> None:
+        self.assertTrue(
+            self.get_items_by_name("Caves Mountain Shortcut (Panel)", 1),
+            "Caves Mountain Shortcut (Panel) should exist in panels shuffle, but it didn't."
+        )
+        self.assertFalse(
+            self.get_items_by_name("Caves Mountain Shortcut (Panel)", 2),
+            "Caves Mountain Shortcut (Panel) should be removed when Early Caves is enabled, but it still exists."
+        )

From 3c5ec49dbee129579573ab7528ddb87185f9fc9a Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Thu, 12 Dec 2024 03:17:19 -0500
Subject: [PATCH 159/381] Stardew Valley: Fix potential incompletable seed when
 starting winter  (#4361)

* make moss available with any season except winter

* add tool and region requirement for moss
---
 worlds/stardew_valley/logic/logic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/stardew_valley/logic/logic.py b/worlds/stardew_valley/logic/logic.py
index 9d4447439f7b..6efc1ade4980 100644
--- a/worlds/stardew_valley/logic/logic.py
+++ b/worlds/stardew_valley/logic/logic.py
@@ -281,7 +281,7 @@ def __init__(self, player: int, options: StardewValleyOptions, content: StardewC
             Material.coal: self.mine.can_mine_in_the_mines_floor_41_80() | self.tool.has_tool(Tool.pan),
             Material.fiber: True_(),
             Material.hardwood: self.tool.has_tool(Tool.axe, ToolMaterial.copper) & (self.region.can_reach(Region.secret_woods) | self.region.can_reach(Region.island_west)),
-            Material.moss: True_(),
+            Material.moss: self.season.has_any_not_winter() & (self.tool.has_tool(Tool.scythe) | self.combat.has_any_weapon) & self.region.can_reach(Region.forest),
             Material.sap: self.ability.can_chop_trees(),
             Material.stone: self.tool.has_tool(Tool.pickaxe),
             Material.wood: self.tool.has_tool(Tool.axe),

From f91537fb481e58ff429929f7919a288f3630ba04 Mon Sep 17 00:00:00 2001
From: Justus Lind <DeamonHunter@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:18:19 +1000
Subject: [PATCH 160/381] Muse Dash: Remove bad option defaults. #4340

---
 worlds/musedash/Options.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/worlds/musedash/Options.py b/worlds/musedash/Options.py
index e647c18d7096..b8c969c39b0f 100644
--- a/worlds/musedash/Options.py
+++ b/worlds/musedash/Options.py
@@ -11,7 +11,6 @@ class DLCMusicPacks(OptionSet):
     Note: The [Just As Planned] DLC contains all [Muse Plus] songs.
     """
     display_name = "DLC Packs"
-    default = {}
     valid_keys = [dlc for dlc in MuseDashCollections.DLC]
 
 
@@ -142,7 +141,6 @@ class ChosenTraps(OptionSet):
     Note: SFX traps are only available if [Just as Planned] DLC songs are enabled.
     """
     display_name = "Chosen Traps"
-    default = {}
     valid_keys = {trap for trap in MuseDashCollections.trap_items.keys()}
 
 

From 7d0b701a2df01b93cf292c231d38c4753e6f0715 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Thu, 12 Dec 2024 06:54:03 -0500
Subject: [PATCH 161/381] TUNIC: Change rule for heir access in non-hex quest
 #4365

---
 worlds/tunic/er_rules.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index d5d6f16c57ec..786af0d617a8 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1079,7 +1079,7 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         connecting_region=regions["Spirit Arena Victory"],
         rule=lambda state: (state.has(gold_hexagon, player, world.options.hexagon_goal.value) if
                             world.options.hexagon_quest else
-                            (state.has_all({red_hexagon, green_hexagon, blue_hexagon, "Unseal the Heir"}, player)
+                            (state.has("Unseal the Heir", player)
                              and state.has_group_unique("Hero Relics", player, 6)
                              and has_sword(state, player))))
 
@@ -1447,6 +1447,9 @@ def set_er_location_rules(world: "TunicWorld") -> None:
              lambda state: has_ability(prayer, state, world))
     set_rule(world.get_location("Library Fuse"),
              lambda state: has_ability(prayer, state, world) and has_ladder("Ladders in Library", state, world))
+    if not world.options.hexagon_quest:
+        set_rule(world.get_location("Place Questagons"),
+                 lambda state: state.has_all((red_hexagon, blue_hexagon, green_hexagon), player))
 
     # Bombable Walls
     for location_name in bomb_walls:

From 3acbe9ece14ba792ea0c50bf3623e0e377cb18f3 Mon Sep 17 00:00:00 2001
From: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com>
Date: Thu, 12 Dec 2024 06:47:47 -0700
Subject: [PATCH 162/381] Castlevania: Circle of the Moon - Implement New Game
 (#3299)

* Add the cotm package with working seed playthrough generation.

* Add the proper event flag IDs for the Item codes.

* Oooops. Put the world completion condition in!

* Adjust the game name and abbreviations.

* Implement more settings.

* Account for too many start_inventory_from_pool cards with Halve DSS Cards Placed.

* Working (albeit very sloooooooooooow) ROM patching.

* Screw you, bsdiff! AP Procedure Patch for life!

* Nuke stage_assert_generate as the ROM is no longer needed for that.

* Working item writing and position adjusting.

* Fix the magic item graphics in Locations wherein they can be fixed.

* Enable sub-weapon shuffle

* Get the seed display working.

* Get the enemy item drop randomization working. Phew!

* Enemy drop rando and seed display fixes.

* Functional Countdown + Early Double setting

* Working multiworld (yay!)

* Fix item links and demo shenanigans.

* Add Wii U VC hash and a docs section explaining the rereleases.

* Change all client read/writes to EWRAM instead of Combined WRAM.

* Custom text insertion foundations.

* Working text converter and word wrap detector.

* More refinements to the text wrap system.

* Well and truly working sent/received messages.

* Add DeathLink and Battle Arena goal options.

* Add tracker stuff, unittests, all locations countdown, presets.

* Add to README, CODEOWNERS, and inno_setup

* Add to README, CODEOWNERS, and inno_setup

* Address some suggestions/problems.

* Switch the Items and Locations to using dataclasses.

* Add note about the alternate classes to the Game Page.

* Oooops, typo!

* Touch up the Options descriptions.

* Fix Battle Arena flag being detected incorrectly on connection and name the locked location/item pairs better.

* Implement option groups

* Swap the Lizard-man Locations into their correct Regions.

* Local start inventory, better DeathLink message handling, handle receiving over 255 of an item.

* Update the PopTracker pack links to no longer point to the Releases page.

* Add Skip Dialogues option.

* Update the presets for the accessibility rework.

* Swap the choices in the accessibility preset options.

* Uhhhhhhh...just see the apworld v4 changelog for this one.

* Ooops, typo!

* .

* Bunch of small stuff

* Correctly change "Fake" to "Breakable" in this comment.

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Make can_touch_water one line.

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Make broke_iron_maidens one line.

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Fix majors countdown and make can_open_ceremonial_door one line.

* Make the Trap AP Item less obvious.

* Add Progression + Useful stuff, patcher handling for incompatible versions, and fix some mypy stuff.

* Better option groups.

* Change Early Double to Early Escape Item.

* Update DeathLink description and ditch the Menu region.

* Fix the Start Broken choice for Iron Maiden Behavior

* Remove the forced option change with Arena goal + required All Bosses and Arena.

* Update the Game Page with the removal of the forced option combination change.

* Fix client potential to send packets nonstop.

* More review addressing.

* Fix the new select_drop code.

* Fix the new select_drop code for REAL this time.

* Send another LocationScout if we send Location checks without having the Location info.

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 README.md                                     |   1 +
 docs/CODEOWNERS                               |   3 +
 inno_setup.iss                                |   5 +
 worlds/cvcotm/LICENSES.txt                    | 248 ++++++
 worlds/cvcotm/NOTICE.txt                      |   4 +
 worlds/cvcotm/__init__.py                     | 221 +++++
 worlds/cvcotm/aesthetics.py                   | 761 ++++++++++++++++
 worlds/cvcotm/client.py                       | 563 ++++++++++++
 worlds/cvcotm/cvcotm_text.py                  | 178 ++++
 worlds/cvcotm/data/iname.py                   |  36 +
 worlds/cvcotm/data/ips/AllowAlwaysDrop.ips    | Bin 0 -> 67 bytes
 worlds/cvcotm/data/ips/AllowSpeedDash.ips     | Bin 0 -> 66 bytes
 worlds/cvcotm/data/ips/BrokenMaidens.ips      | Bin 0 -> 54 bytes
 worlds/cvcotm/data/ips/BuffFamiliars.ips      | Bin 0 -> 44 bytes
 worlds/cvcotm/data/ips/BuffSubweapons.ips     | Bin 0 -> 68 bytes
 worlds/cvcotm/data/ips/CandleFix.ips          | Bin 0 -> 20 bytes
 worlds/cvcotm/data/ips/CardCombosRevealed.ips | Bin 0 -> 17 bytes
 worlds/cvcotm/data/ips/CardUp_v3_Custom2.ips  | Bin 0 -> 348 bytes
 worlds/cvcotm/data/ips/Countdown.ips          | Bin 0 -> 240 bytes
 worlds/cvcotm/data/ips/DSSGlitchFix.ips       | Bin 0 -> 95 bytes
 worlds/cvcotm/data/ips/DSSRunSpeed.ips        | Bin 0 -> 18 bytes
 worlds/cvcotm/data/ips/DemoForceFirst.ips     | Bin 0 -> 15 bytes
 .../data/ips/DropReworkMultiEdition.ips       | Bin 0 -> 783 bytes
 worlds/cvcotm/data/ips/GameClearBypass.ips    | Bin 0 -> 29 bytes
 worlds/cvcotm/data/ips/MPComboFix.ips         | Bin 0 -> 15 bytes
 worlds/cvcotm/data/ips/MapEdits.ips           | Bin 0 -> 32 bytes
 worlds/cvcotm/data/ips/MultiLastKey.ips       | Bin 0 -> 191 bytes
 worlds/cvcotm/data/ips/NoDSSDrops.ips         | Bin 0 -> 232 bytes
 worlds/cvcotm/data/ips/NoMPDrain.ips          | Bin 0 -> 17 bytes
 worlds/cvcotm/data/ips/PermanentDash.ips      | Bin 0 -> 33 bytes
 .../cvcotm/data/ips/SeedDisplay20Digits.ips   | Bin 0 -> 110 bytes
 worlds/cvcotm/data/ips/ShooterStrength.ips    | Bin 0 -> 16 bytes
 worlds/cvcotm/data/ips/SoftlockBlockFix.ips   | Bin 0 -> 15 bytes
 worlds/cvcotm/data/lname.py                   | 128 +++
 worlds/cvcotm/data/patches.py                 | 431 ++++++++++
 .../en_Castlevania - Circle of the Moon.md    | 169 ++++
 worlds/cvcotm/docs/setup_en.md                |  72 ++
 worlds/cvcotm/items.py                        | 211 +++++
 worlds/cvcotm/locations.py                    | 265 ++++++
 worlds/cvcotm/lz10.py                         | 265 ++++++
 worlds/cvcotm/options.py                      | 282 ++++++
 worlds/cvcotm/presets.py                      | 190 ++++
 worlds/cvcotm/regions.py                      | 189 ++++
 worlds/cvcotm/rom.py                          | 600 +++++++++++++
 worlds/cvcotm/rules.py                        | 203 +++++
 worlds/cvcotm/test/__init__.py                |   5 +
 worlds/cvcotm/test/test_access.py             | 811 ++++++++++++++++++
 47 files changed, 5841 insertions(+)
 create mode 100644 worlds/cvcotm/LICENSES.txt
 create mode 100644 worlds/cvcotm/NOTICE.txt
 create mode 100644 worlds/cvcotm/__init__.py
 create mode 100644 worlds/cvcotm/aesthetics.py
 create mode 100644 worlds/cvcotm/client.py
 create mode 100644 worlds/cvcotm/cvcotm_text.py
 create mode 100644 worlds/cvcotm/data/iname.py
 create mode 100644 worlds/cvcotm/data/ips/AllowAlwaysDrop.ips
 create mode 100644 worlds/cvcotm/data/ips/AllowSpeedDash.ips
 create mode 100644 worlds/cvcotm/data/ips/BrokenMaidens.ips
 create mode 100644 worlds/cvcotm/data/ips/BuffFamiliars.ips
 create mode 100644 worlds/cvcotm/data/ips/BuffSubweapons.ips
 create mode 100644 worlds/cvcotm/data/ips/CandleFix.ips
 create mode 100644 worlds/cvcotm/data/ips/CardCombosRevealed.ips
 create mode 100644 worlds/cvcotm/data/ips/CardUp_v3_Custom2.ips
 create mode 100644 worlds/cvcotm/data/ips/Countdown.ips
 create mode 100644 worlds/cvcotm/data/ips/DSSGlitchFix.ips
 create mode 100644 worlds/cvcotm/data/ips/DSSRunSpeed.ips
 create mode 100644 worlds/cvcotm/data/ips/DemoForceFirst.ips
 create mode 100644 worlds/cvcotm/data/ips/DropReworkMultiEdition.ips
 create mode 100644 worlds/cvcotm/data/ips/GameClearBypass.ips
 create mode 100644 worlds/cvcotm/data/ips/MPComboFix.ips
 create mode 100644 worlds/cvcotm/data/ips/MapEdits.ips
 create mode 100644 worlds/cvcotm/data/ips/MultiLastKey.ips
 create mode 100644 worlds/cvcotm/data/ips/NoDSSDrops.ips
 create mode 100644 worlds/cvcotm/data/ips/NoMPDrain.ips
 create mode 100644 worlds/cvcotm/data/ips/PermanentDash.ips
 create mode 100644 worlds/cvcotm/data/ips/SeedDisplay20Digits.ips
 create mode 100644 worlds/cvcotm/data/ips/ShooterStrength.ips
 create mode 100644 worlds/cvcotm/data/ips/SoftlockBlockFix.ips
 create mode 100644 worlds/cvcotm/data/lname.py
 create mode 100644 worlds/cvcotm/data/patches.py
 create mode 100644 worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md
 create mode 100644 worlds/cvcotm/docs/setup_en.md
 create mode 100644 worlds/cvcotm/items.py
 create mode 100644 worlds/cvcotm/locations.py
 create mode 100644 worlds/cvcotm/lz10.py
 create mode 100644 worlds/cvcotm/options.py
 create mode 100644 worlds/cvcotm/presets.py
 create mode 100644 worlds/cvcotm/regions.py
 create mode 100644 worlds/cvcotm/rom.py
 create mode 100644 worlds/cvcotm/rules.py
 create mode 100644 worlds/cvcotm/test/__init__.py
 create mode 100644 worlds/cvcotm/test/test_access.py

diff --git a/README.md b/README.md
index 21a6faaa2698..36b7a07fb4b3 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ Currently, the following games are supported:
 * Yacht Dice
 * Faxanadu
 * Saving Princess
+* Castlevania: Circle of the Moon
 
 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 1aec57fc90f6..8b39f96068af 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -36,6 +36,9 @@
 # Castlevania 64
 /worlds/cv64/ @LiquidCat64
 
+# Castlevania: Circle of the Moon
+/worlds/cvcotm/ @LiquidCat64
+
 # Celeste 64
 /worlds/celeste64/ @PoryGone
 
diff --git a/inno_setup.iss b/inno_setup.iss
index 38e655d917c1..eb794650f3a6 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: ".apcvcotm";                                 ValueData: "{#MyAppName}cvcotmpatch";                               Flags: uninsdeletevalue; ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}cvcotmpatch";                     ValueData: "Archipelago Castlevania Circle of the Moon Patch";                    Flags: uninsdeletekey;   ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}cvcotmpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoBizHawkClient.exe,0";                                          ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}cvcotmpatch\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: "";
diff --git a/worlds/cvcotm/LICENSES.txt b/worlds/cvcotm/LICENSES.txt
new file mode 100644
index 000000000000..815e52d5f668
--- /dev/null
+++ b/worlds/cvcotm/LICENSES.txt
@@ -0,0 +1,248 @@
+
+Regarding the sprite data specifically for the Archipelago logo found in data > patches.py:
+
+The Archipelago Logo is © 2022 by Krista Corkos and Christopher Wilson and licensed under Attribution-NonCommercial 4.0
+International. Logo modified by Liquid Cat to fit artstyle and uses within this mod. To view a copy of this license,
+visit http://creativecommons.org/licenses/by-nc/4.0/
+
+The other custom sprites that I made, as long as you don't lie by claiming you were the one who drew them, I am fine
+with you using and distributing them however you want to. -Liquid Cat
+
+========================================================================================================================
+
+For the lz10.py and cvcotm_text.py modules specifically the MIT license applies. Its terms are as follows:
+
+MIT License
+
+cvcotm_text.py Copyright (c) 2024 Liquid Cat
+(Please consider the associated pixel data for the ASCII characters missing from CotM in data > patches.py
+in the public domain, if there was any thought that that could even be copyrighted. -Liquid Cat)
+
+lz10.py Copyright (c) 2024 lilDavid, NoiseCrush
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+========================================================================================================================
+
+Everything else in this world package not mentioned above can be assumed covered by standalone CotMR's Apache license
+being a piece of a direct derivative of it. The terms are as follows:
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021-2024 DevAnj, fusecavator, spooky, Malaert64
+
+   Archipelago version by Liquid Cat
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/worlds/cvcotm/NOTICE.txt b/worlds/cvcotm/NOTICE.txt
new file mode 100644
index 000000000000..7a6f4d10ff5c
--- /dev/null
+++ b/worlds/cvcotm/NOTICE.txt
@@ -0,0 +1,4 @@
+Circle of the Moon Randomizer
+Copyright 2021-2024 DevAnj, fusecavator, spooky, Malaert64
+
+Archipelago version by Liquid Cat
\ No newline at end of file
diff --git a/worlds/cvcotm/__init__.py b/worlds/cvcotm/__init__.py
new file mode 100644
index 000000000000..4466ed79bdd2
--- /dev/null
+++ b/worlds/cvcotm/__init__.py
@@ -0,0 +1,221 @@
+import os
+import typing
+import settings
+import base64
+import logging
+
+from BaseClasses import Item, Region, Tutorial, ItemClassification
+from .items import CVCotMItem, FILLER_ITEM_NAMES, ACTION_CARDS, ATTRIBUTE_CARDS, cvcotm_item_info, \
+    get_item_names_to_ids, get_item_counts
+from .locations import CVCotMLocation, get_location_names_to_ids, BASE_ID, get_named_locations_data, \
+    get_location_name_groups
+from .options import cvcotm_option_groups, CVCotMOptions, SubWeaponShuffle, IronMaidenBehavior, RequiredSkirmishes, \
+    CompletionGoal, EarlyEscapeItem
+from .regions import get_region_info, get_all_region_names
+from .rules import CVCotMRules
+from .data import iname, lname
+from .presets import cvcotm_options_presets
+from worlds.AutoWorld import WebWorld, World
+
+from .aesthetics import shuffle_sub_weapons, get_location_data, get_countdown_flags, populate_enemy_drops, \
+    get_start_inventory_data
+from .rom import RomData, patch_rom, get_base_rom_path, CVCotMProcedurePatch, CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, \
+    CVCOTM_VC_US_HASH
+from .client import CastlevaniaCotMClient
+
+
+class CVCotMSettings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """File name of the Castlevania CotM US rom"""
+        copy_to = "Castlevania - Circle of the Moon (USA).gba"
+        description = "Castlevania CotM (US) ROM File"
+        md5s = [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
+class CVCotMWeb(WebWorld):
+    theme = "stone"
+    options_presets = cvcotm_options_presets
+
+    tutorials = [Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up the Archipleago Castlevania: Circle of the Moon randomizer on your computer and "
+        "connecting it to a multiworld.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Liquid Cat"]
+    )]
+
+    option_groups = cvcotm_option_groups
+
+
+class CVCotMWorld(World):
+    """
+    Castlevania: Circle of the Moon is a launch title for the Game Boy Advance and the first of three Castlevania games
+    released for the handheld in the "Metroidvania" format. As Nathan Graves, wielding the Hunter Whip and utilizing the
+    Dual Set-Up System for new possibilities, you must battle your way through Camilla's castle and rescue your master
+    from a demonic ritual to restore the Count's power...
+    """
+    game = "Castlevania - Circle of the Moon"
+    item_name_groups = {
+        "DSS": ACTION_CARDS.union(ATTRIBUTE_CARDS),
+        "Card": ACTION_CARDS.union(ATTRIBUTE_CARDS),
+        "Action": ACTION_CARDS,
+        "Action Card": ACTION_CARDS,
+        "Attribute": ATTRIBUTE_CARDS,
+        "Attribute Card": ATTRIBUTE_CARDS,
+        "Freeze": {iname.serpent, iname.cockatrice, iname.mercury, iname.mars},
+        "Freeze Action": {iname.mercury, iname.mars},
+        "Freeze Attribute": {iname.serpent, iname.cockatrice}
+    }
+    location_name_groups = get_location_name_groups()
+    options_dataclass = CVCotMOptions
+    options: CVCotMOptions
+    settings: typing.ClassVar[CVCotMSettings]
+    origin_region_name = "Catacomb"
+    hint_blacklist = frozenset({lname.ba24})  # The Battle Arena reward, if it's put in, will always be a Last Key.
+
+    item_name_to_id = {name: cvcotm_item_info[name].code + BASE_ID for name in cvcotm_item_info
+                       if cvcotm_item_info[name].code is not None}
+    location_name_to_id = get_location_names_to_ids()
+
+    # Default values to possibly be updated in generate_early
+    total_last_keys: int = 0
+    required_last_keys: int = 0
+
+    auth: bytearray
+
+    web = CVCotMWeb()
+
+    def generate_early(self) -> None:
+        # Generate the player's unique authentication
+        self.auth = bytearray(self.random.getrandbits(8) for _ in range(16))
+
+        # If Required Skirmishes are on, force the Required and Available Last Keys to 8 or 9 depending on which option
+        # was chosen.
+        if self.options.required_skirmishes == RequiredSkirmishes.option_all_bosses:
+            self.options.required_last_keys.value = 8
+            self.options.available_last_keys.value = 8
+        elif self.options.required_skirmishes == RequiredSkirmishes.option_all_bosses_and_arena:
+            self.options.required_last_keys.value = 9
+            self.options.available_last_keys.value = 9
+
+        self.total_last_keys = self.options.available_last_keys.value
+        self.required_last_keys = self.options.required_last_keys.value
+
+        # If there are more Last Keys required than there are Last Keys in total, drop the required Last Keys to
+        # the total Last Keys.
+        if self.required_last_keys > self.total_last_keys:
+            self.required_last_keys = self.total_last_keys
+            logging.warning(f"[{self.player_name}] The Required Last Keys "
+                            f"({self.options.required_last_keys.value}) is higher than the Available Last Keys "
+                            f"({self.options.available_last_keys.value}). Lowering the required number to: "
+                            f"{self.required_last_keys}")
+            self.options.required_last_keys.value = self.required_last_keys
+
+        # Place the Double or Roc Wing in local_early_items if the Early Escape option is being used.
+        if self.options.early_escape_item == EarlyEscapeItem.option_double:
+            self.multiworld.local_early_items[self.player][iname.double] = 1
+        elif self.options.early_escape_item == EarlyEscapeItem.option_roc_wing:
+            self.multiworld.local_early_items[self.player][iname.roc_wing] = 1
+        elif self.options.early_escape_item == EarlyEscapeItem.option_double_or_roc_wing:
+            self.multiworld.local_early_items[self.player][self.random.choice([iname.double, iname.roc_wing])] = 1
+
+    def create_regions(self) -> None:
+        # Create every Region object.
+        created_regions = [Region(name, self.player, self.multiworld) for name in get_all_region_names()]
+
+        # Attach the Regions to the Multiworld.
+        self.multiworld.regions.extend(created_regions)
+
+        for reg in created_regions:
+
+            # Add the Entrances to all the Regions.
+            ent_destinations_and_names = get_region_info(reg.name, "entrances")
+            if ent_destinations_and_names is not None:
+                reg.add_exits(ent_destinations_and_names)
+
+            # Add the Locations to all the Regions.
+            loc_names = get_region_info(reg.name, "locations")
+            if loc_names is None:
+                continue
+            locations_with_ids, locked_pairs = get_named_locations_data(loc_names, self.options)
+            reg.add_locations(locations_with_ids, CVCotMLocation)
+
+            # Place locked Items on all of their associated Locations.
+            for locked_loc, locked_item in locked_pairs.items():
+                self.get_location(locked_loc).place_locked_item(self.create_item(locked_item,
+                                                                                 ItemClassification.progression))
+
+    def create_item(self, name: str, force_classification: typing.Optional[ItemClassification] = None) -> Item:
+        if force_classification is not None:
+            classification = force_classification
+        else:
+            classification = cvcotm_item_info[name].default_classification
+
+        code = cvcotm_item_info[name].code
+        if code is not None:
+            code += BASE_ID
+
+        created_item = CVCotMItem(name, classification, code, self.player)
+
+        return created_item
+
+    def create_items(self) -> None:
+        item_counts = get_item_counts(self)
+
+        # Set up the items correctly
+        self.multiworld.itempool += [self.create_item(item, classification) for classification in item_counts for item
+                                     in item_counts[classification] for _ in range(item_counts[classification][item])]
+
+    def set_rules(self) -> None:
+        # Set all the Entrance and Location rules properly.
+        CVCotMRules(self).set_cvcotm_rules()
+
+    def generate_output(self, output_directory: str) -> None:
+        # Get out all the Locations that are not Events. Only take the Iron Maiden switch if the Maiden Detonator is in
+        # the item pool.
+        active_locations = [loc for loc in self.multiworld.get_locations(self.player) if loc.address is not None and
+                            (loc.name != lname.ct21 or self.options.iron_maiden_behavior ==
+                             IronMaidenBehavior.option_detonator_in_pool)]
+
+        # Location data
+        offset_data = get_location_data(self, active_locations)
+        # Sub-weapons
+        if self.options.sub_weapon_shuffle:
+            offset_data.update(shuffle_sub_weapons(self))
+        # Item drop randomization
+        if self.options.item_drop_randomization:
+            offset_data.update(populate_enemy_drops(self))
+        # Countdown
+        if self.options.countdown:
+            offset_data.update(get_countdown_flags(self, active_locations))
+        # Start Inventory
+        start_inventory_data = get_start_inventory_data(self)
+        offset_data.update(start_inventory_data[0])
+
+        patch = CVCotMProcedurePatch(player=self.player, player_name=self.player_name)
+        patch_rom(self, patch, offset_data, start_inventory_data[1])
+
+        rom_path = os.path.join(output_directory, f"{self.multiworld.get_out_file_name_base(self.player)}"
+                                                  f"{patch.patch_file_ending}")
+
+        patch.write(rom_path)
+
+    def fill_slot_data(self) -> dict:
+        return {"death_link": self.options.death_link.value,
+                "iron_maiden_behavior": self.options.iron_maiden_behavior.value,
+                "ignore_cleansing": self.options.ignore_cleansing.value,
+                "skip_tutorials": self.options.skip_tutorials.value,
+                "required_last_keys": self.required_last_keys,
+                "completion_goal": self.options.completion_goal.value}
+
+    def get_filler_item_name(self) -> str:
+        return self.random.choice(FILLER_ITEM_NAMES)
+
+    def modify_multidata(self, multidata: typing.Dict[str, typing.Any]):
+        # Put the player's unique authentication in connect_names.
+        multidata["connect_names"][base64.b64encode(self.auth).decode("ascii")] = \
+            multidata["connect_names"][self.player_name]
diff --git a/worlds/cvcotm/aesthetics.py b/worlds/cvcotm/aesthetics.py
new file mode 100644
index 000000000000..d1668b1db18d
--- /dev/null
+++ b/worlds/cvcotm/aesthetics.py
@@ -0,0 +1,761 @@
+from BaseClasses import ItemClassification, Location
+from .options import ItemDropRandomization, Countdown, RequiredSkirmishes, IronMaidenBehavior
+from .locations import cvcotm_location_info
+from .items import cvcotm_item_info, MAJORS_CLASSIFICATIONS
+from .data import iname
+
+from typing import TYPE_CHECKING, Dict, List, Iterable, Tuple, NamedTuple, Optional, TypedDict
+
+if TYPE_CHECKING:
+    from . import CVCotMWorld
+
+
+class StatInfo(TypedDict):
+    # Amount this stat increases per Max Up the player starts with.
+    amount_per: int
+    # The most amount of this stat the player is allowed to start with. Problems arise if the stat  exceeds 9999, so we
+    # must ensure it can't if the player raises any class to level 99 as well as collects 255 of that max up. The game
+    # caps hearts at 999 automatically, so it doesn't matter so much for that one.
+    max_allowed: int
+    # The key variable in extra_stats that the stat max up affects.
+    variable: str
+
+
+extra_starting_stat_info: Dict[str, StatInfo] = {
+    iname.hp_max: {"amount_per": 10,
+                   "max_allowed": 5289,
+                   "variable": "extra health"},
+    iname.mp_max: {"amount_per": 10,
+                   "max_allowed": 3129,
+                   "variable": "extra magic"},
+    iname.heart_max: {"amount_per": 6,
+                      "max_allowed": 999,
+                      "variable": "extra hearts"},
+}
+
+other_player_subtype_bytes = {
+    0xE4: 0x03,
+    0xE6: 0x14,
+    0xE8: 0x0A
+}
+
+
+class OtherGameAppearancesInfo(TypedDict):
+    # What type of item to place for the other player.
+    type: int
+    # What item to display it as for the other player.
+    appearance: int
+
+
+other_game_item_appearances: Dict[str, Dict[str, OtherGameAppearancesInfo]] = {
+    # NOTE: Symphony of the Night is currently an unsupported world not in main.
+    "Symphony of the Night": {"Life Vessel": {"type": 0xE4,
+                                              "appearance": 0x01},
+                              "Heart Vessel": {"type": 0xE4,
+                                               "appearance": 0x00}},
+    "Timespinner": {"Max HP": {"type": 0xE4,
+                               "appearance": 0x01},
+                    "Max Aura": {"type": 0xE4,
+                                 "appearance": 0x02},
+                    "Max Sand": {"type": 0xE8,
+                                 "appearance": 0x0F}}
+}
+
+# 0 = Holy water  22
+# 1 = Axe         24
+# 2 = Knife       32
+# 3 = Cross        6
+# 4 = Stopwatch   12
+# 5 = Small heart
+# 6 = Big heart
+rom_sub_weapon_offsets = {
+    0xD034E: b"\x01",
+    0xD0462: b"\x02",
+    0xD064E: b"\x00",
+    0xD06F6: b"\x02",
+    0xD0882: b"\x00",
+    0xD0912: b"\x02",
+    0xD0C2A: b"\x02",
+    0xD0C96: b"\x01",
+    0xD0D92: b"\x02",
+    0xD0DCE: b"\x01",
+    0xD1332: b"\x00",
+    0xD13AA: b"\x01",
+    0xD1722: b"\x02",
+    0xD17A6: b"\x01",
+    0xD1926: b"\x01",
+    0xD19AA: b"\x02",
+    0xD1A9A: b"\x02",
+    0xD1AA6: b"\x00",
+    0xD1EBA: b"\x00",
+    0xD1ED2: b"\x01",
+    0xD2262: b"\x02",
+    0xD23B2: b"\x03",
+    0xD256E: b"\x02",
+    0xD2742: b"\x02",
+    0xD2832: b"\x04",
+    0xD2862: b"\x01",
+    0xD2A2A: b"\x01",
+    0xD2DBA: b"\x04",
+    0xD2DC6: b"\x00",
+    0xD2E02: b"\x02",
+    0xD2EFE: b"\x04",
+    0xD2F0A: b"\x02",
+    0xD302A: b"\x00",
+    0xD3042: b"\x01",
+    0xD304E: b"\x04",
+    0xD3066: b"\x02",
+    0xD322E: b"\x04",
+    0xD334E: b"\x04",
+    0xD3516: b"\x03",
+    0xD35CA: b"\x02",
+    0xD371A: b"\x01",
+    0xD38EE: b"\x00",
+    0xD3BE2: b"\x02",
+    0xD3D1A: b"\x01",
+    0xD3D56: b"\x02",
+    0xD3ECA: b"\x00",
+    0xD3EE2: b"\x02",
+    0xD4056: b"\x01",
+    0xD40E6: b"\x04",
+    0xD413A: b"\x04",
+    0xD4326: b"\x00",
+    0xD460E: b"\x00",
+    0xD48D2: b"\x00",
+    0xD49E6: b"\x01",
+    0xD4ABE: b"\x02",
+    0xD4B8A: b"\x01",
+    0xD4D0A: b"\x04",
+    0xD4EAE: b"\x02",
+    0xD4F0E: b"\x00",
+    0xD4F92: b"\x02",
+    0xD4FB6: b"\x01",
+    0xD503A: b"\x03",
+    0xD5646: b"\x01",
+    0xD5682: b"\x02",
+    0xD57C6: b"\x02",
+    0xD57D2: b"\x02",
+    0xD58F2: b"\x00",
+    0xD5922: b"\x01",
+    0xD5B9E: b"\x02",
+    0xD5E26: b"\x01",
+    0xD5E56: b"\x02",
+    0xD5E7A: b"\x02",
+    0xD5F5E: b"\x00",
+    0xD69EA: b"\x02",
+    0xD69F6: b"\x01",
+    0xD6A02: b"\x00",
+    0xD6A0E: b"\x04",
+    0xD6A1A: b"\x03",
+    0xD6BE2: b"\x00",
+    0xD6CBA: b"\x01",
+    0xD6CDE: b"\x02",
+    0xD6EEE: b"\x00",
+    0xD6F1E: b"\x02",
+    0xD6F42: b"\x01",
+    0xD6FC6: b"\x04",
+    0xD706E: b"\x00",
+    0xD716A: b"\x02",
+    0xD72AE: b"\x01",
+    0xD75BA: b"\x03",
+    0xD76AA: b"\x04",
+    0xD76B6: b"\x00",
+    0xD76C2: b"\x01",
+    0xD76CE: b"\x02",
+    0xD76DA: b"\x03",
+    0xD7D46: b"\x00",
+    0xD7D52: b"\x00",
+}
+
+LOW_ITEMS = [
+    41,  # Potion
+    42,  # Meat
+    48,  # Mind Restore
+    51,  # Heart
+    46,  # Antidote
+    47,  # Cure Curse
+
+    17,  # Cotton Clothes
+    18,  # Prison Garb
+    12,  # Cotton Robe
+    1,  # Leather Armor
+    2,  # Bronze Armor
+    3,  # Gold Armor
+
+    39,  # Toy Ring
+    40,  # Bear Ring
+    34,  # Wristband
+    36,  # Arm Guard
+    37,  # Magic Gauntlet
+    38,  # Miracle Armband
+    35,  # Gauntlet
+]
+
+MID_ITEMS = [
+    43,  # Spiced Meat
+    49,  # Mind High
+    52,  # Heart High
+
+    19,  # Stylish Suit
+    20,  # Night Suit
+    13,  # Silk Robe
+    14,  # Rainbow Robe
+    4,  # Chainmail
+    5,  # Steel Armor
+    6,  # Platinum Armor
+
+    24,  # Star Bracelet
+    29,  # Cursed Ring
+    25,  # Strength Ring
+    26,  # Hard Ring
+    27,  # Intelligence Ring
+    28,  # Luck Ring
+    23,  # Double Grips
+]
+
+HIGH_ITEMS = [
+    44,  # Potion High
+    45,  # Potion Ex
+    50,  # Mind Ex
+    53,  # Heart Ex
+    54,  # Heart Mega
+
+    21,  # Ninja Garb
+    22,  # Soldier Fatigues
+    15,  # Magic Robe
+    16,  # Sage Robe
+
+    7,  # Diamond Armor
+    8,  # Mirror Armor
+    9,  # Needle Armor
+    10,  # Dark Armor
+
+    30,  # Strength Armband
+    31,  # Defense Armband
+    32,  # Sage Armband
+    33,  # Gambler Armband
+]
+
+COMMON_ITEMS = LOW_ITEMS + MID_ITEMS
+
+RARE_ITEMS = LOW_ITEMS + MID_ITEMS + HIGH_ITEMS
+
+
+class CVCotMEnemyData(NamedTuple):
+    name: str
+    hp: int
+    attack: int
+    defense: int
+    exp: int
+    type: Optional[str] = None
+
+
+cvcotm_enemy_info: List[CVCotMEnemyData] = [
+    #                Name                  HP   ATK   DEF     EXP
+    CVCotMEnemyData("Medusa Head",          6,  120,   60,      2),
+    CVCotMEnemyData("Zombie",              48,   70,   20,      2),
+    CVCotMEnemyData("Ghoul",              100,  190,   79,      3),
+    CVCotMEnemyData("Wight",              110,  235,   87,      4),
+    CVCotMEnemyData("Clinking Man",        80,  135,   25,     21),
+    CVCotMEnemyData("Zombie Thief",       120,  185,   30,     58),
+    CVCotMEnemyData("Skeleton",            25,   65,   45,      4),
+    CVCotMEnemyData("Skeleton Bomber",     20,   50,   40,      4),
+    CVCotMEnemyData("Electric Skeleton",   42,   80,   50,     30),
+    CVCotMEnemyData("Skeleton Spear",      30,   65,   46,      6),
+    CVCotMEnemyData("Skeleton Boomerang",  60,  170,   90,    112),
+    CVCotMEnemyData("Skeleton Soldier",    35,   90,   60,     16),
+    CVCotMEnemyData("Skeleton Knight",     50,  140,   80,     39),
+    CVCotMEnemyData("Bone Tower",          84,  201,  280,    160),
+    CVCotMEnemyData("Fleaman",             60,  142,   45,     29),
+    CVCotMEnemyData("Poltergeist",        105,  360,  380,    510),
+    CVCotMEnemyData("Bat",                  5,   50,   15,      4),
+    CVCotMEnemyData("Spirit",               9,   55,   17,      1),
+    CVCotMEnemyData("Ectoplasm",           12,  165,   51,      2),
+    CVCotMEnemyData("Specter",             15,  295,   95,      3),
+    CVCotMEnemyData("Axe Armor",           55,  120,  130,     31),
+    CVCotMEnemyData("Flame Armor",        160,  320,  300,    280),
+    CVCotMEnemyData("Flame Demon",        300,  315,  270,    600),
+    CVCotMEnemyData("Ice Armor",          240,  470,  520,   1500),
+    CVCotMEnemyData("Thunder Armor",      204,  340,  320,    800),
+    CVCotMEnemyData("Wind Armor",         320,  500,  460,   1800),
+    CVCotMEnemyData("Earth Armor",        130,  230,  280,    240),
+    CVCotMEnemyData("Poison Armor",       260,  382,  310,    822),
+    CVCotMEnemyData("Forest Armor",       370,  390,  390,   1280),
+    CVCotMEnemyData("Stone Armor",         90,  220,  320,    222),
+    CVCotMEnemyData("Ice Demon",          350,  492,  510,   4200),
+    CVCotMEnemyData("Holy Armor",         350,  420,  450,   1700),
+    CVCotMEnemyData("Thunder Demon",      180,  270,  230,    450),
+    CVCotMEnemyData("Dark Armor",         400,  680,  560,   3300),
+    CVCotMEnemyData("Wind Demon",         400,  540,  490,   3600),
+    CVCotMEnemyData("Bloody Sword",        30,  220,  500,    200),
+    CVCotMEnemyData("Golem",              650,  520,  700,   1400),
+    CVCotMEnemyData("Earth Demon",        150,   90,   85,     25),
+    CVCotMEnemyData("Were-wolf",          160,  265,  110,    140),
+    CVCotMEnemyData("Man Eater",          400,  330,  233,    700),
+    CVCotMEnemyData("Devil Tower",         10,  140,  200,     17),
+    CVCotMEnemyData("Skeleton Athlete",   100,  100,   50,     25),
+    CVCotMEnemyData("Harpy",              120,  275,  200,    271),
+    CVCotMEnemyData("Siren",              160,  443,  300,    880),
+    CVCotMEnemyData("Imp",                 90,  220,   99,    103),
+    CVCotMEnemyData("Mudman",              25,   79,   30,      2),
+    CVCotMEnemyData("Gargoyle",            60,  160,   66,      3),
+    CVCotMEnemyData("Slime",               40,  102,   18,     11),
+    CVCotMEnemyData("Frozen Shade",       112,  490,  560,   1212),
+    CVCotMEnemyData("Heat Shade",          80,  240,  200,    136),
+    CVCotMEnemyData("Poison Worm",        120,   30,   20,     12),
+    CVCotMEnemyData("Myconid",             50,  250,  114,     25),
+    CVCotMEnemyData("Will O'Wisp",         11,  110,   16,      9),
+    CVCotMEnemyData("Spearfish",           40,  360,  450,    280),
+    CVCotMEnemyData("Merman",              60,  303,  301,     10),
+    CVCotMEnemyData("Minotaur",           410,  520,  640,   2000),
+    CVCotMEnemyData("Were-horse",         400,  540,  360,   1970),
+    CVCotMEnemyData("Marionette",          80,  160,  150,    127),
+    CVCotMEnemyData("Gremlin",             30,   80,   33,      2),
+    CVCotMEnemyData("Hopper",              40,   87,   35,      8),
+    CVCotMEnemyData("Evil Pillar",         20,  460,  800,    480),
+    CVCotMEnemyData("Were-panther",       200,  300,  130,    270),
+    CVCotMEnemyData("Were-jaguar",        270,  416,  170,    760),
+    CVCotMEnemyData("Bone Head",           24,   60,   80,      7),
+    CVCotMEnemyData("Fox Archer",          75,  130,   59,     53),
+    CVCotMEnemyData("Fox Hunter",         100,  290,  140,    272),
+    CVCotMEnemyData("Were-bear",          265,  250,  140,    227),
+    CVCotMEnemyData("Grizzly",            600,  380,  200,    960),
+    CVCotMEnemyData("Cerberus",           600,  150,  100,    500, "boss"),
+    CVCotMEnemyData("Beast Demon",        150,  330,  250,    260),
+    CVCotMEnemyData("Arch Demon",         320,  505,  400,   1000),
+    CVCotMEnemyData("Demon Lord",         460,  660,  500,   1950),
+    CVCotMEnemyData("Gorgon",             230,  215,  165,    219),
+    CVCotMEnemyData("Catoblepas",         550,  500,  430,   1800),
+    CVCotMEnemyData("Succubus",           150,  400,  350,    710),
+    CVCotMEnemyData("Fallen Angel",       370,  770,  770,   6000),
+    CVCotMEnemyData("Necromancer",        500,  200,  250,   2500, "boss"),
+    CVCotMEnemyData("Hyena",               93,  140,   70,    105),
+    CVCotMEnemyData("Fishhead",            80,  320,  504,    486),
+    CVCotMEnemyData("Dryad",              120,  300,  360,    300),
+    CVCotMEnemyData("Mimic Candle",       990,  600,  600,   6600, "candle"),
+    CVCotMEnemyData("Brain Float",         20,   50,   25,     10),
+    CVCotMEnemyData("Evil Hand",           52,  150,  120,     63),
+    CVCotMEnemyData("Abiondarg",           88,  388,  188,    388),
+    CVCotMEnemyData("Iron Golem",         640,  290,  450,   8000, "boss"),
+    CVCotMEnemyData("Devil",             1080,  800,  900,  10000),
+    CVCotMEnemyData("Witch",              144,  330,  290,    600),
+    CVCotMEnemyData("Mummy",              100,  100,   35,      3),
+    CVCotMEnemyData("Hipogriff",          300,  500,  210,    740),
+    CVCotMEnemyData("Adramelech",        1800,  380,  360,  16000, "boss"),
+    CVCotMEnemyData("Arachne",            330,  420,  288,   1300),
+    CVCotMEnemyData("Death Mantis",       200,  318,  240,    400),
+    CVCotMEnemyData("Alraune",            774,  490,  303,   2500),
+    CVCotMEnemyData("King Moth",          140,  290,  160,    150),
+    CVCotMEnemyData("Killer Bee",           8,  308,  108,     88),
+    CVCotMEnemyData("Dragon Zombie",     1400,  390,  440,  15000, "boss"),
+    CVCotMEnemyData("Lizardman",          100,  345,  400,    800),
+    CVCotMEnemyData("Franken",           1200,  700,  350,   2100),
+    CVCotMEnemyData("Legion",             420,  610,  375,   1590),
+    CVCotMEnemyData("Dullahan",           240,  550,  440,   2200),
+    CVCotMEnemyData("Death",              880,  600,  800,  60000, "boss"),
+    CVCotMEnemyData("Camilla",           1500,  650,  700,  80000, "boss"),
+    CVCotMEnemyData("Hugh",              1400,  570,  750, 120000, "boss"),
+    CVCotMEnemyData("Dracula",           1100,  805,  850, 150000, "boss"),
+    CVCotMEnemyData("Dracula",           3000, 1000, 1000,      0, "final boss"),
+    CVCotMEnemyData("Skeleton Medalist",  250,  100,  100,   1500),
+    CVCotMEnemyData("Were-jaguar",        320,  518,  260,   1200, "battle arena"),
+    CVCotMEnemyData("Were-wolf",          340,  525,  180,   1100, "battle arena"),
+    CVCotMEnemyData("Catoblepas",         560,  510,  435,   2000, "battle arena"),
+    CVCotMEnemyData("Hipogriff",          500,  620,  280,   1900, "battle arena"),
+    CVCotMEnemyData("Wind Demon",         490,  600,  540,   4000, "battle arena"),
+    CVCotMEnemyData("Witch",              210,  480,  340,   1000, "battle arena"),
+    CVCotMEnemyData("Stone Armor",        260,  585,  750,   3000, "battle arena"),
+    CVCotMEnemyData("Devil Tower",         50,  560,  700,    600, "battle arena"),
+    CVCotMEnemyData("Skeleton",           150,  400,  200,    500, "battle arena"),
+    CVCotMEnemyData("Skeleton Bomber",    150,  400,  200,    550, "battle arena"),
+    CVCotMEnemyData("Electric Skeleton",  150,  400,  200,    700, "battle arena"),
+    CVCotMEnemyData("Skeleton Spear",     150,  400,  200,    580, "battle arena"),
+    CVCotMEnemyData("Flame Demon",        680,  650,  600,   4500, "battle arena"),
+    CVCotMEnemyData("Bone Tower",         120,  500,  650,    800, "battle arena"),
+    CVCotMEnemyData("Fox Hunter",         160,  510,  220,    600, "battle arena"),
+    CVCotMEnemyData("Poison Armor",       380,  680,  634,   3600, "battle arena"),
+    CVCotMEnemyData("Bloody Sword",        55,  600, 1200,   2000, "battle arena"),
+    CVCotMEnemyData("Abiondarg",          188,  588,  288,    588, "battle arena"),
+    CVCotMEnemyData("Legion",             540,  760,  480,   2900, "battle arena"),
+    CVCotMEnemyData("Marionette",         200,  420,  400,   1200, "battle arena"),
+    CVCotMEnemyData("Minotaur",           580,  700,  715,   4100, "battle arena"),
+    CVCotMEnemyData("Arachne",            430,  590,  348,   2400, "battle arena"),
+    CVCotMEnemyData("Succubus",           300,  670,  630,   3100, "battle arena"),
+    CVCotMEnemyData("Demon Lord",         590,  800,  656,   4200, "battle arena"),
+    CVCotMEnemyData("Alraune",           1003,  640,  450,   5000, "battle arena"),
+    CVCotMEnemyData("Hyena",              210,  408,  170,   1000, "battle arena"),
+    CVCotMEnemyData("Devil Armor",        500,  804,  714,   6600),
+    CVCotMEnemyData("Evil Pillar",         55,  655,  900,   1500, "battle arena"),
+    CVCotMEnemyData("White Armor",        640,  770,  807,   7000),
+    CVCotMEnemyData("Devil",             1530,  980, 1060,  30000, "battle arena"),
+    CVCotMEnemyData("Scary Candle",       150,  300,  300,    900, "candle"),
+    CVCotMEnemyData("Trick Candle",       200,  400,  400,   1400, "candle"),
+    CVCotMEnemyData("Nightmare",          250,  550,  550,   2000),
+    CVCotMEnemyData("Lilim",              400,  800,  800,   8000),
+    CVCotMEnemyData("Lilith",             660,  960,  960,  20000),
+]
+# NOTE: Coffin is omitted from the end of this, as its presence doesn't
+# actually impact the randomizer (all stats and drops inherited from Mummy).
+
+BOSS_IDS = [enemy_id for enemy_id in range(len(cvcotm_enemy_info)) if cvcotm_enemy_info[enemy_id].type == "boss"]
+
+ENEMY_TABLE_START = 0xCB2C4
+
+NUMBER_ITEMS = 55
+
+COUNTDOWN_TABLE_ADDR = 0x673400
+ITEM_ID_SHINNING_ARMOR = 11
+
+
+def shuffle_sub_weapons(world: "CVCotMWorld") -> Dict[int, bytes]:
+    """Shuffles the sub-weapons amongst themselves."""
+    sub_bytes = list(rom_sub_weapon_offsets.values())
+    world.random.shuffle(sub_bytes)
+    return dict(zip(rom_sub_weapon_offsets, sub_bytes))
+
+
+def get_countdown_flags(world: "CVCotMWorld", active_locations: Iterable[Location]) -> Dict[int, bytes]:
+    """Figures out which Countdown numbers to increase for each Location after verifying the Item on the Location should
+    count towards a number.
+
+    Which number to increase is determined by the Location's "countdown" attr in its CVCotMLocationData."""
+
+    next_pos = COUNTDOWN_TABLE_ADDR + 0x40
+    countdown_flags: List[List[int]] = [[] for _ in range(16)]
+    countdown_dict = {}
+    ptr_offset = COUNTDOWN_TABLE_ADDR
+
+    # Loop over every Location.
+    for loc in active_locations:
+        # If the Location's Item is not Progression/Useful-classified with the "Majors" Countdown being used, or if the
+        # Location is the Iron Maiden switch with the vanilla Iron Maiden behavior, skip adding its flag to the arrays.
+        if (not loc.item.classification & MAJORS_CLASSIFICATIONS and world.options.countdown ==
+                Countdown.option_majors):
+            continue
+
+        countdown_index = cvcotm_location_info[loc.name].countdown
+        # Take the Location's address if the above condition is satisfied, and get the flag value out of it.
+        countdown_flags[countdown_index] += [loc.address & 0xFF, 0]
+
+    # Write the Countdown flag arrays and array pointers correctly. Each flag list should end with a 0xFFFF to indicate
+    # the end of an area's list.
+    for area_flags in countdown_flags:
+        countdown_dict[ptr_offset] = int.to_bytes(next_pos | 0x08000000, 4, "little")
+        countdown_dict[next_pos] = bytes(area_flags + [0xFF, 0xFF])
+        ptr_offset += 4
+        next_pos += len(area_flags) + 2
+
+    return countdown_dict
+
+
+def get_location_data(world: "CVCotMWorld", active_locations: Iterable[Location]) -> Dict[int, bytes]:
+    """Gets ALL the Item data to go into the ROM. Items consist of four bytes; the first two represent the object ID
+    for the "category" of item that it belongs to, the third is the sub-value for which item within that "category" it
+    is, and the fourth controls the appearance it takes."""
+
+    location_bytes = {}
+
+    for loc in active_locations:
+        # Figure out the item ID bytes to put in each Location's offset here.
+        # If it's a CotM Item, always write the Item's primary type byte.
+        if loc.item.game == "Castlevania - Circle of the Moon":
+            type_byte = cvcotm_item_info[loc.item.name].code >> 8
+
+            # If the Item is for this player, set the subtype to actually be that Item.
+            # Otherwise, set a dummy subtype value that is different for every item type.
+            if loc.item.player == world.player:
+                subtype_byte = cvcotm_item_info[loc.item.name].code & 0xFF
+            else:
+                subtype_byte = other_player_subtype_bytes[type_byte]
+
+            # If it's a DSS Card, set the appearance based on whether it's progression or not; freeze combo cards should
+            # all appear blue in color while the others are standard purple/yellow. Otherwise, set the appearance the
+            # same way as the subtype for local items regardless of whether it's actually local or not.
+            if type_byte == 0xE6:
+                if loc.item.advancement:
+                    appearance_byte = 1
+                else:
+                    appearance_byte = 0
+            else:
+                appearance_byte = cvcotm_item_info[loc.item.name].code & 0xFF
+
+        # If it's not a CotM Item at all, always set the primary type to that of a Magic Item and the subtype to that of
+        # a dummy item. The AP Items are all under Magic Items.
+        else:
+            type_byte = 0xE8
+            subtype_byte = 0x0A
+            # Decide which AP Item to use to represent the other game item.
+            if loc.item.classification & ItemClassification.progression and \
+                    loc.item.classification & ItemClassification.useful:
+                appearance_byte = 0x0E  # Progression + Useful
+            elif loc.item.classification & ItemClassification.progression:
+                appearance_byte = 0x0C  # Progression
+            elif loc.item.classification & ItemClassification.useful:
+                appearance_byte = 0x0B  # Useful
+            elif loc.item.classification & ItemClassification.trap:
+                appearance_byte = 0x0D  # Trap
+            else:
+                appearance_byte = 0x0A  # Filler
+
+            # Check if the Item's game is in the other game item appearances' dict, and if so, if the Item is under that
+            # game's name. If it is, change the appearance accordingly.
+            # Right now, only SotN and Timespinner stat ups are supported.
+            other_game_name = world.multiworld.worlds[loc.item.player].game
+            if other_game_name in other_game_item_appearances:
+                if loc.item.name in other_game_item_appearances[other_game_name]:
+                    type_byte = other_game_item_appearances[other_game_name][loc.item.name]["type"]
+                    subtype_byte = other_player_subtype_bytes[type_byte]
+                    appearance_byte = other_game_item_appearances[other_game_name][loc.item.name]["appearance"]
+
+        # Create the correct bytes object for the Item on that Location.
+        location_bytes[cvcotm_location_info[loc.name].offset] = bytes([type_byte, 1, subtype_byte, appearance_byte])
+    return location_bytes
+
+
+def populate_enemy_drops(world: "CVCotMWorld") -> Dict[int, bytes]:
+    """Randomizes the enemy-dropped items throughout the game within each other. There are three tiers of item drops:
+    Low, Mid, and High. Each enemy has two item slots that can both drop its own item; a Common slot and a Rare one.
+
+    On Normal item randomization, easy enemies (below 61 HP) will only have Low-tier drops in both of their stats,
+    bosses and candle enemies will be guaranteed to have High drops in one or both of their slots respectively (bosses
+    are made to only drop one slot 100% of the time), and everything else can have a Low or Mid-tier item in its Common
+    drop slot and a Low, Mid, OR High-tier item in its Rare drop slot.
+
+    If Item Drop Randomization is set to Tiered, the HP threshold for enemies being considered "easily" will raise to
+    below 144, enemies in the 144-369 HP range (inclusive) will have a Low-tier item in its Common slot and a Mid-tier
+    item in its rare slot, and enemies with more than 369 HP will have a Mid-tier in its Common slot and a High-tier in
+    its Rare slot. Candles and bosses still have Rares in all their slots, but now the guaranteed drops that land on
+    bosses will be exclusive to them; no other enemy in the game will have their item.
+
+    This and select_drop are the most directly adapted code from upstream CotMR in this package by far. Credit where
+    it's due to Spooky for writing the original, and Malaert64 for further refinements and updating what used to be
+    Random Item Hardmode to instead be Tiered Item Mode. The original C code this was adapted from can be found here:
+    https://github.com/calm-palm/cotm-randomizer/blob/master/Program/randomizer.c#L1028"""
+
+    placed_low_items = [0] * len(LOW_ITEMS)
+    placed_mid_items = [0] * len(MID_ITEMS)
+    placed_high_items = [0] * len(HIGH_ITEMS)
+
+    placed_common_items = [0] * len(COMMON_ITEMS)
+    placed_rare_items = [0] * len(RARE_ITEMS)
+
+    regular_drops = [0] * len(cvcotm_enemy_info)
+    regular_drop_chances = [0] * len(cvcotm_enemy_info)
+    rare_drops = [0] * len(cvcotm_enemy_info)
+    rare_drop_chances = [0] * len(cvcotm_enemy_info)
+
+    # Set boss items first to prevent boss drop duplicates.
+    # If Tiered mode is enabled, make these items exclusive to these enemies by adding an arbitrary integer larger
+    # than could be reached normally (e.g.the total number of enemies) and use the placed high items array instead of
+    # the placed rare items one.
+    if world.options.item_drop_randomization == ItemDropRandomization.option_tiered:
+        for boss_id in BOSS_IDS:
+            regular_drops[boss_id] = select_drop(world, HIGH_ITEMS, placed_high_items, True)
+    else:
+        for boss_id in BOSS_IDS:
+            regular_drops[boss_id] = select_drop(world, RARE_ITEMS, placed_rare_items, start_index=len(COMMON_ITEMS))
+
+    # Setting drop logic for all enemies.
+    for i in range(len(cvcotm_enemy_info)):
+
+        # Give Dracula II Shining Armor occasionally as a joke.
+        if cvcotm_enemy_info[i].type == "final boss":
+            regular_drops[i] = rare_drops[i] = ITEM_ID_SHINNING_ARMOR
+            regular_drop_chances[i] = rare_drop_chances[i] = 5000
+
+        # Set bosses' secondary item to none since we already set the primary item earlier.
+        elif cvcotm_enemy_info[i].type == "boss":
+            # Set rare drop to none.
+            rare_drops[i] = 0
+
+            # Max out rare boss drops (normally, drops are capped to 50% and 25% for common and rare respectively, but
+            # Fuse's patch AllowAlwaysDrop.ips allows setting the regular item drop chance to 10000 to force a drop
+            # always)
+            regular_drop_chances[i] = 10000
+            rare_drop_chances[i] = 0
+
+        # Candle enemies use a similar placement logic to the bosses, except items that land on them are NOT exclusive
+        # to them on Tiered mode.
+        elif cvcotm_enemy_info[i].type == "candle":
+            if world.options.item_drop_randomization == ItemDropRandomization.option_tiered:
+                regular_drops[i] = select_drop(world, HIGH_ITEMS, placed_high_items)
+                rare_drops[i] = select_drop(world, HIGH_ITEMS, placed_high_items)
+            else:
+                regular_drops[i] = select_drop(world, RARE_ITEMS, placed_rare_items, start_index=len(COMMON_ITEMS))
+                rare_drops[i] = select_drop(world, RARE_ITEMS, placed_rare_items, start_index=len(COMMON_ITEMS))
+
+            # Set base drop chances at 20-30% for common and 15-20% for rare.
+            regular_drop_chances[i] = 2000 + world.random.randint(0, 1000)
+            rare_drop_chances[i] = 1500 + world.random.randint(0, 500)
+
+        # On All Bosses and Battle Arena Required, the Shinning Armor at the end of Battle Arena is removed.
+        # We compensate for this by giving the Battle Arena Devil a 100% chance to drop Shinning Armor.
+        elif cvcotm_enemy_info[i].name == "Devil" and cvcotm_enemy_info[i].type == "battle arena" and \
+                world.options.required_skirmishes == RequiredSkirmishes.option_all_bosses_and_arena:
+            regular_drops[i] = ITEM_ID_SHINNING_ARMOR
+            rare_drops[i] = 0
+
+            regular_drop_chances[i] = 10000
+            rare_drop_chances[i] = 0
+
+        # Low-tier items drop from enemies that are trivial to farm (60 HP or less)
+        # on Normal drop logic, or enemies under 144 HP on Tiered logic.
+        elif (world.options.item_drop_randomization == ItemDropRandomization.option_normal and
+              cvcotm_enemy_info[i].hp <= 60) or \
+                (world.options.item_drop_randomization == ItemDropRandomization.option_tiered and
+                 cvcotm_enemy_info[i].hp <= 143):
+            # Low-tier enemy drops.
+            regular_drops[i] = select_drop(world, LOW_ITEMS, placed_low_items)
+            rare_drops[i] = select_drop(world, LOW_ITEMS, placed_low_items)
+
+            # Set base drop chances at 6-10% for common and 3-6% for rare.
+            regular_drop_chances[i] = 600 + world.random.randint(0, 400)
+            rare_drop_chances[i] = 300 + world.random.randint(0, 300)
+
+        # Rest of Tiered logic, by Malaert64.
+        elif world.options.item_drop_randomization == ItemDropRandomization.option_tiered:
+            # If under 370 HP, mid-tier enemy.
+            if cvcotm_enemy_info[i].hp <= 369:
+                regular_drops[i] = select_drop(world, LOW_ITEMS, placed_low_items)
+                rare_drops[i] = select_drop(world, MID_ITEMS, placed_mid_items)
+            # Otherwise, enemy HP is 370+, thus high-tier enemy.
+            else:
+                regular_drops[i] = select_drop(world, MID_ITEMS, placed_mid_items)
+                rare_drops[i] = select_drop(world, HIGH_ITEMS, placed_high_items)
+
+            # Set base drop chances at 6-10% for common and 3-6% for rare.
+            regular_drop_chances[i] = 600 + world.random.randint(0, 400)
+            rare_drop_chances[i] = 300 + world.random.randint(0, 300)
+
+        # Regular enemies outside Tiered logic.
+        else:
+            # Select a random regular and rare drop for every enemy from their respective lists.
+            regular_drops[i] = select_drop(world, COMMON_ITEMS, placed_common_items)
+            rare_drops[i] = select_drop(world, RARE_ITEMS, placed_rare_items)
+
+            # Set base drop chances at 6-10% for common and 3-6% for rare.
+            regular_drop_chances[i] = 600 + world.random.randint(0, 400)
+            rare_drop_chances[i] = 300 + world.random.randint(0, 300)
+
+    # Return the randomized drop data as bytes with their respective offsets.
+    enemy_address = ENEMY_TABLE_START
+    drop_data = {}
+    for i, enemy_info in enumerate(cvcotm_enemy_info):
+        drop_data[enemy_address] = bytes([regular_drops[i], 0, regular_drop_chances[i] & 0xFF,
+                                          regular_drop_chances[i] >> 8, rare_drops[i], 0, rare_drop_chances[i] & 0xFF,
+                                          rare_drop_chances[i] >> 8])
+        enemy_address += 20
+
+    return drop_data
+
+
+def select_drop(world: "CVCotMWorld", drop_list: List[int], drops_placed: List[int], exclusive_drop: bool = False,
+                start_index: int = 0) -> int:
+    """Chooses a drop from a given list of drops based on another given list of how many drops from that list were
+    selected before. In order to ensure an even number of drops are distributed, drops that were selected the least are
+    the ones that will be picked from.
+
+    Calling this with exclusive_drop param being True will force the number of the chosen item really high to ensure it
+    will never be picked again."""
+
+    # Take the list of placed item drops beginning from the starting index.
+    drops_from_start_index = drops_placed[start_index:]
+
+    # Determine the lowest drop counts and the indices with that drop count.
+    lowest_number = min(drops_from_start_index)
+    indices_with_lowest_number = [index for index, placed in enumerate(drops_from_start_index) if
+                                  placed == lowest_number]
+
+    random_index = world.random.choice(indices_with_lowest_number)
+    random_index += start_index  # Add start_index back on
+
+    # Increment the number of this item placed, unless it should be exclusive to the boss / candle, in which case
+    # set it to an arbitrarily large number to make it exclusive.
+    if exclusive_drop:
+        drops_placed[random_index] += 999
+    else:
+        drops_placed[random_index] += 1
+
+    # Return the in-game item ID of the chosen item.
+    return drop_list[random_index]
+
+
+def get_start_inventory_data(world: "CVCotMWorld") -> Tuple[Dict[int, bytes], bool]:
+    """Calculate and return the starting inventory arrays. Different items go into different arrays, so they all have
+    to be handled accordingly."""
+    start_inventory_data = {}
+
+    magic_items_array = [0 for _ in range(8)]
+    cards_array = [0 for _ in range(20)]
+    extra_stats = {"extra health": 0,
+                   "extra magic": 0,
+                   "extra hearts": 0}
+    start_with_detonator = False
+    # If the Iron Maiden Behavior option is set to Start Broken, consider ourselves starting with the Maiden Detonator.
+    if world.options.iron_maiden_behavior == IronMaidenBehavior.option_start_broken:
+        start_with_detonator = True
+
+    # Always start with the Dash Boots.
+    magic_items_array[0] = 1
+
+    for item in world.multiworld.precollected_items[world.player]:
+
+        array_offset = item.code & 0xFF
+
+        # If it's a Maiden Detonator we're starting with, set the boolean for it to True.
+        if item.name == iname.ironmaidens:
+            start_with_detonator = True
+        # If it's a Max Up we're starting with, check if increasing the extra amount of that stat will put us over the
+        # max amount of the stat allowed. If it will, set the current extra amount to the max. Otherwise, increase it by
+        # the amount that it should.
+        elif "Max Up" in item.name:
+            info = extra_starting_stat_info[item.name]
+            if extra_stats[info["variable"]] + info["amount_per"] > info["max_allowed"]:
+                extra_stats[info["variable"]] = info["max_allowed"]
+            else:
+                extra_stats[info["variable"]] += info["amount_per"]
+        # If it's a DSS card we're starting with, set that card's value in the cards array.
+        elif "Card" in item.name:
+            cards_array[array_offset] = 1
+        # If it's none of the above, it has to be a regular Magic Item.
+        # Increase that Magic Item's value in the Magic Items array if it's not greater than 240. Last Keys are the only
+        # Magic Item wherein having more than one is relevant.
+        else:
+            # Decrease the Magic Item array offset by 1 if it's higher than the unused Map's item value.
+            if array_offset > 5:
+                array_offset -= 1
+            if magic_items_array[array_offset] < 240:
+                magic_items_array[array_offset] += 1
+
+    # Add the start inventory arrays to the offset data in bytes form.
+    start_inventory_data[0x680080] = bytes(magic_items_array)
+    start_inventory_data[0x6800A0] = bytes(cards_array)
+
+    # Add the extra max HP/MP/Hearts to all classes' base stats. Doing it this way makes us less likely to hit the max
+    # possible Max Ups.
+    # Vampire Killer
+    start_inventory_data[0xE08C6] = int.to_bytes(100 + extra_stats["extra health"], 2, "little")
+    start_inventory_data[0xE08CE] = int.to_bytes(100 + extra_stats["extra magic"], 2, "little")
+    start_inventory_data[0xE08D4] = int.to_bytes(50 + extra_stats["extra hearts"], 2, "little")
+
+    # Magician
+    start_inventory_data[0xE090E] = int.to_bytes(50 + extra_stats["extra health"], 2, "little")
+    start_inventory_data[0xE0916] = int.to_bytes(400 + extra_stats["extra magic"], 2, "little")
+    start_inventory_data[0xE091C] = int.to_bytes(50 + extra_stats["extra hearts"], 2, "little")
+
+    # Fighter
+    start_inventory_data[0xE0932] = int.to_bytes(200 + extra_stats["extra health"], 2, "little")
+    start_inventory_data[0xE093A] = int.to_bytes(50 + extra_stats["extra magic"], 2, "little")
+    start_inventory_data[0xE0940] = int.to_bytes(50 + extra_stats["extra hearts"], 2, "little")
+
+    # Shooter
+    start_inventory_data[0xE0832] = int.to_bytes(50 + extra_stats["extra health"], 2, "little")
+    start_inventory_data[0xE08F2] = int.to_bytes(100 + extra_stats["extra magic"], 2, "little")
+    start_inventory_data[0xE08F8] = int.to_bytes(250 + extra_stats["extra hearts"], 2, "little")
+
+    # Thief
+    start_inventory_data[0xE0956] = int.to_bytes(50 + extra_stats["extra health"], 2, "little")
+    start_inventory_data[0xE095E] = int.to_bytes(50 + extra_stats["extra magic"], 2, "little")
+    start_inventory_data[0xE0964] = int.to_bytes(50 + extra_stats["extra hearts"], 2, "little")
+
+    return start_inventory_data, start_with_detonator
diff --git a/worlds/cvcotm/client.py b/worlds/cvcotm/client.py
new file mode 100644
index 000000000000..4db2c2faabfa
--- /dev/null
+++ b/worlds/cvcotm/client.py
@@ -0,0 +1,563 @@
+from typing import TYPE_CHECKING, Set
+from .locations import BASE_ID, get_location_names_to_ids
+from .items import cvcotm_item_info, MAJORS_CLASSIFICATIONS
+from .locations import cvcotm_location_info
+from .cvcotm_text import cvcotm_string_to_bytearray
+from .options import CompletionGoal, CVCotMDeathLink, IronMaidenBehavior
+from .rom import ARCHIPELAGO_IDENTIFIER_START, ARCHIPELAGO_IDENTIFIER, AUTH_NUMBER_START, QUEUED_TEXT_STRING_START
+from .data import iname, lname
+
+from BaseClasses import ItemClassification
+from NetUtils import ClientStatus
+import worlds._bizhawk as bizhawk
+import base64
+from worlds._bizhawk.client import BizHawkClient
+
+if TYPE_CHECKING:
+    from worlds._bizhawk.context import BizHawkClientContext
+
+CURRENT_STATUS_ADDRESS = 0xD0
+POISON_TIMER_TILL_DAMAGE_ADDRESS = 0xD8
+POISON_DAMAGE_VALUE_ADDRESS = 0xDE
+GAME_STATE_ADDRESS = 0x45D8
+FLAGS_ARRAY_START = 0x25374
+CARDS_ARRAY_START = 0x25674
+NUM_RECEIVED_ITEMS_ADDRESS = 0x253D0
+MAX_UPS_ARRAY_START = 0x2572C
+MAGIC_ITEMS_ARRAY_START = 0x2572F
+QUEUED_TEXTBOX_1_ADDRESS = 0x25300
+QUEUED_TEXTBOX_2_ADDRESS = 0x25302
+QUEUED_MSG_DELAY_TIMER_ADDRESS = 0x25304
+QUEUED_SOUND_ID_ADDRESS = 0x25306
+DELAY_TIMER_ADDRESS = 0x25308
+CURRENT_CUTSCENE_ID_ADDRESS = 0x26000
+NATHAN_STATE_ADDRESS = 0x50
+CURRENT_HP_ADDRESS = 0x2562E
+CURRENT_MP_ADDRESS = 0x25636
+CURRENT_HEARTS_ADDRESS = 0x2563C
+CURRENT_LOCATION_VALUES_START = 0x253FC
+ROM_NAME_START = 0xA0
+
+AREA_SEALED_ROOM = 0x00
+AREA_BATTLE_ARENA = 0x0E
+GAME_STATE_GAMEPLAY = 0x06
+GAME_STATE_CREDITS = 0x21
+NATHAN_STATE_SAVING = 0x34
+STATUS_POISON = b"\x02"
+TEXT_ID_DSS_TUTORIAL = b"\x1D\x82"
+TEXT_ID_MULTIWORLD_MESSAGE = b"\xF2\x84"
+SOUND_ID_UNUSED_SIMON_FANFARE = b"\x04"
+SOUND_ID_MAIDEN_BREAKING = b"\x79"
+# SOUND_ID_NATHAN_FREEZING = b"\x7A"
+SOUND_ID_BAD_CONFIG = b"\x2D\x01"
+SOUND_ID_DRACULA_CHARGE = b"\xAB\x01"
+SOUND_ID_MINOR_PICKUP = b"\xB3\x01"
+SOUND_ID_MAJOR_PICKUP = b"\xB4\x01"
+
+ITEM_NAME_LIMIT = 300
+PLAYER_NAME_LIMIT = 50
+
+FLAG_HIT_IRON_MAIDEN_SWITCH = 0x2A
+FLAG_SAW_DSS_TUTORIAL = 0xB1
+FLAG_WON_BATTLE_ARENA = 0xB2
+FLAG_DEFEATED_DRACULA_II = 0xBC
+
+# These flags are communicated to the tracker as a bitfield using this order.
+# Modifying the order will cause undetectable autotracking issues.
+EVENT_FLAG_MAP = {
+    FLAG_HIT_IRON_MAIDEN_SWITCH: "FLAG_HIT_IRON_MAIDEN_SWITCH",
+    FLAG_WON_BATTLE_ARENA: "FLAG_WON_BATTLE_ARENA",
+    0xB3: "FLAG_DEFEATED_CERBERUS",
+    0xB4: "FLAG_DEFEATED_NECROMANCER",
+    0xB5: "FLAG_DEFEATED_IRON_GOLEM",
+    0xB6: "FLAG_DEFEATED_ADRAMELECH",
+    0xB7: "FLAG_DEFEATED_DRAGON_ZOMBIES",
+    0xB8: "FLAG_DEFEATED_DEATH",
+    0xB9: "FLAG_DEFEATED_CAMILLA",
+    0xBA: "FLAG_DEFEATED_HUGH",
+    0xBB: "FLAG_DEFEATED_DRACULA_I",
+    FLAG_DEFEATED_DRACULA_II: "FLAG_DEFEATED_DRACULA_II"
+}
+
+DEATHLINK_AREA_NAMES = ["Sealed Room", "Catacomb", "Abyss Staircase", "Audience Room", "Triumph Hallway",
+                        "Machine Tower", "Eternal Corridor", "Chapel Tower", "Underground Warehouse",
+                        "Underground Gallery", "Underground Waterway", "Outer Wall", "Observation Tower",
+                        "Ceremonial Room", "Battle Arena"]
+
+
+class CastlevaniaCotMClient(BizHawkClient):
+    game = "Castlevania - Circle of the Moon"
+    system = "GBA"
+    patch_suffix = ".apcvcotm"
+    sent_initial_packets: bool
+    self_induced_death: bool
+    local_checked_locations: Set[int]
+    client_set_events = {flag_name: False for flag, flag_name in EVENT_FLAG_MAP.items()}
+    killed_dracula_2: bool
+    won_battle_arena: bool
+    sent_message_queue: list
+    death_causes: list
+    currently_dead: bool
+    synced_set_events: bool
+    saw_arena_win_message: bool
+    saw_dss_tutorial: bool
+
+    async def validate_rom(self, ctx: "BizHawkClientContext") -> bool:
+        from CommonClient import logger
+
+        try:
+            # Check ROM name/patch version
+            game_names = await bizhawk.read(ctx.bizhawk_ctx, [(ROM_NAME_START, 0xC, "ROM"),
+                                                              (ARCHIPELAGO_IDENTIFIER_START, 12, "ROM")])
+            if game_names[0].decode("ascii") != "DRACULA AGB1":
+                return False
+            if game_names[1] == b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00':
+                logger.info("ERROR: You appear to be running an unpatched version of Castlevania: Circle of the Moon. "
+                            "You need to generate a patch file and use it to create a patched ROM.")
+                return False
+            if game_names[1].decode("ascii") != ARCHIPELAGO_IDENTIFIER:
+                logger.info("ERROR: The patch file used to create this ROM is not compatible with "
+                            "this client. Double check your client version against the version being "
+                            "used by the generator.")
+                return False
+        except UnicodeDecodeError:
+            return False
+        except bizhawk.RequestFailedError:
+            return False  # Should verify on the next pass
+
+        ctx.game = self.game
+        ctx.items_handling = 0b001
+        ctx.want_slot_data = True
+        ctx.watcher_timeout = 0.125
+        return True
+
+    async def set_auth(self, ctx: "BizHawkClientContext") -> None:
+        auth_raw = (await bizhawk.read(ctx.bizhawk_ctx, [(AUTH_NUMBER_START, 16, "ROM")]))[0]
+        ctx.auth = base64.b64encode(auth_raw).decode("utf-8")
+        # Initialize all the local client attributes here so that nothing will be carried over from a previous CotM if
+        # the player tried changing CotM ROMs without resetting their Bizhawk Client instance.
+        self.sent_initial_packets = False
+        self.local_checked_locations = set()
+        self.self_induced_death = False
+        self.client_set_events = {flag_name: False for flag, flag_name in EVENT_FLAG_MAP.items()}
+        self.killed_dracula_2 = False
+        self.won_battle_arena = False
+        self.sent_message_queue = []
+        self.death_causes = []
+        self.currently_dead = False
+        self.synced_set_events = False
+        self.saw_arena_win_message = False
+        self.saw_dss_tutorial = False
+
+    def on_package(self, ctx: "BizHawkClientContext", cmd: str, args: dict) -> None:
+        if cmd != "Bounced":
+            return
+        if "tags" not in args:
+            return
+        if ctx.slot is None:
+            return
+        if "DeathLink" in args["tags"] and args["data"]["source"] != ctx.slot_info[ctx.slot].name:
+            if "cause" in args["data"]:
+                cause = args["data"]["cause"]
+                if cause == "":
+                    cause = f"{args['data']['source']} killed you without a word!"
+                if len(cause) > ITEM_NAME_LIMIT + PLAYER_NAME_LIMIT:
+                    cause = cause[:ITEM_NAME_LIMIT + PLAYER_NAME_LIMIT]
+            else:
+                cause = f"{args['data']['source']} killed you without a word!"
+
+            # Highlight the player that killed us in the game's orange text.
+            if args['data']['source'] in cause:
+                words = cause.split(args['data']['source'], 1)
+                cause = words[0] + "「" + args['data']['source'] + "�" + words[1]
+
+            self.death_causes += [cause]
+
+    async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
+        if ctx.server is None or ctx.server.socket.closed or ctx.slot_data is None or ctx.slot is None:
+            return
+
+        try:
+            # Scout all Locations and get our Set events upon initial connection.
+            if not self.sent_initial_packets:
+                await ctx.send_msgs([{
+                    "cmd": "LocationScouts",
+                    "locations": [code for name, code in get_location_names_to_ids().items()
+                                  if code in ctx.server_locations],
+                    "create_as_hint": 0
+                }])
+                await ctx.send_msgs([{
+                    "cmd": "Get",
+                    "keys": [f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"]
+                }])
+                self.sent_initial_packets = True
+
+            read_state = await bizhawk.read(ctx.bizhawk_ctx, [(GAME_STATE_ADDRESS, 1, "EWRAM"),
+                                                              (FLAGS_ARRAY_START, 32, "EWRAM"),
+                                                              (CARDS_ARRAY_START, 20, "EWRAM"),
+                                                              (NUM_RECEIVED_ITEMS_ADDRESS, 2, "EWRAM"),
+                                                              (MAX_UPS_ARRAY_START, 3, "EWRAM"),
+                                                              (MAGIC_ITEMS_ARRAY_START, 8, "EWRAM"),
+                                                              (QUEUED_TEXTBOX_1_ADDRESS, 2, "EWRAM"),
+                                                              (DELAY_TIMER_ADDRESS, 2, "EWRAM"),
+                                                              (CURRENT_CUTSCENE_ID_ADDRESS, 1, "EWRAM"),
+                                                              (NATHAN_STATE_ADDRESS, 1, "EWRAM"),
+                                                              (CURRENT_HP_ADDRESS, 18, "EWRAM"),
+                                                              (CURRENT_LOCATION_VALUES_START, 2, "EWRAM")])
+
+            game_state = int.from_bytes(read_state[0], "little")
+            event_flags_array = read_state[1]
+            cards_array = list(read_state[2])
+            max_ups_array = list(read_state[4])
+            magic_items_array = list(read_state[5])
+            num_received_items = int.from_bytes(bytearray(read_state[3]), "little")
+            queued_textbox = int.from_bytes(bytearray(read_state[6]), "little")
+            delay_timer = int.from_bytes(bytearray(read_state[7]), "little")
+            cutscene = int.from_bytes(bytearray(read_state[8]), "little")
+            nathan_state = int.from_bytes(bytearray(read_state[9]), "little")
+            health_stats_array = bytearray(read_state[10])
+            area = int.from_bytes(bytearray(read_state[11][0:1]), "little")
+            room = int.from_bytes(bytearray(read_state[11][1:]), "little")
+
+            # Get out each of the individual health/magic/heart values.
+            hp = int.from_bytes(health_stats_array[0:2], "little")
+            max_hp = int.from_bytes(health_stats_array[4:6], "little")
+            # mp = int.from_bytes(health_stats_array[8:10], "little") Not used. But it's here if it's ever needed!
+            max_mp = int.from_bytes(health_stats_array[12:14], "little")
+            hearts = int.from_bytes(health_stats_array[14:16], "little")
+            max_hearts = int.from_bytes(health_stats_array[16:], "little")
+
+            # If there's no textbox already queued, the delay timer is 0, we are not in a cutscene, and Nathan's current
+            # state value is not 0x34 (using a save room), it should be safe to inject a textbox message.
+            ok_to_inject = not queued_textbox and not delay_timer and not cutscene \
+                and nathan_state != NATHAN_STATE_SAVING
+
+            # Make sure we are in the Gameplay or Credits states before detecting sent locations.
+            # If we are in any other state, such as the Game Over state, reset the textbox buffers back to 0 so that we
+            # don't receive the most recent item upon loading back in.
+            #
+            # If the intro cutscene floor broken flag is not set, then assume we are in the demo; at no point during
+            # regular gameplay will this flag not be set.
+            if game_state not in [GAME_STATE_GAMEPLAY, GAME_STATE_CREDITS] or not event_flags_array[6] & 0x02:
+                self.currently_dead = False
+                await bizhawk.write(ctx.bizhawk_ctx, [(QUEUED_TEXTBOX_1_ADDRESS, [0 for _ in range(12)], "EWRAM")])
+                return
+
+            # Enable DeathLink if it's in our slot_data.
+            if "DeathLink" not in ctx.tags and ctx.slot_data["death_link"]:
+                await ctx.update_death_link(True)
+
+            # Send a DeathLink if we died on our own independently of receiving another one.
+            if "DeathLink" in ctx.tags and hp == 0 and not self.currently_dead:
+                self.currently_dead = True
+
+                # Check if we are in Dracula II's arena. The game considers this part of the Sealed Room area,
+                # which I don't think makes sense to be player-facing like this.
+                if area == AREA_SEALED_ROOM and room == 2:
+                    area_of_death = "Dracula's realm"
+                # If we aren't in Dracula II's arena, then take the name of whatever area the player is currently in.
+                else:
+                    area_of_death = DEATHLINK_AREA_NAMES[area]
+
+                await ctx.send_death(f"{ctx.player_names[ctx.slot]} perished in {area_of_death}. Dracula has won!")
+
+            # Update the Dracula II and Battle Arena events already being done on past separate sessions for if the
+            # player is running the Battle Arena and Dracula goal.
+            if f"castlevania_cotm_events_{ctx.team}_{ctx.slot}" in ctx.stored_data:
+                if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] is not None:
+                    if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] & 0x2:
+                        self.won_battle_arena = True
+
+                    if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] & 0x800:
+                        self.killed_dracula_2 = True
+
+            # If we won the Battle Arena, haven't seen the win message yet, and are in the Arena at the moment, pop up
+            # the win message while playing the game's unused Theme of Simon Belmont fanfare.
+            if self.won_battle_arena and not self.saw_arena_win_message and area == AREA_BATTLE_ARENA \
+                    and ok_to_inject and not self.currently_dead:
+                win_message = cvcotm_string_to_bytearray("      A 「WINNER� IS 「YOU�!▶", "little middle", 0,
+                                                         wrap=False)
+                await bizhawk.write(ctx.bizhawk_ctx, [(QUEUED_TEXTBOX_1_ADDRESS, TEXT_ID_MULTIWORLD_MESSAGE, "EWRAM"),
+                                                      (QUEUED_SOUND_ID_ADDRESS, SOUND_ID_UNUSED_SIMON_FANFARE, "EWRAM"),
+                                                      (QUEUED_TEXT_STRING_START, win_message, "ROM")])
+                self.saw_arena_win_message = True
+
+            # If we have any queued death causes, handle DeathLink giving here.
+            elif self.death_causes and ok_to_inject and not self.currently_dead:
+
+                # Inject the oldest cause as a textbox message and play the Dracula charge attack sound.
+                death_text = self.death_causes[0]
+                death_writes = [(QUEUED_TEXTBOX_1_ADDRESS, TEXT_ID_MULTIWORLD_MESSAGE, "EWRAM"),
+                                (QUEUED_SOUND_ID_ADDRESS, SOUND_ID_DRACULA_CHARGE, "EWRAM")]
+
+                # If we are in the Battle Arena and are not using the On Including Arena DeathLink option, extend the
+                # DeathLink message and don't actually kill Nathan.
+                if ctx.slot_data["death_link"] != CVCotMDeathLink.option_arena_on and area == AREA_BATTLE_ARENA:
+                    death_text += "â—ŠThe Battle Arena nullified the DeathLink. Go fight fair and square!"
+                else:
+                    # Otherwise, kill Nathan by giving him a 9999 damage-dealing poison status that hurts him as soon as
+                    # the death cause textbox is dismissed.
+                    death_writes += [(CURRENT_STATUS_ADDRESS, STATUS_POISON, "EWRAM"),
+                                     (POISON_TIMER_TILL_DAMAGE_ADDRESS, b"\x38", "EWRAM"),
+                                     (POISON_DAMAGE_VALUE_ADDRESS, b"\x0F\x27", "EWRAM")]
+
+                # Add the final death text and write the whole shebang.
+                death_writes += [(QUEUED_TEXT_STRING_START,
+                                  bytes(cvcotm_string_to_bytearray(death_text + "â—Š", "big middle", 0)), "ROM")]
+                await bizhawk.write(ctx.bizhawk_ctx, death_writes)
+
+                # Delete the oldest death cause that we just wrote and set currently_dead to True so the client doesn't
+                # think we just died on our own on the subsequent frames before the Game Over state.
+                del(self.death_causes[0])
+                self.currently_dead = True
+
+            # If we have a queue of Locations to inject "sent" messages with, do so before giving any subsequent Items.
+            elif self.sent_message_queue and ok_to_inject and not self.currently_dead and ctx.locations_info:
+                loc = self.sent_message_queue[0]
+                # Truncate the Item name. ArchipIDLE's FFXIV Item is 214 characters, for comparison.
+                item_name = ctx.item_names.lookup_in_slot(ctx.locations_info[loc].item, ctx.locations_info[loc].player)
+                if len(item_name) > ITEM_NAME_LIMIT:
+                    item_name = item_name[:ITEM_NAME_LIMIT]
+                # Truncate the player name. Player names are normally capped at 16 characters, but there is no limit on
+                # ItemLink group names.
+                player_name = ctx.player_names[ctx.locations_info[loc].player]
+                if len(player_name) > PLAYER_NAME_LIMIT:
+                    player_name = player_name[:PLAYER_NAME_LIMIT]
+
+                sent_text = cvcotm_string_to_bytearray(f"「{item_name}� sent to 「{player_name}�◊", "big middle", 0)
+
+                # Set the correct sound to play depending on the Item's classification.
+                if item_name == iname.ironmaidens and \
+                        ctx.slot_info[ctx.locations_info[loc].player].game == "Castlevania - Circle of the Moon":
+                    mssg_sfx_id = SOUND_ID_MAIDEN_BREAKING
+                    sent_text = cvcotm_string_to_bytearray(f"「Iron Maidens� broken for 「{player_name}�◊",
+                                                           "big middle", 0)
+                elif ctx.locations_info[loc].flags & MAJORS_CLASSIFICATIONS:
+                    mssg_sfx_id = SOUND_ID_MAJOR_PICKUP
+                elif ctx.locations_info[loc].flags & ItemClassification.trap:
+                    mssg_sfx_id = SOUND_ID_BAD_CONFIG
+                else:  # Filler
+                    mssg_sfx_id = SOUND_ID_MINOR_PICKUP
+
+                await bizhawk.write(ctx.bizhawk_ctx, [(QUEUED_TEXTBOX_1_ADDRESS, TEXT_ID_MULTIWORLD_MESSAGE, "EWRAM"),
+                                                      (QUEUED_SOUND_ID_ADDRESS, mssg_sfx_id, "EWRAM"),
+                                                      (QUEUED_TEXT_STRING_START, sent_text, "ROM")])
+
+                del(self.sent_message_queue[0])
+
+            # If the game hasn't received all items yet, it's ok to inject, and the current number of received items
+            # still matches what we read before, then write the next incoming item into the inventory and, separately,
+            # the textbox ID to trigger the multiworld textbox, sound effect to play when the textbox opens, number to
+            # increment the received items count by, and the text to go into the multiworld textbox. The game will then
+            # do the rest when it's able to.
+            elif num_received_items < len(ctx.items_received) and ok_to_inject and not self.currently_dead:
+                next_item = ctx.items_received[num_received_items]
+
+                # Figure out what inventory array and offset from said array to increment based on what we are
+                # receiving.
+                flag_index = 0
+                flag_array = b""
+                inv_array = []
+                inv_array_start = 0
+                text_id_2 = b"\x00\x00"
+                item_type = next_item.item & 0xFF00
+                inv_array_index = next_item.item & 0xFF
+                if item_type == 0xE600:  # Card
+                    inv_array_start = CARDS_ARRAY_START
+                    inv_array = cards_array
+                    mssg_sfx_id = SOUND_ID_MAJOR_PICKUP
+                    # If skip_tutorials is off and the saw DSS tutorial flag is not set, set the flag and display it
+                    # for the second textbox.
+                    if not self.saw_dss_tutorial and not ctx.slot_data["skip_tutorials"]:
+                        flag_index = FLAG_SAW_DSS_TUTORIAL
+                        flag_array = event_flags_array
+                        text_id_2 = TEXT_ID_DSS_TUTORIAL
+                elif item_type == 0xE800 and inv_array_index == 0x09:  # Maiden Detonator
+                    flag_index = FLAG_HIT_IRON_MAIDEN_SWITCH
+                    flag_array = event_flags_array
+                    mssg_sfx_id = SOUND_ID_MAIDEN_BREAKING
+                elif item_type == 0xE800:  # Any other Magic Item
+                    inv_array_start = MAGIC_ITEMS_ARRAY_START
+                    inv_array = magic_items_array
+                    mssg_sfx_id = SOUND_ID_MAJOR_PICKUP
+                    if inv_array_index > 5:  # The unused Map's index is skipped over.
+                        inv_array_index -= 1
+                else:  # Max Up
+                    inv_array_start = MAX_UPS_ARRAY_START
+                    mssg_sfx_id = SOUND_ID_MINOR_PICKUP
+                    inv_array = max_ups_array
+
+                item_name = ctx.item_names.lookup_in_slot(next_item.item)
+                player_name = ctx.player_names[next_item.player]
+                # Truncate the player name.
+                if len(player_name) > PLAYER_NAME_LIMIT:
+                    player_name = player_name[:PLAYER_NAME_LIMIT]
+
+                # If the Item came from a different player, display a custom received message. Otherwise, display the
+                # vanilla received message for that Item.
+                if next_item.player != ctx.slot:
+                    text_id_1 = TEXT_ID_MULTIWORLD_MESSAGE
+                    if item_name == iname.ironmaidens:
+                        received_text = cvcotm_string_to_bytearray(f"「Iron Maidens� broken by "
+                                                                   f"「{player_name}�◊", "big middle", 0)
+                    else:
+                        received_text = cvcotm_string_to_bytearray(f"「{item_name}� received from "
+                                                                   f"「{player_name}�◊", "big middle", 0)
+                    text_write = [(QUEUED_TEXT_STRING_START, bytes(received_text), "ROM")]
+
+                    # If skip_tutorials is off, display the Item's tutorial for the second textbox (if it has one).
+                    if not ctx.slot_data["skip_tutorials"] and cvcotm_item_info[item_name].tutorial_id is not None:
+                        text_id_2 = cvcotm_item_info[item_name].tutorial_id
+                else:
+                    text_id_1 = cvcotm_item_info[item_name].text_id
+                    text_write = []
+
+                # Check if the player has 255 of the item being received. If they do, don't increment that counter
+                # further.
+                refill_write = []
+                count_write = []
+                flag_write = []
+                count_guard = []
+                flag_guard = []
+
+                # If there's a value to increment in an inventory array, do so here after checking to see if we can.
+                if inv_array_start:
+                    if inv_array[inv_array_index] + 1 > 0xFF:
+                        # If it's a stat max up being received, manually give a refill of that item's stat.
+                        # Normally, the game does this automatically by incrementing the number of that max up.
+                        if item_name == iname.hp_max:
+                            refill_write = [(CURRENT_HP_ADDRESS, int.to_bytes(max_hp, 2, "little"), "EWRAM")]
+                        elif item_name == iname.mp_max:
+                            refill_write = [(CURRENT_MP_ADDRESS, int.to_bytes(max_mp, 2, "little"), "EWRAM")]
+                        elif item_name == iname.heart_max:
+                            # If adding +6 Hearts doesn't put us over the player's current max Hearts, do so.
+                            # Otherwise, set the player's current Hearts to the current max.
+                            if hearts + 6 > max_hearts:
+                                new_hearts = max_hearts
+                            else:
+                                new_hearts = hearts + 6
+                            refill_write = [(CURRENT_HEARTS_ADDRESS, int.to_bytes(new_hearts, 2, "little"), "EWRAM")]
+                    else:
+                        # If our received count of that item is not more than 255, increment it normally.
+                        inv_address = inv_array_start + inv_array_index
+                        count_guard = [(inv_address, int.to_bytes(inv_array[inv_array_index], 1, "little"), "EWRAM")]
+                        count_write = [(inv_address, int.to_bytes(inv_array[inv_array_index] + 1, 1, "little"),
+                                        "EWRAM")]
+
+                # If there's a flag value to set, do so here.
+                if flag_index:
+                    flag_bytearray_index = flag_index // 8
+                    flag_address = FLAGS_ARRAY_START + flag_bytearray_index
+                    flag_guard = [(flag_address, int.to_bytes(flag_array[flag_bytearray_index], 1, "little"), "EWRAM")]
+                    flag_write = [(flag_address, int.to_bytes(flag_array[flag_bytearray_index] |
+                                                              (0x01 << (flag_index % 8)), 1, "little"), "EWRAM")]
+
+                await bizhawk.guarded_write(ctx.bizhawk_ctx,
+                                            [(QUEUED_TEXTBOX_1_ADDRESS, text_id_1, "EWRAM"),
+                                             (QUEUED_TEXTBOX_2_ADDRESS, text_id_2, "EWRAM"),
+                                             (QUEUED_MSG_DELAY_TIMER_ADDRESS, b"\x01", "EWRAM"),
+                                             (QUEUED_SOUND_ID_ADDRESS, mssg_sfx_id, "EWRAM")]
+                                            + count_write + flag_write + text_write + refill_write,
+                                            # Make sure the number of received items and number to overwrite are still
+                                            # what we expect them to be.
+                                            [(NUM_RECEIVED_ITEMS_ADDRESS, read_state[3], "EWRAM")]
+                                            + count_guard + flag_guard),
+
+            locs_to_send = set()
+
+            # Check each bit in each flag byte for set Location and event flags.
+            checked_set_events = {flag_name: False for flag, flag_name in EVENT_FLAG_MAP.items()}
+            for byte_index, byte in enumerate(event_flags_array):
+                for i in range(8):
+                    and_value = 0x01 << i
+                    if byte & and_value != 0:
+                        flag_id = byte_index * 8 + i
+
+                        location_id = flag_id + BASE_ID
+                        if location_id in ctx.server_locations:
+                            locs_to_send.add(location_id)
+
+                        # If the flag for pressing the Iron Maiden switch is set, and the Iron Maiden behavior is
+                        # vanilla (meaning we really pressed the switch), send the Iron Maiden switch as checked.
+                        if flag_id == FLAG_HIT_IRON_MAIDEN_SWITCH and ctx.slot_data["iron_maiden_behavior"] == \
+                                IronMaidenBehavior.option_vanilla:
+                            locs_to_send.add(cvcotm_location_info[lname.ct21].code + BASE_ID)
+
+                        # If the DSS tutorial flag is set, let the client know, so it's not shown again for
+                        # subsequently-received cards.
+                        if flag_id == FLAG_SAW_DSS_TUTORIAL:
+                            self.saw_dss_tutorial = True
+
+                        if flag_id in EVENT_FLAG_MAP:
+                            checked_set_events[EVENT_FLAG_MAP[flag_id]] = True
+
+                            # Update the client's statuses for the Battle Arena and Dracula goals.
+                            if flag_id == FLAG_WON_BATTLE_ARENA:
+                                self.won_battle_arena = True
+
+                            if flag_id == FLAG_DEFEATED_DRACULA_II:
+                                self.killed_dracula_2 = True
+
+            # Send Locations if there are any to send.
+            if locs_to_send != self.local_checked_locations:
+                self.local_checked_locations = locs_to_send
+
+                if locs_to_send is not None:
+                    # Capture all the Locations with non-local Items to send that are in ctx.missing_locations
+                    # (the ones that were definitely never sent before).
+                    if ctx.locations_info:
+                        self.sent_message_queue += [loc for loc in locs_to_send if loc in ctx.missing_locations and
+                                                    ctx.locations_info[loc].player != ctx.slot]
+                    # If we still don't have the locations info at this point, send another LocationScout packet just
+                    # in case something went wrong, and we never received the initial LocationInfo packet.
+                    else:
+                        await ctx.send_msgs([{
+                            "cmd": "LocationScouts",
+                            "locations": [code for name, code in get_location_names_to_ids().items()
+                                          if code in ctx.server_locations],
+                            "create_as_hint": 0
+                        }])
+
+                    await ctx.send_msgs([{
+                        "cmd": "LocationChecks",
+                        "locations": list(locs_to_send)
+                    }])
+
+            # Check the win condition depending on what our completion goal is.
+            # The Dracula option requires the "killed Dracula II" flag to be set or being in the credits state.
+            # The Battle Arena option requires the Shinning Armor pickup flag to be set.
+            # Otherwise, the Battle Arena and Dracula option requires both of the above to be satisfied simultaneously.
+            if ctx.slot_data["completion_goal"] == CompletionGoal.option_dracula:
+                win_condition = self.killed_dracula_2
+            elif ctx.slot_data["completion_goal"] == CompletionGoal.option_battle_arena:
+                win_condition = self.won_battle_arena
+            else:
+                win_condition = self.killed_dracula_2 and self.won_battle_arena
+
+            # Send game clear if we've satisfied the win condition.
+            if not ctx.finished_game and win_condition:
+                ctx.finished_game = True
+                await ctx.send_msgs([{
+                    "cmd": "StatusUpdate",
+                    "status": ClientStatus.CLIENT_GOAL
+                }])
+
+            # Update the tracker event flags
+            if checked_set_events != self.client_set_events and ctx.slot is not None:
+                event_bitfield = 0
+                for index, (flag, flag_name) in enumerate(EVENT_FLAG_MAP.items()):
+                    if checked_set_events[flag_name]:
+                        event_bitfield |= 1 << index
+
+                await ctx.send_msgs([{
+                    "cmd": "Set",
+                    "key": f"castlevania_cotm_events_{ctx.team}_{ctx.slot}",
+                    "default": 0,
+                    "want_reply": False,
+                    "operations": [{"operation": "or", "value": event_bitfield}],
+                }])
+                self.client_set_events = checked_set_events
+
+        except bizhawk.RequestFailedError:
+            # Exit handler and return to main loop to reconnect.
+            pass
diff --git a/worlds/cvcotm/cvcotm_text.py b/worlds/cvcotm/cvcotm_text.py
new file mode 100644
index 000000000000..803435a5fce8
--- /dev/null
+++ b/worlds/cvcotm/cvcotm_text.py
@@ -0,0 +1,178 @@
+from typing import Literal
+
+cvcotm_char_dict = {"\n": 0x09, " ": 0x26, "!": 0x4A, '"': 0x78, "#": 0x79, "$": 0x7B, "%": 0x68, "&": 0x73, "'": 0x51,
+                    "(": 0x54, ")": 0x55, "*": 0x7A, "+": 0x50, ",": 0x4C, "-": 0x58, ".": 0x35, "/": 0x70, "0": 0x64,
+                    "1": 0x6A, "2": 0x63, "3": 0x6C, "4": 0x71, "5": 0x69, "6": 0x7C, "7": 0x7D, "8": 0x72, "9": 0x85,
+                    ":": 0x86, ";": 0x87, "<": 0x8F, "=": 0x90, ">": 0x91, "?": 0x48, "@": 0x98, "A": 0x3E, "B": 0x4D,
+                    "C": 0x44, "D": 0x45, "E": 0x4E, "F": 0x56, "G": 0x4F, "H": 0x40, "I": 0x43, "J": 0x6B, "K": 0x66,
+                    "L": 0x5F, "M": 0x42, "N": 0x52, "O": 0x67, "P": 0x4B, "Q": 0x99, "R": 0x46, "S": 0x41, "T": 0x47,
+                    "U": 0x60, "V": 0x6E, "W": 0x49, "X": 0x6D, "Y": 0x53, "Z": 0x6F, "[": 0x59, "\\": 0x9A, "]": 0x5A,
+                    "^": 0x9B, "_": 0xA1, "a": 0x29, "b": 0x3C, "c": 0x33, "d": 0x32, "e": 0x28, "f": 0x3A, "g": 0x39,
+                    "h": 0x31, "i": 0x2D, "j": 0x62, "k": 0x3D, "l": 0x30, "m": 0x36, "n": 0x2E, "o": 0x2B, "p": 0x38,
+                    "q": 0x61, "r": 0x2C, "s": 0x2F, "t": 0x2A, "u": 0x34, "v": 0x3F, "w": 0x37, "x": 0x57, "y": 0x3B,
+                    "z": 0x65, "{": 0xA3, "|": 0xA4, "}": 0xA5, "`": 0xA2, "~": 0xAC,
+                    # Special command characters
+                    "â–¶": 0x02,  # Press A with prompt arrow.
+                    "â—Š": 0x03,  # Press A without prompt arrow.
+                    "\t": 0x01,  # Clear the text buffer; usually after pressing A to advance.
+                    "\b": 0x0A,  # Reset text alignment; usually after pressing A.
+                    "「": 0x06,  # Start orange text
+                    "�": 0x07,  # End orange text
+                    }
+
+# Characters that do not contribute to the line length.
+weightless_chars = {"\n", "▶", "◊", "\b", "\t", "「", "�"}
+
+
+def cvcotm_string_to_bytearray(cvcotm_text: str, textbox_type: Literal["big top", "big middle", "little middle"],
+                               speed: int, portrait: int = 0xFF, wrap: bool = True,
+                               skip_textbox_controllers: bool = False) -> bytearray:
+    """Converts a string into a textbox bytearray following CVCotM's string format."""
+    text_bytes = bytearray(0)
+    if portrait == 0xFF and textbox_type != "little middle":
+        text_bytes.append(0x0C)  # Insert the character to convert a 3-line named textbox into a 4-line nameless one.
+
+    # Figure out the start and end params for the textbox based on what type it is.
+    if textbox_type == "little middle":
+        main_control_start_param = 0x10
+        main_control_end_param = 0x20
+    elif textbox_type == "big top":
+        main_control_start_param = 0x40
+        main_control_end_param = 0xC0
+    else:
+        main_control_start_param = 0x80
+        main_control_end_param = 0xC0
+
+    # Figure out the number of lines and line length limit.
+    if textbox_type == "little middle":
+        total_lines = 1
+        len_limit = 29
+    elif textbox_type != "little middle" and portrait != 0xFF:
+        total_lines = 3
+        len_limit = 21
+    else:
+        total_lines = 4
+        len_limit = 23
+
+    # Wrap the text if we are opting to do so.
+    if wrap:
+        refined_text = cvcotm_text_wrap(cvcotm_text, len_limit, total_lines)
+    else:
+        refined_text = cvcotm_text
+
+    # Add the textbox control characters if we are opting to add them.
+    if not skip_textbox_controllers:
+        text_bytes.extend([0x1D, main_control_start_param + (speed & 0xF)])  # Speed should be a value between 0 and 15.
+
+    # Add the portrait (if we are adding one).
+    if portrait != 0xFF and textbox_type != "little middle":
+        text_bytes.extend([0x1E, portrait & 0xFF])
+
+    for i, char in enumerate(refined_text):
+        if char in cvcotm_char_dict:
+            text_bytes.extend([cvcotm_char_dict[char]])
+            # If we're pressing A to advance, add the text clear and reset alignment characters.
+            if char in ["â–¶", "â—Š"] and not skip_textbox_controllers:
+                text_bytes.extend([0x01, 0x0A])
+        else:
+            text_bytes.extend([0x48])
+
+    # Add the characters indicating the end of the whole message.
+    if not skip_textbox_controllers:
+        text_bytes.extend([0x1D, main_control_end_param, 0x00])
+    else:
+        text_bytes.extend([0x00])
+    return text_bytes
+
+
+def cvcotm_text_truncate(cvcotm_text: str, textbox_len_limit: int) -> str:
+    """Truncates a string at a given in-game text line length."""
+    line_len = 0
+
+    for i in range(len(cvcotm_text)):
+        if cvcotm_text[i] not in weightless_chars:
+            line_len += 1
+
+        if line_len > textbox_len_limit:
+            return cvcotm_text[0x00:i]
+
+    return cvcotm_text
+
+
+def cvcotm_text_wrap(cvcotm_text: str, textbox_len_limit: int, total_lines: int = 4) -> str:
+    """Rebuilds a string with some of its spaces replaced with newlines to ensure the text wraps properly in an in-game
+    textbox of a given length. If the number of lines allowed per textbox is exceeded, an A prompt will be placed
+    instead of a newline."""
+    words = cvcotm_text.split(" ")
+    new_text = ""
+    line_len = 0
+    num_lines = 1
+
+    for word_index, word in enumerate(words):
+        # Reset the word length to 0 on every word iteration and make its default divider a space.
+        word_len = 0
+        word_divider = " "
+
+        # Check if we're at the very beginning of a line and handle the situation accordingly by increasing the current
+        # line length to account for the space if we are not. Otherwise, the word divider should be nothing.
+        if line_len != 0:
+            line_len += 1
+        else:
+            word_divider = ""
+
+        new_word = ""
+
+        for char_index, char in enumerate(word):
+            # Check if the current character contributes to the line length.
+            if char not in weightless_chars:
+                line_len += 1
+                word_len += 1
+
+            # If we're looking at a manually-placed newline, add +1 to the lines counter and reset the length counters.
+            if char == "\n":
+                word_len = 0
+                line_len = 0
+                num_lines += 1
+                # If this puts us over the line limit, insert the A advance prompt character.
+                if num_lines > total_lines:
+                    num_lines = 1
+                    new_word += "â–¶"
+
+            # If we're looking at a manually-placed A advance prompt, reset the lines and length counters.
+            if char in ["â–¶", "â—Š"]:
+                word_len = 0
+                line_len = 0
+                num_lines = 1
+
+            # If the word alone is long enough to exceed the line length, wrap without moving the entire word.
+            if word_len > textbox_len_limit:
+                word_len = 1
+                line_len = 1
+                num_lines += 1
+                word_splitter = "\n"
+
+                # If this puts us over the line limit, replace the newline with the A advance prompt character.
+                if num_lines > total_lines:
+                    num_lines = 1
+                    word_splitter = "â–¶"
+
+                new_word += word_splitter
+
+            # If the total length of the current line exceeds the line length, wrap the current word to the next line.
+            if line_len > textbox_len_limit:
+                word_divider = "\n"
+                line_len = word_len
+                num_lines += 1
+                # If we're over the allowed number of lines to be displayed in the textbox, insert the A advance
+                # character instead.
+                if num_lines > total_lines:
+                    num_lines = 1
+                    word_divider = "â–¶"
+
+            # Add the character to the new word if the character is not a newline immediately following up an A advance.
+            if char != "\n" or new_word[len(new_word)-1] not in ["â–¶", "â—Š"]:
+                new_word += char
+
+        new_text += word_divider + new_word
+
+    return new_text
diff --git a/worlds/cvcotm/data/iname.py b/worlds/cvcotm/data/iname.py
new file mode 100644
index 000000000000..f121217fdf20
--- /dev/null
+++ b/worlds/cvcotm/data/iname.py
@@ -0,0 +1,36 @@
+double =      "Double"
+tackle =      "Tackle"
+kick_boots =  "Kick Boots"
+heavy_ring =  "Heavy Ring"
+cleansing =   "Cleansing"
+roc_wing =    "Roc Wing"
+last_key =    "Last Key"
+ironmaidens = "Maiden Detonator"
+
+heart_max =   "Heart Max Up"
+mp_max =      "MP Max Up"
+hp_max =      "HP Max Up"
+
+salamander =  "Salamander Card"
+serpent =     "Serpent Card"
+mandragora =  "Mandragora Card"
+golem =       "Golem Card"
+cockatrice =  "Cockatrice Card"
+manticore =   "Manticore Card"
+griffin =     "Griffin Card"
+thunderbird = "Thunderbird Card"
+unicorn =     "Unicorn Card"
+black_dog =   "Black Dog Card"
+mercury =     "Mercury Card"
+venus =       "Venus Card"
+jupiter =     "Jupiter Card"
+mars =        "Mars Card"
+diana =       "Diana Card"
+apollo =      "Apollo Card"
+neptune =     "Neptune Card"
+saturn =      "Saturn Card"
+uranus =      "Uranus Card"
+pluto =       "Pluto Card"
+
+dracula =        "The Count Downed"
+shinning_armor = "Where's My Super Suit?"
diff --git a/worlds/cvcotm/data/ips/AllowAlwaysDrop.ips b/worlds/cvcotm/data/ips/AllowAlwaysDrop.ips
new file mode 100644
index 0000000000000000000000000000000000000000..ece911545e907c7bdb2ccbcbc8108053f3feed49
GIT binary patch
literal 67
zcmWG=3~}~gw9R2)5%y?zW3=7Fz`~%M&XKOnz@Wn7HN}bf0;`vqB(ukKHx@57ndxo<
V>I@7W!VC-rwu~HQK<w)81_0y24b1=m

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/AllowSpeedDash.ips b/worlds/cvcotm/data/ips/AllowSpeedDash.ips
new file mode 100644
index 0000000000000000000000000000000000000000..6bbd34385c7a9985adf4147e576fbae42d9d75af
GIT binary patch
literal 66
zcmWG=3~}~g+vCB&!Qi*ujX^1$BVCDsL1TslTLqUM>qR#?vkG=S#*54z?QRSe5)xL1
SOdw?pS$o(x0)W`n-wgl}8xREm

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/BrokenMaidens.ips b/worlds/cvcotm/data/ips/BrokenMaidens.ips
new file mode 100644
index 0000000000000000000000000000000000000000..84cee2c227bdfb01a1cde17c4ab1c47398eb1af3
GIT binary patch
literal 54
zcmWG=3~}~gsBdB5VDRK{XH-b%NLOHBkYVv)QDiJIkeOq^py&|C<fGuuz)%^?#ME2Q
Jz~Soe1^^ui3UdGe

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/BuffFamiliars.ips b/worlds/cvcotm/data/ips/BuffFamiliars.ips
new file mode 100644
index 0000000000000000000000000000000000000000..73218fb3b115097a1a26bdf7a88fd51d3b6e4512
GIT binary patch
literal 44
ycmWG=3~}~gKX8hHv5x)hI|jyC?6<u@<nulT#y<AXa~K#;u>X6(z!>G~?*;%-Tn{k-

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/BuffSubweapons.ips b/worlds/cvcotm/data/ips/BuffSubweapons.ips
new file mode 100644
index 0000000000000000000000000000000000000000..373c1d425cfc13b7caddea85075eb14bfb0423af
GIT binary patch
literal 68
zcmWG=3~}~gdl|vNn8Nlkih;3~oqZnzdx|2X2E)Z(cCHHy?6qL_Ja)bX4D9w`b_%<o
O2m^Z_n7!83-wgmxZ4jma

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/CandleFix.ips b/worlds/cvcotm/data/ips/CandleFix.ips
new file mode 100644
index 0000000000000000000000000000000000000000..3b7ca775e0c0b13b7223fc87e5726300d81f152a
GIT binary patch
literal 20
bcmWG=3~~10t(Rb6+|1kB!@#)J)!z*OHuVK}

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/CardCombosRevealed.ips b/worlds/cvcotm/data/ips/CardCombosRevealed.ips
new file mode 100644
index 0000000000000000000000000000000000000000..88031074a8f55340d808cc01e7c18f28ea049cc6
GIT binary patch
literal 17
YcmWG=3~}~g`1*>0<$&7(H&=f*05<6cIsgCw

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/CardUp_v3_Custom2.ips b/worlds/cvcotm/data/ips/CardUp_v3_Custom2.ips
new file mode 100644
index 0000000000000000000000000000000000000000..e73ece2fbd06cf3d1e8f4f62bee5a9e5929e99da
GIT binary patch
literal 348
zcmWG=3~}~geHFmKbij@EdkO;wgC~dk!S-~H^!5V`CJLPj9e#=dK?xl}K=MIH2#{3h
z3<Ht^GJ-M;nv55jfXdexFnS5NSAJ*Z$OU57S0{j`c(l7IbO251P+%}&+7hOi5yjzI
z?Z#?6&#m8$X^)5w<83yt>24h^E-nmej0#LZHUoo79RtUOSF9YjfSC2Q3(ypxa3a{0
z1O^2LC60m_SxyBZiit5InvA!ZfL1Vg_PhDKX60xDV%Ap+7?{|qSYJmlFlhj(Dh4La
zD%R%}Kx4e;yLo`U<iL=z!qt`IM{7FAhXf57MVU~gT`>$=j2BqE7#=WrffP18XXV(y
zz{}wP)W84+AOHJaHfi|rA4Ib@`~lMbP&yD!i-P5YFRL^#Fns(Ud|9-?)!z*OD0+C7

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/Countdown.ips b/worlds/cvcotm/data/ips/Countdown.ips
new file mode 100644
index 0000000000000000000000000000000000000000..4da69502a94093ee4b36ebaa0998912499b4a43a
GIT binary patch
literal 240
zcmWG=3~}~gQ<}!W#puD{&cIM>kj{~Az`$^Y&6A^oUxV@Pe+AYD3>wTAJu8?r87}@;
zC;%$@6U@X^utnIjfx#()LG`}^8xxzeK*t6r$qNU$88mq>^7=S(b}}SK$SX2BFe-F7
zNH{QPFkECbWiopGoZZKP#eqjLh5=|ANaWFT4Vi*HKvPZ9IZA-$mV_}e{r`U8|9=gZ
ziwp_^o*WGx4Z;upe?R`;k-<Ttk%3d9lY!H#Q$j$2aSQVTMuRptb}trXMg=w>1$V{`
l+Y~z)awRk?PBJh9y>sUhFUJf92DX`e3>*uU*f?DM-2h<ELt+2`

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/DSSGlitchFix.ips b/worlds/cvcotm/data/ips/DSSGlitchFix.ips
new file mode 100644
index 0000000000000000000000000000000000000000..1cc78a4e344bfdab88bbbaab66f262a650c85b27
GIT binary patch
literal 95
zcmWG=3~}~gc$~n%!Qk2N#vq%{kuJ-?;IvVpfx$$A#gn7LRD<I}xCYw=CNBk<>23iG
s3``l188{r2R>Zg)D8?{oGG1H|vm(S1$PWbbUxE40pS$|I)&Ktw0H9AD-2eap

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/DSSRunSpeed.ips b/worlds/cvcotm/data/ips/DSSRunSpeed.ips
new file mode 100644
index 0000000000000000000000000000000000000000..33c29c2367981cb5939489cc296309093d03844f
GIT binary patch
literal 18
ZcmWG=3~~10V-;dxWny4pU~%<#0{|M>0($@e

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/DemoForceFirst.ips b/worlds/cvcotm/data/ips/DemoForceFirst.ips
new file mode 100644
index 0000000000000000000000000000000000000000..26e12794d34b3ca0f0e00caa4158d60dbfadcb39
GIT binary patch
literal 15
WcmWG=3~}~gWYJ(?VpMeXcLM+xg94lY

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/DropReworkMultiEdition.ips b/worlds/cvcotm/data/ips/DropReworkMultiEdition.ips
new file mode 100644
index 0000000000000000000000000000000000000000..a11303195626c3f3049778697b655128879b7ac4
GIT binary patch
literal 783
zcmX|9Pe>F|82{e<S>Nbv%`PNUOtga*BN?ql;34hl<m}E0B_gt}mo>7P;~o<to`;nY
zBE-|y$-s-Cm&lukg*@a<shb6>L=+?_3VTteZ&tU{_kO>R_x--#@4b<MF*{2hb^`^M
zX0C9LlD^J!;5NWAf-GdN&tj+l3AB>;5$r)I@1KG=Fzd+&(QPCL=8!yo2jr1_ymUT;
z;0$FV8i@V9vPWP1*#vQI&ht2s;-a*u3Vg`1d?_8tuN=!%TL%*)QI&GgsZDZ;tCc}%
zhZ?j7a5y6f!adR>b{+m8DK@BW2pcp5z$K=N3&KJqa;J~bWDYv=kSNTzkrZWM(QTno
z<J;uEbo*#m?4Y$gB=tl<Qe33A#`93hG@0rJL((Oj9cjjLpIde>GaS{tQ(;w`GL4rq
zQ9r#d8DV`hlnphv49TlnP=!{P>9YZqt8I#_3^QFXD(-K>^n8(KE5(X$8R^FMe<4m!
z&Zg<f{xtmtAi*mVV`yo_3F}`&(O{12Ku*i7p)U<pwvdbPWItlm9XDB_#UkIs`f8Xm
zqD0<0QI_++Wa^cd;0C}{0<`vaET(pgXj6$KB-)WO2|$8)<u4%P3Gh^d)AT3iFuytz
z8G3Lg8}Z>wxjho#`tghP)yDcl3Iu9W`vb6RE5P)YTq2-$dc)!|d<1}ol{X%3+WGiW
z5bjPWbk!{7AN#ccEZ9*~q<73LjfVB!vvI6l0SB-xj$DCbfJ$Ktl&qo$!J(-LgjuK%
zYv@>9&ic=uJKbdo)tV7T8b2{k??9%}w}|3dO%uO0kW!jWdDe${$qnmA|AP`RD1e)<
Lfhri+&{O9hGmg#u

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/GameClearBypass.ips b/worlds/cvcotm/data/ips/GameClearBypass.ips
new file mode 100644
index 0000000000000000000000000000000000000000..5fc351b3972355dc91948a420681c28278e934d3
GIT binary patch
literal 29
jcmWG=3~}~gm_LbuNluwz|0N)$$S^UDfr){^)!z*OYug5j

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/MPComboFix.ips b/worlds/cvcotm/data/ips/MPComboFix.ips
new file mode 100644
index 0000000000000000000000000000000000000000..4c7dfab36e5795fecd288965458714a6b4e2658c
GIT binary patch
literal 15
WcmWG=3~~10^H{;a#K7R{?*;%I-~&ql

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/MapEdits.ips b/worlds/cvcotm/data/ips/MapEdits.ips
new file mode 100644
index 0000000000000000000000000000000000000000..4e4c07551698ce221179b731aa2b7f6650321c4e
GIT binary patch
literal 32
lcmWG=3~}~|(Obj7%+0_Uqo2UQ%*enMdno`!bGZ7u0RV051{44Q

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/MultiLastKey.ips b/worlds/cvcotm/data/ips/MultiLastKey.ips
new file mode 100644
index 0000000000000000000000000000000000000000..20df85d1c91fccaf6794930013064a8546d08784
GIT binary patch
literal 191
zcmWG=3~}~gIGx5|X5`1<(e9=opU!c>4HGgb7|LjQF@Jdc<Fi5o1CxP=3qysWjJg-Y
z850K99~lg6Ul{IhXJEX|8NGmknL$3CGe?nu@m9J#1A_#!hoS^W1)~8+0Ta*y28MIY
z3=B`AIXTkh6&P$JR9HP(y#zWq8klUDjF=1=bbj37@a%Vc1T@kC=$2oBKLafTV*(ih
Q5Kt4yYdOup;p*=O0QAB(N&o-=

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/NoDSSDrops.ips b/worlds/cvcotm/data/ips/NoDSSDrops.ips
new file mode 100644
index 0000000000000000000000000000000000000000..350686c6eb3d22641ed56377c63340399188c9b1
GIT binary patch
literal 232
zcmWG=3~~10*&M*Y$iTBX14M3#0Fyajatest$^#}1z@!J5Yyp#Nz~mJ$`3FR9Qvj1D
zV6p^E&H<6z1;AtvnA`v&cQ}B_31D&wn0x>tcRm4;yTG>W0^72?10=Hh0GPZ1BKHJ<
oNwCR#PJq~ZMHpBa7=AJ6@a(l=VAY1OG8h=OdG^)-NmqY204o798~^|S

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/NoMPDrain.ips b/worlds/cvcotm/data/ips/NoMPDrain.ips
new file mode 100644
index 0000000000000000000000000000000000000000..7481a63b556cbf2c09e957d8837ef4416695b90d
GIT binary patch
literal 17
YcmWG=3~}~gJ28cU#qEIG0at%F05I|ey#N3J

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/PermanentDash.ips b/worlds/cvcotm/data/ips/PermanentDash.ips
new file mode 100644
index 0000000000000000000000000000000000000000..458c8c935ac9d1bfa6a969a8f70398163bf7199b
GIT binary patch
literal 33
ncmWG=3~}~gGw@(wWMJFq!N7FDjcsEh1LFg>jSWB{SARDEf`SMF

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/SeedDisplay20Digits.ips b/worlds/cvcotm/data/ips/SeedDisplay20Digits.ips
new file mode 100644
index 0000000000000000000000000000000000000000..ffcd22972d0f6add0c5ab34306e07cf30531e4b1
GIT binary patch
literal 110
zcmWG=3~}~gIHkbA!Qj#E#-Nzak*>(V5c12AQGug?&5O-bL|LGNqk++y$%x62LHoxY
zW{-`E?QS|ig+VzCY#OH+ICKN_0`vn60t^F;0*nJp0!#zU0?Y#}0xScp0;~gU0&D~9
M0_+1E0$lyw0Ge1E00000

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/ShooterStrength.ips b/worlds/cvcotm/data/ips/ShooterStrength.ips
new file mode 100644
index 0000000000000000000000000000000000000000..865d201c387cf3aad887278511311844b0de5bfa
GIT binary patch
literal 16
XcmWG=3~~10<M_kCoWj86>hA^sB1{9$

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/ips/SoftlockBlockFix.ips b/worlds/cvcotm/data/ips/SoftlockBlockFix.ips
new file mode 100644
index 0000000000000000000000000000000000000000..5f4f4b902b5f5c08eb016a91aeac64ce431da840
GIT binary patch
literal 15
WcmWG=3~~10)%w7|#8~g@?*;%M2?O*1

literal 0
HcmV?d00001

diff --git a/worlds/cvcotm/data/lname.py b/worlds/cvcotm/data/lname.py
new file mode 100644
index 000000000000..4ef312f2fa23
--- /dev/null
+++ b/worlds/cvcotm/data/lname.py
@@ -0,0 +1,128 @@
+sr3   = "Sealed Room: Main shaft left fake wall"
+cc1   = "Catacomb: Push crate treasure room"
+cc3   = "Catacomb: Fleamen brain room - Lower"
+cc3b  = "Catacomb: Fleamen brain room - Upper"
+cc4   = "Catacomb: Earth Demon dash room"
+cc5   = "Catacomb: Tackle block treasure room"
+cc8   = "Catacomb: Earth Demon bone pit - Lower"
+cc8b  = "Catacomb: Earth Demon bone pit - Upper"
+cc9   = "Catacomb: Below right column save room"
+cc10  = "Catacomb: Right column fake wall"
+cc13  = "Catacomb: Right column Spirit room"
+cc14  = "Catacomb: Muddy Mudman platforms room - Lower"
+cc14b = "Catacomb: Muddy Mudman platforms room - Upper"
+cc16  = "Catacomb: Slide space zone"
+cc20  = "Catacomb: Pre-Cerberus lone Skeleton room"
+cc22  = "Catacomb: Pre-Cerberus Hopper treasure room"
+cc24  = "Catacomb: Behind Cerberus"
+cc25  = "Catacomb: Mummies' fake wall"
+as2   = "Abyss Staircase: Lower fake wall"
+as3   = "Abyss Staircase: Loopback drop"
+as4   = "Abyss Staircase: Roc ledge"
+as9   = "Abyss Staircase: Upper fake wall"
+ar4   = "Audience Room: Skeleton foyer fake wall"
+ar7   = "Audience Room: Main gallery fake wall"
+ar8   = "Audience Room: Below coyote jump"
+ar9   = "Audience Room: Push crate gallery"
+ar10  = "Audience Room: Past coyote jump"
+ar11  = "Audience Room: Tackle block gallery"
+ar14  = "Audience Room: Wicked roc chamber - Lower"
+ar14b = "Audience Room: Wicked roc chamber - Upper"
+ar16  = "Audience Room: Upper Devil Tower hallway"
+ar17  = "Audience Room: Right exterior - Lower"
+ar17b = "Audience Room: Right exterior - Upper"
+ar18  = "Audience Room: Right exterior fake wall"
+ar19  = "Audience Room: 100 meter skelly dash hallway"
+ar21  = "Audience Room: Lower Devil Tower hallway fake wall"
+ar25  = "Audience Room: Behind Necromancer"
+ar26  = "Audience Room: Below Machine Tower roc ledge"
+ar27  = "Audience Room: Below Machine Tower push crate room"
+ar30  = "Audience Room: Roc horse jaguar armory - Left"
+ar30b = "Audience Room: Roc horse jaguar armory - Right"
+ow0   = "Outer Wall: Left roc ledge"
+ow1   = "Outer Wall: Right-brained ledge"
+ow2   = "Outer Wall: Fake Nightmare floor"
+th1   = "Triumph Hallway: Skeleton slopes fake wall"
+th3   = "Triumph Hallway: Entrance Flame Armor climb"
+mt0   = "Machine Tower: Foxy platforms ledge"
+mt2   = "Machine Tower: Knight fox meeting room"
+mt3   = "Machine Tower: Boneheaded argument wall kicks room"
+mt4   = "Machine Tower: Foxy fake wall"
+mt6   = "Machine Tower: Skelly-rang wall kicks room"
+mt8   = "Machine Tower: Fake Lilim wall"
+mt10  = "Machine Tower: Thunderous zone fake wall"
+mt11  = "Machine Tower: Thunderous zone lone Stone Armor room"
+mt13  = "Machine Tower: Top lone Stone Armor room"
+mt14  = "Machine Tower: Stone fox hallway"
+mt17  = "Machine Tower: Pre-Iron Golem fake wall"
+mt19  = "Machine Tower: Behind Iron Golem"
+ec5   = "Eternal Corridor: Midway fake wall"
+ec7   = "Eternal Corridor: Skelly-rang wall kicks room"
+ec9   = "Eternal Corridor: Skelly-rang fake wall"
+ct1   = "Chapel Tower: Flame Armor climb room"
+ct4   = "Chapel Tower: Lower chapel push crate room"
+ct5   = "Chapel Tower: Lower chapel fake wall"
+ct6   = "Chapel Tower: Beastly wall kicks room - Brain side"
+ct6b  = "Chapel Tower: Beastly wall kicks room - Brawn side"
+ct8   = "Chapel Tower: Middle chapel fake wall"
+ct10  = "Chapel Tower: Middle chapel push crate room"
+ct13  = "Chapel Tower: Sharp mind climb room"
+ct15  = "Chapel Tower: Upper chapel fake wall"
+ct16  = "Chapel Tower: Upper chapel Marionette wall kicks"
+ct18  = "Chapel Tower: Upper belfry fake wall"
+ct21  = "Chapel Tower: Iron maiden switch"
+ct22  = "Chapel Tower: Behind Adramelech iron maiden"
+ct26  = "Chapel Tower: Outside Battle Arena - Upper"
+ct26b = "Chapel Tower: Outside Battle Arena - Lower"
+ug0   = "Underground Gallery: Conveyor platform ride"
+ug1   = "Underground Gallery: Conveyor upper push crate room"
+ug2   = "Underground Gallery: Conveyor lower push crate room"
+ug3   = "Underground Gallery: Harpy climb room - Lower"
+ug3b  = "Underground Gallery: Harpy climb room - Upper"
+ug8   = "Underground Gallery: Harpy mantis tackle hallway"
+ug10  = "Underground Gallery: Handy bee hallway"
+ug13  = "Underground Gallery: Myconid fake wall"
+ug15  = "Underground Gallery: Crumble bridge fake wall"
+ug20  = "Underground Gallery: Behind Dragon Zombies"
+uw1   = "Underground Warehouse: Entrance push crate room"
+uw6   = "Underground Warehouse: Forever pushing room"
+uw8   = "Underground Warehouse: Crate-nudge fox room"
+uw9   = "Underground Warehouse: Crate-nudge fake wall"
+uw10  = "Underground Warehouse: Succubus shaft roc ledge"
+uw11  = "Underground Warehouse: Fake Lilith wall"
+uw14  = "Underground Warehouse: Optional puzzle ceiling fake wall"
+uw16  = "Underground Warehouse: Holy fox hideout - Left"
+uw16b = "Underground Warehouse: Holy fox hideout - Right roc ledge"
+uw19  = "Underground Warehouse: Forest Armor's domain fake wall"
+uw23  = "Underground Warehouse: Behind Death"
+uw24  = "Underground Warehouse: Behind Death fake wall"
+uw25  = "Underground Warehouse: Dryad expulsion chamber"
+uy1   = "Underground Waterway: Entrance fake wall"
+uy3   = "Underground Waterway: Before illusory wall"
+uy3b  = "Underground Waterway: Beyond illusory wall"
+uy4   = "Underground Waterway: Ice Armor's domain fake wall"
+uy5   = "Underground Waterway: Brain freeze room"
+uy7   = "Underground Waterway: Middle lone Ice Armor room"
+uy8   = "Underground Waterway: Roc fake ceiling"
+uy9   = "Underground Waterway: Wicked Fishhead moat - Bottom"
+uy9b  = "Underground Waterway: Wicked Fishhead moat - Top"
+uy12  = "Underground Waterway: Lizard-man turf - Bottom"
+uy12b = "Underground Waterway: Lizard-man turf - Top"
+uy13  = "Underground Waterway: Roc exit shaft"
+uy17  = "Underground Waterway: Behind Camilla"
+uy18  = "Underground Waterway: Roc exit shaft fake wall"
+ot1   = "Observation Tower: Wind Armor rampart"
+ot2   = "Observation Tower: Legion plaza fake wall"
+ot3   = "Observation Tower: Legion plaza Minotaur hallway"
+ot5   = "Observation Tower: Siren balcony fake wall"
+ot8   = "Observation Tower: Evil Pillar pit fake wall"
+ot9   = "Observation Tower: Alraune garden"
+ot12  = "Observation Tower: Dark Armor's domain fake wall"
+ot13  = "Observation Tower: Catoblepeas hallway"
+ot16  = "Observation Tower: Near warp room fake wall"
+ot20  = "Observation Tower: Behind Hugh"
+cr1   = "Ceremonial Room: Fake floor"
+ba24  = "Battle Arena: End reward"
+
+arena_victory = "Arena Victory"
+dracula = "Dracula"
diff --git a/worlds/cvcotm/data/patches.py b/worlds/cvcotm/data/patches.py
new file mode 100644
index 000000000000..c2a9aa791f91
--- /dev/null
+++ b/worlds/cvcotm/data/patches.py
@@ -0,0 +1,431 @@
+remote_textbox_shower = [
+    # Pops up the textbox(s) of whatever textbox IDs is written at 0x02025300 and 0x02025302 and increments the current
+    # received item index at 0x020253D0 if a number to increment it by is written at 0x02025304. Also plays the sound
+    # effect of the ID written at 0x02025306, if one is written there. This will NOT give any items on its own; the item
+    # has to be written by the client into the inventory alongside writing the above-mentioned things.
+
+    # Make sure we didn't hit the lucky one frame before room transitioning wherein Nathan is on top of the room
+    # transition tile.
+    0x0C, 0x88,  # ldrh r4, [r1]
+    0x80, 0x20,  # movs r0, #0x80
+    0x20, 0x40,  # ands r0, r4
+    0x00, 0x28,  # cmp  r0, #0
+    0x2F, 0xD1,  # bne  0x87FFF8A
+    0x11, 0xB4,  # push r0, r4
+    # Check the cutscene value to make sure we are not in a cutscene; forcing a textbox while there's already another
+    # textbox on-screen messes things up.
+    0x1E, 0x4A,  # ldr  r2, =0x2026000
+    0x13, 0x78,  # ldrb r3, [r2]
+    0x00, 0x2B,  # cmp  r0, #0
+    0x29, 0xD1,  # bne  0x87FFF88
+    # Check our "delay" timer buffer for a non-zero. If it is, decrement it by one and skip straight to the return part
+    # of this code, as we may have received an item on a frame wherein it's "unsafe" to pop the item textbox.
+    0x16, 0x4A,  # ldr  r2, =0x2025300
+    0x13, 0x89,  # ldrh r3, [r2, #8]
+    0x00, 0x2B,  # cmp  r0, #0
+    0x02, 0xD0,  # beq  0x87FFF42
+    0x01, 0x3B,  # subs r3, #1
+    0x13, 0x81,  # strh r3, [r2, #8]
+    0x22, 0xE0,  # beq  0x87FFF88
+    # Check our first custom "textbox ID" buffers for a non-zero number.
+    0x10, 0x88,  # ldrh r0, [r2]
+    0x00, 0x28,  # cmp  r0, #0
+    0x12, 0xD0,  # beq  0x87FFF6E
+    # Increase the "received item index" by the specified number in our "item index amount to increase" buffer.
+    0x93, 0x88,  # ldrh r3, [r2, #4]
+    0xD0, 0x32,  # adds r2, #0xD0
+    0x11, 0x88,  # ldrh r1, [r2]
+    0xC9, 0x18,  # adds r1, r1, r3
+    0x11, 0x80,  # strh r1, [r2]
+    # Check our second custom "textbox ID" buffers for a non-zero number.
+    0xD0, 0x3A,  # subs r2, #0xD0
+    0x51, 0x88,  # ldrh r1, [r2, #2]
+    0x00, 0x29,  # cmp  r1, #0
+    0x01, 0xD0,  # beq  0x87FFF5E
+    # If we have a second textbox ID, run the "display two textboxes" function.
+    # Otherwise, run the "display one textbox" function.
+    0x0E, 0x4A,  # ldr  r2, =0x805F104
+    0x00, 0xE0,  # b    0x87FFF60
+    0x0E, 0x4A,  # ldr  r2, =0x805F0C8
+    0x7B, 0x46,  # mov  r3, r15
+    0x05, 0x33,  # adds r3, #5
+    0x9E, 0x46,  # mov  r14, r3
+    0x97, 0x46,  # mov  r15, r2
+    0x09, 0x48,  # ldr  r0, =0x2025300
+    0x02, 0x21,  # movs r1, #2
+    0x01, 0x81,  # strh r1, [r0, #8]
+    # Check our "sound effect ID" buffer and run the "play sound" function if it's a non-zero number.
+    0x08, 0x48,  # ldr  r0, =0x2025300
+    0xC0, 0x88,  # ldrh r0, [r0, #6]
+    0x00, 0x28,  # cmp  r0, #0
+    0x04, 0xD0,  # beq  0x87FFF7E
+    0x0B, 0x4A,  # ldr  r2, =0x8005E80
+    0x7B, 0x46,  # mov  r3, r15
+    0x05, 0x33,  # adds r3, #5
+    0x9E, 0x46,  # mov  r14, r3
+    0x97, 0x46,  # mov  r15, r2
+    # Clear all our buffers and return to the "check for Nathan being in a room transition" function we've hooked into.
+    0x03, 0x48,  # ldr  r0, =0x2025300
+    0x00, 0x21,  # movs r1, #0
+    0x01, 0x60,  # str  r1, [r0]
+    0x41, 0x60,  # str  r1, [r0, #4]
+    0x11, 0xBC,  # pop  r0, r4
+    0x04, 0x4A,  # ldr  r2, =0x8007D68
+    0x00, 0x28,  # cmp  r0, #0
+    0x97, 0x46,  # mov  r15, r2
+    # LDR number pool
+    0x00, 0x53, 0x02, 0x02,
+    0x04, 0xF1, 0x05, 0x08,
+    0xC8, 0xF0, 0x05, 0x08,
+    0x68, 0x7D, 0x00, 0x08,
+    0x90, 0x1E, 0x02, 0x02,
+    0x80, 0x5E, 0x00, 0x08,
+    0x00, 0x60, 0x02, 0x02
+]
+
+transition_textbox_delayer = [
+    # Sets the remote item textbox delay timer whenever the player screen transitions to ensure the item textbox won't
+    # pop during said transition.
+    0x40, 0x78,  # ldrb r0, [r0, #1]
+    0x28, 0x70,  # strb r0, [r5]
+    0xF8, 0x6D,  # ldr  r0, [r7, #0x5C]
+    0x20, 0x18,  # adds r0, r4, r0
+    0x02, 0x4A,  # ldr  r2, =0x2025300
+    0x10, 0x23,  # movs r3, #0x10
+    0x13, 0x80,  # strh r3, [r2]
+    0x02, 0x4A,  # ldr  r2, =0x806CE1C
+    0x97, 0x46,  # mov  r15, r2
+    0x00, 0x00,
+    # LDR number pool
+    0x08, 0x53, 0x02, 0x02,
+    0x1C, 0xCE, 0x06, 0x08,
+]
+
+magic_item_sfx_customizer = [
+    # Enables a different sound to be played depending on which Magic Item was picked up. The array starting at 086797C0
+    # contains each 2-byte sound ID for each Magic Item. Putting 0000 for a sound will cause no sound to play; this is
+    # currently used for the dummy AP Items as their sound is played by the "sent" textbox instead.
+    0x70, 0x68,  # ldr  r0, [r6, #4]
+    0x80, 0x79,  # ldrb r0, [r0, #6]
+    0x40, 0x00,  # lsl  r0, r0, 1
+    0x07, 0x49,  # ldr  r1, =0x86797C0
+    0x08, 0x5A,  # ldrh r0, [r1, r0]
+    0x00, 0x28,  # cmp  r0, 0
+    0x04, 0xD0,  # beq  0x8679818
+    0x03, 0x4A,  # ldr  r2, =0x8005E80
+    0x7B, 0x46,  # mov  r3, r15
+    0x05, 0x33,  # adds r3, #5
+    0x9E, 0x46,  # mov  r14, r3
+    0x97, 0x46,  # mov  r15, r2
+    0x01, 0x48,  # ldr  r0, =0x8095BEC
+    0x87, 0x46,  # mov  r15, r0
+    # LDR number pool
+    0x80, 0x5E, 0x00, 0x08,
+    0xEC, 0x5B, 0x09, 0x08,
+    0xC0, 0x97, 0x67, 0x08,
+]
+
+start_inventory_giver = [
+    # This replaces AutoDashBoots.ips from standalone CotMR by allowing the player to start with any set of items, not
+    # just the Dash Boots. If playing Magician Mode, they will be given all cards that were not put into the starting
+    # inventory right after this code runs.
+
+    # Magic Items
+    0x13, 0x48,  # ldr  r0, =0x202572F
+    0x14, 0x49,  # ldr  r1, =0x8680080
+    0x00, 0x22,  # mov  r2, #0
+    0x8B, 0x5C,  # ldrb r3, [r1, r2]
+    0x83, 0x54,  # strb r3, [r0, r2]
+    0x01, 0x32,  # adds r2, #1
+    0x08, 0x2A,  # cmp  r2, #8
+    0xFA, 0xDB,  # blt  0x8680006
+    # Max Ups
+    0x11, 0x48,  # ldr  r0, =0x202572C
+    0x12, 0x49,  # ldr  r1, =0x8680090
+    0x00, 0x22,  # mov  r2, #0
+    0x8B, 0x5C,  # ldrb r3, [r1, r2]
+    0x83, 0x54,  # strb r3, [r0, r2]
+    0x01, 0x32,  # adds r2, #1
+    0x03, 0x2A,  # cmp  r2, #3
+    0xFA, 0xDB,  # blt  0x8680016
+    # Cards
+    0x0F, 0x48,  # ldr  r0, =0x2025674
+    0x10, 0x49,  # ldr  r1, =0x86800A0
+    0x00, 0x22,  # mov  r2, #0
+    0x8B, 0x5C,  # ldrb r3, [r1, r2]
+    0x83, 0x54,  # strb r3, [r0, r2]
+    0x01, 0x32,  # adds r2, #1
+    0x14, 0x2A,  # cmp  r2, #0x14
+    0xFA, 0xDB,  # blt  0x8680026
+    # Inventory Items (not currently supported)
+    0x0D, 0x48,  # ldr  r0, =0x20256ED
+    0x0E, 0x49,  # ldr  r1, =0x86800C0
+    0x00, 0x22,  # mov  r2, #0
+    0x8B, 0x5C,  # ldrb r3, [r1, r2]
+    0x83, 0x54,  # strb r3, [r0, r2]
+    0x01, 0x32,  # adds r2, #1
+    0x36, 0x2A,  # cmp  r2, #36
+    0xFA, 0xDB,  # blt  0x8680036
+    # Return to the function that checks for Magician Mode.
+    0xBA, 0x21,  # movs r1, #0xBA
+    0x89, 0x00,  # lsls r1, r1, #2
+    0x70, 0x18,  # adds r0, r6, r1
+    0x04, 0x70,  # strb r4, [r0]
+    0x00, 0x4A,  # ldr  r2, =0x8007F78
+    0x97, 0x46,  # mov  r15, r2
+    # LDR number pool
+    0x78, 0x7F, 0x00, 0x08,
+    0x2F, 0x57, 0x02, 0x02,
+    0x80, 0x00, 0x68, 0x08,
+    0x2C, 0x57, 0x02, 0x02,
+    0x90, 0x00, 0x68, 0x08,
+    0x74, 0x56, 0x02, 0x02,
+    0xA0, 0x00, 0x68, 0x08,
+    0xED, 0x56, 0x02, 0x02,
+    0xC0, 0x00, 0x68, 0x08,
+]
+
+max_max_up_checker = [
+    # Whenever the player picks up a Max Up, this will check to see if they currently have 255 of that particular Max Up
+    # and only increment the number further if they don't. This is necessary for extreme Item Link seeds, as going over
+    # 255 of any Max Up will reset the counter to 0.
+    0x08, 0x78,  # ldrb r0, [r1]
+    0xFF, 0x28,  # cmp  r0, 0xFF
+    0x17, 0xD1,  # bne  0x86A0036
+    # If it's an HP Max, refill our HP.
+    0xFF, 0x23,  # mov  r3, #0xFF
+    0x0B, 0x40,  # and  r3, r1
+    0x2D, 0x2B,  # cmp  r3, 0x2D
+    0x03, 0xD1,  # bne  0x86A0016
+    0x0D, 0x4A,  # ldr  r2, =0x202562E
+    0x93, 0x88,  # ldrh r3, [r2, #4]
+    0x13, 0x80,  # strh r3, [r2]
+    0x11, 0xE0,  # b    0x86A003A
+    # If it's an MP Max, refill our MP.
+    0x2E, 0x2B,  # cmp  r3, 0x2E
+    0x03, 0xD1,  # bne  0x86A0022
+    0x0B, 0x4A,  # ldr  r2, =0x2025636
+    0x93, 0x88,  # ldrh r3, [r2, #4]
+    0x13, 0x80,  # strh r3, [r2]
+    0x0B, 0xE0,  # b    0x86A003A
+    # Else, meaning it's a Hearts Max, add +6 Hearts. If adding +6 Hearts would put us over our current max, set our
+    # current amount to said current max instead.
+    0x0A, 0x4A,  # ldr  r2, =0x202563C
+    0x13, 0x88,  # ldrh r3, [r2]
+    0x06, 0x33,  # add  r3, #6
+    0x51, 0x88,  # ldrh r1, [r2, #2]
+    0x8B, 0x42,  # cmp  r3, r1
+    0x00, 0xDB,  # blt  0x86A0030
+    0x0B, 0x1C,  # add  r3, r1, #0
+    0x13, 0x80,  # strh r3, [r2]
+    0x02, 0xE0,  # b 0x86A003A
+    0x00, 0x00,
+    # Increment the Max Up count like normal. Should only get here if the Max Up count was determined to be less than
+    # 255, branching past if not the case.
+    0x01, 0x30,  # adds r0, #1
+    0x08, 0x70,  # strb r0, [r1]
+    # Return to the function that gives Max Ups normally.
+    0x05, 0x48,  # ldr  r0, =0x1B3
+    0x00, 0x4A,  # ldr  r2, =0x805E170
+    0x97, 0x46,  # mov  r15, r2
+    # LDR number pool
+    0x78, 0xE1, 0x05, 0x08,
+    0x2E, 0x56, 0x02, 0x02,
+    0x36, 0x56, 0x02, 0x02,
+    0x3C, 0x56, 0x02, 0x02,
+    0xB3, 0x01, 0x00, 0x00,
+]
+
+maiden_detonator = [
+    # Detonates the iron maidens upon picking up the Maiden Detonator item by setting the "broke iron maidens" flag.
+    0x2A, 0x20,  # mov  r0, #0x2A
+    0x03, 0x4A,  # ldr  r2, =0x8007E24
+    0x7B, 0x46,  # mov  r3, r15
+    0x05, 0x33,  # adds r3, #5
+    0x9E, 0x46,  # mov  r14, r3
+    0x97, 0x46,  # mov  r15, r2
+    0x01, 0x4A,  # ldr  r2, =0x8095BE4
+    0x97, 0x46,  # mov  r15, r2
+    # LDR number pool
+    0x24, 0x7E, 0x00, 0x08,
+    0xE4, 0x5B, 0x09, 0x08,
+]
+
+doubleless_roc_midairs_preventer = [
+    # Prevents being able to Roc jump in midair without the Double. Will pass if the jump counter is 0 or if Double is
+    # in the inventory.
+    # Check for Roc Wing in the inventory normally.
+    0x58, 0x18,  # add  r0, r3, r1
+    0x00, 0x78,  # ldrb r0, [r0]
+    0x00, 0x28,  # cmp  r0, 0
+    0x11, 0xD0,  # beq  0x8679A2C
+    # Check the "jumps since last on the ground" counter. Is it 0?
+    # If so, then we are on the ground and can advance to the Kick Boots question. If not, advance to the Double check.
+    0x0B, 0x48,  # ldr  r0, =0x2000080
+    0x01, 0x78,  # ldrb r1, [r0]
+    0x00, 0x29,  # cmp  r1, 0
+    0x03, 0xD0,  # beq  0x8679A18
+    # Check for Double in the inventory. Is it there?
+    # If not, then it's not time to Roc! Otherwise, advance to the next check.
+    0x0A, 0x4A,  # ldr  r2, =0x202572F
+    0x52, 0x78,  # ldrb r2, [r2, 1]
+    0x00, 0x2A,  # cmp  r2, 0
+    0x09, 0xD0,  # beq  0x8679A2C
+    # Check for Kick Boots in the inventory. Are they there?
+    # If they are, then we can definitely Roc! If they aren't, however, then on to the next question...
+    0x08, 0x4A,  # ldr  r2, =0x202572F
+    0xD2, 0x78,  # ldrb r2, [r2, 3]
+    0x00, 0x2A,  # cmp  r2, 0
+    0x03, 0xD1,  # bne  0x8679A28
+    # Is our "jumps since last on the ground" counter 2?
+    # If it is, then we already Double jumped and should not Roc jump as well.
+    # Should always pass if we came here from the "on the ground" 0 check.
+    0x02, 0x29,  # cmp  r1, 2
+    0x03, 0xD0,  # beq  0x8679A2C
+    # If we did not Double jump yet, then set the above-mentioned counter to 2, and now we can finally Roc on!
+    0x02, 0x21,  # mov  r1, 2
+    0x01, 0x70,  # strb r1, [r0]
+    # Go to the "Roc jump" code.
+    0x01, 0x4A,  # ldr  r2, =0x806B8A8
+    0x97, 0x46,  # mov  r15, r2
+    # Go to the "don't Roc jump" code.
+    0x01, 0x4A,  # ldr  r2, =0x806B93C
+    0x97, 0x46,  # mov  r15, r2
+    # LDR number pool
+    0xA8, 0xB8, 0x06, 0x08,
+    0x3C, 0xB9, 0x06, 0x08,
+    0x80, 0x00, 0x00, 0x02,
+    0x2F, 0x57, 0x02, 0x02,
+]
+
+kickless_roc_height_shortener = [
+    # Shortens the amount of time spent rising with Roc Wing if the player doesn't have Kick Boots.
+    0x06, 0x49,  # ldr  r1, =0x202572F
+    0xC9, 0x78,  # ldrb r1, [r1, 3]
+    0x00, 0x29,  # cmp  r1, 0
+    0x00, 0xD1,  # bne  0x8679A6A
+    0x10, 0x20,  # mov  r0, 0x12
+    0xA8, 0x65,  # str  r0, [r5, 0x58]
+    # Go back to the Roc jump code.
+    0x00, 0x24,  # mov  r4, 0
+    0x2C, 0x64,  # str  r4, [r5, 0x40]
+    0x03, 0x49,  # ldr  r1, =0x80E03A0
+    0x01, 0x4A,  # ldr  r2, =0x806B8BC
+    0x97, 0x46,  # mov  r15, r2
+    0x00, 0x00,
+    # LDR number pool
+    0xBC, 0xB8, 0x06, 0x08,
+    0x2F, 0x57, 0x02, 0x02,
+    0xA0, 0x03, 0x0E, 0x08
+]
+
+missing_char_data = {
+    # The pixel data for all ASCII characters missing from the game's dialogue textbox font.
+
+    # Each character consists of 8 bytes, with each byte representing one row of pixels in the character. The bytes are
+    # arranged from top to bottom row going from left to right.
+
+    # Each bit within each byte represents the following pixels within that row:
+    # 8- = -+------
+    # 4- = +-------
+    # 2- = ---+----
+    # 1- = --+-----
+    # -8 = -----+--
+    # -4 = ----+---
+    # -2 = -------+
+    # -1 = ------+-
+    0x396C54: [0x00, 0x9C, 0x9C, 0x18, 0x84, 0x00, 0x00, 0x00],  # "
+    0x396C5C: [0x00, 0x18, 0xBD, 0x18, 0x18, 0x18, 0xBD, 0x18],  # #
+    0x396C64: [0x00, 0x0C, 0x2D, 0x0C, 0x21, 0x00, 0x00, 0x00],  # *
+    0x396C6C: [0x00, 0x20, 0x3C, 0xA0, 0x34, 0x28, 0xB4, 0x20],  # $
+    0x396C74: [0x00, 0x34, 0x88, 0x80, 0xB4, 0x88, 0x88, 0x34],  # 6
+    0x396C7C: [0x00, 0xBC, 0x88, 0x04, 0x04, 0x20, 0x20, 0x20],  # 7
+    0x396CBC: [0x00, 0x34, 0x88, 0x88, 0x3C, 0x08, 0x88, 0x34],  # 9
+    0x396CC4: [0x00, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0xC0, 0xC0],  # :
+    0x396CCC: [0x00, 0xC0, 0xC0, 0x00, 0xC0, 0xC0, 0x80, 0x40],  # ;
+    0x396D0C: [0x00, 0x00, 0x09, 0x24, 0x90, 0x24, 0x09, 0x00],  # <
+    0x396D14: [0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0xFD, 0x00],  # =
+    0x396D1C: [0x00, 0x00, 0xC0, 0x30, 0x0C, 0x30, 0xC0, 0x00],  # >
+    0x396D54: [0x00, 0x34, 0x88, 0xAC, 0xA8, 0xAC, 0x80, 0x34],  # @
+    0x396D5C: [0x00, 0x34, 0x88, 0x88, 0xA8, 0x8C, 0x88, 0x35],  # Q
+    0x396D64: [0x00, 0x40, 0x80, 0x10, 0x20, 0x04, 0x08, 0x01],  # \
+    0x396D6C: [0x00, 0x20, 0x14, 0x88, 0x00, 0x00, 0x00, 0x00],  # ^
+    0x396D9C: [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD],  # _
+    0x396DA4: [0x00, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00],  # `
+    0x396DAC: [0x00, 0x08, 0x04, 0x04, 0x20, 0x04, 0x04, 0x08],  # {
+    0x396DB4: [0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20],  # |
+    0x396DBC: [0x00, 0x80, 0x10, 0x10, 0x20, 0x10, 0x10, 0x80],  # }
+    0x396DF4: [0x00, 0x00, 0x00, 0x90, 0x61, 0x0C, 0x00, 0x00],  # ~
+}
+
+extra_item_sprites = [
+    # The VRAM data for all the extra item sprites, including the Archipelago Items.
+
+    # NOTE: The Archipelago logo is © 2022 by Krista Corkos and Christopher Wilson
+    # and licensed under Attribution-NonCommercial 4.0 International.
+    # See LICENSES.txt at the root of this apworld's directory for more licensing information.
+
+    # Maiden Detonator
+    0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x10, 0xCC, 0x00, 0x00, 0xC1, 0xBB, 0x00, 0x10, 0x1C, 0xB8,
+    0x00, 0x10, 0x1C, 0xB1, 0x00, 0x10, 0xBC, 0xBB, 0x00, 0x00, 0x11, 0x11, 0x00, 0x10, 0xCC, 0xBB,
+    0x11, 0x00, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0xBB, 0x1C, 0x00, 0x00, 0x8B, 0xC1, 0x01, 0x00,
+    0x1B, 0xC1, 0x01, 0x00, 0xBB, 0xCB, 0x01, 0x00, 0x11, 0x11, 0x00, 0x00, 0xBB, 0xCC, 0x01, 0x00,
+    0x00, 0x10, 0x11, 0x11, 0x00, 0xC1, 0xBC, 0x1B, 0x00, 0x10, 0x11, 0x11, 0x00, 0xC1, 0xBC, 0x1B,
+    0x00, 0x10, 0x11, 0x11, 0x00, 0xC1, 0xBC, 0x1B, 0x00, 0xC1, 0xBC, 0x1B, 0x00, 0x10, 0x11, 0x01,
+    0x11, 0x11, 0x01, 0x00, 0xB1, 0xCB, 0x1C, 0x00, 0x11, 0x11, 0x01, 0x00, 0xB1, 0xCB, 0x1C, 0x00,
+    0x11, 0x11, 0x01, 0x00, 0xB1, 0xCB, 0x1C, 0x00, 0xB1, 0xCB, 0x1C, 0x00, 0x10, 0x11, 0x01, 0x00,
+    # Archipelago Filler
+    0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x20, 0x88, 0x00, 0x22, 0x82, 0x88, 0x20, 0x66, 0x26, 0x88,
+    0x62, 0x66, 0x62, 0x82, 0x62, 0x66, 0x66, 0x82, 0x62, 0x22, 0x62, 0x22, 0x20, 0xAA, 0x2A, 0x00,
+    0x02, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x82, 0x22, 0x02, 0x00, 0x28, 0xCC, 0x2C, 0x00,
+    0xC2, 0xCC, 0xC2, 0x02, 0xC2, 0xCC, 0xCC, 0x02, 0xC2, 0x22, 0xC2, 0x02, 0x20, 0xFF, 0x2F, 0x00,
+    0xA2, 0xAA, 0xA2, 0x02, 0xA2, 0xAA, 0xAA, 0x22, 0xA2, 0xAA, 0x2A, 0x77, 0x20, 0xAA, 0x72, 0x77,
+    0x00, 0x22, 0x72, 0x77, 0x00, 0x00, 0x72, 0x77, 0x00, 0x00, 0x20, 0x77, 0x00, 0x00, 0x00, 0x22,
+    0xF2, 0xFF, 0xF2, 0x02, 0xF2, 0xFF, 0xFF, 0x02, 0x27, 0xFF, 0xFF, 0x02, 0x72, 0xF2, 0x2F, 0x00,
+    0x77, 0x22, 0x02, 0x00, 0x77, 0x02, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+    # Archipelago Useful
+    0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x20, 0x88, 0x00, 0x22, 0x82, 0x88, 0x20, 0x66, 0x26, 0x88,
+    0x62, 0x66, 0x62, 0x82, 0x62, 0x66, 0x66, 0x82, 0x62, 0x22, 0x62, 0x22, 0x20, 0xAA, 0x2A, 0x00,
+    0x02, 0xAA, 0x0A, 0x00, 0x28, 0x9A, 0x0A, 0x00, 0xAA, 0x9A, 0xAA, 0x0A, 0x9A, 0x99, 0x99, 0x0A,
+    0xAA, 0x9A, 0xAA, 0x0A, 0xC2, 0x9A, 0xCA, 0x02, 0xC2, 0xAA, 0xCA, 0x02, 0x20, 0xFF, 0x2F, 0x00,
+    0xA2, 0xAA, 0xA2, 0x02, 0xA2, 0xAA, 0xAA, 0x22, 0xA2, 0xAA, 0x2A, 0x77, 0x20, 0xAA, 0x72, 0x77,
+    0x00, 0x22, 0x72, 0x77, 0x00, 0x00, 0x72, 0x77, 0x00, 0x00, 0x20, 0x77, 0x00, 0x00, 0x00, 0x22,
+    0xF2, 0xFF, 0xF2, 0x02, 0xF2, 0xFF, 0xFF, 0x02, 0x27, 0xFF, 0xFF, 0x02, 0x72, 0xF2, 0x2F, 0x00,
+    0x77, 0x22, 0x02, 0x00, 0x77, 0x02, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+    # Archipelago Progression
+    0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x20, 0x88, 0x00, 0x22, 0x82, 0x88, 0x20, 0x66, 0x26, 0x88,
+    0x62, 0x66, 0x62, 0x82, 0x62, 0x66, 0x66, 0x82, 0x62, 0x22, 0x62, 0x22, 0x20, 0xAA, 0x2A, 0x00,
+    0x02, 0x10, 0x00, 0x00, 0x28, 0x71, 0x01, 0x00, 0x12, 0x77, 0x17, 0x00, 0x71, 0x77, 0x77, 0x01,
+    0x11, 0x77, 0x17, 0x01, 0x12, 0x77, 0x17, 0x02, 0x12, 0x11, 0x11, 0x02, 0x20, 0xFF, 0x2F, 0x00,
+    0xA2, 0xAA, 0xA2, 0x02, 0xA2, 0xAA, 0xAA, 0x22, 0xA2, 0xAA, 0x2A, 0x77, 0x20, 0xAA, 0x72, 0x77,
+    0x00, 0x22, 0x72, 0x77, 0x00, 0x00, 0x72, 0x77, 0x00, 0x00, 0x20, 0x77, 0x00, 0x00, 0x00, 0x22,
+    0xF2, 0xFF, 0xF2, 0x02, 0xF2, 0xFF, 0xFF, 0x02, 0x27, 0xFF, 0xFF, 0x02, 0x72, 0xF2, 0x2F, 0x00,
+    0x77, 0x22, 0x02, 0x00, 0x77, 0x02, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+    # Archipelago Trap
+    0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x20, 0x88, 0x00, 0x22, 0x82, 0x82, 0x20, 0x66, 0x26, 0x88,
+    0x62, 0x62, 0x66, 0x82, 0x62, 0x66, 0x66, 0x82, 0x62, 0x22, 0x62, 0x22, 0x20, 0xAA, 0x2A, 0x00,
+    0x02, 0x10, 0x00, 0x00, 0x28, 0x71, 0x01, 0x00, 0x18, 0x77, 0x17, 0x00, 0x71, 0x77, 0x77, 0x01,
+    0x11, 0x77, 0x17, 0x01, 0x12, 0x77, 0x17, 0x02, 0x12, 0x11, 0x11, 0x02, 0x20, 0xFF, 0x2F, 0x00,
+    0xA2, 0xA2, 0xAA, 0x02, 0xA2, 0xAA, 0xAA, 0x22, 0xA2, 0xAA, 0x2A, 0x77, 0x20, 0xAA, 0x72, 0x72,
+    0x00, 0x22, 0x72, 0x77, 0x00, 0x00, 0x72, 0x77, 0x00, 0x00, 0x20, 0x77, 0x00, 0x00, 0x00, 0x22,
+    0xF2, 0xF2, 0xFF, 0x02, 0xF2, 0xFF, 0xFF, 0x02, 0x27, 0xFF, 0xFF, 0x02, 0x77, 0xF2, 0x2F, 0x00,
+    0x77, 0x22, 0x02, 0x00, 0x77, 0x02, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+    # Archipelago Progression + Useful
+    0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x20, 0x88, 0x00, 0x22, 0x82, 0x88, 0x20, 0x66, 0x26, 0x88,
+    0x62, 0x66, 0x62, 0x82, 0x62, 0x66, 0x66, 0x82, 0x62, 0x22, 0x62, 0x22, 0x20, 0xAA, 0x2A, 0x00,
+    0x02, 0x10, 0x00, 0x00, 0x28, 0x71, 0x01, 0x00, 0x12, 0x77, 0x17, 0x00, 0x71, 0x77, 0x77, 0x01,
+    0x11, 0x77, 0x17, 0x01, 0x12, 0x77, 0x17, 0x02, 0x12, 0x11, 0x11, 0x02, 0x20, 0xFF, 0x2F, 0x00,
+    0xA2, 0xAA, 0xA2, 0x02, 0xA2, 0xAA, 0xAA, 0x22, 0xA2, 0xAA, 0x2A, 0x77, 0x20, 0xAA, 0x72, 0x77,
+    0x00, 0x22, 0x72, 0x77, 0x00, 0x00, 0x72, 0x77, 0x00, 0x00, 0x20, 0x77, 0x00, 0x00, 0x00, 0x22,
+    0xF2, 0xFF, 0xF2, 0x02, 0xF2, 0xAA, 0xFA, 0x02, 0x27, 0x9A, 0xFA, 0x02, 0xAA, 0x9A, 0xAA, 0x0A,
+    0x9A, 0x99, 0x99, 0x0A, 0xAA, 0x9A, 0xAA, 0x0A, 0x27, 0x9A, 0x0A, 0x00, 0x02, 0xAA, 0x0A, 0x00,
+    # Hourglass (Specifically used to represent Max Sand from Timespinner)
+    0x00, 0x00, 0xFF, 0xFF, 0x00, 0xF0, 0xEE, 0xCC, 0x00, 0xF0, 0x43, 0x42, 0x00, 0xF0, 0x12, 0x11,
+    0x00, 0x00, 0x1F, 0x11, 0x00, 0x00, 0x2F, 0x88, 0x00, 0x00, 0xF0, 0x82, 0x00, 0x00, 0x00, 0x1F,
+    0xFF, 0xFF, 0x00, 0x00, 0xCC, 0xEE, 0x0F, 0x00, 0x42, 0x34, 0x0F, 0x00, 0x11, 0x21, 0x0F, 0x00,
+    0x11, 0xF1, 0x00, 0x00, 0x98, 0xF2, 0x00, 0x00, 0x29, 0x0F, 0x00, 0x00, 0xF9, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0xF0, 0x81, 0x00, 0x00, 0x2F, 0x81, 0x00, 0x00, 0x1F, 0x88,
+    0x00, 0xF0, 0x12, 0xA9, 0x00, 0xF0, 0x43, 0x24, 0x00, 0xF0, 0xEE, 0xCC, 0x00, 0x00, 0xFF, 0xFF,
+    0xF9, 0x00, 0x00, 0x00, 0x19, 0x0F, 0x00, 0x00, 0x99, 0xF2, 0x00, 0x00, 0xA9, 0xF1, 0x00, 0x00,
+    0xAA, 0x21, 0x0F, 0x00, 0x42, 0x34, 0x0F, 0x00, 0xCC, 0xEE, 0x0F, 0x00, 0xFF, 0xFF, 0x00, 0x00,
+]
diff --git a/worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md b/worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md
new file mode 100644
index 000000000000..e81b79bf2048
--- /dev/null
+++ b/worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md	
@@ -0,0 +1,169 @@
+# Castlevania: Circle of the Moon
+
+## Quick Links
+- [Setup](/tutorial/Castlevania%20-%20Circle%20of%20the%20Moon/setup/en)
+- [Options Page](/games/Castlevania%20-%20Circle%20of%20the%20Moon/player-options)
+- [PopTracker Pack](https://github.com/sassyvania/Circle-of-the-Moon-Rando-AP-Map-Tracker-/releases/latest)
+- [Repo for the original, standalone CotMR](https://github.com/calm-palm/cotm-randomizer)
+- [Web version of the above randomizer](https://rando.circleofthemoon.com/)
+- [A more in-depth guide to CotMR's nuances](https://docs.google.com/document/d/1uot4BD9XW7A--A8ecgoY8mLK_vSoQRpY5XCkzgas87c/view?usp=sharing)
+
+This Game Page is focused more specifically on the Archipelago functionality. If you have a more general Circle of the Moon-related
+question that is not answered here, try the above guide.
+
+## What does randomization do to this game?
+
+Almost all items that you would normally find on pedestals throughout the game have had their locations changed. In addition to
+Magic Items (barring the Dash Boots which you always start with) and stat max ups, the DSS Cards have been added to the
+item pool as well; you will now find these as randomized items rather than by farming them via enemy drops.
+
+## Can I use any of the alternate modes?
+
+Yes. All alternate modes (Magician, Fighter, Shooter, and Thief Mode) are all unlocked and usable from the start by registering
+the name password shown on the Data Select screen for the mode of your choice. 
+
+If you intend to play Magician Mode, putting all of your cards in "Start Inventory from Pool" is recommended due to the fact
+that it naturally starts with all cards. In Fighter Mode, unlike in the regular game, you will be able to receive and use
+DSS Cards like in all other modes.
+
+## What is the goal of Castlevania: Circle of the Moon when randomized?
+
+Depending on what was chosen for the "Completion Goal" option, your goal may be to defeat Dracula, complete the Battle Arena, or both.
+
+- "Dracula": Make it to the Ceremonial Room and kill Dracula's first and second forms to view the credits. The door to the
+Ceremonial Room can be set to require anywhere between 0-9 Last Keys to open it.
+- "Battle Arena": Survive every room in the Battle Arena and pick up the Shinning Armor <sup>sic</sup> on the pedestal at the end. To make it
+easier, the "Disable Battle Arena Mp Drain" option can be enabled to make the Battle Arena not drain your MP to 0, allowing
+DSS to be used. Reaching the Battle Arena in the first place requires finding the Heavy Ring and Roc Wing (as well as Double or Kick Boots
+if "Nerf Roc Wing" is on).
+- "Battle Arena And Dracula": Complete both of the above-mentioned objectives. The server will remember which ones (if any) were
+already completed on previous sessions upon connecting.
+
+NOTE: If "All Bosses" was chosen for the "Required Skirmishes" option, 8 Last Keys will be required, and they will be guaranteed
+to be placed behind all 8 bosses (that are not Dracula). If "All Bosses And Arena" was chosen for the option, an additional
+required 9th Last Key will be placed on the Shinning Armor <sup>sic</sup> pedestal at the end of the Battle Arena in addition to
+the 8 that will be behind all the bosses.
+
+If you aren't sure what goal you have, there are two in-game ways you can check:
+
+- Pause the game, go to the Magic Item menu, and view the Dash Boots tutorial.
+- Approach the door to the first Battle Arena combat room and the textbox that normally explains how the place works will tell you.
+
+There are also two in-game ways to see how many Last Keys are in the item pool for the slot:
+
+- Pause the game, go to the Magic Item menu, and view the Last Key tutorial.
+- If you don't have any keys, touch the Ceremonial Room door before acquiring the necessary amount.
+
+
+## What items and locations get shuffled?
+
+Stat max ups, Magic Items, and DSS Cards are all randomized into the item pool, and the check locations are the pedestals
+that you would normally find the first two types of items on.
+
+The sole exception is the pedestal at the end of the Battle Arena. This location, most of the time, will always have 
+Shinning Armor <sup>sic</sup> unless "Required Skirmishes" is set to "All Bosses And Arena", in which case it will have a Last Key instead.
+
+## Which items can be in another player's world?
+
+Stat max ups, Magic Items, and DSS Cards can all be placed into another player's world.
+
+The Dash Boots and Shinning Armor <sup>sic</sup> are not randomized in the item pool; the former you will always start with and the
+latter will always be found at the end of the Battle Arena in your own world. And depending on your goal, you may or may
+not be required to pick it up.
+
+## What does another world's item look like in Castlevania: Circle of the Moon?
+
+Items for other Circle of the Moon players will show up in your game as that item, though you won't receive it yourself upon
+picking it up. Items for non-Circle of the Moon players will show up as one of four Archipelago Items depending on how its 
+classified:
+
+* "Filler": Just the six spheres, nothing extra.
+* "Useful": Blue plus sign in the top-right corner.
+* "Progression": Orange up arrow in the top-right corner.
+* "Progression" and "Useful": Orange up arrow in the top-right corner, blue plus sign in the bottom-right corner.
+* "Trap": Reports from the local residents of the remote Austrian village of \[REDACTED], Styria claim that they disguise themselves
+as Progression but with the important difference of \[DATA EXPUNGED]. Verification of these claims are currently pending...
+
+Upon sending an item, a textbox announcing the item being sent and the player who it's for will show up on-screen, accompanied
+by a sound depending on whether the item is filler-, progression-/useful-, or trap-classified.
+
+## When the player receives an item, what happens?
+
+A textbox announcing the item being received and the player who sent it will pop up on-screen, and it will be given.
+Similar to the outgoing item textbox, it will be accompanied by a sound depending on the item received being filler or progression/useful.
+
+## What are the item name groups?
+
+When you attempt to hint for items in Archipelago you can use either the name for the specific item, or the name of a group
+of items. Hinting for a group will choose a random item from the group that you do not currently have and hint for it. The
+groups you can use for Castlevania: Circle of the Moon are as follows:
+
+* "DSS" or "Card": Any DSS Card of either type.
+* "Action" or "Action Card": Any Action Card.
+* "Attribute" or "Attribute Card": Any Attribute Card.
+* "Freeze": Any card that logically lets you freeze enemies to use as platforms.
+* "Action Freeze": Either Action Card that logically lets you freeze enemies.
+* "Attribute Freeze": Either Attribute Card that logically lets you freeze enemies.
+
+## What are the location name groups?
+
+In Castlevania: Circle of the Moon, every location is part of a location group under that location's area name.
+So if you want to exclude all of, say, Underground Waterway from having progression, you can do so by just excluding
+"Underground Waterway" as a whole.
+
+In addition to the area location groups, the following groups also exist:
+
+* "Breakable Secrets": All locations behind the secret breakable walls, floors, and ceilings.
+* "Bosses": All the primary locations behind bosses that Last Keys normally get forced onto when bosses are required. If you want
+to prioritize every boss to be guarding a progression item for someone, this is the group for you!
+
+## How does the item drop randomization work?
+
+There are three tiers of item drops: Low, Mid, and High. Each enemy has two item "slots" that can both drop its own item; a Common slot and a Rare one.
+
+On Normal item randomization, "easy" enemies (below 61 HP) will only have Low-tier drops in both of their slots, bosses
+and candle enemies will be guaranteed to have High drops in one or both of their slots respectively (bosses are made to
+only drop one slot 100% of the time), and everything else can have a Low or Mid-tier item in its Common drop slot and a
+Low, Mid, OR High-tier item in its Rare drop slot.
+
+If Item Drop Randomization is set to Tiered, the HP threshold for enemies being considered "easy" will raise to below
+144, enemies in the 144-369 HP range (inclusive) will have a Low-tier item in its Common slot and a Mid-tier item in
+its rare slot, and enemies with more than 369 HP will have a Mid-tier in its Common slot and a High-tier in its Rare
+slot, making them more worthwhile to go after. Candles and bosses still have Rares in all their slots, but now the guaranteed
+drops that land on bosses will be exclusive to them; no other enemy in the game will have their item.
+
+Note that the Shinning Armor <sup>sic</sup> can never be placed randomly onto a normal enemy; you can only receive it by completing the Battle Arena.
+If "Required Skirmishes" is set to "All Bosses And Arena", which replaces the Shinning Armor <sup>sic</sup> on the pedestal at the end with
+a Last Key, the Devil fought in the last room before the end pedestal will drop Shinning Armor <sup>sic</sup> 100% of the time upon defeat.
+
+For more information and an exact breakdown of what items are considered which tier, see Malaert64's guide 
+[here](https://docs.google.com/document/d/1uot4BD9XW7A--A8ecgoY8mLK_vSoQRpY5XCkzgas87c/view#heading=h.5iz6ytaji08m).
+
+## Is it just me, or does the Countdown seem inaccurate to the number of checks in the area?
+Some Countdown regions are funny because of how the developers of the game decided what rooms belong to which areas in spite of
+what most players might think. For instance, the Skeleton Athlete room is actually part of the Chapel Tower area, not the Audience Room.
+And the Outer Wall very notably has several rooms isolated from its "main" area, like the Were-Horse/Jaguar Armory.
+See [this map](https://docs.google.com/document/d/1uot4BD9XW7A--A8ecgoY8mLK_vSoQRpY5XCkzgas87c/view#heading=h.scu4u49kvcd4) 
+to know exactly which rooms make up which Countdown regions.
+
+## Will the Castlevania Advance Collection and/or Wii U Virtual Console versions work?
+
+The Castlevania Advance Collection ROM is tested and known to work. However, there are some major caveats when playing with the
+Advance Collection ROM; most notably the fact that the audio does not function when played in an emulator outside the collection,
+which is currently a requirement to connect to a multiworld. This happens because all audio code was stripped
+from the ROM, and all sound is instead played by the collection through external means.
+
+For this reason, it is most recommended to obtain the ROM by dumping it from an original cartridge of the game that you legally own.
+Though, the Advance Collection *can* still technically be an option if you cannot do that and don't mind the lack of sound.
+
+The Wii U Virtual Console version is currently untested. If you happen to have purchased it before the Wii U eShop shut down, you can try
+dumping and playing with it. However, at the moment, we cannot guarantee that it will work well due to it being untested.
+
+Regardless of which released ROM you intend to try playing with, the US version of the game is required.
+
+## What are the odds of a pentabone?
+The odds of skeleton Nathan throwing a big bone instead of a little one, verified by looking at the code itself, is <sup>1</sup>&frasl;<sub>8</sub>, or 12.5%.
+
+Soooooooooo, to throw 5 big bones back-to-back...
+
+(<sup>1</sup>&frasl;<sub>8</sub>)<sup>5</sup> = <sup>1</sup>&frasl;<sub>32768</sub>, or 0.0030517578125%. Good luck, you're gonna need it!
diff --git a/worlds/cvcotm/docs/setup_en.md b/worlds/cvcotm/docs/setup_en.md
new file mode 100644
index 000000000000..7899ac997366
--- /dev/null
+++ b/worlds/cvcotm/docs/setup_en.md
@@ -0,0 +1,72 @@
+# Castlevania: Circle of the Moon Setup Guide
+
+## Required Software
+
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest).
+- A Castlevania: Circle of the Moon ROM of the US version specifically. The Archipelago community cannot provide this.
+The Castlevania Advance Collection ROM can technically be used, but it has no audio. The Wii U Virtual Console ROM is untested.
+- [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 `.gba` file in EmuHawk and go to `Config > Controllers…` to configure your inputs. If you can't click
+`Controllers…`, load any `.gba` 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.
+
+## Optional Software
+
+- [Castlevania: Circle of the Moon AP Tracker](https://github.com/sassyvania/Circle-of-the-Moon-Rando-AP-Map-Tracker-/releases/latest), for use with
+[PopTracker](https://github.com/black-sliver/PopTracker/releases).
+
+## Generating and Patching a Game
+
+1. Create your settings file (YAML). You can make one on the [Castlevania: Circle of the Moon options page](../../../games/Castlevania%20-%20Circle%20of%20the%20Moon/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 `.apcvcotm` 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.
+6. A patched `.gba` 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.
+
+If you're playing a single-player seed, and you don't care about hints, you can stop here, close the client, and load
+the patched ROM in any emulator of your choice. However, for multiworlds and other Archipelago features,
+continue below using BizHawk as your emulator.
+
+## 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. Castlevania: Circle of the Moon 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 may freeze every few seconds until it manages to connect to the client. This is expected. The BizHawk
+Client window should indicate that it connected and recognized Castlevania: Circle of the Moon.
+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.
+
+## Auto-Tracking
+
+Castlevania: Circle of the Moon has a fully functional map tracker that supports auto-tracking.
+
+1. Download [Castlevania: Circle of the Moon AP Tracker](https://github.com/sassyvania/Circle-of-the-Moon-Rando-AP-Map-Tracker-/releases/latest) and
+[PopTracker](https://github.com/black-sliver/PopTracker/releases).
+2. Put the tracker pack into `packs/` in your PopTracker install.
+3. Open PopTracker, and load the Castlevania: Circle of the Moon pack.
+4. For autotracking, click on the "AP" symbol at the top.
+5. Enter the Archipelago server address (the one you connected your client to), slot name, and password.
diff --git a/worlds/cvcotm/items.py b/worlds/cvcotm/items.py
new file mode 100644
index 000000000000..bce2b3fc0c4d
--- /dev/null
+++ b/worlds/cvcotm/items.py
@@ -0,0 +1,211 @@
+import logging
+
+from BaseClasses import Item, ItemClassification
+from .data import iname
+from .locations import BASE_ID
+from .options import IronMaidenBehavior
+
+from typing import TYPE_CHECKING, Dict, NamedTuple, Optional
+from collections import Counter
+
+if TYPE_CHECKING:
+    from . import CVCotMWorld
+
+
+class CVCotMItem(Item):
+    game: str = "Castlevania - Circle of the Moon"
+
+
+class CVCotMItemData(NamedTuple):
+    code: Optional[int]
+    text_id: Optional[bytes]
+    default_classification: ItemClassification
+    tutorial_id: Optional[bytes] = None
+# "code" = The unique part of the Item's AP code attribute, as well as the value to call the in-game "prepare item
+#          textbox" function with to give the Item in-game. Add this + base_id to get the actual AP code.
+# "text_id" = The textbox ID for the vanilla message for receiving the Item. Used when receiving an Item through the
+#             client that was not sent by a different player.
+# "default_classification" = The AP Item Classification that gets assigned to instances of that Item in create_item
+#                            by default, unless I deliberately override it (as is the case for the Cleansing on the
+#                            Ignore Cleansing option).
+# "tutorial_id" = The textbox ID for the item's tutorial. Used by the client if tutorials are not skipped.
+
+
+cvcotm_item_info: Dict[str, CVCotMItemData] = {
+    iname.heart_max:      CVCotMItemData(0xE400, b"\x57\x81", ItemClassification.filler),
+    iname.hp_max:         CVCotMItemData(0xE401, b"\x55\x81", ItemClassification.filler),
+    iname.mp_max:         CVCotMItemData(0xE402, b"\x56\x81", ItemClassification.filler),
+    iname.salamander:     CVCotMItemData(0xE600, b"\x1E\x82", ItemClassification.useful),
+    iname.serpent:        CVCotMItemData(0xE601, b"\x1F\x82", ItemClassification.useful |
+                                         ItemClassification.progression),
+    iname.mandragora:     CVCotMItemData(0xE602, b"\x20\x82", ItemClassification.useful),
+    iname.golem:          CVCotMItemData(0xE603, b"\x21\x82", ItemClassification.useful),
+    iname.cockatrice:     CVCotMItemData(0xE604, b"\x22\x82", ItemClassification.useful |
+                                         ItemClassification.progression),
+    iname.manticore:      CVCotMItemData(0xE605, b"\x23\x82", ItemClassification.useful),
+    iname.griffin:        CVCotMItemData(0xE606, b"\x24\x82", ItemClassification.useful),
+    iname.thunderbird:    CVCotMItemData(0xE607, b"\x25\x82", ItemClassification.useful),
+    iname.unicorn:        CVCotMItemData(0xE608, b"\x26\x82", ItemClassification.useful),
+    iname.black_dog:      CVCotMItemData(0xE609, b"\x27\x82", ItemClassification.useful),
+    iname.mercury:        CVCotMItemData(0xE60A, b"\x28\x82", ItemClassification.useful |
+                                         ItemClassification.progression),
+    iname.venus:          CVCotMItemData(0xE60B, b"\x29\x82", ItemClassification.useful),
+    iname.jupiter:        CVCotMItemData(0xE60C, b"\x2A\x82", ItemClassification.useful),
+    iname.mars:           CVCotMItemData(0xE60D, b"\x2B\x82", ItemClassification.useful |
+                                         ItemClassification.progression),
+    iname.diana:          CVCotMItemData(0xE60E, b"\x2C\x82", ItemClassification.useful),
+    iname.apollo:         CVCotMItemData(0xE60F, b"\x2D\x82", ItemClassification.useful),
+    iname.neptune:        CVCotMItemData(0xE610, b"\x2E\x82", ItemClassification.useful),
+    iname.saturn:         CVCotMItemData(0xE611, b"\x2F\x82", ItemClassification.useful),
+    iname.uranus:         CVCotMItemData(0xE612, b"\x30\x82", ItemClassification.useful),
+    iname.pluto:          CVCotMItemData(0xE613, b"\x31\x82", ItemClassification.useful),
+    # Dash Boots
+    iname.double:         CVCotMItemData(0xE801, b"\x59\x81", ItemClassification.useful |
+                                         ItemClassification.progression, b"\xF4\x84"),
+    iname.tackle:         CVCotMItemData(0xE802, b"\x5A\x81", ItemClassification.progression, b"\xF5\x84"),
+    iname.kick_boots:     CVCotMItemData(0xE803, b"\x5B\x81", ItemClassification.progression, b"\xF6\x84"),
+    iname.heavy_ring:     CVCotMItemData(0xE804, b"\x5C\x81", ItemClassification.progression, b"\xF7\x84"),
+    # Map
+    iname.cleansing:      CVCotMItemData(0xE806, b"\x5D\x81", ItemClassification.progression, b"\xF8\x84"),
+    iname.roc_wing:       CVCotMItemData(0xE807, b"\x5E\x81", ItemClassification.useful |
+                                         ItemClassification.progression, b"\xF9\x84"),
+    iname.last_key:       CVCotMItemData(0xE808, b"\x5F\x81", ItemClassification.progression_skip_balancing,
+                                         b"\xFA\x84"),
+    iname.ironmaidens:    CVCotMItemData(0xE809, b"\xF1\x84", ItemClassification.progression),
+    iname.dracula:        CVCotMItemData(None, None, ItemClassification.progression),
+    iname.shinning_armor: CVCotMItemData(None, None, ItemClassification.progression),
+}
+
+ACTION_CARDS = {iname.mercury, iname.venus, iname.jupiter, iname.mars, iname.diana, iname.apollo, iname.neptune,
+                iname.saturn, iname.uranus, iname.pluto}
+
+ATTRIBUTE_CARDS = {iname.salamander, iname.serpent, iname.mandragora, iname.golem, iname.cockatrice, iname.griffin,
+                   iname.manticore, iname.thunderbird, iname.unicorn, iname.black_dog}
+
+FREEZE_ACTIONS = [iname.mercury, iname.mars]
+FREEZE_ATTRS = [iname.serpent, iname.cockatrice]
+
+FILLER_ITEM_NAMES = [iname.heart_max, iname.hp_max, iname.mp_max]
+
+MAJORS_CLASSIFICATIONS = ItemClassification.progression | ItemClassification.useful
+
+
+def get_item_names_to_ids() -> Dict[str, int]:
+    return {name: cvcotm_item_info[name].code + BASE_ID for name in cvcotm_item_info
+            if cvcotm_item_info[name].code is not None}
+
+
+def get_item_counts(world: "CVCotMWorld") -> Dict[ItemClassification, Dict[str, int]]:
+
+    item_counts: Dict[ItemClassification, Counter[str, int]] = {
+        ItemClassification.progression: Counter(),
+        ItemClassification.progression_skip_balancing: Counter(),
+        ItemClassification.useful | ItemClassification.progression: Counter(),
+        ItemClassification.useful: Counter(),
+        ItemClassification.filler: Counter(),
+    }
+    total_items = 0
+    # Items to be skipped over in the main Item creation loop.
+    excluded_items = [iname.hp_max, iname.mp_max, iname.heart_max, iname.last_key]
+
+    # If Halve DSS Cards Placed is on, determine which cards we will exclude here.
+    if world.options.halve_dss_cards_placed:
+        excluded_cards = list(ACTION_CARDS.union(ATTRIBUTE_CARDS))
+
+        has_freeze_action = False
+        has_freeze_attr = False
+        start_card_cap = 8
+
+        # Get out all cards from start_inventory_from_pool that the player isn't starting with 0 of.
+        start_cards = [item for item in world.options.start_inventory_from_pool.value if "Card" in item]
+
+        # Check for ice/stone cards that are in the player's starting cards. Increase the starting card capacity by 1
+        # for each card type satisfied.
+        for card in start_cards:
+            if card in FREEZE_ACTIONS and not has_freeze_action:
+                has_freeze_action = True
+                start_card_cap += 1
+            if card in FREEZE_ATTRS and not has_freeze_attr:
+                has_freeze_attr = True
+                start_card_cap += 1
+
+        # If we are over our starting card capacity, some starting cards will need to be removed...
+        if len(start_cards) > start_card_cap:
+
+            # Ice/stone cards will be kept no matter what. As for the others, put them in a list of possible candidates
+            # to remove.
+            kept_start_cards = []
+            removal_candidates = []
+            for card in start_cards:
+                if card in FREEZE_ACTIONS + FREEZE_ATTRS:
+                    kept_start_cards.append(card)
+                else:
+                    removal_candidates.append(card)
+
+            # Add a random sample of the removal candidate cards to our kept cards list.
+            kept_start_cards += world.random.sample(removal_candidates, start_card_cap - len(kept_start_cards))
+
+            # Make a list of the cards we are not keeping.
+            removed_start_cards = [card for card in removal_candidates if card not in kept_start_cards]
+
+            # Remove the cards we're not keeping from start_inventory_from_pool.
+            for card in removed_start_cards:
+                del world.options.start_inventory_from_pool.value[card]
+
+            logging.warning(f"[{world.player_name}] Too many DSS Cards in "
+                            f"Start Inventory from Pool to satisfy the Halve DSS Cards Placed option. The following "
+                            f"{len(removed_start_cards)} card(s) were removed: {removed_start_cards}")
+
+            start_cards = kept_start_cards
+
+        # Remove the starting cards from the excluded cards.
+        for card in ACTION_CARDS.union(ATTRIBUTE_CARDS):
+            if card in start_cards:
+                excluded_cards.remove(card)
+
+        # Remove a valid ice/stone action and/or attribute card if the player isn't starting with one.
+        if not has_freeze_action:
+            excluded_cards.remove(world.random.choice(FREEZE_ACTIONS))
+        if not has_freeze_attr:
+            excluded_cards.remove(world.random.choice(FREEZE_ATTRS))
+
+        # Remove 10 random cards from the exclusions.
+        excluded_items += world.random.sample(excluded_cards, 10)
+
+    # Exclude the Maiden Detonator from creation if the maidens start broken.
+    if world.options.iron_maiden_behavior == IronMaidenBehavior.option_start_broken:
+        excluded_items += [iname.ironmaidens]
+
+    # Add one of each Item to the pool that is not filler or progression skip balancing.
+    for item in cvcotm_item_info:
+        classification = cvcotm_item_info[item].default_classification
+        code = cvcotm_item_info[item].code
+
+        # Skip event Items and Items that are excluded from creation.
+        if code is None or item in excluded_items:
+            continue
+
+        # Classify the Cleansing as Useful instead of Progression if Ignore Cleansing is on.
+        if item == iname.cleansing and world.options.ignore_cleansing:
+            classification = ItemClassification.useful
+
+        # Classify the Kick Boots as Progression + Useful if Nerf Roc Wing is on.
+        if item == iname.kick_boots and world.options.nerf_roc_wing:
+            classification |= ItemClassification.useful
+
+        item_counts[classification][item] = 1
+        total_items += 1
+
+    # Add the total Last Keys if no skirmishes are required (meaning they're not forced anywhere).
+    if not world.options.required_skirmishes:
+        item_counts[ItemClassification.progression_skip_balancing][iname.last_key] = \
+            world.options.available_last_keys.value
+        total_items += world.options.available_last_keys.value
+
+    # Add filler items at random until the total Items = the total Locations.
+    while total_items < len(world.multiworld.get_unfilled_locations(world.player)):
+        filler_to_add = world.random.choice(FILLER_ITEM_NAMES)
+        item_counts[ItemClassification.filler][filler_to_add] += 1
+        total_items += 1
+
+    return item_counts
diff --git a/worlds/cvcotm/locations.py b/worlds/cvcotm/locations.py
new file mode 100644
index 000000000000..02f1e65ab6f8
--- /dev/null
+++ b/worlds/cvcotm/locations.py
@@ -0,0 +1,265 @@
+from BaseClasses import Location
+from .data import lname, iname
+from .options import CVCotMOptions, CompletionGoal, IronMaidenBehavior, RequiredSkirmishes
+
+from typing import Dict, List, Union, Tuple, Optional, Set, NamedTuple
+
+BASE_ID = 0xD55C0000
+
+
+class CVCotMLocation(Location):
+    game: str = "Castlevania - Circle of the Moon"
+
+
+class CVCotMLocationData(NamedTuple):
+    code: Union[int, str]
+    offset: Optional[int]
+    countdown: Optional[int]
+    type: Optional[str] = None
+# code = The unique part of the Location's AP code attribute, as well as the in-game bitflag index starting from
+#        0x02025374 that indicates the Location has been checked. Add this + base_id to get the actual AP code.
+#        If we put an Item name string here instead of an int, then it is an event Location and that Item should be
+#        forced on it while calling the actual code None.
+# offset = The offset in the ROM to overwrite to change the Item on that Location.
+# countdown = The index of the Countdown number region it contributes to.
+# rule = What rule should be applied to the Location during set_rules, as defined in self.rules in the CVCotMRules class
+#        definition in rules.py.
+# event = What event Item to place on that Location, for Locations that are events specifically.
+# type = Anything special about this Location that should be considered, whether it be a boss Location, etc.
+
+
+cvcotm_location_info: Dict[str, CVCotMLocationData] = {
+    # Sealed Room
+    lname.sr3:   CVCotMLocationData(0x35, 0xD0310,  0),
+    # Catacombs
+    lname.cc1:   CVCotMLocationData(0x37, 0xD0658,  1),
+    lname.cc3:   CVCotMLocationData(0x43, 0xD0370,  1),
+    lname.cc3b:  CVCotMLocationData(0x36, 0xD0364,  1),
+    lname.cc4:   CVCotMLocationData(0xA8, 0xD0934,  1, type="magic item"),
+    lname.cc5:   CVCotMLocationData(0x38, 0xD0DE4,  1),
+    lname.cc8:   CVCotMLocationData(0x3A, 0xD1078,  1),
+    lname.cc8b:  CVCotMLocationData(0x3B, 0xD1084,  1),
+    lname.cc9:   CVCotMLocationData(0x40, 0xD0F94,  1),
+    lname.cc10:  CVCotMLocationData(0x39, 0xD12C4,  1),
+    lname.cc13:  CVCotMLocationData(0x41, 0xD0DA8,  1),
+    lname.cc14:  CVCotMLocationData(0x3C, 0xD1168,  1),
+    lname.cc14b: CVCotMLocationData(0x3D, 0xD1174,  1),
+    lname.cc16:  CVCotMLocationData(0x3E, 0xD0C40,  1),
+    lname.cc20:  CVCotMLocationData(0x42, 0xD103C,  1),
+    lname.cc22:  CVCotMLocationData(0x3F, 0xD07C0,  1),
+    lname.cc24:  CVCotMLocationData(0xA9, 0xD1288,  1, type="boss"),
+    lname.cc25:  CVCotMLocationData(0x44, 0xD12A0,  1),
+    # Abyss Staircase
+    lname.as2:   CVCotMLocationData(0x47, 0xD181C,  2),
+    lname.as3:   CVCotMLocationData(0x45, 0xD1774,  2),
+    lname.as4:   CVCotMLocationData(0x46, 0xD1678,  2),
+    lname.as9:   CVCotMLocationData(0x48, 0xD17EC,  2),
+    # Audience Room
+    lname.ar4:   CVCotMLocationData(0x53, 0xD2344,  3),
+    lname.ar7:   CVCotMLocationData(0x54, 0xD2368,  3),
+    lname.ar8:   CVCotMLocationData(0x51, 0xD1BF4,  3),
+    lname.ar9:   CVCotMLocationData(0x4B, 0xD1E1C,  3),
+    lname.ar10:  CVCotMLocationData(0x4A, 0xD1DE0,  3),
+    lname.ar11:  CVCotMLocationData(0x49, 0xD1E58,  3),
+    lname.ar14:  CVCotMLocationData(0x4D, 0xD2158,  3),
+    lname.ar14b: CVCotMLocationData(0x4C, 0xD214C,  3),
+    lname.ar16:  CVCotMLocationData(0x52, 0xD20BC,  3),
+    lname.ar17:  CVCotMLocationData(0x50, 0xD2290,  3),
+    lname.ar17b: CVCotMLocationData(0x4F, 0xD2284,  3),
+    lname.ar18:  CVCotMLocationData(0x4E, 0xD1FA8,  3),
+    lname.ar19:  CVCotMLocationData(0x6A, 0xD44A4,  7),
+    lname.ar21:  CVCotMLocationData(0x55, 0xD238C,  3),
+    lname.ar25:  CVCotMLocationData(0xAA, 0xD1E04,  3, type="boss"),
+    lname.ar26:  CVCotMLocationData(0x59, 0xD3370,  5),
+    lname.ar27:  CVCotMLocationData(0x58, 0xD34E4,  5),
+    lname.ar30:  CVCotMLocationData(0x99, 0xD6A24, 11),
+    lname.ar30b: CVCotMLocationData(0x9A, 0xD6A30, 11),
+    # Outer Wall
+    lname.ow0:   CVCotMLocationData(0x97, 0xD6BEC, 11),
+    lname.ow1:   CVCotMLocationData(0x98, 0xD6CE8, 11),
+    lname.ow2:   CVCotMLocationData(0x9E, 0xD6DE4, 11),
+    # Triumph Hallway
+    lname.th1:   CVCotMLocationData(0x57, 0xD26D4,  4),
+    lname.th3:   CVCotMLocationData(0x56, 0xD23C8,  4),
+    # Machine Tower
+    lname.mt0:   CVCotMLocationData(0x61, 0xD307C,  5),
+    lname.mt2:   CVCotMLocationData(0x62, 0xD32A4,  5),
+    lname.mt3:   CVCotMLocationData(0x5B, 0xD3244,  5),
+    lname.mt4:   CVCotMLocationData(0x5A, 0xD31FC,  5),
+    lname.mt6:   CVCotMLocationData(0x5F, 0xD2F38,  5),
+    lname.mt8:   CVCotMLocationData(0x5E, 0xD2EC0,  5),
+    lname.mt10:  CVCotMLocationData(0x63, 0xD3550,  5),
+    lname.mt11:  CVCotMLocationData(0x5D, 0xD2D88,  5),
+    lname.mt13:  CVCotMLocationData(0x5C, 0xD3580,  5),
+    lname.mt14:  CVCotMLocationData(0x60, 0xD2A64,  5),
+    lname.mt17:  CVCotMLocationData(0x64, 0xD3520,  5),
+    lname.mt19:  CVCotMLocationData(0xAB, 0xD283C,  5, type="boss"),
+    # Eternal Corridor
+    lname.ec5:   CVCotMLocationData(0x66, 0xD3B50,  6),
+    lname.ec7:   CVCotMLocationData(0x65, 0xD3A90,  6),
+    lname.ec9:   CVCotMLocationData(0x67, 0xD3B98,  6),
+    # Chapel Tower
+    lname.ct1:   CVCotMLocationData(0x68, 0xD40F0,  7),
+    lname.ct4:   CVCotMLocationData(0x69, 0xD4630,  7),
+    lname.ct5:   CVCotMLocationData(0x72, 0xD481C,  7),
+    lname.ct6:   CVCotMLocationData(0x6B, 0xD4294,  7),
+    lname.ct6b:  CVCotMLocationData(0x6C, 0xD42A0,  7),
+    lname.ct8:   CVCotMLocationData(0x6D, 0xD4330,  7),
+    lname.ct10:  CVCotMLocationData(0x6E, 0xD415C,  7),
+    lname.ct13:  CVCotMLocationData(0x6F, 0xD4060,  7),
+    lname.ct15:  CVCotMLocationData(0x73, 0xD47F8,  7),
+    lname.ct16:  CVCotMLocationData(0x70, 0xD3DA8,  7),
+    lname.ct18:  CVCotMLocationData(0x74, 0xD47C8,  7),
+    lname.ct21:  CVCotMLocationData(0xF0, 0xD47B0,  7, type="maiden switch"),
+    lname.ct22:  CVCotMLocationData(0x71, 0xD3CF4,  7, type="max up boss"),
+    lname.ct26:  CVCotMLocationData(0x9C, 0xD6ACC, 11),
+    lname.ct26b: CVCotMLocationData(0x9B, 0xD6AC0, 11),
+    # Underground Gallery
+    lname.ug0:   CVCotMLocationData(0x82, 0xD5944,  9),
+    lname.ug1:   CVCotMLocationData(0x83, 0xD5890,  9),
+    lname.ug2:   CVCotMLocationData(0x81, 0xD5A1C,  9),
+    lname.ug3:   CVCotMLocationData(0x85, 0xD56A4,  9),
+    lname.ug3b:  CVCotMLocationData(0x84, 0xD5698,  9),
+    lname.ug8:   CVCotMLocationData(0x86, 0xD5E30,  9),
+    lname.ug10:  CVCotMLocationData(0x87, 0xD5F68,  9),
+    lname.ug13:  CVCotMLocationData(0x88, 0xD5AB8,  9),
+    lname.ug15:  CVCotMLocationData(0x89, 0xD5BD8,  9),
+    lname.ug20:  CVCotMLocationData(0xAC, 0xD5470,  9, type="boss"),
+    # Underground Warehouse
+    lname.uw1:   CVCotMLocationData(0x75, 0xD48DC,  8),
+    lname.uw6:   CVCotMLocationData(0x76, 0xD4D20,  8),
+    lname.uw8:   CVCotMLocationData(0x77, 0xD4BA0,  8),
+    lname.uw9:   CVCotMLocationData(0x7E, 0xD53EC,  8),
+    lname.uw10:  CVCotMLocationData(0x78, 0xD4C84,  8),
+    lname.uw11:  CVCotMLocationData(0x79, 0xD4EC4,  8),
+    lname.uw14:  CVCotMLocationData(0x7F, 0xD5410,  8),
+    lname.uw16:  CVCotMLocationData(0x7A, 0xD5050,  8),
+    lname.uw16b: CVCotMLocationData(0x7B, 0xD505C,  8),
+    lname.uw19:  CVCotMLocationData(0x7C, 0xD5344,  8),
+    lname.uw23:  CVCotMLocationData(0xAE, 0xD53B0,  8, type="boss"),
+    lname.uw24:  CVCotMLocationData(0x80, 0xD5434,  8),
+    lname.uw25:  CVCotMLocationData(0x7D, 0xD4FC0,  8),
+    # Underground Waterway
+    lname.uy1:   CVCotMLocationData(0x93, 0xD5F98, 10),
+    lname.uy3:   CVCotMLocationData(0x8B, 0xD5FEC, 10),
+    lname.uy3b:  CVCotMLocationData(0x8A, 0xD5FE0, 10),
+    lname.uy4:   CVCotMLocationData(0x94, 0xD697C, 10),
+    lname.uy5:   CVCotMLocationData(0x8C, 0xD6214, 10),
+    lname.uy7:   CVCotMLocationData(0x8D, 0xD65A4, 10),
+    lname.uy8:   CVCotMLocationData(0x95, 0xD69A0, 10),
+    lname.uy9:   CVCotMLocationData(0x8E, 0xD640C, 10),
+    lname.uy9b:  CVCotMLocationData(0x8F, 0xD6418, 10),
+    lname.uy12:  CVCotMLocationData(0x90, 0xD6730, 10),
+    lname.uy12b: CVCotMLocationData(0x91, 0xD673C, 10),
+    lname.uy13:  CVCotMLocationData(0x92, 0xD685C, 10),
+    lname.uy17:  CVCotMLocationData(0xAF, 0xD6940, 10, type="boss"),
+    lname.uy18:  CVCotMLocationData(0x96, 0xD69C4, 10),
+    # Observation Tower
+    lname.ot1:   CVCotMLocationData(0x9D, 0xD6B38, 11),
+    lname.ot2:   CVCotMLocationData(0xA4, 0xD760C, 12),
+    lname.ot3:   CVCotMLocationData(0x9F, 0xD72E8, 12),
+    lname.ot5:   CVCotMLocationData(0xA5, 0xD75E8, 12),
+    lname.ot8:   CVCotMLocationData(0xA0, 0xD71EC, 12),
+    lname.ot9:   CVCotMLocationData(0xA2, 0xD6FE8, 12),
+    lname.ot12:  CVCotMLocationData(0xA6, 0xD75C4, 12),
+    lname.ot13:  CVCotMLocationData(0xA3, 0xD6F64, 12),
+    lname.ot16:  CVCotMLocationData(0xA1, 0xD751C, 12),
+    lname.ot20:  CVCotMLocationData(0xB0, 0xD6E20, 12, type="boss"),
+    # Ceremonial Room
+    lname.cr1:   CVCotMLocationData(0xA7, 0xD7690, 13),
+    lname.dracula: CVCotMLocationData(iname.dracula, None, None),
+    # Battle Arena
+    lname.ba24:  CVCotMLocationData(0xB2, 0xD7D20, 14, type="arena"),
+    lname.arena_victory:  CVCotMLocationData(iname.shinning_armor, None, None),
+ }
+
+
+def get_location_names_to_ids() -> Dict[str, int]:
+    return {name: cvcotm_location_info[name].code+BASE_ID for name in cvcotm_location_info
+            if isinstance(cvcotm_location_info[name].code, int)}
+
+
+def get_location_name_groups() -> Dict[str, Set[str]]:
+    loc_name_groups: Dict[str, Set[str]] = {"Breakable Secrets": set(),
+                                            "Bosses": set()}
+
+    for loc_name in cvcotm_location_info:
+        # If we are looking at an event Location, don't include it.
+        if isinstance(cvcotm_location_info[loc_name].code, str):
+            continue
+
+        # The part of the Location name's string before the colon is its area name.
+        area_name = loc_name.split(":")[0]
+
+        # Add each Location to its corresponding area name group.
+        if area_name not in loc_name_groups:
+            loc_name_groups[area_name] = {loc_name}
+        else:
+            loc_name_groups[area_name].add(loc_name)
+
+        # If the word "fake" is in the Location's name, add it to the "Breakable Walls" Location group.
+        if "fake" in loc_name.casefold():
+            loc_name_groups["Breakable Secrets"].add(loc_name)
+
+        # If it's a behind boss Location, add it to the "Bosses" Location group.
+        if cvcotm_location_info[loc_name].type in ["boss", "max up boss"]:
+            loc_name_groups["Bosses"].add(loc_name)
+
+    return loc_name_groups
+
+
+def get_named_locations_data(locations: List[str], options: CVCotMOptions) -> \
+        Tuple[Dict[str, Optional[int]], Dict[str, str]]:
+    locations_with_ids = {}
+    locked_pairs = {}
+    locked_key_types = []
+
+    # Decide which Location types should have locked Last Keys placed on them, if skirmishes are required.
+    # If the Maiden Detonator is in the pool, Adramelech's key should be on the switch instead of behind the maiden.
+    if options.required_skirmishes:
+        locked_key_types += ["boss"]
+        if options.iron_maiden_behavior == IronMaidenBehavior.option_detonator_in_pool:
+            locked_key_types += ["maiden switch"]
+        else:
+            locked_key_types += ["max up boss"]
+        # If all bosses and the Arena is required, the Arena end reward should have a Last Key as well.
+        if options.required_skirmishes == RequiredSkirmishes.option_all_bosses_and_arena:
+            locked_key_types += ["arena"]
+
+    for loc in locations:
+        if loc == lname.ct21:
+            # If the maidens are pre-broken, don't create the iron maiden switch Location at all.
+            if options.iron_maiden_behavior == IronMaidenBehavior.option_start_broken:
+                continue
+            # If the maiden behavior is vanilla, lock the Maiden Detonator on this Location.
+            if options.iron_maiden_behavior == IronMaidenBehavior.option_vanilla:
+                locked_pairs[loc] = iname.ironmaidens
+
+        # Don't place the Dracula Location if our Completion Goal is the Battle Arena only.
+        if loc == lname.dracula and options.completion_goal == CompletionGoal.option_battle_arena:
+            continue
+
+        # Don't place the Battle Arena normal Location if the Arena is not required by the Skirmishes option.
+        if loc == lname.ba24 and options.required_skirmishes != RequiredSkirmishes.option_all_bosses_and_arena:
+            continue
+
+        # Don't place the Battle Arena event Location if our Completion Goal is Dracula only.
+        if loc == lname.arena_victory and options.completion_goal == CompletionGoal.option_dracula:
+            continue
+
+        loc_code = cvcotm_location_info[loc].code
+
+        # If we are looking at an event Location, add its associated event Item to the events' dict.
+        # Otherwise, add the base_id to the Location's code.
+        if isinstance(loc_code, str):
+            locked_pairs[loc] = loc_code
+            locations_with_ids.update({loc: None})
+        else:
+            loc_code += BASE_ID
+            locations_with_ids.update({loc: loc_code})
+
+        # Place a locked Last Key on this Location if its of a type that should have one.
+        if cvcotm_location_info[loc].type in locked_key_types:
+            locked_pairs[loc] = iname.last_key
+
+    return locations_with_ids, locked_pairs
diff --git a/worlds/cvcotm/lz10.py b/worlds/cvcotm/lz10.py
new file mode 100644
index 000000000000..5ca24c13dd17
--- /dev/null
+++ b/worlds/cvcotm/lz10.py
@@ -0,0 +1,265 @@
+from collections import defaultdict
+from operator import itemgetter
+import struct
+from typing import Union
+
+ByteString = Union[bytes, bytearray, memoryview]
+
+
+"""
+Taken from the Archipelago Metroid: Zero Mission implementation by Lil David at:
+https://github.com/lilDavid/Archipelago-Metroid-Zero-Mission/blob/main/lz10.py
+
+Tweaked version of nlzss modified to work with raw data and return bytes instead of operating on whole files.
+LZ11 functionality has been removed since it is not necessary for Zero Mission nor Circle of the Moon.
+
+https://github.com/magical/nlzss
+"""
+
+
+def decompress(data: ByteString):
+    """Decompress LZSS-compressed bytes. Returns a bytearray containing the decompressed data."""
+    header = data[:4]
+    if header[0] == 0x10:
+        decompress_raw = decompress_raw_lzss10
+    else:
+        raise DecompressionError("not as lzss-compressed file")
+
+    decompressed_size = int.from_bytes(header[1:], "little")
+
+    data = data[4:]
+    return decompress_raw(data, decompressed_size)
+
+
+def compress(data: bytearray):
+    byteOut = bytearray()
+    # header
+    byteOut.extend(struct.pack("<L", (len(data) << 8) + 0x10))
+
+    # body
+    length = 0
+    for tokens in chunkit(_compress(data), 8):
+        flags = [type(t) is tuple for t in tokens]
+        byteOut.extend(struct.pack(">B", packflags(flags)))
+
+        for t in tokens:
+            if type(t) is tuple:
+                count, disp = t
+                count -= 3
+                disp = (-disp) - 1
+                assert 0 <= disp < 4096
+                sh = (count << 12) | disp
+                byteOut.extend(struct.pack(">H", sh))
+            else:
+                byteOut.extend(struct.pack(">B", t))
+
+        length += 1
+        length += sum(2 if f else 1 for f in flags)
+
+    # padding
+    padding = 4 - (length % 4 or 4)
+    if padding:
+        byteOut.extend(b'\xff' * padding)
+    return byteOut
+
+
+class SlidingWindow:
+    # The size of the sliding window
+    size = 4096
+
+    # The minimum displacement.
+    disp_min = 2
+
+    # The hard minimum — a disp less than this can't be represented in the
+    # compressed stream.
+    disp_start = 1
+
+    # The minimum length for a successful match in the window
+    match_min = 3
+
+    # The maximum length of a successful match, inclusive.
+    match_max = 3 + 0xf
+
+    def __init__(self, buf):
+        self.data = buf
+        self.hash = defaultdict(list)
+        self.full = False
+
+        self.start = 0
+        self.stop = 0
+        # self.index = self.disp_min - 1
+        self.index = 0
+
+        assert self.match_max is not None
+
+    def next(self):
+        if self.index < self.disp_start - 1:
+            self.index += 1
+            return
+
+        if self.full:
+            olditem = self.data[self.start]
+            assert self.hash[olditem][0] == self.start
+            self.hash[olditem].pop(0)
+
+        item = self.data[self.stop]
+        self.hash[item].append(self.stop)
+        self.stop += 1
+        self.index += 1
+
+        if self.full:
+            self.start += 1
+        else:
+            if self.size <= self.stop:
+                self.full = True
+
+    def advance(self, n=1):
+        """Advance the window by n bytes"""
+        for _ in range(n):
+            self.next()
+
+    def search(self):
+        match_max = self.match_max
+        match_min = self.match_min
+
+        counts = []
+        indices = self.hash[self.data[self.index]]
+        for i in indices:
+            matchlen = self.match(i, self.index)
+            if matchlen >= match_min:
+                disp = self.index - i
+                if self.disp_min <= disp:
+                    counts.append((matchlen, -disp))
+                    if matchlen >= match_max:
+                        return counts[-1]
+
+        if counts:
+            match = max(counts, key=itemgetter(0))
+            return match
+
+        return None
+
+    def match(self, start, bufstart):
+        size = self.index - start
+
+        if size == 0:
+            return 0
+
+        matchlen = 0
+        it = range(min(len(self.data) - bufstart, self.match_max))
+        for i in it:
+            if self.data[start + (i % size)] == self.data[bufstart + i]:
+                matchlen += 1
+            else:
+                break
+        return matchlen
+
+
+def _compress(input, windowclass=SlidingWindow):
+    """Generates a stream of tokens. Either a byte (int) or a tuple of (count,
+    displacement)."""
+
+    window = windowclass(input)
+
+    i = 0
+    while True:
+        if len(input) <= i:
+            break
+        match = window.search()
+        if match:
+            yield match
+            window.advance(match[0])
+            i += match[0]
+        else:
+            yield input[i]
+            window.next()
+            i += 1
+
+
+def packflags(flags):
+    n = 0
+    for i in range(8):
+        n <<= 1
+        try:
+            if flags[i]:
+                n |= 1
+        except IndexError:
+            pass
+    return n
+
+
+def chunkit(it, n):
+    buf = []
+    for x in it:
+        buf.append(x)
+        if n <= len(buf):
+            yield buf
+            buf = []
+    if buf:
+        yield buf
+
+
+def bits(byte):
+    return ((byte >> 7) & 1,
+            (byte >> 6) & 1,
+            (byte >> 5) & 1,
+            (byte >> 4) & 1,
+            (byte >> 3) & 1,
+            (byte >> 2) & 1,
+            (byte >> 1) & 1,
+            byte & 1)
+
+
+def decompress_raw_lzss10(indata, decompressed_size, _overlay=False):
+    """Decompress LZSS-compressed bytes. Returns a bytearray."""
+    data = bytearray()
+
+    it = iter(indata)
+
+    if _overlay:
+        disp_extra = 3
+    else:
+        disp_extra = 1
+
+    def writebyte(b):
+        data.append(b)
+
+    def readbyte():
+        return next(it)
+
+    def readshort():
+        # big-endian
+        a = next(it)
+        b = next(it)
+        return (a << 8) | b
+
+    def copybyte():
+        data.append(next(it))
+
+    while len(data) < decompressed_size:
+        b = readbyte()
+        flags = bits(b)
+        for flag in flags:
+            if flag == 0:
+                copybyte()
+            elif flag == 1:
+                sh = readshort()
+                count = (sh >> 0xc) + 3
+                disp = (sh & 0xfff) + disp_extra
+
+                for _ in range(count):
+                    writebyte(data[-disp])
+            else:
+                raise ValueError(flag)
+
+            if decompressed_size <= len(data):
+                break
+
+    if len(data) != decompressed_size:
+        raise DecompressionError("decompressed size does not match the expected size")
+
+    return data
+
+
+class DecompressionError(ValueError):
+    pass
diff --git a/worlds/cvcotm/options.py b/worlds/cvcotm/options.py
new file mode 100644
index 000000000000..3f7d93661cc0
--- /dev/null
+++ b/worlds/cvcotm/options.py
@@ -0,0 +1,282 @@
+from dataclasses import dataclass
+from Options import OptionGroup, Choice, Range, Toggle, PerGameCommonOptions, StartInventoryPool, DeathLink
+
+
+class IgnoreCleansing(Toggle):
+    """
+    Removes the logical requirement for the Cleansing to go beyond the first Underground Waterway rooms from either of the area's sides. You may be required to brave the harmful water without it.
+    """
+    display_name = "Ignore Cleansing"
+
+
+class AutoRun(Toggle):
+    """
+    Makes Nathan always run when pressing left or right without needing to double-tap.
+    """
+    display_name = "Auto Run"
+
+
+class DSSPatch(Toggle):
+    """
+    Patches out being able to pause during the DSS startup animation and switch the cards in the menu to use any combos you don't currently have, as well as changing the element of a summon to one you don't currently have.
+    """
+    display_name = "DSS Patch"
+
+
+class AlwaysAllowSpeedDash(Toggle):
+    """
+    Allows activating the speed dash combo (Pluto + Griffin) without needing the respective cards first.
+    """
+    display_name = "Always Allow Speed Dash"
+
+
+class IronMaidenBehavior(Choice):
+    """
+    Sets how the iron maiden barriers blocking the entrances to Underground Gallery and Waterway will behave.
+    Vanilla: Vanilla behavior. Must press the button guarded by Adramelech to break them.
+    Start Broken: The maidens will be broken from the start.
+    Detonator In Pool: Adds a Maiden Detonator item in the pool that will detonate the maidens when found. Adramelech will guard an extra check.
+    """
+    display_name = "Iron Maiden Behavior"
+    option_vanilla = 0
+    option_start_broken = 1
+    option_detonator_in_pool = 2
+
+
+class RequiredLastKeys(Range):
+    """
+    How many Last Keys are needed to open the door to the Ceremonial Room. This will lower if higher than Available Last Keys.
+    """
+    range_start = 0
+    range_end = 9
+    default = 1
+    display_name = "Required Last Keys"
+
+
+class AvailableLastKeys(Range):
+    """
+    How many Last Keys are in the pool in total.
+    To see this in-game, select the Last Key in the Magic Item menu (when you have at least one) or touch the Ceremonial Room door.
+    """
+    range_start = 0
+    range_end = 9
+    default = 1
+    display_name = "Available Last Keys"
+
+
+class BuffRangedFamiliars(Toggle):
+    """
+    Makes Familiar projectiles deal double damage to enemies.
+    """
+    display_name = "Buff Ranged Familiars"
+
+
+class BuffSubWeapons(Toggle):
+    """
+    Increases damage dealt by sub-weapons and item crushes in Shooter and non-Shooter Modes.
+    """
+    display_name = "Buff Sub-weapons"
+
+
+class BuffShooterStrength(Toggle):
+    """
+    Increases Nathan's strength in Shooter Mode to match his strength in Vampire Killer Mode.
+    """
+    display_name = "Buff Shooter Strength"
+
+
+class ItemDropRandomization(Choice):
+    """
+    Randomizes what enemies drop what items as well as the drop rates for said items.
+    Bosses and candle enemies will be guaranteed to have high-tier items in all of their drop slots, and "easy" enemies (below 61 HP) will only drop low-tier items in all of theirs.
+    All other enemies will drop a low or mid-tier item in their common drop slot, and a low, mid, or high-tier item in their rare drop slot.
+    The common slot item has a 6-10% base chance of appearing, and the rare has a 3-6% chance.
+    If Tiered is chosen, all enemies below 144 (instead of 61) HP will be considered "easy", rare items that land on bosses will be exclusive to them, enemies with 144-369 HP will have a low-tier in its common slot and a mid-tier in its rare slot, and enemies with more than 369 HP will have a mid-tier in its common slot and a high-tier in its rare slot.
+    See the Game Page for more info.
+    """
+    display_name = "Item Drop Randomization"
+    option_disabled = 0
+    option_normal = 1
+    option_tiered = 2
+    default = 1
+
+
+class HalveDSSCardsPlaced(Toggle):
+    """
+    Places only half of the DSS Cards in the item pool.
+    A valid combo that lets you freeze or petrify enemies to use as platforms will always be placed.
+    """
+    display_name = "Halve DSS Cards Placed"
+
+
+class Countdown(Choice):
+    """
+    Displays, below and near the right side of the MP bar, the number of un-found progression/useful-marked items or the total check locations remaining in the area you are currently in.
+    """
+    display_name = "Countdown"
+    option_none = 0
+    option_majors = 1
+    option_all_locations = 2
+    default = 0
+
+
+class SubWeaponShuffle(Toggle):
+    """
+    Randomizes which sub-weapon candles have which sub-weapons.
+    The total available count of each sub-weapon will be consistent with that of the vanilla game.
+    """
+    display_name = "Sub-weapon Shuffle"
+
+
+class DisableBattleArenaMPDrain(Toggle):
+    """
+    Makes the Battle Arena not drain Nathan's MP, so that DSS combos can be used like normal.
+    """
+    display_name = "Disable Battle Arena MP Drain"
+
+
+class RequiredSkirmishes(Choice):
+    """
+    Forces a Last Key after every boss or after every boss and the Battle Arena and forces the required Last Keys to enter the Ceremonial Room to 8 or 9 for All Bosses and All Bosses And Arena respectively.
+    The Available and Required Last Keys options will be overridden to the respective values.
+    """
+    display_name = "Required Skirmishes"
+    option_none = 0
+    option_all_bosses = 1
+    option_all_bosses_and_arena = 2
+    default = 0
+
+
+class EarlyEscapeItem(Choice):
+    """
+    Ensures the chosen Catacomb escape item will be placed in a starting location within your own game, accessible with nothing.
+    """
+    display_name = "Early Escape Item"
+    option_none = 0
+    option_double = 1
+    option_roc_wing = 2
+    option_double_or_roc_wing = 3
+    default = 1
+
+
+class NerfRocWing(Toggle):
+    """
+    Initially nerfs the Roc Wing by removing its ability to jump infinitely and reducing its jump height. You can power it back up to its vanilla behavior by obtaining the following:
+    Double: Allows one jump in midair, using your double jump.
+    Kick Boots: Restores its vanilla jump height.
+    Both: Enables infinite midair jumping.
+    Note that holding A while Roc jumping will cause you to rise slightly higher; this is accounted for in logic.
+    """
+    display_name = "Nerf Roc Wing"
+
+
+class PlutoGriffinAirSpeed(Toggle):
+    """
+    Increases Nathan's air speeds with the Pluto + Griffin combo active to be the same as his ground speeds. Anything made possible with the increased air speed is out of logic.
+    """
+    display_name = "DSS Pluto and Griffin Run Speed in Air"
+
+
+class SkipDialogues(Toggle):
+    """
+    Skips all cutscene dialogue besides the ending.
+    """
+    display_name = "Skip Cutscene Dialogue"
+
+
+class SkipTutorials(Toggle):
+    """
+    Skips all Magic Item and DSS-related tutorial textboxes.
+    """
+    display_name = "Skip Magic Item Tutorials"
+
+
+class BattleArenaMusic(Choice):
+    """
+    Enables any looping song from the game to play inside the Battle Arena instead of it being silent the whole time.
+    """
+    display_name = "Battle Arena Music"
+    option_nothing = 0
+    option_requiem = 1
+    option_a_vision_of_dark_secrets = 2
+    option_inversion = 3
+    option_awake = 4
+    option_the_sinking_old_sanctuary = 5
+    option_clockwork = 6
+    option_shudder = 7
+    option_fate_to_despair = 8
+    option_aquarius = 9
+    option_clockwork_mansion = 10
+    option_big_battle = 11
+    option_nightmare = 12
+    option_vampire_killer = 13
+    option_illusionary_dance = 14
+    option_proof_of_blood = 15
+    option_repose_of_souls = 16
+    option_circle_of_the_moon = 17
+    default = 0
+
+
+class CVCotMDeathLink(Choice):
+    __doc__ = (DeathLink.__doc__ +
+               "\n\n    Received DeathLinks will not kill you in the Battle Arena unless Arena On is chosen.")
+    display_name = "Death Link"
+    option_off = 0
+    alias_false = 0
+    alias_no = 0
+    option_on = 1
+    alias_true = 1
+    alias_yes = 1
+    option_arena_on = 2
+    default = 0
+
+
+class CompletionGoal(Choice):
+    """
+    The goal for game completion. Can be defeating Dracula, winning in the Battle Arena, or both.
+    If you aren't sure which one you have while playing, select the Dash Boots in the Magic Item menu.
+    """
+    display_name = "Completion Goal"
+    option_dracula = 0
+    option_battle_arena = 1
+    option_battle_arena_and_dracula = 2
+    default = 0
+
+
+@dataclass
+class CVCotMOptions(PerGameCommonOptions):
+    start_inventory_from_pool: StartInventoryPool
+    completion_goal: CompletionGoal
+    ignore_cleansing: IgnoreCleansing
+    auto_run: AutoRun
+    dss_patch: DSSPatch
+    always_allow_speed_dash: AlwaysAllowSpeedDash
+    iron_maiden_behavior: IronMaidenBehavior
+    required_last_keys: RequiredLastKeys
+    available_last_keys: AvailableLastKeys
+    buff_ranged_familiars: BuffRangedFamiliars
+    buff_sub_weapons: BuffSubWeapons
+    buff_shooter_strength: BuffShooterStrength
+    item_drop_randomization: ItemDropRandomization
+    halve_dss_cards_placed: HalveDSSCardsPlaced
+    countdown: Countdown
+    sub_weapon_shuffle: SubWeaponShuffle
+    disable_battle_arena_mp_drain: DisableBattleArenaMPDrain
+    required_skirmishes: RequiredSkirmishes
+    pluto_griffin_air_speed: PlutoGriffinAirSpeed
+    skip_dialogues: SkipDialogues
+    skip_tutorials: SkipTutorials
+    nerf_roc_wing: NerfRocWing
+    early_escape_item: EarlyEscapeItem
+    battle_arena_music: BattleArenaMusic
+    death_link: CVCotMDeathLink
+
+
+cvcotm_option_groups = [
+    OptionGroup("difficulty", [
+        BuffRangedFamiliars, BuffSubWeapons, BuffShooterStrength, ItemDropRandomization, IgnoreCleansing,
+        HalveDSSCardsPlaced, SubWeaponShuffle, EarlyEscapeItem, CVCotMDeathLink]),
+    OptionGroup("quality of life", [
+        AutoRun, DSSPatch, AlwaysAllowSpeedDash, PlutoGriffinAirSpeed, Countdown, DisableBattleArenaMPDrain,
+        SkipDialogues, SkipTutorials, BattleArenaMusic])
+]
diff --git a/worlds/cvcotm/presets.py b/worlds/cvcotm/presets.py
new file mode 100644
index 000000000000..7865935c7c7a
--- /dev/null
+++ b/worlds/cvcotm/presets.py
@@ -0,0 +1,190 @@
+from typing import Any, Dict
+
+from Options import Accessibility, ProgressionBalancing
+from .options import IgnoreCleansing, AutoRun, DSSPatch, AlwaysAllowSpeedDash, IronMaidenBehavior, BuffRangedFamiliars,\
+    BuffSubWeapons, BuffShooterStrength, ItemDropRandomization, HalveDSSCardsPlaced, Countdown, SubWeaponShuffle,\
+    DisableBattleArenaMPDrain, RequiredSkirmishes, EarlyEscapeItem, CVCotMDeathLink, CompletionGoal, SkipDialogues,\
+    NerfRocWing, SkipTutorials, BattleArenaMusic, PlutoGriffinAirSpeed
+
+all_random_options = {
+    "progression_balancing":         "random",
+    "accessibility":                 "random",
+    "ignore_cleansing":              "random",
+    "auto_run":                      "random",
+    "dss_patch":                     "random",
+    "always_allow_speed_dash":       "random",
+    "iron_maiden_behavior":          "random",
+    "required_last_keys":            "random",
+    "available_last_keys":           "random",
+    "buff_ranged_familiars":         "random",
+    "buff_sub_weapons":              "random",
+    "buff_shooter_strength":         "random",
+    "item_drop_randomization":       "random",
+    "halve_dss_cards_placed":        "random",
+    "countdown":                     "random",
+    "sub_weapon_shuffle":            "random",
+    "disable_battle_arena_mp_drain": "random",
+    "required_skirmishes":           "random",
+    "pluto_griffin_air_speed":       "random",
+    "skip_dialogues":                "random",
+    "skip_tutorials":                "random",
+    "nerf_roc_wing":                 "random",
+    "early_escape_item":             "random",
+    "battle_arena_music":            "random",
+    "death_link":                    CVCotMDeathLink.option_off,
+    "completion_goal":               "random",
+}
+
+beginner_mode_options = {
+    "progression_balancing":         ProgressionBalancing.default,
+    "accessibility":                 Accessibility.option_full,
+    "ignore_cleansing":              IgnoreCleansing.option_false,
+    "auto_run":                      AutoRun.option_true,
+    "dss_patch":                     DSSPatch.option_true,
+    "always_allow_speed_dash":       AlwaysAllowSpeedDash.option_true,
+    "iron_maiden_behavior":          IronMaidenBehavior.option_start_broken,
+    "required_last_keys":            3,
+    "available_last_keys":           6,
+    "buff_ranged_familiars":         BuffRangedFamiliars.option_true,
+    "buff_sub_weapons":              BuffSubWeapons.option_true,
+    "buff_shooter_strength":         BuffShooterStrength.option_true,
+    "item_drop_randomization":       ItemDropRandomization.option_normal,
+    "halve_dss_cards_placed":        HalveDSSCardsPlaced.option_false,
+    "countdown":                     Countdown.option_majors,
+    "sub_weapon_shuffle":            SubWeaponShuffle.option_false,
+    "disable_battle_arena_mp_drain": DisableBattleArenaMPDrain.option_true,
+    "required_skirmishes":           RequiredSkirmishes.option_none,
+    "pluto_griffin_air_speed":       PlutoGriffinAirSpeed.option_false,
+    "skip_dialogues":                SkipDialogues.option_false,
+    "skip_tutorials":                SkipTutorials.option_false,
+    "nerf_roc_wing":                 NerfRocWing.option_false,
+    "early_escape_item":             EarlyEscapeItem.option_double,
+    "battle_arena_music":            BattleArenaMusic.option_nothing,
+    "death_link":                    CVCotMDeathLink.option_off,
+    "completion_goal":               CompletionGoal.option_dracula,
+}
+
+standard_competitive_options = {
+    "progression_balancing":         ProgressionBalancing.default,
+    "accessibility":                 Accessibility.option_full,
+    "ignore_cleansing":              IgnoreCleansing.option_false,
+    "auto_run":                      AutoRun.option_false,
+    "dss_patch":                     DSSPatch.option_true,
+    "always_allow_speed_dash":       AlwaysAllowSpeedDash.option_true,
+    "iron_maiden_behavior":          IronMaidenBehavior.option_start_broken,
+    "required_last_keys":            3,
+    "available_last_keys":           5,
+    "buff_ranged_familiars":         BuffRangedFamiliars.option_true,
+    "buff_sub_weapons":              BuffSubWeapons.option_true,
+    "buff_shooter_strength":         BuffShooterStrength.option_false,
+    "item_drop_randomization":       ItemDropRandomization.option_normal,
+    "halve_dss_cards_placed":        HalveDSSCardsPlaced.option_true,
+    "countdown":                     Countdown.option_majors,
+    "sub_weapon_shuffle":            SubWeaponShuffle.option_true,
+    "disable_battle_arena_mp_drain": DisableBattleArenaMPDrain.option_false,
+    "required_skirmishes":           RequiredSkirmishes.option_none,
+    "pluto_griffin_air_speed":       PlutoGriffinAirSpeed.option_false,
+    "skip_dialogues":                SkipDialogues.option_true,
+    "skip_tutorials":                SkipTutorials.option_true,
+    "nerf_roc_wing":                 NerfRocWing.option_false,
+    "early_escape_item":             EarlyEscapeItem.option_double,
+    "battle_arena_music":            BattleArenaMusic.option_nothing,
+    "death_link":                    CVCotMDeathLink.option_off,
+    "completion_goal":               CompletionGoal.option_dracula,
+}
+
+randomania_2023_options = {
+    "progression_balancing":         ProgressionBalancing.default,
+    "accessibility":                 Accessibility.option_full,
+    "ignore_cleansing":              IgnoreCleansing.option_false,
+    "auto_run":                      AutoRun.option_false,
+    "dss_patch":                     DSSPatch.option_true,
+    "always_allow_speed_dash":       AlwaysAllowSpeedDash.option_true,
+    "iron_maiden_behavior":          IronMaidenBehavior.option_vanilla,
+    "required_last_keys":            3,
+    "available_last_keys":           5,
+    "buff_ranged_familiars":         BuffRangedFamiliars.option_true,
+    "buff_sub_weapons":              BuffSubWeapons.option_true,
+    "buff_shooter_strength":         BuffShooterStrength.option_false,
+    "item_drop_randomization":       ItemDropRandomization.option_normal,
+    "halve_dss_cards_placed":        HalveDSSCardsPlaced.option_false,
+    "countdown":                     Countdown.option_majors,
+    "sub_weapon_shuffle":            SubWeaponShuffle.option_true,
+    "disable_battle_arena_mp_drain": DisableBattleArenaMPDrain.option_false,
+    "required_skirmishes":           RequiredSkirmishes.option_none,
+    "pluto_griffin_air_speed":       PlutoGriffinAirSpeed.option_false,
+    "skip_dialogues":                SkipDialogues.option_false,
+    "skip_tutorials":                SkipTutorials.option_false,
+    "nerf_roc_wing":                 NerfRocWing.option_false,
+    "early_escape_item":             EarlyEscapeItem.option_double,
+    "battle_arena_music":            BattleArenaMusic.option_nothing,
+    "death_link":                    CVCotMDeathLink.option_off,
+    "completion_goal":               CompletionGoal.option_dracula,
+}
+
+competitive_all_bosses_options = {
+    "progression_balancing":         ProgressionBalancing.default,
+    "accessibility":                 Accessibility.option_full,
+    "ignore_cleansing":              IgnoreCleansing.option_false,
+    "auto_run":                      AutoRun.option_false,
+    "dss_patch":                     DSSPatch.option_true,
+    "always_allow_speed_dash":       AlwaysAllowSpeedDash.option_true,
+    "iron_maiden_behavior":          IronMaidenBehavior.option_vanilla,
+    "required_last_keys":            8,
+    "available_last_keys":           8,
+    "buff_ranged_familiars":         BuffRangedFamiliars.option_true,
+    "buff_sub_weapons":              BuffSubWeapons.option_true,
+    "buff_shooter_strength":         BuffShooterStrength.option_false,
+    "item_drop_randomization":       ItemDropRandomization.option_tiered,
+    "halve_dss_cards_placed":        HalveDSSCardsPlaced.option_true,
+    "countdown":                     Countdown.option_none,
+    "sub_weapon_shuffle":            SubWeaponShuffle.option_true,
+    "disable_battle_arena_mp_drain": DisableBattleArenaMPDrain.option_false,
+    "required_skirmishes":           RequiredSkirmishes.option_all_bosses,
+    "pluto_griffin_air_speed":       PlutoGriffinAirSpeed.option_false,
+    "skip_dialogues":                SkipDialogues.option_true,
+    "skip_tutorials":                SkipTutorials.option_true,
+    "nerf_roc_wing":                 NerfRocWing.option_false,
+    "early_escape_item":             EarlyEscapeItem.option_double,
+    "battle_arena_music":            BattleArenaMusic.option_nothing,
+    "death_link":                    CVCotMDeathLink.option_off,
+    "completion_goal":               CompletionGoal.option_dracula,
+}
+
+hardcore_mode_options = {
+    "progression_balancing":         ProgressionBalancing.default,
+    "accessibility":                 Accessibility.option_minimal,
+    "ignore_cleansing":              IgnoreCleansing.option_true,
+    "auto_run":                      AutoRun.option_false,
+    "dss_patch":                     DSSPatch.option_true,
+    "always_allow_speed_dash":       AlwaysAllowSpeedDash.option_false,
+    "iron_maiden_behavior":          IronMaidenBehavior.option_vanilla,
+    "required_last_keys":            9,
+    "available_last_keys":           9,
+    "buff_ranged_familiars":         BuffRangedFamiliars.option_false,
+    "buff_sub_weapons":              BuffSubWeapons.option_false,
+    "buff_shooter_strength":         BuffShooterStrength.option_false,
+    "item_drop_randomization":       ItemDropRandomization.option_tiered,
+    "halve_dss_cards_placed":        HalveDSSCardsPlaced.option_true,
+    "countdown":                     Countdown.option_none,
+    "sub_weapon_shuffle":            SubWeaponShuffle.option_true,
+    "disable_battle_arena_mp_drain": DisableBattleArenaMPDrain.option_false,
+    "required_skirmishes":           RequiredSkirmishes.option_none,
+    "pluto_griffin_air_speed":       PlutoGriffinAirSpeed.option_false,
+    "skip_dialogues":                SkipDialogues.option_false,
+    "skip_tutorials":                SkipTutorials.option_false,
+    "nerf_roc_wing":                 NerfRocWing.option_false,
+    "early_escape_item":             EarlyEscapeItem.option_double,
+    "battle_arena_music":            BattleArenaMusic.option_nothing,
+    "death_link":                    CVCotMDeathLink.option_off,
+    "completion_goal":               CompletionGoal.option_battle_arena_and_dracula,
+}
+
+cvcotm_options_presets: Dict[str, Dict[str, Any]] = {
+    "All Random": all_random_options,
+    "Beginner Mode": beginner_mode_options,
+    "Standard Competitive": standard_competitive_options,
+    "Randomania 2023": randomania_2023_options,
+    "Competitive All Bosses": competitive_all_bosses_options,
+    "Hardcore Mode": hardcore_mode_options,
+}
diff --git a/worlds/cvcotm/regions.py b/worlds/cvcotm/regions.py
new file mode 100644
index 000000000000..5403d12c81a3
--- /dev/null
+++ b/worlds/cvcotm/regions.py
@@ -0,0 +1,189 @@
+from .data import lname
+from typing import Dict, List, Optional, TypedDict, Union
+
+
+class RegionInfo(TypedDict, total=False):
+    locations: List[str]
+    entrances: Dict[str, str]
+
+
+# # #    KEY    # # #
+# "locations" = A list of the Locations to add to that Region when adding said Region.
+# "entrances" = A dict of the connecting Regions to the Entrances' names to add to that Region when adding said Region.
+cvcotm_region_info: Dict[str, RegionInfo] = {
+    "Catacomb": {"locations": [lname.sr3,
+                               lname.cc1,
+                               lname.cc3,
+                               lname.cc3b,
+                               lname.cc4,
+                               lname.cc5,
+                               lname.cc8,
+                               lname.cc8b,
+                               lname.cc9,
+                               lname.cc10,
+                               lname.cc13,
+                               lname.cc14,
+                               lname.cc14b,
+                               lname.cc16,
+                               lname.cc20,
+                               lname.cc22,
+                               lname.cc24,
+                               lname.cc25],
+                 "entrances": {"Abyss Stairway": "Catacomb to Stairway"}},
+
+    "Abyss Stairway": {"locations": [lname.as2,
+                                     lname.as3],
+                       "entrances": {"Audience Room": "Stairway to Audience"}},
+
+    "Audience Room": {"locations": [lname.as4,
+                                    lname.as9,
+                                    lname.ar4,
+                                    lname.ar7,
+                                    lname.ar8,
+                                    lname.ar9,
+                                    lname.ar10,
+                                    lname.ar11,
+                                    lname.ar14,
+                                    lname.ar14b,
+                                    lname.ar16,
+                                    lname.ar17,
+                                    lname.ar17b,
+                                    lname.ar18,
+                                    lname.ar19,
+                                    lname.ar21,
+                                    lname.ar25,
+                                    lname.ar26,
+                                    lname.ar27,
+                                    lname.ar30,
+                                    lname.ar30b,
+                                    lname.ow0,
+                                    lname.ow1,
+                                    lname.ow2,
+                                    lname.th1,
+                                    lname.th3],
+                      "entrances": {"Machine Tower Bottom": "Audience to Machine Bottom",
+                                    "Machine Tower Top": "Audience to Machine Top",
+                                    "Chapel Tower Bottom": "Audience to Chapel",
+                                    "Underground Gallery Lower": "Audience to Gallery",
+                                    "Underground Warehouse Start": "Audience to Warehouse",
+                                    "Underground Waterway Start": "Audience to Waterway",
+                                    "Observation Tower": "Audience to Observation",
+                                    "Ceremonial Room": "Ceremonial Door"}},
+
+    "Machine Tower Bottom": {"locations": [lname.mt0,
+                                           lname.mt2,
+                                           lname.mt3,
+                                           lname.mt4,
+                                           lname.mt6,
+                                           lname.mt8,
+                                           lname.mt10,
+                                           lname.mt11],
+                             "entrances": {"Machine Tower Top": "Machine Bottom to Top"}},
+
+    "Machine Tower Top": {"locations": [lname.mt13,
+                                        lname.mt14,
+                                        lname.mt17,
+                                        lname.mt19]},
+
+    "Eternal Corridor Pit": {"locations": [lname.ec5],
+                             "entrances": {"Underground Gallery Upper": "Corridor to Gallery",
+                                           "Chapel Tower Bottom": "Escape the Gallery Pit"}},
+
+    "Chapel Tower Bottom": {"locations": [lname.ec7,
+                                          lname.ec9,
+                                          lname.ct1,
+                                          lname.ct4,
+                                          lname.ct5,
+                                          lname.ct6,
+                                          lname.ct6b,
+                                          lname.ct8,
+                                          lname.ct10,
+                                          lname.ct13,
+                                          lname.ct15],
+                            "entrances": {"Eternal Corridor Pit": "Into the Corridor Pit",
+                                          "Underground Waterway End": "Dip Into Waterway End",
+                                          "Chapel Tower Top": "Climb to Chapel Top"}},
+
+    "Chapel Tower Top": {"locations": [lname.ct16,
+                                       lname.ct18,
+                                       lname.ct21,
+                                       lname.ct22],
+                         "entrances": {"Battle Arena": "Arena Passage"}},
+
+    "Battle Arena": {"locations": [lname.ct26,
+                                   lname.ct26b,
+                                   lname.ba24,
+                                   lname.arena_victory]},
+
+    "Underground Gallery Upper": {"locations": [lname.ug0,
+                                                lname.ug1,
+                                                lname.ug2,
+                                                lname.ug3,
+                                                lname.ug3b],
+                                  "entrances": {"Eternal Corridor Pit": "Gallery to Corridor",
+                                                "Underground Gallery Lower": "Gallery Upper to Lower"}},
+
+    "Underground Gallery Lower": {"locations": [lname.ug8,
+                                                lname.ug10,
+                                                lname.ug13,
+                                                lname.ug15,
+                                                lname.ug20],
+                                  "entrances": {"Underground Gallery Upper": "Gallery Lower to Upper"}},
+
+    "Underground Warehouse Start": {"locations": [lname.uw1],
+                                    "entrances": {"Underground Warehouse Main": "Into Warehouse Main"}},
+
+    "Underground Warehouse Main": {"locations": [lname.uw6,
+                                                 lname.uw8,
+                                                 lname.uw9,
+                                                 lname.uw10,
+                                                 lname.uw11,
+                                                 lname.uw14,
+                                                 lname.uw16,
+                                                 lname.uw16b,
+                                                 lname.uw19,
+                                                 lname.uw23,
+                                                 lname.uw24,
+                                                 lname.uw25]},
+
+    "Underground Waterway Start": {"locations": [lname.uy1],
+                                   "entrances": {"Underground Waterway Main": "Into Waterway Main"}},
+
+    "Underground Waterway Main": {"locations": [lname.uy3,
+                                                lname.uy3b,
+                                                lname.uy4,
+                                                lname.uy5,
+                                                lname.uy7,
+                                                lname.uy8,
+                                                lname.uy9,
+                                                lname.uy9b,
+                                                lname.uy12],
+                                  "entrances": {"Underground Waterway End": "Onward to Waterway End"}},
+
+    "Underground Waterway End": {"locations": [lname.uy12b,
+                                               lname.uy13,
+                                               lname.uy17,
+                                               lname.uy18]},
+
+    "Observation Tower": {"locations": [lname.ot1,
+                                        lname.ot2,
+                                        lname.ot3,
+                                        lname.ot5,
+                                        lname.ot8,
+                                        lname.ot9,
+                                        lname.ot12,
+                                        lname.ot13,
+                                        lname.ot16,
+                                        lname.ot20]},
+
+    "Ceremonial Room": {"locations": [lname.cr1,
+                                      lname.dracula]},
+}
+
+
+def get_region_info(region: str, info: str) -> Optional[Union[List[str], Dict[str, str]]]:
+    return cvcotm_region_info[region].get(info, None)
+
+
+def get_all_region_names() -> List[str]:
+    return [reg_name for reg_name in cvcotm_region_info]
diff --git a/worlds/cvcotm/rom.py b/worlds/cvcotm/rom.py
new file mode 100644
index 000000000000..e7b0710d134e
--- /dev/null
+++ b/worlds/cvcotm/rom.py
@@ -0,0 +1,600 @@
+
+import Utils
+import logging
+import json
+
+from worlds.Files import APProcedurePatch, APTokenMixin, APTokenTypes, APPatchExtension
+from typing import Dict, Optional, Collection, TYPE_CHECKING
+
+import hashlib
+import os
+import pkgutil
+
+from .data import patches
+from .locations import cvcotm_location_info
+from .cvcotm_text import cvcotm_string_to_bytearray
+from .options import CompletionGoal, IronMaidenBehavior, RequiredSkirmishes
+from .lz10 import decompress
+from settings import get_settings
+
+if TYPE_CHECKING:
+    from . import CVCotMWorld
+
+CVCOTM_CT_US_HASH = "50a1089600603a94e15ecf287f8d5a1f"  # Original GBA cartridge ROM
+CVCOTM_AC_US_HASH = "87a1bd6577b6702f97a60fc55772ad74"  # Castlevania Advance Collection ROM
+CVCOTM_VC_US_HASH = "2cc38305f62b337281663bad8c901cf9"  # Wii U Virtual Console ROM
+
+# NOTE: The Wii U VC version is untested as of when this comment was written. I am only including its hash in case it
+# does work. If someone who has it can confirm it does indeed work, this comment should be removed. If it doesn't, the
+# hash should be removed in addition. See the Game Page for more information about supported versions.
+
+ARCHIPELAGO_IDENTIFIER_START = 0x7FFF00
+ARCHIPELAGO_IDENTIFIER = "ARCHIPELAG03"
+AUTH_NUMBER_START = 0x7FFF10
+QUEUED_TEXT_STRING_START = 0x7CEB00
+MULTIWORLD_TEXTBOX_POINTERS_START = 0x671C10
+
+BATTLE_ARENA_SONG_IDS = [0x01, 0x03, 0x12, 0x06, 0x08, 0x09, 0x07, 0x0A, 0x0B,
+                         0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x13, 0x14]
+
+
+class RomData:
+    def __init__(self, file: bytes, name: Optional[str] = None) -> 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) -> bytes:
+        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: Collection[int]) -> None:
+        self.file[offset:offset + len(values)] = values
+
+    def get_bytes(self) -> bytes:
+        return bytes(self.file)
+
+    def apply_ips(self, filename: str) -> None:
+        # Try loading the IPS file.
+        try:
+            ips_file = pkgutil.get_data(__name__, "data/ips/" + filename)
+        except IOError:
+            raise Exception(f"{filename} is not present in the ips folder. If it was removed, please replace it.")
+
+        # Verify that the IPS patch is, indeed, an IPS patch.
+        if ips_file[0:5].decode("ascii") != "PATCH":
+            logging.error(filename + " does not appear to be an IPS patch...")
+            return
+
+        file_pos = 5
+        while True:
+            # Get the ROM offset bytes of the current record.
+            rom_offset = int.from_bytes(ips_file[file_pos:file_pos + 3], "big")
+
+            # If we've hit the "EOF" codeword (aka 0x454F46), stop iterating because we've reached the end of the patch.
+            if rom_offset == 0x454F46:
+                return
+
+            # Get the size bytes of the current record.
+            bytes_size = int.from_bytes(ips_file[file_pos + 3:file_pos + 5], "big")
+
+            if bytes_size != 0:
+                # Write the bytes to the ROM.
+                self.write_bytes(rom_offset, ips_file[file_pos + 5:file_pos + 5 + bytes_size])
+
+                # Increase our position in the IPS patch to the start of the next record.
+                file_pos += 5 + bytes_size
+            else:
+                # If the size is 0, we are looking at an RLE record.
+                # Get the size of the RLE.
+                rle_size = int.from_bytes(ips_file[file_pos + 5:file_pos + 7], "big")
+
+                # Get the byte to be written over and over.
+                rle_byte = int.from_bytes(ips_file[file_pos + 7:file_pos + 8], "big")
+
+                # Write the RLE byte to the ROM the RLE size times over.
+                self.write_bytes(rom_offset, [rle_byte for _ in range(rle_size)])
+
+                # Increase our position in the IPS patch to the start of the next record.
+                file_pos += 8
+
+
+class CVCotMPatchExtensions(APPatchExtension):
+    game = "Castlevania - Circle of the Moon"
+
+    @staticmethod
+    def apply_patches(caller: APProcedurePatch, rom: bytes, options_file: str) -> bytes:
+        """Applies every patch to mod the game into its rando state, both CotMR's pre-made IPS patches and some
+        additional byte writes. Each patch is credited to its author."""
+
+        rom_data = RomData(rom)
+        options = json.loads(caller.get_file(options_file).decode("utf-8"))
+
+        # Check to see if the patch was generated on a compatible APWorld version.
+        if "compat_identifier" not in options:
+            raise Exception("Incompatible patch/APWorld version. Make sure the Circle of the Moon APWorlds of both you "
+                            "and the person who generated are matching (and preferably up-to-date).")
+        if options["compat_identifier"] != ARCHIPELAGO_IDENTIFIER:
+            raise Exception("Incompatible patch/APWorld version. Make sure the Circle of the Moon APWorlds of both you "
+                            "and the person who generated are matching (and preferably up-to-date).")
+
+        # This patch allows placing DSS cards on pedestals, prevents them from timing out, and removes them from enemy
+        # drop tables. Created by DevAnj originally as a standalone hack known as Card Mode, it has been modified for
+        # this randomizer's purposes by stripping out additional things like drop and pedestal item replacements.
+
+        # Further modified by Liquid Cat to make placed cards set their flags upon pickup (instead of relying on whether
+        # the card is in the player's inventory when determining to spawn it or not), enable placing dummy DSS Cards to
+        # represent other players' Cards in a multiworld setting, and turn specific cards blue to visually indicate
+        # their status as valid ice/stone combo cards.
+        rom_data.apply_ips("CardUp_v3_Custom2.ips")
+
+        # This patch replaces enemy drops that included DSS cards. Created by DevAnj as part of the Card Up patch but
+        # modified for different replacement drops (Lowered rate, Potion instead of Meat, and no Shinning Armor change
+        # on Devil).
+        rom_data.apply_ips("NoDSSDrops.ips")
+
+        # This patch reveals card combination descriptions instead of showing "???" until the combination is used.
+        # Created by DevAnj.
+        rom_data.apply_ips("CardCombosRevealed.ips")
+
+        # In lategame, the Trick Candle and Scary Candle load in the Cerberus and Iron Golem boss rooms after defeating
+        # Camilla and Twin Dragon Zombies respectively. If the former bosses have not yet been cleared (i.e., we have
+        # sequence broken the game and returned to the earlier boss rooms to fight them), the candle enemies will cause
+        # the bosses to fail to load and soft lock the game. This patches the candles to appear after the early boss is
+        # completed instead.
+        # Created by DevAnj.
+        rom_data.apply_ips("CandleFix.ips")
+
+        # A Tackle block in Machine Tower will cause a softlock if you access the Machine Tower from the Audience Room
+        # using the stone tower route with Kick Boots and not Double. This is a small level edit that moves that block
+        # slightly, removing the potential for a softlock.
+        # Created by DevAnj.
+        rom_data.apply_ips("SoftlockBlockFix.ips")
+
+        # Normally, the MP boosting card combination is useless since it depletes more MP than it gains. This patch
+        # makes it consume zero MP.
+        # Created by DevAnj.
+        rom_data.apply_ips("MPComboFix.ips")
+
+        # Normally, you must clear the game with each mode to unlock subsequent modes, and complete the game at least
+        # once to be able to skip the introductory text crawl. This allows all game modes to be selected and the
+        # introduction to be skipped even without game/mode completion.
+        # Created by DevAnj.
+        rom_data.apply_ips("GameClearBypass.ips")
+
+        # This patch adds custom mapping in Underground Gallery and Underground Waterway to avoid softlocking/Kick Boots
+        # requirements.
+        # Created by DevAnj.
+        rom_data.apply_ips("MapEdits.ips")
+
+        # Prevents demos on the main title screen after the first one from being displayed to avoid pedestal item
+        # reconnaissance from the menu.
+        # Created by Fusecavator.
+        rom_data.apply_ips("DemoForceFirst.ips")
+
+        # Used internally in the item randomizer to allow setting drop rate to 10000 (100%) and actually drop the item
+        # 100% of the time. Normally, it is hard capped at 50% for common drops and 25% for rare drops.
+        # Created by Fusecavator.
+        rom_data.apply_ips("AllowAlwaysDrop.ips")
+
+        # Displays the seed on the pause menu. Originally created by Fusecavator and modified by Liquid Cat to display a
+        # 20-digit seed (which AP seeds most commonly are).
+        rom_data.apply_ips("SeedDisplay20Digits.ips")
+
+        # Write the seed. Upwards of 20 digits can be displayed for the seed number.
+        curr_seed_addr = 0x672152
+        total_digits = 0
+        while options["seed"] and total_digits < 20:
+            seed_digit = (options["seed"] % 10) + 0x511C
+            rom_data.write_bytes(curr_seed_addr, int.to_bytes(seed_digit, 2, "little"))
+            curr_seed_addr -= 2
+            total_digits += 1
+            options["seed"] //= 10
+
+        # Optional patch created by Fusecavator. Permanent dash effect without double tapping.
+        if options["auto_run"]:
+            rom_data.apply_ips("PermanentDash.ips")
+
+        # Optional patch created by Fusecavator. Prohibits the DSS glitch. You will not be able to update the active
+        # effect unless the card combination switched to is obtained. For example, if you switch to another DSS
+        # combination that you have not obtained during DSS startup, you will still have the effect of the original
+        # combination you had selected when you started the DSS activation. In addition, you will not be able to
+        # increase damage and/or change the element of a summon attack unless you possess the cards you swap to.
+        if options["dss_patch"]:
+            rom_data.apply_ips("DSSGlitchFix.ips")
+
+        # Optional patch created by DevAnj. Breaks the iron maidens blocking access to the Underground Waterway,
+        # Underground Gallery, and the room beyond the Adramelech boss room from the beginning of the game.
+        if options["break_iron_maidens"]:
+            rom_data.apply_ips("BrokenMaidens.ips")
+
+        # Optional patch created by Fusecavator. Changes game behavior to add instead of set Last Key values, and check
+        # for a specific value of Last Keys on the door to the Ceremonial Room, allowing multiple keys to be required to
+        # complete the game. Relies on the program to set required key values.
+        if options["required_last_keys"] != 1:
+            rom_data.apply_ips("MultiLastKey.ips")
+            rom_data.write_byte(0x96C1E, options["required_last_keys"])
+            rom_data.write_byte(0xDFB4, options["required_last_keys"])
+            rom_data.write_byte(0xCB84, options["required_last_keys"])
+
+        # Optional patch created by Fusecavator. Doubles the damage dealt by projectiles fired by ranged familiars.
+        if options["buff_ranged_familiars"]:
+            rom_data.apply_ips("BuffFamiliars.ips")
+
+        # Optional patch created by Fusecavator. Increases the base damage dealt by some sub-weapons.
+        # Changes below (normal multiplier on left/shooter on right):
+        # Original:                         Changed:
+        # Dagger:            45 / 141 ----> 100 / 141 (Non-Shooter buffed)
+        # Dagger crush:      32 / 45  ----> 100 / 141 (Both buffed to match non-crush values)
+        # Axe:               89 / 158 ----> 125 / 158 (Non-Shooter somewhat buffed)
+        # Axe crush:         89 / 126 ----> 125 / 158 (Both buffed to match non-crush values)
+        # Holy water:        63 / 100 ---->  63 / 100 (Unchanged)
+        # Holy water crush:  45 / 63  ---->  63 / 100 (Large buff to Shooter, non-Shooter slightly buffed)
+        # Cross:            110 / 173 ----> 110 / 173 (Unchanged)
+        # Cross crush:      100 / 141 ----> 110 / 173 (Slightly buffed to match non-crush values)
+        if options["buff_sub_weapons"]:
+            rom_data.apply_ips("BuffSubweapons.ips")
+
+        # Optional patch created by Fusecavator. Increases the Shooter gamemode base strength and strength per level to
+        # match Vampire Killer.
+        if options["buff_shooter_strength"]:
+            rom_data.apply_ips("ShooterStrength.ips")
+
+        # Optional patch created by Fusecavator. Allows using the Pluto + Griffin combination for the speed boost with
+        # or without the cards being obtained.
+        if options["always_allow_speed_dash"]:
+            rom_data.apply_ips("AllowSpeedDash.ips")
+
+        # Optional patch created by fuse. Displays a counter on the HUD showing the number of magic items and cards
+        # remaining in the current area. Requires a lookup table generated by the randomizer to function.
+        if options["countdown"]:
+            rom_data.apply_ips("Countdown.ips")
+
+        # This patch disables the MP drain effect in the Battle Arena.
+        # Created by Fusecavator.
+        if options["disable_battle_arena_mp_drain"]:
+            rom_data.apply_ips("NoMPDrain.ips")
+
+        # Patch created by Fusecavator. Makes various changes to dropped item graphics to avoid garbled Magic Items and
+        # allow displaying arbitrary items on pedestals. Modified by Liquid Cat for the purposes of changing the
+        # appearances of items regardless of what they really are, as well as allowing additional Magic Items.
+        rom_data.apply_ips("DropReworkMultiEdition.ips")
+        # Decompress the Magic Item graphics and reinsert them (decompressed) where the patch expects them.
+        # Doing it this way is more copyright-safe.
+        rom_data.write_bytes(0x678C00, decompress(rom_data.read_bytes(0x630690, 0x605))[0x300:])
+
+        # Everything past here was added by Liquid Cat.
+
+        # Makes the Pluto + Griffin speed increase apply even while in the air, instead of losing it.
+        if options["pluto_griffin_air_speed"]:
+            rom_data.apply_ips("DSSRunSpeed.ips")
+
+        # Move the item sprite info table.
+        rom_data.write_bytes(0x678A00, rom_data.read_bytes(0x630B98, 0x98))
+        # Update the ldr numbers pointing to the above item sprite table.
+        rom_data.write_bytes(0x95A08, [0x00, 0x8A, 0x67, 0x08])
+        rom_data.write_bytes(0x100380, [0x00, 0x8A, 0x67, 0x08])
+        # Move the magic item text ID table.
+        rom_data.write_bytes(0x6788B0, rom_data.read_bytes(0x100A7E, 0x48))
+        # Update the ldr numbers pointing to the above magic item text ID table.
+        rom_data.write_bytes(0x95C10, [0xB0, 0x88, 0x67, 0x08])
+        rom_data.write_bytes(0x95CE0, [0xB0, 0x88, 0x67, 0x08])
+        # Move the magic item pickup function jump table.
+        rom_data.write_bytes(0x678B20, rom_data.read_bytes(0x95B80, 0x24))
+        # Update the ldr number point to the above jump table.
+        rom_data.write_bytes(0x95B7C, [0x20, 0x8B, 0x67, 0x08])
+        rom_data.write_byte(0x95B6A, 0x09)  # Raise the magic item function index limit.
+
+        # Make the Maiden Detonator detonate the maidens when picked up.
+        rom_data.write_bytes(0x678B44, [0x90, 0x1F, 0x67, 0x08])
+        rom_data.write_bytes(0x671F90, patches.maiden_detonator)
+        # Add the text for detonating the maidens.
+        rom_data.write_bytes(0x671C0C, [0xC0, 0x1F, 0x67, 0x08])
+        rom_data.write_bytes(0x671FC0, cvcotm_string_to_bytearray("    「Iron Maidens� broken◊", "little middle", 0,
+                                                                  wrap=False))
+
+        # Put the new text string IDs for all our new items.
+        rom_data.write_bytes(0x6788F8, [0xF1, 0x84, 0xF1, 0x84, 0xF1, 0x84, 0xF1, 0x84,
+                                        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF])
+        # Have the game get the entry in that table to use by adding the item's parameter.
+        rom_data.write_bytes(0x95980, [0x0A, 0x30, 0x00, 0x00, 0x00, 0x00])
+        # Add the AP Item sprites and their associated info.
+        rom_data.write_bytes(0x679080, patches.extra_item_sprites)
+        rom_data.write_bytes(0x678A98, [0xF8, 0xFF, 0xF8, 0xFF, 0xFC, 0x21, 0x45, 0x00,
+                                        0xF8, 0xFF, 0xF8, 0xFF, 0x00, 0x22, 0x45, 0x00,
+                                        0xF8, 0xFF, 0xF8, 0xFF, 0x04, 0x22, 0x45, 0x00,
+                                        0xF8, 0xFF, 0xF8, 0xFF, 0x08, 0x22, 0x45, 0x00,
+                                        0xF8, 0xFF, 0xF8, 0xFF, 0x0C, 0x22, 0x45, 0x00,
+                                        0xF8, 0xFF, 0xF8, 0xFF, 0x10, 0x22, 0x45, 0x00,
+                                        0xF8, 0xFF, 0xF8, 0xFF, 0x14, 0x32, 0x45, 0x00])
+        # Enable changing the Magic Item appearance separately from what it really is.
+        # Change these ldrh's to ldrb's to read only the high or low byte of the object list entry's parameter field.
+        rom_data.write_bytes(0x9597A, [0xC1, 0x79])
+        rom_data.write_bytes(0x95B64, [0x80, 0x79])
+        rom_data.write_bytes(0x95BF0, [0x81, 0x79])
+        rom_data.write_bytes(0x95CBE, [0x82, 0x79])
+        # Enable changing the Max Up appearance separately from what it really is.
+        rom_data.write_bytes(0x5DE98, [0xC1, 0x79])
+        rom_data.write_byte(0x5E152, 0x13)
+        rom_data.write_byte(0x5E15C, 0x0E)
+        rom_data.write_byte(0x5E20A, 0x0B)
+
+        # Set the 0xF0 flag on the iron maiden switch if we're placing an Item on it.
+        if options["iron_maiden_behavior"] == IronMaidenBehavior.option_detonator_in_pool:
+            rom_data.write_byte(0xD47B4, 0xF0)
+
+        if options["nerf_roc_wing"]:
+            # Prevent Roc jumping in midair if the Double is not in the player's inventory.
+            rom_data.write_bytes(0x6B8A0, [0x00, 0x4A, 0x97, 0x46, 0x00, 0x9A, 0x67, 0x08])
+            rom_data.write_bytes(0x679A00, patches.doubleless_roc_midairs_preventer)
+
+            # Make Roc Wing not jump as high if Kick Boots isn't in the inventory.
+            rom_data.write_bytes(0x6B8B4, [0x00, 0x49, 0x8F, 0x46, 0x60, 0x9A, 0x67, 0x08])
+            rom_data.write_bytes(0x679A60, patches.kickless_roc_height_shortener)
+
+        # Give the player their Start Inventory upon entering their name on a new file.
+        rom_data.write_bytes(0x7F70, [0x00, 0x48, 0x87, 0x46, 0x00, 0x00, 0x68, 0x08])
+        rom_data.write_bytes(0x680000, patches.start_inventory_giver)
+
+        # Prevent Max Ups from exceeding 255.
+        rom_data.write_bytes(0x5E170, [0x00, 0x4A, 0x97, 0x46, 0x00, 0x00, 0x6A, 0x08])
+        rom_data.write_bytes(0x6A0000, patches.max_max_up_checker)
+
+        # Write the textbox messaging system code.
+        rom_data.write_bytes(0x7D60, [0x00, 0x48, 0x87, 0x46, 0x20, 0xFF, 0x7F, 0x08])
+        rom_data.write_bytes(0x7FFF20, patches.remote_textbox_shower)
+
+        # Write the code that sets the screen transition delay timer.
+        rom_data.write_bytes(0x6CE14, [0x00, 0x4A, 0x97, 0x46, 0xC0, 0xFF, 0x7F, 0x08])
+        rom_data.write_bytes(0x7FFFC0, patches.transition_textbox_delayer)
+
+        # Write the code that allows any sound to be played with any Magic Item.
+        rom_data.write_bytes(0x95BE4, [0x00, 0x4A, 0x97, 0x46, 0x00, 0x98, 0x67, 0x08])
+        rom_data.write_bytes(0x679800, patches.magic_item_sfx_customizer)
+        # Array of sound IDs for each Magic Item.
+        rom_data.write_bytes(0x6797C0, [0xB4, 0x01, 0xB4, 0x01, 0xB4, 0x01, 0xB4, 0x01, 0xB4, 0x01, 0xB4, 0x01,
+                                        0xB4, 0x01, 0xB4, 0x01, 0xB4, 0x01, 0x79, 0x00])
+
+        # Write all the data for the missing ASCII text characters.
+        for offset, data in patches.missing_char_data.items():
+            rom_data.write_bytes(offset, data)
+
+        # Change all the menu item name strings that use the overwritten character IDs to use a different, equivalent
+        # space character ID.
+        rom_data.write_bytes(0x391A1B, [0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD])
+        rom_data.write_bytes(0x391CB6, [0xAD, 0xAD, 0xAD])
+        rom_data.write_bytes(0x391CC1, [0xAD, 0xAD, 0xAD])
+        rom_data.write_bytes(0x391CCB, [0xAD, 0xAD, 0xAD, 0xAD])
+        rom_data.write_bytes(0x391CD5, [0xAD, 0xAD, 0xAD, 0xAD, 0xAD])
+        rom_data.write_byte(0x391CE1, 0xAD)
+
+        # Put the unused bottom-of-screen textbox in the middle of the screen instead.
+        # Its background's new y position will be 0x28 instead of 0x50.
+        rom_data.write_byte(0xBEDEA, 0x28)
+        # Change all the hardcoded checks for the 0x50 position to instead check for 0x28.
+        rom_data.write_byte(0xBF398, 0x28)
+        rom_data.write_byte(0xBF41C, 0x28)
+        rom_data.write_byte(0xBF4CC, 0x28)
+        # Change all the hardcoded checks for greater than 0x48 to instead check for 0x28 specifically.
+        rom_data.write_byte(0xBF4A4, 0x28)
+        rom_data.write_byte(0xBF4A7, 0xD0)
+        rom_data.write_byte(0xBF37E, 0x28)
+        rom_data.write_byte(0xBF381, 0xD0)
+        rom_data.write_byte(0xBF40A, 0x28)
+        rom_data.write_byte(0xBF40D, 0xD0)
+        # Change the y position of the contents within the textbox from 0xA0 to 0xB4.
+        # KCEK didn't program hardcoded checks for these, thankfully!
+        rom_data.write_byte(0xBF3BC, 0xB4)
+
+        # Insert the multiworld message pointer at the end of the text pointers.
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START, int.to_bytes(QUEUED_TEXT_STRING_START + 0x8000000,
+                                                                             4, "little"))
+        # Insert pointers for every item tutorial.
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START + 4,  [0x8E, 0x3B, 0x39, 0x08])
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START + 8,  [0xDF, 0x3B, 0x39, 0x08])
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START + 12, [0x35, 0x3C, 0x39, 0x08])
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START + 16, [0xC4, 0x3C, 0x39, 0x08])
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START + 20, [0x41, 0x3D, 0x39, 0x08])
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START + 24, [0x88, 0x3D, 0x39, 0x08])
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START + 28, [0xF7, 0x3D, 0x39, 0x08])
+        rom_data.write_bytes(MULTIWORLD_TEXTBOX_POINTERS_START + 32, [0x67, 0x3E, 0x39, 0x08])
+
+        # Write the completion goal messages over the menu Dash Boots tutorial and Battle Arena's explanation message.
+        if options["completion_goal"] == CompletionGoal.option_dracula:
+            dash_tutorial_message = "Your goal is:\n  Draculaâ—Š"
+            if options["required_skirmishes"] == RequiredSkirmishes.option_all_bosses_and_arena:
+                arena_goal_message = "Your goal is:\n「Dracula�▶" \
+                                     "A required 「Last Key� is waiting for you at the end of the Arena. Good luck!◊"
+            else:
+                arena_goal_message = "Your goal is:\n「Dracula�▶" \
+                                     "You don't have to win the Arena, but you are certainly welcome to try!â—Š"
+        elif options["completion_goal"] == CompletionGoal.option_battle_arena:
+            dash_tutorial_message = "Your goal is:\n  Battle Arenaâ—Š"
+            arena_goal_message = "Your goal is:\n「Battle Arena�▶" \
+                                 "Win the Arena, and your goal will send. Good luck!â—Š"
+        else:
+            dash_tutorial_message = "Your goal is:\n  Arena and Draculaâ—Š"
+            arena_goal_message = "Your goal is:\n「Battle Arena & Dracula�▶" \
+                                 "Your goal will send once you've both won the Arena and beaten Dracula. Good luck!â—Š"
+
+        rom_data.write_bytes(0x393EAE, cvcotm_string_to_bytearray(dash_tutorial_message, "big top", 4,
+                                                                  skip_textbox_controllers=True))
+        rom_data.write_bytes(0x393A0C, cvcotm_string_to_bytearray(arena_goal_message, "big top", 4))
+
+        # Change the pointer to the Ceremonial Room locked door text.
+        rom_data.write_bytes(0x670D94, [0xE0, 0xE9, 0x7C, 0x08])
+        # Write the Ceremonial Room door and menu Last Key tutorial messages telling the player's Last Key options.
+        door_message = f"Hmmmmmm...\nI need 「{options['required_last_keys']}�/" \
+                       f"「{options['available_last_keys']}� Last Keys.◊"
+        key_tutorial_message = f"You need {options['required_last_keys']}/{options['available_last_keys']} keys.â—Š"
+        rom_data.write_bytes(0x7CE9E0, cvcotm_string_to_bytearray(door_message, "big top", 4, 0))
+        rom_data.write_bytes(0x394098, cvcotm_string_to_bytearray(key_tutorial_message, "big top", 4,
+                                                                  skip_textbox_controllers=True))
+
+        # Nuke all the tutorial-related text if Skip Tutorials is enabled.
+        if options["skip_tutorials"]:
+            rom_data.write_byte(0x5EB55, 0xE0)  # DSS
+            rom_data.write_byte(0x393B8C, 0x00)  # Dash Boots
+            rom_data.write_byte(0x393BDD, 0x00)  # Double
+            rom_data.write_byte(0x393C33, 0x00)  # Tackle
+            rom_data.write_byte(0x393CC2, 0x00)  # Kick Boots
+            rom_data.write_byte(0x393D41, 0x00)  # Heavy Ring
+            rom_data.write_byte(0x393D86, 0x00)  # Cleansing
+            rom_data.write_byte(0x393DF5, 0x00)  # Roc Wing
+            rom_data.write_byte(0x393E65, 0x00)  # Last Key
+
+        # Nuke all the cutscene dialogue before the ending if Skip Dialogues is enabled.
+        if options["skip_dialogues"]:
+            rom_data.write_byte(0x392372, 0x00)
+            rom_data.write_bytes(0x3923C9, [0x20, 0x80, 0x00])
+            rom_data.write_bytes(0x3924EE, [0x20, 0x81, 0x00])
+            rom_data.write_byte(0x392621, 0x00)
+            rom_data.write_bytes(0x392650, [0x20, 0x81, 0x00])
+            rom_data.write_byte(0x392740, 0x00)
+            rom_data.write_byte(0x3933C8, 0x00)
+            rom_data.write_byte(0x39346E, 0x00)
+            rom_data.write_byte(0x393670, 0x00)
+            rom_data.write_bytes(0x393698, [0x20, 0x80, 0x00])
+            rom_data.write_byte(0x3936A6, 0x00)
+            rom_data.write_byte(0x393741, 0x00)
+            rom_data.write_byte(0x392944, 0x00)
+            rom_data.write_byte(0x392FFB, 0x00)
+            rom_data.write_byte(0x39305D, 0x00)
+            rom_data.write_byte(0x393114, 0x00)
+            rom_data.write_byte(0x392771, 0x00)
+            rom_data.write_byte(0x3928E9, 0x00)
+            rom_data.write_byte(0x392A3C, 0x00)
+            rom_data.write_byte(0x392A55, 0x00)
+            rom_data.write_byte(0x392A8B, 0x00)
+            rom_data.write_byte(0x392AA4, 0x00)
+            rom_data.write_byte(0x392AF4, 0x00)
+            rom_data.write_byte(0x392B3F, 0x00)
+            rom_data.write_byte(0x392C4D, 0x00)
+            rom_data.write_byte(0x392DEA, 0x00)
+            rom_data.write_byte(0x392E65, 0x00)
+            rom_data.write_byte(0x392F09, 0x00)
+            rom_data.write_byte(0x392FE4, 0x00)
+
+        # Make the Battle Arena play the player's chosen track.
+        if options["battle_arena_music"]:
+            arena_track_id = BATTLE_ARENA_SONG_IDS[options["battle_arena_music"] - 1]
+            rom_data.write_bytes(0xEDEF0, [0xFC, 0xFF, arena_track_id])
+            rom_data.write_bytes(0xEFA50, [0xFC, 0xFF, arena_track_id])
+            rom_data.write_bytes(0xF24F0, [0xFC, 0xFF, arena_track_id])
+            rom_data.write_bytes(0xF3420, [0xF5, 0xFF])
+            rom_data.write_bytes(0xF3430, [0xFC, 0xFF, arena_track_id])
+
+        return rom_data.get_bytes()
+
+    @staticmethod
+    def fix_item_positions(caller: APProcedurePatch, rom: bytes) -> bytes:
+        """After writing all the items into the ROM via token application, translates Magic Items in non-Magic Item
+        Locations up by 8 units and the reverse down by 8 units. This is necessary for them to look properly placed,
+        as Magic Items are offset differently on the Y axis from the other item types."""
+        rom_data = RomData(rom)
+        for loc in cvcotm_location_info:
+            offset = cvcotm_location_info[loc].offset
+            if offset is None:
+                continue
+            item_type = rom_data.read_byte(offset)
+
+            # Magic Items in non-Magic Item Locations should have their Y position decreased by 8.
+            if item_type == 0xE8 and cvcotm_location_info[loc].type not in ["magic item", "boss"]:
+                y_pos = int.from_bytes(rom_data.read_bytes(offset-2, 2), "little")
+                y_pos -= 8
+                rom_data.write_bytes(offset-2, int.to_bytes(y_pos, 2, "little"))
+
+            # Non-Magic Items in Magic Item Locations should have their Y position increased by 8.
+            if item_type != 0xE8 and cvcotm_location_info[loc].type in ["magic item", "boss"]:
+                y_pos = int.from_bytes(rom_data.read_bytes(offset - 2, 2), "little")
+                y_pos += 8
+                rom_data.write_bytes(offset - 2, int.to_bytes(y_pos, 2, "little"))
+
+        return rom_data.get_bytes()
+
+
+class CVCotMProcedurePatch(APProcedurePatch, APTokenMixin):
+    hash = [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]
+    patch_file_ending: str = ".apcvcotm"
+    result_file_ending: str = ".gba"
+
+    game = "Castlevania - Circle of the Moon"
+
+    procedure = [
+        ("apply_patches", ["options.json"]),
+        ("apply_tokens", ["token_data.bin"]),
+        ("fix_item_positions", [])
+    ]
+
+    @classmethod
+    def get_source_data(cls) -> bytes:
+        return get_base_rom_bytes()
+
+
+def patch_rom(world: "CVCotMWorld", patch: CVCotMProcedurePatch, offset_data: Dict[int, bytes],
+              start_with_detonator: bool) -> None:
+
+    # Write all the new item values
+    for offset, data in offset_data.items():
+        patch.write_token(APTokenTypes.WRITE, offset, data)
+
+    # Write the secondary name the client will use to distinguish a vanilla ROM from an AP one.
+    patch.write_token(APTokenTypes.WRITE, ARCHIPELAGO_IDENTIFIER_START, ARCHIPELAGO_IDENTIFIER.encode("utf-8"))
+    # Write the slot authentication
+    patch.write_token(APTokenTypes.WRITE, AUTH_NUMBER_START, bytes(world.auth))
+
+    patch.write_file("token_data.bin", patch.get_token_binary())
+
+    # Write these slot options to a JSON.
+    options_dict = {
+        "auto_run": world.options.auto_run.value,
+        "dss_patch": world.options.dss_patch.value,
+        "break_iron_maidens": start_with_detonator,
+        "iron_maiden_behavior": world.options.iron_maiden_behavior.value,
+        "required_last_keys": world.required_last_keys,
+        "available_last_keys": world.options.available_last_keys.value,
+        "required_skirmishes": world.options.required_skirmishes.value,
+        "buff_ranged_familiars": world.options.buff_ranged_familiars.value,
+        "buff_sub_weapons": world.options.buff_sub_weapons.value,
+        "buff_shooter_strength": world.options.buff_shooter_strength.value,
+        "always_allow_speed_dash": world.options.always_allow_speed_dash.value,
+        "countdown": world.options.countdown.value,
+        "disable_battle_arena_mp_drain": world.options.disable_battle_arena_mp_drain.value,
+        "completion_goal": world.options.completion_goal.value,
+        "skip_dialogues": world.options.skip_dialogues.value,
+        "skip_tutorials": world.options.skip_tutorials.value,
+        "nerf_roc_wing": world.options.nerf_roc_wing.value,
+        "pluto_griffin_air_speed": world.options.pluto_griffin_air_speed.value,
+        "battle_arena_music": world.options.battle_arena_music.value,
+        "seed": world.multiworld.seed,
+        "compat_identifier": ARCHIPELAGO_IDENTIFIER
+    }
+
+    patch.write_file("options.json", json.dumps(options_dict).encode('utf-8'))
+
+
+def get_base_rom_bytes(file_name: str = "") -> bytes:
+    base_rom_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 = bytes(open(file_name, "rb").read())
+
+        basemd5 = hashlib.md5()
+        basemd5.update(base_rom_bytes)
+        if basemd5.hexdigest() not in [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]:
+            raise Exception("Supplied Base ROM does not match known MD5s for Castlevania: Circle of the Moon USA."
+                            "Get the correct game and version, then dump it.")
+        setattr(get_base_rom_bytes, "base_rom_bytes", base_rom_bytes)
+    return base_rom_bytes
+
+
+def get_base_rom_path(file_name: str = "") -> str:
+    if not file_name:
+        file_name = get_settings()["cvcotm_options"]["rom_file"]
+    if not os.path.exists(file_name):
+        file_name = Utils.user_path(file_name)
+    return file_name
diff --git a/worlds/cvcotm/rules.py b/worlds/cvcotm/rules.py
new file mode 100644
index 000000000000..01c240418804
--- /dev/null
+++ b/worlds/cvcotm/rules.py
@@ -0,0 +1,203 @@
+from typing import Dict, TYPE_CHECKING
+
+from BaseClasses import CollectionState
+from worlds.generic.Rules import CollectionRule
+from .data import iname, lname
+from .options import CompletionGoal, IronMaidenBehavior
+
+if TYPE_CHECKING:
+    from . import CVCotMWorld
+
+
+class CVCotMRules:
+    player: int
+    world: "CVCotMWorld"
+    rules: Dict[str, CollectionRule]
+    required_last_keys: int
+    iron_maiden_behavior: int
+    nerf_roc_wing: int
+    ignore_cleansing: int
+    completion_goal: int
+
+    def __init__(self, world: "CVCotMWorld") -> None:
+        self.player = world.player
+        self.world = world
+        self.required_last_keys = world.required_last_keys
+        self.iron_maiden_behavior = world.options.iron_maiden_behavior.value
+        self.nerf_roc_wing = world.options.nerf_roc_wing.value
+        self.ignore_cleansing = world.options.ignore_cleansing.value
+        self.completion_goal = world.options.completion_goal.value
+
+        self.location_rules = {
+            # Sealed Room
+            lname.sr3: self.has_jump_level_5,
+            # Catacomb
+            lname.cc1: self.has_push,
+            lname.cc3: self.has_jump_level_1,
+            lname.cc3b: lambda state:
+                (self.has_jump_level_1(state) and self.has_ice_or_stone(state)) or self.has_jump_level_4(state),
+            lname.cc5: self.has_tackle,
+            lname.cc8b: lambda state: self.has_jump_level_3(state) or self.has_kick(state),
+            lname.cc14b: lambda state: self.has_jump_level_1(state) or self.has_kick(state),
+            lname.cc25: self.has_jump_level_1,
+            # Abyss Staircase
+            lname.as4: self.has_jump_level_4,
+            # Audience Room
+            lname.ar9: self.has_push,
+            lname.ar11: self.has_tackle,
+            lname.ar14b: self.has_jump_level_4,
+            lname.ar17b: lambda state: self.has_jump_level_2(state) or self.has_kick(state),
+            lname.ar19: lambda state: self.has_jump_level_2(state) or self.has_kick(state),
+            lname.ar26: lambda state: self.has_tackle(state) and self.has_jump_level_5(state),
+            lname.ar27: lambda state: self.has_tackle(state) and self.has_push(state),
+            lname.ar30: lambda state:
+                (self.has_jump_level_3(state) and self.has_ice_or_stone(state)) or self.has_jump_level_4(state),
+            lname.ar30b: lambda state:
+                (self.has_jump_level_3(state) and self.has_ice_or_stone(state)) or self.has_jump_level_4(state),
+            # Outer Wall
+            lname.ow0: self.has_jump_level_4,
+            lname.ow1: lambda state: self.has_jump_level_5(state) or self.has_ice_or_stone(state),
+            # Triumph Hallway
+            lname.th3: lambda state:
+                (self.has_kick(state) and self.has_ice_or_stone(state)) or self.has_jump_level_2(state),
+            # Machine Tower
+            lname.mt3: lambda state: self.has_jump_level_2(state) or self.has_kick(state),
+            lname.mt6: lambda state: self.has_jump_level_2(state) or self.has_kick(state),
+            lname.mt14: self.has_tackle,
+            # Chapel Tower
+            lname.ct1: lambda state: self.has_jump_level_2(state) or self.has_ice_or_stone(state),
+            lname.ct4: self.has_push,
+            lname.ct10: self.has_push,
+            lname.ct13: lambda state: self.has_jump_level_2(state) or self.has_ice_or_stone(state),
+            lname.ct22: self.broke_iron_maidens,
+            lname.ct26: lambda state:
+                (self.has_jump_level_3(state) and self.has_ice_or_stone(state)) or self.has_jump_level_4(state),
+            lname.ct26b: lambda state:
+                (self.has_jump_level_3(state) and self.has_ice_or_stone(state)) or self.has_jump_level_4(state),
+            # Underground Gallery
+            lname.ug1: self.has_push,
+            lname.ug2: self.has_push,
+            lname.ug3: lambda state: self.has_jump_level_2(state) or self.has_ice_or_stone(state),
+            lname.ug3b: lambda state: self.has_jump_level_4(state) or self.has_ice_or_stone(state),
+            lname.ug8: self.has_tackle,
+            # Underground Warehouse
+            lname.uw10: lambda state:
+                (self.has_jump_level_4(state) and self.has_ice_or_stone(state)) or self.has_jump_level_5(state),
+            lname.uw14: lambda state: self.has_jump_level_2(state) or self.has_ice_or_stone(state),
+            lname.uw16b: lambda state:
+                (self.has_jump_level_2(state) and self.has_ice_or_stone(state)) or self.has_jump_level_3(state),
+            # Underground Waterway
+            lname.uy5: lambda state: self.has_jump_level_3(state) or self.has_ice_or_stone(state),
+            lname.uy8: self.has_jump_level_2,
+            lname.uy12b: self.can_touch_water,
+            lname.uy17: self.can_touch_water,
+            lname.uy13: self.has_jump_level_3,
+            lname.uy18: self.has_jump_level_3,
+            # Ceremonial Room
+            lname.cr1: lambda state: self.has_jump_level_2(state) or self.has_kick(state),
+            lname.dracula: self.has_jump_level_2,
+        }
+
+        self.entrance_rules = {
+            "Catacomb to Stairway": lambda state: self.has_jump_level_1(state) or self.has_kick(state),
+            "Stairway to Audience": self.has_jump_level_1,
+            "Audience to Machine Bottom": self.has_tackle,
+            "Audience to Machine Top": lambda state: self.has_jump_level_2(state) or self.has_kick(state),
+            "Audience to Chapel": lambda state:
+                (self.has_jump_level_2(state) and self.has_ice_or_stone(state)) or self.has_jump_level_3(state)
+                or self.has_kick(state),
+            "Audience to Gallery": lambda state: self.broke_iron_maidens(state) and self.has_push(state),
+            "Audience to Warehouse": self.has_push,
+            "Audience to Waterway": self.broke_iron_maidens,
+            "Audience to Observation": self.has_jump_level_5,
+            "Ceremonial Door": self.can_open_ceremonial_door,
+            "Corridor to Gallery": self.broke_iron_maidens,
+            "Escape the Gallery Pit": lambda state: self.has_jump_level_2(state) or self.has_kick(state),
+            "Climb to Chapel Top": lambda state: self.has_jump_level_3(state) or self.has_kick(state),
+            "Arena Passage": lambda state: self.has_push(state) and self.has_jump_level_2(state),
+            "Dip Into Waterway End": self.has_jump_level_3,
+            "Gallery Upper to Lower": self.has_tackle,
+            "Gallery Lower to Upper": self.has_tackle,
+            "Into Warehouse Main": self.has_tackle,
+            "Into Waterway Main": self.can_touch_water,
+        }
+
+    def has_jump_level_1(self, state: CollectionState) -> bool:
+        """Double or Roc Wing, regardless of Roc being nerfed or not."""
+        return state.has_any([iname.double, iname.roc_wing], self.player)
+
+    def has_jump_level_2(self, state: CollectionState) -> bool:
+        """Specifically Roc Wing, regardless of Roc being nerfed or not."""
+        return state.has(iname.roc_wing, self.player)
+
+    def has_jump_level_3(self, state: CollectionState) -> bool:
+        """Roc Wing and Double OR Kick Boots if Roc is nerfed. Otherwise, just Roc."""
+        if self.nerf_roc_wing:
+            return state.has(iname.roc_wing, self.player) and \
+                   state.has_any([iname.double, iname.kick_boots], self.player)
+        else:
+            return state.has(iname.roc_wing, self.player)
+
+    def has_jump_level_4(self, state: CollectionState) -> bool:
+        """Roc Wing and Kick Boots specifically if Roc is nerfed. Otherwise, just Roc."""
+        if self.nerf_roc_wing:
+            return state.has_all([iname.roc_wing, iname.kick_boots], self.player)
+        else:
+            return state.has(iname.roc_wing, self.player)
+
+    def has_jump_level_5(self, state: CollectionState) -> bool:
+        """Roc Wing, Double, AND Kick Boots if Roc is nerfed. Otherwise, just Roc."""
+        if self.nerf_roc_wing:
+            return state.has_all([iname.roc_wing, iname.double, iname.kick_boots], self.player)
+        else:
+            return state.has(iname.roc_wing, self.player)
+
+    def has_tackle(self, state: CollectionState) -> bool:
+        return state.has(iname.tackle, self.player)
+
+    def has_push(self, state: CollectionState) -> bool:
+        return state.has(iname.heavy_ring, self.player)
+
+    def has_kick(self, state: CollectionState) -> bool:
+        return state.has(iname.kick_boots, self.player)
+
+    def has_ice_or_stone(self, state: CollectionState) -> bool:
+        """Valid DSS combo that allows freezing or petrifying enemies to use as platforms."""
+        return state.has_any([iname.serpent, iname.cockatrice], self.player) and \
+            state.has_any([iname.mercury, iname.mars], self.player)
+
+    def can_touch_water(self, state: CollectionState) -> bool:
+        """Cleansing unless it's ignored, in which case this will always return True."""
+        return self.ignore_cleansing or state.has(iname.cleansing, self.player)
+
+    def broke_iron_maidens(self, state: CollectionState) -> bool:
+        """Maiden Detonator unless the Iron Maidens start broken, in which case this will always return True."""
+        return (self.iron_maiden_behavior == IronMaidenBehavior.option_start_broken
+                or state.has(iname.ironmaidens, self.player))
+
+    def can_open_ceremonial_door(self, state: CollectionState) -> bool:
+        """The required number of Last Keys. If 0 keys are required, this should always return True."""
+        return state.has(iname.last_key, self.player, self.required_last_keys)
+
+    def set_cvcotm_rules(self) -> None:
+        multiworld = self.world.multiworld
+
+        for region in multiworld.get_regions(self.player):
+            # Set each Entrance's rule if it should have one.
+            for ent in region.entrances:
+                if ent.name in self.entrance_rules:
+                    ent.access_rule = self.entrance_rules[ent.name]
+
+            # Set each Location's rule if it should have one.
+            for loc in region.locations:
+                if loc.name in self.location_rules:
+                    loc.access_rule = self.location_rules[loc.name]
+
+        # Set the World's completion condition depending on what its Completion Goal option is.
+        if self.completion_goal == CompletionGoal.option_dracula:
+            multiworld.completion_condition[self.player] = lambda state: state.has(iname.dracula, self.player)
+        elif self.completion_goal == CompletionGoal.option_battle_arena:
+            multiworld.completion_condition[self.player] = lambda state: state.has(iname.shinning_armor, self.player)
+        else:
+            multiworld.completion_condition[self.player] = \
+                lambda state: state.has_all([iname.dracula, iname.shinning_armor], self.player)
diff --git a/worlds/cvcotm/test/__init__.py b/worlds/cvcotm/test/__init__.py
new file mode 100644
index 000000000000..d8092a937924
--- /dev/null
+++ b/worlds/cvcotm/test/__init__.py
@@ -0,0 +1,5 @@
+from test.bases import WorldTestBase
+
+
+class CVCotMTestBase(WorldTestBase):
+    game = "Castlevania - Circle of the Moon"
diff --git a/worlds/cvcotm/test/test_access.py b/worlds/cvcotm/test/test_access.py
new file mode 100644
index 000000000000..7fba9964e112
--- /dev/null
+++ b/worlds/cvcotm/test/test_access.py
@@ -0,0 +1,811 @@
+from . import CVCotMTestBase
+from ..data import iname, lname
+from ..options import IronMaidenBehavior
+
+
+class CatacombSphere1Test(CVCotMTestBase):
+
+    def test_always_accessible(self) -> None:
+        self.assertTrue(self.can_reach_location(lname.cc4))
+        self.assertTrue(self.can_reach_location(lname.cc8))
+        self.assertTrue(self.can_reach_location(lname.cc9))
+        self.assertTrue(self.can_reach_location(lname.cc10))
+        self.assertTrue(self.can_reach_location(lname.cc13))
+        self.assertTrue(self.can_reach_location(lname.cc14))
+        self.assertTrue(self.can_reach_location(lname.cc16))
+        self.assertTrue(self.can_reach_location(lname.cc20))
+        self.assertTrue(self.can_reach_location(lname.cc22))
+        self.assertTrue(self.can_reach_location(lname.cc24))
+
+
+class DoubleTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken,
+        "nerf_roc_wing": True,
+        "ignore_cleansing": True
+    }
+
+    def test_double_only(self) -> None:
+        self.assertFalse(self.can_reach_location(lname.cc3))
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.cc14b))
+        self.assertFalse(self.can_reach_location(lname.cc25))
+        self.assertFalse(self.can_reach_entrance("Catacomb to Stairway"))
+        self.assertFalse(self.can_reach_entrance("Stairway to Audience"))
+
+        self.collect_by_name([iname.double])
+
+        self.assertTrue(self.can_reach_location(lname.cc3))
+        self.assertTrue(self.can_reach_location(lname.cc14b))
+        self.assertTrue(self.can_reach_location(lname.cc25))
+        self.assertTrue(self.can_reach_entrance("Catacomb to Stairway"))
+        self.assertTrue(self.can_reach_entrance("Stairway to Audience"))
+
+        # Jump-locked things that Double still shouldn't be able to reach.
+        self.assertFalse(self.can_reach_location(lname.sr3))
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.cc8b))
+        self.assertFalse(self.can_reach_location(lname.as4))
+        self.assertFalse(self.can_reach_location(lname.ar14b))
+        self.assertFalse(self.can_reach_location(lname.ar17b))
+        self.assertFalse(self.can_reach_location(lname.ar19))
+        self.assertFalse(self.can_reach_location(lname.ar26))
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ow0))
+        self.assertFalse(self.can_reach_location(lname.ow1))
+        self.assertFalse(self.can_reach_location(lname.th3))
+        self.assertFalse(self.can_reach_entrance("Audience to Machine Top"))
+        self.assertFalse(self.can_reach_entrance("Audience to Chapel"))
+        self.assertFalse(self.can_reach_entrance("Audience to Observation"))
+
+        self.collect_by_name([iname.heavy_ring, iname.tackle])
+
+        self.assertFalse(self.can_reach_entrance("Escape the Gallery Pit"))
+
+    def test_double_with_freeze(self) -> None:
+        self.collect_by_name([iname.mercury, iname.serpent])
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+
+        self.collect_by_name([iname.double])
+
+        self.assertTrue(self.can_reach_location(lname.cc3b))
+
+    def test_nerfed_roc_double_path(self) -> None:
+        self.collect_by_name([iname.roc_wing, iname.tackle, iname.heavy_ring])
+
+        self.assertFalse(self.can_reach_entrance("Audience to Chapel"))
+        self.assertFalse(self.can_reach_entrance("Arena Passage"))
+        self.assertFalse(self.can_reach_entrance("Dip Into Waterway End"))
+        self.assertFalse(self.can_reach_entrance("Climb to Chapel Top"))
+        self.assertFalse(self.can_reach_location(lname.cc8b))
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.as4))
+        self.assertFalse(self.can_reach_location(lname.ar14b))
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ow0))
+        self.assertFalse(self.can_reach_location(lname.ct26))
+        self.assertFalse(self.can_reach_location(lname.ct26b))
+        self.assertFalse(self.can_reach_location(lname.ug3b))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+        self.assertFalse(self.can_reach_location(lname.uw16b))
+        self.assertFalse(self.can_reach_location(lname.uy5))
+        self.assertFalse(self.can_reach_location(lname.uy13))
+        self.assertFalse(self.can_reach_location(lname.uy18))
+
+        self.collect_by_name([iname.double])
+
+        self.assertTrue(self.can_reach_entrance("Audience to Chapel"))
+        self.assertTrue(self.can_reach_entrance("Arena Passage"))
+        self.assertTrue(self.can_reach_entrance("Dip Into Waterway End"))
+        self.assertTrue(self.can_reach_entrance("Climb to Chapel Top"))
+        self.assertTrue(self.can_reach_location(lname.cc8b))
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.as4))
+        self.assertFalse(self.can_reach_location(lname.ar14b))
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ow0))
+        self.assertFalse(self.can_reach_location(lname.ct26))
+        self.assertFalse(self.can_reach_location(lname.ct26b))
+        self.assertFalse(self.can_reach_location(lname.ug3b))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+        self.assertTrue(self.can_reach_location(lname.uw16b))
+        self.assertTrue(self.can_reach_location(lname.uy5))
+        self.assertTrue(self.can_reach_location(lname.uy13))
+        self.assertTrue(self.can_reach_location(lname.uy18))
+
+        self.assertFalse(self.can_reach_entrance("Audience to Observation"))
+        self.assertFalse(self.can_reach_location(lname.sr3))
+        self.assertFalse(self.can_reach_location(lname.ar26))
+        self.assertFalse(self.can_reach_location(lname.ow1))
+
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_entrance("Arena Passage"))
+        self.assertTrue(self.can_reach_location(lname.cc3b))
+        self.assertTrue(self.can_reach_location(lname.as4))
+        self.assertTrue(self.can_reach_location(lname.ar14b))
+        self.assertTrue(self.can_reach_location(lname.ar30))
+        self.assertTrue(self.can_reach_location(lname.ar30b))
+        self.assertTrue(self.can_reach_location(lname.ow0))
+        self.assertTrue(self.can_reach_location(lname.ct26))
+        self.assertTrue(self.can_reach_location(lname.ct26b))
+        self.assertTrue(self.can_reach_location(lname.ug3b))
+        self.assertTrue(self.can_reach_location(lname.uw10))
+        self.assertTrue(self.can_reach_entrance("Audience to Observation"))
+        self.assertTrue(self.can_reach_location(lname.sr3))
+        self.assertTrue(self.can_reach_location(lname.ar26))
+        self.assertTrue(self.can_reach_location(lname.ow1))
+
+
+class TackleTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken,
+    }
+
+    def test_tackle_only_in_catacomb(self) -> None:
+        self.assertFalse(self.can_reach_location(lname.cc5))
+
+        self.collect_by_name([iname.tackle])
+
+        self.assertTrue(self.can_reach_location(lname.cc5))
+
+    def test_tackle_only_in_audience_room(self) -> None:
+        self.collect_by_name([iname.double])
+
+        self.assertFalse(self.can_reach_location(lname.ar11))
+        self.assertFalse(self.can_reach_entrance("Audience to Machine Bottom"))
+
+        self.collect_by_name([iname.tackle])
+
+        self.assertTrue(self.can_reach_location(lname.ar11))
+        self.assertTrue(self.can_reach_entrance("Audience to Machine Bottom"))
+
+    def test_tackle_with_kick_boots(self) -> None:
+        self.collect_by_name([iname.double, iname.kick_boots])
+
+        self.assertFalse(self.can_reach_location(lname.mt14))
+        self.assertFalse(self.can_reach_entrance("Gallery Upper to Lower"))
+
+        self.collect_by_name([iname.tackle])
+
+        self.assertTrue(self.can_reach_location(lname.mt14))
+        self.assertTrue(self.can_reach_entrance("Gallery Upper to Lower"))
+
+    def test_tackle_with_heavy_ring(self) -> None:
+        self.collect_by_name([iname.double, iname.heavy_ring])
+
+        self.assertFalse(self.can_reach_location(lname.ar27))
+        self.assertFalse(self.can_reach_location(lname.ug8))
+        self.assertFalse(self.can_reach_entrance("Into Warehouse Main"))
+        self.assertFalse(self.can_reach_entrance("Gallery Lower to Upper"))
+
+        self.collect_by_name([iname.tackle])
+
+        self.assertTrue(self.can_reach_location(lname.ar27))
+        self.assertTrue(self.can_reach_location(lname.ug8))
+        self.assertTrue(self.can_reach_entrance("Into Warehouse Main"))
+        self.assertTrue(self.can_reach_entrance("Gallery Lower to Upper"))
+
+    def test_tackle_with_roc_wing(self) -> None:
+        self.collect_by_name([iname.roc_wing])
+
+        self.assertFalse(self.can_reach_location(lname.ar26))
+
+        self.collect_by_name([iname.tackle])
+
+        self.assertTrue(self.can_reach_location(lname.ar26))
+
+
+class KickBootsTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken,
+        "nerf_roc_wing": True,
+        "ignore_cleansing": True,
+    }
+
+    def test_kick_boots_only_in_catacomb(self) -> None:
+        self.assertFalse(self.can_reach_location(lname.cc8b))
+        self.assertFalse(self.can_reach_location(lname.cc14b))
+        self.assertFalse(self.can_reach_entrance("Catacomb to Stairway"))
+
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_location(lname.cc8b))
+        self.assertTrue(self.can_reach_location(lname.cc14b))
+        self.assertTrue(self.can_reach_entrance("Catacomb to Stairway"))
+
+    def test_kick_boots_only_in_audience_room(self) -> None:
+        self.collect_by_name([iname.double])
+
+        self.assertFalse(self.can_reach_location(lname.ar17b))
+        self.assertFalse(self.can_reach_location(lname.ar19))
+        self.assertFalse(self.can_reach_entrance("Audience to Machine Top"))
+        self.assertFalse(self.can_reach_entrance("Audience to Chapel"))
+        self.assertFalse(self.can_reach_entrance("Climb to Chapel Top"))
+
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_location(lname.ar17b))
+        self.assertTrue(self.can_reach_location(lname.ar19))
+        self.assertTrue(self.can_reach_entrance("Audience to Machine Top"))
+        self.assertTrue(self.can_reach_entrance("Audience to Chapel"))
+        self.assertTrue(self.can_reach_entrance("Climb to Chapel Top"))
+
+    def test_kick_boots_with_tackle(self) -> None:
+        self.collect_by_name([iname.double, iname.tackle])
+
+        self.assertFalse(self.can_reach_location(lname.mt3))
+        self.assertFalse(self.can_reach_location(lname.mt6))
+
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_location(lname.mt3))
+        self.assertTrue(self.can_reach_location(lname.mt6))
+
+    def test_kick_boots_with_freeze(self) -> None:
+        self.collect_by_name([iname.double, iname.mars, iname.cockatrice])
+
+        self.assertFalse(self.can_reach_region("Underground Gallery Upper"))
+        self.assertFalse(self.can_reach_location(lname.th3))
+        self.assertFalse(self.can_reach_location(lname.ug3))
+        self.assertFalse(self.can_reach_location(lname.ug3b))
+
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_region("Underground Gallery Upper"))
+        self.assertTrue(self.can_reach_location(lname.th3))
+        self.assertTrue(self.can_reach_location(lname.ug3))
+        self.assertTrue(self.can_reach_location(lname.ug3b))
+
+    def test_kick_boots_with_last_key(self) -> None:
+        self.collect_by_name([iname.double, iname.last_key])
+
+        self.assertFalse(self.can_reach_location(lname.cr1))
+
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_location(lname.cr1))
+
+    def test_nerfed_roc_kick_boots_path(self) -> None:
+        self.collect_by_name([iname.roc_wing, iname.tackle, iname.heavy_ring])
+
+        self.assertFalse(self.can_reach_entrance("Audience to Chapel"))
+        self.assertFalse(self.can_reach_entrance("Arena Passage"))
+        self.assertFalse(self.can_reach_entrance("Dip Into Waterway End"))
+        self.assertFalse(self.can_reach_entrance("Climb to Chapel Top"))
+        self.assertFalse(self.can_reach_location(lname.cc8b))
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.as4))
+        self.assertFalse(self.can_reach_location(lname.ar14b))
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ow0))
+        self.assertFalse(self.can_reach_location(lname.ct26))
+        self.assertFalse(self.can_reach_location(lname.ct26b))
+        self.assertFalse(self.can_reach_location(lname.ug3b))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+        self.assertFalse(self.can_reach_location(lname.uw16b))
+        self.assertFalse(self.can_reach_location(lname.uy5))
+        self.assertFalse(self.can_reach_location(lname.uy13))
+        self.assertFalse(self.can_reach_location(lname.uy18))
+
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_entrance("Audience to Chapel"))
+        self.assertTrue(self.can_reach_entrance("Arena Passage"))
+        self.assertTrue(self.can_reach_entrance("Dip Into Waterway End"))
+        self.assertTrue(self.can_reach_entrance("Climb to Chapel Top"))
+        self.assertTrue(self.can_reach_location(lname.cc8b))
+        self.assertTrue(self.can_reach_location(lname.cc3b))
+        self.assertTrue(self.can_reach_location(lname.as4))
+        self.assertTrue(self.can_reach_location(lname.ar14b))
+        self.assertTrue(self.can_reach_location(lname.ar30))
+        self.assertTrue(self.can_reach_location(lname.ar30b))
+        self.assertTrue(self.can_reach_location(lname.ow0))
+        self.assertTrue(self.can_reach_location(lname.ct26))
+        self.assertTrue(self.can_reach_location(lname.ct26b))
+        self.assertTrue(self.can_reach_location(lname.ug3b))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+        self.assertTrue(self.can_reach_location(lname.uw16b))
+        self.assertTrue(self.can_reach_location(lname.uy5))
+        self.assertTrue(self.can_reach_location(lname.uy13))
+        self.assertTrue(self.can_reach_location(lname.uy18))
+
+        self.assertFalse(self.can_reach_entrance("Audience to Observation"))
+        self.assertFalse(self.can_reach_location(lname.sr3))
+        self.assertFalse(self.can_reach_location(lname.ar26))
+        self.assertFalse(self.can_reach_location(lname.ow1))
+
+        self.collect_by_name([iname.double])
+
+        self.assertTrue(self.can_reach_location(lname.uw10))
+        self.assertTrue(self.can_reach_entrance("Audience to Observation"))
+        self.assertTrue(self.can_reach_location(lname.sr3))
+        self.assertTrue(self.can_reach_location(lname.ar26))
+        self.assertTrue(self.can_reach_location(lname.ow1))
+
+
+class HeavyRingTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken
+    }
+
+    def test_heavy_ring_only_in_catacomb(self) -> None:
+        self.assertFalse(self.can_reach_location(lname.cc1))
+
+        self.collect_by_name([iname.heavy_ring])
+
+        self.assertTrue(self.can_reach_location(lname.cc1))
+
+    def test_heavy_ring_only_in_audience_room(self) -> None:
+        self.collect_by_name([iname.double])
+
+        self.assertFalse(self.can_reach_location(lname.ar9))
+        self.assertFalse(self.can_reach_entrance("Audience to Gallery"))
+        self.assertFalse(self.can_reach_entrance("Audience to Warehouse"))
+
+        self.collect_by_name([iname.heavy_ring])
+
+        self.assertTrue(self.can_reach_location(lname.ar9))
+        self.assertTrue(self.can_reach_entrance("Audience to Gallery"))
+        self.assertTrue(self.can_reach_entrance("Audience to Warehouse"))
+
+    def test_heavy_ring_with_tackle(self) -> None:
+        self.collect_by_name([iname.double, iname.tackle])
+
+        self.assertFalse(self.can_reach_location(lname.ar27))
+        self.assertFalse(self.can_reach_entrance("Into Warehouse Main"))
+
+        self.collect_by_name([iname.heavy_ring])
+
+        self.assertTrue(self.can_reach_location(lname.ar27))
+        self.assertTrue(self.can_reach_entrance("Into Warehouse Main"))
+
+    def test_heavy_ring_with_kick_boots(self) -> None:
+        self.collect_by_name([iname.double, iname.kick_boots])
+
+        self.assertFalse(self.can_reach_location(lname.ct4))
+        self.assertFalse(self.can_reach_location(lname.ct10))
+        self.assertFalse(self.can_reach_location(lname.ug1))
+        self.assertFalse(self.can_reach_location(lname.ug2))
+
+        self.collect_by_name([iname.heavy_ring])
+
+        self.assertTrue(self.can_reach_location(lname.ct4))
+        self.assertTrue(self.can_reach_location(lname.ct10))
+        self.assertTrue(self.can_reach_location(lname.ug1))
+        self.assertTrue(self.can_reach_location(lname.ug2))
+
+    def test_heavy_ring_with_roc_wing(self) -> None:
+        self.collect_by_name([iname.roc_wing])
+
+        self.assertFalse(self.can_reach_entrance("Arena Passage"))
+
+        self.collect_by_name([iname.heavy_ring])
+
+        self.assertTrue(self.can_reach_entrance("Arena Passage"))
+
+
+class CleansingTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken
+    }
+
+    def test_cleansing_only(self) -> None:
+        self.collect_by_name([iname.double])
+
+        self.assertFalse(self.can_reach_entrance("Into Waterway Main"))
+
+        self.collect_by_name([iname.cleansing])
+
+        self.assertTrue(self.can_reach_entrance("Into Waterway Main"))
+
+    def test_cleansing_with_roc(self) -> None:
+        self.collect_by_name([iname.roc_wing])
+
+        self.assertFalse(self.can_reach_location(lname.uy12b))
+        self.assertFalse(self.can_reach_location(lname.uy17))
+
+        self.assertTrue(self.can_reach_entrance("Dip Into Waterway End"))
+
+        self.collect_by_name([iname.cleansing])
+
+        self.assertTrue(self.can_reach_location(lname.uy12b))
+        self.assertTrue(self.can_reach_location(lname.uy17))
+
+
+class IgnoredCleansingTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken,
+        "ignore_cleansing": True
+    }
+
+    def test_ignored_cleansing(self) -> None:
+        self.assertFalse(self.can_reach_entrance("Into Waterway Main"))
+        self.assertFalse(self.can_reach_location(lname.uy12b))
+        self.assertFalse(self.can_reach_location(lname.uy17))
+
+        self.collect_by_name([iname.double])
+
+        self.assertTrue(self.can_reach_entrance("Into Waterway Main"))
+        self.assertTrue(self.can_reach_location(lname.uy12b))
+        self.assertTrue(self.can_reach_location(lname.uy17))
+
+
+class UnNerfedRocTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken
+    }
+
+    def test_roc_wing_only(self) -> None:
+        self.assertFalse(self.can_reach_location(lname.sr3))
+        self.assertFalse(self.can_reach_location(lname.cc3))
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.cc8b))
+        self.assertFalse(self.can_reach_location(lname.cc14b))
+        self.assertFalse(self.can_reach_location(lname.cc25))
+        self.assertFalse(self.can_reach_location(lname.as4))
+        self.assertFalse(self.can_reach_location(lname.ar14b))
+        self.assertFalse(self.can_reach_location(lname.ar17b))
+        self.assertFalse(self.can_reach_location(lname.ar19))
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ow0))
+        self.assertFalse(self.can_reach_location(lname.ow1))
+        self.assertFalse(self.can_reach_location(lname.th3))
+        self.assertFalse(self.can_reach_location(lname.ct1))
+        self.assertFalse(self.can_reach_location(lname.ct13))
+        self.assertFalse(self.can_reach_location(lname.ug3))
+        self.assertFalse(self.can_reach_location(lname.ug3b))
+        self.assertFalse(self.can_reach_entrance("Catacomb to Stairway"))
+        self.assertFalse(self.can_reach_entrance("Stairway to Audience"))
+        self.assertFalse(self.can_reach_entrance("Audience to Machine Top"))
+        self.assertFalse(self.can_reach_entrance("Audience to Chapel"))
+        self.assertFalse(self.can_reach_entrance("Audience to Observation"))
+        self.assertFalse(self.can_reach_entrance("Dip Into Waterway End"))
+
+        self.collect_by_name([iname.roc_wing])
+
+        self.assertTrue(self.can_reach_location(lname.sr3))
+        self.assertTrue(self.can_reach_location(lname.cc3))
+        self.assertTrue(self.can_reach_location(lname.cc3b))
+        self.assertTrue(self.can_reach_location(lname.cc8b))
+        self.assertTrue(self.can_reach_location(lname.cc14b))
+        self.assertTrue(self.can_reach_location(lname.cc25))
+        self.assertTrue(self.can_reach_location(lname.as4))
+        self.assertTrue(self.can_reach_location(lname.ar14b))
+        self.assertTrue(self.can_reach_location(lname.ar17b))
+        self.assertTrue(self.can_reach_location(lname.ar19))
+        self.assertTrue(self.can_reach_location(lname.ar30))
+        self.assertTrue(self.can_reach_location(lname.ar30b))
+        self.assertTrue(self.can_reach_location(lname.ow0))
+        self.assertTrue(self.can_reach_location(lname.ow1))
+        self.assertTrue(self.can_reach_location(lname.th3))
+        self.assertTrue(self.can_reach_location(lname.ct1))
+        self.assertTrue(self.can_reach_location(lname.ct13))
+        self.assertTrue(self.can_reach_location(lname.ug3))
+        self.assertTrue(self.can_reach_location(lname.ug3b))
+        self.assertTrue(self.can_reach_entrance("Catacomb to Stairway"))
+        self.assertTrue(self.can_reach_entrance("Stairway to Audience"))
+        self.assertTrue(self.can_reach_entrance("Audience to Machine Top"))
+        self.assertTrue(self.can_reach_entrance("Audience to Chapel"))
+        self.assertTrue(self.can_reach_entrance("Audience to Observation"))
+        self.assertTrue(self.can_reach_entrance("Dip Into Waterway End"))
+        self.assertFalse(self.can_reach_entrance("Arena Passage"))
+
+    def test_roc_wing_exclusive_accessibility(self) -> None:
+        self.collect_by_name([iname.double, iname.tackle, iname.kick_boots, iname.heavy_ring, iname.cleansing,
+                              iname.last_key, iname.mercury, iname.cockatrice])
+
+        self.assertFalse(self.can_reach_location(lname.sr3))
+        self.assertFalse(self.can_reach_location(lname.as4))
+        self.assertFalse(self.can_reach_location(lname.ar14b))
+        self.assertFalse(self.can_reach_location(lname.ar26))
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ow0))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+        self.assertFalse(self.can_reach_location(lname.uw16b))
+        self.assertFalse(self.can_reach_location(lname.uy8))
+        self.assertFalse(self.can_reach_location(lname.uy13))
+        self.assertFalse(self.can_reach_location(lname.uy18))
+        self.assertFalse(self.can_reach_location(lname.dracula))
+        self.assertFalse(self.can_reach_entrance("Audience to Observation"))
+        self.assertFalse(self.can_reach_entrance("Arena Passage"))
+        self.assertFalse(self.can_reach_entrance("Dip Into Waterway End"))
+
+        self.collect_by_name([iname.roc_wing])
+
+        self.assertTrue(self.can_reach_location(lname.sr3))
+        self.assertTrue(self.can_reach_location(lname.as4))
+        self.assertTrue(self.can_reach_location(lname.ar14b))
+        self.assertTrue(self.can_reach_location(lname.ar26))
+        self.assertTrue(self.can_reach_location(lname.ar30))
+        self.assertTrue(self.can_reach_location(lname.ar30b))
+        self.assertTrue(self.can_reach_location(lname.ow0))
+        self.assertTrue(self.can_reach_location(lname.uw10))
+        self.assertTrue(self.can_reach_location(lname.uw16b))
+        self.assertTrue(self.can_reach_location(lname.uy8))
+        self.assertTrue(self.can_reach_location(lname.uy13))
+        self.assertTrue(self.can_reach_location(lname.uy18))
+        self.assertTrue(self.can_reach_location(lname.dracula))
+        self.assertTrue(self.can_reach_entrance("Audience to Observation"))
+        self.assertTrue(self.can_reach_entrance("Arena Passage"))
+        self.assertTrue(self.can_reach_entrance("Dip Into Waterway End"))
+
+
+class NerfedRocTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken,
+        "nerf_roc_wing": True,
+        "ignore_cleansing": True
+    }
+
+    def test_nerfed_roc_without_double_or_kick(self) -> None:
+        self.collect_by_name([iname.tackle, iname.heavy_ring, iname.last_key])
+        self.assertFalse(self.can_reach_location(lname.cc3))
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.cc14b))
+        self.assertFalse(self.can_reach_location(lname.cc25))
+        self.assertFalse(self.can_reach_entrance("Catacomb to Stairway"))
+        self.assertFalse(self.can_reach_entrance("Stairway to Audience"))
+
+        self.collect_by_name([iname.roc_wing])
+
+        # Jump-locked things inside Catacomb that just Roc Wing should be able to reach while nerfed.
+        self.assertTrue(self.can_reach_location(lname.cc3))
+        self.assertTrue(self.can_reach_location(lname.cc14b))
+        self.assertTrue(self.can_reach_location(lname.cc25))
+        self.assertTrue(self.can_reach_entrance("Catacomb to Stairway"))
+        self.assertTrue(self.can_reach_entrance("Stairway to Audience"))
+
+        # Jump-locked things outside Catacomb that just Roc Wing should be able to reach while nerfed.
+        self.assertTrue(self.can_reach_location(lname.ar17b))
+        self.assertTrue(self.can_reach_location(lname.ar19))
+        self.assertTrue(self.can_reach_location(lname.th3))
+        self.assertTrue(self.can_reach_location(lname.mt3))
+        self.assertTrue(self.can_reach_location(lname.mt6))
+        self.assertTrue(self.can_reach_location(lname.ct1))
+        self.assertTrue(self.can_reach_location(lname.ct13))
+        self.assertTrue(self.can_reach_location(lname.ug3))
+        self.assertTrue(self.can_reach_location(lname.uw14))
+        self.assertTrue(self.can_reach_location(lname.uy8))
+        self.assertTrue(self.can_reach_location(lname.cr1))
+        self.assertTrue(self.can_reach_location(lname.dracula))
+        self.assertTrue(self.can_reach_entrance("Audience to Machine Top"))
+        self.assertTrue(self.can_reach_entrance("Escape the Gallery Pit"))
+
+        # Jump-locked things outside Catacomb that just Roc Wing shouldn't be able to reach while nerfed.
+        self.assertFalse(self.can_reach_location(lname.sr3))
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.cc8b))
+        self.assertFalse(self.can_reach_location(lname.as4))
+        self.assertFalse(self.can_reach_location(lname.ar14b))
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ow0))
+        self.assertFalse(self.can_reach_location(lname.ow1))
+        self.assertFalse(self.can_reach_location(lname.ct26))
+        self.assertFalse(self.can_reach_location(lname.ct26b))
+        self.assertFalse(self.can_reach_location(lname.ug3b))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+        self.assertFalse(self.can_reach_location(lname.uw16b))
+        self.assertFalse(self.can_reach_location(lname.uy5))
+        self.assertFalse(self.can_reach_location(lname.uy13))
+        self.assertFalse(self.can_reach_location(lname.uy18))
+        self.assertFalse(self.can_reach_entrance("Audience to Chapel"))
+        self.assertFalse(self.can_reach_entrance("Audience to Observation"))
+        self.assertFalse(self.can_reach_entrance("Climb to Chapel Top"))
+
+        self.collect_by_name([iname.double, iname.kick_boots])
+
+        self.assertTrue(self.can_reach_location(lname.sr3))
+        self.assertTrue(self.can_reach_location(lname.cc3b))
+        self.assertTrue(self.can_reach_location(lname.cc8b))
+        self.assertTrue(self.can_reach_location(lname.as4))
+        self.assertTrue(self.can_reach_location(lname.ar14b))
+        self.assertTrue(self.can_reach_location(lname.ar30))
+        self.assertTrue(self.can_reach_location(lname.ar30b))
+        self.assertTrue(self.can_reach_location(lname.ow0))
+        self.assertTrue(self.can_reach_location(lname.ow1))
+        self.assertTrue(self.can_reach_location(lname.ct26))
+        self.assertTrue(self.can_reach_location(lname.ct26b))
+        self.assertTrue(self.can_reach_location(lname.ug3b))
+        self.assertTrue(self.can_reach_location(lname.uw10))
+        self.assertTrue(self.can_reach_location(lname.uw16b))
+        self.assertTrue(self.can_reach_location(lname.uy5))
+        self.assertTrue(self.can_reach_location(lname.uy13))
+        self.assertTrue(self.can_reach_location(lname.uy18))
+        self.assertTrue(self.can_reach_entrance("Audience to Chapel"))
+        self.assertTrue(self.can_reach_entrance("Audience to Observation"))
+        self.assertTrue(self.can_reach_entrance("Climb to Chapel Top"))
+
+
+class LastKeyTest(CVCotMTestBase):
+    options = {
+        "required_last_keys": 9,
+        "available_last_keys": 9
+    }
+
+    def test_last_keys(self) -> None:
+        self.collect_by_name([iname.double])
+
+        self.assertFalse(self.can_reach_entrance("Ceremonial Door"))
+
+        self.collect([self.get_item_by_name(iname.last_key)] * 1)
+
+        self.assertFalse(self.can_reach_entrance("Ceremonial Door"))
+
+        self.collect([self.get_item_by_name(iname.last_key)] * 7)
+
+        self.assertFalse(self.can_reach_entrance("Ceremonial Door"))
+
+        self.collect([self.get_item_by_name(iname.last_key)] * 1)
+
+        self.assertTrue(self.can_reach_entrance("Ceremonial Door"))
+
+
+class FreezeTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_start_broken,
+        "nerf_roc_wing": True
+    }
+
+    def test_freeze_only_in_audience_room(self) -> None:
+        self.collect_by_name([iname.double])
+
+        self.assertFalse(self.can_reach_location(lname.cc3b))
+        self.assertFalse(self.can_reach_location(lname.ow1))
+
+        self.collect_by_name([iname.mars, iname.serpent])
+
+        self.assertTrue(self.can_reach_location(lname.cc3b))
+        self.assertTrue(self.can_reach_location(lname.ow1))
+
+    def test_freeze_with_kick_boots(self) -> None:
+        self.collect_by_name([iname.double, iname.kick_boots])
+
+        self.assertFalse(self.can_reach_location(lname.th3))
+        self.assertFalse(self.can_reach_location(lname.ct1))
+        self.assertFalse(self.can_reach_location(lname.ct13))
+        self.assertFalse(self.can_reach_location(lname.ug3))
+        self.assertFalse(self.can_reach_location(lname.ug3b))
+
+        self.collect_by_name([iname.mercury, iname.serpent])
+
+        self.assertTrue(self.can_reach_location(lname.th3))
+        self.assertTrue(self.can_reach_location(lname.ct1))
+        self.assertTrue(self.can_reach_location(lname.ct13))
+        self.assertTrue(self.can_reach_location(lname.ug3))
+        self.assertTrue(self.can_reach_location(lname.ug3b))
+
+    def test_freeze_with_heavy_ring_and_tackle(self) -> None:
+        self.collect_by_name([iname.double, iname.heavy_ring, iname.tackle])
+
+        self.assertFalse(self.can_reach_location(lname.uw14))
+
+        self.collect_by_name([iname.mercury, iname.cockatrice])
+
+        self.assertTrue(self.can_reach_location(lname.uw14))
+
+    def test_freeze_with_cleansing(self) -> None:
+        self.collect_by_name([iname.double, iname.cleansing])
+
+        self.assertFalse(self.can_reach_location(lname.uy5))
+
+        self.collect_by_name([iname.mercury, iname.serpent])
+
+        self.assertTrue(self.can_reach_location(lname.uy5))
+
+    def test_freeze_with_nerfed_roc(self) -> None:
+        self.collect_by_name([iname.roc_wing, iname.heavy_ring, iname.tackle])
+
+        self.assertFalse(self.can_reach_entrance("Audience to Chapel"))
+        self.assertFalse(self.can_reach_location(lname.uw16b))
+
+        self.collect_by_name([iname.mercury, iname.cockatrice])
+
+        self.assertTrue(self.can_reach_entrance("Audience to Chapel"))
+        self.assertTrue(self.can_reach_location(lname.uw16b))
+
+        # Freeze spots requiring Double
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ct26))
+        self.assertFalse(self.can_reach_location(lname.ct26b))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+
+        self.collect_by_name([iname.double])
+
+        self.assertTrue(self.can_reach_location(lname.ar30))
+        self.assertTrue(self.can_reach_location(lname.ar30b))
+        self.assertTrue(self.can_reach_location(lname.ct26))
+        self.assertTrue(self.can_reach_location(lname.ct26b))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+
+        self.remove_by_name([iname.double])
+
+        # Freeze spots requiring Kick Boots
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ct26))
+        self.assertFalse(self.can_reach_location(lname.ct26b))
+        self.assertFalse(self.can_reach_location(lname.uw10))
+
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_location(lname.ar30))
+        self.assertTrue(self.can_reach_location(lname.ar30b))
+        self.assertTrue(self.can_reach_location(lname.ct26))
+        self.assertTrue(self.can_reach_location(lname.ct26b))
+        self.assertTrue(self.can_reach_location(lname.uw10))
+
+    def test_freeze_with_nerfed_roc_and_double(self) -> None:
+        self.collect_by_name([iname.roc_wing, iname.heavy_ring, iname.tackle, iname.double])
+
+        self.assertFalse(self.can_reach_location(lname.ar30))
+        self.assertFalse(self.can_reach_location(lname.ar30b))
+        self.assertFalse(self.can_reach_location(lname.ct26))
+        self.assertFalse(self.can_reach_location(lname.ct26b))
+
+        self.collect_by_name([iname.mars, iname.cockatrice])
+
+        self.assertTrue(self.can_reach_location(lname.ar30))
+        self.assertTrue(self.can_reach_location(lname.ar30b))
+        self.assertTrue(self.can_reach_location(lname.ct26))
+        self.assertTrue(self.can_reach_location(lname.ct26b))
+
+    def test_freeze_with_nerfed_roc_and_kick_boots(self) -> None:
+        self.collect_by_name([iname.roc_wing, iname.heavy_ring, iname.tackle, iname.kick_boots])
+
+        self.assertFalse(self.can_reach_location(lname.uw10))
+
+        self.collect_by_name([iname.mars, iname.serpent])
+
+        self.assertTrue(self.can_reach_location(lname.uw10))
+
+
+class VanillaMaidensTest(CVCotMTestBase):
+
+    def test_waterway_and_right_gallery_maidens(self) -> None:
+        self.collect_by_name([iname.double])
+
+        self.assertFalse(self.can_reach_entrance("Audience to Waterway"))
+        self.assertFalse(self.can_reach_entrance("Corridor to Gallery"))
+
+        # Gives access to Chapel Tower wherein we collect the locked Maiden Detonator item.
+        self.collect_by_name([iname.kick_boots])
+
+        self.assertTrue(self.can_reach_entrance("Audience to Waterway"))
+        self.assertTrue(self.can_reach_entrance("Corridor to Gallery"))
+
+    def test_left_gallery_maiden(self) -> None:
+        self.collect_by_name([iname.double, iname.heavy_ring])
+
+        self.assertFalse(self.can_reach_entrance("Audience to Gallery"))
+
+        self.collect_by_name([iname.roc_wing])
+
+        self.assertTrue(self.can_reach_entrance("Audience to Gallery"))
+
+
+class MaidenDetonatorInPoolTest(CVCotMTestBase):
+    options = {
+        "iron_maiden_behavior": IronMaidenBehavior.option_detonator_in_pool
+    }
+
+    def test_maiden_detonator(self) -> None:
+        self.collect_by_name([iname.double, iname.heavy_ring, iname.kick_boots])
+
+        self.assertFalse(self.can_reach_entrance("Audience to Waterway"))
+        self.assertFalse(self.can_reach_entrance("Corridor to Gallery"))
+        self.assertFalse(self.can_reach_entrance("Audience to Gallery"))
+
+        self.collect_by_name([iname.ironmaidens])
+
+        self.assertTrue(self.can_reach_entrance("Audience to Waterway"))
+        self.assertTrue(self.can_reach_entrance("Corridor to Gallery"))
+        self.assertTrue(self.can_reach_entrance("Audience to Gallery"))

From 144d612c527ac02eb290c8e7960c61c6b2fe1d79 Mon Sep 17 00:00:00 2001
From: josephwhite <damasta21th@aol.com>
Date: Thu, 12 Dec 2024 08:50:48 -0500
Subject: [PATCH 163/381] Super Mario 64: Rework logic for 100 Coins (#4131)

* sm64ex: Rework logic for 100 Coins

* sm64ex: 100 Coins Vanilla Option

* sm64ex: Avoiding raw int comparisons for 100 coin option

* sm64ex: Change 100 coin option from toggle to choice

* sm64ex: use snake_case for 100 coin option

* just use "vanilla" for option comparison (exempt-medic feedback)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* sm64ex: remove vanilla 100 coins from item pool to remove overfilling stars

* yeah

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Remove range condition (35 is the min for total stars)

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/sm64ex/Options.py  | 17 ++++++++++++++---
 worlds/sm64ex/__init__.py | 23 ++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/worlds/sm64ex/Options.py b/worlds/sm64ex/Options.py
index 6cf233558ce2..9c428c99590e 100644
--- a/worlds/sm64ex/Options.py
+++ b/worlds/sm64ex/Options.py
@@ -3,10 +3,21 @@
 from Options import DefaultOnToggle, Range, Toggle, DeathLink, Choice, PerGameCommonOptions, OptionSet, OptionGroup
 from .Items import action_item_table
 
-class EnableCoinStars(DefaultOnToggle):
-    """Disable to Ignore 100 Coin Stars. You can still collect them, but they don't do anything.
-    Removes 15 locations from the pool."""
+class EnableCoinStars(Choice):
+    """
+    Determine logic for 100 Coin Stars.
+
+    Off - Removed from pool. You can still collect them, but they don't do anything.
+    Optimal for ignoring 100 Coin Stars entirely. Removes 15 locations from the pool.
+
+    On - Kept in pool, potentially randomized.
+
+    Vanilla - Kept in pool, but NOT randomized.
+    """
     display_name = "Enable 100 Coin Stars"
+    option_off = 0
+    option_on = 1
+    option_vanilla = 2
 
 
 class StrictCapRequirements(DefaultOnToggle):
diff --git a/worlds/sm64ex/__init__.py b/worlds/sm64ex/__init__.py
index 40c778ebe66c..afa67f233c69 100644
--- a/worlds/sm64ex/__init__.py
+++ b/worlds/sm64ex/__init__.py
@@ -104,7 +104,11 @@ def create_items(self):
         # 1Up Mushrooms
         self.multiworld.itempool += [self.create_item("1Up Mushroom") for i in range(0,self.filler_count)]
         # Power Stars
-        self.multiworld.itempool += [self.create_item("Power Star") for i in range(0,self.number_of_stars)]
+        star_range = self.number_of_stars
+        # Vanilla 100 Coin stars have to removed from the pool if other max star increasing options are active.
+        if self.options.enable_coin_stars == "vanilla":
+            star_range -= 15
+        self.multiworld.itempool += [self.create_item("Power Star") for i in range(0,star_range)]
         # Keys
         if (not self.options.progressive_keys):
             key1 = self.create_item("Basement Key")
@@ -166,6 +170,23 @@ def generate_basic(self):
             self.multiworld.get_location("Wing Mario Over the Rainbow 1Up Block", self.player).place_locked_item(self.create_item("1Up Mushroom"))
             self.multiworld.get_location("Bowser in the Sky 1Up Block", self.player).place_locked_item(self.create_item("1Up Mushroom"))
 
+        if (self.options.enable_coin_stars == "vanilla"):
+            self.multiworld.get_location("BoB: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("WF: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("JRB: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("CCM: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("BBH: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("HMC: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("LLL: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("SSL: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("DDD: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("SL: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("WDW: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("TTM: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("THI: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("TTC: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+            self.multiworld.get_location("RR: 100 Coins", self.player).place_locked_item(self.create_item("Power Star"))
+
     def get_filler_item_name(self) -> str:
         return "1Up Mushroom"
 

From f5e3677ef1ec741f830e6ce3d231a25dca7c2689 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:04:27 +0000
Subject: [PATCH 164/381] Pokemon Emerald: Fix invalid escape sequence warnings
 (#4328)

Generation on Python 3.12 would print SyntaxWarnings due to invalid '\d'
escape sequences added in #3832.

Use raw strings to avoid `\` being used to escape characters.
---
 worlds/pokemon_emerald/data.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/pokemon_emerald/data.py b/worlds/pokemon_emerald/data.py
index d93ff926229b..34bebae2d66a 100644
--- a/worlds/pokemon_emerald/data.py
+++ b/worlds/pokemon_emerald/data.py
@@ -397,13 +397,13 @@ def _init() -> None:
         label = []
         for word in map_name[4:].split("_"):
             # 1F, B1F, 2R, etc.
-            re_match = re.match("^B?\d+[FRP]$", word)
+            re_match = re.match(r"^B?\d+[FRP]$", word)
             if re_match:
                 label.append(word)
                 continue
 
             # Route 103, Hall 1, House 5, etc.
-            re_match = re.match("^([A-Z]+)(\d+)$", word)
+            re_match = re.match(r"^([A-Z]+)(\d+)$", word)
             if re_match:
                 label.append(re_match.group(1).capitalize())
                 label.append(re_match.group(2).lstrip("0"))

From d7736950cd48d3df9ee35ff1167dc6586172903e Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Thu, 12 Dec 2024 19:42:14 +0100
Subject: [PATCH 165/381] The Witness: Panel Hunt Plando (#3549)

* Add panel hunt plando option

* Keys are strs

* oops

* better message

* ,

* this doesn ot need to be here

* don't replace pre picked panels

* Update options.py

* rebase error

* rebase error

* oops

* Mypy

* ruff

* another rebase error

* actually this is a stupid change too

* bring over that change:tm:

* Update entity_hunt.py

* Update entity_hunt.py

* Update entity_hunt.py
---
 worlds/witness/entity_hunt.py | 57 +++++++++++++++++++++++++++--------
 worlds/witness/options.py     | 14 +++++++++
 2 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/worlds/witness/entity_hunt.py b/worlds/witness/entity_hunt.py
index 86881930c3e1..9549246ce479 100644
--- a/worlds/witness/entity_hunt.py
+++ b/worlds/witness/entity_hunt.py
@@ -1,5 +1,5 @@
 from collections import defaultdict
-from logging import debug
+from logging import debug, warning
 from pprint import pformat
 from typing import TYPE_CHECKING, Dict, List, Set, Tuple
 
@@ -48,6 +48,8 @@ def __init__(self, player_logic: "WitnessPlayerLogic", world: "WitnessWorld",
         self.PRE_PICKED_HUNT_ENTITIES = pre_picked_entities.copy()
         self.HUNT_ENTITIES: Set[str] = set()
 
+        self._add_plandoed_hunt_panels_to_pre_picked()
+
         self.ALL_ELIGIBLE_ENTITIES, self.ELIGIBLE_ENTITIES_PER_AREA = self._get_eligible_panels()
 
     def pick_panel_hunt_panels(self, total_amount: int) -> Set[str]:
@@ -69,24 +71,51 @@ def pick_panel_hunt_panels(self, total_amount: int) -> Set[str]:
 
         return self.HUNT_ENTITIES
 
-    def _entity_is_eligible(self, panel_hex: str) -> bool:
+    def _entity_is_eligible(self, panel_hex: str, plando: bool = False) -> 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 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.
-                self.player_options.disable_non_randomized_puzzles
-                and not self.player_options.shuffle_discarded_panels
-                and panel_obj["locationType"] == "Discard"
-            )
+        if not self.player_logic.solvability_guaranteed(panel_hex) or panel_hex in self.player_logic.EXCLUDED_ENTITIES:
+            if plando:
+                warning(f"Panel {panel_obj['checkName']} is disabled / excluded and thus not eligible for panel hunt.")
+            return False
+
+        return plando or 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 _add_plandoed_hunt_panels_to_pre_picked(self) -> None:
+        """
+        Add panels the player explicitly specified to be included in panel hunt to the pre picked hunt panels.
+        Output a warning if a panel could not be added for some reason.
+        """
+
+        # Plandoed hunt panels should be in random order, but deterministic by seed, so we sort, then shuffle
+        panels_to_plando = sorted(self.player_options.panel_hunt_plando.value)
+        self.random.shuffle(panels_to_plando)
+
+        for location_name in panels_to_plando:
+            entity_hex = static_witness_logic.ENTITIES_BY_NAME[location_name]["entity_hex"]
+
+            if entity_hex in self.PRE_PICKED_HUNT_ENTITIES:
+                continue
+
+            if self._entity_is_eligible(entity_hex, plando=True):
+                if len(self.PRE_PICKED_HUNT_ENTITIES) == self.player_options.panel_hunt_total:
+                    warning(
+                        f"Panel {location_name} could not be plandoed as a hunt panel for {self.player_name}'s world, "
+                        f"because it would exceed their panel hunt total."
+                    )
+                    continue
+
+                self.PRE_PICKED_HUNT_ENTITIES.add(entity_hex)
+
     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.
@@ -215,6 +244,10 @@ def _replace_unfair_hunt_entities_with_good_hunt_entities(self) -> None:
             if good_entity in self.HUNT_ENTITIES or good_entity not in self.ALL_ELIGIBLE_ENTITIES:
                 continue
 
+            # ... and it's not a forced pick that should stay the same ...
+            if bad_entitiy in self.PRE_PICKED_HUNT_ENTITIES:
+                continue
+
             # ... replace the bad entity with the good entity.
             self.HUNT_ENTITIES.remove(bad_entitiy)
             self.HUNT_ENTITIES.add(good_entity)
diff --git a/worlds/witness/options.py b/worlds/witness/options.py
index b5c15e242f10..d739517870a5 100644
--- a/worlds/witness/options.py
+++ b/worlds/witness/options.py
@@ -5,6 +5,7 @@
 from Options import (
     Choice,
     DefaultOnToggle,
+    LocationSet,
     OptionDict,
     OptionError,
     OptionGroup,
@@ -17,6 +18,7 @@
 
 from .data import static_logic as static_witness_logic
 from .data.item_definition_classes import ItemCategory, WeightedItemDefinition
+from .entity_hunt import ALL_HUNTABLE_PANELS
 
 
 class DisableNonRandomizedPuzzles(Toggle):
@@ -268,6 +270,16 @@ class PanelHuntDiscourageSameAreaFactor(Range):
     default = 40
 
 
+class PanelHuntPlando(LocationSet):
+    """
+    Specify specific hunt panels you want for your panel hunt game.
+    """
+
+    display_name = "Panel Hunt Plando"
+
+    valid_keys = [static_witness_logic.ENTITIES_BY_HEX[panel_hex]["checkName"] for panel_hex in ALL_HUNTABLE_PANELS]
+
+
 class PuzzleRandomization(Choice):
     """
     Puzzles in this randomizer are randomly generated. This option changes the difficulty/types of puzzles.
@@ -477,6 +489,7 @@ class TheWitnessOptions(PerGameCommonOptions):
     panel_hunt_required_percentage: PanelHuntRequiredPercentage
     panel_hunt_postgame: PanelHuntPostgame
     panel_hunt_discourage_same_area_factor: PanelHuntDiscourageSameAreaFactor
+    panel_hunt_plando: PanelHuntPlando
     early_caves: EarlyCaves
     early_symbol_item: EarlySymbolItem
     elevators_come_to_you: ElevatorsComeToYou
@@ -505,6 +518,7 @@ class TheWitnessOptions(PerGameCommonOptions):
         PanelHuntTotal,
         PanelHuntPostgame,
         PanelHuntDiscourageSameAreaFactor,
+        PanelHuntPlando,
     ], start_collapsed=True),
     OptionGroup("Locations", [
         ShuffleDiscardedPanels,

From 9815306875f8c6a4d683679a090babc0b4f96e0d Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Thu, 12 Dec 2024 14:30:49 -0500
Subject: [PATCH 166/381] Docs: Use ModuleUpdate.py #3785

---
 docs/running from source.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/running from source.md b/docs/running from source.md
index 33d6b3928e54..8e8b4f4b61c3 100644
--- a/docs/running from source.md	
+++ b/docs/running from source.md	
@@ -43,9 +43,9 @@ Recommended steps
      [Discord in #ap-core-dev](https://discord.com/channels/731205301247803413/731214280439103580/905154456377757808)
 
  * It is recommended to use [PyCharm IDE](https://www.jetbrains.com/pycharm/)
- * Run Generate.py which will prompt installation of missing modules, press enter to confirm
-   * In PyCharm: right-click Generate.py and select `Run 'Generate'`
-   * Without PyCharm: open a command prompt in the source folder and type `py Generate.py`
+ * Run ModuleUpdate.py which will prompt installation of missing modules, press enter to confirm
+   * In PyCharm: right-click ModuleUpdate.py and select `Run 'ModuleUpdate'`
+   * Without PyCharm: open a command prompt in the source folder and type `py ModuleUpdate.py`
 
 
 ## macOS

From 1ca8d3e4a8b4a4a3850a0829c7c934bc4f8475c6 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Thu, 12 Dec 2024 15:24:38 -0500
Subject: [PATCH 167/381] Docs: add description of Indirect Condition problem
 (#4295)

* Docs: Dev FAQ - About indirect conditions

I wrote up a big effortpost about indirect conditions for nex on the [DS3 3.0 PR](https://github.com/ArchipelagoMW/Archipelago/pull/3128#discussion_r1693843193).

The version I'm [PRing to the world API document](https://github.com/ArchipelagoMW/Archipelago/pull/3552) is very brief and unnuanced, because I'd rather people use too many indirect conditions than too few.
But that might leave some devs wanting to know more.

I think that comment on nex's DS3 PR is probably the best detailed explanation for indirect conditions that exists currently.

So I think it's good if it exists somewhere. And the FAQ doc seems like the best place right now, because I don't want to write an entirely new doc at the moment.

* Actually copy in the text

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: qwint <qwint.42@gmail.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: qwint <qwint.42@gmail.com>

* Update apworld_dev_faq.md

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update apworld_dev_faq.md

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update apworld_dev_faq.md

* Update docs/apworld_dev_faq.md

Co-authored-by: qwint <qwint.42@gmail.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: qwint <qwint.42@gmail.com>

* fix the last couple of wording issues I have with the indirect condition section to apworld dev faq doc

* I didn't like that wording

* Apply suggestions from code review

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Apply suggestions from code review

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update docs/apworld_dev_faq.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update docs/apworld_dev_faq.md

* Update docs/apworld_dev_faq.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

---------

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---
 docs/apworld_dev_faq.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/apworld_dev_faq.md b/docs/apworld_dev_faq.md
index 8d9429afa321..769a2fb3a0a7 100644
--- a/docs/apworld_dev_faq.md
+++ b/docs/apworld_dev_faq.md
@@ -43,3 +43,26 @@ A faster alternative to the `for` loop would be to use a [list comprehension](ht
 ```py
 item_pool += [self.create_filler() for _ in range(total_locations - len(item_pool))]
 ```
+
+---
+
+### I learned about indirect conditions in the world API document, but I want to know more. What are they and why are they necessary?
+
+The world API document mentions how to use `multiworld.register_indirect_condition` to register indirect conditions and **when** you should use them, but not *how* they work and *why* they are necessary. This is because the explanation is quite complicated.
+
+Region sweep (the algorithm that determines which regions are reachable) is a Breadth-First Search of the region graph. It starts from the origin region, checks entrances one by one, and adds newly reached regions and their entrances to the queue until there is nothing more to check.
+
+For performance reasons, AP only checks every entrance once. However, if an entrance's access_rule depends on region access, then the following may happen:
+1. The entrance is checked and determined to be nontraversable because the region in its access_rule hasn't been reached yet during the graph search.
+2. Then, the region in its access_rule is determined to be reachable.
+
+This entrance *would* be in logic if it were rechecked, but it won't be rechecked this cycle.
+To account for this case, AP would have to recheck all entrances every time a new region is reached until no new regions are reached.
+
+An indirect condition is how you can manually define that a specific entrance needs to be rechecked during region sweep if a specific region is reached during it.
+This keeps most of the performance upsides. Even in a game making heavy use of indirect conditions (ex: The Witness), using them is significantly faster than just "rechecking each entrance until nothing new is found".
+The reason entrance access rules using `location.can_reach` and `entrance.can_reach` are also affected is because they call `region.can_reach` on their respective parent/source region.
+
+We recognize it can feel like a trap since it will not alert you when you are missing an indirect condition, and that some games have very complex access rules.
+As of [PR #3682 (Core: Region handling customization)](https://github.com/ArchipelagoMW/Archipelago/pull/3682) being merged, it is possible for a world to opt out of indirect conditions entirely, instead using the system of checking each entrance whenever a region has been reached, although this does come with a performance cost.
+Opting out of using indirect conditions should only be used by games that *really* need it. For most games, it should be reasonable to know all entrance &rarr; region dependencies, making indirect conditions preferred because they are much faster.

From 8d9454ea3bca864cc0e3f20f39563966feeffb86 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Thu, 12 Dec 2024 15:36:56 -0500
Subject: [PATCH 168/381] Core: cast all the settings values so they don't try
 to get pickled later #4362

---
 WebHostLib/generate.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebHostLib/generate.py b/WebHostLib/generate.py
index b19f3d483515..0bd9f7e5e066 100644
--- a/WebHostLib/generate.py
+++ b/WebHostLib/generate.py
@@ -31,11 +31,11 @@ def get_meta(options_source: dict, race: bool = False) -> Dict[str, Union[List[s
 
     server_options = {
         "hint_cost": int(options_source.get("hint_cost", ServerOptions.hint_cost)),
-        "release_mode": options_source.get("release_mode", ServerOptions.release_mode),
-        "remaining_mode": options_source.get("remaining_mode", ServerOptions.remaining_mode),
-        "collect_mode": options_source.get("collect_mode", ServerOptions.collect_mode),
+        "release_mode": str(options_source.get("release_mode", ServerOptions.release_mode)),
+        "remaining_mode": str(options_source.get("remaining_mode", ServerOptions.remaining_mode)),
+        "collect_mode": str(options_source.get("collect_mode", ServerOptions.collect_mode)),
         "item_cheat": bool(int(options_source.get("item_cheat", not ServerOptions.disable_item_cheat))),
-        "server_password": options_source.get("server_password", None),
+        "server_password": str(options_source.get("server_password", None)),
     }
     generator_options = {
         "spoiler": int(options_source.get("spoiler", GeneratorOptions.spoiler)),

From ccea6bcf51143d9b87543e9f03e17088ccf44667 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Fri, 13 Dec 2024 16:49:30 -0500
Subject: [PATCH 169/381] LADX: Improve icon guesses for foreign items (#2201)

* synonyms to new file, many added

* handle singular rupee

* remove redundant map and compass entries

* automatic pluralization

* add guardian acorn and piece of power

* move phrases to ItemIconGuessing.py

* organize, comment

* fix tab spacing

* fix

* add tunic and noita synonyms

* remove triangle instrument synonym

* reorganize, add some matches

* add tunic lucky up

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update worlds/ladx/ItemIconGuessing.py

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* handle camelCase and single rupee

* add indicate_progression option
Adds alternative system for foreign item icons that simply indicates whether or not the item is a progression item.

* improve splitting
drops some more characters, and also dont bother with rejoined stuff in name_cache because our splitting is better

* the witness stuff

* forbid more

* remove boost and surge

* Update worlds/ladx/ItemIconGuessing.py

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>

* match by game name
look at the name of the foreign game and only use game-specific entries for that game

* show message for all key drops

* updates from async test

* vi suggestions

* Adding FNAFW suggestions from @lolz1190 (#40)

* Adding FNAFW suggestions from @lolz1190

* missing comma

---------

Co-authored-by: threeandthreee <a.l.nordstrom@gmail.com>

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Co-authored-by: palex00 <32203971+palex00@users.noreply.github.com>
---
 worlds/ladx/ItemIconGuessing.py               | 531 ++++++++++++++++++
 worlds/ladx/Items.py                          |   6 +-
 worlds/ladx/LADXR/locations/constants.py      |   4 +
 worlds/ladx/LADXR/locations/items.py          |   4 +
 .../ladx/LADXR/patches/bank3e.asm/chest.asm   |   4 +-
 .../LADXR/patches/bank3e.asm/itemnames.asm    |   8 +-
 worlds/ladx/LADXR/patches/droppedKey.py       |   8 +-
 worlds/ladx/Options.py                        |  15 +
 worlds/ladx/__init__.py                       |  85 ++-
 9 files changed, 603 insertions(+), 62 deletions(-)
 create mode 100644 worlds/ladx/ItemIconGuessing.py

diff --git a/worlds/ladx/ItemIconGuessing.py b/worlds/ladx/ItemIconGuessing.py
new file mode 100644
index 000000000000..e3d2ad7b8295
--- /dev/null
+++ b/worlds/ladx/ItemIconGuessing.py
@@ -0,0 +1,531 @@
+BLOCKED_ASSOCIATIONS = [
+    # MAX_ARROWS_UPGRADE, MAX_BOMBS_UPGRADE, MAX_POWDER_UPGRADE
+    # arrows and bombs will be matched to arrow and bomb respectively through pluralization
+    "ARROWS",
+    "BOMBS",
+    "MAX",
+    "UPGRADE",
+
+    "TAIL",     # TAIL_KEY
+    "ANGLER",   # ANGLER_KEY
+    "FACE",     # FACE_KEY
+    "BIRD",     # BIRD_KEY
+    "SLIME",    # SLIME_KEY
+    "NIGHTMARE",# NIGHTMARE_KEY
+
+    "BLUE",     # BLUE_TUNIC
+    "RED",      # RED_TUNIC
+
+    "TRADING",  # TRADING_ITEM_*
+    "ITEM",     # TRADING_ITEM_*
+
+    "BAD",      # BAD_HEART_CONTAINER
+    "GOLD",     # GOLD_LEAF
+    "MAGIC",    # MAGIC_POWDER, MAGIC_ROD
+    "MESSAGE",  # MESSAGE (Master Stalfos' Message)
+    "PEGASUS",  # PEGASUS_BOOTS
+    "PIECE",    # HEART_PIECE, PIECE_OF_POWER
+    "POWER",    # POWER_BRACELET, PIECE_OF_POWER
+    "SINGLE",   # SINGLE_ARROW
+    "STONE",    # STONE_BEAK
+
+    "BEAK1",
+    "BEAK2",
+    "BEAK3",
+    "BEAK4",
+    "BEAK5",
+    "BEAK6",
+    "BEAK7",
+    "BEAK8",
+
+    "COMPASS1",
+    "COMPASS2",
+    "COMPASS3",
+    "COMPASS4",
+    "COMPASS5",
+    "COMPASS6",
+    "COMPASS7",
+    "COMPASS8",
+
+    "MAP1",
+    "MAP2",
+    "MAP3",
+    "MAP4",
+    "MAP5",
+    "MAP6",
+    "MAP7",
+    "MAP8",
+]
+
+# Single word synonyms for Link's Awakening items, for generic matching.
+SYNONYMS = {
+    # POWER_BRACELET
+    'ANKLET': 'POWER_BRACELET',
+    'ARMLET': 'POWER_BRACELET',
+    'BAND': 'POWER_BRACELET',
+    'BANGLE': 'POWER_BRACELET',
+    'BRACER': 'POWER_BRACELET',
+    'CARRY': 'POWER_BRACELET',
+    'CIRCLET': 'POWER_BRACELET',
+    'CROISSANT': 'POWER_BRACELET',
+    'GAUNTLET': 'POWER_BRACELET',
+    'GLOVE': 'POWER_BRACELET',
+    'RING': 'POWER_BRACELET',
+    'STRENGTH': 'POWER_BRACELET',
+
+    # SHIELD
+    'AEGIS': 'SHIELD',
+    'BUCKLER': 'SHIELD',
+    'SHLD': 'SHIELD',
+
+    # BOW
+    'BALLISTA': 'BOW',
+
+    # HOOKSHOT
+    'GRAPPLE': 'HOOKSHOT',
+    'GRAPPLING': 'HOOKSHOT',
+    'ROPE': 'HOOKSHOT',
+
+    # MAGIC_ROD
+    'BEAM': 'MAGIC_ROD',
+    'CANE': 'MAGIC_ROD',
+    'STAFF': 'MAGIC_ROD',
+    'WAND': 'MAGIC_ROD',
+
+    # PEGASUS_BOOTS
+    'BOOT': 'PEGASUS_BOOTS',
+    'GREAVES': 'PEGASUS_BOOTS',
+    'RUN': 'PEGASUS_BOOTS',
+    'SHOE': 'PEGASUS_BOOTS',
+    'SPEED': 'PEGASUS_BOOTS',
+
+    # OCARINA
+    'FLUTE': 'OCARINA',
+    'RECORDER': 'OCARINA',
+
+    # FEATHER
+    'JUMP': 'FEATHER',
+    'PLUME': 'FEATHER',
+    'WING': 'FEATHER',
+
+    # SHOVEL
+    'DIG': 'SHOVEL',
+
+    # MAGIC_POWDER
+    'BAG': 'MAGIC_POWDER',
+    'CASE': 'MAGIC_POWDER',
+    'DUST': 'MAGIC_POWDER',
+    'POUCH': 'MAGIC_POWDER',
+    'SACK': 'MAGIC_POWDER',
+
+    # BOMB
+    'BLAST': 'BOMB',
+    'BOMBCHU': 'BOMB',
+    'FIRECRACKER': 'BOMB',
+    'TNT': 'BOMB',
+
+    # SWORD
+    'BLADE': 'SWORD',
+    'CUT': 'SWORD',
+    'DAGGER': 'SWORD',
+    'DIRK': 'SWORD',
+    'EDGE': 'SWORD',
+    'EPEE': 'SWORD',
+    'EXCALIBUR': 'SWORD',
+    'FALCHION': 'SWORD',
+    'KATANA': 'SWORD',
+    'KNIFE': 'SWORD',
+    'MACHETE': 'SWORD',
+    'MASAMUNE': 'SWORD',
+    'MURASAME': 'SWORD',
+    'SABER': 'SWORD',
+    'SABRE': 'SWORD',
+    'SCIMITAR': 'SWORD',
+    'SLASH': 'SWORD',
+
+    # FLIPPERS
+    'FLIPPER': 'FLIPPERS',
+    'SWIM': 'FLIPPERS',
+
+    # MEDICINE
+    'BOTTLE': 'MEDICINE',
+    'FLASK': 'MEDICINE',
+    'LEMONADE': 'MEDICINE',
+    'POTION': 'MEDICINE',
+    'TEA': 'MEDICINE',
+
+    # TAIL_KEY
+
+    # ANGLER_KEY
+
+    # FACE_KEY
+
+    # BIRD_KEY
+
+    # SLIME_KEY
+
+    # GOLD_LEAF
+    'HERB': 'GOLD_LEAF',
+
+    # RUPEES_20
+    'COIN': 'RUPEES_20',
+    'MONEY': 'RUPEES_20',
+    'RUPEE': 'RUPEES_20',
+
+    # RUPEES_50
+
+    # RUPEES_100
+
+    # RUPEES_200
+
+    # RUPEES_500
+    'GEM': 'RUPEES_500',
+    'JEWEL': 'RUPEES_500',
+
+    # SEASHELL
+    'CARAPACE': 'SEASHELL',
+    'CONCH': 'SEASHELL',
+    'SHELL': 'SEASHELL',
+
+    # MESSAGE (master stalfos message)
+    'NOTHING': 'MESSAGE',
+    'TRAP': 'MESSAGE',
+
+    # BOOMERANG
+    'BOOMER': 'BOOMERANG',
+
+    # HEART_PIECE
+
+    # BOWWOW
+    'BEAST': 'BOWWOW',
+    'PET': 'BOWWOW',
+
+    # ARROWS_10
+
+    # SINGLE_ARROW
+    'MISSILE': 'SINGLE_ARROW',
+    'QUIVER': 'SINGLE_ARROW',
+
+    # ROOSTER
+    'BIRD': 'ROOSTER',
+    'CHICKEN': 'ROOSTER',
+    'CUCCO': 'ROOSTER',
+    'FLY': 'ROOSTER',
+    'GRIFFIN': 'ROOSTER',
+    'GRYPHON': 'ROOSTER',
+
+    # MAX_POWDER_UPGRADE
+
+    # MAX_BOMBS_UPGRADE
+
+    # MAX_ARROWS_UPGRADE
+
+    # RED_TUNIC
+
+    # BLUE_TUNIC
+    'ARMOR': 'BLUE_TUNIC',
+    'MAIL': 'BLUE_TUNIC',
+    'SUIT': 'BLUE_TUNIC',
+
+    # HEART_CONTAINER
+    'TANK': 'HEART_CONTAINER',
+
+    # TOADSTOOL
+    'FUNGAL': 'TOADSTOOL',
+    'FUNGUS': 'TOADSTOOL',
+    'MUSHROOM': 'TOADSTOOL',
+    'SHROOM': 'TOADSTOOL',
+
+    # GUARDIAN_ACORN
+    'NUT': 'GUARDIAN_ACORN',
+    'SEED': 'GUARDIAN_ACORN',
+
+    # KEY
+    'DOOR': 'KEY',
+    'GATE': 'KEY',
+    'KEY': 'KEY', # Without this, foreign keys show up as nightmare keys
+    'LOCK': 'KEY',
+    'PANEL': 'KEY',
+    'UNLOCK': 'KEY',
+
+    # NIGHTMARE_KEY
+
+    # MAP
+
+    # COMPASS
+
+    # STONE_BEAK
+    'FOSSIL': 'STONE_BEAK',
+    'RELIC': 'STONE_BEAK',
+
+    # SONG1
+    'BOLERO': 'SONG1',
+    'LULLABY': 'SONG1',
+    'MELODY': 'SONG1',
+    'MINUET': 'SONG1',
+    'NOCTURNE': 'SONG1',
+    'PRELUDE': 'SONG1',
+    'REQUIEM': 'SONG1',
+    'SERENADE': 'SONG1',
+    'SONG': 'SONG1',
+
+    # SONG2
+    'FISH': 'SONG2',
+    'SURF': 'SONG2',
+
+    # SONG3
+    'FROG': 'SONG3',
+
+    # INSTRUMENT1
+    'CELLO': 'INSTRUMENT1',
+    'GUITAR': 'INSTRUMENT1',
+    'LUTE': 'INSTRUMENT1',
+    'VIOLIN': 'INSTRUMENT1',
+
+    # INSTRUMENT2
+    'HORN': 'INSTRUMENT2',
+
+    # INSTRUMENT3
+    'BELL': 'INSTRUMENT3',
+    'CHIME': 'INSTRUMENT3',
+
+    # INSTRUMENT4
+    'HARP': 'INSTRUMENT4',
+    'KANTELE': 'INSTRUMENT4',
+
+    # INSTRUMENT5
+    'MARIMBA': 'INSTRUMENT5',
+    'XYLOPHONE': 'INSTRUMENT5',
+
+    # INSTRUMENT6 (triangle)
+
+    # INSTRUMENT7
+    'KEYBOARD': 'INSTRUMENT7',
+    'ORGAN': 'INSTRUMENT7',
+    'PIANO': 'INSTRUMENT7',
+
+    # INSTRUMENT8
+    'DRUM': 'INSTRUMENT8',
+
+    # TRADING_ITEM_YOSHI_DOLL
+    'DINOSAUR': 'TRADING_ITEM_YOSHI_DOLL',
+    'DRAGON': 'TRADING_ITEM_YOSHI_DOLL',
+    'TOY': 'TRADING_ITEM_YOSHI_DOLL',
+
+    # TRADING_ITEM_RIBBON
+    'HAIRBAND': 'TRADING_ITEM_RIBBON',
+    'HAIRPIN': 'TRADING_ITEM_RIBBON',
+
+    # TRADING_ITEM_DOG_FOOD
+    'CAN': 'TRADING_ITEM_DOG_FOOD',
+
+    # TRADING_ITEM_BANANAS
+    'BANANA': 'TRADING_ITEM_BANANAS',
+
+    # TRADING_ITEM_STICK
+    'BRANCH': 'TRADING_ITEM_STICK',
+    'TWIG': 'TRADING_ITEM_STICK',
+
+    # TRADING_ITEM_HONEYCOMB
+    'BEEHIVE': 'TRADING_ITEM_HONEYCOMB',
+    'HIVE': 'TRADING_ITEM_HONEYCOMB',
+    'HONEY': 'TRADING_ITEM_HONEYCOMB',
+
+    # TRADING_ITEM_PINEAPPLE
+    'FOOD': 'TRADING_ITEM_PINEAPPLE',
+    'FRUIT': 'TRADING_ITEM_PINEAPPLE',
+    'GOURD': 'TRADING_ITEM_PINEAPPLE',
+
+    # TRADING_ITEM_HIBISCUS
+    'FLOWER': 'TRADING_ITEM_HIBISCUS',
+    'PETAL': 'TRADING_ITEM_HIBISCUS',
+
+    # TRADING_ITEM_LETTER
+    'CARD': 'TRADING_ITEM_LETTER',
+    'MESSAGE': 'TRADING_ITEM_LETTER',
+
+    # TRADING_ITEM_BROOM
+    'SWEEP': 'TRADING_ITEM_BROOM',
+
+    # TRADING_ITEM_FISHING_HOOK
+    'CLAW': 'TRADING_ITEM_FISHING_HOOK',
+
+    # TRADING_ITEM_NECKLACE
+    'AMULET': 'TRADING_ITEM_NECKLACE',
+    'BEADS': 'TRADING_ITEM_NECKLACE',
+    'PEARLS': 'TRADING_ITEM_NECKLACE',
+    'PENDANT': 'TRADING_ITEM_NECKLACE',
+    'ROSARY': 'TRADING_ITEM_NECKLACE',
+
+    # TRADING_ITEM_SCALE
+
+    # TRADING_ITEM_MAGNIFYING_GLASS
+    'FINDER': 'TRADING_ITEM_MAGNIFYING_GLASS',
+    'LENS': 'TRADING_ITEM_MAGNIFYING_GLASS',
+    'MIRROR': 'TRADING_ITEM_MAGNIFYING_GLASS',
+    'SCOPE': 'TRADING_ITEM_MAGNIFYING_GLASS',
+    'XRAY': 'TRADING_ITEM_MAGNIFYING_GLASS',
+
+    # PIECE_OF_POWER
+    'TRIANGLE': 'PIECE_OF_POWER',
+    'POWER': 'PIECE_OF_POWER',
+    'TRIFORCE': 'PIECE_OF_POWER',
+}
+
+# For generic multi-word matches.
+PHRASES = {
+    'BIG KEY': 'NIGHTMARE_KEY',
+    'BOSS KEY': 'NIGHTMARE_KEY',
+    'HEART PIECE': 'HEART_PIECE',
+    'PIECE OF HEART': 'HEART_PIECE',
+}
+
+# All following will only be used to match items for the specific game.
+# Item names will be uppercased when comparing.
+# Can be multi-word.
+GAME_SPECIFIC_PHRASES = {
+    'Final Fantasy': {
+        'OXYALE': 'MEDICINE',
+        'VORPAL': 'SWORD',
+        'XCALBER': 'SWORD',
+    },
+
+    'The Legend of Zelda': {
+        'WATER OF LIFE': 'MEDICINE',
+    },
+
+    'The Legend of Zelda - Oracle of Seasons': {
+        'RARE PEACH STONE': 'HEART_PIECE',
+    },
+
+    'Noita': {
+        'ALL-SEEING EYE': 'TRADING_ITEM_MAGNIFYING_GLASS',  # lets you find secrets
+    },
+
+    'Ocarina of Time': {
+        'COJIRO': 'ROOSTER',
+    },
+
+    'SMZ3': {
+        'BIGKEY': 'NIGHTMARE_KEY',
+        'BYRNA': 'MAGIC_ROD',
+        'HEARTPIECE': 'HEART_PIECE',
+        'POWERBOMB': 'BOMB',
+        'SOMARIA': 'MAGIC_ROD',
+        'SUPER': 'SINGLE_ARROW',
+    },
+
+    'Sonic Adventure 2 Battle': {
+        'CHAOS EMERALD': 'PIECE_OF_POWER',
+    },
+
+    'Super Mario 64': {
+        'POWER STAR': 'PIECE_OF_POWER',
+    },
+
+    'Super Mario World': {
+        'P-BALLOON': 'FEATHER',
+    },
+
+    'Super Metroid': {
+        'POWER BOMB': 'BOMB',
+    },
+
+    'The Witness': {
+        'BONK': 'BOMB',
+        'BUNKER LASER': 'INSTRUMENT4',
+        'DESERT LASER': 'INSTRUMENT5',
+        'JUNGLE LASER': 'INSTRUMENT4',
+        'KEEP LASER': 'INSTRUMENT7',
+        'MONASTERY LASER': 'INSTRUMENT1',
+        'POWER SURGE': 'BOMB',
+        'PUZZLE SKIP': 'GOLD_LEAF',
+        'QUARRY LASER': 'INSTRUMENT8',
+        'SHADOWS LASER': 'INSTRUMENT1',
+        'SHORTCUTS': 'KEY',
+        'SLOWNESS': 'BOMB',
+        'SWAMP LASER': 'INSTRUMENT2',
+        'SYMMETRY LASER': 'INSTRUMENT6',
+        'TOWN LASER': 'INSTRUMENT3',
+        'TREEHOUSE LASER': 'INSTRUMENT2',
+        'WATER PUMPS': 'KEY',
+    },
+
+    'TUNIC': {
+        "AURA'S GEM": 'SHIELD',  # card that enhances the shield
+        'DUSTY': 'TRADING_ITEM_BROOM',  # a broom
+        'HERO RELIC - HP': 'TRADING_ITEM_HIBISCUS',
+        'HERO RELIC - MP': 'TOADSTOOL',
+        'HERO RELIC - SP': 'FEATHER',
+        'HP BERRY': 'GUARDIAN_ACORN',
+        'HP OFFERING': 'TRADING_ITEM_HIBISCUS',  # a flower
+        'LUCKY CUP': 'HEART_CONTAINER',  # card with a heart on it
+        'INVERTED ASH': 'MEDICINE',  # card with a potion on it
+        'MAGIC ORB': 'HOOKSHOT',
+        'MP BERRY': 'GUARDIAN_ACORN',
+        'MP OFFERING': 'TOADSTOOL',  # a mushroom
+        'QUESTAGON': 'PIECE_OF_POWER',  # triforce piece equivalent
+        'SP OFFERING': 'FEATHER',  # a feather
+        'SPRING FALLS': 'TRADING_ITEM_HIBISCUS',  # a flower
+    },
+
+    'FNaFW': {
+        'Freddy': 'TRADING_ITEM_YOSHI_DOLL', # all of these are animatronics, aka dolls.
+        'Bonnie': 'TRADING_ITEM_YOSHI_DOLL',
+        'Chica': 'TRADING_ITEM_YOSHI_DOLL',
+        'Foxy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Toy Bonnie': 'TRADING_ITEM_YOSHI_DOLL',
+        'Toy Chica': 'TRADING_ITEM_YOSHI_DOLL',
+        'Toy Freddy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Mangle': 'TRADING_ITEM_YOSHI_DOLL',
+        'Balloon Boy': 'TRADING_ITEM_YOSHI_DOLL',
+        'JJ': 'TRADING_ITEM_YOSHI_DOLL',
+        'Phantom Freddy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Phantom BB': 'TRADING_ITEM_YOSHI_DOLL',
+        'Phantom Chica': 'TRADING_ITEM_YOSHI_DOLL',
+        'Phantom Mangle': 'TRADING_ITEM_YOSHI_DOLL',
+        'Withered Foxy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Phantom Foxy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Withered Chica': 'TRADING_ITEM_YOSHI_DOLL',
+        'Withered Freddy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Withered Bonnie': 'TRADING_ITEM_YOSHI_DOLL',
+        'Shadow Freddy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Marionette': 'TRADING_ITEM_YOSHI_DOLL',
+        'Phantom Marionette': 'TRADING_ITEM_YOSHI_DOLL',
+        'Golden Freddy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Paperpals': 'TRADING_ITEM_YOSHI_DOLL',
+        'Nightmare Freddy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Nightmare Bonnie': 'TRADING_ITEM_YOSHI_DOLL',
+        'Nightmare Chica': 'TRADING_ITEM_YOSHI_DOLL',
+        'Nightmare Foxy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Endo 01': 'TRADING_ITEM_YOSHI_DOLL',
+        'Endo 02': 'TRADING_ITEM_YOSHI_DOLL',
+        'Plushtrap': 'TRADING_ITEM_YOSHI_DOLL',
+        'Endoplush': 'TRADING_ITEM_YOSHI_DOLL',
+        'Springtrap': 'TRADING_ITEM_YOSHI_DOLL',
+        'RWQFSFASXC': 'TRADING_ITEM_YOSHI_DOLL',
+        'Crying Child': 'TRADING_ITEM_YOSHI_DOLL',
+        'Funtime Foxy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Nightmare Fredbear': 'TRADING_ITEM_YOSHI_DOLL',
+        'Nightmare': 'TRADING_ITEM_YOSHI_DOLL',
+        'Fredbear': 'TRADING_ITEM_YOSHI_DOLL',
+        'Spring Bonnie': 'TRADING_ITEM_YOSHI_DOLL',
+        'Jack-O-Chica': 'TRADING_ITEM_YOSHI_DOLL',
+        'Nightmare BB': 'TRADING_ITEM_YOSHI_DOLL',
+        'Coffee': 'TRADING_ITEM_YOSHI_DOLL',
+        'Jack-O-Bonnie': 'TRADING_ITEM_YOSHI_DOLL',
+        'Purpleguy': 'TRADING_ITEM_YOSHI_DOLL',
+        'Nightmarionne': 'TRADING_ITEM_YOSHI_DOLL',
+        'Mr. Chipper': 'TRADING_ITEM_YOSHI_DOLL',
+        'Animdude': 'TRADING_ITEM_YOSHI_DOLL',
+        'Progressive Endoskeleton': 'BLUE_TUNIC', # basically armor you wear to give you more defense
+        '25 Tokens': 'RUPEES_20', # money
+        '50 Tokens': 'RUPEES_50',
+        '100 Tokens': 'RUPEES_100',
+        '250 Tokens': 'RUPEES_200',
+        '500 Tokens': 'RUPEES_500',
+        '1000 Tokens': 'RUPEES_500',
+        '2500 Tokens': 'RUPEES_500',
+        '5000 Tokens': 'RUPEES_500',
+    },
+}
diff --git a/worlds/ladx/Items.py b/worlds/ladx/Items.py
index 2a64c59394e6..32d466373cae 100644
--- a/worlds/ladx/Items.py
+++ b/worlds/ladx/Items.py
@@ -98,6 +98,7 @@ class ItemName:
     HEART_CONTAINER = "Heart Container"
     BAD_HEART_CONTAINER = "Bad Heart Container"
     TOADSTOOL = "Toadstool"
+    GUARDIAN_ACORN = "Guardian Acorn"
     KEY = "Key"
     KEY1 = "Small Key (Tail Cave)"
     KEY2 = "Small Key (Bottle Grotto)"
@@ -173,6 +174,7 @@ class ItemName:
     TRADING_ITEM_NECKLACE = "Necklace"
     TRADING_ITEM_SCALE = "Scale"
     TRADING_ITEM_MAGNIFYING_GLASS = "Magnifying Glass"
+    PIECE_OF_POWER = "Piece Of Power"
 
 trade_item_prog = ItemClassification.progression
 
@@ -219,6 +221,7 @@ class ItemName:
     ItemData(ItemName.HEART_CONTAINER, "HEART_CONTAINER", ItemClassification.useful),
     #ItemData(ItemName.BAD_HEART_CONTAINER, "BAD_HEART_CONTAINER", ItemClassification.trap),
     ItemData(ItemName.TOADSTOOL, "TOADSTOOL", ItemClassification.progression),
+    ItemData(ItemName.GUARDIAN_ACORN, "GUARDIAN_ACORN", ItemClassification.filler),
     DungeonItemData(ItemName.KEY, "KEY", ItemClassification.progression),
     DungeonItemData(ItemName.KEY1, "KEY1", ItemClassification.progression),
     DungeonItemData(ItemName.KEY2, "KEY2", ItemClassification.progression),
@@ -293,7 +296,8 @@ class ItemName:
     TradeItemData(ItemName.TRADING_ITEM_FISHING_HOOK, "TRADING_ITEM_FISHING_HOOK", trade_item_prog, "Grandma (Animal Village)"),
     TradeItemData(ItemName.TRADING_ITEM_NECKLACE, "TRADING_ITEM_NECKLACE", trade_item_prog, "Fisher (Martha's Bay)"),
     TradeItemData(ItemName.TRADING_ITEM_SCALE, "TRADING_ITEM_SCALE", trade_item_prog, "Mermaid (Martha's Bay)"),
-    TradeItemData(ItemName.TRADING_ITEM_MAGNIFYING_GLASS, "TRADING_ITEM_MAGNIFYING_GLASS", trade_item_prog, "Mermaid Statue (Martha's Bay)")
+    TradeItemData(ItemName.TRADING_ITEM_MAGNIFYING_GLASS, "TRADING_ITEM_MAGNIFYING_GLASS", trade_item_prog, "Mermaid Statue (Martha's Bay)"),
+    ItemData(ItemName.PIECE_OF_POWER, "PIECE_OF_POWER", ItemClassification.filler),
 ]
 
 ladxr_item_to_la_item_name = {
diff --git a/worlds/ladx/LADXR/locations/constants.py b/worlds/ladx/LADXR/locations/constants.py
index a0489febc316..bcf22711bb7b 100644
--- a/worlds/ladx/LADXR/locations/constants.py
+++ b/worlds/ladx/LADXR/locations/constants.py
@@ -87,6 +87,8 @@
 
     TOADSTOOL: 0x50,
 
+    GUARDIAN_ACORN: 0x51,
+
     HEART_PIECE: 0x80,
     BOWWOW: 0x81,
     ARROWS_10: 0x82,
@@ -128,4 +130,6 @@
     TRADING_ITEM_NECKLACE: 0xA2,
     TRADING_ITEM_SCALE: 0xA3,
     TRADING_ITEM_MAGNIFYING_GLASS: 0xA4,
+
+    PIECE_OF_POWER: 0xA5,
 }
diff --git a/worlds/ladx/LADXR/locations/items.py b/worlds/ladx/LADXR/locations/items.py
index 1ecc331f8580..56cc52232355 100644
--- a/worlds/ladx/LADXR/locations/items.py
+++ b/worlds/ladx/LADXR/locations/items.py
@@ -44,6 +44,8 @@
 
 TOADSTOOL = "TOADSTOOL"
 
+GUARDIAN_ACORN = "GUARDIAN_ACORN"
+
 KEY = "KEY"
 KEY1 = "KEY1"
 KEY2 = "KEY2"
@@ -124,3 +126,5 @@
 TRADING_ITEM_NECKLACE = "TRADING_ITEM_NECKLACE"
 TRADING_ITEM_SCALE = "TRADING_ITEM_SCALE"
 TRADING_ITEM_MAGNIFYING_GLASS = "TRADING_ITEM_MAGNIFYING_GLASS"
+
+PIECE_OF_POWER = "PIECE_OF_POWER"
\ No newline at end of file
diff --git a/worlds/ladx/LADXR/patches/bank3e.asm/chest.asm b/worlds/ladx/LADXR/patches/bank3e.asm/chest.asm
index 57771c17b3ca..de237c86293b 100644
--- a/worlds/ladx/LADXR/patches/bank3e.asm/chest.asm
+++ b/worlds/ladx/LADXR/patches/bank3e.asm/chest.asm
@@ -835,6 +835,7 @@ ItemSpriteTable:
     db $46, $1C        ; NIGHTMARE_KEY8
     db $46, $1C        ; NIGHTMARE_KEY9
     db $4C, $1C        ; Toadstool
+    db $AE, $14        ; Guardian Acorn
 
 LargeItemSpriteTable:
     db $AC, $02, $AC, $22 ; heart piece
@@ -874,6 +875,7 @@ LargeItemSpriteTable:
     db $D8, $0D, $DA, $0D ; TradeItem12
     db $DC, $0D, $DE, $0D ; TradeItem13
     db $E0, $0D, $E2, $0D ; TradeItem14
+    db $14, $42, $14, $62 ; Piece Of Power
 
 ItemMessageTable:
     db $90, $3D, $89, $93, $94, $95, $96, $97, $98, $99, $9A, $9B, $9C, $9D, $D9, $A2
@@ -888,7 +890,7 @@ ItemMessageTable:
     ; $80
     db $4F, $C8, $CA, $CB, $E2, $E3, $E4, $CC, $CD, $2A, $2B, $C9, $C9, $C9, $C9, $C9
     db $C9, $C9, $C9, $C9, $C9, $C9, $B8, $44, $C9, $C9, $C9, $C9, $C9, $C9, $C9, $C9
-    db $C9, $C9, $C9, $C9, $9D
+    db $C9, $C9, $C9, $C9, $9D, $C9
 
 RenderDroppedKey:
     ;TODO: See EntityInitKeyDropPoint for a few special cases to unload.
diff --git a/worlds/ladx/LADXR/patches/bank3e.asm/itemnames.asm b/worlds/ladx/LADXR/patches/bank3e.asm/itemnames.asm
index 0c1bc9d699e4..c57ce2f81ccd 100644
--- a/worlds/ladx/LADXR/patches/bank3e.asm/itemnames.asm
+++ b/worlds/ladx/LADXR/patches/bank3e.asm/itemnames.asm
@@ -170,7 +170,7 @@ ItemNamePointers:
     dw ItemNameNightmareKey8
     dw ItemNameNightmareKey9
     dw ItemNameToadstool
-    dw ItemNameNone ; 0x51
+    dw ItemNameGuardianAcorn
     dw ItemNameNone ; 0x52
     dw ItemNameNone ; 0x53
     dw ItemNameNone ; 0x54
@@ -254,6 +254,7 @@ ItemNamePointers:
     dw ItemTradeQuest12
     dw ItemTradeQuest13
     dw ItemTradeQuest14
+    dw ItemPieceOfPower
 
 ItemNameNone:
     db m"NONE", $ff
@@ -418,6 +419,8 @@ ItemNameNightmareKey9:
     db m"Got the {NIGHTMARE_KEY9}", $ff
 ItemNameToadstool:
     db m"Got the {TOADSTOOL}", $ff
+ItemNameGuardianAcorn:
+    db m"Got a Guardian Acorn", $ff
 
 ItemNameHeartPiece:
     db m"Got the {HEART_PIECE}", $ff
@@ -496,5 +499,8 @@ ItemTradeQuest13:
     db m"You've got the Scale", $ff
 ItemTradeQuest14:
     db m"You've got the Magnifying Lens", $ff
+ 
+ItemPieceOfPower:
+    db m"You've got a Piece of Power", $ff
 
 MultiNamePointers:
\ No newline at end of file
diff --git a/worlds/ladx/LADXR/patches/droppedKey.py b/worlds/ladx/LADXR/patches/droppedKey.py
index d24b8b76c7a9..7853712a114a 100644
--- a/worlds/ladx/LADXR/patches/droppedKey.py
+++ b/worlds/ladx/LADXR/patches/droppedKey.py
@@ -24,14 +24,10 @@ def fixDroppedKey(rom):
         ld   a, $06 ; giveItemMultiworld
         rst  8
         
-        ldh  a, [$F1] ; Load active sprite variant to see if this is just a normal small key
-        cp   $1A
-        jr   z, isAKey
-        
-        ;Show message (if not a key)
+        ;Show message
         ld   a, $0A ; showMessageMultiworld
         rst  8
-isAKey:
+
         ret
     """))
     rom.patch(0x03, 0x24B7, "3E", "3E")  # sanity check
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index 9414a7e3c89b..17052659157f 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -505,6 +505,19 @@ class InGameHints(DefaultOnToggle):
     display_name = "In-game Hints"
 
 
+
+class ForeignItemIcons(Choice):
+    """
+    Choose how to display foreign items.
+    [Guess By Name] Foreign items can look like any Link's Awakening item.
+    [Indicate Progression] Foreign items are either a Piece of Power (progression) or Guardian Acorn (non-progression).
+    """
+    display_name = "Foreign Item Icons"
+    option_guess_by_name = 0
+    option_indicate_progression = 1
+    default = option_guess_by_name
+
+
 ladx_option_groups = [
     OptionGroup("Goal Options", [
         Goal,
@@ -537,6 +550,7 @@ class InGameHints(DefaultOnToggle):
         LinkPalette,
         Palette,
         TextShuffle,
+        ForeignItemIcons,
         APTitleScreen,
         GfxMod,
         Music,
@@ -571,6 +585,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     gfxmod: GfxMod
     palette: Palette
     text_shuffle: TextShuffle
+    foreign_item_icons: ForeignItemIcons
     shuffle_nightmare_keys: ShuffleNightmareKeys
     shuffle_small_keys: ShuffleSmallKeys
     shuffle_maps: ShuffleMaps
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 7499aca8c404..8496d4cf49e3 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -4,6 +4,7 @@
 import pkgutil
 import tempfile
 import typing
+import re
 
 import bsdiff4
 
@@ -12,6 +13,7 @@
 from Fill import fill_restrictive
 from worlds.AutoWorld import WebWorld, World
 from .Common import *
+from . import ItemIconGuessing
 from .Items import (DungeonItemData, DungeonItemType, ItemName, LinksAwakeningItem, TradeItemData,
                     ladxr_item_to_la_item_name, links_awakening_items, links_awakening_items_by_name,
                     links_awakening_item_name_groups)
@@ -380,66 +382,36 @@ def priority(item):
 
     name_cache = {}
     # Tries to associate an icon from another game with an icon we have
-    def guess_icon_for_other_world(self, other):
+    def guess_icon_for_other_world(self, foreign_item):
         if not self.name_cache:
-            forbidden = [
-                "TRADING",
-                "ITEM",
-                "BAD",
-                "SINGLE",
-                "UPGRADE",
-                "BLUE",
-                "RED",
-                "NOTHING",
-                "MESSAGE",
-            ]
             for item in ladxr_item_to_la_item_name.keys():
                 self.name_cache[item] = item
                 splits = item.split("_")
-                self.name_cache["".join(splits)] = item
-                if 'RUPEES' in splits:
-                    self.name_cache["".join(reversed(splits))] = item
-                    
                 for word in item.split("_"):
-                    if word not in forbidden and not word.isnumeric():
+                    if word not in ItemIconGuessing.BLOCKED_ASSOCIATIONS and not word.isnumeric():
                         self.name_cache[word] = item
-            others = {
-                'KEY': 'KEY',
-                'COMPASS': 'COMPASS',
-                'BIGKEY': 'NIGHTMARE_KEY',
-                'MAP': 'MAP',
-                'FLUTE': 'OCARINA',
-                'SONG': 'OCARINA',
-                'MUSHROOM': 'TOADSTOOL',
-                'GLOVE': 'POWER_BRACELET',
-                'BOOT': 'PEGASUS_BOOTS',
-                'SHOE': 'PEGASUS_BOOTS',
-                'SHOES': 'PEGASUS_BOOTS',
-                'SANCTUARYHEARTCONTAINER': 'HEART_CONTAINER',
-                'BOSSHEARTCONTAINER': 'HEART_CONTAINER',
-                'HEARTCONTAINER': 'HEART_CONTAINER',
-                'ENERGYTANK': 'HEART_CONTAINER',
-                'MISSILE': 'SINGLE_ARROW',
-                'BOMBS': 'BOMB',
-                'BLUEBOOMERANG': 'BOOMERANG',
-                'MAGICMIRROR': 'TRADING_ITEM_MAGNIFYING_GLASS',
-                'MIRROR': 'TRADING_ITEM_MAGNIFYING_GLASS',
-                'MESSAGE': 'TRADING_ITEM_LETTER',
-                # TODO: Also use AP item name
-            }
-            for name in others.values():
+            for name in ItemIconGuessing.SYNONYMS.values():
                 assert name in self.name_cache, name
                 assert name in CHEST_ITEMS, name
-            self.name_cache.update(others)
-            
-        
-        uppered = other.upper()
-        if "BIG KEY" in uppered:
-            return 'NIGHTMARE_KEY'
-        possibles = other.upper().split(" ")
-        rejoined = "".join(possibles)
-        if rejoined in self.name_cache:
-            return self.name_cache[rejoined]
+            self.name_cache.update(ItemIconGuessing.SYNONYMS)
+            pluralizations = {k + "S": v for k, v in self.name_cache.items()}
+            self.name_cache = pluralizations | self.name_cache
+
+        uppered = foreign_item.name.upper()
+        foreign_game = self.multiworld.game[foreign_item.player]
+        phrases = ItemIconGuessing.PHRASES.copy()
+        if foreign_game in ItemIconGuessing.GAME_SPECIFIC_PHRASES:
+            phrases.update(ItemIconGuessing.GAME_SPECIFIC_PHRASES[foreign_game])
+
+        for phrase, icon in phrases.items():
+            if phrase in uppered:
+                return icon
+        # pattern for breaking down camelCase, also separates out digits
+        pattern = re.compile(r"(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])|(?<=[a-zA-Z])(?=\d)")
+        possibles = pattern.sub(' ', foreign_item.name).upper()
+        for ch in "[]()_":
+            possibles = possibles.replace(ch, " ")
+        possibles = possibles.split()
         for name in possibles:
             if name in self.name_cache:
                 return self.name_cache[name]
@@ -465,8 +437,15 @@ def generate_output(self, output_directory: str):
 
                     # If the item name contains "sword", use a sword icon, etc
                     # Otherwise, use a cute letter as the icon
+                    elif self.options.foreign_item_icons == 'guess_by_name':
+                        loc.ladxr_item.item = self.guess_icon_for_other_world(loc.item)
+                        loc.ladxr_item.custom_item_name = loc.item.name
+
                     else:
-                        loc.ladxr_item.item = self.guess_icon_for_other_world(loc.item.name)
+                        if loc.item.advancement:
+                            loc.ladxr_item.item = 'PIECE_OF_POWER'
+                        else:
+                            loc.ladxr_item.item = 'GUARDIAN_ACORN'
                         loc.ladxr_item.custom_item_name = loc.item.name
 
                     if loc.item:

From 0370e669e57e767f8af23cc08b05468da8a72895 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:28:51 +0000
Subject: [PATCH 170/381] Pokemon Emerald: Add Mr Briney's House indirect
 conditions (#4154)

The `REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE109/BEACH` and
`REGION_ROUTE109/BEACH -> REGION_DEWFORD_TOWN/MAIN` entrances require
access to the
`REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN`
entrance in their access rules, so require indirect conditions for the
parent_region of the entrance: `REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN`.
---
 worlds/pokemon_emerald/rules.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/worlds/pokemon_emerald/rules.py b/worlds/pokemon_emerald/rules.py
index b8d1efb1a98d..828eb20f7218 100644
--- a/worlds/pokemon_emerald/rules.py
+++ b/worlds/pokemon_emerald/rules.py
@@ -416,13 +416,16 @@ def get_location(location: str):
     )
 
     # Dewford Town
+    entrance = get_entrance("REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE109/BEACH")
     set_rule(
-        get_entrance("REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE109/BEACH"),
+        entrance,
         lambda state:
             state.can_reach("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN", "Entrance", world.player)
             and state.has("EVENT_TALK_TO_MR_STONE", world.player)
             and state.has("EVENT_DELIVER_LETTER", world.player)
     )
+    world.multiworld.register_indirect_condition(
+        get_entrance("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN").parent_region, entrance)
     set_rule(
         get_entrance("REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN"),
         lambda state:
@@ -451,14 +454,17 @@ def get_location(location: str):
     )
 
     # Route 109
+    entrance = get_entrance("REGION_ROUTE109/BEACH -> REGION_DEWFORD_TOWN/MAIN")
     set_rule(
-        get_entrance("REGION_ROUTE109/BEACH -> REGION_DEWFORD_TOWN/MAIN"),
+        entrance,
         lambda state:
             state.can_reach("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN", "Entrance", world.player)
             and state.can_reach("REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE109/BEACH", "Entrance", world.player)
             and state.has("EVENT_TALK_TO_MR_STONE", world.player)
             and state.has("EVENT_DELIVER_LETTER", world.player)
     )
+    world.multiworld.register_indirect_condition(
+        get_entrance("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN").parent_region, entrance)
     set_rule(
         get_entrance("REGION_ROUTE109/BEACH -> REGION_ROUTE109/SEA"),
         hm_rules["HM03 Surf"]

From 0fdc14bc42a8af64a17454c42d25f5c037e95309 Mon Sep 17 00:00:00 2001
From: Benjamin S Wolf <jokeserver@gmail.com>
Date: Sun, 15 Dec 2024 13:29:56 -0800
Subject: [PATCH 171/381] Core: Deduplicate exception output (#4036)

When running Generate.py, uncaught exceptions are logged once to a file and twice to the console due to keeping the original excepthook. We can avoid this by filtering the file log out of the stream handler.
---
 Utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Utils.py b/Utils.py
index 50adb18f42be..574c006b503d 100644
--- a/Utils.py
+++ b/Utils.py
@@ -534,7 +534,8 @@ def handle_exception(exc_type, exc_value, exc_traceback):
                 sys.__excepthook__(exc_type, exc_value, exc_traceback)
                 return
             logging.getLogger(exception_logger).exception("Uncaught exception",
-                                                          exc_info=(exc_type, exc_value, exc_traceback))
+                                                          exc_info=(exc_type, exc_value, exc_traceback),
+                                                          extra={"NoStream": exception_logger is None})
             return orig_hook(exc_type, exc_value, exc_traceback)
 
         handle_exception._wrapped = True

From 6282efb13c9842a2c01eb6551d23b5d448f2d91c Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sun, 15 Dec 2024 16:40:36 -0500
Subject: [PATCH 172/381] TUNIC: Additional Combat Logic Option (#3658)

---
 worlds/tunic/__init__.py            |  45 ++-
 worlds/tunic/combat_logic.py        | 422 +++++++++++++++++++++
 worlds/tunic/er_data.py             | 282 ++++++++++----
 worlds/tunic/er_rules.py            | 557 ++++++++++++++++++++++++----
 worlds/tunic/er_scripts.py          |  31 +-
 worlds/tunic/items.py               |  70 ++--
 worlds/tunic/ladder_storage_data.py |  13 +-
 worlds/tunic/locations.py           |  96 ++---
 worlds/tunic/options.py             |  18 +
 worlds/tunic/rules.py               |  25 +-
 worlds/tunic/test/test_access.py    |   6 +-
 11 files changed, 1309 insertions(+), 256 deletions(-)
 create mode 100644 worlds/tunic/combat_logic.py

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 4c62b18b140f..29dbf150125c 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -1,7 +1,8 @@
 from typing import Dict, List, Any, Tuple, TypedDict, ClassVar, Union
 from logging import warning
-from BaseClasses import Region, Location, Item, Tutorial, ItemClassification, MultiWorld
-from .items import item_name_to_id, item_table, item_name_groups, fool_tiers, filler_items, slot_data_item_names
+from BaseClasses import Region, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
+from .items import (item_name_to_id, item_table, item_name_groups, fool_tiers, filler_items, slot_data_item_names,
+                    combat_items)
 from .locations import location_table, location_name_groups, location_name_to_id, hexagon_locations
 from .rules import set_location_rules, set_region_rules, randomize_ability_unlocks, gold_hexagon
 from .er_rules import set_er_location_rules
@@ -10,6 +11,7 @@
 from .er_data import portal_mapping, RegionInfo, tunic_er_regions
 from .options import (TunicOptions, EntranceRando, tunic_option_groups, tunic_option_presets, TunicPlandoConnections,
                       LaurelsLocation, LogicRules, LaurelsZips, IceGrappling, LadderStorage)
+from .combat_logic import area_data, CombatState
 from worlds.AutoWorld import WebWorld, World
 from Options import PlandoConnection
 from decimal import Decimal, ROUND_HALF_UP
@@ -127,11 +129,21 @@ def generate_early(self) -> None:
                 self.options.shuffle_ladders.value = passthrough["shuffle_ladders"]
                 self.options.fixed_shop.value = self.options.fixed_shop.option_false
                 self.options.laurels_location.value = self.options.laurels_location.option_anywhere
+                self.options.combat_logic.value = passthrough["combat_logic"]
 
     @classmethod
     def stage_generate_early(cls, multiworld: MultiWorld) -> None:
         tunic_worlds: Tuple[TunicWorld] = multiworld.get_game_worlds("TUNIC")
         for tunic in tunic_worlds:
+            # setting up state combat logic stuff, see has_combat_reqs for its use
+            # and this is magic so pycharm doesn't like it, unfortunately
+            if tunic.options.combat_logic:
+                multiworld.state.tunic_need_to_reset_combat_from_collect[tunic.player] = False
+                multiworld.state.tunic_need_to_reset_combat_from_remove[tunic.player] = False
+                multiworld.state.tunic_area_combat_state[tunic.player] = {}
+                for area_name in area_data.keys():
+                    multiworld.state.tunic_area_combat_state[tunic.player][area_name] = CombatState.unchecked
+
             # if it's one of the options, then it isn't a custom seed group
             if tunic.options.entrance_rando.value in EntranceRando.options.values():
                 continue
@@ -190,10 +202,12 @@ def stage_generate_early(cls, multiworld: MultiWorld) -> None:
 
     def create_item(self, name: str, classification: ItemClassification = None) -> TunicItem:
         item_data = item_table[name]
-        return TunicItem(name, classification or item_data.classification, self.item_name_to_id[name], self.player)
+        # if item_data.combat_ic is None, it'll take item_data.classification instead
+        itemclass: ItemClassification = ((item_data.combat_ic if self.options.combat_logic else None)
+                                         or item_data.classification)
+        return TunicItem(name, classification or itemclass, self.item_name_to_id[name], self.player)
 
     def create_items(self) -> None:
-
         tunic_items: List[TunicItem] = []
         self.slot_data_items = []
 
@@ -322,15 +336,15 @@ def create_regions(self) -> None:
                 self.ability_unlocks["Pages 42-43 (Holy Cross)"] = passthrough["Hexagon Quest Holy Cross"]
                 self.ability_unlocks["Pages 52-53 (Icebolt)"] = passthrough["Hexagon Quest Icebolt"]
 
-        # ladder rando uses ER with vanilla connections, so that we're not managing more rules files
-        if self.options.entrance_rando or self.options.shuffle_ladders:
+        # Ladders and Combat Logic uses ER rules with vanilla connections for easier maintenance
+        if self.options.entrance_rando or self.options.shuffle_ladders or self.options.combat_logic:
             portal_pairs = create_er_regions(self)
             if self.options.entrance_rando:
                 # these get interpreted by the game to tell it which entrances to connect
                 for portal1, portal2 in portal_pairs.items():
                     self.tunic_portal_pairs[portal1.scene_destination()] = portal2.scene_destination()
         else:
-            # for non-ER, non-ladders
+            # uses the original rules, easier to navigate and reference
             for region_name in tunic_regions:
                 region = Region(region_name, self.player, self.multiworld)
                 self.multiworld.regions.append(region)
@@ -351,7 +365,8 @@ def create_regions(self) -> None:
             victory_region.locations.append(victory_location)
 
     def set_rules(self) -> None:
-        if self.options.entrance_rando or self.options.shuffle_ladders:
+        # same reason as in create_regions, could probably be put into create_regions
+        if self.options.entrance_rando or self.options.shuffle_ladders or self.options.combat_logic:
             set_er_location_rules(self)
         else:
             set_region_rules(self)
@@ -360,6 +375,19 @@ def set_rules(self) -> None:
     def get_filler_item_name(self) -> str:
         return self.random.choice(filler_items)
 
+    # cache whether you can get through combat logic areas
+    def collect(self, state: CollectionState, item: Item) -> bool:
+        change = super().collect(state, item)
+        if change and self.options.combat_logic and item.name in combat_items:
+            state.tunic_need_to_reset_combat_from_collect[self.player] = True
+        return change
+
+    def remove(self, state: CollectionState, item: Item) -> bool:
+        change = super().remove(state, item)
+        if change and self.options.combat_logic and item.name in combat_items:
+            state.tunic_need_to_reset_combat_from_remove[self.player] = True
+        return change
+
     def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]) -> None:
         if self.options.entrance_rando:
             hint_data.update({self.player: {}})
@@ -426,6 +454,7 @@ def fill_slot_data(self) -> Dict[str, Any]:
             "maskless": self.options.maskless.value,
             "entrance_rando": int(bool(self.options.entrance_rando.value)),
             "shuffle_ladders": self.options.shuffle_ladders.value,
+            "combat_logic": self.options.combat_logic.value,
             "Hexagon Quest Prayer": self.ability_unlocks["Pages 24-25 (Prayer)"],
             "Hexagon Quest Holy Cross": self.ability_unlocks["Pages 42-43 (Holy Cross)"],
             "Hexagon Quest Icebolt": self.ability_unlocks["Pages 52-53 (Icebolt)"],
diff --git a/worlds/tunic/combat_logic.py b/worlds/tunic/combat_logic.py
new file mode 100644
index 000000000000..9ff363942c9e
--- /dev/null
+++ b/worlds/tunic/combat_logic.py
@@ -0,0 +1,422 @@
+from typing import Dict, List, NamedTuple, Tuple, Optional
+from enum import IntEnum
+from collections import defaultdict
+from BaseClasses import CollectionState
+from .rules import has_sword, has_melee
+from worlds.AutoWorld import LogicMixin
+
+
+# the vanilla stats you are expected to have to get through an area, based on where they are in vanilla
+class AreaStats(NamedTuple):
+    att_level: int
+    def_level: int
+    potion_level: int  # all 3 are before your first bonfire after getting the upgrade page, third costs 1k
+    hp_level: int
+    sp_level: int
+    mp_level: int
+    potion_count: int
+    equipment: List[str] = []
+    is_boss: bool = False
+
+
+# the vanilla upgrades/equipment you would have
+area_data: Dict[str, AreaStats] = {
+    "Overworld": AreaStats(1, 1, 1, 1, 1, 1, 0, ["Stick"]),
+    "East Forest": AreaStats(1, 1, 1, 1, 1, 1, 0, ["Sword"]),
+    "Before Well": AreaStats(1, 1, 1, 1, 1, 1, 3, ["Sword", "Shield"]),
+    # learn how to upgrade
+    "Beneath the Well": AreaStats(2, 1, 3, 3, 1, 1, 3, ["Sword", "Shield"]),
+    "Dark Tomb": AreaStats(2, 2, 3, 3, 1, 1, 3, ["Sword", "Shield"]),
+    "West Garden": AreaStats(2, 3, 3, 3, 1, 1, 4, ["Sword", "Shield"]),
+    "Garden Knight": AreaStats(3, 3, 3, 3, 2, 1, 4, ["Sword", "Shield"], is_boss=True),
+    # get the wand here
+    "Beneath the Vault": AreaStats(3, 3, 3, 3, 2, 1, 4, ["Sword", "Shield", "Magic"]),
+    "Eastern Vault Fortress": AreaStats(3, 3, 3, 4, 3, 2, 4, ["Sword", "Shield", "Magic"]),
+    "Siege Engine": AreaStats(3, 3, 3, 4, 3, 2, 4, ["Sword", "Shield", "Magic"], is_boss=True),
+    "Frog's Domain": AreaStats(3, 4, 3, 5, 3, 3, 4, ["Sword", "Shield", "Magic"]),
+    # the second half of Atoll is the part you need the stats for, so putting it after frogs
+    "Ruined Atoll": AreaStats(4, 4, 3, 5, 3, 3, 5, ["Sword", "Shield", "Magic"]),
+    "The Librarian": AreaStats(4, 4, 3, 5, 3, 3, 5, ["Sword", "Shield", "Magic"], is_boss=True),
+    "Quarry": AreaStats(5, 4, 3, 5, 3, 3, 5, ["Sword", "Shield", "Magic"]),
+    "Rooted Ziggurat": AreaStats(5, 5, 3, 5, 3, 3, 6, ["Sword", "Shield", "Magic"]),
+    "Boss Scavenger": AreaStats(5, 5, 3, 5, 3, 3, 6, ["Sword", "Shield", "Magic"], is_boss=True),
+    "Swamp": AreaStats(1, 1, 1, 1, 1, 1, 6, ["Sword", "Shield", "Magic"]),
+    "Cathedral": AreaStats(1, 1, 1, 1, 1, 1, 6, ["Sword", "Shield", "Magic"]),
+    # marked as boss because the garden knights can't get hurt by stick
+    "Gauntlet": AreaStats(1, 1, 1, 1, 1, 1, 6, ["Sword", "Shield", "Magic"], is_boss=True),
+    "The Heir": AreaStats(5, 5, 3, 5, 3, 3, 6, ["Sword", "Shield", "Magic", "Laurels"], is_boss=True),
+}
+
+
+# these are used for caching which areas can currently be reached in state
+boss_areas: List[str] = [name for name, data in area_data.items() if data.is_boss and name != "Gauntlet"]
+non_boss_areas: List[str] = [name for name, data in area_data.items() if not data.is_boss]
+
+
+class CombatState(IntEnum):
+    unchecked = 0
+    failed = 1
+    succeeded = 2
+
+
+def has_combat_reqs(area_name: str, state: CollectionState, player: int) -> bool:
+    # we're caching whether you've met the combat reqs before if the state didn't change first
+    # if the combat state is stale, mark each area's combat state as stale
+    if state.tunic_need_to_reset_combat_from_collect[player]:
+        state.tunic_need_to_reset_combat_from_collect[player] = False
+        for name in area_data.keys():
+            if state.tunic_area_combat_state[player][name] == CombatState.failed:
+                state.tunic_area_combat_state[player][name] = CombatState.unchecked
+
+    if state.tunic_need_to_reset_combat_from_remove[player]:
+        state.tunic_need_to_reset_combat_from_remove[player] = False
+        for name in area_data.keys():
+            if state.tunic_area_combat_state[player][name] == CombatState.succeeded:
+                state.tunic_area_combat_state[player][name] = CombatState.unchecked
+
+    if state.tunic_area_combat_state[player][area_name] > CombatState.unchecked:
+        return state.tunic_area_combat_state[player][area_name] == CombatState.succeeded
+
+    met_combat_reqs = check_combat_reqs(area_name, state, player)
+
+    # we want to skip the "none area" since we don't record its results
+    if area_name not in area_data.keys():
+        return met_combat_reqs
+
+    # loop through the lists and set the easier/harder area states accordingly
+    if area_name in boss_areas:
+        area_list = boss_areas
+    elif area_name in non_boss_areas:
+        area_list = non_boss_areas
+    else:
+        area_list = [area_name]
+
+    if met_combat_reqs:
+        # set the state as true for each area until you get to the area we're looking at
+        for name in area_list:
+            state.tunic_area_combat_state[player][name] = CombatState.succeeded
+            if name == area_name:
+                break
+    else:
+        # set the state as false for the area we're looking at and each area after that
+        reached_name = False
+        for name in area_list:
+            if name == area_name:
+                reached_name = True
+            if reached_name:
+                state.tunic_area_combat_state[player][name] = CombatState.failed
+
+    return met_combat_reqs
+
+
+def check_combat_reqs(area_name: str, state: CollectionState, player: int, alt_data: Optional[AreaStats] = None) -> bool:
+    data = alt_data or area_data[area_name]
+    extra_att_needed = 0
+    extra_def_needed = 0
+    extra_mp_needed = 0
+    has_magic = state.has_any({"Magic Wand", "Gun"}, player)
+    stick_bool = False
+    sword_bool = False
+    for item in data.equipment:
+        if item == "Stick":
+            if not has_melee(state, player):
+                if has_magic:
+                    # magic can make up for the lack of stick
+                    extra_mp_needed += 2
+                    extra_att_needed -= 16
+                else:
+                    return False
+            else:
+                stick_bool = True
+
+        elif item == "Sword":
+            if not has_sword(state, player):
+                # need sword for bosses
+                if data.is_boss:
+                    return False
+                if has_magic:
+                    # +4 mp pretty much makes up for the lack of sword, at least in Quarry
+                    extra_mp_needed += 4
+                    # stick is a backup plan, and doesn't scale well, so let's require a little less
+                    extra_att_needed -= 2
+                elif has_melee(state, player):
+                    # may revise this later based on feedback
+                    extra_att_needed += 3
+                    extra_def_needed += 2
+                else:
+                    return False
+            else:
+                sword_bool = True
+
+        elif item == "Shield":
+            if not state.has("Shield", player):
+                extra_def_needed += 2
+        elif item == "Laurels":
+            if not state.has("Hero's Laurels", player):
+                # these are entirely based on vibes
+                extra_att_needed += 2
+                extra_def_needed += 3
+        elif item == "Magic":
+            if not has_magic:
+                extra_att_needed += 2
+                extra_def_needed += 2
+                extra_mp_needed -= 16
+    modified_stats = AreaStats(data.att_level + extra_att_needed, data.def_level + extra_def_needed, data.potion_level,
+                               data.hp_level, data.sp_level, data.mp_level + extra_mp_needed, data.potion_count)
+    if not has_required_stats(modified_stats, state, player):
+        # we may need to check if you would have the required stats if you were missing a weapon
+        # it's kinda janky, but these only get hit in less than once per 100 generations, so whatever
+        if sword_bool and "Sword" in data.equipment and "Magic" in data.equipment:
+            # we need to check if you would have the required stats if you didn't have melee
+            equip_list = [item for item in data.equipment if item != "Sword"]
+            more_modified_stats = AreaStats(data.att_level - 16, data.def_level, data.potion_level,
+                                            data.hp_level, data.sp_level, data.mp_level + 4, data.potion_count,
+                                            equip_list)
+            if check_combat_reqs("none", state, player, more_modified_stats):
+                return True
+
+            # and we need to check if you would have the required stats if you didn't have magic
+            equip_list = [item for item in data.equipment if item != "Magic"]
+            more_modified_stats = AreaStats(data.att_level + 2, data.def_level + 2, data.potion_level,
+                                            data.hp_level, data.sp_level, data.mp_level - 16, data.potion_count,
+                                            equip_list)
+            if check_combat_reqs("none", state, player, more_modified_stats):
+                return True
+            return False
+
+        elif stick_bool and "Stick" in data.equipment and "Magic" in data.equipment:
+            # we need to check if you would have the required stats if you didn't have the stick
+            equip_list = [item for item in data.equipment if item != "Stick"]
+            more_modified_stats = AreaStats(data.att_level - 16, data.def_level, data.potion_level,
+                                            data.hp_level, data.sp_level, data.mp_level + 4, data.potion_count,
+                                            equip_list)
+            if check_combat_reqs("none", state, player, more_modified_stats):
+                return True
+            return False
+        else:
+            return False
+    return True
+
+
+# check if you have the required stats, and the money to afford them
+# it may be innaccurate due to poor spending, and it may even require you to "spend poorly"
+# but that's fine -- it's already pretty generous to begin with
+def has_required_stats(data: AreaStats, state: CollectionState, player: int) -> bool:
+    money_required = 0
+    player_att = 0
+
+    # check if we actually need the stat before checking state
+    if data.att_level > 1:
+        player_att, att_offerings = get_att_level(state, player)
+        if player_att < data.att_level:
+            return False
+        else:
+            extra_att = player_att - data.att_level
+            paid_att = max(0, att_offerings - extra_att)
+            # attack upgrades cost 100 for the first, +50 for each additional
+            money_per_att = 100
+            for _ in range(paid_att):
+                money_required += money_per_att
+                money_per_att += 50
+
+    # adding defense and sp together since they accomplish similar things: making you take less damage
+    if data.def_level + data.sp_level > 2:
+        player_def, def_offerings = get_def_level(state, player)
+        player_sp, sp_offerings = get_sp_level(state, player)
+        if player_def + player_sp < data.def_level + data.sp_level:
+            return False
+        else:
+            free_def = player_def - def_offerings
+            free_sp = player_sp - sp_offerings
+            paid_stats = data.def_level + data.sp_level - free_def - free_sp
+            sp_to_buy = 0
+
+            if paid_stats <= 0:
+                # if you don't have to pay for any stats, you don't need money for these upgrades
+                def_to_buy = 0
+            elif paid_stats <= def_offerings:
+                # get the amount needed to buy these def offerings
+                def_to_buy = paid_stats
+            else:
+                def_to_buy = def_offerings
+                sp_to_buy = max(0, paid_stats - def_offerings)
+
+            # if you have to buy more than 3 def, it's cheaper to buy 1 extra sp
+            if def_to_buy > 3 and sp_offerings > 0:
+                def_to_buy -= 1
+                sp_to_buy += 1
+            # def costs 100 for the first, +50 for each additional
+            money_per_def = 100
+            for _ in range(def_to_buy):
+                money_required += money_per_def
+                money_per_def += 50
+            # sp costs 200 for the first, +200 for each additional
+            money_per_sp = 200
+            for _ in range(sp_to_buy):
+                money_required += money_per_sp
+                money_per_sp += 200
+
+    # if you have 2 more attack than needed, we can forego needing mp
+    if data.mp_level > 1 and player_att < data.att_level + 2:
+        player_mp, mp_offerings = get_mp_level(state, player)
+        if player_mp < data.mp_level:
+            return False
+        else:
+            extra_mp = player_mp - data.mp_level
+            paid_mp = max(0, mp_offerings - extra_mp)
+            # mp costs 300 for the first, +50 for each additional
+            money_per_mp = 300
+            for _ in range(paid_mp):
+                money_required += money_per_mp
+                money_per_mp += 50
+
+    req_effective_hp = calc_effective_hp(data.hp_level, data.potion_level, data.potion_count)
+    player_potion, potion_offerings = get_potion_level(state, player)
+    player_hp, hp_offerings = get_hp_level(state, player)
+    player_potion_count = get_potion_count(state, player)
+    player_effective_hp = calc_effective_hp(player_hp, player_potion, player_potion_count)
+    if player_effective_hp < req_effective_hp:
+        return False
+    else:
+        # need a way to determine which of potion offerings or hp offerings you can reduce
+        # your level if you didn't pay for offerings
+        free_potion = player_potion - potion_offerings
+        free_hp = player_hp - hp_offerings
+        paid_hp_count = 0
+        paid_potion_count = 0
+        if calc_effective_hp(free_hp, free_potion, player_potion_count) >= req_effective_hp:
+            # you don't need to buy upgrades
+            pass
+        # if you have no potions, or no potion upgrades, you only need to check your hp upgrades
+        elif player_potion_count == 0 or potion_offerings == 0:
+            # check if you have enough hp at each paid hp offering
+            for i in range(hp_offerings):
+                paid_hp_count = i + 1
+                if calc_effective_hp(paid_hp_count, 0, player_potion_count) > req_effective_hp:
+                    break
+        else:
+            for i in range(potion_offerings):
+                paid_potion_count = i + 1
+                if calc_effective_hp(free_hp, free_potion + paid_potion_count, player_potion_count) > req_effective_hp:
+                    break
+                for j in range(hp_offerings):
+                    paid_hp_count = j + 1
+                    if (calc_effective_hp(free_hp + paid_hp_count, free_potion + paid_potion_count, player_potion_count)
+                            > req_effective_hp):
+                        break
+        # hp costs 200 for the first, +50 for each additional
+        money_per_hp = 200
+        for _ in range(paid_hp_count):
+            money_required += money_per_hp
+            money_per_hp += 50
+
+        # potion costs 100 for the first, 300 for the second, 1,000 for the third, and +200 for each additional
+        # currently we assume you will not buy past the second potion upgrade, but we might change our minds later
+        money_per_potion = 100
+        for _ in range(paid_potion_count):
+            money_required += money_per_potion
+            if money_per_potion == 100:
+                money_per_potion = 300
+            elif money_per_potion == 300:
+                money_per_potion = 1000
+            else:
+                money_per_potion += 200
+
+    if money_required > get_money_count(state, player):
+        return False
+
+    return True
+
+
+# returns a tuple of your max attack level, the number of attack offerings
+def get_att_level(state: CollectionState, player: int) -> Tuple[int, int]:
+    att_offerings = state.count("ATT Offering", player)
+    att_upgrades = state.count("Hero Relic - ATT", player)
+    sword_level = state.count("Sword Upgrade", player)
+    if sword_level >= 3:
+        att_upgrades += min(2, sword_level - 2)
+    # attack falls off, can just cap it at 8 for simplicity
+    return min(8, 1 + att_offerings + att_upgrades), att_offerings
+
+
+# returns a tuple of your max defense level, the number of defense offerings
+def get_def_level(state: CollectionState, player: int) -> Tuple[int, int]:
+    def_offerings = state.count("DEF Offering", player)
+    # defense falls off, can just cap it at 8 for simplicity
+    return (min(8, 1 + def_offerings
+                + state.count_from_list({"Hero Relic - DEF", "Secret Legend", "Phonomath"}, player)),
+            def_offerings)
+
+
+# returns a tuple of your max potion level, the number of potion offerings
+def get_potion_level(state: CollectionState, player: int) -> Tuple[int, int]:
+    potion_offerings = min(2, state.count("Potion Offering", player))
+    # your third potion upgrade (from offerings) costs 1,000 money, reasonable to assume you won't do that
+    return (1 + potion_offerings
+            + state.count_from_list({"Hero Relic - POTION", "Just Some Pals", "Spring Falls", "Back To Work"}, player),
+            potion_offerings)
+
+
+# returns a tuple of your max hp level, the number of hp offerings
+def get_hp_level(state: CollectionState, player: int) -> Tuple[int, int]:
+    hp_offerings = state.count("HP Offering", player)
+    return 1 + hp_offerings + state.count("Hero Relic - HP", player), hp_offerings
+
+
+# returns a tuple of your max sp level, the number of sp offerings
+def get_sp_level(state: CollectionState, player: int) -> Tuple[int, int]:
+    sp_offerings = state.count("SP Offering", player)
+    return (1 + sp_offerings
+            + state.count_from_list({"Hero Relic - SP", "Mr Mayor", "Power Up",
+                                     "Regal Weasel", "Forever Friend"}, player),
+            sp_offerings)
+
+
+def get_mp_level(state: CollectionState, player: int) -> Tuple[int, int]:
+    mp_offerings = state.count("MP Offering", player)
+    return (1 + mp_offerings
+            + state.count_from_list({"Hero Relic - MP", "Sacred Geometry", "Vintage", "Dusty"}, player),
+            mp_offerings)
+
+
+def get_potion_count(state: CollectionState, player: int) -> int:
+    return state.count("Potion Flask", player) + state.count("Flask Shard", player) // 3
+
+
+def calc_effective_hp(hp_level: int, potion_level: int, potion_count: int) -> int:
+    player_hp = 60 + hp_level * 20
+    # since you don't tend to use potions efficiently all the time, scale healing by .75
+    total_healing = int(.75 * potion_count * min(player_hp, 20 + 10 * potion_level))
+    return player_hp + total_healing
+
+
+# returns the total amount of progression money the player has
+def get_money_count(state: CollectionState, player: int) -> int:
+    money: int = 0
+    # this could be done with something to parse the money count at the end of the string, but I don't wanna
+    money += state.count("Money x255", player) * 255  # 1 in pool
+    money += state.count("Money x200", player) * 200  # 1 in pool
+    money += state.count("Money x128", player) * 128  # 3 in pool
+    # total from regular money: 839
+    # first effigy is 8, doubles until it reaches 512 at number 7, after effigy 28 they stop dropping money
+    # with the vanilla count of 12, you get 3,576 money from effigies
+    effigy_count = min(28, state.count("Effigy", player))  # 12 in pool
+    money_per_break = 8
+    for _ in range(effigy_count):
+        money += money_per_break
+        money_per_break = min(512, money_per_break * 2)
+    return money
+
+
+class TunicState(LogicMixin):
+    tunic_need_to_reset_combat_from_collect: Dict[int, bool]
+    tunic_need_to_reset_combat_from_remove: Dict[int, bool]
+    tunic_area_combat_state: Dict[int, Dict[str, int]]
+
+    def init_mixin(self, _):
+        # the per-player need to reset the combat state when collecting a combat item
+        self.tunic_need_to_reset_combat_from_collect = defaultdict(lambda: False)
+        # the per-player need to reset the combat state when removing a combat item
+        self.tunic_need_to_reset_combat_from_remove = defaultdict(lambda: False)
+        # the per-player, per-area state of combat checking -- unchecked, failed, or succeeded
+        self.tunic_area_combat_state = defaultdict(lambda: defaultdict(lambda: CombatState.unchecked))
diff --git a/worlds/tunic/er_data.py b/worlds/tunic/er_data.py
index 1269f3b85e45..9794f4a87b67 100644
--- a/worlds/tunic/er_data.py
+++ b/worlds/tunic/er_data.py
@@ -235,12 +235,12 @@ def destination_scene(self) -> str:  # the vanilla connection
            destination="Sewer_Boss", tag="_"),
     Portal(name="Well Exit towards Furnace", region="Beneath the Well Back",
            destination="Overworld Redux", tag="_west_aqueduct"),
-    
+
     Portal(name="Well Boss to Well", region="Well Boss",
            destination="Sewer", tag="_"),
     Portal(name="Checkpoint to Dark Tomb", region="Dark Tomb Checkpoint",
            destination="Crypt Redux", tag="_"),
-    
+
     Portal(name="Dark Tomb to Overworld", region="Dark Tomb Entry Point",
            destination="Overworld Redux", tag="_"),
     Portal(name="Dark Tomb to Furnace", region="Dark Tomb Dark Exit",
@@ -248,13 +248,13 @@ def destination_scene(self) -> str:  # the vanilla connection
     Portal(name="Dark Tomb to Checkpoint", region="Dark Tomb Entry Point",
            destination="Sewer_Boss", tag="_"),
     
-    Portal(name="West Garden Exit near Hero's Grave", region="West Garden",
+    Portal(name="West Garden Exit near Hero's Grave", region="West Garden before Terry",
            destination="Overworld Redux", tag="_lower"),
-    Portal(name="West Garden to Magic Dagger House", region="West Garden",
+    Portal(name="West Garden to Magic Dagger House", region="West Garden at Dagger House",
            destination="archipelagos_house", tag="_"),
     Portal(name="West Garden Exit after Boss", region="West Garden after Boss",
            destination="Overworld Redux", tag="_upper"),
-    Portal(name="West Garden Shop", region="West Garden",
+    Portal(name="West Garden Shop", region="West Garden before Terry",
            destination="Shop", tag="_"),
     Portal(name="West Garden Laurels Exit", region="West Garden Laurels Exit Region",
            destination="Overworld Redux", tag="_lowest"),
@@ -262,7 +262,7 @@ def destination_scene(self) -> str:  # the vanilla connection
            destination="RelicVoid", tag="_teleporter_relic plinth"),
     Portal(name="West Garden to Far Shore", region="West Garden Portal",
            destination="Transit", tag="_teleporter_archipelagos_teleporter"),
-    
+
     Portal(name="Magic Dagger House Exit", region="Magic Dagger House",
            destination="Archipelagos Redux", tag="_"),
 
@@ -308,7 +308,7 @@ def destination_scene(self) -> str:  # the vanilla connection
     Portal(name="East Fortress to Interior Upper", region="Fortress East Shortcut Upper",
            destination="Fortress Main", tag="_upper"),
 
-    Portal(name="Fortress Grave Path Lower Exit", region="Fortress Grave Path",
+    Portal(name="Fortress Grave Path Lower Exit", region="Fortress Grave Path Entry",
            destination="Fortress Courtyard", tag="_Lower"),
     Portal(name="Fortress Hero's Grave", region="Fortress Hero's Grave Region",
            destination="RelicVoid", tag="_teleporter_relic plinth"),
@@ -339,7 +339,7 @@ def destination_scene(self) -> str:  # the vanilla connection
            destination="Frog Stairs", tag="_eye"),
     Portal(name="Frog Stairs Mouth Entrance", region="Ruined Atoll Frog Mouth",
            destination="Frog Stairs", tag="_mouth"),
-    
+
     Portal(name="Frog Stairs Eye Exit", region="Frog Stairs Eye Exit",
            destination="Atoll Redux", tag="_eye"),
     Portal(name="Frog Stairs Mouth Exit", region="Frog Stairs Upper",
@@ -348,39 +348,39 @@ def destination_scene(self) -> str:  # the vanilla connection
            destination="frog cave main", tag="_Entrance"),
     Portal(name="Frog Stairs to Frog's Domain's Exit", region="Frog Stairs Lower",
            destination="frog cave main", tag="_Exit"),
-    
+
     Portal(name="Frog's Domain Ladder Exit", region="Frog's Domain Entry",
            destination="Frog Stairs", tag="_Entrance"),
     Portal(name="Frog's Domain Orb Exit", region="Frog's Domain Back",
            destination="Frog Stairs", tag="_Exit"),
-    
+
     Portal(name="Library Exterior Tree", region="Library Exterior Tree Region",
            destination="Atoll Redux", tag="_"),
     Portal(name="Library Exterior Ladder", region="Library Exterior Ladder Region",
            destination="Library Hall", tag="_"),
-    
+
     Portal(name="Library Hall Bookshelf Exit", region="Library Hall Bookshelf",
            destination="Library Exterior", tag="_"),
     Portal(name="Library Hero's Grave", region="Library Hero's Grave Region",
            destination="RelicVoid", tag="_teleporter_relic plinth"),
     Portal(name="Library Hall to Rotunda", region="Library Hall to Rotunda",
            destination="Library Rotunda", tag="_"),
-    
+
     Portal(name="Library Rotunda Lower Exit", region="Library Rotunda to Hall",
            destination="Library Hall", tag="_"),
     Portal(name="Library Rotunda Upper Exit", region="Library Rotunda to Lab",
            destination="Library Lab", tag="_"),
-    
+
     Portal(name="Library Lab to Rotunda", region="Library Lab Lower",
            destination="Library Rotunda", tag="_"),
     Portal(name="Library to Far Shore", region="Library Portal",
            destination="Transit", tag="_teleporter_library teleporter"),
     Portal(name="Library Lab to Librarian Arena", region="Library Lab to Librarian",
            destination="Library Arena", tag="_"),
-    
+
     Portal(name="Librarian Arena Exit", region="Library Arena",
            destination="Library Lab", tag="_"),
-    
+
     Portal(name="Stairs to Top of the Mountain", region="Lower Mountain Stairs",
            destination="Mountaintop", tag="_"),
     Portal(name="Mountain to Quarry", region="Lower Mountain",
@@ -433,7 +433,7 @@ def destination_scene(self) -> str:  # the vanilla connection
     Portal(name="Ziggurat Tower to Ziggurat Lower", region="Rooted Ziggurat Middle Bottom",
            destination="ziggurat2020_3", tag="_"),
     
-    Portal(name="Ziggurat Lower to Ziggurat Tower", region="Rooted Ziggurat Lower Front",
+    Portal(name="Ziggurat Lower to Ziggurat Tower", region="Rooted Ziggurat Lower Entry",
            destination="ziggurat2020_2", tag="_"),
     Portal(name="Ziggurat Portal Room Entrance", region="Rooted Ziggurat Portal Room Entrance",
            destination="ziggurat2020_FTRoom", tag="_"),
@@ -461,7 +461,7 @@ def destination_scene(self) -> str:  # the vanilla connection
     Portal(name="Swamp Hero's Grave", region="Swamp Hero's Grave Region",
            destination="RelicVoid", tag="_teleporter_relic plinth"),
     
-    Portal(name="Cathedral Main Exit", region="Cathedral",
+    Portal(name="Cathedral Main Exit", region="Cathedral Entry",
            destination="Swamp Redux 2", tag="_main"),
     Portal(name="Cathedral Elevator", region="Cathedral to Gauntlet",
            destination="Cathedral Arena", tag="_"),
@@ -523,7 +523,6 @@ class RegionInfo(NamedTuple):
     game_scene: str  # the name of the scene in the actual game
     dead_end: int = 0  # if a region has only one exit
     outlet_region: Optional[str] = None
-    is_fake_region: bool = False
 
 
 # gets the outlet region name if it exists, the region if it doesn't
@@ -563,6 +562,8 @@ class DeadEnd(IntEnum):
     "Overworld to West Garden Upper": RegionInfo("Overworld Redux"),  # usually leads to garden knight
     "Overworld to West Garden from Furnace": RegionInfo("Overworld Redux"),  # isolated stairway with one chest
     "Overworld Well Ladder": RegionInfo("Overworld Redux"),  # just the ladder entrance itself as a region
+    "Overworld Well Entry Area": RegionInfo("Overworld Redux"),  # the page, the bridge, etc.
+    "Overworld Tunnel to Beach": RegionInfo("Overworld Redux"),  # the tunnel with the chest
     "Overworld Beach": RegionInfo("Overworld Redux"),  # from the two turrets to invisble maze, and lower atoll entry
     "Overworld Tunnel Turret": RegionInfo("Overworld Redux"),  # the tunnel turret by the southwest beach ladder
     "Overworld to Atoll Upper": RegionInfo("Overworld Redux"),  # the little ledge before the ladder
@@ -624,14 +625,18 @@ class DeadEnd(IntEnum):
     "Beneath the Well Front": RegionInfo("Sewer"),  # the front, to separate it from the weapon requirement in the mid
     "Beneath the Well Main": RegionInfo("Sewer"),  # the main section of it, requires a weapon
     "Beneath the Well Back": RegionInfo("Sewer"),  # the back two portals, and all 4 upper chests
-    "West Garden": RegionInfo("Archipelagos Redux"),
+    "West Garden before Terry": RegionInfo("Archipelagos Redux"),  # the lower entry point, near hero grave
+    "West Garden after Terry": RegionInfo("Archipelagos Redux"),  # after Terry, up until next chompignons
+    "West Garden at Dagger House": RegionInfo("Archipelagos Redux"),  # just outside magic dagger house
+    "West Garden South Checkpoint": RegionInfo("Archipelagos Redux"),
     "Magic Dagger House": RegionInfo("archipelagos_house", dead_end=DeadEnd.all_cats),
     "West Garden Portal": RegionInfo("Archipelagos Redux", dead_end=DeadEnd.restricted, outlet_region="West Garden by Portal"),
     "West Garden by Portal": RegionInfo("Archipelagos Redux", dead_end=DeadEnd.restricted),
     "West Garden Portal Item": RegionInfo("Archipelagos Redux", dead_end=DeadEnd.restricted),
     "West Garden Laurels Exit Region": RegionInfo("Archipelagos Redux"),
+    "West Garden before Boss": RegionInfo("Archipelagos Redux"),  # main west garden
     "West Garden after Boss": RegionInfo("Archipelagos Redux"),
-    "West Garden Hero's Grave Region": RegionInfo("Archipelagos Redux", outlet_region="West Garden"),
+    "West Garden Hero's Grave Region": RegionInfo("Archipelagos Redux", outlet_region="West Garden before Terry"),
     "Ruined Atoll": RegionInfo("Atoll Redux"),
     "Ruined Atoll Lower Entry Area": RegionInfo("Atoll Redux"),
     "Ruined Atoll Ladder Tops": RegionInfo("Atoll Redux"),  # at the top of the 5 ladders in south Atoll
@@ -643,8 +648,9 @@ class DeadEnd(IntEnum):
     "Frog Stairs Upper": RegionInfo("Frog Stairs"),
     "Frog Stairs Lower": RegionInfo("Frog Stairs"),
     "Frog Stairs to Frog's Domain": RegionInfo("Frog Stairs"),
-    "Frog's Domain Entry": RegionInfo("frog cave main"),
-    "Frog's Domain": RegionInfo("frog cave main"),
+    "Frog's Domain Entry": RegionInfo("frog cave main"),  # just the ladder
+    "Frog's Domain Front": RegionInfo("frog cave main"),  # before combat
+    "Frog's Domain Main": RegionInfo("frog cave main"),
     "Frog's Domain Back": RegionInfo("frog cave main"),
     "Library Exterior Tree Region": RegionInfo("Library Exterior", outlet_region="Library Exterior by Tree"),
     "Library Exterior by Tree": RegionInfo("Library Exterior"),
@@ -658,8 +664,8 @@ class DeadEnd(IntEnum):
     "Library Rotunda to Lab": RegionInfo("Library Rotunda"),
     "Library Lab": RegionInfo("Library Lab"),
     "Library Lab Lower": RegionInfo("Library Lab"),
-    "Library Portal": RegionInfo("Library Lab", outlet_region="Library Lab on Portal Pad"),
     "Library Lab on Portal Pad": RegionInfo("Library Lab"),
+    "Library Portal": RegionInfo("Library Lab", outlet_region="Library Lab on Portal Pad"),
     "Library Lab to Librarian": RegionInfo("Library Lab"),
     "Library Arena": RegionInfo("Library Arena", dead_end=DeadEnd.all_cats),
     "Fortress Exterior from East Forest": RegionInfo("Fortress Courtyard"),
@@ -675,10 +681,12 @@ class DeadEnd(IntEnum):
     "Eastern Vault Fortress Gold Door": RegionInfo("Fortress Main"),
     "Fortress East Shortcut Upper": RegionInfo("Fortress East"),
     "Fortress East Shortcut Lower": RegionInfo("Fortress East"),
-    "Fortress Grave Path": RegionInfo("Fortress Reliquary"),
+    "Fortress Grave Path Entry": RegionInfo("Fortress Reliquary"),
+    "Fortress Grave Path Combat": RegionInfo("Fortress Reliquary"),  # the combat is basically just a barrier here
+    "Fortress Grave Path by Grave": RegionInfo("Fortress Reliquary"),
     "Fortress Grave Path Upper": RegionInfo("Fortress Reliquary", dead_end=DeadEnd.restricted),
     "Fortress Grave Path Dusty Entrance Region": RegionInfo("Fortress Reliquary"),
-    "Fortress Hero's Grave Region": RegionInfo("Fortress Reliquary", outlet_region="Fortress Grave Path"),
+    "Fortress Hero's Grave Region": RegionInfo("Fortress Reliquary", outlet_region="Fortress Grave Path by Grave"),
     "Fortress Leaf Piles": RegionInfo("Dusty", dead_end=DeadEnd.all_cats),
     "Fortress Arena": RegionInfo("Fortress Arena"),
     "Fortress Arena Portal": RegionInfo("Fortress Arena", outlet_region="Fortress Arena"),
@@ -697,6 +705,7 @@ class DeadEnd(IntEnum):
     "Monastery Rope": RegionInfo("Quarry Redux"),
     "Lower Quarry": RegionInfo("Quarry Redux"),
     "Even Lower Quarry": RegionInfo("Quarry Redux"),
+    "Even Lower Quarry Isolated Chest": RegionInfo("Quarry Redux"),  # a region for that one chest
     "Lower Quarry Zig Door": RegionInfo("Quarry Redux"),
     "Rooted Ziggurat Entry": RegionInfo("ziggurat2020_0"),
     "Rooted Ziggurat Upper Entry": RegionInfo("ziggurat2020_1"),
@@ -704,13 +713,15 @@ class DeadEnd(IntEnum):
     "Rooted Ziggurat Upper Back": RegionInfo("ziggurat2020_1"),  # after the administrator
     "Rooted Ziggurat Middle Top": RegionInfo("ziggurat2020_2"),
     "Rooted Ziggurat Middle Bottom": RegionInfo("ziggurat2020_2"),
-    "Rooted Ziggurat Lower Front": RegionInfo("ziggurat2020_3"),  # the vanilla entry point side
+    "Rooted Ziggurat Lower Entry": RegionInfo("ziggurat2020_3"),  # the vanilla entry point side
+    "Rooted Ziggurat Lower Front": RegionInfo("ziggurat2020_3"),  # the front for combat logic
+    "Rooted Ziggurat Lower Mid Checkpoint": RegionInfo("ziggurat2020_3"),  # the mid-checkpoint before double admin
     "Rooted Ziggurat Lower Back": RegionInfo("ziggurat2020_3"),  # the boss side
-    "Zig Skip Exit": RegionInfo("ziggurat2020_3", dead_end=DeadEnd.special, outlet_region="Rooted Ziggurat Lower Front"),  # the exit from zig skip, for use with fixed shop on
+    "Zig Skip Exit": RegionInfo("ziggurat2020_3", dead_end=DeadEnd.special, outlet_region="Rooted Ziggurat Lower Entry"),  # for use with fixed shop on
     "Rooted Ziggurat Portal Room Entrance": RegionInfo("ziggurat2020_3", outlet_region="Rooted Ziggurat Lower Back"),  # the door itself on the zig 3 side
     "Rooted Ziggurat Portal": RegionInfo("ziggurat2020_FTRoom", outlet_region="Rooted Ziggurat Portal Room"),
     "Rooted Ziggurat Portal Room": RegionInfo("ziggurat2020_FTRoom"),
-    "Rooted Ziggurat Portal Room Exit": RegionInfo("ziggurat2020_FTRoom"),
+    "Rooted Ziggurat Portal Room Exit": RegionInfo("ziggurat2020_FTRoom", outlet_region="Rooted Ziggurat Portal Room"),
     "Swamp Front": RegionInfo("Swamp Redux 2"),  # from the main entry to the top of the ladder after south
     "Swamp Mid": RegionInfo("Swamp Redux 2"),  # from the bottom of the ladder to the cathedral door
     "Swamp Ledge under Cathedral Door": RegionInfo("Swamp Redux 2"),  # the ledge with the chest and secret door
@@ -719,7 +730,8 @@ class DeadEnd(IntEnum):
     "Back of Swamp": RegionInfo("Swamp Redux 2"),  # the area with hero grave and gauntlet entrance
     "Swamp Hero's Grave Region": RegionInfo("Swamp Redux 2", outlet_region="Back of Swamp"),
     "Back of Swamp Laurels Area": RegionInfo("Swamp Redux 2"),  # the spots you need laurels to traverse
-    "Cathedral": RegionInfo("Cathedral Redux"),
+    "Cathedral Entry": RegionInfo("Cathedral Redux"),  # the checkpoint and easily-accessible chests
+    "Cathedral Main": RegionInfo("Cathedral Redux"),  # the majority of Cathedral
     "Cathedral to Gauntlet": RegionInfo("Cathedral Redux"),  # the elevator
     "Cathedral Secret Legend Room": RegionInfo("Cathedral Redux", dead_end=DeadEnd.all_cats),
     "Cathedral Gauntlet Checkpoint": RegionInfo("Cathedral Arena"),
@@ -741,7 +753,7 @@ class DeadEnd(IntEnum):
     "Purgatory": RegionInfo("Purgatory"),
     "Shop": RegionInfo("Shop", dead_end=DeadEnd.all_cats),
     "Spirit Arena": RegionInfo("Spirit Arena", dead_end=DeadEnd.all_cats),
-    "Spirit Arena Victory": RegionInfo("Spirit Arena", dead_end=DeadEnd.all_cats)
+    "Spirit Arena Victory": RegionInfo("Spirit Arena", dead_end=DeadEnd.all_cats),
 }
 
 
@@ -759,6 +771,8 @@ class DeadEnd(IntEnum):
     "Overworld": {
         "Overworld Beach":
             [],
+        "Overworld Tunnel to Beach":
+            [],
         "Overworld to Atoll Upper":
             [["Hyperdash"]],
         "Overworld Belltower":
@@ -769,7 +783,7 @@ class DeadEnd(IntEnum):
             [],
         "Overworld Special Shop Entry":
             [["Hyperdash"], ["LS1"]],
-        "Overworld Well Ladder":
+        "Overworld Well Entry Area":
             [],
         "Overworld Ruined Passage Door":
             [],
@@ -847,6 +861,12 @@ class DeadEnd(IntEnum):
     #     "Overworld":
     #         [],
     # },
+    "Overworld Tunnel to Beach": {
+        # "Overworld":
+        #     [],
+        "Overworld Beach":
+            [],
+    },
     "Overworld Beach": {
         # "Overworld":
         #     [],
@@ -873,9 +893,15 @@ class DeadEnd(IntEnum):
         "Overworld Beach":
             [],
     },
-    "Overworld Well Ladder": {
+    "Overworld Well Entry Area": {
         # "Overworld":
         #     [],
+        "Overworld Well Ladder":
+            [],
+    },
+    "Overworld Well Ladder": {
+        "Overworld Well Entry Area":
+            [],
     },
     "Overworld at Patrol Cave": {
         "East Overworld":
@@ -954,6 +980,7 @@ class DeadEnd(IntEnum):
         "Overworld":
             [],
     },
+
     "Old House Front": {
         "Old House Back":
             [],
@@ -962,6 +989,7 @@ class DeadEnd(IntEnum):
         "Old House Front":
             [["Hyperdash", "Zip"]],
     },
+
     "Furnace Fuse": {
         "Furnace Ladder Area":
             [["Hyperdash"]],
@@ -976,6 +1004,7 @@ class DeadEnd(IntEnum):
         "Furnace Ladder Area":
             [["Hyperdash"]],
     },
+
     "Sealed Temple": {
         "Sealed Temple Rafters":
             [],
@@ -984,10 +1013,12 @@ class DeadEnd(IntEnum):
         "Sealed Temple":
             [["Hyperdash"]],
     },
+
     "Hourglass Cave": {
         "Hourglass Cave Tower":
             [],
     },
+
     "Forest Belltower Upper": {
         "Forest Belltower Main":
             [],
@@ -996,6 +1027,7 @@ class DeadEnd(IntEnum):
         "Forest Belltower Lower":
             [],
     },
+
     "East Forest": {
         "East Forest Dance Fox Spot":
             [["Hyperdash"], ["IG1"], ["LS1"]],
@@ -1016,6 +1048,7 @@ class DeadEnd(IntEnum):
         "East Forest":
             [],
     },
+
     "Guard House 1 East": {
         "Guard House 1 West":
             [],
@@ -1024,6 +1057,7 @@ class DeadEnd(IntEnum):
         "Guard House 1 East":
             [["Hyperdash"], ["LS1"]],
     },
+
     "Guard House 2 Upper": {
         "Guard House 2 Lower":
             [],
@@ -1032,6 +1066,7 @@ class DeadEnd(IntEnum):
         "Guard House 2 Upper":
             [],
     },
+
     "Forest Grave Path Main": {
         "Forest Grave Path Upper":
             [["Hyperdash"], ["LS2"], ["IG3"]],
@@ -1044,7 +1079,7 @@ class DeadEnd(IntEnum):
     },
     "Forest Grave Path by Grave": {
         "Forest Hero's Grave":
-            [], 
+            [],
         "Forest Grave Path Main":
             [["IG1"]],
     },
@@ -1052,6 +1087,7 @@ class DeadEnd(IntEnum):
         "Forest Grave Path by Grave":
             [],
     },
+
     "Beneath the Well Ladder Exit": {
         "Beneath the Well Front":
             [],
@@ -1072,6 +1108,7 @@ class DeadEnd(IntEnum):
         "Beneath the Well Main":
             [],
     },
+
     "Well Boss": {
         "Dark Tomb Checkpoint":
             [],
@@ -1080,6 +1117,7 @@ class DeadEnd(IntEnum):
         "Well Boss":
             [["Hyperdash", "Zip"]],
     },
+
     "Dark Tomb Entry Point": {
         "Dark Tomb Upper":
             [],
@@ -1100,44 +1138,72 @@ class DeadEnd(IntEnum):
         "Dark Tomb Main":
             [],
     },
-    "West Garden": {
+
+    "West Garden before Terry": {
+        "West Garden after Terry":
+            [],
+        "West Garden Hero's Grave Region":
+            [],
+    },
+    "West Garden Hero's Grave Region": {
+        "West Garden before Terry":
+            [],
+    },
+    "West Garden after Terry": {
+        "West Garden before Terry":
+            [],
+        "West Garden South Checkpoint":
+            [],
         "West Garden Laurels Exit Region":
-            [["Hyperdash"], ["LS1"]],
+            [["LS1"]],
+    },
+    "West Garden South Checkpoint": {
+        "West Garden before Boss":
+            [],
+        "West Garden at Dagger House":
+            [],
+        "West Garden after Terry":
+            [],
+    },
+    "West Garden before Boss": {
         "West Garden after Boss":
-            [], 
-        "West Garden Hero's Grave Region":
+            [],
+        "West Garden South Checkpoint":
+            [],
+    },
+    "West Garden after Boss": {
+        "West Garden before Boss":
+            [["Hyperdash"]],
+    },
+    "West Garden at Dagger House": {
+        "West Garden Laurels Exit Region":
+            [["Hyperdash"]],
+        "West Garden South Checkpoint":
             [],
         "West Garden Portal Item":
             [["IG2"]],
     },
     "West Garden Laurels Exit Region": {
-        "West Garden":
-            [["Hyperdash"]],
-    },
-    "West Garden after Boss": {
-        "West Garden":
+        "West Garden at Dagger House":
             [["Hyperdash"]],
     },
     "West Garden Portal Item": {
-        "West Garden":
+        "West Garden at Dagger House":
             [["IG1"]],
         "West Garden by Portal":
             [["Hyperdash"]],
     },
     "West Garden by Portal": {
+        "West Garden Portal":
+            [["West Garden South Checkpoint"]],
         "West Garden Portal Item":
             [["Hyperdash"]],
-        "West Garden Portal":
-            [["West Garden"]],
     },
     "West Garden Portal": {
         "West Garden by Portal":
             [],
     },
-    "West Garden Hero's Grave Region": {
-        "West Garden":
-            [],
-    },
+
     "Ruined Atoll": {
         "Ruined Atoll Lower Entry Area":
             [["Hyperdash"], ["LS1"]],
@@ -1176,6 +1242,7 @@ class DeadEnd(IntEnum):
         "Ruined Atoll":
             [],
     },
+
     "Frog Stairs Eye Exit": {
         "Frog Stairs Upper":
             [],
@@ -1196,16 +1263,25 @@ class DeadEnd(IntEnum):
         "Frog Stairs Lower":
             [],
     },
+
     "Frog's Domain Entry": {
-        "Frog's Domain":
+        "Frog's Domain Front":
             [],
     },
-    "Frog's Domain": {
+    "Frog's Domain Front": {
         "Frog's Domain Entry":
             [],
+        "Frog's Domain Main":
+            [],
+    },
+    "Frog's Domain Main": {
+        "Frog's Domain Front":
+            [],
         "Frog's Domain Back":
             [],
     },
+
+    # cannot get from frogs back to front
     "Library Exterior Ladder Region": {
         "Library Exterior by Tree":
             [],
@@ -1220,6 +1296,7 @@ class DeadEnd(IntEnum):
         "Library Exterior by Tree":
             [],
     },
+
     "Library Hall Bookshelf": {
         "Library Hall":
             [],
@@ -1240,6 +1317,7 @@ class DeadEnd(IntEnum):
         "Library Hall":
             [],
     },
+
     "Library Rotunda to Hall": {
         "Library Rotunda":
             [],
@@ -1281,9 +1359,10 @@ class DeadEnd(IntEnum):
         "Library Lab":
             [],
     },
+
     "Fortress Exterior from East Forest": {
         "Fortress Exterior from Overworld":
-            [], 
+            [],
         "Fortress Courtyard Upper":
             [["LS2"]],
         "Fortress Courtyard":
@@ -1291,9 +1370,9 @@ class DeadEnd(IntEnum):
     },
     "Fortress Exterior from Overworld": {
         "Fortress Exterior from East Forest":
-            [["Hyperdash"]], 
+            [["Hyperdash"]],
         "Fortress Exterior near cave":
-            [], 
+            [],
         "Fortress Courtyard":
             [["Hyperdash"], ["IG1"], ["LS1"]],
     },
@@ -1321,6 +1400,7 @@ class DeadEnd(IntEnum):
         "Fortress Courtyard":
             [],
     },
+
     "Beneath the Vault Ladder Exit": {
         "Beneath the Vault Main":
             [],
@@ -1337,6 +1417,7 @@ class DeadEnd(IntEnum):
         "Beneath the Vault Ladder Exit":
             [],
     },
+
     "Fortress East Shortcut Lower": {
         "Fortress East Shortcut Upper":
             [["IG1"]],
@@ -1345,6 +1426,7 @@ class DeadEnd(IntEnum):
         "Fortress East Shortcut Lower":
             [],
     },
+
     "Eastern Vault Fortress": {
         "Eastern Vault Fortress Gold Door":
             [["IG2"], ["Fortress Exterior from Overworld", "Beneath the Vault Back", "Fortress Courtyard Upper"]],
@@ -1353,24 +1435,44 @@ class DeadEnd(IntEnum):
         "Eastern Vault Fortress":
             [["IG1"]],
     },
-    "Fortress Grave Path": {
+
+    "Fortress Grave Path Entry": {
+        "Fortress Grave Path Combat":
+            [],
+        # redundant here, keeping a comment to show it's intentional
+        # "Fortress Grave Path Dusty Entrance Region":
+        #     [["Hyperdash"]],
+    },
+    "Fortress Grave Path Combat": {
+        "Fortress Grave Path Entry":
+            [],
+        "Fortress Grave Path by Grave":
+            [],
+    },
+    "Fortress Grave Path by Grave": {
+        "Fortress Grave Path Entry":
+            [],
+        # unnecessary, you can just skip it
+        # "Fortress Grave Path Combat":
+        #     [],
         "Fortress Hero's Grave Region":
-            [], 
+            [],
         "Fortress Grave Path Dusty Entrance Region":
             [["Hyperdash"]],
     },
     "Fortress Grave Path Upper": {
-        "Fortress Grave Path":
+        "Fortress Grave Path Entry":
             [["IG1"]],
     },
     "Fortress Grave Path Dusty Entrance Region": {
-        "Fortress Grave Path":
+        "Fortress Grave Path by Grave":
             [["Hyperdash"]],
     },
     "Fortress Hero's Grave Region": {
-        "Fortress Grave Path":
+        "Fortress Grave Path by Grave":
             [],
     },
+
     "Fortress Arena": {
         "Fortress Arena Portal":
             [["Fortress Exterior from Overworld", "Beneath the Vault Back", "Eastern Vault Fortress"]],
@@ -1379,6 +1481,7 @@ class DeadEnd(IntEnum):
         "Fortress Arena":
             [],
     },
+
     "Lower Mountain": {
         "Lower Mountain Stairs":
             [],
@@ -1387,6 +1490,7 @@ class DeadEnd(IntEnum):
         "Lower Mountain":
             [],
     },
+
     "Monastery Back": {
         "Monastery Front":
             [["Hyperdash", "Zip"]],
@@ -1401,6 +1505,7 @@ class DeadEnd(IntEnum):
         "Monastery Back":
             [],
     },
+
     "Quarry Entry": {
         "Quarry Portal":
             [["Quarry Connector"]],
@@ -1436,15 +1541,17 @@ class DeadEnd(IntEnum):
             [],
         "Quarry Monastery Entry":
             [],
-        "Lower Quarry Zig Door":
-            [["IG3"]],
     },
     "Lower Quarry": {
         "Even Lower Quarry":
             [],
     },
     "Even Lower Quarry": {
-        "Lower Quarry":
+        "Even Lower Quarry Isolated Chest":
+            [],
+    },
+    "Even Lower Quarry Isolated Chest": {
+        "Even Lower Quarry":
             [],
         "Lower Quarry Zig Door":
             [["Quarry", "Quarry Connector"], ["IG3"]],
@@ -1453,6 +1560,7 @@ class DeadEnd(IntEnum):
         "Quarry Back":
             [],
     },
+
     "Rooted Ziggurat Upper Entry": {
         "Rooted Ziggurat Upper Front":
             [],
@@ -1465,17 +1573,38 @@ class DeadEnd(IntEnum):
         "Rooted Ziggurat Upper Front":
             [["Hyperdash"]],
     },
+
     "Rooted Ziggurat Middle Top": {
         "Rooted Ziggurat Middle Bottom":
             [],
     },
+
+    "Rooted Ziggurat Lower Entry": {
+        "Rooted Ziggurat Lower Front":
+            [],
+        # can zip through to the checkpoint
+        "Rooted Ziggurat Lower Mid Checkpoint":
+            [["Hyperdash"]],
+    },
     "Rooted Ziggurat Lower Front": {
+        "Rooted Ziggurat Lower Entry":
+            [],
+        "Rooted Ziggurat Lower Mid Checkpoint":
+            [],
+    },
+    "Rooted Ziggurat Lower Mid Checkpoint": {
+        "Rooted Ziggurat Lower Entry":
+            [["Hyperdash"]],
+        "Rooted Ziggurat Lower Front":
+            [],
         "Rooted Ziggurat Lower Back":
             [],
     },
     "Rooted Ziggurat Lower Back": {
-        "Rooted Ziggurat Lower Front":
-            [["Hyperdash"], ["LS2"], ["IG1"]],
+        "Rooted Ziggurat Lower Entry":
+            [["LS2"]],
+        "Rooted Ziggurat Lower Mid Checkpoint":
+            [["Hyperdash"], ["IG1"]],
         "Rooted Ziggurat Portal Room Entrance":
             [],
     },
@@ -1487,20 +1616,22 @@ class DeadEnd(IntEnum):
         "Rooted Ziggurat Lower Back":
             [],
     },
+
     "Rooted Ziggurat Portal Room Exit": {
         "Rooted Ziggurat Portal Room":
             [],
     },
     "Rooted Ziggurat Portal Room": {
-        "Rooted Ziggurat Portal":
-            [],
         "Rooted Ziggurat Portal Room Exit":
             [["Rooted Ziggurat Lower Back"]],
+        "Rooted Ziggurat Portal":
+            [],
     },
     "Rooted Ziggurat Portal": {
         "Rooted Ziggurat Portal Room":
             [],
     },
+
     "Swamp Front": {
         "Swamp Mid":
             [],
@@ -1557,14 +1688,26 @@ class DeadEnd(IntEnum):
         "Back of Swamp":
             [],
     },
-    "Cathedral": {
+
+    "Cathedral Entry": {
+        "Cathedral to Gauntlet":
+            [],
+        "Cathedral Main":
+            [],
+    },
+    "Cathedral Main": {
+        "Cathedral Entry":
+            [],
         "Cathedral to Gauntlet":
             [],
     },
     "Cathedral to Gauntlet": {
-        "Cathedral":
+        "Cathedral Entry":
+            [],
+        "Cathedral Main":
             [],
     },
+
     "Cathedral Gauntlet Checkpoint": {
         "Cathedral Gauntlet":
             [],
@@ -1577,6 +1720,7 @@ class DeadEnd(IntEnum):
         "Cathedral Gauntlet":
             [["Hyperdash"]],
     },
+
     "Far Shore": {
         "Far Shore to Spawn Region":
             [["Hyperdash"]],
@@ -1587,7 +1731,7 @@ class DeadEnd(IntEnum):
         "Far Shore to Library Region":
             [["Library Lab"]],
         "Far Shore to West Garden Region":
-            [["West Garden"]],
+            [["West Garden South Checkpoint"]],
         "Far Shore to Fortress Region":
             [["Fortress Exterior from Overworld", "Beneath the Vault Back", "Eastern Vault Fortress"]],
     },
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index 786af0d617a8..163523108345 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1,10 +1,11 @@
 from typing import Dict, FrozenSet, Tuple, TYPE_CHECKING
-from worlds.generic.Rules import set_rule, forbid_item
-from .options import IceGrappling, LadderStorage
-from .rules import (has_ability, has_sword, has_stick, has_ice_grapple_logic, has_lantern, has_mask, can_ladder_storage,
+from worlds.generic.Rules import set_rule, add_rule, forbid_item
+from .options import IceGrappling, LadderStorage, CombatLogic
+from .rules import (has_ability, has_sword, has_melee, has_ice_grapple_logic, has_lantern, has_mask, can_ladder_storage,
                     laurels_zip, bomb_walls)
 from .er_data import Portal, get_portal_outlet_region
 from .ladder_storage_data import ow_ladder_groups, region_ladders, easy_ls, medium_ls, hard_ls
+from .combat_logic import has_combat_reqs
 from BaseClasses import Region, CollectionState
 
 if TYPE_CHECKING:
@@ -43,6 +44,24 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     player = world.player
     options = world.options
 
+    # input scene destination tag, returns portal's name and paired portal's outlet region or region
+    def get_portal_info(portal_sd: str) -> Tuple[str, str]:
+        for portal1, portal2 in portal_pairs.items():
+            if portal1.scene_destination() == portal_sd:
+                return portal1.name, get_portal_outlet_region(portal2, world)
+            if portal2.scene_destination() == portal_sd:
+                return portal2.name, get_portal_outlet_region(portal1, world)
+        raise Exception("No matches found in get_portal_info")
+
+    # input scene destination tag, returns paired portal's name and region
+    def get_paired_portal(portal_sd: str) -> Tuple[str, str]:
+        for portal1, portal2 in portal_pairs.items():
+            if portal1.scene_destination() == portal_sd:
+                return portal2.name, portal2.region
+            if portal2.scene_destination() == portal_sd:
+                return portal1.name, portal1.region
+        raise Exception("no matches found in get_paired_portal")
+
     regions["Menu"].connect(
         connecting_region=regions["Overworld"])
 
@@ -56,10 +75,18 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         connecting_region=regions["Overworld Beach"],
         rule=lambda state: has_ladder("Ladders in Overworld Town", state, world)
         or state.has_any({laurels, grapple}, player))
+    # regions["Overworld Beach"].connect(
+    #     connecting_region=regions["Overworld"],
+    #     rule=lambda state: has_ladder("Ladders in Overworld Town", state, world)
+    #     or state.has_any({laurels, grapple}, player))
+
+    # region for combat logic, no need to connect it to beach since it would be the same as the ow -> beach cxn
+    ow_tunnel_beach = regions["Overworld"].connect(
+        connecting_region=regions["Overworld Tunnel to Beach"])
+
     regions["Overworld Beach"].connect(
-        connecting_region=regions["Overworld"],
-        rule=lambda state: has_ladder("Ladders in Overworld Town", state, world)
-        or state.has_any({laurels, grapple}, player))
+        connecting_region=regions["Overworld Tunnel to Beach"],
+        rule=lambda state: state.has(laurels, player) or has_ladder("Ladders in Overworld Town", state, world))
 
     regions["Overworld Beach"].connect(
         connecting_region=regions["Overworld West Garden Laurels Entry"],
@@ -277,11 +304,17 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         connecting_region=regions["East Overworld"],
         rule=lambda state: state.has(laurels, player))
 
-    regions["Overworld"].connect(
+    # region made for combat logic
+    ow_to_well_entry = regions["Overworld"].connect(
+        connecting_region=regions["Overworld Well Entry Area"])
+    regions["Overworld Well Entry Area"].connect(
+        connecting_region=regions["Overworld"])
+
+    regions["Overworld Well Entry Area"].connect(
         connecting_region=regions["Overworld Well Ladder"],
         rule=lambda state: has_ladder("Ladders in Well", state, world))
     regions["Overworld Well Ladder"].connect(
-        connecting_region=regions["Overworld"],
+        connecting_region=regions["Overworld Well Entry Area"],
         rule=lambda state: has_ladder("Ladders in Well", state, world))
 
     # nmg: can ice grapple through the door
@@ -306,7 +339,7 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Overworld Fountain Cross Door"].connect(
         connecting_region=regions["Overworld"])
 
-    regions["Overworld"].connect(
+    ow_to_town_portal = regions["Overworld"].connect(
         connecting_region=regions["Overworld Town Portal"],
         rule=lambda state: has_ability(prayer, state, world))
     regions["Overworld Town Portal"].connect(
@@ -337,6 +370,7 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         rule=lambda state: has_ladder("Ladders in Overworld Town", state, world)
         or has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
 
+    # don't need the ice grapple rule since you can go from ow -> beach -> tunnel
     regions["Overworld"].connect(
         connecting_region=regions["Overworld Tunnel Turret"],
         rule=lambda state: state.has(laurels, player))
@@ -473,29 +507,28 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         connecting_region=regions["Beneath the Well Ladder Exit"],
         rule=lambda state: has_ladder("Ladders in Well", state, world))
 
-    regions["Beneath the Well Front"].connect(
+    btw_front_main = regions["Beneath the Well Front"].connect(
         connecting_region=regions["Beneath the Well Main"],
-        rule=lambda state: has_stick(state, player) or state.has(fire_wand, player))
+        rule=lambda state: has_melee(state, player) or state.has(fire_wand, player))
     regions["Beneath the Well Main"].connect(
-        connecting_region=regions["Beneath the Well Front"],
-        rule=lambda state: has_stick(state, player) or state.has(fire_wand, player))
+        connecting_region=regions["Beneath the Well Front"])
 
     regions["Beneath the Well Main"].connect(
         connecting_region=regions["Beneath the Well Back"],
         rule=lambda state: has_ladder("Ladders in Well", state, world))
-    regions["Beneath the Well Back"].connect(
+    btw_back_main = regions["Beneath the Well Back"].connect(
         connecting_region=regions["Beneath the Well Main"],
         rule=lambda state: has_ladder("Ladders in Well", state, world)
-        and (has_stick(state, player) or state.has(fire_wand, player)))
+        and (has_melee(state, player) or state.has(fire_wand, player)))
 
-    regions["Well Boss"].connect(
+    well_boss_to_dt = regions["Well Boss"].connect(
         connecting_region=regions["Dark Tomb Checkpoint"])
     # can laurels through the gate, no setup needed
     regions["Dark Tomb Checkpoint"].connect(
         connecting_region=regions["Well Boss"],
         rule=lambda state: laurels_zip(state, world))
 
-    regions["Dark Tomb Entry Point"].connect(
+    dt_entry_to_upper = regions["Dark Tomb Entry Point"].connect(
         connecting_region=regions["Dark Tomb Upper"],
         rule=lambda state: has_lantern(state, world))
     regions["Dark Tomb Upper"].connect(
@@ -512,34 +545,57 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
 
     regions["Dark Tomb Main"].connect(
         connecting_region=regions["Dark Tomb Dark Exit"])
-    regions["Dark Tomb Dark Exit"].connect(
+    dt_exit_to_main = regions["Dark Tomb Dark Exit"].connect(
         connecting_region=regions["Dark Tomb Main"],
         rule=lambda state: has_lantern(state, world))
 
     # West Garden
+    # combat logic regions
+    wg_before_to_after_terry = regions["West Garden before Terry"].connect(
+        connecting_region=regions["West Garden after Terry"])
+    wg_after_to_before_terry = regions["West Garden after Terry"].connect(
+        connecting_region=regions["West Garden before Terry"])
+
+    regions["West Garden after Terry"].connect(
+        connecting_region=regions["West Garden South Checkpoint"])
+    wg_checkpoint_to_after_terry = regions["West Garden South Checkpoint"].connect(
+        connecting_region=regions["West Garden after Terry"])
+
+    wg_checkpoint_to_dagger = regions["West Garden South Checkpoint"].connect(
+        connecting_region=regions["West Garden at Dagger House"])
+    regions["West Garden at Dagger House"].connect(
+        connecting_region=regions["West Garden South Checkpoint"])
+
+    wg_checkpoint_to_before_boss = regions["West Garden South Checkpoint"].connect(
+        connecting_region=regions["West Garden before Boss"])
+    regions["West Garden before Boss"].connect(
+        connecting_region=regions["West Garden South Checkpoint"])
+
     regions["West Garden Laurels Exit Region"].connect(
-        connecting_region=regions["West Garden"],
+        connecting_region=regions["West Garden at Dagger House"],
         rule=lambda state: state.has(laurels, player))
-    regions["West Garden"].connect(
+    regions["West Garden at Dagger House"].connect(
         connecting_region=regions["West Garden Laurels Exit Region"],
         rule=lambda state: state.has(laurels, player))
 
-    # you can grapple Garden Knight to aggro it, then ledge it
-    regions["West Garden after Boss"].connect(
-        connecting_region=regions["West Garden"],
+    # laurels past, or ice grapple it off, or ice grapple to it then fight
+    after_gk_to_wg = regions["West Garden after Boss"].connect(
+        connecting_region=regions["West Garden before Boss"],
         rule=lambda state: state.has(laurels, player)
-        or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world))
+        or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world)
+        or (has_ice_grapple_logic(False, IceGrappling.option_easy, state, world)
+            and has_sword(state, player)))
     # ice grapple push Garden Knight off the side
-    regions["West Garden"].connect(
+    wg_to_after_gk = regions["West Garden before Boss"].connect(
         connecting_region=regions["West Garden after Boss"],
         rule=lambda state: state.has(laurels, player) or has_sword(state, player)
         or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world))
 
-    regions["West Garden"].connect(
+    regions["West Garden before Terry"].connect(
         connecting_region=regions["West Garden Hero's Grave Region"],
         rule=lambda state: has_ability(prayer, state, world))
     regions["West Garden Hero's Grave Region"].connect(
-        connecting_region=regions["West Garden"])
+        connecting_region=regions["West Garden before Terry"])
 
     regions["West Garden Portal"].connect(
         connecting_region=regions["West Garden by Portal"])
@@ -556,9 +612,9 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
 
     # can ice grapple to and from the item behind the magic dagger house
     regions["West Garden Portal Item"].connect(
-        connecting_region=regions["West Garden"],
+        connecting_region=regions["West Garden at Dagger House"],
         rule=lambda state: has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
-    regions["West Garden"].connect(
+    regions["West Garden at Dagger House"].connect(
         connecting_region=regions["West Garden Portal Item"],
         rule=lambda state: has_ice_grapple_logic(True, IceGrappling.option_medium, state, world))
 
@@ -596,7 +652,7 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Ruined Atoll Portal"].connect(
         connecting_region=regions["Ruined Atoll"])
 
-    regions["Ruined Atoll"].connect(
+    atoll_statue = regions["Ruined Atoll"].connect(
         connecting_region=regions["Ruined Atoll Statue"],
         rule=lambda state: has_ability(prayer, state, world)
         and (has_ladder("Ladders in South Atoll", state, world)
@@ -629,10 +685,13 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         rule=lambda state: has_ladder("Ladders to Frog's Domain", state, world))
 
     regions["Frog's Domain Entry"].connect(
-        connecting_region=regions["Frog's Domain"],
+        connecting_region=regions["Frog's Domain Front"],
         rule=lambda state: has_ladder("Ladders to Frog's Domain", state, world))
 
-    regions["Frog's Domain"].connect(
+    frogs_front_to_main = regions["Frog's Domain Front"].connect(
+        connecting_region=regions["Frog's Domain Main"])
+
+    regions["Frog's Domain Main"].connect(
         connecting_region=regions["Frog's Domain Back"],
         rule=lambda state: state.has(grapple, player))
 
@@ -752,7 +811,7 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         rule=lambda state: state.has(laurels, player)
         or has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
 
-    regions["Fortress Courtyard Upper"].connect(
+    fort_upper_lower = regions["Fortress Courtyard Upper"].connect(
         connecting_region=regions["Fortress Courtyard"])
     # nmg: can ice grapple to the upper ledge
     regions["Fortress Courtyard"].connect(
@@ -762,12 +821,12 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Fortress Courtyard Upper"].connect(
         connecting_region=regions["Fortress Exterior from Overworld"])
 
-    regions["Beneath the Vault Ladder Exit"].connect(
+    btv_front_to_main = regions["Beneath the Vault Ladder Exit"].connect(
         connecting_region=regions["Beneath the Vault Main"],
         rule=lambda state: has_ladder("Ladder to Beneath the Vault", state, world)
         and has_lantern(state, world)
         # there's some boxes in the way
-        and (has_stick(state, player) or state.has_any((gun, grapple, fire_wand, laurels), player)))
+        and (has_melee(state, player) or state.has_any((gun, grapple, fire_wand, laurels), player)))
     # on the reverse trip, you can lure an enemy over to break the boxes if needed
     regions["Beneath the Vault Main"].connect(
         connecting_region=regions["Beneath the Vault Ladder Exit"],
@@ -775,11 +834,11 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
 
     regions["Beneath the Vault Main"].connect(
         connecting_region=regions["Beneath the Vault Back"])
-    regions["Beneath the Vault Back"].connect(
+    btv_back_to_main = regions["Beneath the Vault Back"].connect(
         connecting_region=regions["Beneath the Vault Main"],
         rule=lambda state: has_lantern(state, world))
 
-    regions["Fortress East Shortcut Upper"].connect(
+    fort_east_upper_lower = regions["Fortress East Shortcut Upper"].connect(
         connecting_region=regions["Fortress East Shortcut Lower"])
     regions["Fortress East Shortcut Lower"].connect(
         connecting_region=regions["Fortress East Shortcut Upper"],
@@ -794,21 +853,31 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         connecting_region=regions["Eastern Vault Fortress"],
         rule=lambda state: has_ice_grapple_logic(False, IceGrappling.option_easy, state, world))
 
-    regions["Fortress Grave Path"].connect(
-        connecting_region=regions["Fortress Grave Path Dusty Entrance Region"],
-        rule=lambda state: state.has(laurels, player))
-    regions["Fortress Grave Path Dusty Entrance Region"].connect(
-        connecting_region=regions["Fortress Grave Path"],
-        rule=lambda state: state.has(laurels, player))
+    fort_grave_entry_to_combat = regions["Fortress Grave Path Entry"].connect(
+        connecting_region=regions["Fortress Grave Path Combat"])
+    regions["Fortress Grave Path Combat"].connect(
+        connecting_region=regions["Fortress Grave Path Entry"])
 
-    regions["Fortress Grave Path"].connect(
+    regions["Fortress Grave Path Combat"].connect(
+        connecting_region=regions["Fortress Grave Path by Grave"])
+
+    # run past the enemies
+    regions["Fortress Grave Path by Grave"].connect(
+        connecting_region=regions["Fortress Grave Path Entry"])
+
+    regions["Fortress Grave Path by Grave"].connect(
         connecting_region=regions["Fortress Hero's Grave Region"],
         rule=lambda state: has_ability(prayer, state, world))
     regions["Fortress Hero's Grave Region"].connect(
-        connecting_region=regions["Fortress Grave Path"])
+        connecting_region=regions["Fortress Grave Path by Grave"])
+
+    regions["Fortress Grave Path by Grave"].connect(
+        connecting_region=regions["Fortress Grave Path Dusty Entrance Region"],
+        rule=lambda state: state.has(laurels, player))
+    # reverse connection is conditionally made later, depending on whether combat logic is on, and the details of ER
 
     regions["Fortress Grave Path Upper"].connect(
-        connecting_region=regions["Fortress Grave Path"],
+        connecting_region=regions["Fortress Grave Path Entry"],
         rule=lambda state: has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
 
     regions["Fortress Arena"].connect(
@@ -831,19 +900,19 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Quarry Portal"].connect(
         connecting_region=regions["Quarry Entry"])
 
-    regions["Quarry Entry"].connect(
+    quarry_entry_to_main = regions["Quarry Entry"].connect(
         connecting_region=regions["Quarry"],
         rule=lambda state: state.has(fire_wand, player) or has_sword(state, player))
     regions["Quarry"].connect(
         connecting_region=regions["Quarry Entry"])
 
-    regions["Quarry Back"].connect(
+    quarry_back_to_main = regions["Quarry Back"].connect(
         connecting_region=regions["Quarry"],
         rule=lambda state: state.has(fire_wand, player) or has_sword(state, player))
     regions["Quarry"].connect(
         connecting_region=regions["Quarry Back"])
 
-    regions["Quarry Monastery Entry"].connect(
+    monastery_to_quarry_main = regions["Quarry Monastery Entry"].connect(
         connecting_region=regions["Quarry"],
         rule=lambda state: state.has(fire_wand, player) or has_sword(state, player))
     regions["Quarry"].connect(
@@ -869,18 +938,24 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         rule=lambda state: has_ladder("Ladders in Lower Quarry", state, world)
         or has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
 
-    # nmg: bring a scav over, then ice grapple through the door, only with ER on to avoid soft lock
     regions["Even Lower Quarry"].connect(
+        connecting_region=regions["Even Lower Quarry Isolated Chest"])
+    # you grappled down, might as well loot the rest too
+    lower_quarry_empty_to_combat = regions["Even Lower Quarry Isolated Chest"].connect(
+        connecting_region=regions["Even Lower Quarry"],
+        rule=lambda state: has_mask(state, world))
+
+    regions["Even Lower Quarry Isolated Chest"].connect(
         connecting_region=regions["Lower Quarry Zig Door"],
         rule=lambda state: state.has("Activate Quarry Fuse", player)
         or has_ice_grapple_logic(False, IceGrappling.option_hard, state, world))
 
-    # nmg: use ice grapple to get from the beginning of Quarry to the door without really needing mask only with ER on
+    # don't need the mask for this either, please don't complain about not needing a mask here, you know what you did
     regions["Quarry"].connect(
-        connecting_region=regions["Lower Quarry Zig Door"],
+        connecting_region=regions["Even Lower Quarry Isolated Chest"],
         rule=lambda state: has_ice_grapple_logic(True, IceGrappling.option_hard, state, world))
 
-    regions["Monastery Front"].connect(
+    monastery_front_to_back = regions["Monastery Front"].connect(
         connecting_region=regions["Monastery Back"])
     # laurels through the gate, no setup needed
     regions["Monastery Back"].connect(
@@ -897,7 +972,7 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Rooted Ziggurat Upper Entry"].connect(
         connecting_region=regions["Rooted Ziggurat Upper Front"])
 
-    regions["Rooted Ziggurat Upper Front"].connect(
+    zig_upper_front_back = regions["Rooted Ziggurat Upper Front"].connect(
         connecting_region=regions["Rooted Ziggurat Upper Back"],
         rule=lambda state: state.has(laurels, player) or has_sword(state, player))
     regions["Rooted Ziggurat Upper Back"].connect(
@@ -907,13 +982,23 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Rooted Ziggurat Middle Top"].connect(
         connecting_region=regions["Rooted Ziggurat Middle Bottom"])
 
+    zig_low_entry_to_front = regions["Rooted Ziggurat Lower Entry"].connect(
+        connecting_region=regions["Rooted Ziggurat Lower Front"])
+    regions["Rooted Ziggurat Lower Front"].connect(
+        connecting_region=regions["Rooted Ziggurat Lower Entry"])
+
     regions["Rooted Ziggurat Lower Front"].connect(
+        connecting_region=regions["Rooted Ziggurat Lower Mid Checkpoint"])
+    zig_low_mid_to_front = regions["Rooted Ziggurat Lower Mid Checkpoint"].connect(
+        connecting_region=regions["Rooted Ziggurat Lower Front"])
+
+    zig_low_mid_to_back = regions["Rooted Ziggurat Lower Mid Checkpoint"].connect(
         connecting_region=regions["Rooted Ziggurat Lower Back"],
         rule=lambda state: state.has(laurels, player)
         or (has_sword(state, player) and has_ability(prayer, state, world)))
-    # nmg: can ice grapple on the voidlings to the double admin fight, still need to pray at the fuse
-    regions["Rooted Ziggurat Lower Back"].connect(
-        connecting_region=regions["Rooted Ziggurat Lower Front"],
+    # can ice grapple to the voidlings to get to the double admin fight, still need to pray at the fuse
+    zig_low_back_to_mid = regions["Rooted Ziggurat Lower Back"].connect(
+        connecting_region=regions["Rooted Ziggurat Lower Mid Checkpoint"],
         rule=lambda state: (state.has(laurels, player)
                             or has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
         and has_ability(prayer, state, world)
@@ -925,8 +1010,10 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Rooted Ziggurat Portal Room Entrance"].connect(
         connecting_region=regions["Rooted Ziggurat Lower Back"])
 
-    regions["Zig Skip Exit"].connect(
-        connecting_region=regions["Rooted Ziggurat Lower Front"])
+    # zig skip region only gets made if entrance rando and fewer shops are on
+    if options.entrance_rando and options.fixed_shop:
+        regions["Zig Skip Exit"].connect(
+            connecting_region=regions["Rooted Ziggurat Lower Front"])
 
     regions["Rooted Ziggurat Portal"].connect(
         connecting_region=regions["Rooted Ziggurat Portal Room"])
@@ -952,7 +1039,6 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         or state.has(laurels, player)
         or has_ice_grapple_logic(False, IceGrappling.option_hard, state, world))
 
-    # a whole lot of stuff to basically say "you need to pray at the overworld fuse"
     swamp_mid_to_cath = regions["Swamp Mid"].connect(
         connecting_region=regions["Swamp to Cathedral Main Entrance Region"],
         rule=lambda state: (has_ability(prayer, state, world)
@@ -965,7 +1051,9 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
                                                             "Ladder to Swamp",
                                                             "Ladders near Weathervane"}, player)
                                           or (state.has("Ladder to Ruined Atoll", player)
-                                              and state.can_reach_region("Overworld Beach", player))))))
+                                              and state.can_reach_region("Overworld Beach", player)))))
+                            and (not options.combat_logic
+                                 or has_combat_reqs("Swamp", state, player)))
         or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world))
 
     if options.ladder_storage >= LadderStorage.option_hard and options.shuffle_ladders:
@@ -1017,13 +1105,23 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
     regions["Swamp Hero's Grave Region"].connect(
         connecting_region=regions["Back of Swamp"])
 
-    regions["Cathedral"].connect(
+    cath_entry_to_elev = regions["Cathedral Entry"].connect(
         connecting_region=regions["Cathedral to Gauntlet"],
         rule=lambda state: (has_ability(prayer, state, world)
                             or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world))
         or options.entrance_rando)  # elevator is always there in ER
     regions["Cathedral to Gauntlet"].connect(
-        connecting_region=regions["Cathedral"])
+        connecting_region=regions["Cathedral Entry"])
+
+    cath_entry_to_main = regions["Cathedral Entry"].connect(
+        connecting_region=regions["Cathedral Main"])
+    regions["Cathedral Main"].connect(
+        connecting_region=regions["Cathedral Entry"])
+
+    cath_elev_to_main = regions["Cathedral to Gauntlet"].connect(
+        connecting_region=regions["Cathedral Main"])
+    regions["Cathedral Main"].connect(
+        connecting_region=regions["Cathedral to Gauntlet"])
 
     regions["Cathedral Gauntlet Checkpoint"].connect(
         connecting_region=regions["Cathedral Gauntlet"])
@@ -1075,7 +1173,7 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
         connecting_region=regions["Far Shore"])
 
     # Misc
-    regions["Spirit Arena"].connect(
+    heir_fight = regions["Spirit Arena"].connect(
         connecting_region=regions["Spirit Arena Victory"],
         rule=lambda state: (state.has(gold_hexagon, player, world.options.hexagon_goal.value) if
                             world.options.hexagon_quest else
@@ -1219,6 +1317,192 @@ def ls_connect(origin_name: str, portal_sdt: str) -> None:
         for region in ladder_regions.values():
             world.multiworld.regions.append(region)
 
+    # for combat logic, easiest to replace or add to existing rules
+    if world.options.combat_logic >= CombatLogic.option_bosses_only:
+        set_rule(wg_to_after_gk,
+                 lambda state: state.has(laurels, player)
+                 or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world)
+                 or has_combat_reqs("Garden Knight", state, player))
+        # laurels past, or ice grapple it off, or ice grapple to it and fight
+        set_rule(after_gk_to_wg,
+                 lambda state: state.has(laurels, player)
+                 or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world)
+                 or (has_ice_grapple_logic(False, IceGrappling.option_easy, state, world)
+                     and has_combat_reqs("Garden Knight", state, player)))
+
+        if not world.options.hexagon_quest:
+            add_rule(heir_fight,
+                     lambda state: has_combat_reqs("The Heir", state, player))
+
+    if world.options.combat_logic == CombatLogic.option_on:
+        # these are redundant with combat logic off
+        regions["Fortress Grave Path Entry"].connect(
+            connecting_region=regions["Fortress Grave Path Dusty Entrance Region"],
+            rule=lambda state: state.has(laurels, player))
+
+        regions["Rooted Ziggurat Lower Entry"].connect(
+            connecting_region=regions["Rooted Ziggurat Lower Mid Checkpoint"],
+            rule=lambda state: state.has(laurels, player))
+        regions["Rooted Ziggurat Lower Mid Checkpoint"].connect(
+            connecting_region=regions["Rooted Ziggurat Lower Entry"],
+            rule=lambda state: state.has(laurels, player))
+
+        add_rule(ow_to_town_portal,
+                 lambda state: has_combat_reqs("Before Well", state, player))
+        # need to fight through the rudelings and turret, or just laurels from near the windmill
+        set_rule(ow_to_well_entry,
+                 lambda state: state.has(laurels, player)
+                 or has_combat_reqs("East Forest", state, player))
+        set_rule(ow_tunnel_beach,
+                 lambda state: has_combat_reqs("East Forest", state, player))
+
+        add_rule(atoll_statue,
+                 lambda state: has_combat_reqs("Ruined Atoll", state, player))
+        set_rule(frogs_front_to_main,
+                 lambda state: has_combat_reqs("Frog's Domain", state, player))
+
+        set_rule(btw_front_main,
+                 lambda state: state.has(laurels, player) or has_combat_reqs("Beneath the Well", state, player))
+        set_rule(btw_back_main,
+                 lambda state: has_ladder("Ladders in Well", state, world)
+                 and (state.has(laurels, player) or has_combat_reqs("Beneath the Well", state, player)))
+        set_rule(well_boss_to_dt,
+                 lambda state: has_combat_reqs("Beneath the Well", state, player)
+                 or laurels_zip(state, world))
+
+        add_rule(dt_entry_to_upper,
+                 lambda state: has_combat_reqs("Dark Tomb", state, player))
+        add_rule(dt_exit_to_main,
+                 lambda state: has_combat_reqs("Dark Tomb", state, player))
+
+        set_rule(wg_before_to_after_terry,
+                 lambda state: state.has_any({laurels, ice_dagger}, player)
+                 or has_combat_reqs("West Garden", state, player))
+        set_rule(wg_after_to_before_terry,
+                 lambda state: state.has_any({laurels, ice_dagger}, player)
+                 or has_combat_reqs("West Garden", state, player))
+        # laurels through, probably to the checkpoint, or just fight
+        set_rule(wg_checkpoint_to_after_terry,
+                 lambda state: state.has(laurels, player) or has_combat_reqs("West Garden", state, player))
+        set_rule(wg_checkpoint_to_before_boss,
+                 lambda state: has_combat_reqs("West Garden", state, player))
+
+        add_rule(btv_front_to_main,
+                 lambda state: has_combat_reqs("Beneath the Vault", state, player))
+        add_rule(btv_back_to_main,
+                 lambda state: has_combat_reqs("Beneath the Vault", state, player))
+
+        add_rule(fort_upper_lower,
+                 lambda state: state.has(ice_dagger, player)
+                 or has_combat_reqs("Eastern Vault Fortress", state, player))
+        set_rule(fort_grave_entry_to_combat,
+                 lambda state: has_combat_reqs("Eastern Vault Fortress", state, player))
+
+        set_rule(quarry_entry_to_main,
+                 lambda state: has_combat_reqs("Quarry", state, player))
+        set_rule(quarry_back_to_main,
+                 lambda state: has_combat_reqs("Quarry", state, player))
+        set_rule(monastery_to_quarry_main,
+                 lambda state: has_combat_reqs("Quarry", state, player))
+        set_rule(monastery_front_to_back,
+                 lambda state: has_combat_reqs("Quarry", state, player))
+        set_rule(lower_quarry_empty_to_combat,
+                 lambda state: has_combat_reqs("Quarry", state, player))
+
+        set_rule(zig_upper_front_back,
+                 lambda state: state.has(laurels, player)
+                 or has_combat_reqs("Rooted Ziggurat", state, player))
+        set_rule(zig_low_entry_to_front,
+                 lambda state: has_combat_reqs("Rooted Ziggurat", state, player))
+        set_rule(zig_low_mid_to_front,
+                 lambda state: has_combat_reqs("Rooted Ziggurat", state, player))
+        set_rule(zig_low_mid_to_back,
+                 lambda state: state.has(laurels, player)
+                 or (has_ability(prayer, state, world) and has_combat_reqs("Rooted Ziggurat", state, player)))
+        set_rule(zig_low_back_to_mid,
+                 lambda state: (state.has(laurels, player)
+                                or has_ice_grapple_logic(True, IceGrappling.option_easy, state, world))
+                 and has_ability(prayer, state, world)
+                 and has_combat_reqs("Rooted Ziggurat", state, player))
+
+        # only activating the fuse requires combat logic
+        set_rule(cath_entry_to_elev,
+                 lambda state: options.entrance_rando
+                 or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world)
+                 or (has_ability(prayer, state, world) and has_combat_reqs("Cathedral", state, player)))
+
+        set_rule(cath_entry_to_main,
+                 lambda state: has_combat_reqs("Cathedral", state, player))
+        set_rule(cath_elev_to_main,
+                 lambda state: has_combat_reqs("Cathedral", state, player))
+
+        # for spots where you can go into and come out of an entrance to reset enemy aggro
+        if world.options.entrance_rando:
+            # for the chest outside of magic dagger house
+            dagger_entry_paired_name, dagger_entry_paired_region = (
+                get_paired_portal("Archipelagos Redux, archipelagos_house_"))
+            try:
+                dagger_entry_paired_entrance = world.get_entrance(dagger_entry_paired_name)
+            except KeyError:
+                # there is no paired entrance, so you must fight or dash past, which is done in the finally
+                pass
+            else:
+                set_rule(wg_checkpoint_to_dagger,
+                         lambda state: dagger_entry_paired_entrance.can_reach(state))
+                world.multiworld.register_indirect_condition(region=regions["West Garden at Dagger House"],
+                                                             entrance=dagger_entry_paired_entrance)
+            finally:
+                add_rule(wg_checkpoint_to_dagger,
+                         lambda state: state.has(laurels, player) or has_combat_reqs("West Garden", state, player),
+                         combine="or")
+
+            # zip past enemies in fortress grave path to enter the dusty entrance, then come back out
+            fort_dusty_paired_name, fort_dusty_paired_region = get_paired_portal("Fortress Reliquary, Dusty_")
+            try:
+                fort_dusty_paired_entrance = world.get_entrance(fort_dusty_paired_name)
+            except KeyError:
+                # there is no paired entrance, so you can't run past to deaggro
+                # the path to dusty can be done via combat, so no need to do anything here
+                pass
+            else:
+                # there is a paired entrance, so you can use that to deaggro enemies
+                regions["Fortress Grave Path Dusty Entrance Region"].connect(
+                    connecting_region=regions["Fortress Grave Path by Grave"],
+                    rule=lambda state: state.has(laurels, player) and fort_dusty_paired_entrance.can_reach(state))
+                world.multiworld.register_indirect_condition(region=regions["Fortress Grave Path by Grave"],
+                                                             entrance=fort_dusty_paired_entrance)
+
+            # for activating the ladder switch to get from fortress east upper to lower
+            fort_east_upper_right_paired_name, fort_east_upper_right_paired_region = (
+                get_paired_portal("Fortress East, Fortress Courtyard_"))
+            try:
+                fort_east_upper_right_paired_entrance = (
+                    world.get_entrance(fort_east_upper_right_paired_name))
+            except KeyError:
+                # no paired entrance, so you must fight, which is done in the finally
+                pass
+            else:
+                set_rule(fort_east_upper_lower,
+                         lambda state: fort_east_upper_right_paired_entrance.can_reach(state))
+                world.multiworld.register_indirect_condition(region=regions["Fortress East Shortcut Lower"],
+                                                             entrance=fort_east_upper_right_paired_entrance)
+            finally:
+                add_rule(fort_east_upper_lower,
+                         lambda state: has_combat_reqs("Eastern Vault Fortress", state, player)
+                         or has_ice_grapple_logic(True, IceGrappling.option_easy, state, world),
+                         combine="or")
+
+        else:
+            # if combat logic is on and ER is off, we can make this entrance freely
+            regions["Fortress Grave Path Dusty Entrance Region"].connect(
+                connecting_region=regions["Fortress Grave Path by Grave"],
+                rule=lambda state: state.has(laurels, player))
+    else:
+        # if combat logic is off, we can make this entrance freely
+        regions["Fortress Grave Path Dusty Entrance Region"].connect(
+            connecting_region=regions["Fortress Grave Path by Grave"],
+            rule=lambda state: state.has(laurels, player))
+
 
 def set_er_location_rules(world: "TunicWorld") -> None:
     player = world.player
@@ -1315,6 +1599,11 @@ def set_er_location_rules(world: "TunicWorld") -> None:
     set_rule(world.get_location("East Forest - Ice Rod Grapple Chest"), lambda state: (
             state.has_all({grapple, ice_dagger, fire_wand}, player) and has_ability(icebolt, state, world)))
 
+    # Dark Tomb
+    # added to make combat logic smoother
+    set_rule(world.get_location("Dark Tomb - 2nd Laser Room"),
+             lambda state: has_lantern(state, world))
+
     # West Garden
     set_rule(world.get_location("West Garden - [North] Across From Page Pickup"),
              lambda state: state.has(laurels, player))
@@ -1348,11 +1637,11 @@ def set_er_location_rules(world: "TunicWorld") -> None:
 
     # Library Lab
     set_rule(world.get_location("Library Lab - Page 1"),
-             lambda state: has_stick(state, player) or state.has_any((fire_wand, gun), player))
+             lambda state: has_melee(state, player) or state.has_any((fire_wand, gun), player))
     set_rule(world.get_location("Library Lab - Page 2"),
-             lambda state: has_stick(state, player) or state.has_any((fire_wand, gun), player))
+             lambda state: has_melee(state, player) or state.has_any((fire_wand, gun), player))
     set_rule(world.get_location("Library Lab - Page 3"),
-             lambda state: has_stick(state, player) or state.has_any((fire_wand, gun), player))
+             lambda state: has_melee(state, player) or state.has_any((fire_wand, gun), player))
 
     # Eastern Vault Fortress
     set_rule(world.get_location("Fortress Arena - Hexagon Red"),
@@ -1361,11 +1650,11 @@ def set_er_location_rules(world: "TunicWorld") -> None:
     # gun isn't included since it can only break one leaf pile at a time, and we don't check how much mana you have
     # but really, I expect the player to just throw a bomb at them if they don't have melee
     set_rule(world.get_location("Fortress Leaf Piles - Secret Chest"),
-             lambda state: has_stick(state, player) or state.has(ice_dagger, player))
+             lambda state: has_melee(state, player) or state.has(ice_dagger, player))
 
     # Beneath the Vault
     set_rule(world.get_location("Beneath the Fortress - Bridge"),
-             lambda state: has_stick(state, player) or state.has_any({laurels, fire_wand}, player))
+             lambda state: has_melee(state, player) or state.has_any({laurels, fire_wand}, player))
 
     # Quarry
     set_rule(world.get_location("Quarry - [Central] Above Ladder Dash Chest"),
@@ -1421,9 +1710,9 @@ def set_er_location_rules(world: "TunicWorld") -> None:
 
     # Events
     set_rule(world.get_location("Eastern Bell"),
-             lambda state: (has_stick(state, player) or state.has(fire_wand, player)))
+             lambda state: (has_melee(state, player) or state.has(fire_wand, player)))
     set_rule(world.get_location("Western Bell"),
-             lambda state: (has_stick(state, player) or state.has(fire_wand, player)))
+             lambda state: (has_melee(state, player) or state.has(fire_wand, player)))
     set_rule(world.get_location("Furnace Fuse"),
              lambda state: has_ability(prayer, state, world))
     set_rule(world.get_location("South and West Fortress Exterior Fuses"),
@@ -1470,3 +1759,129 @@ def set_er_location_rules(world: "TunicWorld") -> None:
              lambda state: has_sword(state, player))
     set_rule(world.get_location("Shop - Coin 2"),
              lambda state: has_sword(state, player))
+
+    def combat_logic_to_loc(loc_name: str, combat_req_area: str, set_instead: bool = False,
+                            dagger: bool = False, laurel: bool = False) -> None:
+        # dagger means you can use magic dagger instead of combat for that check
+        # laurel means you can dodge the enemies freely with the laurels
+        if set_instead:
+            set_rule(world.get_location(loc_name),
+                     lambda state: has_combat_reqs(combat_req_area, state, player)
+                     or (dagger and state.has(ice_dagger, player))
+                     or (laurel and state.has(laurels, player)))
+        else:
+            add_rule(world.get_location(loc_name),
+                     lambda state: has_combat_reqs(combat_req_area, state, player)
+                     or (dagger and state.has(ice_dagger, player))
+                     or (laurel and state.has(laurels, player)))
+
+    if world.options.combat_logic >= CombatLogic.option_bosses_only:
+        # garden knight is in the regions part above
+        combat_logic_to_loc("Fortress Arena - Siege Engine/Vault Key Pickup", "Siege Engine", set_instead=True)
+        combat_logic_to_loc("Librarian - Hexagon Green", "The Librarian", set_instead=True)
+        set_rule(world.get_location("Librarian - Hexagon Green"),
+                 rule=lambda state: has_combat_reqs("The Librarian", state, player)
+                 and has_ladder("Ladders in Library", state, world))
+        combat_logic_to_loc("Rooted Ziggurat Lower - Hexagon Blue", "Boss Scavenger", set_instead=True)
+        if world.options.ice_grappling >= IceGrappling.option_medium:
+            add_rule(world.get_location("Rooted Ziggurat Lower - Hexagon Blue"),
+                     lambda state: has_ice_grapple_logic(False, IceGrappling.option_medium, state, world))
+        combat_logic_to_loc("Cathedral Gauntlet - Gauntlet Reward", "Gauntlet", set_instead=True)
+
+    if world.options.combat_logic == CombatLogic.option_on:
+        combat_logic_to_loc("Overworld - [Northeast] Flowers Holy Cross", "Garden Knight")
+        combat_logic_to_loc("Overworld - [Northwest] Chest Near Quarry Gate", "Before Well", dagger=True)
+        combat_logic_to_loc("Overworld - [Northeast] Chest Above Patrol Cave", "Garden Knight", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] West Beach Guarded By Turret", "Overworld", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] West Beach Guarded By Turret 2", "Overworld")
+        combat_logic_to_loc("Overworld - [Southwest] Bombable Wall Near Fountain", "East Forest", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] Fountain Holy Cross", "East Forest", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] South Chest Near Guard", "East Forest", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] Tunnel Guarded By Turret", "East Forest", dagger=True)
+        combat_logic_to_loc("Overworld - [Northwest] Chest Near Turret", "Before Well")
+
+        add_rule(world.get_location("Hourglass Cave - Hourglass Chest"),
+                 lambda state: has_sword(state, player) and (state.has("Shield", player)
+                                                             # kill the turrets through the wall with a longer sword
+                                                             or state.has("Sword Upgrade", player, 3)))
+        add_rule(world.get_location("Hourglass Cave - Holy Cross Chest"),
+                 lambda state: has_sword(state, player) and (state.has("Shield", player)
+                                                             or state.has("Sword Upgrade", player, 3)))
+
+        # the first spider chest they literally do not attack you until you open the chest
+        # the second one, you can still just walk past them, but I guess /something/ would be wanted
+        combat_logic_to_loc("East Forest - Beneath Spider Chest", "East Forest", dagger=True, laurel=True)
+        combat_logic_to_loc("East Forest - Golden Obelisk Holy Cross", "East Forest", dagger=True)
+        combat_logic_to_loc("East Forest - Dancing Fox Spirit Holy Cross", "East Forest", dagger=True, laurel=True)
+        combat_logic_to_loc("East Forest - From Guardhouse 1 Chest", "East Forest", dagger=True, laurel=True)
+        combat_logic_to_loc("East Forest - Above Save Point", "East Forest", dagger=True)
+        combat_logic_to_loc("East Forest - Above Save Point Obscured", "East Forest", dagger=True)
+        combat_logic_to_loc("Forest Grave Path - Above Gate", "East Forest", dagger=True, laurel=True)
+        combat_logic_to_loc("Forest Grave Path - Obscured Chest", "East Forest", dagger=True, laurel=True)
+
+        # most of beneath the well is covered by the region access rule
+        combat_logic_to_loc("Beneath the Well - [Entryway] Chest", "Beneath the Well")
+        combat_logic_to_loc("Beneath the Well - [Entryway] Obscured Behind Waterfall", "Beneath the Well")
+        combat_logic_to_loc("Beneath the Well - [Back Corridor] Left Secret", "Beneath the Well")
+        combat_logic_to_loc("Beneath the Well - [Side Room] Chest By Phrends", "Overworld")
+
+        # laurels past the enemies, then use the wand or gun to take care of the fairies that chased you
+        add_rule(world.get_location("West Garden - [West Lowlands] Tree Holy Cross Chest"),
+                 lambda state: state.has_any({fire_wand, "Gun"}, player))
+        combat_logic_to_loc("West Garden - [Central Lowlands] Chest Beneath Faeries", "West Garden")
+        combat_logic_to_loc("West Garden - [Central Lowlands] Chest Beneath Save Point", "West Garden")
+        combat_logic_to_loc("West Garden - [West Highlands] Upper Left Walkway", "West Garden")
+
+        # with combat logic on, I presume the player will want to be able to see to avoid the spiders
+        set_rule(world.get_location("Beneath the Fortress - Bridge"),
+                 lambda state: has_lantern(state, world)
+                 and (state.has_any({laurels, fire_wand, "Gun"}, player) or has_melee(state, player)))
+
+        combat_logic_to_loc("Eastern Vault Fortress - [West Wing] Candles Holy Cross", "Eastern Vault Fortress",
+                            dagger=True)
+
+        # could just do the last two, but this outputs better in the spoiler log
+        # dagger is maybe viable here, but it's sketchy -- activate ladder switch, save to reset enemies, climb up
+        combat_logic_to_loc("Upper and Central Fortress Exterior Fuses", "Eastern Vault Fortress")
+        combat_logic_to_loc("Beneath the Vault Fuse", "Beneath the Vault")
+        combat_logic_to_loc("Eastern Vault West Fuses", "Eastern Vault Fortress")
+
+        # if you come in from the left, you only need to fight small crabs
+        add_rule(world.get_location("Ruined Atoll - [South] Near Birds"),
+                 lambda state: has_melee(state, player) or state.has_any({laurels, "Gun"}, player))
+
+        # can get this one without fighting if you have laurels
+        add_rule(world.get_location("Frog's Domain - Above Vault"),
+                 lambda state: state.has(laurels, player) or has_combat_reqs("Frog's Domain", state, player))
+
+        # with wand, you can get this chest. Non-ER, you need laurels to continue down. ER, you can just torch
+        set_rule(world.get_location("Rooted Ziggurat Upper - Near Bridge Switch"),
+                 lambda state: (state.has(fire_wand, player)
+                                and (state.has(laurels, player) or world.options.entrance_rando))
+                 or has_combat_reqs("Rooted Ziggurat", state, player))
+        set_rule(world.get_location("Rooted Ziggurat Lower - After Guarded Fuse"),
+                 lambda state: has_ability(prayer, state, world)
+                 and has_combat_reqs("Rooted Ziggurat", state, player))
+
+        # replace the sword rule with this one
+        combat_logic_to_loc("Swamp - [South Graveyard] 4 Orange Skulls", "Swamp", set_instead=True)
+        combat_logic_to_loc("Swamp - [South Graveyard] Guarded By Big Skeleton", "Swamp", dagger=True)
+        # don't really agree with this one but eh
+        combat_logic_to_loc("Swamp - [South Graveyard] Above Big Skeleton", "Swamp", dagger=True, laurel=True)
+        # the tentacles deal with everything else reasonably, and you can hide on the island, so no rule for it
+        add_rule(world.get_location("Swamp - [South Graveyard] Obscured Beneath Telescope"),
+                 lambda state: state.has(laurels, player)  # can dash from swamp mid to here and grab it
+                 or has_combat_reqs("Swamp", state, player))
+        add_rule(world.get_location("Swamp - [Central] South Secret Passage"),
+                 lambda state: state.has(laurels, player)  # can dash from swamp front to here and grab it
+                 or has_combat_reqs("Swamp", state, player))
+        combat_logic_to_loc("Swamp - [South Graveyard] Upper Walkway On Pedestal", "Swamp")
+        combat_logic_to_loc("Swamp - [Central] Beneath Memorial", "Swamp")
+        combat_logic_to_loc("Swamp - [Central] Near Ramps Up", "Swamp")
+        combat_logic_to_loc("Swamp - [Upper Graveyard] Near Telescope", "Swamp")
+        combat_logic_to_loc("Swamp - [Upper Graveyard] Near Shield Fleemers", "Swamp")
+        combat_logic_to_loc("Swamp - [Upper Graveyard] Obscured Behind Hill", "Swamp")
+
+        # zip through the rubble to sneakily grab this chest, or just fight to it
+        add_rule(world.get_location("Cathedral - [1F] Near Spikes"),
+                 lambda state: laurels_zip(state, world) or has_combat_reqs("Cathedral", state, player))
diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py
index 05f6177aa57d..aa5833b4db36 100644
--- a/worlds/tunic/er_scripts.py
+++ b/worlds/tunic/er_scripts.py
@@ -22,10 +22,19 @@ class TunicERLocation(Location):
 
 def create_er_regions(world: "TunicWorld") -> Dict[Portal, Portal]:
     regions: Dict[str, Region] = {}
-    for region_name, region_data in world.er_regions.items():
-        regions[region_name] = Region(region_name, world.player, world.multiworld)
 
     if world.options.entrance_rando:
+        for region_name, region_data in world.er_regions.items():
+            # if fewer shops is off, zig skip is not made
+            if region_name == "Zig Skip Exit":
+                # need to check if there's a seed group for this first
+                if world.options.entrance_rando.value not in EntranceRando.options.values():
+                    if not world.seed_groups[world.options.entrance_rando.value]["fixed_shop"]:
+                        continue
+                elif not world.options.fixed_shop:
+                    continue
+            regions[region_name] = Region(region_name, world.player, world.multiworld)
+
         portal_pairs = pair_portals(world, regions)
 
         # output the entrances to the spoiler log here for convenience
@@ -33,16 +42,21 @@ def create_er_regions(world: "TunicWorld") -> Dict[Portal, Portal]:
         for portal1, portal2 in sorted_portal_pairs.items():
             world.multiworld.spoiler.set_entrance(portal1, portal2, "both", world.player)
     else:
+        for region_name, region_data in world.er_regions.items():
+            # filter out regions that are inaccessible in non-er
+            if region_name not in ["Zig Skip Exit", "Purgatory"]:
+                regions[region_name] = Region(region_name, world.player, world.multiworld)
+
         portal_pairs = vanilla_portals(world, regions)
 
+    create_randomized_entrances(portal_pairs, regions)
+
     set_er_region_rules(world, regions, portal_pairs)
 
     for location_name, location_id in world.location_name_to_id.items():
         region = regions[location_table[location_name].er_region]
         location = TunicERLocation(world.player, location_name, location_id, region)
         region.locations.append(location)
-    
-    create_randomized_entrances(portal_pairs, regions)
 
     for region in regions.values():
         world.multiworld.regions.append(region)
@@ -70,7 +84,7 @@ def create_er_regions(world: "TunicWorld") -> Dict[Portal, Portal]:
     "Quarry Connector Fuse": "Quarry Connector",
     "Quarry Fuse": "Quarry Entry",
     "Ziggurat Fuse": "Rooted Ziggurat Lower Back",
-    "West Garden Fuse": "West Garden",
+    "West Garden Fuse": "West Garden South Checkpoint",
     "Library Fuse": "Library Lab",
     "Place Questagons": "Sealed Temple",
 }
@@ -108,7 +122,8 @@ def create_shop_region(world: "TunicWorld", regions: Dict[str, Region]) -> None:
 def vanilla_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal, Portal]:
     portal_pairs: Dict[Portal, Portal] = {}
     # we don't want the zig skip exit for vanilla portals, since it shouldn't be considered for logic here
-    portal_map = [portal for portal in portal_mapping if portal.name != "Ziggurat Lower Falling Entrance"]
+    portal_map = [portal for portal in portal_mapping if portal.name not in
+                  ["Ziggurat Lower Falling Entrance", "Purgatory Bottom Exit", "Purgatory Top Exit"]]
 
     while portal_map:
         portal1 = portal_map[0]
@@ -121,9 +136,6 @@ def vanilla_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Por
                              destination="Previous Region", tag="_")
             create_shop_region(world, regions)
 
-        elif portal2_sdt == "Purgatory, Purgatory_bottom":
-            portal2_sdt = "Purgatory, Purgatory_top"
-
         for portal in portal_map:
             if portal.scene_destination() == portal2_sdt:
                 portal2 = portal
@@ -414,6 +426,7 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
                             cr.add(portal.region)
                             if "Secret Gathering Place" not in update_reachable_regions(cr, traversal_reqs, has_laurels, logic_tricks):
                                 continue
+                        # if not waterfall_plando, then we just want to pair secret gathering place now
                         elif portal.region != "Secret Gathering Place":
                             continue
                     portal2 = portal
diff --git a/worlds/tunic/items.py b/worlds/tunic/items.py
index b6ce5d8995a8..f30c1d5d248a 100644
--- a/worlds/tunic/items.py
+++ b/worlds/tunic/items.py
@@ -1,5 +1,5 @@
 from itertools import groupby
-from typing import Dict, List, Set, NamedTuple
+from typing import Dict, List, Set, NamedTuple, Optional
 from BaseClasses import ItemClassification as IC
 
 
@@ -8,6 +8,8 @@ class TunicItemData(NamedTuple):
     quantity_in_item_pool: int
     item_id_offset: int
     item_group: str = ""
+    # classification if combat logic is on
+    combat_ic: Optional[IC] = None
 
 
 item_base_id = 509342400
@@ -27,7 +29,7 @@ class TunicItemData(NamedTuple):
     "Lure x2": TunicItemData(IC.filler, 1, 11, "Consumables"),
     "Pepper x2": TunicItemData(IC.filler, 4, 12, "Consumables"),
     "Ivy x3": TunicItemData(IC.filler, 2, 13, "Consumables"),
-    "Effigy": TunicItemData(IC.useful, 12, 14, "Money"),
+    "Effigy": TunicItemData(IC.useful, 12, 14, "Money", combat_ic=IC.progression),
     "HP Berry": TunicItemData(IC.filler, 2, 15, "Consumables"),
     "HP Berry x2": TunicItemData(IC.filler, 4, 16, "Consumables"),
     "HP Berry x3": TunicItemData(IC.filler, 2, 17, "Consumables"),
@@ -44,32 +46,32 @@ class TunicItemData(NamedTuple):
     "Hero's Laurels": TunicItemData(IC.progression | IC.useful, 1, 28),
     "Lantern": TunicItemData(IC.progression, 1, 29),
     "Gun": TunicItemData(IC.progression | IC.useful, 1, 30, "Weapons"),
-    "Shield": TunicItemData(IC.useful, 1, 31),
+    "Shield": TunicItemData(IC.useful, 1, 31, combat_ic=IC.progression | IC.useful),
     "Dath Stone": TunicItemData(IC.useful, 1, 32),
     "Hourglass": TunicItemData(IC.useful, 1, 33),
     "Old House Key": TunicItemData(IC.progression, 1, 34, "Keys"),
     "Key": TunicItemData(IC.progression, 2, 35, "Keys"),
     "Fortress Vault Key": TunicItemData(IC.progression, 1, 36, "Keys"),
-    "Flask Shard": TunicItemData(IC.useful, 12, 37),
-    "Potion Flask": TunicItemData(IC.useful, 5, 38, "Flask"),
+    "Flask Shard": TunicItemData(IC.useful, 12, 37, combat_ic=IC.progression),
+    "Potion Flask": TunicItemData(IC.useful, 5, 38, "Flask", combat_ic=IC.progression),
     "Golden Coin": TunicItemData(IC.progression, 17, 39),
     "Card Slot": TunicItemData(IC.useful, 4, 40),
     "Red Questagon": TunicItemData(IC.progression_skip_balancing, 1, 41, "Hexagons"),
     "Green Questagon": TunicItemData(IC.progression_skip_balancing, 1, 42, "Hexagons"),
     "Blue Questagon": TunicItemData(IC.progression_skip_balancing, 1, 43, "Hexagons"),
     "Gold Questagon": TunicItemData(IC.progression_skip_balancing, 0, 44, "Hexagons"),
-    "ATT Offering": TunicItemData(IC.useful, 4, 45, "Offerings"),
-    "DEF Offering": TunicItemData(IC.useful, 4, 46, "Offerings"),
-    "Potion Offering": TunicItemData(IC.useful, 3, 47, "Offerings"),
-    "HP Offering": TunicItemData(IC.useful, 6, 48, "Offerings"),
-    "MP Offering": TunicItemData(IC.useful, 3, 49, "Offerings"),
-    "SP Offering": TunicItemData(IC.useful, 2, 50, "Offerings"),
-    "Hero Relic - ATT": TunicItemData(IC.progression_skip_balancing, 1, 51, "Hero Relics"),
-    "Hero Relic - DEF": TunicItemData(IC.progression_skip_balancing, 1, 52, "Hero Relics"),
-    "Hero Relic - HP": TunicItemData(IC.progression_skip_balancing, 1, 53, "Hero Relics"),
-    "Hero Relic - MP": TunicItemData(IC.progression_skip_balancing, 1, 54, "Hero Relics"),
-    "Hero Relic - POTION": TunicItemData(IC.progression_skip_balancing, 1, 55, "Hero Relics"),
-    "Hero Relic - SP": TunicItemData(IC.progression_skip_balancing, 1, 56, "Hero Relics"),
+    "ATT Offering": TunicItemData(IC.useful, 4, 45, "Offerings", combat_ic=IC.progression),
+    "DEF Offering": TunicItemData(IC.useful, 4, 46, "Offerings", combat_ic=IC.progression),
+    "Potion Offering": TunicItemData(IC.useful, 3, 47, "Offerings", combat_ic=IC.progression),
+    "HP Offering": TunicItemData(IC.useful, 6, 48, "Offerings", combat_ic=IC.progression),
+    "MP Offering": TunicItemData(IC.useful, 3, 49, "Offerings", combat_ic=IC.progression),
+    "SP Offering": TunicItemData(IC.useful, 2, 50, "Offerings", combat_ic=IC.progression),
+    "Hero Relic - ATT": TunicItemData(IC.progression_skip_balancing, 1, 51, "Hero Relics", combat_ic=IC.progression),
+    "Hero Relic - DEF": TunicItemData(IC.progression_skip_balancing, 1, 52, "Hero Relics", combat_ic=IC.progression),
+    "Hero Relic - HP": TunicItemData(IC.progression_skip_balancing, 1, 53, "Hero Relics", combat_ic=IC.progression),
+    "Hero Relic - MP": TunicItemData(IC.progression_skip_balancing, 1, 54, "Hero Relics", combat_ic=IC.progression),
+    "Hero Relic - POTION": TunicItemData(IC.progression_skip_balancing, 1, 55, "Hero Relics", combat_ic=IC.progression),
+    "Hero Relic - SP": TunicItemData(IC.progression_skip_balancing, 1, 56, "Hero Relics", combat_ic=IC.progression),
     "Orange Peril Ring": TunicItemData(IC.useful, 1, 57, "Cards"),
     "Tincture": TunicItemData(IC.useful, 1, 58, "Cards"),
     "Scavenger Mask": TunicItemData(IC.progression, 1, 59, "Cards"),
@@ -86,18 +88,18 @@ class TunicItemData(NamedTuple):
     "Louder Echo": TunicItemData(IC.useful, 1, 70, "Cards"),
     "Aura's Gem": TunicItemData(IC.useful, 1, 71, "Cards"),
     "Bone Card": TunicItemData(IC.useful, 1, 72, "Cards"),
-    "Mr Mayor": TunicItemData(IC.useful, 1, 73, "Golden Treasures"),
-    "Secret Legend": TunicItemData(IC.useful, 1, 74, "Golden Treasures"),
-    "Sacred Geometry": TunicItemData(IC.useful, 1, 75, "Golden Treasures"),
-    "Vintage": TunicItemData(IC.useful, 1, 76, "Golden Treasures"),
-    "Just Some Pals": TunicItemData(IC.useful, 1, 77, "Golden Treasures"),
-    "Regal Weasel": TunicItemData(IC.useful, 1, 78, "Golden Treasures"),
-    "Spring Falls": TunicItemData(IC.useful, 1, 79, "Golden Treasures"),
-    "Power Up": TunicItemData(IC.useful, 1, 80, "Golden Treasures"),
-    "Back To Work": TunicItemData(IC.useful, 1, 81, "Golden Treasures"),
-    "Phonomath": TunicItemData(IC.useful, 1, 82, "Golden Treasures"),
-    "Dusty": TunicItemData(IC.useful, 1, 83, "Golden Treasures"),
-    "Forever Friend": TunicItemData(IC.useful, 1, 84, "Golden Treasures"),
+    "Mr Mayor": TunicItemData(IC.useful, 1, 73, "Golden Treasures", combat_ic=IC.progression),
+    "Secret Legend": TunicItemData(IC.useful, 1, 74, "Golden Treasures", combat_ic=IC.progression),
+    "Sacred Geometry": TunicItemData(IC.useful, 1, 75, "Golden Treasures", combat_ic=IC.progression),
+    "Vintage": TunicItemData(IC.useful, 1, 76, "Golden Treasures", combat_ic=IC.progression),
+    "Just Some Pals": TunicItemData(IC.useful, 1, 77, "Golden Treasures", combat_ic=IC.progression),
+    "Regal Weasel": TunicItemData(IC.useful, 1, 78, "Golden Treasures", combat_ic=IC.progression),
+    "Spring Falls": TunicItemData(IC.useful, 1, 79, "Golden Treasures", combat_ic=IC.progression),
+    "Power Up": TunicItemData(IC.useful, 1, 80, "Golden Treasures", combat_ic=IC.progression),
+    "Back To Work": TunicItemData(IC.useful, 1, 81, "Golden Treasures", combat_ic=IC.progression),
+    "Phonomath": TunicItemData(IC.useful, 1, 82, "Golden Treasures", combat_ic=IC.progression),
+    "Dusty": TunicItemData(IC.useful, 1, 83, "Golden Treasures", combat_ic=IC.progression),
+    "Forever Friend": TunicItemData(IC.useful, 1, 84, "Golden Treasures", combat_ic=IC.progression),
     "Fool Trap": TunicItemData(IC.trap, 0, 85),
     "Money x1": TunicItemData(IC.filler, 3, 86, "Money"),
     "Money x10": TunicItemData(IC.filler, 1, 87, "Money"),
@@ -112,9 +114,9 @@ class TunicItemData(NamedTuple):
     "Money x50": TunicItemData(IC.filler, 7, 96, "Money"),
     "Money x64": TunicItemData(IC.filler, 1, 97, "Money"),
     "Money x100": TunicItemData(IC.filler, 5, 98, "Money"),
-    "Money x128": TunicItemData(IC.useful, 3, 99, "Money"),
-    "Money x200": TunicItemData(IC.useful, 1, 100, "Money"),
-    "Money x255": TunicItemData(IC.useful, 1, 101, "Money"),
+    "Money x128": TunicItemData(IC.useful, 3, 99, "Money", combat_ic=IC.progression),
+    "Money x200": TunicItemData(IC.useful, 1, 100, "Money", combat_ic=IC.progression),
+    "Money x255": TunicItemData(IC.useful, 1, 101, "Money", combat_ic=IC.progression),
     "Pages 0-1": TunicItemData(IC.useful, 1, 102, "Pages"),
     "Pages 2-3": TunicItemData(IC.useful, 1, 103, "Pages"),
     "Pages 4-5": TunicItemData(IC.useful, 1, 104, "Pages"),
@@ -206,6 +208,10 @@ class TunicItemData(NamedTuple):
     "Gold Questagon",
 ]
 
+combat_items: List[str] = [name for name, data in item_table.items()
+                           if data.combat_ic and IC.progression in data.combat_ic]
+combat_items.extend(["Stick", "Sword", "Sword Upgrade", "Magic Wand", "Hero's Laurels"])
+
 item_name_to_id: Dict[str, int] = {name: item_base_id + data.item_id_offset for name, data in item_table.items()}
 
 filler_items: List[str] = [name for name, data in item_table.items() if data.classification == IC.filler]
diff --git a/worlds/tunic/ladder_storage_data.py b/worlds/tunic/ladder_storage_data.py
index c6dda42bca79..f2d4b94406ac 100644
--- a/worlds/tunic/ladder_storage_data.py
+++ b/worlds/tunic/ladder_storage_data.py
@@ -78,9 +78,11 @@ class LadderInfo(NamedTuple):
 
     # West Garden
     # exit after Garden Knight
-    LadderInfo("West Garden", "Archipelagos Redux, Overworld Redux_upper"),
+    LadderInfo("West Garden before Boss", "Archipelagos Redux, Overworld Redux_upper"),
     # West Garden laurels exit
-    LadderInfo("West Garden", "Archipelagos Redux, Overworld Redux_lowest"),
+    LadderInfo("West Garden after Terry", "Archipelagos Redux, Overworld Redux_lowest"),
+    # Magic dagger house, only relevant with combat logic on
+    LadderInfo("West Garden after Terry", "Archipelagos Redux, archipelagos_house_"),
 
     # Atoll, use the little ladder you fix at the beginning
     LadderInfo("Ruined Atoll", "Atoll Redux, Overworld Redux_lower"),
@@ -159,7 +161,8 @@ class LadderInfo(NamedTuple):
     LadderInfo("Quarry Back", "Quarry Redux, Monastery_back"),
 
     LadderInfo("Rooted Ziggurat Lower Back", "ziggurat2020_3, ziggurat2020_2_"),
-    LadderInfo("Rooted Ziggurat Lower Back", "Rooted Ziggurat Lower Front", dest_is_region=True),
+    LadderInfo("Rooted Ziggurat Lower Back", "Rooted Ziggurat Lower Entry", dest_is_region=True),
+    LadderInfo("Rooted Ziggurat Lower Back", "Rooted Ziggurat Lower Mid Checkpoint", dest_is_region=True),
 
     # Swamp to Overworld upper
     LadderInfo("Swamp Mid", "Swamp Redux 2, Overworld Redux_wall", "Ladders in Swamp"),
@@ -172,9 +175,9 @@ class LadderInfo(NamedTuple):
     LadderInfo("Beneath the Well Front", "Sewer, Overworld Redux_west_aqueduct", "Ladders in Well"),
     LadderInfo("Beneath the Well Front", "Beneath the Well Back", "Ladders in Well", dest_is_region=True),
     # go through the hexagon engraving above the vault door
-    LadderInfo("Frog's Domain", "frog cave main, Frog Stairs_Exit", "Ladders to Frog's Domain"),
+    LadderInfo("Frog's Domain Front", "frog cave main, Frog Stairs_Exit", "Ladders to Frog's Domain"),
     # the turret at the end here is not affected by enemy rando
-    LadderInfo("Frog's Domain", "Frog's Domain Back", "Ladders to Frog's Domain", dest_is_region=True),
+    LadderInfo("Frog's Domain Front", "Frog's Domain Back", "Ladders to Frog's Domain", dest_is_region=True),
     # todo: see if we can use that new laurels strat here
     # LadderInfo("Rooted Ziggurat Lower Back", "ziggurat2020_3, ziggurat2020_FTRoom_"),
     # go behind the cathedral to reach the door, pretty easily doable
diff --git a/worlds/tunic/locations.py b/worlds/tunic/locations.py
index 442e0c01446d..5ea309fb19d7 100644
--- a/worlds/tunic/locations.py
+++ b/worlds/tunic/locations.py
@@ -25,17 +25,17 @@ class TunicLocationData(NamedTuple):
     "Beneath the Well - [Side Room] Chest By Phrends": TunicLocationData("Beneath the Well", "Beneath the Well Back"),
     "Beneath the Well - [Second Room] Page": TunicLocationData("Beneath the Well", "Beneath the Well Main"),
     "Dark Tomb Checkpoint - [Passage To Dark Tomb] Page Pickup": TunicLocationData("Overworld", "Dark Tomb Checkpoint"),
-    "Cathedral - [1F] Guarded By Lasers": TunicLocationData("Cathedral", "Cathedral"),
-    "Cathedral - [1F] Near Spikes": TunicLocationData("Cathedral", "Cathedral"),
-    "Cathedral - [2F] Bird Room": TunicLocationData("Cathedral", "Cathedral"),
-    "Cathedral - [2F] Entryway Upper Walkway": TunicLocationData("Cathedral", "Cathedral"),
-    "Cathedral - [1F] Library": TunicLocationData("Cathedral", "Cathedral"),
-    "Cathedral - [2F] Library": TunicLocationData("Cathedral", "Cathedral"),
-    "Cathedral - [2F] Guarded By Lasers": TunicLocationData("Cathedral", "Cathedral"),
-    "Cathedral - [2F] Bird Room Secret": TunicLocationData("Cathedral", "Cathedral"),
-    "Cathedral - [1F] Library Secret": TunicLocationData("Cathedral", "Cathedral"),
+    "Cathedral - [1F] Guarded By Lasers": TunicLocationData("Cathedral", "Cathedral Main"),
+    "Cathedral - [1F] Near Spikes": TunicLocationData("Cathedral", "Cathedral Entry"),  # entry because special rules
+    "Cathedral - [2F] Bird Room": TunicLocationData("Cathedral", "Cathedral Main"),
+    "Cathedral - [2F] Entryway Upper Walkway": TunicLocationData("Cathedral", "Cathedral Main"),
+    "Cathedral - [1F] Library": TunicLocationData("Cathedral", "Cathedral Entry"),
+    "Cathedral - [2F] Library": TunicLocationData("Cathedral", "Cathedral Main"),
+    "Cathedral - [2F] Guarded By Lasers": TunicLocationData("Cathedral", "Cathedral Main"),
+    "Cathedral - [2F] Bird Room Secret": TunicLocationData("Cathedral", "Cathedral Main"),
+    "Cathedral - [1F] Library Secret": TunicLocationData("Cathedral", "Cathedral Entry"),
     "Dark Tomb - Spike Maze Near Exit": TunicLocationData("Dark Tomb", "Dark Tomb Main"),
-    "Dark Tomb - 2nd Laser Room": TunicLocationData("Dark Tomb", "Dark Tomb Main"),
+    "Dark Tomb - 2nd Laser Room": TunicLocationData("Dark Tomb", "Dark Tomb Dark Exit"),
     "Dark Tomb - 1st Laser Room": TunicLocationData("Dark Tomb", "Dark Tomb Main"),
     "Dark Tomb - Spike Maze Upper Walkway": TunicLocationData("Dark Tomb", "Dark Tomb Main"),
     "Dark Tomb - Skulls Chest": TunicLocationData("Dark Tomb", "Dark Tomb Upper"),
@@ -81,25 +81,25 @@ class TunicLocationData(NamedTuple):
     "Eastern Vault Fortress - [East Wing] Bombable Wall": TunicLocationData("Eastern Vault Fortress", "Eastern Vault Fortress"),
     "Eastern Vault Fortress - [West Wing] Page Pickup": TunicLocationData("Eastern Vault Fortress", "Eastern Vault Fortress"),
     "Fortress Grave Path - Upper Walkway": TunicLocationData("Eastern Vault Fortress", "Fortress Grave Path Upper"),
-    "Fortress Grave Path - Chest Right of Grave": TunicLocationData("Eastern Vault Fortress", "Fortress Grave Path"),
-    "Fortress Grave Path - Obscured Chest Left of Grave": TunicLocationData("Eastern Vault Fortress", "Fortress Grave Path"),
+    "Fortress Grave Path - Chest Right of Grave": TunicLocationData("Eastern Vault Fortress", "Fortress Grave Path by Grave"),
+    "Fortress Grave Path - Obscured Chest Left of Grave": TunicLocationData("Eastern Vault Fortress", "Fortress Grave Path by Grave"),
     "Hero's Grave - Flowers Relic": TunicLocationData("Eastern Vault Fortress", "Hero Relic - Fortress"),
     "Beneath the Fortress - Bridge": TunicLocationData("Beneath the Vault", "Beneath the Vault Back"),
     "Beneath the Fortress - Cell Chest 1": TunicLocationData("Beneath the Vault", "Beneath the Vault Back"),
     "Beneath the Fortress - Obscured Behind Waterfall": TunicLocationData("Beneath the Vault", "Beneath the Vault Main"),
     "Beneath the Fortress - Back Room Chest": TunicLocationData("Beneath the Vault", "Beneath the Vault Back"),
     "Beneath the Fortress - Cell Chest 2": TunicLocationData("Beneath the Vault", "Beneath the Vault Back"),
-    "Frog's Domain - Near Vault": TunicLocationData("Frog's Domain", "Frog's Domain"),
-    "Frog's Domain - Slorm Room": TunicLocationData("Frog's Domain", "Frog's Domain"),
+    "Frog's Domain - Near Vault": TunicLocationData("Frog's Domain", "Frog's Domain Main"),
+    "Frog's Domain - Slorm Room": TunicLocationData("Frog's Domain", "Frog's Domain Main"),
     "Frog's Domain - Escape Chest": TunicLocationData("Frog's Domain", "Frog's Domain Back"),
-    "Frog's Domain - Grapple Above Hot Tub": TunicLocationData("Frog's Domain", "Frog's Domain"),
-    "Frog's Domain - Above Vault": TunicLocationData("Frog's Domain", "Frog's Domain"),
-    "Frog's Domain - Main Room Top Floor": TunicLocationData("Frog's Domain", "Frog's Domain"),
-    "Frog's Domain - Main Room Bottom Floor": TunicLocationData("Frog's Domain", "Frog's Domain"),
-    "Frog's Domain - Side Room Secret Passage": TunicLocationData("Frog's Domain", "Frog's Domain"),
-    "Frog's Domain - Side Room Chest": TunicLocationData("Frog's Domain", "Frog's Domain"),
-    "Frog's Domain - Side Room Grapple Secret": TunicLocationData("Frog's Domain", "Frog's Domain"),
-    "Frog's Domain - Magic Orb Pickup": TunicLocationData("Frog's Domain", "Frog's Domain"),
+    "Frog's Domain - Grapple Above Hot Tub": TunicLocationData("Frog's Domain", "Frog's Domain Front"),
+    "Frog's Domain - Above Vault": TunicLocationData("Frog's Domain", "Frog's Domain Front"),
+    "Frog's Domain - Main Room Top Floor": TunicLocationData("Frog's Domain", "Frog's Domain Main"),
+    "Frog's Domain - Main Room Bottom Floor": TunicLocationData("Frog's Domain", "Frog's Domain Main"),
+    "Frog's Domain - Side Room Secret Passage": TunicLocationData("Frog's Domain", "Frog's Domain Main"),
+    "Frog's Domain - Side Room Chest": TunicLocationData("Frog's Domain", "Frog's Domain Main"),
+    "Frog's Domain - Side Room Grapple Secret": TunicLocationData("Frog's Domain", "Frog's Domain Front"),
+    "Frog's Domain - Magic Orb Pickup": TunicLocationData("Frog's Domain", "Frog's Domain Main"),
     "Librarian - Hexagon Green": TunicLocationData("Library", "Library Arena", location_group="Bosses"),
     "Library Hall - Holy Cross Chest": TunicLocationData("Library", "Library Hall", location_group="Holy Cross"),
     "Library Lab - Chest By Shrine 2": TunicLocationData("Library", "Library Lab"),
@@ -131,7 +131,7 @@ class TunicLocationData(NamedTuple):
     "Overworld - [Southwest] West Beach Guarded By Turret": TunicLocationData("Overworld", "Overworld Beach"),
     "Overworld - [Southwest] Chest Guarded By Turret": TunicLocationData("Overworld", "Overworld"),
     "Overworld - [Northwest] Shadowy Corner Chest": TunicLocationData("Overworld", "Overworld"),
-    "Overworld - [Southwest] Obscured In Tunnel To Beach": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - [Southwest] Obscured In Tunnel To Beach": TunicLocationData("Overworld", "Overworld Tunnel to Beach"),
     "Overworld - [Southwest] Grapple Chest Over Walkway": TunicLocationData("Overworld", "Overworld"),
     "Overworld - [Northwest] Chest Beneath Quarry Gate": TunicLocationData("Overworld", "Overworld after Envoy"),
     "Overworld - [Southeast] Chest Near Swamp": TunicLocationData("Overworld", "Overworld Swamp Lower Entry"),
@@ -158,7 +158,7 @@ class TunicLocationData(NamedTuple):
     "Overworld - [Northwest] Page on Pillar by Dark Tomb": TunicLocationData("Overworld", "Overworld"),
     "Overworld - [Northwest] Fire Wand Pickup": TunicLocationData("Overworld", "Upper Overworld"),
     "Overworld - [West] Page On Teleporter": TunicLocationData("Overworld", "Overworld"),
-    "Overworld - [Northwest] Page By Well": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - [Northwest] Page By Well": TunicLocationData("Overworld", "Overworld Well Entry Area"),
     "Patrol Cave - Normal Chest": TunicLocationData("Overworld", "Patrol Cave"),
     "Ruined Shop - Chest 1": TunicLocationData("Overworld", "Ruined Shop"),
     "Ruined Shop - Chest 2": TunicLocationData("Overworld", "Ruined Shop"),
@@ -233,17 +233,17 @@ class TunicLocationData(NamedTuple):
     "Quarry - [Lowlands] Upper Walkway": TunicLocationData("Lower Quarry", "Even Lower Quarry"),
     "Quarry - [West] Lower Area Below Bridge": TunicLocationData("Lower Quarry", "Lower Quarry"),
     "Quarry - [West] Lower Area Isolated Chest": TunicLocationData("Lower Quarry", "Lower Quarry"),
-    "Quarry - [Lowlands] Near Elevator": TunicLocationData("Lower Quarry", "Even Lower Quarry"),
+    "Quarry - [Lowlands] Near Elevator": TunicLocationData("Lower Quarry", "Even Lower Quarry Isolated Chest"),
     "Quarry - [West] Lower Area After Bridge": TunicLocationData("Lower Quarry", "Lower Quarry"),
     "Rooted Ziggurat Upper - Near Bridge Switch": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Upper Front"),
     "Rooted Ziggurat Upper - Beneath Bridge To Administrator": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Upper Back"),
     "Rooted Ziggurat Tower - Inside Tower": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Middle Top"),
-    "Rooted Ziggurat Lower - Near Corpses": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Front"),
-    "Rooted Ziggurat Lower - Spider Ambush": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Front"),
-    "Rooted Ziggurat Lower - Left Of Checkpoint Before Fuse": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Front"),
-    "Rooted Ziggurat Lower - After Guarded Fuse": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Front"),
+    "Rooted Ziggurat Lower - Near Corpses": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Entry"),
+    "Rooted Ziggurat Lower - Spider Ambush": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Entry"),
+    "Rooted Ziggurat Lower - Left Of Checkpoint Before Fuse": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Mid Checkpoint"),
+    "Rooted Ziggurat Lower - After Guarded Fuse": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Mid Checkpoint"),
     "Rooted Ziggurat Lower - Guarded By Double Turrets": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Front"),
-    "Rooted Ziggurat Lower - After 2nd Double Turret Chest": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Front"),
+    "Rooted Ziggurat Lower - After 2nd Double Turret Chest": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Mid Checkpoint"),
     "Rooted Ziggurat Lower - Guarded By Double Turrets 2": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Front"),
     "Rooted Ziggurat Lower - Hexagon Blue": TunicLocationData("Rooted Ziggurat", "Rooted Ziggurat Lower Back", location_group="Bosses"),
     "Ruined Atoll - [West] Near Kevin Block": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
@@ -290,26 +290,26 @@ class TunicLocationData(NamedTuple):
     "Hero's Grave - Feathers Relic": TunicLocationData("Swamp", "Hero Relic - Swamp"),
     "West Furnace - Chest": TunicLocationData("West Garden", "Furnace Walking Path"),
     "Overworld - [West] Near West Garden Entrance": TunicLocationData("West Garden", "Overworld to West Garden from Furnace"),
-    "West Garden - [Central Highlands] Holy Cross (Blue Lines)": TunicLocationData("West Garden", "West Garden", location_group="Holy Cross"),
-    "West Garden - [West Lowlands] Tree Holy Cross Chest": TunicLocationData("West Garden", "West Garden", location_group="Holy Cross"),
-    "West Garden - [Southeast Lowlands] Outside Cave": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [Central Lowlands] Chest Beneath Faeries": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [North] Behind Holy Cross Door": TunicLocationData("West Garden", "West Garden", location_group="Holy Cross"),
-    "West Garden - [Central Highlands] Top of Ladder Before Boss": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [Central Lowlands] Passage Beneath Bridge": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [North] Across From Page Pickup": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [Central Lowlands] Below Left Walkway": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [West] In Flooded Walkway": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [West] Past Flooded Walkway": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [North] Obscured Beneath Hero's Memorial": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [Central Lowlands] Chest Near Shortcut Bridge": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [West Highlands] Upper Left Walkway": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [Central Lowlands] Chest Beneath Save Point": TunicLocationData("West Garden", "West Garden"),
-    "West Garden - [Central Highlands] Behind Guard Captain": TunicLocationData("West Garden", "West Garden"),
+    "West Garden - [Central Highlands] Holy Cross (Blue Lines)": TunicLocationData("West Garden", "West Garden before Boss", location_group="Holy Cross"),
+    "West Garden - [West Lowlands] Tree Holy Cross Chest": TunicLocationData("West Garden", "West Garden after Terry", location_group="Holy Cross"),
+    "West Garden - [Southeast Lowlands] Outside Cave": TunicLocationData("West Garden", "West Garden at Dagger House"),
+    "West Garden - [Central Lowlands] Chest Beneath Faeries": TunicLocationData("West Garden", "West Garden South Checkpoint"),
+    "West Garden - [North] Behind Holy Cross Door": TunicLocationData("West Garden", "West Garden before Terry", location_group="Holy Cross"),
+    "West Garden - [Central Highlands] Top of Ladder Before Boss": TunicLocationData("West Garden", "West Garden before Boss"),
+    "West Garden - [Central Lowlands] Passage Beneath Bridge": TunicLocationData("West Garden", "West Garden after Terry"),
+    "West Garden - [North] Across From Page Pickup": TunicLocationData("West Garden", "West Garden before Terry"),
+    "West Garden - [Central Lowlands] Below Left Walkway": TunicLocationData("West Garden", "West Garden after Terry"),
+    "West Garden - [West] In Flooded Walkway": TunicLocationData("West Garden", "West Garden after Terry"),
+    "West Garden - [West] Past Flooded Walkway": TunicLocationData("West Garden", "West Garden after Terry"),
+    "West Garden - [North] Obscured Beneath Hero's Memorial": TunicLocationData("West Garden", "West Garden before Terry"),
+    "West Garden - [Central Lowlands] Chest Near Shortcut Bridge": TunicLocationData("West Garden", "West Garden after Terry"),
+    "West Garden - [West Highlands] Upper Left Walkway": TunicLocationData("West Garden", "West Garden South Checkpoint"),
+    "West Garden - [Central Lowlands] Chest Beneath Save Point": TunicLocationData("West Garden", "West Garden South Checkpoint"),
+    "West Garden - [Central Highlands] Behind Guard Captain": TunicLocationData("West Garden", "West Garden before Boss"),
     "West Garden - [Central Highlands] After Garden Knight": TunicLocationData("Overworld", "West Garden after Boss", location_group="Bosses"),
-    "West Garden - [South Highlands] Secret Chest Beneath Fuse": TunicLocationData("West Garden", "West Garden"),
+    "West Garden - [South Highlands] Secret Chest Beneath Fuse": TunicLocationData("West Garden", "West Garden South Checkpoint"),
     "West Garden - [East Lowlands] Page Behind Ice Dagger House": TunicLocationData("West Garden", "West Garden Portal Item"),
-    "West Garden - [North] Page Pickup": TunicLocationData("West Garden", "West Garden"),
+    "West Garden - [North] Page Pickup": TunicLocationData("West Garden", "West Garden before Terry"),
     "West Garden House - [Southeast Lowlands] Ice Dagger Pickup": TunicLocationData("West Garden", "Magic Dagger House"),
     "Hero's Grave - Effigy Relic": TunicLocationData("West Garden", "Hero Relic - West Garden"),
 }
diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index f1d53362f4c9..24247a6cfdcf 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -168,6 +168,22 @@ class TunicPlandoConnections(PlandoConnections):
     duplicate_exits = True
 
 
+class CombatLogic(Choice):
+    """
+    If enabled, the player will logically require a combination of stat upgrade items and equipment to get some checks or navigate to some areas, with a goal of matching the vanilla combat difficulty.
+    The player may still be expected to run past enemies, reset aggro (by using a checkpoint or doing a scene transition), or find sneaky paths to checks.
+    This option marks many more items as progression and may force weapons much earlier than normal.
+    Bosses Only makes it so that additional combat logic is only added to the boss fights and the Gauntlet.
+    If disabled, the standard, looser logic is used. The standard logic does not include stat upgrades, just minimal weapon requirements, such as requiring a Sword or Magic Wand for Quarry, or not requiring a weapon for Swamp.
+    """
+    internal_name = "combat_logic"
+    display_name = "More Combat Logic"
+    option_off = 0
+    option_bosses_only = 1
+    option_on = 2
+    default = 0
+
+
 class LaurelsZips(Toggle):
     """
     Choose whether to include using the Hero's Laurels to zip through gates, doors, and tricky spots.
@@ -259,6 +275,7 @@ class TunicOptions(PerGameCommonOptions):
     hexagon_goal: HexagonGoal
     extra_hexagon_percentage: ExtraHexagonPercentage
     laurels_location: LaurelsLocation
+    combat_logic: CombatLogic
     lanternless: Lanternless
     maskless: Maskless
     laurels_zips: LaurelsZips
@@ -272,6 +289,7 @@ class TunicOptions(PerGameCommonOptions):
 
 tunic_option_groups = [
     OptionGroup("Logic Options", [
+        CombatLogic,
         Lanternless,
         Maskless,
         LaurelsZips,
diff --git a/worlds/tunic/rules.py b/worlds/tunic/rules.py
index 58c987acbcee..30b7cee9d07b 100644
--- a/worlds/tunic/rules.py
+++ b/worlds/tunic/rules.py
@@ -56,9 +56,8 @@ def has_ability(ability: str, state: CollectionState, world: "TunicWorld") -> bo
 
 
 # a check to see if you can whack things in melee at all
-def has_stick(state: CollectionState, player: int) -> bool:
-    return (state.has("Stick", player) or state.has("Sword Upgrade", player, 1)
-            or state.has("Sword", player))
+def has_melee(state: CollectionState, player: int) -> bool:
+    return state.has_any({"Stick", "Sword", "Sword Upgrade"}, player)
 
 
 def has_sword(state: CollectionState, player: int) -> bool:
@@ -83,7 +82,7 @@ def can_ladder_storage(state: CollectionState, world: "TunicWorld") -> bool:
         return False
     if world.options.ladder_storage_without_items:
         return True
-    return has_stick(state, world.player) or state.has_any((grapple, shield), world.player)
+    return has_melee(state, world.player) or state.has_any((grapple, shield), world.player)
 
 
 def has_mask(state: CollectionState, world: "TunicWorld") -> bool:
@@ -101,7 +100,7 @@ def set_region_rules(world: "TunicWorld") -> None:
     world.get_entrance("Overworld -> Overworld Holy Cross").access_rule = \
         lambda state: has_ability(holy_cross, state, world)
     world.get_entrance("Overworld -> Beneath the Well").access_rule = \
-        lambda state: has_stick(state, player) or state.has(fire_wand, player)
+        lambda state: has_melee(state, player) or state.has(fire_wand, player)
     world.get_entrance("Overworld -> Dark Tomb").access_rule = \
         lambda state: has_lantern(state, world)
     # laurels in, ladder storage in through the furnace, or ice grapple down the belltower
@@ -117,7 +116,7 @@ def set_region_rules(world: "TunicWorld") -> None:
     world.get_entrance("Overworld -> Beneath the Vault").access_rule = \
         lambda state: (has_lantern(state, world) and has_ability(prayer, state, world)
                        # there's some boxes in the way
-                       and (has_stick(state, player) or state.has_any((gun, grapple, fire_wand), player)))
+                       and (has_melee(state, player) or state.has_any((gun, grapple, fire_wand), player)))
     world.get_entrance("Ruined Atoll -> Library").access_rule = \
         lambda state: state.has_any({grapple, laurels}, player) and has_ability(prayer, state, world)
     world.get_entrance("Overworld -> Quarry").access_rule = \
@@ -237,7 +236,7 @@ def set_location_rules(world: "TunicWorld") -> None:
              or (has_lantern(state, world) and (has_sword(state, player) or state.has(fire_wand, player)))
              or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world))
     set_rule(world.get_location("West Furnace - Lantern Pickup"),
-             lambda state: has_stick(state, player) or state.has_any({fire_wand, laurels}, player))
+             lambda state: has_melee(state, player) or state.has_any({fire_wand, laurels}, player))
 
     set_rule(world.get_location("Secret Gathering Place - 10 Fairy Reward"),
              lambda state: state.has(fairies, player, 10))
@@ -301,18 +300,18 @@ def set_location_rules(world: "TunicWorld") -> None:
 
     # Library Lab
     set_rule(world.get_location("Library Lab - Page 1"),
-             lambda state: has_stick(state, player) or state.has_any((fire_wand, gun), player))
+             lambda state: has_melee(state, player) or state.has_any((fire_wand, gun), player))
     set_rule(world.get_location("Library Lab - Page 2"),
-             lambda state: has_stick(state, player) or state.has_any((fire_wand, gun), player))
+             lambda state: has_melee(state, player) or state.has_any((fire_wand, gun), player))
     set_rule(world.get_location("Library Lab - Page 3"),
-             lambda state: has_stick(state, player) or state.has_any((fire_wand, gun), player))
+             lambda state: has_melee(state, player) or state.has_any((fire_wand, gun), player))
 
     # Eastern Vault Fortress
     # yes, you can clear the leaves with dagger
     # gun isn't included since it can only break one leaf pile at a time, and we don't check how much mana you have
     # but really, I expect the player to just throw a bomb at them if they don't have melee
     set_rule(world.get_location("Fortress Leaf Piles - Secret Chest"),
-             lambda state: state.has(laurels, player) and (has_stick(state, player) or state.has(ice_dagger, player)))
+             lambda state: state.has(laurels, player) and (has_melee(state, player) or state.has(ice_dagger, player)))
     set_rule(world.get_location("Fortress Arena - Siege Engine/Vault Key Pickup"),
              lambda state: has_sword(state, player)
              and (has_ability(prayer, state, world)
@@ -324,9 +323,9 @@ def set_location_rules(world: "TunicWorld") -> None:
 
     # Beneath the Vault
     set_rule(world.get_location("Beneath the Fortress - Bridge"),
-             lambda state: has_stick(state, player) or state.has_any({laurels, fire_wand}, player))
+             lambda state: has_melee(state, player) or state.has_any({laurels, fire_wand}, player))
     set_rule(world.get_location("Beneath the Fortress - Obscured Behind Waterfall"),
-             lambda state: has_stick(state, player) and has_lantern(state, world))
+             lambda state: has_melee(state, player) and has_lantern(state, world))
 
     # Quarry
     set_rule(world.get_location("Quarry - [Central] Above Ladder Dash Chest"),
diff --git a/worlds/tunic/test/test_access.py b/worlds/tunic/test/test_access.py
index bbceb7468ff3..24551a13d547 100644
--- a/worlds/tunic/test/test_access.py
+++ b/worlds/tunic/test/test_access.py
@@ -3,6 +3,8 @@
 
 
 class TestAccess(TunicTestBase):
+    options = {options.CombatLogic.internal_name: options.CombatLogic.option_off}
+
     # test whether you can get into the temple without laurels
     def test_temple_access(self) -> None:
         self.collect_all_but(["Hero's Laurels", "Lantern"])
@@ -61,7 +63,9 @@ def test_normal_goal(self) -> None:
 class TestER(TunicTestBase):
     options = {options.EntranceRando.internal_name: options.EntranceRando.option_yes,
                options.AbilityShuffling.internal_name: options.AbilityShuffling.option_true,
-               options.HexagonQuest.internal_name: options.HexagonQuest.option_false}
+               options.HexagonQuest.internal_name: options.HexagonQuest.option_false,
+               options.CombatLogic.internal_name: options.CombatLogic.option_off,
+               options.FixedShop.internal_name: options.FixedShop.option_true}
 
     def test_overworld_hc_chest(self) -> None:
         # test to see that static connections are working properly -- this chest requires holy cross and is in Overworld

From d1823a21ea891c8d949cc0a5371059b265ff0cb4 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sun, 15 Dec 2024 16:48:44 -0500
Subject: [PATCH 173/381] HK: add random handling to plandocharmcosts (#4327)

---
 worlds/hk/Options.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py
index 02f04ab18eef..0dc38e744e50 100644
--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -294,6 +294,10 @@ def get_costs(self, random_source: Random) -> typing.List[int]:
             return charms
 
 
+class CharmCost(Range):
+    range_end = 6
+
+
 class PlandoCharmCosts(OptionDict):
     """Allows setting a Charm's Notch costs directly, mapping {name: cost}.
     This is set after any random Charm Notch costs, if applicable."""
@@ -303,6 +307,27 @@ class PlandoCharmCosts(OptionDict):
         Optional(name): And(int, lambda n: 6 >= n >= 0, error="Charm costs must be integers in the range 0-6.") for name in charm_names
         })
 
+    def __init__(self, value):
+        # To handle keys of random like other options, create an option instance from their values
+        # Additionally a vanilla keyword is added to plando individual charms to vanilla costs
+        # and default is disabled so as to not cause confusion
+        self.value = {}
+        for key, data in value.items():
+            if isinstance(data, str):
+                if data.lower() == "vanilla" and key in self.valid_keys:
+                    self.value[key] = vanilla_costs[charm_names.index(key)]
+                    continue
+                elif data.lower() == "default":
+                    # default is too easily confused with vanilla but actually 0
+                    # skip CharmCost resolution to fail schema afterwords
+                    self.value[key] = data
+                    continue
+            try:
+                self.value[key] = CharmCost.from_any(data).value
+            except ValueError as ex:
+                # will fail schema afterwords
+                self.value[key] = data
+
     def get_costs(self, charm_costs: typing.List[int]) -> typing.List[int]:
         for name, cost in self.value.items():
             charm_costs[charm_names.index(name)] = cost

From 728d2492020ee3f75d421a7263308c6feb64e56a Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sun, 15 Dec 2024 23:30:35 +0100
Subject: [PATCH 174/381] Core: Add some more world convenience methods (#3021)

* Add some more convenience methods

* Typing stuff

* Rename the method

* beauxq's suggestions

* Back to Push Precollected
---
 worlds/AutoWorld.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py
index ded8701d3b61..a51071792079 100644
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -7,7 +7,7 @@
 import time
 from random import Random
 from dataclasses import make_dataclass
-from typing import (Any, Callable, ClassVar, Dict, FrozenSet, List, Mapping, Optional, Set, TextIO, Tuple,
+from typing import (Any, Callable, ClassVar, Dict, FrozenSet, Iterable, List, Mapping, Optional, Set, TextIO, Tuple,
                     TYPE_CHECKING, Type, Union)
 
 from Options import item_and_loc_options, ItemsAccessibility, OptionGroup, PerGameCommonOptions
@@ -534,12 +534,24 @@ def create_filler(self) -> "Item":
     def get_location(self, location_name: str) -> "Location":
         return self.multiworld.get_location(location_name, self.player)
 
+    def get_locations(self) -> "Iterable[Location]":
+        return self.multiworld.get_locations(self.player)
+
     def get_entrance(self, entrance_name: str) -> "Entrance":
         return self.multiworld.get_entrance(entrance_name, self.player)
 
+    def get_entrances(self) -> "Iterable[Entrance]":
+        return self.multiworld.get_entrances(self.player)
+
     def get_region(self, region_name: str) -> "Region":
         return self.multiworld.get_region(region_name, self.player)
 
+    def get_regions(self) -> "Iterable[Region]":
+        return self.multiworld.get_regions(self.player)
+
+    def push_precollected(self, item: Item) -> None:
+        self.multiworld.push_precollected(item)
+
     @property
     def player_name(self) -> str:
         return self.multiworld.get_player_name(self.player)

From cacab68b779a28f8401c5a3a34d26d609054bd75 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Mon, 16 Dec 2024 00:06:48 -0800
Subject: [PATCH 175/381] Pokemon Emerald: Remove unnecessary code (#4364)

---
 worlds/pokemon_emerald/data.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/worlds/pokemon_emerald/data.py b/worlds/pokemon_emerald/data.py
index 34bebae2d66a..cd1becf44b22 100644
--- a/worlds/pokemon_emerald/data.py
+++ b/worlds/pokemon_emerald/data.py
@@ -1459,9 +1459,6 @@ def _init() -> None:
     for warp, destination in extracted_data["warps"].items():
         data.warp_map[warp] = None if destination == "" else destination
 
-        if encoded_warp not in data.warp_map:
-            data.warp_map[encoded_warp] = None
-
     # Create trainer data
     for i, trainer_json in enumerate(extracted_data["trainers"]):
         party_json = trainer_json["party"]

From 1ded7b2fd4486d116a8f86c19fb1eb3be210a021 Mon Sep 17 00:00:00 2001
From: Louis M <prog@tioui.com>
Date: Thu, 19 Dec 2024 20:17:56 -0500
Subject: [PATCH 176/381] Aquaria: Replacing the release link to the latest
 link (#4381)

* Replacing the release link to the latest link

* The fr link was not working
---
 worlds/aquaria/docs/setup_en.md | 4 ++--
 worlds/aquaria/docs/setup_fr.md | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/worlds/aquaria/docs/setup_en.md b/worlds/aquaria/docs/setup_en.md
index 8177725ded64..b5a71f1ab5f1 100644
--- a/worlds/aquaria/docs/setup_en.md
+++ b/worlds/aquaria/docs/setup_en.md
@@ -3,11 +3,11 @@
 ## Required Software
 
 - The original Aquaria Game (purchasable from most online game stores)
-- The [Aquaria randomizer](https://github.com/tioui/Aquaria_Randomizer/releases)
+- The [Aquaria randomizer](https://github.com/tioui/Aquaria_Randomizer/releases/latest)
 
 ## Optional Software
  
-- For sending [commands](/tutorial/Archipelago/commands/en) like `!hint`: the TextClient from [the most recent Archipelago release](https://github.com/ArchipelagoMW/Archipelago/releases)
+- For sending [commands](/tutorial/Archipelago/commands/en) like `!hint`: the TextClient from [the most recent Archipelago release](https://github.com/ArchipelagoMW/Archipelago/releases/latest)
 - [Aquaria AP Tracker](https://github.com/palex00/aquaria-ap-tracker/releases/latest), for use with
 [PopTracker](https://github.com/black-sliver/PopTracker/releases/latest)
 
diff --git a/worlds/aquaria/docs/setup_fr.md b/worlds/aquaria/docs/setup_fr.md
index 66b6d6119708..7433dc5dce36 100644
--- a/worlds/aquaria/docs/setup_fr.md
+++ b/worlds/aquaria/docs/setup_fr.md
@@ -3,12 +3,11 @@
 ## Logiciels nécessaires
 
 - Une copie du jeu Aquaria non-modifiée (disponible sur la majorité des sites de ventes de jeux vidéos en ligne)
-- Le client du Randomizer d'Aquaria [Aquaria randomizer]
-(https://github.com/tioui/Aquaria_Randomizer/releases)
+- Le client du Randomizer d'Aquaria [Aquaria randomizer](https://github.com/tioui/Aquaria_Randomizer/releases/latest)
 
 ## Logiciels optionnels
 
-- De manière optionnel, pour pouvoir envoyer des [commandes](/tutorial/Archipelago/commands/en) comme `!hint`: utilisez le client texte de [la version la plus récente d'Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
+- De manière optionnel, pour pouvoir envoyer des [commandes](/tutorial/Archipelago/commands/en) comme `!hint`: utilisez le client texte de [la version la plus récente d'Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest)
 - [Aquaria AP Tracker](https://github.com/palex00/aquaria-ap-tracker/releases/latest), pour utiliser avec [PopTracker](https://github.com/black-sliver/PopTracker/releases/latest)
 
 ## Procédures d'installation et d'exécution

From 2e0769c90ec27f155c1de3f6141c641c1f9c341b Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Thu, 19 Dec 2024 20:30:41 -0500
Subject: [PATCH 177/381] Noita: Make greed die a trap (#4382)

Noita make greed die a trap
---
 worlds/noita/items.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/worlds/noita/items.py b/worlds/noita/items.py
index 1cb7d9601386..394bcdb5757f 100644
--- a/worlds/noita/items.py
+++ b/worlds/noita/items.py
@@ -53,6 +53,7 @@ def create_random_items(world: NoitaWorld, weights: Dict[str, int], count: int)
     filler_pool = weights.copy()
     if not world.options.bad_effects:
         del filler_pool["Trap"]
+        del filler_pool["Greed Die"]
 
     return world.random.choices(population=list(filler_pool.keys()),
                                 weights=list(filler_pool.values()),
@@ -114,7 +115,7 @@ def create_all_items(world: NoitaWorld) -> None:
     "Secret Potion":                        ItemData(110024, "Items", ItemClassification.filler),
     "Powder Pouch":                         ItemData(110025, "Items", ItemClassification.filler),
     "Chaos Die":                            ItemData(110026, "Items", ItemClassification.filler),
-    "Greed Die":                            ItemData(110027, "Items", ItemClassification.filler),
+    "Greed Die":                            ItemData(110027, "Items", ItemClassification.trap),
     "Kammi":                                ItemData(110028, "Items", ItemClassification.filler, 1),
     "Refreshing Gourd":                     ItemData(110029, "Items", ItemClassification.filler, 1),
     "Sädekivi":                             ItemData(110030, "Items", ItemClassification.filler),

From de3707af4a4090449a30d228e5b21c3169f30016 Mon Sep 17 00:00:00 2001
From: palex00 <32203971+palex00@users.noreply.github.com>
Date: Fri, 20 Dec 2024 02:47:33 +0100
Subject: [PATCH 178/381] Core/Docs: Adding apostrophe quotes around variables
 in printed error messages (#3914)

* Also indents plando_connections properly

* Adding apostrophe quotes around item, location, entrance/exit and boss names to make errors more readable

* Update plando_en.md

* Fixing test in Lufia II
---
 Options.py                                 | 30 +++++++++++-----------
 worlds/lufia2ac/test/TestCustomItemPool.py |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Options.py b/Options.py
index 4e26a0d56c5c..f4724e9747b0 100644
--- a/Options.py
+++ b/Options.py
@@ -496,7 +496,7 @@ class TextChoice(Choice):
 
     def __init__(self, value: typing.Union[str, int]):
         assert isinstance(value, str) or isinstance(value, int), \
-            f"{value} is not a valid option for {self.__class__.__name__}"
+            f"'{value}' is not a valid option for '{self.__class__.__name__}'"
         self.value = value
 
     @property
@@ -617,17 +617,17 @@ def validate_plando_bosses(cls, options: typing.List[str]) -> None:
                 used_locations.append(location)
                 used_bosses.append(boss)
                 if not cls.valid_boss_name(boss):
-                    raise ValueError(f"{boss.title()} is not a valid boss name.")
+                    raise ValueError(f"'{boss.title()}' is not a valid boss name.")
                 if not cls.valid_location_name(location):
-                    raise ValueError(f"{location.title()} is not a valid boss location name.")
+                    raise ValueError(f"'{location.title()}' is not a valid boss location name.")
                 if not cls.can_place_boss(boss, location):
-                    raise ValueError(f"{location.title()} is not a valid location for {boss.title()} to be placed.")
+                    raise ValueError(f"'{location.title()}' is not a valid location for {boss.title()} to be placed.")
             else:
                 if cls.duplicate_bosses:
                     if not cls.valid_boss_name(option):
-                        raise ValueError(f"{option} is not a valid boss name.")
+                        raise ValueError(f"'{option}' is not a valid boss name.")
                 else:
-                    raise ValueError(f"{option.title()} is not formatted correctly.")
+                    raise ValueError(f"'{option.title()}' is not formatted correctly.")
 
     @classmethod
     def can_place_boss(cls, boss: str, location: str) -> bool:
@@ -817,15 +817,15 @@ def verify(self, world: typing.Type[World], player_name: str, plando_options: "P
             for item_name in self.value:
                 if item_name not in world.item_names:
                     picks = get_fuzzy_results(item_name, world.item_names, limit=1)
-                    raise Exception(f"Item {item_name} from option {self} "
-                                    f"is not a valid item name from {world.game}. "
+                    raise Exception(f"Item '{item_name}' from option '{self}' "
+                                    f"is not a valid item name from '{world.game}'. "
                                     f"Did you mean '{picks[0][0]}' ({picks[0][1]}% sure)")
         elif self.verify_location_name:
             for location_name in self.value:
                 if location_name not in world.location_names:
                     picks = get_fuzzy_results(location_name, world.location_names, limit=1)
-                    raise Exception(f"Location {location_name} from option {self} "
-                                    f"is not a valid location name from {world.game}. "
+                    raise Exception(f"Location '{location_name}' from option '{self}' "
+                                    f"is not a valid location name from '{world.game}'. "
                                     f"Did you mean '{picks[0][0]}' ({picks[0][1]}% sure)")
 
     def __iter__(self) -> typing.Iterator[typing.Any]:
@@ -1111,11 +1111,11 @@ def validate_plando_connections(cls, connections: typing.Iterable[PlandoConnecti
             used_entrances.append(entrance)
             used_exits.append(exit)
             if not cls.validate_entrance_name(entrance):
-                raise ValueError(f"{entrance.title()} is not a valid entrance.")
+                raise ValueError(f"'{entrance.title()}' is not a valid entrance.")
             if not cls.validate_exit_name(exit):
-                raise ValueError(f"{exit.title()} is not a valid exit.")
+                raise ValueError(f"'{exit.title()}' is not a valid exit.")
             if not cls.can_connect(entrance, exit):
-                raise ValueError(f"Connection between {entrance.title()} and {exit.title()} is invalid.")
+                raise ValueError(f"Connection between '{entrance.title()}' and '{exit.title()}' is invalid.")
 
     @classmethod
     def from_any(cls, data: PlandoConFromAnyType) -> Self:
@@ -1379,8 +1379,8 @@ def verify_items(items: typing.List[str], item_link: str, pool_name: str, world,
                 picks_group = get_fuzzy_results(item_name, world.item_name_groups.keys(), limit=1)
                 picks_group = f" or '{picks_group[0][0]}' ({picks_group[0][1]}% sure)" if allow_item_groups else ""
 
-                raise Exception(f"Item {item_name} from item link {item_link} "
-                                f"is not a valid item from {world.game} for {pool_name}. "
+                raise Exception(f"Item '{item_name}' from item link '{item_link}' "
+                                f"is not a valid item from '{world.game}' for '{pool_name}'. "
                                 f"Did you mean '{picks[0][0]}' ({picks[0][1]}% sure){picks_group}")
             if allow_item_groups:
                 pool |= world.item_name_groups.get(item_name, {item_name})
diff --git a/worlds/lufia2ac/test/TestCustomItemPool.py b/worlds/lufia2ac/test/TestCustomItemPool.py
index 97d4cab2f296..33f72273daae 100644
--- a/worlds/lufia2ac/test/TestCustomItemPool.py
+++ b/worlds/lufia2ac/test/TestCustomItemPool.py
@@ -50,8 +50,8 @@ class TestVerifyItemName(L2ACTestBase):
 
     def test_verify_item_name(self) -> None:
         self.assertRaisesRegex(Exception,
-                               "Item The car blade from option CustomItemPool\\(The car blade: 2\\) is not a "
-                               "valid item name from Lufia II Ancient Cave\\. Did you mean 'Dekar blade'",
+                               "Item 'The car blade' from option 'CustomItemPool\\(The car blade: 2\\)' is not a "
+                               "valid item name from 'Lufia II Ancient Cave'\\. Did you mean 'Dekar blade'",
                                lambda: handle_option(Namespace(game="Lufia II Ancient Cave", name="Player"),
                                                      self.options, "custom_item_pool", CustomItemPool,
                                                      PlandoOptions(0)))

From e142283e649d7cba0431d297ee1b1ccfffce5483 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 19 Dec 2024 21:19:00 -0500
Subject: [PATCH 179/381] LADX: enable upstream options (#3962)

* enable some upstream settings

* flashing just disabled, no setting

* just enable fast text

* noflash and textmode as hidden options

* typo

* drop whitespace changes

* add hard mode to slot data

* textmode adjustments
fast text default (fixing mistake)
remove no text option (its buggy)

* unhide options

* Update worlds/ladx/Options.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* adjustments
---
 worlds/ladx/LADXR/settings.py |   2 +-
 worlds/ladx/Options.py        | 105 ++++++++++++++++++++++------------
 worlds/ladx/__init__.py       |  20 +++++--
 3 files changed, 87 insertions(+), 40 deletions(-)

diff --git a/worlds/ladx/LADXR/settings.py b/worlds/ladx/LADXR/settings.py
index 848d64390de3..a92b6c1e40f4 100644
--- a/worlds/ladx/LADXR/settings.py
+++ b/worlds/ladx/LADXR/settings.py
@@ -181,7 +181,7 @@ def __init__(self, ap_options):
             Setting('quickswap', 'User options', 'Q', 'Quickswap', options=[('none', '', 'Disabled'), ('a', 'a', 'Swap A button'), ('b', 'b', 'Swap B button')], default='none',
                 description='Adds that the select button swaps with either A or B. The item is swapped with the top inventory slot. The map is not available when quickswap is enabled.',
                 aesthetic=True),
-            Setting('textmode', 'User options', 'f', 'Text mode', options=[('fast', '', 'Fast'), ('default', 'd', 'Normal'), ('none', 'n', 'No-text')], default='fast',
+            Setting('textmode', 'User options', 'f', 'Text mode', options=[('fast', '', 'Fast'), ('normal', 'd', 'Normal'), ('none', 'n', 'No-text')], default='fast',
                 description="""[Fast] makes text appear twice as fast.
 [No-Text] removes all text from the game""", aesthetic=True),
             Setting('lowhpbeep', 'User options', 'p', 'Low HP beeps', options=[('none', 'D', 'Disabled'), ('slow', 'S', 'Slow'), ('default', 'N', 'Normal')], default='slow',
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index 17052659157f..afa29e4c28d3 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -278,11 +278,21 @@ class MusicChangeCondition(Choice):
 # [Start with 1] normal game, you just start with 1 heart instead of 3.
 # [Low max] replace heart containers with heart pieces."""),
 
-#             Setting('hardmode', 'Gameplay', 'X', 'Hard mode', options=[('none', '', 'Disabled'), ('oracle', 'O', 'Oracle'), ('hero', 'H', 'Hero'), ('ohko', '1', 'One hit KO')], default='none',
-#                 description="""
-# [Oracle] Less iframes and heath from drops. Bombs damage yourself. Water damages you without flippers. No piece of power or acorn.
-# [Hero] Switch version hero mode, double damage, no heart/fairy drops.
-# [One hit KO] You die on a single hit, always."""),
+
+class HardMode(Choice, LADXROption):
+    """
+    [Oracle] Less iframes and health from drops. Bombs damage yourself. Water damages you without flippers. No piece of power or acorn.
+    [Hero] Switch version hero mode, double damage, no heart/fairy drops.
+    [One hit KO] You die on a single hit, always.
+    """
+    display_name = "Hard Mode"
+    ladxr_name = "hardmode"
+    option_none = 0
+    option_oracle = 1
+    option_hero = 2
+    option_ohko = 3
+    default = option_none
+
 
 #             Setting('steal', 'Gameplay', 't', 'Stealing from the shop',
 #                 options=[('always', 'a', 'Always'), ('never', 'n', 'Never'), ('default', '', 'Normal')], default='default',
@@ -317,35 +327,50 @@ class Overworld(Choice, LADXROption):
 
 # Setting('superweapons', 'Special', 'q', 'Enable super weapons', default=False,
 #    description='All items will be more powerful, faster, harder, bigger stronger. You name it.'),
-# Setting('quickswap', 'User options', 'Q', 'Quickswap', options=[('none', '', 'Disabled'), ('a', 'a', 'Swap A button'), ('b', 'b', 'Swap B button')], default='none',
-#    description='Adds that the select button swaps with either A or B. The item is swapped with the top inventory slot. The map is not available when quickswap is enabled.',
-#    aesthetic=True),
-#             Setting('textmode', 'User options', 'f', 'Text mode', options=[('fast', '', 'Fast'), ('default', 'd', 'Normal'), ('none', 'n', 'No-text')], default='fast',
-#                 description="""[Fast] makes text appear twice as fast.
-# [No-Text] removes all text from the game""", aesthetic=True),
-#             Setting('lowhpbeep', 'User options', 'p', 'Low HP beeps', options=[('none', 'D', 'Disabled'), ('slow', 'S', 'Slow'), ('default', 'N', 'Normal')], default='slow',
-#                 description='Slows or disables the low health beeping sound', aesthetic=True),
-#             Setting('noflash', 'User options', 'l', 'Remove flashing lights', default=True,
-#                 description='Remove the flashing light effects from Mamu, shopkeeper and MadBatter. Useful for capture cards and people that are sensitive for these things.',
-#                 aesthetic=True),
-#             Setting('nagmessages', 'User options', 'S', 'Show nag messages', default=False,
-#                 description='Enables the nag messages normally shown when touching stones and crystals',
-#                 aesthetic=True),
-#             Setting('gfxmod', 'User options', 'c', 'Graphics', options=gfx_options, default='',
-#                 description='Generally affects at least Link\'s sprite, but can alter any graphics in the game',
-#                 aesthetic=True),
-#             Setting('linkspalette', 'User options', 'C', "Link's color",
-#                 options=[('-1', '-', 'Normal'), ('0', '0', 'Green'), ('1', '1', 'Yellow'), ('2', '2', 'Red'), ('3', '3', 'Blue'),
-#                          ('4', '4', '?? A'), ('5', '5', '?? B'), ('6', '6', '?? C'), ('7', '7', '?? D')], default='-1', aesthetic=True,
-#                 description="""Allows you to force a certain color on link.
-# [Normal] color of link depends on the tunic.
-# [Green/Yellow/Red/Blue] forces link into one of these colors.
-# [?? A/B/C/D] colors of link are usually inverted and color depends on the area you are in."""),
-#             Setting('music', 'User options', 'M', 'Music', options=[('', '', 'Default'), ('random', 'r', 'Random'), ('off', 'o', 'Disable')], default='',
-#                 description="""
-# [Random] Randomizes overworld and dungeon music'
-# [Disable] no music in the whole game""",
-#                 aesthetic=True),
+
+
+class Quickswap(Choice, LADXROption):
+    """
+    Adds that the SELECT button swaps with either A or B. The item is swapped with the top inventory slot. The map is not available when quickswap is enabled.
+    """
+    display_name = "Quickswap"
+    ladxr_name = "quickswap"
+    option_none = 0
+    option_a = 1
+    option_b = 2
+    default = option_none
+
+
+class TextMode(Choice, LADXROption):
+    """
+    [Fast] Makes text appear twice as fast
+    """
+    display_name = "Text Mode"
+    ladxr_name = "textmode"
+    option_normal = 0
+    option_fast = 1
+    default = option_fast
+
+
+class LowHpBeep(Choice, LADXROption):
+    """
+    Slows or disables the low health beeping sound.
+    """
+    display_name = "Low HP Beep"
+    ladxr_name = "lowhpbeep"
+    option_default = 0
+    option_slow = 1
+    option_none = 2
+    default = option_default
+
+
+class NoFlash(DefaultOnToggle, LADXROption):
+    """
+    Remove the flashing light effects from Mamu, shopkeeper and MadBatter. Useful for capture cards and people that are sensitive to these things.
+    """
+    display_name = "No Flash"
+    ladxr_name = "noflash"
+
 
 class BootsControls(Choice):
     """
@@ -540,6 +565,8 @@ class ForeignItemIcons(Choice):
         TrendyGame,
         InGameHints,
         NagMessages,
+        Quickswap,
+        HardMode,
         BootsControls
     ]),
     OptionGroup("Experimental", [
@@ -554,7 +581,10 @@ class ForeignItemIcons(Choice):
         APTitleScreen,
         GfxMod,
         Music,
-        MusicChangeCondition
+        MusicChangeCondition,
+        LowHpBeep,
+        TextMode,
+        NoFlash,
     ])
 ]
 
@@ -597,6 +627,11 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     nag_messages: NagMessages
     ap_title_screen: APTitleScreen
     boots_controls: BootsControls
+    quickswap: Quickswap
+    hard_mode: HardMode
+    low_hp_beep: LowHpBeep
+    text_mode: TextMode
+    no_flash: NoFlash
     in_game_hints: InGameHints
 
     warp_improvements: Removed
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 8496d4cf49e3..b416bfd0bfc1 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -514,10 +514,22 @@ def fill_slot_data(self):
             slot_options = ["instrument_count"]
 
             slot_options_display_name = [
-                "goal", "logic", "tradequest", "rooster",
-                "experimental_dungeon_shuffle", "experimental_entrance_shuffle", "trendy_game", "gfxmod",
-                "shuffle_nightmare_keys", "shuffle_small_keys", "shuffle_maps",
-                "shuffle_compasses", "shuffle_stone_beaks", "shuffle_instruments", "nag_messages"
+                "goal",
+                "logic",
+                "tradequest",
+                "rooster",
+                "experimental_dungeon_shuffle",
+                "experimental_entrance_shuffle",
+                "trendy_game",
+                "gfxmod",
+                "shuffle_nightmare_keys",
+                "shuffle_small_keys",
+                "shuffle_maps",
+                "shuffle_compasses",
+                "shuffle_stone_beaks",
+                "shuffle_instruments",
+                "nag_messages",
+                "hard_mode",
             ]
 
             # use the default behaviour to grab options

From 4f71073d174c58c7418b83e2f46960fd1ccc9fd3 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 19 Dec 2024 22:17:41 -0500
Subject: [PATCH 180/381] LADX: correct in-game check counter

LADX: correct in-game check counter
---
 worlds/ladx/LADXR/patches/bank3e.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/worlds/ladx/LADXR/patches/bank3e.py b/worlds/ladx/LADXR/patches/bank3e.py
index 632fffa7e63e..8195bf3ff3f6 100644
--- a/worlds/ladx/LADXR/patches/bank3e.py
+++ b/worlds/ladx/LADXR/patches/bank3e.py
@@ -96,7 +96,9 @@ def get_asm(name):
         ldi  [hl], a ;hour counter
 
         ld   hl, $B010
+        ld   a, $01  ;tarin's gift gets skipped for some reason, so inflate count by 1
         ldi  [hl], a ;check counter low
+        xor  a
         ldi  [hl], a ;check counter high
 
         ; Show the normal message

From 35d30442f70ddaebadb3617a97e2841dc27bda2d Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 19 Dec 2024 22:53:58 -0500
Subject: [PATCH 181/381] LADX: fix for syntax warning (#4376)

* init

* whitespace

* raw string instead
---
 LinksAwakeningClient.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LinksAwakeningClient.py b/LinksAwakeningClient.py
index 298788098d9e..aede742b82a0 100644
--- a/LinksAwakeningClient.py
+++ b/LinksAwakeningClient.py
@@ -235,7 +235,7 @@ async def async_read_memory_safe(self, address, size=1):
 
     def check_command_response(self, command: str, response: bytes):
         if command == "VERSION":
-            ok = re.match("\d+\.\d+\.\d+", response.decode('ascii')) is not None
+            ok = re.match(r"\d+\.\d+\.\d+", response.decode('ascii')) is not None
         else:
             ok = response.startswith(command.encode())
         if not ok:

From 7c8d102c1760b519dfdc2fd5143849cc4db162e6 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Thu, 19 Dec 2024 23:45:29 -0500
Subject: [PATCH 182/381] TUNIC: Logic for bushes in guard house 2 upper and
 belltower (#4371)

* Logic for bushes in guard house 2 upper

* Fix typo

* also do it for forest belltower

* i love the dumb ice grapples
---
 worlds/tunic/er_data.py   | 25 +++++++++++++++++++------
 worlds/tunic/er_rules.py  | 25 +++++++++++++++++++++++--
 worlds/tunic/locations.py |  2 +-
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/worlds/tunic/er_data.py b/worlds/tunic/er_data.py
index 9794f4a87b67..1dc06d586d6f 100644
--- a/worlds/tunic/er_data.py
+++ b/worlds/tunic/er_data.py
@@ -175,7 +175,7 @@ def destination_scene(self) -> str:  # the vanilla connection
     Portal(name="Temple Door Exit", region="Sealed Temple",
            destination="Overworld Redux", tag="_main"),
 
-    Portal(name="Forest Belltower to Fortress", region="Forest Belltower Main",
+    Portal(name="Forest Belltower to Fortress", region="Forest Belltower Main behind bushes",
            destination="Fortress Courtyard", tag="_"),
     Portal(name="Forest Belltower to Forest", region="Forest Belltower Lower",
            destination="East Forest Redux", tag="_"),
@@ -221,7 +221,7 @@ def destination_scene(self) -> str:  # the vanilla connection
 
     Portal(name="Guard House 2 Lower Exit", region="Guard House 2 Lower",
            destination="East Forest Redux", tag="_lower"),
-    Portal(name="Guard House 2 Upper Exit", region="Guard House 2 Upper",
+    Portal(name="Guard House 2 Upper Exit", region="Guard House 2 Upper before bushes",
            destination="East Forest Redux", tag="_upper"),
 
     Portal(name="Guard Captain Room Non-Gate Exit", region="Forest Boss Room",
@@ -601,6 +601,7 @@ class DeadEnd(IntEnum):
     "Sealed Temple Rafters": RegionInfo("Temple"),
     "Forest Belltower Upper": RegionInfo("Forest Belltower"),
     "Forest Belltower Main": RegionInfo("Forest Belltower"),
+    "Forest Belltower Main behind bushes": RegionInfo("Forest Belltower"),
     "Forest Belltower Lower": RegionInfo("Forest Belltower"),
     "East Forest": RegionInfo("East Forest Redux"),
     "East Forest Dance Fox Spot": RegionInfo("East Forest Redux"),
@@ -608,7 +609,8 @@ class DeadEnd(IntEnum):
     "Lower Forest": RegionInfo("East Forest Redux"),  # bottom of the forest
     "Guard House 1 East": RegionInfo("East Forest Redux Laddercave"),
     "Guard House 1 West": RegionInfo("East Forest Redux Laddercave"),
-    "Guard House 2 Upper": RegionInfo("East Forest Redux Interior"),
+    "Guard House 2 Upper before bushes": RegionInfo("East Forest Redux Interior"),
+    "Guard House 2 Upper after bushes": RegionInfo("East Forest Redux Interior"),
     "Guard House 2 Lower": RegionInfo("East Forest Redux Interior"),
     "Forest Boss Room": RegionInfo("Forest Boss Room"),
     "Forest Grave Path Main": RegionInfo("Sword Access"),
@@ -1026,6 +1028,12 @@ class DeadEnd(IntEnum):
     "Forest Belltower Main": {
         "Forest Belltower Lower":
             [],
+        "Forest Belltower Main behind bushes":
+            [],
+    },
+    "Forest Belltower Main behind bushes": {
+        "Forest Belltower Main":
+            [],
     },
 
     "East Forest": {
@@ -1057,13 +1065,18 @@ class DeadEnd(IntEnum):
         "Guard House 1 East":
             [["Hyperdash"], ["LS1"]],
     },
-
-    "Guard House 2 Upper": {
+    "Guard House 2 Upper before bushes": {
+        "Guard House 2 Upper after bushes":
+            [],
+    },
+    "Guard House 2 Upper after bushes": {
         "Guard House 2 Lower":
             [],
+        "Guard House 2 Upper before bushes":
+            [],
     },
     "Guard House 2 Lower": {
-        "Guard House 2 Upper":
+        "Guard House 2 Upper after bushes":
             [],
     },
 
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index 163523108345..6e9ae551dba2 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -40,6 +40,12 @@ def can_shop(state: CollectionState, world: "TunicWorld") -> bool:
     return has_sword(state, world.player) and state.can_reach_region("Shop", world.player)
 
 
+# for the ones that are not early bushes where ER can screw you over a bit
+def can_get_past_bushes(state: CollectionState, world: "TunicWorld") -> bool:
+    # add in glass cannon + stick for grass rando
+    return has_sword(state, world.player) or state.has_any((fire_wand, laurels, gun), world.player)
+
+
 def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_pairs: Dict[Portal, Portal]) -> None:
     player = world.player
     options = world.options
@@ -437,6 +443,14 @@ def get_paired_portal(portal_sd: str) -> Tuple[str, str]:
         connecting_region=regions["Forest Belltower Lower"],
         rule=lambda state: has_ladder("Ladder to East Forest", state, world))
 
+    regions["Forest Belltower Main behind bushes"].connect(
+        connecting_region=regions["Forest Belltower Main"],
+        rule=lambda state: can_get_past_bushes(state, world)
+        or has_ice_grapple_logic(False, IceGrappling.option_easy, state, world))
+    # you can use the slimes to break the bushes
+    regions["Forest Belltower Main"].connect(
+        connecting_region=regions["Forest Belltower Main behind bushes"])
+
     # ice grapple up to dance fox spot, and vice versa
     regions["East Forest"].connect(
         connecting_region=regions["East Forest Dance Fox Spot"],
@@ -467,11 +481,18 @@ def get_paired_portal(portal_sd: str) -> Tuple[str, str]:
         connecting_region=regions["Guard House 1 East"],
         rule=lambda state: state.has(laurels, player))
 
-    regions["Guard House 2 Upper"].connect(
+    regions["Guard House 2 Upper before bushes"].connect(
+        connecting_region=regions["Guard House 2 Upper after bushes"],
+        rule=lambda state: can_get_past_bushes(state, world))
+    regions["Guard House 2 Upper after bushes"].connect(
+        connecting_region=regions["Guard House 2 Upper before bushes"],
+        rule=lambda state: can_get_past_bushes(state, world))
+
+    regions["Guard House 2 Upper after bushes"].connect(
         connecting_region=regions["Guard House 2 Lower"],
         rule=lambda state: has_ladder("Ladders to Lower Forest", state, world))
     regions["Guard House 2 Lower"].connect(
-        connecting_region=regions["Guard House 2 Upper"],
+        connecting_region=regions["Guard House 2 Upper after bushes"],
         rule=lambda state: has_ladder("Ladders to Lower Forest", state, world))
 
     # ice grapple from upper grave path exit to the rest of it
diff --git a/worlds/tunic/locations.py b/worlds/tunic/locations.py
index 5ea309fb19d7..c44852e8aab8 100644
--- a/worlds/tunic/locations.py
+++ b/worlds/tunic/locations.py
@@ -41,7 +41,7 @@ class TunicLocationData(NamedTuple):
     "Dark Tomb - Skulls Chest": TunicLocationData("Dark Tomb", "Dark Tomb Upper"),
     "Dark Tomb - Spike Maze Near Stairs": TunicLocationData("Dark Tomb", "Dark Tomb Main"),
     "Dark Tomb - 1st Laser Room Obscured": TunicLocationData("Dark Tomb", "Dark Tomb Main"),
-    "Guardhouse 2 - Upper Floor": TunicLocationData("East Forest", "Guard House 2 Upper"),
+    "Guardhouse 2 - Upper Floor": TunicLocationData("East Forest", "Guard House 2 Upper after bushes"),
     "Guardhouse 2 - Bottom Floor Secret": TunicLocationData("East Forest", "Guard House 2 Lower"),
     "Guardhouse 1 - Upper Floor Obscured": TunicLocationData("East Forest", "Guard House 1 East"),
     "Guardhouse 1 - Upper Floor": TunicLocationData("East Forest", "Guard House 1 East"),

From e1a1cd10678ce4170a6ae5b609db815c516af193 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Fri, 20 Dec 2024 07:55:32 -0500
Subject: [PATCH 183/381] LADX: Open Mabe Option (#3964)

* open mabe option
swaps east mabe rocks for bushes

* add open mabe to slot data

* use upstream overworld option
Instead of a standalone option, use upstream's "overworld" option, which we don't use yet but it leaves better space for the future

* use ladxr_setting for consistency

* newline
---
 worlds/ladx/LADXR/generator.py         |  9 ++++----
 worlds/ladx/LADXR/logic/overworld.py   |  7 +++++-
 worlds/ladx/LADXR/patches/maptweaks.py |  9 ++++++++
 worlds/ladx/LADXR/settings.py          |  2 +-
 worlds/ladx/Options.py                 | 30 ++++++++++++--------------
 worlds/ladx/__init__.py                |  1 +
 6 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index 046b51815cba..ff6cc06c39a9 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -58,7 +58,6 @@
 
 from .patches import bank34
 from .utils import formatText
-from ..Options import TrendyGame, Palette, Warps
 from .roomEditor import RoomEditor, Object
 from .patches.aesthetics import rgb_to_bin, bin_to_rgb
 
@@ -66,7 +65,7 @@
 
 from BaseClasses import ItemClassification
 from ..Locations import LinksAwakeningLocation
-from ..Options import TrendyGame, Palette, MusicChangeCondition, BootsControls
+from ..Options import TrendyGame, Palette, MusicChangeCondition, Warps
 
 if TYPE_CHECKING:
     from .. import LinksAwakeningWorld
@@ -156,6 +155,8 @@ def generateRom(args, world: "LinksAwakeningWorld"):
     if not world.ladxr_settings.rooster:
         patches.maptweaks.tweakMap(rom)
         patches.maptweaks.tweakBirdKeyRoom(rom)
+    if world.ladxr_settings.overworld == "openmabe":
+        patches.maptweaks.openMabe(rom)
     patches.chest.fixChests(rom)
     patches.shop.fixShop(rom)
     patches.rooster.patchRooster(rom)
@@ -247,7 +248,7 @@ def generateRom(args, world: "LinksAwakeningWorld"):
         patches.core.quickswap(rom, 1)
     elif world.ladxr_settings.quickswap == 'b':
         patches.core.quickswap(rom, 0)
-    
+
     patches.core.addBootsControls(rom, world.options.boots_controls)
 
 
@@ -397,7 +398,7 @@ def gen_hint():
             # Then put new text in
             for bucket_idx, (orig_idx, data) in enumerate(bucket):
                 rom.texts[shuffled[bucket_idx][0]] = data
-    
+
 
     if world.options.trendy_game != TrendyGame.option_normal:
 
diff --git a/worlds/ladx/LADXR/logic/overworld.py b/worlds/ladx/LADXR/logic/overworld.py
index 54da90f8931d..a85a97ae6451 100644
--- a/worlds/ladx/LADXR/logic/overworld.py
+++ b/worlds/ladx/LADXR/logic/overworld.py
@@ -144,7 +144,12 @@ def __init__(self, options, world_setup, r):
         self._addEntrance("moblin_cave", graveyard, moblin_cave, None)
 
         # "Ukuku Prairie"
-        ukuku_prairie = Location().connect(mabe_village, POWER_BRACELET).connect(graveyard, POWER_BRACELET)
+        ukuku_prairie = Location()
+        if options.overworld == "openmabe":
+            ukuku_prairie.connect(mabe_village, r.bush)
+        else:
+            ukuku_prairie.connect(mabe_village, POWER_BRACELET)
+        ukuku_prairie.connect(graveyard, POWER_BRACELET)
         ukuku_prairie.connect(Location().add(TradeSequenceItem(0x07B, TRADING_ITEM_STICK)), TRADING_ITEM_BANANAS)
         ukuku_prairie.connect(Location().add(TradeSequenceItem(0x087, TRADING_ITEM_HONEYCOMB)), TRADING_ITEM_STICK)
         self._addEntrance("prairie_left_phone", ukuku_prairie, None, None)
diff --git a/worlds/ladx/LADXR/patches/maptweaks.py b/worlds/ladx/LADXR/patches/maptweaks.py
index 8a5171b3540d..2d69f79cebc8 100644
--- a/worlds/ladx/LADXR/patches/maptweaks.py
+++ b/worlds/ladx/LADXR/patches/maptweaks.py
@@ -38,3 +38,12 @@ def tweakBirdKeyRoom(rom):
     re.moveObject(2, 5, 3, 6)
     re.addEntity(3, 5, 0x9D)
     re.store(rom)
+
+
+def openMabe(rom):
+    # replaces rocks on east side of Mabe Village with bushes
+    re = RoomEditor(rom, 0x094)
+    re.changeObject(5, 1, 0x5C)
+    re.overlay[5 + 1 * 10] = 0x5C
+    re.overlay[5 + 2 * 10] = 0x5C
+    re.store(rom)
diff --git a/worlds/ladx/LADXR/settings.py b/worlds/ladx/LADXR/settings.py
index a92b6c1e40f4..3b8407c147d1 100644
--- a/worlds/ladx/LADXR/settings.py
+++ b/worlds/ladx/LADXR/settings.py
@@ -169,7 +169,7 @@ def __init__(self, ap_options):
 [Never] you can never steal from the shop."""),
             Setting('bowwow', 'Special', 'g', 'Good boy mode', options=[('normal', '', 'Disabled'), ('always', 'a', 'Enabled'), ('swordless', 's', 'Enabled (swordless)')], default='normal',
                 description='Allows BowWow to be taken into any area, damage bosses and more enemies. If enabled you always start with bowwow. Swordless option removes the swords from the game and requires you to beat the game without a sword and just bowwow.'),
-            Setting('overworld', 'Special', 'O', 'Overworld', options=[('normal', '', 'Normal'), ('dungeondive', 'D', 'Dungeon dive'), ('nodungeons', 'N', 'No dungeons'), ('random', 'R', 'Randomized')], default='normal',
+            Setting('overworld', 'Special', 'O', 'Overworld', options=[('normal', '', 'Normal'), ('dungeondive', 'D', 'Dungeon dive'), ('nodungeons', 'N', 'No dungeons'), ('random', 'R', 'Randomized'), ('openmabe', 'M', 'Open Mabe')], default='normal',
                 description="""
 [Dungeon Dive] Create a different overworld where all the dungeons are directly accessible and almost no chests are located in the overworld.
 [No dungeons] All dungeons only consist of a boss fight and a instrument reward. Rest of the dungeon is removed.
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index afa29e4c28d3..d92bd931867d 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -57,7 +57,7 @@ class TextShuffle(DefaultOffToggle):
 
 class Rooster(DefaultOnToggle, LADXROption):
     """
-    [On] Adds the rooster to the item pool. 
+    [On] Adds the rooster to the item pool.
     [Off] The rooster spot is still a check giving an item. But you will never find the rooster. In that case, any rooster spot is accessible without rooster by other means.
     """
     display_name = "Rooster"
@@ -70,7 +70,7 @@ class Boomerang(Choice):
     [Gift] The boomerang salesman will give you a random item, and the boomerang is shuffled.
     """
     display_name = "Boomerang"
-    
+
     normal = 0
     gift = 1
     default = gift
@@ -156,7 +156,7 @@ class ShuffleSmallKeys(DungeonItemShuffle):
     [Own Dungeons] The item will be within a dungeon in your world
     [Own World] The item will be somewhere in your world
     [Any World] The item could be anywhere
-    [Different World] The item will be somewhere in another world 
+    [Different World] The item will be somewhere in another world
     """
     display_name = "Shuffle Small Keys"
     ladxr_item = "KEY"
@@ -223,7 +223,7 @@ class Goal(Choice, LADXROption):
     The Goal of the game
     [Instruments] The Wind Fish's Egg will only open if you have the required number of Instruments of the Sirens, and play the Ballad of the Wind Fish.
     [Seashells] The Egg will open when you bring 20 seashells. The Ballad and Ocarina are not needed.
-    [Open] The Egg will start pre-opened.  
+    [Open] The Egg will start pre-opened.
     """
     display_name = "Goal"
     ladxr_name = "goal"
@@ -313,15 +313,12 @@ class Bowwow(Choice):
 
 class Overworld(Choice, LADXROption):
     """
-    [Dungeon Dive] Create a different overworld where all the dungeons are directly accessible and almost no chests are located in the overworld.
-    [Tiny dungeons] All dungeons only consist of a boss fight and a instrument reward. Rest of the dungeon is removed.
+    [Open Mabe] Replaces rock on the east side of Mabe Village with bushes, allowing access to Ukuku Prairie without Power Bracelet.
     """
     display_name = "Overworld"
     ladxr_name = "overworld"
     option_normal = 0
-    option_dungeon_dive = 1
-    option_tiny_dungeons = 2
-    # option_shuffled = 3
+    option_open_mabe = 1
     default = option_normal
 
 
@@ -472,7 +469,7 @@ def to_ladxr_option(self, all_options):
 
 class Palette(Choice):
     """
-    Sets the palette for the game. 
+    Sets the palette for the game.
     Note: A few places aren't patched, such as the menu and a few color dungeon tiles.
     [Normal] The vanilla palette
     [1-Bit] One bit of color per channel
@@ -530,7 +527,6 @@ class InGameHints(DefaultOnToggle):
     display_name = "In-game Hints"
 
 
-
 class ForeignItemIcons(Choice):
     """
     Choose how to display foreign items.
@@ -562,6 +558,7 @@ class ForeignItemIcons(Choice):
     OptionGroup("Miscellaneous", [
         TradeQuest,
         Rooster,
+        Overworld,
         TrendyGame,
         InGameHints,
         NagMessages,
@@ -591,12 +588,12 @@ class ForeignItemIcons(Choice):
 @dataclass
 class LinksAwakeningOptions(PerGameCommonOptions):
     logic: Logic
-    # 'heartpiece': DefaultOnToggle, # description='Includes heart pieces in the item pool'),                
-    # 'seashells': DefaultOnToggle, # description='Randomizes the secret sea shells hiding in the ground/trees. (chest are always randomized)'),                
-    # 'heartcontainers': DefaultOnToggle, # description='Includes boss heart container drops in the item pool'),                
-    # 'instruments': DefaultOffToggle, # description='Instruments are placed on random locations, dungeon goal will just contain a random item.'),                
+    # 'heartpiece': DefaultOnToggle, # description='Includes heart pieces in the item pool'),
+    # 'seashells': DefaultOnToggle, # description='Randomizes the secret sea shells hiding in the ground/trees. (chest are always randomized)'),
+    # 'heartcontainers': DefaultOnToggle, # description='Includes boss heart container drops in the item pool'),
+    # 'instruments': DefaultOffToggle, # description='Instruments are placed on random locations, dungeon goal will just contain a random item.'),
     tradequest: TradeQuest  # description='Trade quest items are randomized, each NPC takes its normal trade quest item, but gives a random item'),
-    # 'witch': DefaultOnToggle, # description='Adds both the toadstool and the reward for giving the toadstool to the witch to the item pool'),                
+    # 'witch': DefaultOnToggle, # description='Adds both the toadstool and the reward for giving the toadstool to the witch to the item pool'),
     rooster: Rooster  # description='Adds the rooster to the item pool. Without this option, the rooster spot is still a check giving an item. But you will never find the rooster. Any rooster spot is accessible without rooster by other means.'),
     # 'boomerang': Boomerang,
     # 'randomstartlocation': DefaultOffToggle, # 'Randomize where your starting house is located'),
@@ -633,6 +630,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     text_mode: TextMode
     no_flash: NoFlash
     in_game_hints: InGameHints
+    overworld: Overworld
 
     warp_improvements: Removed
     additional_warp_points: Removed
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index b416bfd0bfc1..b8de6da812df 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -530,6 +530,7 @@ def fill_slot_data(self):
                 "shuffle_instruments",
                 "nag_messages",
                 "hard_mode",
+                "overworld",
             ]
 
             # use the default behaviour to grab options

From 46613adceb4c34676f1bbda29b0fe2960667c19a Mon Sep 17 00:00:00 2001
From: Kaito Sinclaire <ks@rosenthalcastle.org>
Date: Sat, 21 Dec 2024 11:39:38 -0800
Subject: [PATCH 184/381] SMZ3: Fix minimal logic considering SM boss tokens
 unnecessary (#4377)

---
 worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py | 3 ++-
 worlds/smz3/__init__.py                            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py b/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py
index 42933b9f2fd5..e17d7072258c 100644
--- a/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py
+++ b/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py
@@ -140,7 +140,8 @@ def CanEnter(self, items: Progression):
 
     # added for AP completion_condition when TowerCrystals is lower than GanonCrystals
     def CanComplete(self, items: Progression):
-        return self.world.CanAcquireAtLeast(self.world.GanonCrystals, items, RewardType.AnyCrystal)
+        return self.world.CanAcquireAtLeast(self.world.GanonCrystals, items, RewardType.AnyCrystal) and \
+            self.world.CanAcquireAtLeast(self.world.TourianBossTokens, items, RewardType.AnyBossToken)
 
     def CanFill(self, item: Item):
         if (self.Config.Multiworld):
diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index 838db1f7e745..5998db8e6579 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -230,7 +230,7 @@ def create_items(self):
         self.multiworld.itempool += itemPool
 
     def set_rules(self):
-        # SM G4 is logically required to access Ganon's Tower in SMZ3
+        # SM G4 is logically required to complete Ganon's Tower
         self.multiworld.completion_condition[self.player] = lambda state: \
             self.smz3World.GetRegion("Ganon's Tower").CanEnter(state.smz3state[self.player]) and \
             self.smz3World.GetRegion("Ganon's Tower").TowerAscend(state.smz3state[self.player]) and \

From 4f590cdf7b5aa2be95e4ed9cf7c7be95443456e8 Mon Sep 17 00:00:00 2001
From: DrBibop <58860289+DrBibop@users.noreply.github.com>
Date: Sat, 21 Dec 2024 17:12:35 -0500
Subject: [PATCH 185/381] Inscryption: Implement new game (#3621)

* Worked locally before that so this is a lot of work . So, initial push

* Changes in init with better create_regions (Thanks to Phar on discord). Add a rule for victory. Change the regions list to remove menu in the destination.

* Added tests for location rules and changed rule locations to lists instead of sets

* Fixed game var in InscryptionLocation

* Fixed location access by using the same system from The Messenger

* Remove unuse rules in init and add region rules. Add all the act 2 locations and items.

* Add locations rule for the left of the bridge in act 2

* Added test for bridge requirement and added a dash to locationfor clarity

* Added more act 2 rules and removed completion rule

* Created docs for website, added Salmon Card item, marked multiple items as "progression", renamed tomb checks, added more location rules, re-added completion rule

* Renamed tower bath check to "Tentacle", added monocle as requirement for some checks, adjusted setup doc a bit

* Added tentacle to monocle test

* Added forest burrow chest rule

* Switch the two clock location because the id was swapped and screwed with the logic

* Added Ancient Obol rule and adjusted docs

* Added act 3 locations/items/rules/tests

* Added drone & battery to trader rules

* Fixed tutorial docs, added more act 3 rules, renamed holo pelt locations

* Add an option for the optional death card feature

* Added well check and quill item, added rules and tests

* Renamed Gems module and Gems drone

* Added slot data options

* Added rule for act 3 middle pelt

* Added option for randomize ability and uptade the randomize deck option to fit the new setup

* Added randomize ability in slot data

* Added more requirements for mycologists boss since it's pretty much an impossible fight early on

* Finished the french translation of the installation guide

* Changed the french title in the guide

* Added goal option and tests associated to it + fixed goal requirement missing quill

* Added goal option to docs and removed references to the now discarded API mod. Fixed some french translations.

* Added ourobot item + renamed some goal settings

* Fixed locations and items for act 1 goal

* Added skip tutorial option. Cleanup and rename of some options. Added tower requirement for Mycologist Key check. Fixed missing comma in act 2 locations oopsies.

* Added missing rules for Extra Battery, Nano Armor and Goobert's painting

* Added act 1 deathlink behaviour and epitaph pieces randomization options + made pieces progressive + adjusted docs

* Fixed some docs typos

* Added act 3 clock rule. Paintings 2, 3 and Goobert's painting can no longer contain progression items.

* New options system and fixed act 1 goal option breaking

* Added skip epilogue and painting checks balancing options. Renamed randomize abilities to randomize sigils. Fixed generation issue with epitaph pieces randomization. Goobert's painting no longer forces filler. Removed traps option for now. Reworded some option descriptions.

* Attempting type fix for python 3.8

* Attempting type fix for python 3.8 again

* Added starting only option for randomize deck

* Fixed arbitrary rule error

* Import fix attempt

* Migrated to DeathLinkMixin instead of creating a custom DeathLink option, cleaned up imports, renamed Death Link related options to include "death_link" instead of "deathlink", replaced numeral values for option checking into class attributes for readability, slight optimization to tower rule, fixed typo in codes option description.

* Added bug report page to web class, condensed pelt rules to one function, added items/locations count in game docs and adjusted some sections

* Added Inscryption to CODEOWNERS

* Implemented a bunch of suggestions: Better handling of painting option, options as dict for slot data, remove redundant auto_display_name, use of has_all, better goal tests, demote skink card to filler if goal is act 1 and force filler on paintings

* Makes clover plant and squirrel head progression items if paintings are balanced + fixed other issues

* filler items, start inventory from pool, '->"

* Fix bleeding issue

* Copy the list instead

* Fixed bleeding using proper deep copy

* Remove unnecessary for loops in tests

* Add defaults to choice options

---------

Co-authored-by: Benjamin Gregoire <benjamingregoire@outlook.com>
Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 README.md                                 |   1 +
 docs/CODEOWNERS                           |   3 +
 worlds/inscryption/Items.py               | 158 ++++++++++++++++
 worlds/inscryption/Locations.py           | 127 +++++++++++++
 worlds/inscryption/Options.py             | 137 ++++++++++++++
 worlds/inscryption/Regions.py             |  14 ++
 worlds/inscryption/Rules.py               | 181 ++++++++++++++++++
 worlds/inscryption/__init__.py            | 144 ++++++++++++++
 worlds/inscryption/docs/en_Inscryption.md |  22 +++
 worlds/inscryption/docs/setup_en.md       |  65 +++++++
 worlds/inscryption/docs/setup_fr.md       |  67 +++++++
 worlds/inscryption/test/TestAccess.py     | 221 ++++++++++++++++++++++
 worlds/inscryption/test/TestGoal.py       | 108 +++++++++++
 worlds/inscryption/test/__init__.py       |   7 +
 14 files changed, 1255 insertions(+)
 create mode 100644 worlds/inscryption/Items.py
 create mode 100644 worlds/inscryption/Locations.py
 create mode 100644 worlds/inscryption/Options.py
 create mode 100644 worlds/inscryption/Regions.py
 create mode 100644 worlds/inscryption/Rules.py
 create mode 100644 worlds/inscryption/__init__.py
 create mode 100644 worlds/inscryption/docs/en_Inscryption.md
 create mode 100644 worlds/inscryption/docs/setup_en.md
 create mode 100644 worlds/inscryption/docs/setup_fr.md
 create mode 100644 worlds/inscryption/test/TestAccess.py
 create mode 100644 worlds/inscryption/test/TestGoal.py
 create mode 100644 worlds/inscryption/test/__init__.py

diff --git a/README.md b/README.md
index 36b7a07fb4b3..d60f1b96651f 100644
--- a/README.md
+++ b/README.md
@@ -79,6 +79,7 @@ Currently, the following games are supported:
 * Faxanadu
 * Saving Princess
 * Castlevania: Circle of the Moon
+* Inscryption
 
 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 8b39f96068af..d58207806743 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -81,6 +81,9 @@
 # Hylics 2
 /worlds/hylics2/ @TRPG0
 
+# Inscryption
+/worlds/inscryption/ @DrBibop @Glowbuzz
+
 # Kirby's Dream Land 3
 /worlds/kdl3/ @Silvris
 
diff --git a/worlds/inscryption/Items.py b/worlds/inscryption/Items.py
new file mode 100644
index 000000000000..7600830ac9e2
--- /dev/null
+++ b/worlds/inscryption/Items.py
@@ -0,0 +1,158 @@
+from BaseClasses import ItemClassification
+from typing import TypedDict, List
+
+from BaseClasses import Item
+
+
+base_id = 147000
+
+
+class InscryptionItem(Item):
+    name: str = "Inscryption"
+
+
+class ItemDict(TypedDict):
+    name: str
+    count: int
+    classification: ItemClassification
+
+
+act1_items: List[ItemDict] = [
+    {'name': "Stinkbug Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Stunted Wolf Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Wardrobe Key",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Skink Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Ant Cards",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Caged Wolf Card",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Squirrel Totem Head",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Dagger",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Film Roll",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Ring",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Magnificus Eye",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Oil Painting's Clover Plant",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Extra Candle",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Bee Figurine",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Greater Smoke",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Angler Hook",
+     'count': 1,
+     'classification': ItemClassification.useful}
+]
+
+
+act2_items: List[ItemDict] = [
+    {'name': "Camera Replica",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Pile Of Meat",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Epitaph Piece",
+     'count': 9,
+     'classification': ItemClassification.progression},
+    {'name': "Epitaph Pieces",
+     'count': 3,
+     'classification': ItemClassification.progression},
+    {'name': "Monocle",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Bone Lord Femur",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Bone Lord Horn",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Bone Lord Holo Key",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Mycologists Holo Key",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Ancient Obol",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Great Kraken Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Drowned Soul Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Salmon Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Dock's Clover Plant",
+     'count': 1,
+     'classification': ItemClassification.useful}
+]
+
+
+act3_items: List[ItemDict] = [
+    {'name': "Extra Battery",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Nano Armor Generator",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Mrs. Bomb's Remote",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Inspectometer Battery",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Gems Module",
+     'count': 1,
+     'classification': ItemClassification.progression},
+    {'name': "Lonely Wizbot Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Fishbot Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Ourobot Card",
+     'count': 1,
+     'classification': ItemClassification.useful},
+    {'name': "Holo Pelt",
+     'count': 5,
+     'classification': ItemClassification.progression},
+    {'name': "Quill",
+     'count': 1,
+     'classification': ItemClassification.progression},
+]
+
+filler_items: List[ItemDict] = [
+    {'name': "Currency",
+     'count': 1,
+     'classification': ItemClassification.filler},
+    {'name': "Card Pack",
+     'count': 1,
+     'classification': ItemClassification.filler}
+]
diff --git a/worlds/inscryption/Locations.py b/worlds/inscryption/Locations.py
new file mode 100644
index 000000000000..aa124c23e06b
--- /dev/null
+++ b/worlds/inscryption/Locations.py
@@ -0,0 +1,127 @@
+from typing import Dict, List
+
+from BaseClasses import Location
+
+base_id = 147000
+
+
+class InscryptionLocation(Location):
+    game: str = "Inscryption"
+
+
+act1_locations = [
+    "Act 1 - Boss Prospector",
+    "Act 1 - Boss Angler",
+    "Act 1 - Boss Trapper",
+    "Act 1 - Boss Leshy",
+    "Act 1 - Safe",
+    "Act 1 - Clock Main Compartment",
+    "Act 1 - Clock Upper Compartment",
+    "Act 1 - Dagger",
+    "Act 1 - Wardrobe Drawer 1",
+    "Act 1 - Wardrobe Drawer 2",
+    "Act 1 - Wardrobe Drawer 3",
+    "Act 1 - Wardrobe Drawer 4",
+    "Act 1 - Magnificus Eye",
+    "Act 1 - Painting 1",
+    "Act 1 - Painting 2",
+    "Act 1 - Painting 3",
+    "Act 1 - Greater Smoke"
+]
+
+act2_locations = [
+    "Act 2 - Boss Leshy",
+    "Act 2 - Boss Magnificus",
+    "Act 2 - Boss Grimora",
+    "Act 2 - Boss P03",
+    "Act 2 - Battle Prospector",
+    "Act 2 - Battle Angler",
+    "Act 2 - Battle Trapper",
+    "Act 2 - Battle Sawyer",
+    "Act 2 - Battle Royal",
+    "Act 2 - Battle Kaycee",
+    "Act 2 - Battle Goobert",
+    "Act 2 - Battle Pike Mage",
+    "Act 2 - Battle Lonely Wizard",
+    "Act 2 - Battle Inspector",
+    "Act 2 - Battle Melter",
+    "Act 2 - Battle Dredger",
+    "Act 2 - Dock Chest",
+    "Act 2 - Forest Cabin Chest",
+    "Act 2 - Forest Meadow Chest",
+    "Act 2 - Cabin Wardrobe Drawer",
+    "Act 2 - Cabin Safe",
+    "Act 2 - Crypt Casket 1",
+    "Act 2 - Crypt Casket 2",
+    "Act 2 - Crypt Well",
+    "Act 2 - Tower Chest 1",
+    "Act 2 - Tower Chest 2",
+    "Act 2 - Tower Chest 3",
+    "Act 2 - Tentacle",
+    "Act 2 - Factory Trash Can",
+    "Act 2 - Factory Drawer 1",
+    "Act 2 - Factory Drawer 2",
+    "Act 2 - Factory Chest 1",
+    "Act 2 - Factory Chest 2",
+    "Act 2 - Factory Chest 3",
+    "Act 2 - Factory Chest 4",
+    "Act 2 - Ancient Obol",
+    "Act 2 - Bone Lord Femur",
+    "Act 2 - Bone Lord Horn",
+    "Act 2 - Bone Lord Holo Key",
+    "Act 2 - Mycologists Holo Key",
+    "Act 2 - Camera Replica",
+    "Act 2 - Clover",
+    "Act 2 - Monocle",
+    "Act 2 - Epitaph Piece 1",
+    "Act 2 - Epitaph Piece 2",
+    "Act 2 - Epitaph Piece 3",
+    "Act 2 - Epitaph Piece 4",
+    "Act 2 - Epitaph Piece 5",
+    "Act 2 - Epitaph Piece 6",
+    "Act 2 - Epitaph Piece 7",
+    "Act 2 - Epitaph Piece 8",
+    "Act 2 - Epitaph Piece 9"
+]
+
+act3_locations = [
+    "Act 3 - Boss Photographer",
+    "Act 3 - Boss Archivist",
+    "Act 3 - Boss Unfinished",
+    "Act 3 - Boss G0lly",
+    "Act 3 - Boss Mycologists",
+    "Act 3 - Bone Lord Room",
+    "Act 3 - Shop Holo Pelt",
+    "Act 3 - Middle Holo Pelt",
+    "Act 3 - Forest Holo Pelt",
+    "Act 3 - Crypt Holo Pelt",
+    "Act 3 - Tower Holo Pelt",
+    "Act 3 - Trader 1",
+    "Act 3 - Trader 2",
+    "Act 3 - Trader 3",
+    "Act 3 - Trader 4",
+    "Act 3 - Trader 5",
+    "Act 3 - Drawer 1",
+    "Act 3 - Drawer 2",
+    "Act 3 - Clock",
+    "Act 3 - Extra Battery",
+    "Act 3 - Nano Armor Generator",
+    "Act 3 - Chest",
+    "Act 3 - Goobert's Painting",
+    "Act 3 - Luke's File Entry 1",
+    "Act 3 - Luke's File Entry 2",
+    "Act 3 - Luke's File Entry 3",
+    "Act 3 - Luke's File Entry 4",
+    "Act 3 - Inspectometer Battery",
+    "Act 3 - Gems Drone",
+    "Act 3 - The Great Transcendence",
+    "Act 3 - Well"
+]
+
+regions_to_locations: Dict[str, List[str]] = {
+    "Menu": [],
+    "Act 1": act1_locations,
+    "Act 2": act2_locations,
+    "Act 3": act3_locations,
+    "Epilogue": []
+}
diff --git a/worlds/inscryption/Options.py b/worlds/inscryption/Options.py
new file mode 100644
index 000000000000..01e9dfb964a4
--- /dev/null
+++ b/worlds/inscryption/Options.py
@@ -0,0 +1,137 @@
+from dataclasses import dataclass
+
+from Options import Toggle, Choice, DeathLinkMixin, StartInventoryPool, PerGameCommonOptions, DefaultOnToggle
+
+
+class Act1DeathLinkBehaviour(Choice):
+    """If DeathLink is enabled, determines what counts as a death in act 1. This affects deaths sent and received.
+
+    - Sacrificed: Send a death when sacrificed by Leshy. Receiving a death will extinguish all candles.
+
+    - Candle Extinguished: Send a death when a candle is extinguished. Receiving a death will extinguish a candle."""
+    display_name = "Act 1 Death Link Behaviour"
+    option_sacrificed = 0
+    option_candle_extinguished = 1
+    default = 0
+
+
+class Goal(Choice):
+    """Defines the goal to accomplish in order to complete the randomizer.
+
+    - Full Story In Order: Complete each act in order. You can return to previously completed acts.
+
+    - Full Story Any Order: Complete each act in any order. All acts are available from the start.
+
+    - First Act: Complete Act 1 by finding the New Game button. Great for a smaller scale randomizer."""
+    display_name = "Goal"
+    option_full_story_in_order = 0
+    option_full_story_any_order = 1
+    option_first_act = 2
+    default = 0
+
+
+class RandomizeCodes(Toggle):
+    """Randomize codes and passwords in the game (clocks, safes, etc.)"""
+    display_name = "Randomize Codes"
+
+
+class RandomizeDeck(Choice):
+    """Randomize cards in your deck into new cards.
+    Disable: Disable the feature.
+
+    - Every Encounter Within Same Type: Randomize cards within the same type every encounter (keep rarity/scrybe type).
+
+    - Every Encounter Any Type: Randomize cards into any possible card every encounter.
+
+    - Starting Only: Only randomize cards given at the beginning of runs and acts."""
+    display_name = "Randomize Deck"
+    option_disable = 0
+    option_every_encounter_within_same_type = 1
+    option_every_encounter_any_type = 2
+    option_starting_only = 3
+    default = 0
+
+
+class RandomizeSigils(Choice):
+    """Randomize sigils printed on the cards into new sigils every encounter.
+
+    - Disable: Disable the feature.
+
+    - Randomize Addons: Only randomize sigils added from sacrifices or other means.
+
+    - Randomize All: Randomize all sigils."""
+    display_name = "Randomize Abilities"
+    option_disable = 0
+    option_randomize_addons = 1
+    option_randomize_all = 2
+    default = 0
+
+
+class OptionalDeathCard(Choice):
+    """Add a moment after death in act 1 where you can decide to create a death card or not.
+
+    - Disable: Disable the feature.
+
+    - Always On: The choice is always offered after losing all candles.
+
+    - DeathLink Only: The choice is only offered after receiving a DeathLink event."""
+    display_name = "Optional Death Card"
+    option_disable = 0
+    option_always_on = 1
+    option_deathlink_only = 2
+    default = 2
+
+
+class SkipTutorial(DefaultOnToggle):
+    """Skips the first few tutorial runs of act 1. Bones are available from the start."""
+    display_name = "Skip Tutorial"
+
+
+class SkipEpilogue(Toggle):
+    """Completes the goal as soon as the required acts are completed without the need of completing the epilogue."""
+    display_name = "Skip Epilogue"
+
+
+class EpitaphPiecesRandomization(Choice):
+    """Determines how epitaph pieces in act 2 are randomized. This can affect your chances of getting stuck.
+
+    - All Pieces: Randomizes all nine pieces as their own item.
+
+    - In Groups: Randomizes pieces in groups of three.
+
+    - As One Item: Group all nine pieces as a single item."""
+    display_name = "Epitaph Pieces Randomization"
+    option_all_pieces = 0
+    option_in_groups = 1
+    option_as_one_item = 2
+    default = 0
+
+
+class PaintingChecksBalancing(Choice):
+    """Generation options for the second and third painting checks in act 1.
+
+    - None: Adds no progression logic to these painting checks. They will all count as sphere 1 (early game checks).
+
+    - Balanced: Adds rules to these painting checks. Early game items are less likely to appear into these paintings.
+
+    - Force Filler: For when you dislike doing these last two paintings. Their checks will only contain filler items."""
+    display_name = "Painting Checks Balancing"
+    option_none = 0
+    option_balanced = 1
+    option_force_filler = 2
+    default = 1
+
+
+@dataclass
+class InscryptionOptions(DeathLinkMixin, PerGameCommonOptions):
+    start_inventory_from_pool: StartInventoryPool
+    act1_death_link_behaviour: Act1DeathLinkBehaviour
+    goal: Goal
+    randomize_codes: RandomizeCodes
+    randomize_deck: RandomizeDeck
+    randomize_sigils: RandomizeSigils
+    optional_death_card: OptionalDeathCard
+    skip_tutorial: SkipTutorial
+    skip_epilogue: SkipEpilogue
+    epitaph_pieces_randomization: EpitaphPiecesRandomization
+    painting_checks_balancing: PaintingChecksBalancing
diff --git a/worlds/inscryption/Regions.py b/worlds/inscryption/Regions.py
new file mode 100644
index 000000000000..357261da7579
--- /dev/null
+++ b/worlds/inscryption/Regions.py
@@ -0,0 +1,14 @@
+from typing import Dict, List
+
+inscryption_regions_all: Dict[str, List[str]] = {
+    "Menu": ["Act 1", "Act 2", "Act 3", "Epilogue"],
+    "Act 1": [],
+    "Act 2": [],
+    "Act 3": [],
+    "Epilogue": []
+}
+
+inscryption_regions_act_1: Dict[str, List[str]] = {
+    "Menu": ["Act 1"],
+    "Act 1": []
+}
diff --git a/worlds/inscryption/Rules.py b/worlds/inscryption/Rules.py
new file mode 100644
index 000000000000..d9791ce94c7a
--- /dev/null
+++ b/worlds/inscryption/Rules.py
@@ -0,0 +1,181 @@
+from typing import Dict, Callable, TYPE_CHECKING
+from BaseClasses import CollectionState, LocationProgressType
+from .Options import Goal, PaintingChecksBalancing
+
+if TYPE_CHECKING:
+    from . import InscryptionWorld
+else:
+    InscryptionWorld = object
+
+
+# Based on The Messenger's implementation
+class InscryptionRules:
+    player: int
+    world: InscryptionWorld
+    location_rules: Dict[str, Callable[[CollectionState], bool]]
+    region_rules: Dict[str, Callable[[CollectionState], bool]]
+
+    def __init__(self, world: InscryptionWorld) -> None:
+        self.player = world.player
+        self.world = world
+        self.location_rules = {
+            "Act 1 - Wardrobe Drawer 1": self.has_wardrobe_key,
+            "Act 1 - Wardrobe Drawer 2": self.has_wardrobe_key,
+            "Act 1 - Wardrobe Drawer 3": self.has_wardrobe_key,
+            "Act 1 - Wardrobe Drawer 4": self.has_wardrobe_key,
+            "Act 1 - Dagger": self.has_caged_wolf,
+            "Act 1 - Magnificus Eye": self.has_dagger,
+            "Act 1 - Clock Main Compartment": self.has_magnificus_eye,
+            "Act 2 - Battle Prospector": self.has_camera_and_meat,
+            "Act 2 - Battle Angler": self.has_camera_and_meat,
+            "Act 2 - Battle Trapper": self.has_camera_and_meat,
+            "Act 2 - Battle Pike Mage": self.has_tower_requirements,
+            "Act 2 - Battle Goobert": self.has_tower_requirements,
+            "Act 2 - Battle Lonely Wizard": self.has_tower_requirements,
+            "Act 2 - Battle Inspector": self.has_act2_bridge_requirements,
+            "Act 2 - Battle Melter": self.has_act2_bridge_requirements,
+            "Act 2 - Battle Dredger": self.has_act2_bridge_requirements,
+            "Act 2 - Forest Meadow Chest": self.has_camera_and_meat,
+            "Act 2 - Tower Chest 1": self.has_act2_bridge_requirements,
+            "Act 2 - Tower Chest 2": self.has_tower_requirements,
+            "Act 2 - Tower Chest 3": self.has_tower_requirements,
+            "Act 2 - Tentacle": self.has_tower_requirements,
+            "Act 2 - Factory Trash Can": self.has_act2_bridge_requirements,
+            "Act 2 - Factory Drawer 1": self.has_act2_bridge_requirements,
+            "Act 2 - Factory Drawer 2": self.has_act2_bridge_requirements,
+            "Act 2 - Factory Chest 1": self.has_act2_bridge_requirements,
+            "Act 2 - Factory Chest 2": self.has_act2_bridge_requirements,
+            "Act 2 - Factory Chest 3": self.has_act2_bridge_requirements,
+            "Act 2 - Factory Chest 4": self.has_act2_bridge_requirements,
+            "Act 2 - Monocle": self.has_act2_bridge_requirements,
+            "Act 2 - Boss Grimora": self.has_all_epitaph_pieces,
+            "Act 2 - Boss Leshy": self.has_camera_and_meat,
+            "Act 2 - Boss Magnificus": self.has_tower_requirements,
+            "Act 2 - Boss P03": self.has_act2_bridge_requirements,
+            "Act 2 - Bone Lord Femur": self.has_obol,
+            "Act 2 - Bone Lord Horn": self.has_obol,
+            "Act 2 - Bone Lord Holo Key": self.has_obol,
+            "Act 2 - Mycologists Holo Key": self.has_tower_requirements,  # Could need money
+            "Act 2 - Ancient Obol": self.has_tower_requirements,  # Need money for the pieces? Use the tower mannequin.
+            "Act 3 - Boss Photographer": self.has_inspectometer_battery,
+            "Act 3 - Boss Archivist": self.has_battery_and_quill,
+            "Act 3 - Boss Unfinished": self.has_gems_and_battery,
+            "Act 3 - Boss G0lly": self.has_gems_and_battery,
+            "Act 3 - Extra Battery": self.has_inspectometer_battery,  # Hard to miss but soft lock still possible.
+            "Act 3 - Nano Armor Generator": self.has_gems_and_battery,  # Costs money, so can need multiple battles.
+            "Act 3 - Shop Holo Pelt": self.has_gems_and_battery,  # Costs money, so can need multiple battles.
+            "Act 3 - Middle Holo Pelt": self.has_inspectometer_battery,  # Can be reached without but possible soft lock
+            "Act 3 - Forest Holo Pelt": self.has_inspectometer_battery,
+            "Act 3 - Crypt Holo Pelt": self.has_inspectometer_battery,
+            "Act 3 - Tower Holo Pelt": self.has_gems_and_battery,
+            "Act 3 - Trader 1": self.has_pelts(1),
+            "Act 3 - Trader 2": self.has_pelts(2),
+            "Act 3 - Trader 3": self.has_pelts(3),
+            "Act 3 - Trader 4": self.has_pelts(4),
+            "Act 3 - Trader 5": self.has_pelts(5),
+            "Act 3 - Goobert's Painting": self.has_gems_and_battery,
+            "Act 3 - The Great Transcendence": self.has_transcendence_requirements,
+            "Act 3 - Boss Mycologists": self.has_mycologists_boss_requirements,
+            "Act 3 - Bone Lord Room": self.has_bone_lord_room_requirements,
+            "Act 3 - Luke's File Entry 1": self.has_battery_and_quill,
+            "Act 3 - Luke's File Entry 2": self.has_battery_and_quill,
+            "Act 3 - Luke's File Entry 3": self.has_battery_and_quill,
+            "Act 3 - Luke's File Entry 4": self.has_transcendence_requirements,
+            "Act 3 - Well": self.has_inspectometer_battery,
+            "Act 3 - Gems Drone": self.has_inspectometer_battery,
+            "Act 3 - Clock": self.has_gems_and_battery,  # Can be brute-forced, but the solution needs those items.
+        }
+        self.region_rules = {
+            "Act 2": self.has_act2_requirements,
+            "Act 3": self.has_act3_requirements,
+            "Epilogue": self.has_epilogue_requirements
+        }
+
+    def has_wardrobe_key(self, state: CollectionState) -> bool:
+        return state.has("Wardrobe Key", self.player)
+
+    def has_caged_wolf(self, state: CollectionState) -> bool:
+        return state.has("Caged Wolf Card", self.player)
+
+    def has_dagger(self, state: CollectionState) -> bool:
+        return state.has("Dagger", self.player)
+
+    def has_magnificus_eye(self, state: CollectionState) -> bool:
+        return state.has("Magnificus Eye", self.player)
+
+    def has_useful_act1_items(self, state: CollectionState) -> bool:
+        return state.has_all(("Oil Painting's Clover Plant", "Squirrel Totem Head"), self.player)
+
+    def has_all_epitaph_pieces(self, state: CollectionState) -> bool:
+        return state.has(self.world.required_epitaph_pieces_name, self.player, self.world.required_epitaph_pieces_count)
+
+    def has_camera_and_meat(self, state: CollectionState) -> bool:
+        return state.has_all(("Camera Replica", "Pile Of Meat"), self.player)
+
+    def has_monocle(self, state: CollectionState) -> bool:
+        return state.has("Monocle", self.player)
+
+    def has_obol(self, state: CollectionState) -> bool:
+        return state.has("Ancient Obol", self.player)
+
+    def has_epitaphs_and_forest_items(self, state: CollectionState) -> bool:
+        return self.has_camera_and_meat(state) and self.has_all_epitaph_pieces(state)
+
+    def has_act2_bridge_requirements(self, state: CollectionState) -> bool:
+        return self.has_camera_and_meat(state) or self.has_all_epitaph_pieces(state)
+
+    def has_tower_requirements(self, state: CollectionState) -> bool:
+        return self.has_monocle(state) and self.has_act2_bridge_requirements(state)
+
+    def has_inspectometer_battery(self, state: CollectionState) -> bool:
+        return state.has("Inspectometer Battery", self.player)
+
+    def has_gems_and_battery(self, state: CollectionState) -> bool:
+        return state.has("Gems Module", self.player) and self.has_inspectometer_battery(state)
+
+    def has_pelts(self, count: int) -> Callable[[CollectionState], bool]:
+        return lambda state: state.has("Holo Pelt", self.player, count) and self.has_gems_and_battery(state)
+
+    def has_mycologists_boss_requirements(self, state: CollectionState) -> bool:
+        return state.has("Mycologists Holo Key", self.player) and self.has_transcendence_requirements(state)
+
+    def has_bone_lord_room_requirements(self, state: CollectionState) -> bool:
+        return state.has("Bone Lord Holo Key", self.player) and self.has_inspectometer_battery(state)
+
+    def has_battery_and_quill(self, state: CollectionState) -> bool:
+        return state.has("Quill", self.player) and self.has_inspectometer_battery(state)
+
+    def has_transcendence_requirements(self, state: CollectionState) -> bool:
+        return state.has("Quill", self.player) and self.has_gems_and_battery(state)
+
+    def has_act2_requirements(self, state: CollectionState) -> bool:
+        return state.has("Film Roll", self.player)
+
+    def has_act3_requirements(self, state: CollectionState) -> bool:
+        return self.has_act2_requirements(state) and self.has_all_epitaph_pieces(state) and \
+            self.has_camera_and_meat(state) and self.has_monocle(state)
+
+    def has_epilogue_requirements(self, state: CollectionState) -> bool:
+        return self.has_act3_requirements(state) and self.has_transcendence_requirements(state)
+
+    def set_all_rules(self) -> None:
+        multiworld = self.world.multiworld
+        if self.world.options.goal != Goal.option_first_act:
+            multiworld.completion_condition[self.player] = self.has_epilogue_requirements
+        else:
+            multiworld.completion_condition[self.player] = self.has_act2_requirements
+        for region in multiworld.get_regions(self.player):
+            if self.world.options.goal == Goal.option_full_story_in_order:
+                if region.name in self.region_rules:
+                    for entrance in region.entrances:
+                        entrance.access_rule = self.region_rules[region.name]
+            for loc in region.locations:
+                if loc.name in self.location_rules:
+                    loc.access_rule = self.location_rules[loc.name]
+
+        if self.world.options.painting_checks_balancing == PaintingChecksBalancing.option_balanced:
+            self.world.get_location("Act 1 - Painting 2").access_rule = self.has_useful_act1_items
+            self.world.get_location("Act 1 - Painting 3").access_rule = self.has_useful_act1_items
+        elif self.world.options.painting_checks_balancing == PaintingChecksBalancing.option_force_filler:
+            self.world.get_location("Act 1 - Painting 2").progress_type = LocationProgressType.EXCLUDED
+            self.world.get_location("Act 1 - Painting 3").progress_type = LocationProgressType.EXCLUDED
diff --git a/worlds/inscryption/__init__.py b/worlds/inscryption/__init__.py
new file mode 100644
index 000000000000..d84912e1ca0b
--- /dev/null
+++ b/worlds/inscryption/__init__.py
@@ -0,0 +1,144 @@
+from .Options import InscryptionOptions, Goal, EpitaphPiecesRandomization, PaintingChecksBalancing
+from .Items import act1_items, act2_items, act3_items, filler_items, base_id, InscryptionItem, ItemDict
+from .Locations import act1_locations, act2_locations, act3_locations, regions_to_locations
+from .Regions import inscryption_regions_all, inscryption_regions_act_1
+from typing import Dict, Any
+from . import Rules
+from BaseClasses import Region, Item, Tutorial, ItemClassification
+from worlds.AutoWorld import World, WebWorld
+
+
+class InscrypWeb(WebWorld):
+    theme = "dirt"
+
+    guide_en = Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up the Inscryption Archipelago Multiworld",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["DrBibop"]
+    )
+
+    guide_fr = Tutorial(
+        "Multiworld Setup Guide",
+        "Un guide pour configurer Inscryption Archipelago Multiworld",
+        "Français",
+        "setup_fr.md",
+        "setup/fr",
+        ["Glowbuzz"]
+    )
+
+    tutorials = [guide_en, guide_fr]
+
+    bug_report_page = "https://github.com/DrBibop/Archipelago_Inscryption/issues"
+
+
+class InscryptionWorld(World):
+    """
+    Inscryption is an inky black card-based odyssey that blends the deckbuilding roguelike,
+    escape-room style puzzles, and psychological horror into a blood-laced smoothie.
+    Darker still are the secrets inscrybed upon the cards...
+    """
+    game = "Inscryption"
+    web = InscrypWeb()
+    options_dataclass = InscryptionOptions
+    options: InscryptionOptions
+    all_items = act1_items + act2_items + act3_items + filler_items
+    item_name_to_id = {item["name"]: i + base_id for i, item in enumerate(all_items)}
+    all_locations = act1_locations + act2_locations + act3_locations
+    location_name_to_id = {location: i + base_id for i, location in enumerate(all_locations)}
+    required_epitaph_pieces_count = 9
+    required_epitaph_pieces_name = "Epitaph Piece"
+
+    def generate_early(self) -> None:
+        self.all_items = [item.copy() for item in self.all_items]
+
+        if self.options.epitaph_pieces_randomization == EpitaphPiecesRandomization.option_all_pieces:
+            self.required_epitaph_pieces_name = "Epitaph Piece"
+            self.required_epitaph_pieces_count = 9
+        elif self.options.epitaph_pieces_randomization == EpitaphPiecesRandomization.option_in_groups:
+            self.required_epitaph_pieces_name = "Epitaph Pieces"
+            self.required_epitaph_pieces_count = 3
+        else:
+            self.required_epitaph_pieces_name = "Epitaph Pieces"
+            self.required_epitaph_pieces_count = 1
+
+        if self.options.painting_checks_balancing == PaintingChecksBalancing.option_balanced:
+            self.all_items[6]["classification"] = ItemClassification.progression
+            self.all_items[11]["classification"] = ItemClassification.progression
+
+        if self.options.painting_checks_balancing == PaintingChecksBalancing.option_force_filler \
+                and self.options.goal == Goal.option_first_act:
+            self.all_items[3]["classification"] = ItemClassification.filler
+
+        if self.options.epitaph_pieces_randomization != EpitaphPiecesRandomization.option_all_pieces:
+            self.all_items[len(act1_items) + 3]["count"] = self.required_epitaph_pieces_count
+
+    def get_filler_item_name(self) -> str:
+        return self.random.choice(filler_items)["name"]
+
+    def create_item(self, name: str) -> Item:
+        item_id = self.item_name_to_id[name]
+        item_data = self.all_items[item_id - base_id]
+        return InscryptionItem(name, item_data["classification"], item_id, self.player)
+
+    def create_items(self) -> None:
+        nb_items_added = 0
+        useful_items = self.all_items.copy()
+
+        if self.options.goal != Goal.option_first_act:
+            useful_items = [item for item in useful_items
+                            if not any(filler_item["name"] == item["name"] for filler_item in filler_items)]
+            if self.options.epitaph_pieces_randomization == EpitaphPiecesRandomization.option_all_pieces:
+                useful_items.pop(len(act1_items) + 3)
+            else:
+                useful_items.pop(len(act1_items) + 2)
+        else:
+            useful_items = [item for item in useful_items
+                            if any(act1_item["name"] == item["name"] for act1_item in act1_items)]
+
+        for item in useful_items:
+            for _ in range(item["count"]):
+                new_item = self.create_item(item["name"])
+                self.multiworld.itempool.append(new_item)
+                nb_items_added += 1
+
+        filler_count = len(self.all_locations if self.options.goal != Goal.option_first_act else act1_locations)
+        filler_count -= nb_items_added
+
+        for i in range(filler_count):
+            index = i % len(filler_items)
+            filler_item = filler_items[index]
+            new_item = self.create_item(filler_item["name"])
+            self.multiworld.itempool.append(new_item)
+
+    def create_regions(self) -> None:
+        used_regions = inscryption_regions_all if self.options.goal != Goal.option_first_act \
+            else inscryption_regions_act_1
+        for region_name in used_regions.keys():
+            self.multiworld.regions.append(Region(region_name, self.player, self.multiworld))
+
+        for region_name, region_connections in used_regions.items():
+            region = self.get_region(region_name)
+            region.add_exits(region_connections)
+            region.add_locations({
+                location: self.location_name_to_id[location] for location in regions_to_locations[region_name]
+            })
+
+    def set_rules(self) -> None:
+        Rules.InscryptionRules(self).set_all_rules()
+
+    def fill_slot_data(self) -> Dict[str, Any]:
+        return self.options.as_dict(
+            "death_link",
+            "act1_death_link_behaviour",
+            "goal",
+            "randomize_codes",
+            "randomize_deck",
+            "randomize_sigils",
+            "optional_death_card",
+            "skip_tutorial",
+            "skip_epilogue",
+            "epitaph_pieces_randomization"
+        )
diff --git a/worlds/inscryption/docs/en_Inscryption.md b/worlds/inscryption/docs/en_Inscryption.md
new file mode 100644
index 000000000000..da6d7c8dcb0b
--- /dev/null
+++ b/worlds/inscryption/docs/en_Inscryption.md
@@ -0,0 +1,22 @@
+# Inscryption
+
+## Where is the options page?
+You can configure your player options with the Inscryption options page. [Click here](../player-options) to start configuring them to your liking.
+
+## What does randomization do to this game?
+Due to the nature of the randomizer, you are allowed to return to a previous act you've previously completed if there are location checks you've missed. The "New Game" option is replaced with a "Chapter Select" option and is enabled after you beat act 1. If you prefer, you can also make all acts available from the start by changing the goal option. All items that you can find lying around, in containers, or from puzzles are randomized and replaced with location checks. Boss fights from all acts and battles from act 2 also count as location checks.
+
+## What is the goal of Inscryption when randomized?
+By default, the goal is considered reached once you open the OLD_DATA file. This means playing through all three acts in order and the epilogue. You can change the goal option to instead complete all acts in any order or simply complete act 1.
+
+## Which items can be in another player's world?
+All key items necessary for progression such as the film roll, the dagger, Grimora's epitaphs, etc. Unique cards that aren't randomly found in the base game (e.g. talking cards) are also included. For filler items, you can receive currency which will be added to every act's bank or card packs that you can open at any time when inspecting your deck.
+
+## What does another world's item look like in Inscryption?
+Items from other worlds usually take the appearance of a normal card from the current act you're playing. The card's name contains the item that will be sent when picked up and its portrait is the Archipelago logo (a ring of six circles). Picking up these cards does not add them to your deck.
+
+## When the player receives an item, what happens?
+The item is instantly granted to you. A yellow message appears in the Archipelago logs at the top-right of your screen. An audio cue is also played. If the item received is a holdable item (wardrobe key, inspectometer battery, gems module), the item will be placed where you would usually collect it in a vanilla playthrough (safe, inspectometer, drone).
+
+## How many items can I find or receive in my world?
+By default, if all three acts are played, there are **100** randomized locations in your world and **100** of your items shuffled in the multiworld. There are **17** locations in act 1 (this will be the total amount if you decide to only play act 1), **52** locations in act 2, and **31** locations in act 3.
diff --git a/worlds/inscryption/docs/setup_en.md b/worlds/inscryption/docs/setup_en.md
new file mode 100644
index 000000000000..a57e266c4849
--- /dev/null
+++ b/worlds/inscryption/docs/setup_en.md
@@ -0,0 +1,65 @@
+# Inscryption Randomizer Setup Guide
+
+## Required Software
+
+- [Inscryption](https://store.steampowered.com/app/1092790/Inscryption/)
+- For easy setup (recommended):
+  - [r2modman](https://inscryption.thunderstore.io/package/ebkr/r2modman/) OR [Thunderstore Mod Manager](https://www.overwolf.com/app/Thunderstore-Thunderstore_Mod_Manager)
+- For manual setup:
+  - [BepInEx pack for Inscryption](https://inscryption.thunderstore.io/package/BepInEx/BepInExPack_Inscryption/)
+  - [ArchipelagoMod](https://inscryption.thunderstore.io/package/Ballin_Inc/ArchipelagoMod/)
+
+## Installation
+Before starting the installation process, here's what you should know:
+- Only install the mods mentioned in this guide if you want a guaranteed smooth experience! Other mods were NOT tested with ArchipelagoMod and could cause unwanted issues.
+- The ArchipelagoMod uses its own save file system when playing, but for safety measures, back up your save file by going to your Inscryption installation directory and copy the `SaveFile.gwsave` file to another folder.
+- It is strongly recommended to use a mod manager if you want a quicker and easier installation process, but if you don't like installing extra software and are comfortable moving files around, you can refer to the manual setup guide instead.
+
+### Easy setup (mod manager)
+1. Download [r2modman](https://inscryption.thunderstore.io/package/ebkr/r2modman/) using the "Manual Download" button, then install it using the executable in the downloaded zip package (You can also use [Thunderstore Mod Manager](https://www.overwolf.com/app/Thunderstore-Thunderstore_Mod_Manager) which works the same, but it requires [Overwolf](https://www.overwolf.com/))
+2. Open the mod manager and select Inscryption in the game selection screen.
+3. Select the default profile or create a new one.
+4. Open the `Online` tab on the left, then search for `ArchipelagoMod`.
+5. Expand ArchipelagoMod and click the `Download` button to install the latest version and all its dependencies.
+6. Click `Start Modded` to open the game with the mods (a console should appear if everything was done correctly).
+
+### Manual setup
+1. Download the following mods using the `Manual Download` button:
+   - [BepInEx pack for Inscryption](https://inscryption.thunderstore.io/package/BepInEx/BepInExPack_Inscryption/)
+   - [ArchipelagoMod](https://inscryption.thunderstore.io/package/Ballin_Inc/ArchipelagoMod/)
+2. Open your Inscryption installation directory. On Steam, you can find it easily by right-clicking the game and clicking `Manage` > `Browse local files`.
+3. Open the BepInEx pack zip file, then open the `BepInExPack_Inscryption` folder.
+4. Drag all folders and files located inside the `BepInExPack_Inscryption` folder and drop them in your Inscryption directory.
+5. Open the `BepInEx` folder in your Inscryption directory.
+6. Open the ArchipelagoMod zip file.
+7. Drag and drop the `plugins` folder in the `BepInEx` folder to fuse with the existing `plugins` folder.
+8. Open the game normally to play with mods (if BepInEx was installed correctly, a console should appear).
+
+## Joining a new MultiWorld Game
+1. After opening the game, you should see a new menu for browsing and creating save files.
+2. Click on the `New Game` button, then write a unique name for your save file.
+3. On the next screen, enter the information needed to connect to the MultiWorld server, then press the `Connect` button.
+4. If successful, the status on the top-right will change to "Connected". If not, a red error message will appear.
+5. After connecting to the server and receiving items, the game menu will appear.
+
+## Continuing a MultiWorld Game
+1. After opening the game, you should see a list of your save files and a button to add a new one.
+2. Find the save file you want to use, then click its `Play` button.
+3. On the next screen, the input fields will be filled with the information you've written previously. You can adjust some fields if needed, then press the `Connect` button.
+4. If successful, the status on the top-right will change to "connected". If not, a red error message will appear.
+5. After connecting to the server and receiving items, the game menu will appear.
+
+## Troubleshooting
+### The game opens normally without the new menu.
+If the new menu mentioned previously doesn't appear, it can be one of two issues:
+ - If there was no console appearing when opening the game, this means the mods didn't load correctly. Here's what you can try:
+   - If you are using the mod manager, make sure to open it and press `Start Modded`. Opening the game normally from Steam won't load any mods.
+   - Check if the mod manager correctly found the game path. In the mod manager, click `Settings` then go to the `Locations` tab. Make sure the path listed under `Change Inscryption directory` is correct. You can verify the real path if you right-click the game on steam and click `Manage` > `Browse local files`. If the path is wrong, click that setting and change the path.
+   - If you installed the mods manually, this usually means BepInEx was not correctly installed. Make sure to read the installation guide carefully.
+   - If there is still no console when opening the game modded, try asking in the [Archipelago Discord Server](https://discord.gg/8Z65BR2) for help.
+ - If there is a console, this means the mods loaded but the ArchipelagoMod wasn't found or had errors while loading.
+   - Look in the console and make sure you can find a message about ArchipelagoMod being loaded.
+   - If you see any red text, there was an error. Report the issue in the [Archipelago Discord Server](https://discord.gg/8Z65BR2) or create an issue in our [GitHub](https://github.com/DrBibop/Archipelago_Inscryption/issues).
+
+### I'm getting a different issue.
+You can ask for help in the [Archipelago Discord Server](https://discord.gg/8Z65BR2) or, if you think you've found a bug with the mod, create an issue in our [GitHub](https://github.com/DrBibop/Archipelago_Inscryption/issues).
\ No newline at end of file
diff --git a/worlds/inscryption/docs/setup_fr.md b/worlds/inscryption/docs/setup_fr.md
new file mode 100644
index 000000000000..21d0617cbac4
--- /dev/null
+++ b/worlds/inscryption/docs/setup_fr.md
@@ -0,0 +1,67 @@
+# Guide d'Installation de Inscryption Randomizer
+
+## Logiciel Exigé
+
+- [Inscryption](https://store.steampowered.com/app/1092790/Inscryption/)
+- Pour une installation facile (recommandé):
+  - [r2modman](https://inscryption.thunderstore.io/package/ebkr/r2modman/) OU [Thunderstore Mod Manager](https://www.overwolf.com/app/Thunderstore-Thunderstore_Mod_Manager)
+- Pour une installation manuelle:
+  - [BepInEx pack for Inscryption](https://inscryption.thunderstore.io/package/BepInEx/BepInExPack_Inscryption/)
+  - [MonoMod Loader for Inscryption](https://inscryption.thunderstore.io/package/BepInEx/MonoMod_Loader_Inscryption/)
+  - [Inscryption API](https://inscryption.thunderstore.io/package/API_dev/API/)
+  - [ArchipelagoMod](https://inscryption.thunderstore.io/package/Ballin_Inc/ArchipelagoMod/)
+
+## Installation
+Avant de commencer le processus d'installation, voici ce que vous deviez savoir:
+- Installez uniquement les mods mentionnés dans ce guide si vous souhaitez une expérience stable! Les autres mods n'ont PAS été testés avec ArchipelagoMod et peuvent provoquer des problèmes.
+- ArchipelagoMod utilise son propre système de sauvegarde lorsque vous jouez, mais pour des raisons de sécurité, sauvegardez votre fichier de sauvegarde en accédant à votre répertoire d'installation Inscryption et copiez le fichier `SaveFile.gwsave` dans un autre dossier.
+- Il est fortement recommandé d'utiliser un mod manager si vous souhaitez avoir un processus d'installation plus rapide et plus facile, mais si vous n'aimez pas installer de logiciels supplémentaires et que vous êtes à l'aise pour déplacer des fichiers, vous pouvez vous référer au guide de configuration manuelle.
+
+### Installation facile (mod manager)
+1. Téléchargez [r2modman](https://inscryption.thunderstore.io/package/ebkr/r2modman/) à l'aide du bouton `Manual Download`, puis installez-le à l'aide de l'exécutable contenu dans le zip téléchargé (vous pouvez également utiliser [Thunderstore Mod Manager](https://www.overwolf.com/app/Thunderstore-Thunderstore_Mod_Manager) qui fonctionne de la même manière, mais cela nécessite [Overwolf](https://www.overwolf.com/))
+2. Ouvrez le mod manager et sélectionnez Inscryption dans l'écran de sélection de jeu.
+3. Sélectionnez le profil par défaut ou créez-en un nouveau.
+4. Ouvrez l'onglet `Online` à gauche, puis recherchez `ArchipelagoMod`.
+5. Développez ArchipelagoMod et cliquez sur le bouton `Download` pour installer la dernière version disponible et toutes ses dépendances.
+6. Cliquez sur `Start Modded` pour ouvrir le jeu avec les mods (une console devrait apparaître si tout a été fait correctement).
+
+### Installation manuelle
+1. Téléchargez les mods suivants en utilisant le bouton `Manual Download`:
+   - [BepInEx pack for Inscryption](https://inscryption.thunderstore.io/package/BepInEx/BepInExPack_Inscryption/)
+   - [ArchipelagoMod](https://inscryption.thunderstore.io/package/Ballin_Inc/ArchipelagoMod/)
+2. Ouvrez votre dossier d'installation d'Inscryption. Sur Steam, vous pouvez le trouver facilement en faisant un clic droit sur le jeu et en cliquant sur `Gérer` > `Parcourir les fichiers locaux`.
+3. Ouvrez le fichier zip du pack BepInEx, puis ouvrez le dossier `BepInExPack_Inscryption`.
+4. Prenez tous les dossiers et fichiers situés dans le dossier `BepInExPack_Inscryption` et déposez-les dans votre dossier Inscryption.
+5. Ouvrez le dossier `BepInEx` dans votre dossier Inscryption.
+6. Ouvrez le fichier zip d'ArchipelagoMod.
+7. Prenez et déposez le dossier `plugins` dans le dossier `BepInEx` pour fusionner avec le dossier `plugins` existant.
+8. Ouvrez le jeu normalement pour jouer avec les mods (si BepInEx a été correctement installé, une console devrait apparaitre).
+
+## Rejoindre un nouveau MultiWorld
+1. Après avoir ouvert le jeu, vous devriez voir un nouveau menu pour parcourir et créer des fichiers de sauvegarde.
+2. Cliquez sur le bouton `New Game`, puis écrivez un nom unique pour votre fichier de sauvegarde.
+3. Sur l'écran suivant, saisissez les informations nécessaires pour vous connecter au serveur MultiWorld, puis appuyez sur le bouton `Connect`.
+4. En cas de succès, l'état de connexion en haut à droite changera pour "Connected". Sinon, un message d'erreur rouge apparaîtra.
+5. Après s'être connecté au server et avoir reçu les items, le menu du jeu apparaîtra.
+
+## Poursuivre une session MultiWorld
+1. Après avoir ouvert le jeu, vous devriez voir une liste de vos fichiers de sauvegarde et un bouton pour en ajouter un nouveau.
+2. Choisissez le fichier de sauvegarde que vous souhaitez utiliser, puis cliquez sur son bouton `Play`.
+3. Sur l'écran suivant, les champs de texte seront remplis avec les informations que vous avez écrites précédemment. Vous pouvez ajuster certains champs si nécessaire, puis appuyer sur le bouton `Connect`.
+4. En cas de succès, l'état de connexion en haut à droite changera pour "Connected". Sinon, un message d'erreur rouge apparaîtra.
+5. Après s'être connecté au server et avoir reçu les items, le menu du jeu apparaîtra.
+
+## Dépannage
+### Le jeu ouvre normalement sans nouveau menu.
+Si le nouveau menu mentionné précédemment n'apparaît pas, c'est peut-être l'un des deux problèmes suivants:
+ - Si aucune console n'apparait à l'ouverture du jeu, cela signifie que les mods ne se sont pas chargés correctement. Voici ce que vous pouvez essayer:
+   - Si vous utilisez le mod manager, assurez-vous de l'ouvrir et d'appuyer sur `Start Modded`. Ouvrir le jeu normalement depuis Steam ne chargera aucun mod.
+   - Vérifiez si le mod manager a correctement trouvé le répertoire du jeu. Dans le mod manager, cliquez sur `Settings` puis allez dans l'onglet `Locations`. Assurez-vous que le répertoire sous `Change Inscryption directory` est correct. Vous pouvez vérifier le répertoire correct si vous faites un clic droit sur le jeu Inscription sur Steam et cliquez sur `Gérer` > `Parcourir les fichiers locaux`. Si le répertoire est erroné, cliquez sur ce paramètre et modifiez le répertoire.
+   - Si vous avez installé les mods manuellement, cela signifie généralement que BepInEx n'a pas été correctement installé. Assurez-vous de lire attentivement le guide d'installation.
+   - S'il n'y a toujours pas de console lors de l'ouverture du jeu modifié, essayez de demander de l'aide sur [Archipelago Discord Server](https://discord.gg/8Z65BR2).
+ - S'il y a une console, cela signifie que les mods ont été chargés, mais que ArchipelagoMod n'a pas été trouvé ou a eu des erreurs lors du chargement.
+   - Regardez dans la console et assurez-vous que vous trouvez un message concernant le chargement d'ArchipelagoMod.
+   - Si vous voyez du texte rouge, il y a eu une erreur. Signalez le problème dans [Archipelago Discord Server](https://discord.gg/8Z65BR2) ou dans notre [GitHub](https://github.com/DrBibop/Archipelago_Inscryption/issues).
+
+### J'ai un autre problème.
+Vous pouvez demander de l'aide sur [le serveur Discord d'Archipelago](https://discord.gg/8Z65BR2) ou, si vous pensez avoir trouvé un bug avec le mod, signalez-le dans notre [GitHub](https://github.com/DrBibop/Archipelago_Inscryption/issues).
\ No newline at end of file
diff --git a/worlds/inscryption/test/TestAccess.py b/worlds/inscryption/test/TestAccess.py
new file mode 100644
index 000000000000..eeafc933bbbc
--- /dev/null
+++ b/worlds/inscryption/test/TestAccess.py
@@ -0,0 +1,221 @@
+from . import InscryptionTestBase
+
+
+class AccessTestGeneral(InscryptionTestBase):
+
+    def test_dagger(self) -> None:
+        self.assertAccessDependency(["Act 1 - Magnificus Eye"], [["Dagger"]])
+
+    def test_caged_wolf(self) -> None:
+        self.assertAccessDependency(["Act 1 - Dagger"], [["Caged Wolf Card"]])
+
+    def test_magnificus_eye(self) -> None:
+        self.assertAccessDependency(["Act 1 - Clock Main Compartment"], [["Magnificus Eye"]])
+
+    def test_wardrobe_key(self) -> None:
+        self.assertAccessDependency(
+            ["Act 1 - Wardrobe Drawer 1", "Act 1 - Wardrobe Drawer 2",
+             "Act 1 - Wardrobe Drawer 3", "Act 1 - Wardrobe Drawer 4"],
+            [["Wardrobe Key"]]
+        )
+
+    def test_ancient_obol(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Bone Lord Femur", "Act 2 - Bone Lord Horn", "Act 2 - Bone Lord Holo Key"],
+            [["Ancient Obol"]]
+        )
+
+    def test_holo_pelt(self) -> None:
+        self.assertAccessDependency(
+            ["Act 3 - Trader 1", "Act 3 - Trader 2", "Act 3 - Trader 3", "Act 3 - Trader 4", "Act 3 - Trader 5"],
+            [["Holo Pelt"]]
+        )
+
+    def test_inspectometer_battery(self) -> None:
+        self.assertAccessDependency(
+            ["Act 3 - Boss Photographer", "Act 3 - Boss Archivist", "Act 3 - Boss Unfinished", "Act 3 - Boss G0lly",
+             "Act 3 - Trader 1", "Act 3 - Trader 2", "Act 3 - Trader 3", "Act 3 - Trader 4", "Act 3 - Trader 5",
+             "Act 3 - Shop Holo Pelt", "Act 3 - Middle Holo Pelt", "Act 3 - Forest Holo Pelt", "Act 3 - Clock",
+             "Act 3 - Crypt Holo Pelt", "Act 3 - Gems Drone", "Act 3 - Nano Armor Generator", "Act 3 - Extra Battery",
+             "Act 3 - Tower Holo Pelt", "Act 3 - The Great Transcendence", "Act 3 - Boss Mycologists",
+             "Act 3 - Bone Lord Room", "Act 3 - Well", "Act 3 - Luke's File Entry 1", "Act 3 - Luke's File Entry 2",
+             "Act 3 - Luke's File Entry 3", "Act 3 - Luke's File Entry 4", "Act 3 - Goobert's Painting"],
+            [["Inspectometer Battery"]]
+        )
+
+    def test_gem_drone(self) -> None:
+        self.assertAccessDependency(
+            ["Act 3 - Boss Unfinished", "Act 3 - Boss G0lly", "Act 3 - Trader 1", "Act 3 - Trader 2",
+             "Act 3 - Trader 3", "Act 3 - Trader 4", "Act 3 - Trader 5", "Act 3 - Shop Holo Pelt", "Act 3 - Clock",
+             "Act 3 - Tower Holo Pelt", "Act 3 - The Great Transcendence", "Act 3 - Luke's File Entry 4",
+             "Act 3 - Boss Mycologists", "Act 3 - Nano Armor Generator", "Act 3 - Goobert's Painting"],
+            [["Gems Module"]]
+        )
+
+    def test_mycologists_holo_key(self) -> None:
+        self.assertAccessDependency(
+            ["Act 3 - Boss Mycologists"],
+            [["Mycologists Holo Key"]]
+        )
+
+    def test_bone_lord_holo_key(self) -> None:
+        self.assertAccessDependency(
+            ["Act 3 - Bone Lord Room"],
+            [["Bone Lord Holo Key"]]
+        )
+
+    def test_quill(self) -> None:
+        self.assertAccessDependency(
+            ["Act 3 - Boss Archivist", "Act 3 - Luke's File Entry 1", "Act 3 - Luke's File Entry 2",
+             "Act 3 - Luke's File Entry 3", "Act 3 - Luke's File Entry 4", "Act 3 - The Great Transcendence",
+             "Act 3 - Boss Mycologists"],
+            [["Quill"]]
+        )
+
+
+class AccessTestOrdered(InscryptionTestBase):
+    options = {
+        "goal": 0,
+    }
+
+    def test_film_roll(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Battle Prospector", "Act 2 - Battle Angler", "Act 2 - Battle Trapper", "Act 2 - Battle Sawyer",
+             "Act 2 - Battle Royal", "Act 2 - Battle Kaycee", "Act 2 - Battle Pike Mage", "Act 2 - Battle Goobert",
+             "Act 2 - Battle Lonely Wizard", "Act 2 - Battle Inspector", "Act 2 - Battle Melter",
+             "Act 2 - Battle Dredger", "Act 2 - Tower Chest 1", "Act 2 - Tower Chest 2", "Act 2 - Tower Chest 3",
+             "Act 2 - Forest Meadow Chest", "Act 2 - Forest Cabin Chest", "Act 2 - Cabin Wardrobe Drawer",
+             "Act 2 - Cabin Safe", "Act 2 - Crypt Casket 1", "Act 2 - Crypt Casket 2", "Act 2 - Crypt Well",
+             "Act 2 - Camera Replica", "Act 2 - Clover", "Act 2 - Epitaph Piece 1", "Act 2 - Epitaph Piece 2",
+             "Act 2 - Epitaph Piece 3", "Act 2 - Epitaph Piece 4", "Act 2 - Epitaph Piece 5", "Act 2 - Epitaph Piece 6",
+             "Act 2 - Epitaph Piece 7", "Act 2 - Epitaph Piece 8", "Act 2 - Epitaph Piece 9", "Act 2 - Dock Chest",
+             "Act 2 - Tentacle", "Act 2 - Factory Trash Can", "Act 2 - Factory Drawer 1",
+             "Act 2 - Ancient Obol", "Act 2 - Factory Drawer 2", "Act 2 - Factory Chest 1", "Act 2 - Factory Chest 2",
+             "Act 2 - Factory Chest 3", "Act 2 - Factory Chest 4", "Act 2 - Monocle", "Act 2 - Boss Leshy",
+             "Act 2 - Boss Grimora", "Act 2 - Boss Magnificus", "Act 2 - Boss P03", "Act 2 - Mycologists Holo Key",
+             "Act 2 - Bone Lord Femur", "Act 2 - Bone Lord Horn", "Act 2 - Bone Lord Holo Key",
+             "Act 3 - Boss Photographer", "Act 3 - Boss Archivist", "Act 3 - Boss Unfinished", "Act 3 - Boss G0lly",
+             "Act 3 - Boss Mycologists", "Act 3 - Bone Lord Room", "Act 3 - Shop Holo Pelt", "Act 3 - Middle Holo Pelt",
+             "Act 3 - Forest Holo Pelt", "Act 3 - Crypt Holo Pelt", "Act 3 - Tower Holo Pelt", "Act 3 - Trader 1",
+             "Act 3 - Trader 2", "Act 3 - Trader 3", "Act 3 - Trader 4", "Act 3 - Trader 5", "Act 3 - Drawer 1",
+             "Act 3 - Drawer 2", "Act 3 - Clock", "Act 3 - Extra Battery", "Act 3 - Nano Armor Generator",
+             "Act 3 - Chest", "Act 3 - Goobert's Painting", "Act 3 - Luke's File Entry 1", "Act 3 - Gems Drone",
+             "Act 3 - Luke's File Entry 2", "Act 3 - Luke's File Entry 3", "Act 3 - Luke's File Entry 4",
+             "Act 3 - Inspectometer Battery", "Act 3 - Gems Drone", "Act 3 - The Great Transcendence", "Act 3 - Well"],
+            [["Film Roll"]]
+        )
+
+    def test_epitaphs_and_forest_items(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Battle Prospector", "Act 2 - Battle Angler", "Act 2 - Battle Trapper",
+             "Act 2 - Battle Pike Mage", "Act 2 - Battle Goobert", "Act 2 - Battle Lonely Wizard",
+             "Act 2 - Battle Inspector", "Act 2 - Battle Melter", "Act 2 - Battle Dredger",
+             "Act 2 - Tower Chest 1", "Act 2 - Tower Chest 2", "Act 2 - Tower Chest 3", "Act 2 - Forest Meadow Chest",
+             "Act 2 - Tentacle", "Act 2 - Factory Trash Can", "Act 2 - Factory Drawer 1", "Act 2 - Ancient Obol",
+             "Act 2 - Factory Drawer 2", "Act 2 - Factory Chest 1", "Act 2 - Factory Chest 2",
+             "Act 2 - Factory Chest 3", "Act 2 - Factory Chest 4", "Act 2 - Monocle", "Act 2 - Boss Leshy",
+             "Act 2 - Boss Grimora", "Act 2 - Boss Magnificus", "Act 2 - Boss P03", "Act 2 - Mycologists Holo Key",
+             "Act 3 - Boss Photographer", "Act 3 - Boss Archivist", "Act 3 - Boss Unfinished", "Act 3 - Boss G0lly",
+             "Act 3 - Boss Mycologists", "Act 3 - Bone Lord Room", "Act 3 - Shop Holo Pelt", "Act 3 - Middle Holo Pelt",
+             "Act 3 - Forest Holo Pelt", "Act 3 - Crypt Holo Pelt", "Act 3 - Tower Holo Pelt", "Act 3 - Trader 1",
+             "Act 3 - Trader 2", "Act 3 - Trader 3", "Act 3 - Trader 4", "Act 3 - Trader 5", "Act 3 - Drawer 1",
+             "Act 3 - Drawer 2", "Act 3 - Clock", "Act 3 - Extra Battery", "Act 3 - Nano Armor Generator",
+             "Act 3 - Chest", "Act 3 - Goobert's Painting", "Act 3 - Luke's File Entry 1", "Act 3 - Gems Drone",
+             "Act 3 - Luke's File Entry 2", "Act 3 - Luke's File Entry 3", "Act 3 - Luke's File Entry 4",
+             "Act 3 - Inspectometer Battery", "Act 3 - Gems Drone", "Act 3 - The Great Transcendence", "Act 3 - Well"],
+            [["Epitaph Piece", "Camera Replica", "Pile Of Meat"]]
+        )
+
+    def test_epitaphs(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Boss Grimora",
+             "Act 3 - Boss Photographer", "Act 3 - Boss Archivist", "Act 3 - Boss Unfinished", "Act 3 - Boss G0lly",
+             "Act 3 - Boss Mycologists", "Act 3 - Bone Lord Room", "Act 3 - Shop Holo Pelt", "Act 3 - Middle Holo Pelt",
+             "Act 3 - Forest Holo Pelt", "Act 3 - Crypt Holo Pelt", "Act 3 - Tower Holo Pelt", "Act 3 - Trader 1",
+             "Act 3 - Trader 2", "Act 3 - Trader 3", "Act 3 - Trader 4", "Act 3 - Trader 5", "Act 3 - Drawer 1",
+             "Act 3 - Drawer 2", "Act 3 - Clock", "Act 3 - Extra Battery", "Act 3 - Nano Armor Generator",
+             "Act 3 - Chest", "Act 3 - Goobert's Painting", "Act 3 - Luke's File Entry 1", "Act 3 - Gems Drone",
+             "Act 3 - Luke's File Entry 2", "Act 3 - Luke's File Entry 3", "Act 3 - Luke's File Entry 4",
+             "Act 3 - Inspectometer Battery", "Act 3 - Gems Drone", "Act 3 - The Great Transcendence", "Act 3 - Well"],
+            [["Epitaph Piece"]]
+        )
+
+    def test_forest_items(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Battle Prospector", "Act 2 - Battle Angler", "Act 2 - Battle Trapper",
+             "Act 2 - Boss Leshy", "Act 2 - Forest Meadow Chest",
+             "Act 3 - Boss Photographer", "Act 3 - Boss Archivist", "Act 3 - Boss Unfinished", "Act 3 - Boss G0lly",
+             "Act 3 - Boss Mycologists", "Act 3 - Bone Lord Room", "Act 3 - Shop Holo Pelt", "Act 3 - Middle Holo Pelt",
+             "Act 3 - Forest Holo Pelt", "Act 3 - Crypt Holo Pelt", "Act 3 - Tower Holo Pelt", "Act 3 - Trader 1",
+             "Act 3 - Trader 2", "Act 3 - Trader 3", "Act 3 - Trader 4", "Act 3 - Trader 5", "Act 3 - Drawer 1",
+             "Act 3 - Drawer 2", "Act 3 - Clock", "Act 3 - Extra Battery", "Act 3 - Nano Armor Generator",
+             "Act 3 - Chest", "Act 3 - Goobert's Painting", "Act 3 - Luke's File Entry 1", "Act 3 - Gems Drone",
+             "Act 3 - Luke's File Entry 2", "Act 3 - Luke's File Entry 3", "Act 3 - Luke's File Entry 4",
+             "Act 3 - Inspectometer Battery", "Act 3 - Gems Drone", "Act 3 - The Great Transcendence", "Act 3 - Well"],
+            [["Camera Replica", "Pile Of Meat"]]
+        )
+
+    def test_monocle(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Battle Goobert", "Act 2 - Battle Pike Mage", "Act 2 - Battle Lonely Wizard",
+             "Act 2 - Boss Magnificus", "Act 2 - Tower Chest 2", "Act 2 - Tower Chest 3",
+             "Act 2 - Tentacle", "Act 2 - Ancient Obol", "Act 2 - Mycologists Holo Key",
+             "Act 3 - Boss Photographer", "Act 3 - Boss Archivist", "Act 3 - Boss Unfinished", "Act 3 - Boss G0lly",
+             "Act 3 - Boss Mycologists", "Act 3 - Bone Lord Room", "Act 3 - Shop Holo Pelt", "Act 3 - Middle Holo Pelt",
+             "Act 3 - Forest Holo Pelt", "Act 3 - Crypt Holo Pelt", "Act 3 - Tower Holo Pelt", "Act 3 - Trader 1",
+             "Act 3 - Trader 2", "Act 3 - Trader 3", "Act 3 - Trader 4", "Act 3 - Trader 5", "Act 3 - Drawer 1",
+             "Act 3 - Drawer 2", "Act 3 - Clock", "Act 3 - Extra Battery", "Act 3 - Nano Armor Generator",
+             "Act 3 - Chest", "Act 3 - Goobert's Painting", "Act 3 - Luke's File Entry 1", "Act 3 - Gems Drone",
+             "Act 3 - Luke's File Entry 2", "Act 3 - Luke's File Entry 3", "Act 3 - Luke's File Entry 4",
+             "Act 3 - Inspectometer Battery", "Act 3 - Gems Drone", "Act 3 - The Great Transcendence", "Act 3 - Well"],
+            [["Monocle"]]
+        )
+
+
+class AccessTestUnordered(InscryptionTestBase):
+    options = {
+        "goal": 1,
+    }
+
+    def test_epitaphs_and_forest_items(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Battle Prospector", "Act 2 - Battle Angler", "Act 2 - Battle Trapper",
+             "Act 2 - Battle Pike Mage", "Act 2 - Battle Goobert", "Act 2 - Battle Lonely Wizard",
+             "Act 2 - Battle Inspector", "Act 2 - Battle Melter", "Act 2 - Battle Dredger",
+             "Act 2 - Tower Chest 1", "Act 2 - Tower Chest 2", "Act 2 - Tower Chest 3", "Act 2 - Forest Meadow Chest",
+             "Act 2 - Tentacle", "Act 2 - Factory Trash Can", "Act 2 - Factory Drawer 1", "Act 2 - Ancient Obol",
+             "Act 2 - Factory Drawer 2", "Act 2 - Factory Chest 1", "Act 2 - Factory Chest 2",
+             "Act 2 - Factory Chest 3", "Act 2 - Factory Chest 4", "Act 2 - Monocle", "Act 2 - Boss Leshy",
+             "Act 2 - Boss Grimora", "Act 2 - Boss Magnificus", "Act 2 - Boss P03", "Act 2 - Mycologists Holo Key"],
+            [["Epitaph Piece", "Camera Replica", "Pile Of Meat"]]
+        )
+
+    def test_epitaphs(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Boss Grimora"],
+            [["Epitaph Piece"]]
+        )
+
+    def test_forest_items(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Battle Prospector", "Act 2 - Battle Angler", "Act 2 - Battle Trapper",
+             "Act 2 - Boss Leshy", "Act 2 - Forest Meadow Chest"],
+            [["Camera Replica", "Pile Of Meat"]]
+        )
+
+    def test_monocle(self) -> None:
+        self.assertAccessDependency(
+            ["Act 2 - Battle Goobert", "Act 2 - Battle Pike Mage", "Act 2 - Battle Lonely Wizard",
+             "Act 2 - Boss Magnificus", "Act 2 - Tower Chest 2", "Act 2 - Tower Chest 3",
+             "Act 2 - Tentacle", "Act 2 - Ancient Obol", "Act 2 - Mycologists Holo Key"],
+            [["Monocle"]]
+        )
+
+class AccessTestBalancedPaintings(InscryptionTestBase):
+    options = {
+        "painting_checks_balancing": 1,
+    }
+
+    def test_paintings(self) -> None:
+        self.assertAccessDependency(["Act 1 - Painting 2", "Act 1 - Painting 3"],
+                                    [["Oil Painting's Clover Plant", "Squirrel Totem Head"]])
diff --git a/worlds/inscryption/test/TestGoal.py b/worlds/inscryption/test/TestGoal.py
new file mode 100644
index 000000000000..975af66e45a6
--- /dev/null
+++ b/worlds/inscryption/test/TestGoal.py
@@ -0,0 +1,108 @@
+from . import InscryptionTestBase
+
+
+class GoalTestOrdered(InscryptionTestBase):
+    options = {
+        "goal": 0,
+    }
+
+    def test_beatable(self) -> None:
+        for item_name in self.required_items_all_acts:
+            item = self.get_item_by_name(item_name)
+            self.collect(item)
+        for i in range(9):
+            item = self.get_item_by_name("Epitaph Piece")
+            self.collect(item)
+        self.assertBeatable(True)
+        for item_name in self.required_items_all_acts:
+            item = self.get_item_by_name(item_name)
+            self.remove(item)
+            self.assertBeatable(False)
+            self.collect(item)
+        item = self.get_item_by_name("Epitaph Piece")
+        self.remove(item)
+        self.assertBeatable(False)
+        self.collect(item)
+
+
+class GoalTestUnordered(InscryptionTestBase):
+    options = {
+        "goal": 1,
+    }
+
+    def test_beatable(self) -> None:
+        for item_name in self.required_items_all_acts:
+            item = self.get_item_by_name(item_name)
+            self.collect(item)
+        for i in range(9):
+            item = self.get_item_by_name("Epitaph Piece")
+            self.collect(item)
+        self.assertBeatable(True)
+        for item_name in self.required_items_all_acts:
+            item = self.get_item_by_name(item_name)
+            self.remove(item)
+            self.assertBeatable(False)
+            self.collect(item)
+        item = self.get_item_by_name("Epitaph Piece")
+        self.remove(item)
+        self.assertBeatable(False)
+        self.collect(item)
+
+
+class GoalTestAct1(InscryptionTestBase):
+    options = {
+        "goal": 2,
+    }
+
+    def test_beatable(self) -> None:
+        self.assertBeatable(False)
+        film_roll = self.get_item_by_name("Film Roll")
+        self.collect(film_roll)
+        self.assertBeatable(True)
+
+
+class GoalTestGroupedEpitaphs(InscryptionTestBase):
+    options = {
+        "epitaph_pieces_randomization": 1,
+    }
+
+    def test_beatable(self) -> None:
+        for item_name in self.required_items_all_acts:
+            item = self.get_item_by_name(item_name)
+            self.collect(item)
+        for i in range(3):
+            item = self.get_item_by_name("Epitaph Pieces")
+            self.collect(item)
+        self.assertBeatable(True)
+        for item_name in self.required_items_all_acts:
+            item = self.get_item_by_name(item_name)
+            self.remove(item)
+            self.assertBeatable(False)
+            self.collect(item)
+        item = self.get_item_by_name("Epitaph Pieces")
+        self.remove(item)
+        self.assertBeatable(False)
+        self.collect(item)
+
+
+class GoalTestEpitaphsAsOne(InscryptionTestBase):
+    options = {
+        "epitaph_pieces_randomization": 2,
+    }
+
+    def test_beatable(self) -> None:
+        for item_name in self.required_items_all_acts:
+            item = self.get_item_by_name(item_name)
+            self.collect(item)
+        item = self.get_item_by_name("Epitaph Pieces")
+        self.collect(item)
+        self.assertBeatable(True)
+        for item_name in self.required_items_all_acts:
+            item = self.get_item_by_name(item_name)
+            self.remove(item)
+            self.assertBeatable(False)
+            self.collect(item)
+        item = self.get_item_by_name("Epitaph Pieces")
+        self.remove(item)
+        self.assertBeatable(False)
+        self.collect(item)
diff --git a/worlds/inscryption/test/__init__.py b/worlds/inscryption/test/__init__.py
new file mode 100644
index 000000000000..31a0cd2b112e
--- /dev/null
+++ b/worlds/inscryption/test/__init__.py
@@ -0,0 +1,7 @@
+from test.bases import WorldTestBase
+
+
+class InscryptionTestBase(WorldTestBase):
+    game = "Inscryption"
+    required_items_all_acts = ["Film Roll", "Camera Replica", "Pile Of Meat", "Monocle",
+                               "Inspectometer Battery", "Gems Module", "Quill"]

From f3ec82962e18ec3a57e1f1984ba5270b0b0d145a Mon Sep 17 00:00:00 2001
From: Richard Snider <lighthousemaniac@gmail.com>
Date: Sun, 22 Dec 2024 18:05:43 +0000
Subject: [PATCH 186/381] Core: Add JSONMessagePart for Hint Status (Hint
 Priority) (#4387)

* add hint_status JSONMessagePart handling

* add docs for hint_status JSONMessagePart

* fix link ordering

* Rename hint_status type in docs

Co-authored-by: Emily <35015090+EmilyV99@users.noreply.github.com>

* Remove redundant explanation of hint_status field

Co-authored-by: Emily <35015090+EmilyV99@users.noreply.github.com>

* Fix formatting on hint status docs again

Co-authored-by: Emily <35015090+EmilyV99@users.noreply.github.com>

---------

Co-authored-by: Emily <35015090+EmilyV99@users.noreply.github.com>
---
 NetUtils.py              | 33 +++++++++++++++++++++++----------
 docs/network protocol.md |  2 ++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/NetUtils.py b/NetUtils.py
index a961850639a0..64a778c55ce8 100644
--- a/NetUtils.py
+++ b/NetUtils.py
@@ -10,6 +10,14 @@
 from Utils import ByValue, Version
 
 
+class HintStatus(enum.IntEnum):
+    HINT_FOUND = 0
+    HINT_UNSPECIFIED = 1
+    HINT_NO_PRIORITY = 10
+    HINT_AVOID = 20
+    HINT_PRIORITY = 30
+
+
 class JSONMessagePart(typing.TypedDict, total=False):
     text: str
     # optional
@@ -19,6 +27,8 @@ class JSONMessagePart(typing.TypedDict, total=False):
     player: int
     # if type == item indicates item flags
     flags: int
+    # if type == hint_status
+    hint_status: HintStatus
 
 
 class ClientStatus(ByValue, enum.IntEnum):
@@ -29,14 +39,6 @@ class ClientStatus(ByValue, enum.IntEnum):
     CLIENT_GOAL = 30
 
 
-class HintStatus(enum.IntEnum):
-    HINT_FOUND = 0
-    HINT_UNSPECIFIED = 1
-    HINT_NO_PRIORITY = 10
-    HINT_AVOID = 20
-    HINT_PRIORITY = 30
-
-
 class SlotType(ByValue, enum.IntFlag):
     spectator = 0b00
     player = 0b01
@@ -192,6 +194,7 @@ class JSONTypes(str, enum.Enum):
     location_name = "location_name"
     location_id = "location_id"
     entrance_name = "entrance_name"
+    hint_status = "hint_status"
 
 
 class JSONtoTextParser(metaclass=HandlerMeta):
@@ -273,6 +276,10 @@ def _handle_entrance_name(self, node: JSONMessagePart):
         node["color"] = 'blue'
         return self._handle_color(node)
 
+    def _handle_hint_status(self, node: JSONMessagePart):
+        node["color"] = status_colors.get(node["hint_status"], "red")
+        return self._handle_color(node)
+
 
 class RawJSONtoTextParser(JSONtoTextParser):
     def _handle_color(self, node: JSONMessagePart):
@@ -319,6 +326,13 @@ def add_json_location(parts: list, location_id: int, player: int = 0, **kwargs)
     HintStatus.HINT_AVOID: "salmon",
     HintStatus.HINT_PRIORITY: "plum",
 }
+
+
+def add_json_hint_status(parts: list, hint_status: HintStatus, text: typing.Optional[str] = None, **kwargs):
+    parts.append({"text": text if text != None else status_names.get(hint_status, "(unknown)"),
+                  "hint_status": hint_status, "type": JSONTypes.hint_status, **kwargs})
+
+
 class Hint(typing.NamedTuple):
     receiving_player: int
     finding_player: int
@@ -363,8 +377,7 @@ def as_network_message(self) -> dict:
         else:
             add_json_text(parts, "'s World")
         add_json_text(parts, ". ")
-        add_json_text(parts, status_names.get(self.status, "(unknown)"), type="color",
-                      color=status_colors.get(self.status, "red"))
+        add_json_hint_status(parts, self.status)
 
         return {"cmd": "PrintJSON", "data": parts, "type": "Hint",
                 "receiving": self.receiving_player,
diff --git a/docs/network protocol.md b/docs/network protocol.md
index 4331cf971007..2ad8d4c4d1bc 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -554,6 +554,7 @@ class JSONMessagePart(TypedDict):
     color: Optional[str] # only available if type is a color
     flags: Optional[int] # only available if type is an item_id or item_name
     player: Optional[int] # only available if type is either item or location
+    hint_status: Optional[HintStatus] # only available if type is hint_status
 ```
 
 `type` is used to denote the intent of the message part. This can be used to indicate special information which may be rendered differently depending on client. How these types are displayed in Archipelago's ALttP client is not the end-all be-all. Other clients may choose to interpret and display these messages differently.
@@ -569,6 +570,7 @@ Possible values for `type` include:
 | location_id | Location ID, should be resolved to Location Name |
 | location_name | Location Name, not currently used over network, but supported by reference Clients. |
 | entrance_name | Entrance Name. No ID mapping exists. |
+| hint_status | The [HintStatus](#HintStatus) of the hint. Both `text` and `hint_status` are given. |
 | color | Regular text that should be colored. Only `type` that will contain `color` data. |
 
 

From 78637c96a747dd15584fb85a281d447b8307ebe0 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Tue, 24 Dec 2024 17:38:46 +0000
Subject: [PATCH 187/381] Tests: Add spheres test for missing indirect
 conditions (#3924)

Co-authored-by: Fabian Dill <Berserker66@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>
---
 test/general/test_implemented.py | 65 ++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/test/general/test_implemented.py b/test/general/test_implemented.py
index e76d539451ea..756cfa8bb67d 100644
--- a/test/general/test_implemented.py
+++ b/test/general/test_implemented.py
@@ -52,3 +52,68 @@ def test_slot_data(self):
     def test_no_failed_world_loads(self):
         if failed_world_loads:
             self.fail(f"The following worlds failed to load: {failed_world_loads}")
+
+    def test_explicit_indirect_conditions_spheres(self):
+        """Tests that worlds using explicit indirect conditions produce identical spheres as when using implicit
+        indirect conditions"""
+        # Because the iteration order of blocked_connections in CollectionState.update_reachable_regions() is
+        # nondeterministic, this test may sometimes pass with the same seed even when there are missing indirect
+        # conditions.
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            multiworld = setup_solo_multiworld(world_type)
+            world = multiworld.get_game_worlds(game_name)[0]
+            if not world.explicit_indirect_conditions:
+                # The world does not use explicit indirect conditions, so it can be skipped.
+                continue
+            # The world may override explicit_indirect_conditions as a property that cannot be set, so try modifying it.
+            try:
+                world.explicit_indirect_conditions = False
+                world.explicit_indirect_conditions = True
+            except Exception:
+                # Could not modify the attribute, so skip this world.
+                with self.subTest(game=game_name, skipped="world.explicit_indirect_conditions could not be set"):
+                    continue
+            with self.subTest(game=game_name, seed=multiworld.seed):
+                distribute_items_restrictive(multiworld)
+                call_all(multiworld, "post_fill")
+
+                # Note: `multiworld.get_spheres()` iterates a set of locations, so the order that locations are checked
+                # is nondeterministic and may vary between runs with the same seed.
+                explicit_spheres = list(multiworld.get_spheres())
+                # Disable explicit indirect conditions and produce a second list of spheres.
+                world.explicit_indirect_conditions = False
+                implicit_spheres = list(multiworld.get_spheres())
+
+                # Both lists should be identical.
+                if explicit_spheres == implicit_spheres:
+                    # Test passed.
+                    continue
+
+                # Find the first sphere that was different and provide a useful failure message.
+                zipped = zip(explicit_spheres, implicit_spheres)
+                for sphere_num, (sphere_explicit, sphere_implicit) in enumerate(zipped, start=1):
+                    # Each sphere created with explicit indirect conditions should be identical to the sphere created
+                    # with implicit indirect conditions.
+                    if sphere_explicit != sphere_implicit:
+                        reachable_only_with_implicit = sorted(sphere_implicit - sphere_explicit)
+                        if reachable_only_with_implicit:
+                            locations_and_parents = [(loc, loc.parent_region) for loc in reachable_only_with_implicit]
+                            self.fail(f"Sphere {sphere_num} created with explicit indirect conditions did not contain"
+                                      f" the same locations as sphere {sphere_num} created with implicit indirect"
+                                      f" conditions. There may be missing indirect conditions for connections to the"
+                                      f" locations' parent regions or connections from other regions which connect to"
+                                      f" these regions."
+                                      f"\nLocations that should have been reachable in sphere {sphere_num} and their"
+                                      f" parent regions:"
+                                      f"\n{locations_and_parents}")
+                        else:
+                            # Some locations were only present in the sphere created with explicit indirect conditions.
+                            # This should not happen because missing indirect conditions should only reduce
+                            # accessibility, not increase accessibility.
+                            reachable_only_with_explicit = sorted(sphere_explicit - sphere_implicit)
+                            self.fail(f"Sphere {sphere_num} created with explicit indirect conditions contained more"
+                                      f" locations than sphere {sphere_num} created with implicit indirect conditions."
+                                      f" This should not happen."
+                                      f"\nUnexpectedly reachable locations in sphere {sphere_num}:"
+                                      f"\n{reachable_only_with_explicit}")
+                self.fail("Unreachable")

From 5578ccd578be4aff3b4542970f8bd7cacac5c526 Mon Sep 17 00:00:00 2001
From: Dinopony <dinopony.gg@gmail.com>
Date: Tue, 24 Dec 2024 20:08:03 +0100
Subject: [PATCH 188/381] Landstalker: Fix issues on generation (#4345)

---
 worlds/landstalker/Constants.py               | 28 +++++++++++++++
 worlds/landstalker/Hints.py                   |  2 +-
 worlds/landstalker/Items.py                   |  3 +-
 worlds/landstalker/Locations.py               | 16 +++++----
 worlds/landstalker/__init__.py                | 20 ++++++++---
 worlds/landstalker/data/world_node.py         | 36 +++++++++++++++++++
 worlds/landstalker/data/world_path.py         | 25 +++++++++++++
 worlds/landstalker/data/world_region.py       | 13 ++++---
 .../landstalker/data/world_teleport_tree.py   | 10 +++---
 9 files changed, 131 insertions(+), 22 deletions(-)
 create mode 100644 worlds/landstalker/Constants.py

diff --git a/worlds/landstalker/Constants.py b/worlds/landstalker/Constants.py
new file mode 100644
index 000000000000..ad4dc6ce7ae6
--- /dev/null
+++ b/worlds/landstalker/Constants.py
@@ -0,0 +1,28 @@
+
+BASE_ITEM_ID = 4000
+
+BASE_LOCATION_ID = 4000
+BASE_GROUND_LOCATION_ID = BASE_LOCATION_ID + 256
+BASE_SHOP_LOCATION_ID = BASE_GROUND_LOCATION_ID + 30
+BASE_REWARD_LOCATION_ID = BASE_SHOP_LOCATION_ID + 50
+
+ENDGAME_REGIONS = [
+    "kazalt",
+    "king_nole_labyrinth_pre_door",
+    "king_nole_labyrinth_post_door",
+    "king_nole_labyrinth_exterior",
+    "king_nole_labyrinth_fall_from_exterior",
+    "king_nole_labyrinth_path_to_palace",
+    "king_nole_labyrinth_raft_entrance",
+    "king_nole_labyrinth_raft",
+    "king_nole_labyrinth_sacred_tree",
+    "king_nole_palace"
+]
+
+ENDGAME_PROGRESSION_ITEMS = [
+    "Gola's Nail",
+    "Gola's Fang",
+    "Gola's Horn",
+    "Logs",
+    "Snow Spikes"
+]
\ No newline at end of file
diff --git a/worlds/landstalker/Hints.py b/worlds/landstalker/Hints.py
index 5309e85032ea..4211e0ef3bb1 100644
--- a/worlds/landstalker/Hints.py
+++ b/worlds/landstalker/Hints.py
@@ -45,7 +45,7 @@ def generate_lithograph_hint(world: "LandstalkerWorld"):
             words.append(item.name.split(" ")[0].upper())
         if item.location.player != world.player:
             # Add player name if it's not in our own world
-            player_name = world.multiworld.get_player_name(world.player)
+            player_name = world.multiworld.get_player_name(item.location.player)
             words.append(player_name.upper())
         world.random.shuffle(words)
         hint_text += " ".join(words) + "\n"
diff --git a/worlds/landstalker/Items.py b/worlds/landstalker/Items.py
index ad7efa1cb27a..6424a37f9a1e 100644
--- a/worlds/landstalker/Items.py
+++ b/worlds/landstalker/Items.py
@@ -1,8 +1,7 @@
 from typing import Dict, List, NamedTuple
 
 from BaseClasses import Item, ItemClassification
-
-BASE_ITEM_ID = 4000
+from .Constants import BASE_ITEM_ID
 
 
 class LandstalkerItem(Item):
diff --git a/worlds/landstalker/Locations.py b/worlds/landstalker/Locations.py
index 0fe63526c63b..25d02ca527f4 100644
--- a/worlds/landstalker/Locations.py
+++ b/worlds/landstalker/Locations.py
@@ -1,15 +1,11 @@
 from typing import Dict, Optional
 
 from BaseClasses import Location, ItemClassification, Item
+from .Constants import *
 from .Regions import LandstalkerRegion
 from .data.item_source import ITEM_SOURCES_JSON
 from .data.world_path import WORLD_PATHS_JSON
 
-BASE_LOCATION_ID = 4000
-BASE_GROUND_LOCATION_ID = BASE_LOCATION_ID + 256
-BASE_SHOP_LOCATION_ID = BASE_GROUND_LOCATION_ID + 30
-BASE_REWARD_LOCATION_ID = BASE_SHOP_LOCATION_ID + 50
-
 
 class LandstalkerLocation(Location):
     game: str = "Landstalker - The Treasures of King Nole"
@@ -21,10 +17,14 @@ def __init__(self, player: int, name: str, location_id: Optional[int], region: L
         self.type_string = type_string
 
 
-def create_locations(player: int, regions_table: Dict[str, LandstalkerRegion], name_to_id_table: Dict[str, int]):
+def create_locations(player: int, regions_table: Dict[str, LandstalkerRegion],
+                     name_to_id_table: Dict[str, int], reach_kazalt_goal: bool):
     # Create real locations from the data inside the corresponding JSON file
     for data in ITEM_SOURCES_JSON:
         region_id = data["nodeId"]
+        # If "Reach Kazalt" goal is enabled and location is beyond Kazalt, don't create it
+        if reach_kazalt_goal and region_id in ENDGAME_REGIONS:
+            continue
         region = regions_table[region_id]
         new_location = LandstalkerLocation(player, data["name"], name_to_id_table[data["name"]], region, data["type"])
         region.locations.append(new_location)
@@ -32,6 +32,10 @@ def create_locations(player: int, regions_table: Dict[str, LandstalkerRegion], n
     # Create fake event locations that will be used to determine if some key regions has been visited
     regions_with_entrance_checks = []
     for data in WORLD_PATHS_JSON:
+        # If "Reach Kazalt" goal is enabled and region is beyond Kazalt, don't create any event for it since it would
+        # be useless anyway
+        if reach_kazalt_goal and data["fromId"] in ENDGAME_REGIONS:
+            continue
         if "requiredNodes" in data:
             regions_with_entrance_checks.extend([region_id for region_id in data["requiredNodes"]])
     regions_with_entrance_checks = sorted(set(regions_with_entrance_checks))
diff --git a/worlds/landstalker/__init__.py b/worlds/landstalker/__init__.py
index 8463e56e54c1..cfdc335c484e 100644
--- a/worlds/landstalker/__init__.py
+++ b/worlds/landstalker/__init__.py
@@ -2,6 +2,7 @@
 
 from BaseClasses import LocationProgressType, Tutorial
 from worlds.AutoWorld import WebWorld, World
+from .Constants import *
 from .Hints import *
 from .Items import *
 from .Locations import *
@@ -87,7 +88,8 @@ def generate_early(self):
 
     def create_regions(self):
         self.regions_table = Regions.create_regions(self)
-        Locations.create_locations(self.player, self.regions_table, self.location_name_to_id)
+        Locations.create_locations(self.player, self.regions_table, self.location_name_to_id,
+                                   self.options.goal == "reach_kazalt")
         self.create_teleportation_trees()
 
     def create_item(self, name: str, classification_override: Optional[ItemClassification] = None) -> LandstalkerItem:
@@ -109,7 +111,16 @@ def create_items(self):
             # If item is an armor and progressive armors are enabled, transform it into a progressive armor item
             if self.options.progressive_armors and "Breast" in name:
                 name = "Progressive Armor"
-            item_pool += [self.create_item(name) for _ in range(data.quantity)]
+
+            qty = data.quantity
+            if self.options.goal == "reach_kazalt":
+                # In "Reach Kazalt" goal, remove all endgame progression items that would be useless anyway
+                if name in ENDGAME_PROGRESSION_ITEMS:
+                    continue
+                # Also reduce quantities for most filler items to let space for more EkeEke (see end of function)
+                if data.classification == ItemClassification.filler:
+                    qty = int(qty * 0.8)
+            item_pool += [self.create_item(name) for _ in range(qty)]
 
         # If the appropriate setting is on, place one EkeEke in one shop in every town in the game
         if self.options.ensure_ekeeke_in_shops:
@@ -120,9 +131,10 @@ def create_items(self):
                 "Mercator: Shop item #1",
                 "Verla: Shop item #1",
                 "Destel: Inn item",
-                "Route to Lake Shrine: Greedly's shop item #1",
-                "Kazalt: Shop item #1"
+                "Route to Lake Shrine: Greedly's shop item #1"
             ]
+            if self.options.goal != "reach_kazalt":
+                shops_to_fill.append("Kazalt: Shop item #1")
             for location_name in shops_to_fill:
                 self.multiworld.get_location(location_name, self.player).place_locked_item(self.create_item("EkeEke"))
 
diff --git a/worlds/landstalker/data/world_node.py b/worlds/landstalker/data/world_node.py
index f786f9613fba..0b0c56a74e69 100644
--- a/worlds/landstalker/data/world_node.py
+++ b/worlds/landstalker/data/world_node.py
@@ -73,6 +73,22 @@
             "between Gumi and Ryuma"
         ]
     },
+    "tibor_tree": {
+        "name": "Route from Gumi to Ryuma (Tibor tree)",
+        "hints": [
+            "on a route",
+            "in a region inhabited by bears",
+            "between Gumi and Ryuma"
+        ]
+    },
+    "mercator_gate_tree": {
+        "name": "Route from Gumi to Ryuma (Mercator gate tree)",
+        "hints": [
+            "on a route",
+            "in a region inhabited by bears",
+            "between Gumi and Ryuma"
+        ]
+    },
     "tibor": {
         "name": "Tibor",
         "hints": [
@@ -223,6 +239,13 @@
             "in the infamous Greenmaze"
         ]
     },
+    "greenmaze_post_whistle_tree": {
+        "name": "Greenmaze (post-whistle tree)",
+        "hints": [
+            "among the trees",
+            "in the infamous Greenmaze"
+        ]
+    },
     "verla_shore": {
         "name": "Verla shore",
         "hints": [
@@ -230,6 +253,13 @@
             "near the town of Verla"
         ]
     },
+    "verla_shore_tree": {
+        "name": "Verla shore tree",
+        "hints": [
+            "on a route",
+            "near the town of Verla"
+        ]
+    },
     "verla_shore_cliff": {
         "name": "Verla shore cliff (accessible from Verla Mines)",
         "hints": [
@@ -326,6 +356,12 @@
             "in a mountainous area"
         ]
     },
+    "mountainous_area_tree": {
+        "name": "Mountainous Area tree",
+        "hints": [
+            "in a mountainous area"
+        ]
+    },
     "king_nole_cave": {
         "name": "King Nole's Cave",
         "hints": [
diff --git a/worlds/landstalker/data/world_path.py b/worlds/landstalker/data/world_path.py
index f7baba358a48..572149a73529 100644
--- a/worlds/landstalker/data/world_path.py
+++ b/worlds/landstalker/data/world_path.py
@@ -54,6 +54,16 @@
         "toId": "ryuma",
         "twoWay": True
     },
+    {
+        "fromId": "route_gumi_ryuma",
+        "toId": "tibor_tree",
+        "twoWay": True
+    },
+    {
+        "fromId": "route_gumi_ryuma",
+        "toId": "mercator_gate_tree",
+        "twoWay": True
+    },
     {
         "fromId": "ryuma",
         "toId": "ryuma_after_thieves_hideout",
@@ -211,6 +221,11 @@
         ],
         "twoWay": True
     },
+    {
+        "fromId": "greenmaze_post_whistle",
+        "toId": "greenmaze_post_whistle_tree",
+        "twoWay": True
+    },
     {
         "fromId": "greenmaze_post_whistle",
         "toId": "route_massan_gumi"
@@ -253,6 +268,11 @@
         "fromId": "verla_shore_cliff",
         "toId": "verla_shore"
     },
+    {
+        "fromId": "verla_shore",
+        "toId": "verla_shore_tree",
+        "twoWay": True
+    },
     {
         "fromId": "verla_shore",
         "toId": "mir_tower_sector",
@@ -316,6 +336,11 @@
             "Axe Magic"
         ]
     },
+    {
+        "fromId": "mountainous_area",
+        "toId": "mountainous_area_tree",
+        "twoWay": True
+    },
     {
         "fromId": "mountainous_area",
         "toId": "route_lake_shrine_cliff",
diff --git a/worlds/landstalker/data/world_region.py b/worlds/landstalker/data/world_region.py
index 3365a9dfa9e2..81ff94452257 100644
--- a/worlds/landstalker/data/world_region.py
+++ b/worlds/landstalker/data/world_region.py
@@ -57,7 +57,9 @@
         "name": "Route between Gumi and Ryuma",
         "canBeHintedAsRequired": False,
         "nodeIds": [
-            "route_gumi_ryuma"
+            "route_gumi_ryuma",
+            "tibor_tree",
+            "mercator_gate_tree"
         ]
     },
     {
@@ -157,7 +159,8 @@
         "hintName": "in Greenmaze",
         "nodeIds": [
             "greenmaze_pre_whistle",
-            "greenmaze_post_whistle"
+            "greenmaze_post_whistle",
+            "greenmaze_post_whistle_tree"
         ]
     },
     {
@@ -165,7 +168,8 @@
         "canBeHintedAsRequired": False,
         "nodeIds": [
             "verla_shore",
-            "verla_shore_cliff"
+            "verla_shore_cliff",
+            "verla_shore_tree"
         ]
     },
     {
@@ -244,7 +248,8 @@
         "name": "Mountainous Area",
         "hintName": "in the mountainous area",
         "nodeIds": [
-            "mountainous_area"
+            "mountainous_area",
+            "mountainous_area_tree"
         ]
     },
     {
diff --git a/worlds/landstalker/data/world_teleport_tree.py b/worlds/landstalker/data/world_teleport_tree.py
index 830f5547201e..f3b92affd3a6 100644
--- a/worlds/landstalker/data/world_teleport_tree.py
+++ b/worlds/landstalker/data/world_teleport_tree.py
@@ -8,19 +8,19 @@
         {
             "name": "Tibor tree",
             "treeMapId": 534,
-            "nodeId": "route_gumi_ryuma"
+            "nodeId": "tibor_tree"
         }
     ],
     [
         {
             "name": "Mercator front gate tree",
             "treeMapId": 539,
-            "nodeId": "route_gumi_ryuma"
+            "nodeId": "mercator_gate_tree"
         },
         {
             "name": "Verla shore tree",
             "treeMapId": 537,
-            "nodeId": "verla_shore"
+            "nodeId": "verla_shore_tree"
         }
     ],
     [
@@ -44,7 +44,7 @@
         {
             "name": "Mountainous area tree",
             "treeMapId": 535,
-            "nodeId": "mountainous_area"
+            "nodeId": "mountainous_area_tree"
         }
     ],
     [
@@ -56,7 +56,7 @@
         {
             "name": "Greenmaze end tree",
             "treeMapId": 511,
-            "nodeId": "greenmaze_post_whistle"
+            "nodeId": "greenmaze_post_whistle_tree"
         }
     ]
 ]
\ No newline at end of file

From 6c1dc5f645ad215347eaecc2a5f5de0d2fd13365 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Wed, 25 Dec 2024 01:44:47 +0000
Subject: [PATCH 189/381] Landstalker: Fix paths Lantern logic affecting other
 Landstalker worlds (#4394)

The data from `WORLD_PATHS_JSON` is supposed to be constant logic data
shared by all Landstalker worlds, but `add_path_requirements()` was
modifying this data such that after adding a `Lantern` requirement for a
dark region, subsequent Landstalker worlds to have their logic set could
also be affected by this `Lantern` requirement and previous Landstalker
worlds without damage boosting logic could also be affected by this
`Lantern` requirement because they could all be using the same list
instances. This issue would only occur for paths that have
`"requiredItems"` because all paths without required items would create
a new empty list, avoiding the problem.

The items in `data["itemsPlacedWhenCrossing"]` were also getting added
once for each Landstalker player, but there are no paths that have both
`"itemsPlacedWhenCrossing"` and `"requiredItems"`, so all such cases
would start from a new empty list of required items and avoid modifying
`WORLD_PATHS_JSON`.
---
 worlds/landstalker/Rules.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/worlds/landstalker/Rules.py b/worlds/landstalker/Rules.py
index 94171944d7b2..60f4cdde2901 100644
--- a/worlds/landstalker/Rules.py
+++ b/worlds/landstalker/Rules.py
@@ -37,7 +37,8 @@ def add_path_requirements(world: "LandstalkerWorld"):
         name = data["fromId"] + " -> " + data["toId"]
 
         # Determine required items to reach this region
-        required_items = data["requiredItems"] if "requiredItems" in data else []
+        # WORLD_PATHS_JSON is shared by all Landstalker worlds, so a copy is made to prevent modifying the original
+        required_items = data["requiredItems"].copy() if "requiredItems" in data else []
         if "itemsPlacedWhenCrossing" in data:
             required_items += data["itemsPlacedWhenCrossing"]
 

From b05f81b4b4f8f63368c7ebcf0aa5d3223357e1ce Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 25 Dec 2024 10:58:27 +0100
Subject: [PATCH 190/381] =?UTF-8?q?The=20Witness:=20Fix=20bridge/elevator?=
 =?UTF-8?q?=20items=20being=20progression=20when=20they=20shouldn't=20be?=
 =?UTF-8?q?=C2=A0#4392?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worlds/witness/player_logic.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index 9e6c9597382b..aea2953abb50 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -927,7 +927,6 @@ def determine_unrequired_entities(self, world: "WitnessWorld") -> None:
 
         # Gather quick references to relevant options
         eps_shuffled = world.options.shuffle_EPs
-        come_to_you = world.options.elevators_come_to_you
         difficulty = world.options.puzzle_randomization
         discards_shuffled = world.options.shuffle_discarded_panels
         boat_shuffled = world.options.shuffle_boat
@@ -939,6 +938,9 @@ def determine_unrequired_entities(self, world: "WitnessWorld") -> None:
         shortbox_req = world.options.mountain_lasers
         longbox_req = world.options.challenge_lasers
 
+        swamp_bridge_comes_to_you = "Swamp Long Bridge" in world.options.elevators_come_to_you
+        quarry_elevator_comes_to_you = "Quarry Elevator" in world.options.elevators_come_to_you
+
         # Make some helper booleans so it is easier to follow what's going on
         mountain_upper_is_in_postgame = (
                 goal == "mountain_box_short"
@@ -956,8 +958,8 @@ def determine_unrequired_entities(self, world: "WitnessWorld") -> None:
             "0x17D02": eps_shuffled,  # Windmill Turn Control
             "0x0368A": symbols_shuffled or door_panels,  # Quarry Stoneworks Stairs Door
             "0x3865F": symbols_shuffled or door_panels or eps_shuffled,  # Quarry Boathouse 2nd Barrier
-            "0x17CC4": come_to_you or eps_shuffled,  # Quarry Elevator Panel
-            "0x17E2B": come_to_you and boat_shuffled or eps_shuffled,  # Swamp Long Bridge
+            "0x17CC4": quarry_elevator_comes_to_you or eps_shuffled,  # Quarry Elevator Panel
+            "0x17E2B": swamp_bridge_comes_to_you and boat_shuffled or eps_shuffled,  # Swamp Long Bridge
             "0x0CF2A": False,  # Jungle Monastery Garden Shortcut
             "0x0364E": False,  # Monastery Laser Shortcut Door
             "0x03713": remote_doors,  # Monastery Laser Shortcut Panel

From 845000d10faa8cdf1c6ac293dcdfecc4c69a213d Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 25 Dec 2024 21:47:17 +0100
Subject: [PATCH 191/381] Docs: Make an actual LogicMixin spec & explanation
 (#3975)

* Docs: Make an actual LogicMixin spec & explanation

* Update world api.md

* Update world api.md

* Update world api.md

* Update world api.md

* Update world api.md

* Update world api.md

* Update world api.md

* Update world api.md

* Update world api.md

* Update world api.md

* Update docs/world api.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update docs/world api.md

* Update world api.md

* Code corrections / actually follow own spec

* Update docs/world api.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update world api.md

* Update world api.md

* Reorganize / Rewrite the parts about optimisations a bit

* Update world api.md

* Write a big motivation paragraph

* Update world api.md

* Update world api.md

* line break issues

* Update docs/world api.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update docs/world api.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update docs/world api.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Update world api.md

* Update docs/world api.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---
 docs/world api.md | 89 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 3 deletions(-)

diff --git a/docs/world api.md b/docs/world api.md
index 20669d7ae7be..445e68e71e3c 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -699,9 +699,92 @@ When importing a file that defines a class that inherits from `worlds.AutoWorld.
 is automatically extended by the mixin's members. These members should be prefixed with the name of the implementing
 world since the namespace is shared with all other logic mixins.
 
-Some uses could be to add additional variables to the state object, or to have a custom state machine that gets modified
-with the state.
-Please do this with caution and only when necessary.
+LogicMixin is handy when your logic is more complex than one-to-one location-item relationships.  
+A game in which "The red key opens the red door" can just express this relationship through a one-line access rule.  
+But now, consider a game with a heavy focus on combat, where the main logical consideration is which enemies you can
+defeat with your current items.  
+There could be dozens of weapons, armor pieces, or consumables that each improve your ability to defeat
+specific enemies to varying degrees. It would be useful to be able to keep track of "defeatable enemies" as a state variable,
+and have this variable be recalculated as necessary based on newly collected/removed items.
+This is the capability of LogicMixin: Adding custom variables to state that get recalculated as necessary.
+
+In general, a LogicMixin class should have at least one mutable variable that is tracking some custom state per player,
+as well as `init_mixin` and `copy_mixin` functions so that this variable gets initialized and copied correctly when
+`CollectionState()` and `CollectionState.copy()` are called respectively.
+
+```python
+from BaseClasses import CollectionState, MultiWorld
+from worlds.AutoWorld import LogicMixin
+
+class MyGameState(LogicMixin):
+    mygame_defeatable_enemies: Dict[int, Set[str]]  # per player
+
+    def init_mixin(self, multiworld: MultiWorld) -> None:
+        # Initialize per player with the corresponding "nothing" value, such as 0 or an empty set.
+        # You can also use something like Collections.defaultdict
+        self.mygame_defeatable_enemies = {
+            player: set() for player in multiworld.get_game_players("My Game")
+        }
+
+    def copy_mixin(self, new_state: CollectionState) -> CollectionState:
+        # Be careful to make a "deep enough" copy here!
+        new_state.mygame_defeatable_enemies = {
+            player: enemies.copy() for player, enemies in self.mygame_defeatable_enemies.items()
+        }
+```
+
+After doing this, you can now access `state.mygame_defeatable_enemies[player]` from your access rules.
+
+Usually, doing this coincides with an override of `World.collect` and `World.remove`, where the custom state variable 
+gets recalculated when a relevant item is collected or removed.
+
+```python
+# __init__.py
+
+def collect(self, state: CollectionState, item: Item) -> bool:
+    change = super().collect(state, item)
+    if change and item in COMBAT_ITEMS:
+        state.mygame_defeatable_enemies[self.player] |= get_newly_unlocked_enemies(state)
+    return change
+
+def remove(self, state: CollectionState, item: Item) -> bool:
+    change = super().remove(state, item)
+    if change and item in COMBAT_ITEMS:
+        state.mygame_defeatable_enemies[self.player] -= get_newly_locked_enemies(state)
+    return change
+```
+
+Using LogicMixin can greatly slow down your code if you don't use it intelligently. This is because `collect`
+and `remove` are called very frequently during fill. If your `collect` & `remove` cause a heavy calculation
+every time, your code might end up being *slower* than just doing calculations in your access rules.
+
+One way to optimise recalculations is to make use of the fact that `collect` should only unlock things,
+and `remove` should only lock things.  
+In our example, we have two different functions: `get_newly_unlocked_enemies` and `get_newly_locked_enemies`.  
+`get_newly_unlocked_enemies` should only consider enemies that are *not already in the set*
+and check whether they were **unlocked**.  
+`get_newly_locked_enemies` should only consider enemies that are *already in the set*
+and check whether they **became locked**.
+
+Another impactful way to optimise LogicMixin is to use caching.  
+Your custom state variables don't actually need to be recalculated on every `collect` / `remove`, because there are
+often multiple calls to `collect` / `remove` between access rule calls. Thus, it would be much more efficient to hold
+off on recaculating until the an actual access rule call happens.  
+A common way to realize this is to define a `mygame_state_is_stale` variable that is set to True in `collect`, `remove`,
+and `init_mixin`. The calls to the actual recalculating functions are then moved to the start of the relevant
+access rules like this:
+
+```python
+def can_defeat_enemy(state: CollectionState, player: int, enemy: str) -> bool:
+    if state.mygame_state_is_stale[player]:
+        state.mygame_defeatable_enemies[player] = recalculate_defeatable_enemies(state)
+        state.mygame_state_is_stale[player] = False
+
+    return enemy in state.mygame_defeatable_enemies[player]
+```
+
+Only use LogicMixin if necessary. There are often other ways to achieve what it does, like making clever use of
+`state.prog_items`, using event items, pseudo-regions, etc.
 
 #### pre_fill
 

From 222c8aa0ae0ebbedb9884812087c38e15e381ed1 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 25 Dec 2024 21:47:51 +0100
Subject: [PATCH 192/381] Core: Reword item classification definitions to allow
 for progression + useful (#3925)

* Core: Reword item classification definitions to allow for progression + useful

* Update network protocol.md

* Update world api.md

* Update Fill.py

* Docstrings

* Update BaseClasses.py

* Update advanced_settings_en.md

* Update advanced_settings_en.md

* Update advanced_settings_en.md

* space
---
 BaseClasses.py                              | 27 +++++++++++++++------
 Fill.py                                     |  2 +-
 docs/network protocol.md                    |  2 +-
 docs/world api.md                           |  3 ++-
 worlds/generic/docs/advanced_settings_en.md |  4 +--
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 98ada4f861ec..e5c187b9117f 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1254,13 +1254,26 @@ def hint_text(self) -> str:
 
 
 class ItemClassification(IntFlag):
-    filler = 0b0000  # aka trash, as in filler items like ammo, currency etc,
-    progression = 0b0001  # Item that is logically relevant
-    useful = 0b0010  # Item that is generally quite useful, but not required for anything logical
-    trap = 0b0100  # detrimental item
-    skip_balancing = 0b1000  # should technically never occur on its own
-    # Item that is logically relevant, but progression balancing should not touch.
-    # Typically currency or other counted items.
+    filler = 0b0000
+    """ aka trash, as in filler items like ammo, currency etc """
+
+    progression = 0b0001
+    """ Item that is logically relevant.
+    Protects this item from being placed on excluded or unreachable locations. """
+
+    useful = 0b0010
+    """ Item that is especially useful.
+    Protects this item from being placed on excluded or unreachable locations.
+    When combined with another flag like "progression", it means "an especially useful progression item". """
+
+    trap = 0b0100
+    """ Item that is detrimental in some way. """
+
+    skip_balancing = 0b1000
+    """ should technically never occur on its own
+    Item that is logically relevant, but progression balancing should not touch.
+    Typically currency or other counted items. """
+
     progression_skip_balancing = 0b1001  # only progression gets balanced
 
     def as_flag(self) -> int:
diff --git a/Fill.py b/Fill.py
index 86a4639c51ce..45c4def9e322 100644
--- a/Fill.py
+++ b/Fill.py
@@ -537,7 +537,7 @@ def mark_for_locking(location: Location):
     if excludedlocations:
         raise FillError(
             f"Not enough filler items for excluded locations. "
-            f"There are {len(excludedlocations)} more excluded locations than filler or trap items.",
+            f"There are {len(excludedlocations)} more excluded locations than excludable items.",
             multiworld=multiworld,
         )
 
diff --git a/docs/network protocol.md b/docs/network protocol.md
index 2ad8d4c4d1bc..160f83031c9b 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -540,7 +540,7 @@ In JSON this may look like:
 | ----- | ----- |
 | 0 | Nothing special about this item |
 | 0b001 | If set, indicates the item can unlock logical advancement |
-| 0b010 | If set, indicates the item is important but not in a way that unlocks advancement |
+| 0b010 | If set, indicates the item is especially useful |
 | 0b100 | If set, indicates the item is a trap |
 
 ### JSONMessagePart
diff --git a/docs/world api.md b/docs/world api.md
index 445e68e71e3c..487c5b4a360c 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -248,7 +248,8 @@ will all have the same ID. Name must not be numeric (must contain at least 1 let
 Other classifications include:
 
 * `filler`: a regular item or trash item
-* `useful`: generally quite useful, but not required for anything logical. Cannot be placed on excluded locations
+* `useful`: item that is especially useful. Cannot be placed on excluded or unreachable locations. When combined with
+another flag like "progression", it means "an especially useful progression item".
 * `trap`: negative impact on the player
 * `skip_balancing`: denotes that an item should not be moved to an earlier sphere for the purpose of balancing (to be
   combined with `progression`; see below)
diff --git a/worlds/generic/docs/advanced_settings_en.md b/worlds/generic/docs/advanced_settings_en.md
index 2197c0708e9c..e78eb91592a3 100644
--- a/worlds/generic/docs/advanced_settings_en.md
+++ b/worlds/generic/docs/advanced_settings_en.md
@@ -131,8 +131,8 @@ guide: [Archipelago Plando Guide](/tutorial/Archipelago/plando/en)
   the location without using any hint points.
 * `start_location_hints` is the same as `start_hints` but for locations, allowing you to hint for the item contained
   there without using any hint points.
-* `exclude_locations` lets you define any locations that you don't want to do and forces a filler or trap item which
-  isn't necessary for progression into these locations.
+* `exclude_locations` lets you define any locations that you don't want to do and prevents items classified as
+  "progression" or "useful" from being placed on them.
 * `priority_locations` lets you define any locations that you want to do and forces a progression item into these
   locations.
 * `item_links` allows players to link their items into a group with the same item link name and game. The items declared

From fe810535211ca9ab57ed3b7649a272035d59e3a7 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 25 Dec 2024 21:53:05 +0100
Subject: [PATCH 193/381] Core: Give the option to worlds to have a remaining
 fill that respects excluded locations (#3738)

* Give the option to worlds to have a remaining fill that respects excluded

* comment
---
 Fill.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Fill.py b/Fill.py
index 45c4def9e322..5bbbfa79c28f 100644
--- a/Fill.py
+++ b/Fill.py
@@ -235,18 +235,30 @@ def remaining_fill(multiworld: MultiWorld,
                    locations: typing.List[Location],
                    itempool: typing.List[Item],
                    name: str = "Remaining", 
-                   move_unplaceable_to_start_inventory: bool = False) -> None:
+                   move_unplaceable_to_start_inventory: bool = False,
+                   check_location_can_fill: bool = False) -> None:
     unplaced_items: typing.List[Item] = []
     placements: typing.List[Location] = []
     swapped_items: typing.Counter[typing.Tuple[int, str]] = Counter()
     total = min(len(itempool),  len(locations))
     placed = 0
+
+    # Optimisation: Decide whether to do full location.can_fill check (respect excluded), or only check the item rule
+    if check_location_can_fill:
+        state = CollectionState(multiworld)
+
+        def location_can_fill_item(location_to_fill: Location, item_to_fill: Item):
+            return location_to_fill.can_fill(state, item_to_fill, check_access=False)
+    else:
+        def location_can_fill_item(location_to_fill: Location, item_to_fill: Item):
+            return location_to_fill.item_rule(item_to_fill)
+
     while locations and itempool:
         item_to_place = itempool.pop()
         spot_to_fill: typing.Optional[Location] = None
 
         for i, location in enumerate(locations):
-            if location.item_rule(item_to_place):
+            if location_can_fill_item(location, item_to_place):
                 # popping by index is faster than removing by content,
                 spot_to_fill = locations.pop(i)
                 # skipping a scan for the element
@@ -267,7 +279,7 @@ def remaining_fill(multiworld: MultiWorld,
 
                 location.item = None
                 placed_item.location = None
-                if location.item_rule(item_to_place):
+                if location_can_fill_item(location, item_to_place):
                     # Add this item to the existing placement, and
                     # add the old item to the back of the queue
                     spot_to_fill = placements.pop(i)

From 62942704bdea4ba0f79cb88580d5214b31b750b5 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 25 Dec 2024 21:55:15 +0100
Subject: [PATCH 194/381] The Witness: Add info about which door items exist in
 the pool to slot data (#3583)

* This feature is just broken lol

* simplify

* mypy

* Expand the unit test for forbidden doors
---
 worlds/witness/__init__.py               |  9 ++---
 worlds/witness/player_items.py           | 19 +++-------
 worlds/witness/test/test_door_shuffle.py | 47 ++++++++++++++++++++----
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
index ac9197bd92bb..471d030d4897 100644
--- a/worlds/witness/__init__.py
+++ b/worlds/witness/__init__.py
@@ -84,7 +84,8 @@ def _get_slot_data(self) -> Dict[str, Any]:
             "victory_location": int(self.player_logic.VICTORY_LOCATION, 16),
             "panelhex_to_id": self.player_locations.CHECK_PANELHEX_TO_ID,
             "item_id_to_door_hexes": static_witness_items.get_item_to_door_mappings(),
-            "door_hexes_in_the_pool": self.player_items.get_door_ids_in_pool(),
+            "door_items_in_the_pool": self.player_items.get_door_item_ids_in_pool(),
+            "doors_that_shouldnt_be_locked": [int(h, 16) for h in self.player_logic.FORBIDDEN_DOORS],
             "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],
@@ -150,7 +151,8 @@ def generate_early(self) -> None:
         )
         self.player_regions: WitnessPlayerRegions = WitnessPlayerRegions(self.player_locations, self)
 
-        self.log_ids_to_hints = {}
+        self.log_ids_to_hints: Dict[int, CompactHintData] = {}
+        self.laser_ids_to_hints: Dict[int, CompactHintData] = {}
 
         self.determine_sufficient_progression()
 
@@ -325,9 +327,6 @@ 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, CompactHintData] = {}
-        self.laser_ids_to_hints: Dict[int, CompactHintData] = {}
-
         already_hinted_locations = set()
 
         # Laser hints
diff --git a/worlds/witness/player_items.py b/worlds/witness/player_items.py
index 2fb987bb456a..e40d261d8a97 100644
--- a/worlds/witness/player_items.py
+++ b/worlds/witness/player_items.py
@@ -222,20 +222,15 @@ def get_early_items(self) -> List[str]:
         # Sort the output for consistency across versions if the implementation changes but the logic does not.
         return sorted(output)
 
-    def get_door_ids_in_pool(self) -> List[int]:
+    def get_door_item_ids_in_pool(self) -> List[int]:
         """
-        Returns the total set of all door IDs that are controlled by items in the pool.
+        Returns the ids of all door items that exist in the pool.
         """
-        output: List[int] = []
 
-        for item_name, item_data in self.item_data.items():
-            if not isinstance(item_data.definition, DoorItemDefinition):
-                continue
-
-            output += [int(hex_string, 16) for hex_string in item_data.definition.panel_id_hexes
-                       if hex_string not in self._logic.FORBIDDEN_DOORS]
-
-        return output
+        return [
+            cast_not_none(item_data.ap_code) for item_data in self.item_data.values()
+            if isinstance(item_data.definition, DoorItemDefinition)
+        ]
 
     def get_symbol_ids_not_in_pool(self) -> List[int]:
         """
@@ -257,5 +252,3 @@ def get_progressive_item_ids_in_pool(self) -> Dict[int, List[int]]:
                 output[cast_not_none(item.ap_code)] = [cast_not_none(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/test/test_door_shuffle.py b/worlds/witness/test/test_door_shuffle.py
index d593a84bdb8f..ca4d6e0aa83e 100644
--- a/worlds/witness/test/test_door_shuffle.py
+++ b/worlds/witness/test/test_door_shuffle.py
@@ -1,3 +1,6 @@
+from typing import cast
+
+from .. import WitnessWorld
 from ..test import WitnessMultiworldTestBase, WitnessTestBase
 
 
@@ -32,6 +35,10 @@ class TestForbiddenDoors(WitnessMultiworldTestBase):
         {
             "early_caves": "add_to_pool",
         },
+        {
+            "early_caves": "add_to_pool",
+            "door_groupings": "regional",
+        },
     ]
 
     common_options = {
@@ -40,11 +47,35 @@ class TestForbiddenDoors(WitnessMultiworldTestBase):
     }
 
     def test_forbidden_doors(self) -> None:
-        self.assertTrue(
-            self.get_items_by_name("Caves Mountain Shortcut (Panel)", 1),
-            "Caves Mountain Shortcut (Panel) should exist in panels shuffle, but it didn't."
-        )
-        self.assertFalse(
-            self.get_items_by_name("Caves Mountain Shortcut (Panel)", 2),
-            "Caves Mountain Shortcut (Panel) should be removed when Early Caves is enabled, but it still exists."
-        )
+        with self.subTest("Test that Caves Mountain Shortcut (Panel) exists if Early Caves is off"):
+            self.assertTrue(
+                self.get_items_by_name("Caves Mountain Shortcut (Panel)", 1),
+                "Caves Mountain Shortcut (Panel) should exist in panels shuffle, but it didn't."
+            )
+
+        with self.subTest("Test that Caves Mountain Shortcut (Panel) doesn't exist if Early Caves is start_to_pool"):
+            self.assertFalse(
+                self.get_items_by_name("Caves Mountain Shortcut (Panel)", 2),
+                "Caves Mountain Shortcut (Panel) should be removed when Early Caves is enabled, but it still exists."
+            )
+
+        with self.subTest("Test that slot data is set up correctly for a panels seed with Early Caves"):
+            slot_data = cast(WitnessWorld, self.multiworld.worlds[3])._get_slot_data()
+
+            self.assertIn(
+                WitnessWorld.item_name_to_id["Caves Panels"],
+                slot_data["door_items_in_the_pool"],
+                'Caves Panels should still exist in slot_data under "door_items_in_the_pool".'
+            )
+
+            self.assertIn(
+                0x021D7,
+                slot_data["item_id_to_door_hexes"][WitnessWorld.item_name_to_id["Caves Panels"]],
+                "Caves Panels should still contain Caves Mountain Shortcut Panel as a door they unlock.",
+            )
+
+            self.assertIn(
+                0x021D7,
+                slot_data["doors_that_shouldnt_be_locked"],
+                "Caves Mountain Shortcut Panel should be marked as \"shouldn't be locked\".",
+            )

From 33ae68c756f71eac6203b302db0144dee04ab09f Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Thu, 26 Dec 2024 13:50:18 +0000
Subject: [PATCH 195/381] DS3: Convert post_fill to stage_post_fill for better
 performance (#4122)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/dark_souls_3/__init__.py | 214 +++++++++++++++++---------------
 1 file changed, 117 insertions(+), 97 deletions(-)

diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py
index 765ffb1fc544..e1787a9a44aa 100644
--- a/worlds/dark_souls_3/__init__.py
+++ b/worlds/dark_souls_3/__init__.py
@@ -1366,7 +1366,8 @@ def write_spoiler(self, spoiler_handle: TextIO) -> None:
             text = "\n" + text + "\n"
             spoiler_handle.write(text)
 
-    def post_fill(self):
+    @classmethod
+    def stage_post_fill(cls, multiworld: MultiWorld):
         """If item smoothing is enabled, rearrange items so they scale up smoothly through the run.
 
         This determines the approximate order a given silo of items (say, soul items) show up in the
@@ -1375,106 +1376,125 @@ def post_fill(self):
         items, later spheres get higher-level ones. Within a sphere, items in DS3 are distributed in
         region order, and then the best items in a sphere go into the multiworld.
         """
+        ds3_worlds = [world for world in cast(List[DarkSouls3World], multiworld.get_game_worlds(cls.game)) if
+                      world.options.smooth_upgrade_items
+                      or world.options.smooth_soul_items
+                      or world.options.smooth_upgraded_weapons]
+        if not ds3_worlds:
+            # No worlds need item smoothing.
+            return
 
-        locations_by_sphere = [
-            sorted(loc for loc in sphere if loc.item.player == self.player and not loc.locked)
-            for sphere in self.multiworld.get_spheres()
-        ]
-
-        # All items in the base game in approximately the order they appear
-        all_item_order: List[DS3ItemData] = [
-            item_dictionary[location.default_item_name]
-            for region in region_order
-            # Shuffle locations within each region.
-            for location in self._shuffle(location_tables[region])
-            if self._is_location_available(location)
-        ]
-
-        # All DarkSouls3Items for this world that have been assigned anywhere, grouped by name
-        full_items_by_name: Dict[str, List[DarkSouls3Item]] = defaultdict(list)
-        for location in self.multiworld.get_filled_locations():
-            if location.item.player == self.player and (
-                location.player != self.player or self._is_location_available(location)
-            ):
-                full_items_by_name[location.item.name].append(location.item)
-
-        def smooth_items(item_order: List[Union[DS3ItemData, DarkSouls3Item]]) -> None:
-            """Rearrange all items in item_order to match that order.
-
-            Note: this requires that item_order exactly matches the number of placed items from this
-            world matching the given names.
-            """
-
-            # Convert items to full DarkSouls3Items.
-            converted_item_order: List[DarkSouls3Item] = [
-                item for item in (
-                    (
-                        # full_items_by_name won't contain DLC items if the DLC is disabled.
-                        (full_items_by_name[item.name] or [None]).pop(0)
-                        if isinstance(item, DS3ItemData) else item
-                    )
-                    for item in item_order
-                )
-                # Never re-order event items, because they weren't randomized in the first place.
-                if item and item.code is not None
-            ]
-
-            names = {item.name for item in converted_item_order}
-
-            all_matching_locations = [
-                loc
-                for sphere in locations_by_sphere
-                for loc in sphere
-                if loc.item.name in names
+        spheres_per_player: Dict[int, List[List[Location]]] = {world.player: [] for world in ds3_worlds}
+        for sphere in multiworld.get_spheres():
+            locations_per_item_player: Dict[int, List[Location]] = {player: [] for player in spheres_per_player.keys()}
+            for location in sphere:
+                if location.locked:
+                    continue
+                item_player = location.item.player
+                if item_player in locations_per_item_player:
+                    locations_per_item_player[item_player].append(location)
+            for player, locations in locations_per_item_player.items():
+                # Sort for deterministic results.
+                locations.sort()
+                spheres_per_player[player].append(locations)
+
+        for ds3_world in ds3_worlds:
+            locations_by_sphere = spheres_per_player[ds3_world.player]
+
+            # All items in the base game in approximately the order they appear
+            all_item_order: List[DS3ItemData] = [
+                item_dictionary[location.default_item_name]
+                for region in region_order
+                # Shuffle locations within each region.
+                for location in ds3_world._shuffle(location_tables[region])
+                if ds3_world._is_location_available(location)
             ]
 
-            # It's expected that there may be more total items than there are matching locations if
-            # the player has chosen a more limited accessibility option, since the matching
-            # locations *only* include items in the spheres of accessibility.
-            if len(converted_item_order) < len(all_matching_locations):
-                raise Exception(
-                    f"DS3 bug: there are {len(all_matching_locations)} locations that can " +
-                    f"contain smoothed items, but only {len(converted_item_order)} items to smooth."
-                )
-
-            for sphere in locations_by_sphere:
-                locations = [loc for loc in sphere if loc.item.name in names]
-
-                # Check the game, not the player, because we know how to sort within regions for DS3
-                offworld = self._shuffle([loc for loc in locations if loc.game != "Dark Souls III"])
-                onworld = sorted((loc for loc in locations if loc.game == "Dark Souls III"),
-                                 key=lambda loc: loc.data.region_value)
-
-                # Give offworld regions the last (best) items within a given sphere
-                for location in onworld + offworld:
-                    new_item = self._pop_item(location, converted_item_order)
-                    location.item = new_item
-                    new_item.location = location
-
-        if self.options.smooth_upgrade_items:
-            base_names = {
-                "Titanite Shard", "Large Titanite Shard", "Titanite Chunk", "Titanite Slab",
-                "Titanite Scale", "Twinkling Titanite", "Farron Coal", "Sage's Coal", "Giant's Coal",
-                "Profaned Coal"
-            }
-            smooth_items([item for item in all_item_order if item.base_name in base_names])
-
-        if self.options.smooth_soul_items:
-            smooth_items([
-                item for item in all_item_order
-                if item.souls and item.classification != ItemClassification.progression
-            ])
+            # All DarkSouls3Items for this world that have been assigned anywhere, grouped by name
+            full_items_by_name: Dict[str, List[DarkSouls3Item]] = defaultdict(list)
+            for location in multiworld.get_filled_locations():
+                if location.item.player == ds3_world.player and (
+                    location.player != ds3_world.player or ds3_world._is_location_available(location)
+                ):
+                    full_items_by_name[location.item.name].append(location.item)
+
+            def smooth_items(item_order: List[Union[DS3ItemData, DarkSouls3Item]]) -> None:
+                """Rearrange all items in item_order to match that order.
+
+                Note: this requires that item_order exactly matches the number of placed items from this
+                world matching the given names.
+                """
+
+                # Convert items to full DarkSouls3Items.
+                converted_item_order: List[DarkSouls3Item] = [
+                    item for item in (
+                        (
+                            # full_items_by_name won't contain DLC items if the DLC is disabled.
+                            (full_items_by_name[item.name] or [None]).pop(0)
+                            if isinstance(item, DS3ItemData) else item
+                        )
+                        for item in item_order
+                    )
+                    # Never re-order event items, because they weren't randomized in the first place.
+                    if item and item.code is not None
+                ]
+
+                names = {item.name for item in converted_item_order}
+
+                all_matching_locations = [
+                    loc
+                    for sphere in locations_by_sphere
+                    for loc in sphere
+                    if loc.item.name in names
+                ]
+
+                # It's expected that there may be more total items than there are matching locations if
+                # the player has chosen a more limited accessibility option, since the matching
+                # locations *only* include items in the spheres of accessibility.
+                if len(converted_item_order) < len(all_matching_locations):
+                    raise Exception(
+                        f"DS3 bug: there are {len(all_matching_locations)} locations that can " +
+                        f"contain smoothed items, but only {len(converted_item_order)} items to smooth."
+                    )
 
-        if self.options.smooth_upgraded_weapons:
-            upgraded_weapons = [
-                location.item
-                for location in self.multiworld.get_filled_locations()
-                if location.item.player == self.player
-                and location.item.level and location.item.level > 0
-                and location.item.classification != ItemClassification.progression
-            ]
-            upgraded_weapons.sort(key=lambda item: item.level)
-            smooth_items(upgraded_weapons)
+                for sphere in locations_by_sphere:
+                    locations = [loc for loc in sphere if loc.item.name in names]
+
+                    # Check the game, not the player, because we know how to sort within regions for DS3
+                    offworld = ds3_world._shuffle([loc for loc in locations if loc.game != "Dark Souls III"])
+                    onworld = sorted((loc for loc in locations if loc.game == "Dark Souls III"),
+                                     key=lambda loc: loc.data.region_value)
+
+                    # Give offworld regions the last (best) items within a given sphere
+                    for location in onworld + offworld:
+                        new_item = ds3_world._pop_item(location, converted_item_order)
+                        location.item = new_item
+                        new_item.location = location
+
+            if ds3_world.options.smooth_upgrade_items:
+                base_names = {
+                    "Titanite Shard", "Large Titanite Shard", "Titanite Chunk", "Titanite Slab",
+                    "Titanite Scale", "Twinkling Titanite", "Farron Coal", "Sage's Coal", "Giant's Coal",
+                    "Profaned Coal"
+                }
+                smooth_items([item for item in all_item_order if item.base_name in base_names])
+
+            if ds3_world.options.smooth_soul_items:
+                smooth_items([
+                    item for item in all_item_order
+                    if item.souls and item.classification != ItemClassification.progression
+                ])
+
+            if ds3_world.options.smooth_upgraded_weapons:
+                upgraded_weapons = [
+                    location.item
+                    for location in multiworld.get_filled_locations()
+                    if location.item.player == ds3_world.player
+                    and location.item.level and location.item.level > 0
+                    and location.item.classification != ItemClassification.progression
+                ]
+                upgraded_weapons.sort(key=lambda item: item.level)
+                smooth_items(upgraded_weapons)
 
     def _shuffle(self, seq: Sequence) -> List:
         """Returns a shuffled copy of a sequence."""

From b9642a482f67f2358f13d2306a90673fc4f8fd9a Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Thu, 26 Dec 2024 17:04:21 -0500
Subject: [PATCH 196/381] KH2: Using fast_fill instead of fill_restrictive
 (#4227)

---
 worlds/kh2/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/worlds/kh2/__init__.py b/worlds/kh2/__init__.py
index 2809460aed6a..59c77627eebe 100644
--- a/worlds/kh2/__init__.py
+++ b/worlds/kh2/__init__.py
@@ -2,7 +2,7 @@
 from typing import List
 
 from BaseClasses import Tutorial, ItemClassification
-from Fill import fill_restrictive
+from Fill import fast_fill
 from worlds.LauncherComponents import Component, components, Type, launch_subprocess
 from worlds.AutoWorld import World, WebWorld
 from .Items import *
@@ -287,7 +287,7 @@ def generate_early(self) -> None:
 
     def pre_fill(self):
         """
-        Plandoing Events and Fill_Restrictive for donald,goofy and sora
+        Plandoing Events and Fast_Fill for donald,goofy and sora
         """
         self.donald_pre_fill()
         self.goofy_pre_fill()
@@ -431,9 +431,10 @@ def keyblade_pre_fill(self):
         Fills keyblade slots with abilities determined on player's setting
         """
         keyblade_locations = [self.multiworld.get_location(location, self.player) for location in Keyblade_Slots.keys()]
-        state = self.multiworld.get_all_state(False)
         keyblade_ability_pool_copy = self.keyblade_ability_pool.copy()
-        fill_restrictive(self.multiworld, state, keyblade_locations, keyblade_ability_pool_copy, True, True, allow_excluded=True)
+        fast_fill(self.multiworld, keyblade_ability_pool_copy, keyblade_locations)
+        for location in keyblade_locations:
+            location.locked = True
 
     def starting_invo_verify(self):
         """

From 218f28912e0e120e4cf91a63aba627e91cc451c5 Mon Sep 17 00:00:00 2001
From: BadMagic100 <dempsey.sean@outlook.com>
Date: Fri, 27 Dec 2024 12:04:02 -0800
Subject: [PATCH 197/381] Core: Generic Entrance Rando (#2883)

* Initial implementation of Generic ER

* Move ERType to Entrance.Type, fix typing imports

* updates based on testing (read: flailing)

* Updates from feedback

* Various bug fixes in ERCollectionState

* Use deque instead of queue.Queue

* Allow partial entrances in collection state earlier, doc improvements

* Prevent early loops in region graph, improve reusability of ER stage code

* Typos, grammar, PEP8, and style "fixes"

* use RuntimeError instead of bare Exceptions

* return tuples from connect since it's slightly faster for our purposes

* move the shuffle to the beginning of find_pairing

* do er_state placements within pairing lookups to remove code duplication

* requested adjustments

* Add some temporary performance logging

* Use CollectionState to track available exits and placed regions

* Add a method to automatically disconnect entrances in a coupled-compliant way

 Update docs and cleanup todos

* Make find_placeable_exits deterministic by sorting blocked_connections set

* Move EntranceType out of Entrance

* Handle minimal accessibility, autodetect regions, and improvements to disconnect

* Add on_connect callback to react to succeeded entrance placements

* Relax island-prevention constraints after a successful run on minimal accessibility; better error message on failure

* First set of unit tests for generic ER

* Change on_connect to send lists, add unit tests for EntranceLookup

* Fix duplicated location names in tests

* Update tests after merge

* Address review feedback, start docs with diagrams

* Fix rendering of hidden nodes in ER doc

* Move most docstring content into a docs article

* Clarify when randomize_entrances can be called safely

* Address review feedback

* Apply suggestions from code review

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

* Docs on ERPlacementState, add coupled/uncoupled handling to deadend detection

* Documentation clarifications

* Update groups to allow any hashable

* Restrict groups from hashable to int

* Implement speculative sweeping in stage 1, address misc review comments

* Clean unused imports in BaseClasses.py

* Restrictive region/speculative sweep test

* sweep_for_events->advancement

* Remove redundant __str__

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

* Allow partial entrances in auto indirect condition sweep

* Treat regions needed for logic as non-dead-end regardless of if they have exits, flip order of stage 3 and 4 to ensure there are enough exits for the dead ends

* Typing fixes suggested by mypy

* Remove erroneous newline

Not sure why the merge conflict editor is different and worse than the normal editor. Crazy

* Use modern typing for ER

* Enforce the use of explicit indirect conditions

* Improve doc on required indirect conditions

---------

Co-authored-by: qwint <qwint.42@gmail.com>
Co-authored-by: alwaysintreble <mmmcheese158@gmail.com>
Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 BaseClasses.py                      |  66 +++-
 docs/entrance randomization.md      | 430 ++++++++++++++++++++++++++
 entrance_rando.py                   | 447 ++++++++++++++++++++++++++++
 test/general/test_entrance_rando.py | 387 ++++++++++++++++++++++++
 4 files changed, 1324 insertions(+), 6 deletions(-)
 create mode 100644 docs/entrance randomization.md
 create mode 100644 entrance_rando.py
 create mode 100644 test/general/test_entrance_rando.py

diff --git a/BaseClasses.py b/BaseClasses.py
index e5c187b9117f..e19ba5f7772e 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -19,6 +19,7 @@
 import Utils
 
 if TYPE_CHECKING:
+    from entrance_rando import ERPlacementState
     from worlds import AutoWorld
 
 
@@ -426,12 +427,12 @@ def get_entrance(self, entrance_name: str, player: int) -> Entrance:
     def get_location(self, location_name: str, player: int) -> Location:
         return self.regions.location_cache[player][location_name]
 
-    def get_all_state(self, use_cache: bool) -> CollectionState:
+    def get_all_state(self, use_cache: bool, allow_partial_entrances: bool = False) -> CollectionState:
         cached = getattr(self, "_all_state", None)
         if use_cache and cached:
             return cached.copy()
 
-        ret = CollectionState(self)
+        ret = CollectionState(self, allow_partial_entrances)
 
         for item in self.itempool:
             self.worlds[item.player].collect(ret, item)
@@ -717,10 +718,11 @@ class CollectionState():
     path: Dict[Union[Region, Entrance], PathValue]
     locations_checked: Set[Location]
     stale: Dict[int, bool]
+    allow_partial_entrances: bool
     additional_init_functions: List[Callable[[CollectionState, MultiWorld], None]] = []
     additional_copy_functions: List[Callable[[CollectionState, CollectionState], CollectionState]] = []
 
-    def __init__(self, parent: MultiWorld):
+    def __init__(self, parent: MultiWorld, allow_partial_entrances: bool = False):
         self.prog_items = {player: Counter() for player in parent.get_all_ids()}
         self.multiworld = parent
         self.reachable_regions = {player: set() for player in parent.get_all_ids()}
@@ -729,6 +731,7 @@ def __init__(self, parent: MultiWorld):
         self.path = {}
         self.locations_checked = set()
         self.stale = {player: True for player in parent.get_all_ids()}
+        self.allow_partial_entrances = allow_partial_entrances
         for function in self.additional_init_functions:
             function(self, parent)
         for items in parent.precollected_items.values():
@@ -763,6 +766,8 @@ def _update_reachable_regions_explicit_indirect_conditions(self, player: int, qu
             if new_region in reachable_regions:
                 blocked_connections.remove(connection)
             elif connection.can_reach(self):
+                if self.allow_partial_entrances and not new_region:
+                    continue
                 assert new_region, f"tried to search through an Entrance \"{connection}\" with no connected Region"
                 reachable_regions.add(new_region)
                 blocked_connections.remove(connection)
@@ -788,7 +793,9 @@ def _update_reachable_regions_auto_indirect_conditions(self, player: int, queue:
                 if new_region in reachable_regions:
                     blocked_connections.remove(connection)
                 elif connection.can_reach(self):
-                    assert new_region, f"tried to search through an Entrance \"{connection}\" with no Region"
+                    if self.allow_partial_entrances and not new_region:
+                        continue
+                    assert new_region, f"tried to search through an Entrance \"{connection}\" with no connected Region"
                     reachable_regions.add(new_region)
                     blocked_connections.remove(connection)
                     blocked_connections.update(new_region.exits)
@@ -808,6 +815,7 @@ def copy(self) -> CollectionState:
         ret.advancements = self.advancements.copy()
         ret.path = self.path.copy()
         ret.locations_checked = self.locations_checked.copy()
+        ret.allow_partial_entrances = self.allow_partial_entrances
         for function in self.additional_copy_functions:
             ret = function(self, ret)
         return ret
@@ -972,6 +980,11 @@ def remove(self, item: Item):
             self.stale[item.player] = True
 
 
+class EntranceType(IntEnum):
+    ONE_WAY = 1
+    TWO_WAY = 2
+
+
 class Entrance:
     access_rule: Callable[[CollectionState], bool] = staticmethod(lambda state: True)
     hide_path: bool = False
@@ -979,19 +992,24 @@ class Entrance:
     name: str
     parent_region: Optional[Region]
     connected_region: Optional[Region] = None
+    randomization_group: int
+    randomization_type: EntranceType
     # LttP specific, TODO: should make a LttPEntrance
     addresses = None
     target = None
 
-    def __init__(self, player: int, name: str = "", parent: Optional[Region] = None) -> None:
+    def __init__(self, player: int, name: str = "", parent: Optional[Region] = None,
+                 randomization_group: int = 0, randomization_type: EntranceType = EntranceType.ONE_WAY) -> None:
         self.name = name
         self.parent_region = parent
         self.player = player
+        self.randomization_group = randomization_group
+        self.randomization_type = randomization_type
 
     def can_reach(self, state: CollectionState) -> bool:
         assert self.parent_region, f"called can_reach on an Entrance \"{self}\" with no parent_region"
         if self.parent_region.can_reach(state) and self.access_rule(state):
-            if not self.hide_path and not self in state.path:
+            if not self.hide_path and self not in state.path:
                 state.path[self] = (self.name, state.path.get(self.parent_region, (self.parent_region.name, None)))
             return True
 
@@ -1003,6 +1021,32 @@ def connect(self, region: Region, addresses: Any = None, target: Any = None) ->
         self.addresses = addresses
         region.entrances.append(self)
 
+    def is_valid_source_transition(self, er_state: "ERPlacementState") -> bool:
+        """
+        Determines whether this is a valid source transition, that is, whether the entrance
+        randomizer is allowed to pair it to place any other regions. By default, this is the
+        same as a reachability check, but can be modified by Entrance implementations to add
+        other restrictions based on the placement state.
+
+        :param er_state: The current (partial) state of the ongoing entrance randomization
+        """
+        return self.can_reach(er_state.collection_state)
+
+    def can_connect_to(self, other: Entrance, dead_end: bool, er_state: "ERPlacementState") -> bool:
+        """
+        Determines whether a given Entrance is a valid target transition, that is, whether
+        the entrance randomizer is allowed to pair this Entrance to that Entrance. By default,
+        only allows connection between entrances of the same type (one ways only go to one ways,
+        two ways always go to two ways) and prevents connecting an exit to itself in coupled mode.
+
+        :param other: The proposed Entrance to connect to
+        :param dead_end: Whether the other entrance considered a dead end by Entrance randomization
+        :param er_state: The current (partial) state of the ongoing entrance randomization
+        """
+        # the implementation of coupled causes issues for self-loops since the reverse entrance will be the
+        # same as the forward entrance. In uncoupled they are ok.
+        return self.randomization_type == other.randomization_type and (not er_state.coupled or self.name != other.name)
+
     def __repr__(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})'
@@ -1152,6 +1196,16 @@ def create_exit(self, name: str) -> Entrance:
         self.exits.append(exit_)
         return exit_
 
+    def create_er_target(self, name: str) -> Entrance:
+        """
+        Creates and returns an Entrance object as an entrance to this region
+
+        :param name: name of the Entrance being created
+        """
+        entrance = self.entrance_type(self.player, name)
+        entrance.connect(self)
+        return entrance
+
     def add_exits(self, exits: Union[Iterable[str], Dict[str, Optional[str]]],
                   rules: Dict[str, Callable[[CollectionState], bool]] = None) -> List[Entrance]:
         """
diff --git a/docs/entrance randomization.md b/docs/entrance randomization.md
new file mode 100644
index 000000000000..9e3e281bcc31
--- /dev/null
+++ b/docs/entrance randomization.md	
@@ -0,0 +1,430 @@
+# Entrance Randomization
+
+This document discusses the API and underlying implementation of the generic entrance randomization algorithm
+exposed in [entrance_rando.py](/entrance_rando.py). Throughout the doc, entrance randomization is frequently abbreviated
+as "ER."
+
+This doc assumes familiarity with Archipelago's graph logic model. If you don't have a solid understanding of how
+regions work, you should start there.
+
+## Entrance randomization concepts
+
+### Terminology
+
+Some important terminology to understand when reading this doc and working with ER is listed below.
+
+* Entrance rando - sometimes called "room rando," "transition rando," "door rando," or similar,
+  this is a game mode in which the game map itself is randomized.
+  In Archipelago, these things are often represented as `Entrance`s in the region graph, so we call it Entrance rando.
+* Entrances and exits - entrances are ways into your region, exits are ways out of the region. In code, they are both
+  represented as `Entrance` objects. In this doc, the terms "entrances" and "exits" will be used in this sense; the
+  `Entrance` class will always be referenced in a code block with an uppercase E.
+* Dead end - a connected group of regions which can never help ER progress. This means that it:
+  * Is not in any indirect conditions/access rules.
+  * Has no plando'd or otherwise preplaced progression items, including events.
+  * Has no randomized exits.
+* One way transition - a transition that, in the game, is not safe to reverse through (for example, in Hollow Knight,
+  some transitions are inaccessible backwards in vanilla and would put you out of bounds). One way transitions are 
+  paired together during randomization to prevent such unsafe game states. Most transitions are not one way.
+
+### Basic randomization strategy
+
+The Generic ER algorithm works by using the logic structures you are already familiar with. To give a basic example,
+let's assume a toy world is defined with the vanilla region graph modeled below. In this diagram, the smaller boxes
+represent regions while the larger boxes represent scenes. Scenes are not an Archipelago concept, the grouping is
+purely illustrative.
+
+```mermaid
+%%{init: {"graph": {"defaultRenderer": "elk"}} }%%
+graph LR
+    subgraph startingRoom [Starting Room]
+        S[Starting Room Right Door]
+    end
+    subgraph sceneB [Scene B]
+        BR1[Scene B Right Door]
+    end
+    subgraph sceneA [Scene A]
+        AL1[Scene A Lower Left Door] <--> AR1[Scene A Right Door]
+        AL2[Scene A Upper Left Door] <--> AR1
+    end
+    subgraph sceneC [Scene C]
+        CL1[Scene C Left Door] <--> CR1[Scene C Upper Right Door]
+        CL1 <--> CR2[Scene C Lower Right Door]
+    end
+    subgraph sceneD [Scene D]
+        DL1[Scene D Left Door] <--> DR1[Scene D Right Door]
+    end
+    subgraph endingRoom [Ending Room]
+        EL1[Ending Room Upper Left Door] <--> Victory
+        EL2[Ending Room Lower Left Door] <--> Victory
+    end
+    Menu --> S
+    S <--> AL2
+    BR1 <--> AL1
+    AR1 <--> CL1
+    CR1 <--> DL1
+    DR1 <--> EL1
+    CR2 <--> EL2
+    
+    classDef hidden display:none;
+```
+
+First, the world begins by splitting the `Entrance`s which should be randomized. This is essentially all that has to be
+done on the world side; calling the `randomize_entrances` function will do the rest, using your region definitions and
+logic to generate a valid world layout by connecting the partially connected edges you've defined. After you have done
+that, your region graph might look something like the following diagram. Note how each randomizable entrance/exit pair
+(represented as a bidirectional arrow) is disconnected on one end.
+
+> [!NOTE]
+> It is required to use explicit indirect conditions when using Generic ER. Without this restriction,
+> Generic ER would have no way to correctly determine that a region may be required in logic,
+> leading to significantly higher failure rates due to mis-categorized regions.
+
+```mermaid
+%%{init: {"graph": {"defaultRenderer": "elk"}} }%%
+graph LR
+    subgraph startingRoom [Starting Room]
+        S[Starting Room Right Door]
+    end
+    subgraph sceneA [Scene A]
+        AL1[Scene A Upper Left Door] <--> AR1[Scene A Right Door]
+        AL2[Scene A Lower Left Door] <--> AR1
+    end
+    subgraph sceneB [Scene B]
+        BR1[Scene B Right Door]
+    end
+    subgraph sceneC [Scene C]
+        CL1[Scene C Left Door] <--> CR1[Scene C Upper Right Door]
+        CL1 <--> CR2[Scene C Lower Right Door]
+    end
+    subgraph sceneD [Scene D]
+        DL1[Scene D Left Door] <--> DR1[Scene D Right Door]
+    end
+    subgraph endingRoom [Ending Room]
+        EL1[Ending Room Upper Left Door] <--> Victory
+        EL2[Ending Room Lower Left Door] <--> Victory
+    end
+    Menu --> S
+    S <--> T1:::hidden
+    T2:::hidden <--> AL1
+    T3:::hidden <--> AL2
+    AR1 <--> T5:::hidden
+    BR1 <--> T4:::hidden
+    T6:::hidden <--> CL1
+    CR1 <--> T7:::hidden
+    CR2 <--> T11:::hidden
+    T8:::hidden <--> DL1
+    DR1 <--> T9:::hidden
+    T10:::hidden <--> EL1
+    T12:::hidden <--> EL2
+    
+    classDef hidden display:none;
+```
+
+From here, you can call the `randomize_entrances` function and Archipelago takes over. Starting from the Menu region,
+the algorithm will sweep out to find eligible region exits to randomize. It will then select an eligible target entrance
+and connect them, prioritizing giving access to unvisited regions first until all regions are placed. Once the exit has
+been connected to the new region, placeholder entrances are deleted. This process is visualized in the diagram below
+with the newly connected edge highlighted in red.
+
+```mermaid
+%%{init: {"graph": {"defaultRenderer": "elk"}} }%%
+graph LR
+    subgraph startingRoom [Starting Room]
+        S[Starting Room Right Door]
+    end
+    subgraph sceneA [Scene A]
+        AL1[Scene A Upper Left Door] <--> AR1[Scene A Right Door]
+        AL2[Scene A Lower Left Door] <--> AR1
+    end
+    subgraph sceneB [Scene B]
+        BR1[Scene B Right Door]
+    end
+    subgraph sceneC [Scene C]
+        CL1[Scene C Left Door] <--> CR1[Scene C Upper Right Door]
+        CL1 <--> CR2[Scene C Lower Right Door]
+    end
+    subgraph sceneD [Scene D]
+        DL1[Scene D Left Door] <--> DR1[Scene D Right Door]
+    end
+    subgraph endingRoom [Ending Room]
+        EL1[Ending Room Upper Left Door] <--> Victory
+        EL2[Ending Room Lower Left Door] <--> Victory
+    end
+    Menu --> S
+    S <--> CL1
+    T2:::hidden <--> AL1
+    T3:::hidden <--> AL2
+    AR1 <--> T5:::hidden
+    BR1 <--> T4:::hidden
+    CR1 <--> T7:::hidden
+    CR2 <--> T11:::hidden
+    T8:::hidden <--> DL1
+    DR1 <--> T9:::hidden
+    T10:::hidden <--> EL1
+    T12:::hidden <--> EL2
+    
+    classDef hidden display:none;
+    linkStyle 8 stroke:red,stroke-width:5px;
+```
+
+This process is then repeated until all disconnected `Entrance`s have been connected or deleted, eventually resulting
+in a randomized region layout.
+
+```mermaid
+%%{init: {"graph": {"defaultRenderer": "elk"}} }%%
+graph LR
+    subgraph startingRoom [Starting Room]
+        S[Starting Room Right Door]
+    end
+    subgraph sceneA [Scene A]
+        AL1[Scene A Upper Left Door] <--> AR1[Scene A Right Door]
+        AL2[Scene A Lower Left Door] <--> AR1
+    end
+    subgraph sceneB [Scene B]
+        BR1[Scene B Right Door]
+    end
+    subgraph sceneC [Scene C]
+        CL1[Scene C Left Door] <--> CR1[Scene C Upper Right Door]
+        CL1 <--> CR2[Scene C Lower Right Door]
+    end
+    subgraph sceneD [Scene D]
+        DL1[Scene D Left Door] <--> DR1[Scene D Right Door]
+    end
+    subgraph endingRoom [Ending Room]
+        EL1[Ending Room Upper Left Door] <--> Victory
+        EL2[Ending Room Lower Left Door] <--> Victory
+    end
+    Menu --> S
+    S <--> CL1
+    AR1 <--> DL1
+    BR1 <--> EL2
+    CR1 <--> EL1
+    CR2 <--> AL1
+    DR1 <--> AL2
+    
+    classDef hidden display:none;
+```
+
+#### ER and minimal accessibility
+
+In general, even on minimal accessibility, ER will prefer to provide access to as many regions as possible. This is for
+2 reasons:
+1. Generally, having items spread across the world is going to be a more fun/engaging experience for players than
+   severely restricting their map. Imagine an ER arrangement with just the start region, the goal region, and exactly
+   enough locations in between them to get the goal - this may be the intuitive behavior of minimal, or even the desired
+   behavior in some cases, but it is not a particularly interesting randomizer.
+2. Giving access to more of the world will give item fill a higher chance to succeed.
+
+However, ER will cull unreachable regions and exits if necessary to save the generation of a beaten minimal.
+
+## Usage
+
+### Defining entrances to be randomized
+
+The first step to using generic ER is defining entrances to be randomized. In order to do this, you will need to
+leave partially disconnected exits without a `target_region` and partially disconnected entrances without a
+`parent_region`. You can do this either by hand using `region.create_exit` and `region.create_er_target`, or you can
+create your vanilla region graph and then use `disconnect_entrance_for_randomization` to split the desired edges.
+If you're not sure which to use, prefer the latter approach as it will automatically satisfy the requirements for 
+coupled randomization (discussed in more depth later).
+
+> [!TIP]
+> It's recommended to give your `Entrance`s non-default names when creating them. The default naming scheme is 
+> `f"{parent_region} -> {target_region}"` which is generally not helpful in an entrance rando context - after all,
+> the target region will not be the same as vanilla and regions are often not user-facing anyway. Instead consider names
+> that describe the location of the exit, such as "Starting Room Right Door."
+
+When creating your `Entrance`s you should also set the randomization type and group. One-way `Entrance`s represent
+transitions which are impossible to traverse in reverse. All other transitions are two-ways. To ensure that all
+transitions can be accessed in the game, one-ways are only randomized with other one-ways and two-ways are only
+randomized with other two-ways. You can set whether an `Entrance` is one-way or two-way using the `randomization_type`
+attribute.
+
+`Entrance`s can also set the `randomization_group` attribute to allow for grouping during randomization. This can be
+any integer you define and may be based on player options. Some possible use cases for grouping include:
+* Directional matching - only match leftward-facing transitions to rightward-facing ones
+* Terrain matching - only match water transitions to water transitions and land transitions to land transitions
+* Dungeon shuffle - only shuffle entrances within a dungeon/area with each other
+* Combinations of the above
+
+By default, all `Entrance`s are placed in the group 0. An entrance can only be a member of one group, but a given group
+may connect to many other groups.
+
+### Calling generic ER
+
+Once you have defined all your entrances and exits and connected the Menu region to your region graph, you can call 
+`randomize_entrances` to perform randomization.
+
+#### Coupled and uncoupled modes
+
+In coupled randomization, an entrance placed from A to B guarantees that the reverse placement B to A also exists
+(assuming that A and B are both two-way doors). Uncoupled randomization does not make this guarantee.
+
+When using coupled mode, there are some requirements for how placeholder ER targets for two-ways are named. 
+`disconnect_entrance_for_randomization` will handle this for you. However, if you opt to create your ER targets and
+exits by hand, you will need to ensure that ER targets into a region are named the same as the exit they correspond to.
+This allows the randomizer to find and connect the reverse pairing after the first pairing is completed. See the diagram
+below for an example of incorrect and correct naming.
+
+Incorrect target naming:
+
+```mermaid
+%%{init: {"graph": {"defaultRenderer": "elk"}} }%%
+graph LR
+    subgraph a [" "]
+        direction TB
+        target1
+        target2
+    end
+    subgraph b [" "]
+        direction TB
+        Region
+    end
+    Region["Room1"] -->|Room1 Right Door| target1:::hidden
+    Region --- target2:::hidden -->|Room2 Left Door| Region
+
+    linkStyle 1 stroke:none;
+    classDef hidden display:none;
+    style a display:none;
+    style b display:none;
+```
+
+Correct target naming:
+
+```mermaid
+%%{init: {"graph": {"defaultRenderer": "elk"}} }%%
+graph LR
+    subgraph a [" "]
+        direction TB
+        target1
+        target2
+    end
+    subgraph b [" "]
+        direction TB
+        Region
+    end
+    Region["Room1"] -->|Room1 Right Door| target1:::hidden
+    Region --- target2:::hidden -->|Room1 Right Door| Region
+
+    linkStyle 1 stroke:none;
+    classDef hidden display:none;
+    style a display:none;
+    style b display:none;
+```
+
+#### Implementing grouping
+
+When you created your entrances, you defined the group each entrance belongs to. Now you will have to define how groups
+should connect with each other. This is done with the `target_group_lookup` and `preserve_group_order` parameters.
+There is also a convenience function `bake_target_group_lookup` which can help to prepare group lookups when more
+complex group mapping logic is needed. Some recipes for `target_group_lookup` are presented here.
+
+For the recipes below, assume the following groups (if the syntax used here is unfamiliar to you, "bit masking" and 
+"bitwise operators" would be the terms to search for):
+```python
+class Groups(IntEnum):
+    # Directions
+    LEFT = 1
+    RIGHT = 2
+    TOP = 3
+    BOTTOM = 4
+    DOOR = 5
+    # Areas
+    FIELD = 1 << 3
+    CAVE = 2 << 3
+    MOUNTAIN = 3 << 3
+    # Bitmasks
+    DIRECTION_MASK = FIELD - 1
+    AREA_MASK = ~0 << 3
+```
+
+Directional matching:
+```python
+direction_matching_group_lookup = {
+    # with preserve_group_order = False, pair a left transition to either a right transition or door randomly
+    # with preserve_group_order = True, pair a left transition to a right transition, or else a door if no
+    #   viable right transitions remain
+    Groups.LEFT: [Groups.RIGHT, Groups.DOOR],
+    # ...
+}
+```
+
+Terrain matching or dungeon shuffle:
+```python
+def randomize_within_same_group(group: int) -> List[int]:
+    return [group]
+identity_group_lookup = bake_target_group_lookup(world, randomize_within_same_group)
+```
+
+Directional + area shuffle:
+```python
+def get_target_groups(group: int) -> List[int]:
+    # example group: LEFT | CAVE
+    # example result: [RIGHT | CAVE, DOOR | CAVE]
+    direction = group & Groups.DIRECTION_MASK
+    area = group & Groups.AREA_MASK
+    return [pair_direction | area for pair_direction in direction_matching_group_lookup[direction]]
+target_group_lookup = bake_target_group_lookup(world, get_target_groups)
+```
+
+#### When to call `randomize_entrances`
+
+The short answer is that you will almost always want to do ER in `pre_fill`. For more information why, continue reading.
+
+ER begins by collecting the entire item pool and then uses your access rules to try and prevent some kinds of failures. 
+This means 2 things about when you can call ER:
+1. You must supply your item pool before calling ER, or call ER before setting any rules which require items.
+2. If you have rules dependent on anything other than items (e.g. `Entrance`s or events), you must set your rules
+   and create your events before you call ER if you want to guarantee a correct output.
+
+If the conditions above are met, you could theoretically do ER as early as `create_regions`. However, plando is also 
+a consideration. Since item plando happens between `set_rules` and `pre_fill` and modifies the item pool, doing ER 
+in `pre_fill` is the only way to account for placements made by item plando, otherwise you risk impossible seeds or 
+generation failures. Obviously, if your world implements entrance plando, you will likely want to do that before ER as
+well.
+
+#### Informing your client about randomized entrances
+
+`randomize_entrances` returns the completed `ERPlacementState`. The `pairings` attribute contains a list of the
+created placements by name which can be used to populate slot data.
+
+### Imposing custom constraints on randomization
+
+Generic ER is, as the name implies, generic! That means that your world may have some use case which is not covered by
+the ER implementation. To solve this, you can create a custom `Entrance` class which provides custom implementations
+for `is_valid_source_transition` and `can_connect_to`. These allow arbitrary constraints to be implemented on
+randomization, for instance helping to prevent restrictive sphere 1s or ensuring a maximum distance from a "hub" region.
+
+> [!IMPORTANT]
+> When implementing these functions, make sure to use `super().is_valid_source_transition` and `super().can_connect_to`
+> as part of your implementation. Otherwise ER may behave unexpectedly.
+
+## Implementation details
+
+This section is a medium-level explainer of the implementation of ER for those who don't want to decipher the code.
+However, a basic understanding of the mechanics of `fill_restrictive` will be helpful as many of the underlying
+algorithms are shared
+
+ER uses a forward fill approach to create the region layout. First, ER collects `all_state` and performs a region sweep
+from Menu, similar to fill. ER then proceeds in stages to complete the randomization:
+1. Attempt to connect all non-dead-end regions, prioritizing access to unseen regions so there will always be new exits
+   to pair off.
+2. Attempt to connect all dead-end regions, so that all regions will be placed
+3. Connect all remaining dangling edges now that all regions are placed.
+    1. Connect any other dead end entrances (e.g. second entrances to the same dead end regions).
+    2. Connect all remaining non-dead-ends amongst each other.
+
+The process for each connection will do the following:
+1. Select a randomizable exit of a reachable region which is a valid source transition.
+2. Get its group and check `target_group_lookup` to determine which groups are valid targets.
+3. Look up ER targets from those groups and find one which is valid according to `can_connect_to`
+4. Connect the source exit to the target's target_region and delete the target.
+   * In stage 1, before placing the last valid source transition, an additional speculative sweep is performed to ensure
+     that there will be an available exit after the placement so randomization can continue.
+5. If it's coupled mode, find the reverse exit and target by name and connect them as well.
+6. Sweep to update reachable regions.
+7. Call the `on_connect` callback.
+
+This process repeats until the stage is complete, no valid source transition is found, or no valid target transition is
+found for any source transition. Unlike fill, there is no attempt made to save a failed randomization.
\ No newline at end of file
diff --git a/entrance_rando.py b/entrance_rando.py
new file mode 100644
index 000000000000..5aa16fa0bb06
--- /dev/null
+++ b/entrance_rando.py
@@ -0,0 +1,447 @@
+import itertools
+import logging
+import random
+import time
+from collections import deque
+from collections.abc import Callable, Iterable
+
+from BaseClasses import CollectionState, Entrance, Region, EntranceType
+from Options import Accessibility
+from worlds.AutoWorld import World
+
+
+class EntranceRandomizationError(RuntimeError):
+    pass
+
+
+class EntranceLookup:
+    class GroupLookup:
+        _lookup: dict[int, list[Entrance]]
+
+        def __init__(self):
+            self._lookup = {}
+
+        def __len__(self):
+            return sum(map(len, self._lookup.values()))
+
+        def __bool__(self):
+            return bool(self._lookup)
+
+        def __getitem__(self, item: int) -> list[Entrance]:
+            return self._lookup.get(item, [])
+
+        def __iter__(self):
+            return itertools.chain.from_iterable(self._lookup.values())
+
+        def __repr__(self):
+            return str(self._lookup)
+
+        def add(self, entrance: Entrance) -> None:
+            self._lookup.setdefault(entrance.randomization_group, []).append(entrance)
+
+        def remove(self, entrance: Entrance) -> None:
+            group = self._lookup[entrance.randomization_group]
+            group.remove(entrance)
+            if not group:
+                del self._lookup[entrance.randomization_group]
+
+    dead_ends: GroupLookup
+    others: GroupLookup
+    _random: random.Random
+    _expands_graph_cache: dict[Entrance, bool]
+    _coupled: bool
+
+    def __init__(self, rng: random.Random, coupled: bool):
+        self.dead_ends = EntranceLookup.GroupLookup()
+        self.others = EntranceLookup.GroupLookup()
+        self._random = rng
+        self._expands_graph_cache = {}
+        self._coupled = coupled
+
+    def _can_expand_graph(self, entrance: Entrance) -> bool:
+        """
+        Checks whether an entrance is able to expand the region graph, either by
+        providing access to randomizable exits or by granting access to items or
+        regions used in logic conditions.
+
+        :param entrance: A randomizable (no parent) region entrance
+        """
+        # we've seen this, return cached result
+        if entrance in self._expands_graph_cache:
+            return self._expands_graph_cache[entrance]
+
+        visited = set()
+        q: deque[Region] = deque()
+        q.append(entrance.connected_region)
+
+        while q:
+            region = q.popleft()
+            visited.add(region)
+
+            # check if the region itself is progression
+            if region in region.multiworld.indirect_connections:
+                self._expands_graph_cache[entrance] = True
+                return True
+
+            # check if any placed locations are progression
+            for loc in region.locations:
+                if loc.advancement:
+                    self._expands_graph_cache[entrance] = True
+                    return True
+
+            # check if there is a randomized exit out (expands the graph directly) or else search any connected
+            # regions to see if they are/have progression
+            for exit_ in region.exits:
+                # randomizable exits which are not reverse of the incoming entrance.
+                # uncoupled mode is an exception because in this case going back in the door you just came in could
+                # actually lead somewhere new
+                if not exit_.connected_region and (not self._coupled or exit_.name != entrance.name):
+                    self._expands_graph_cache[entrance] = True
+                    return True
+                elif exit_.connected_region and exit_.connected_region not in visited:
+                    q.append(exit_.connected_region)
+
+        self._expands_graph_cache[entrance] = False
+        return False
+
+    def add(self, entrance: Entrance) -> None:
+        lookup = self.others if self._can_expand_graph(entrance) else self.dead_ends
+        lookup.add(entrance)
+
+    def remove(self, entrance: Entrance) -> None:
+        lookup = self.others if self._can_expand_graph(entrance) else self.dead_ends
+        lookup.remove(entrance)
+
+    def get_targets(
+            self,
+            groups: Iterable[int],
+            dead_end: bool,
+            preserve_group_order: bool
+    ) -> Iterable[Entrance]:
+
+        lookup = self.dead_ends if dead_end else self.others
+        if preserve_group_order:
+            for group in groups:
+                self._random.shuffle(lookup[group])
+            ret = [entrance for group in groups for entrance in lookup[group]]
+        else:
+            ret = [entrance for group in groups for entrance in lookup[group]]
+            self._random.shuffle(ret)
+        return ret
+
+    def __len__(self):
+        return len(self.dead_ends) + len(self.others)
+
+
+class ERPlacementState:
+    """The state of an ongoing or completed entrance randomization"""
+    placements: list[Entrance]
+    """The list of randomized Entrance objects which have been connected successfully"""
+    pairings: list[tuple[str, str]]
+    """A list of pairings of connected entrance names, of the form (source_exit, target_entrance)"""
+    world: World
+    """The world which is having its entrances randomized"""
+    collection_state: CollectionState
+    """The CollectionState backing the entrance randomization logic"""
+    coupled: bool
+    """Whether entrance randomization is operating in coupled mode"""
+
+    def __init__(self, world: World, coupled: bool):
+        self.placements = []
+        self.pairings = []
+        self.world = world
+        self.coupled = coupled
+        self.collection_state = world.multiworld.get_all_state(False, True)
+
+    @property
+    def placed_regions(self) -> set[Region]:
+        return self.collection_state.reachable_regions[self.world.player]
+
+    def find_placeable_exits(self, check_validity: bool) -> list[Entrance]:
+        if check_validity:
+            blocked_connections = self.collection_state.blocked_connections[self.world.player]
+            blocked_connections = sorted(blocked_connections, key=lambda x: x.name)
+            placeable_randomized_exits = [connection for connection in blocked_connections
+                                          if not connection.connected_region
+                                          and connection.is_valid_source_transition(self)]
+        else:
+            # this is on a beaten minimal attempt, so any exit anywhere is fair game
+            placeable_randomized_exits = [ex for region in self.world.multiworld.get_regions(self.world.player)
+                                          for ex in region.exits if not ex.connected_region]
+        self.world.random.shuffle(placeable_randomized_exits)
+        return placeable_randomized_exits
+
+    def _connect_one_way(self, source_exit: Entrance, target_entrance: Entrance) -> None:
+        target_region = target_entrance.connected_region
+
+        target_region.entrances.remove(target_entrance)
+        source_exit.connect(target_region)
+
+        self.collection_state.stale[self.world.player] = True
+        self.placements.append(source_exit)
+        self.pairings.append((source_exit.name, target_entrance.name))
+
+    def test_speculative_connection(self, source_exit: Entrance, target_entrance: Entrance) -> bool:
+        copied_state = self.collection_state.copy()
+        # simulated connection. A real connection is unsafe because the region graph is shallow-copied and would
+        # propagate back to the real multiworld.
+        copied_state.reachable_regions[self.world.player].add(target_entrance.connected_region)
+        copied_state.blocked_connections[self.world.player].remove(source_exit)
+        copied_state.blocked_connections[self.world.player].update(target_entrance.connected_region.exits)
+        copied_state.update_reachable_regions(self.world.player)
+        copied_state.sweep_for_advancements()
+        # test that at there are newly reachable randomized exits that are ACTUALLY reachable
+        available_randomized_exits = copied_state.blocked_connections[self.world.player]
+        for _exit in available_randomized_exits:
+            if _exit.connected_region:
+                continue
+            # ignore the source exit, and, if coupled, the reverse exit. They're not actually new
+            if _exit.name == source_exit.name or (self.coupled and _exit.name == target_entrance.name):
+                continue
+            # technically this should be is_valid_source_transition, but that may rely on side effects from
+            # on_connect, which have not happened here (because we didn't do a real connection, and if we did, we would
+            # not want them to persist). can_reach is a close enough approximation most of the time.
+            if _exit.can_reach(copied_state):
+                return True
+        return False
+
+    def connect(
+            self,
+            source_exit: Entrance,
+            target_entrance: Entrance
+    ) -> tuple[list[Entrance], list[Entrance]]:
+        """
+        Connects a source exit to a target entrance in the graph, accounting for coupling
+
+        :returns: The newly placed exits and the dummy entrance(s) which were removed from the graph
+        """
+        source_region = source_exit.parent_region
+        target_region = target_entrance.connected_region
+
+        self._connect_one_way(source_exit, target_entrance)
+        # if we're doing coupled randomization place the reverse transition as well.
+        if self.coupled and source_exit.randomization_type == EntranceType.TWO_WAY:
+            for reverse_entrance in source_region.entrances:
+                if reverse_entrance.name == source_exit.name:
+                    if reverse_entrance.parent_region:
+                        raise EntranceRandomizationError(
+                            f"Could not perform coupling on {source_exit.name} -> {target_entrance.name} "
+                            f"because the reverse entrance is already parented to "
+                            f"{reverse_entrance.parent_region.name}.")
+                    break
+            else:
+                raise EntranceRandomizationError(f"Two way exit {source_exit.name} had no corresponding entrance in "
+                                                 f"{source_exit.parent_region.name}")
+            for reverse_exit in target_region.exits:
+                if reverse_exit.name == target_entrance.name:
+                    if reverse_exit.connected_region:
+                        raise EntranceRandomizationError(
+                            f"Could not perform coupling on {source_exit.name} -> {target_entrance.name} "
+                            f"because the reverse exit is already connected to "
+                            f"{reverse_exit.connected_region.name}.")
+                    break
+            else:
+                raise EntranceRandomizationError(f"Two way entrance {target_entrance.name} had no corresponding exit "
+                                                 f"in {target_region.name}.")
+            self._connect_one_way(reverse_exit, reverse_entrance)
+            return [source_exit, reverse_exit], [target_entrance, reverse_entrance]
+        return [source_exit], [target_entrance]
+
+
+def bake_target_group_lookup(world: World, get_target_groups: Callable[[int], list[int]]) \
+        -> dict[int, list[int]]:
+    """
+    Applies a transformation to all known entrance groups on randomizable exists to build a group lookup table.
+
+    :param world: Your World instance
+    :param get_target_groups: Function to call that returns the groups that a specific group type is allowed to
+                              connect to
+    """
+    unique_groups = { entrance.randomization_group for entrance in world.multiworld.get_entrances(world.player)
+                      if entrance.parent_region and not entrance.connected_region }
+    return { group: get_target_groups(group) for group in unique_groups }
+
+
+def disconnect_entrance_for_randomization(entrance: Entrance, target_group: int | None = None) -> None:
+    """
+    Given an entrance in a "vanilla" region graph, splits that entrance to prepare it for randomization
+    in randomize_entrances. This should be done after setting the type and group of the entrance.
+
+    :param entrance: The entrance which will be disconnected in preparation for randomization.
+    :param target_group: The group to assign to the created ER target. If not specified, the group from
+                         the original entrance will be copied.
+    """
+    child_region = entrance.connected_region
+    parent_region = entrance.parent_region
+
+    # disconnect the edge
+    child_region.entrances.remove(entrance)
+    entrance.connected_region = None
+
+    # create the needed ER target
+    if entrance.randomization_type == EntranceType.TWO_WAY:
+        # for 2-ways, create a target in the parent region with a matching name to support coupling.
+        # targets in the child region will be created when the other direction edge is disconnected
+        target = parent_region.create_er_target(entrance.name)
+    else:
+        # for 1-ways, the child region needs a target and coupling/naming is not a concern
+        target = child_region.create_er_target(child_region.name)
+    target.randomization_type = entrance.randomization_type
+    target.randomization_group = target_group or entrance.randomization_group
+
+
+def randomize_entrances(
+        world: World,
+        coupled: bool,
+        target_group_lookup: dict[int, list[int]],
+        preserve_group_order: bool = False,
+        er_targets: list[Entrance] | None = None,
+        exits: list[Entrance] | None = None,
+        on_connect: Callable[[ERPlacementState, list[Entrance]], None] | None = None
+) -> ERPlacementState:
+    """
+    Randomizes Entrances for a single world in the multiworld.
+
+    :param world: Your World instance
+    :param coupled: Whether connected entrances should be coupled to go in both directions
+    :param target_group_lookup: Map from each group to a list of the groups that it can be connect to. Every group
+                                used on an exit must be provided and must map to at least one other group. The default
+                                group is 0.
+    :param preserve_group_order: Whether the order of groupings should be preserved for the returned target_groups
+    :param er_targets: The list of ER targets (Entrance objects with no parent region) to use for randomization.
+                       Remember to be deterministic! If not provided, automatically discovers all valid targets
+                       in your world.
+    :param exits: The list of exits (Entrance objects with no target region) to use for randomization.
+                  Remember to be deterministic! If not provided, automatically discovers all valid exits in your world.
+    :param on_connect: A callback function which allows specifying side effects after a placement is completed
+                       successfully and the underlying collection state has been updated.
+    """
+    if not world.explicit_indirect_conditions:
+        raise EntranceRandomizationError("Entrance randomization requires explicit indirect conditions in order "
+                                         + "to correctly analyze whether dead end regions can be required in logic.")
+
+    start_time = time.perf_counter()
+    er_state = ERPlacementState(world, coupled)
+    entrance_lookup = EntranceLookup(world.random, coupled)
+    # similar to fill, skip validity checks on entrances if the game is beatable on minimal accessibility
+    perform_validity_check = True
+
+    def do_placement(source_exit: Entrance, target_entrance: Entrance) -> None:
+        placed_exits, removed_entrances = er_state.connect(source_exit, target_entrance)
+        # remove the placed targets from consideration
+        for entrance in removed_entrances:
+            entrance_lookup.remove(entrance)
+        # propagate new connections
+        er_state.collection_state.update_reachable_regions(world.player)
+        er_state.collection_state.sweep_for_advancements()
+        if on_connect:
+            on_connect(er_state, placed_exits)
+
+    def find_pairing(dead_end: bool, require_new_exits: bool) -> bool:
+        nonlocal perform_validity_check
+        placeable_exits = er_state.find_placeable_exits(perform_validity_check)
+        for source_exit in placeable_exits:
+            target_groups = target_group_lookup[source_exit.randomization_group]
+            for target_entrance in entrance_lookup.get_targets(target_groups, dead_end, preserve_group_order):
+                # when requiring new exits, ideally we would like to make it so that every placement increases
+                # (or keeps the same number of) reachable exits. The goal is to continue to expand the search space
+                # so that we do not crash. In the interest of performance and bias reduction, generally, just checking
+                # that we are going to a new region is a good approximation. however, we should take extra care on the
+                # very last exit and check whatever exits we open up are functionally accessible.
+                # this requirement can be ignored on a beaten minimal, islands are no issue there.
+                exit_requirement_satisfied = (not perform_validity_check or not require_new_exits
+                                                or target_entrance.connected_region not in er_state.placed_regions)
+                needs_speculative_sweep = (not dead_end and require_new_exits and perform_validity_check
+                                           and len(placeable_exits) == 1)
+                if exit_requirement_satisfied and source_exit.can_connect_to(target_entrance, dead_end, er_state):
+                    if (needs_speculative_sweep
+                            and not er_state.test_speculative_connection(source_exit, target_entrance)):
+                        continue
+                    do_placement(source_exit, target_entrance)
+                    return True
+        else:
+            # no source exits had any valid target so this stage is deadlocked. retries may be implemented if early
+            # deadlocking is a frequent issue.
+            lookup = entrance_lookup.dead_ends if dead_end else entrance_lookup.others
+
+            # if we're in a stage where we're trying to get to new regions, we could also enter this
+            # branch in a success state (when all regions of the preferred type have been placed, but there are still
+            # additional unplaced entrances into those regions)
+            if require_new_exits:
+                if all(e.connected_region in er_state.placed_regions for e in lookup):
+                    return False
+
+            # if we're on minimal accessibility and can guarantee the game is beatable,
+            # we can prevent a failure by bypassing future validity checks. this check may be
+            # expensive; fortunately we only have to do it once
+            if perform_validity_check and world.options.accessibility == Accessibility.option_minimal \
+                    and world.multiworld.has_beaten_game(er_state.collection_state, world.player):
+                # ensure that we have enough locations to place our progression
+                accessible_location_count = 0
+                prog_item_count = sum(er_state.collection_state.prog_items[world.player].values())
+                # short-circuit location checking in this case
+                if prog_item_count == 0:
+                    return True
+                for region in er_state.placed_regions:
+                    for loc in region.locations:
+                        if loc.can_reach(er_state.collection_state):
+                            accessible_location_count += 1
+                            if accessible_location_count >= prog_item_count:
+                                perform_validity_check = False
+                                # pretend that this was successful to retry the current stage
+                                return True
+
+            unplaced_entrances = [entrance for region in world.multiworld.get_regions(world.player)
+                                  for entrance in region.entrances if not entrance.parent_region]
+            unplaced_exits = [exit_ for region in world.multiworld.get_regions(world.player)
+                              for exit_ in region.exits if not exit_.connected_region]
+            entrance_kind = "dead ends" if dead_end else "non-dead ends"
+            region_access_requirement = "requires" if require_new_exits else "does not require"
+            raise EntranceRandomizationError(
+                f"None of the available entrances are valid targets for the available exits.\n"
+                f"Randomization stage is placing {entrance_kind} and {region_access_requirement} "
+                f"new region/exit access by default\n"
+                f"Placeable entrances: {lookup}\n"
+                f"Placeable exits: {placeable_exits}\n"
+                f"All unplaced entrances: {unplaced_entrances}\n"
+                f"All unplaced exits: {unplaced_exits}")
+
+    if not er_targets:
+        er_targets = sorted([entrance for region in world.multiworld.get_regions(world.player)
+                             for entrance in region.entrances if not entrance.parent_region], key=lambda x: x.name)
+    if not exits:
+        exits = sorted([ex for region in world.multiworld.get_regions(world.player)
+                        for ex in region.exits if not ex.connected_region], key=lambda x: x.name)
+    if len(er_targets) != len(exits):
+        raise EntranceRandomizationError(f"Unable to randomize entrances due to a mismatched count of "
+                                         f"entrances ({len(er_targets)}) and exits ({len(exits)}.")
+    for entrance in er_targets:
+        entrance_lookup.add(entrance)
+
+    # place the menu region and connected start region(s)
+    er_state.collection_state.update_reachable_regions(world.player)
+
+    # stage 1 - try to place all the non-dead-end entrances
+    while entrance_lookup.others:
+        if not find_pairing(dead_end=False, require_new_exits=True):
+            break
+    # stage 2 - try to place all the dead-end entrances
+    while entrance_lookup.dead_ends:
+        if not find_pairing(dead_end=True, require_new_exits=True):
+            break
+    # stage 3 - all the regions should be placed at this point. We now need to connect dangling edges
+    # stage 3a - get the rest of the dead ends (e.g. second entrances into already-visited regions)
+    #            doing this before the non-dead-ends is important to ensure there are enough connections to
+    #            go around
+    while entrance_lookup.dead_ends:
+        find_pairing(dead_end=True, require_new_exits=False)
+    # stage 3b - tie all the other loose ends connecting visited regions to each other
+    while entrance_lookup.others:
+        find_pairing(dead_end=False, require_new_exits=False)
+
+    running_time = time.perf_counter() - start_time
+    if running_time > 1.0:
+        logging.info(f"Took {running_time:.4f} seconds during entrance randomization for player {world.player},"
+                     f"named {world.multiworld.player_name[world.player]}")
+
+    return er_state
diff --git a/test/general/test_entrance_rando.py b/test/general/test_entrance_rando.py
new file mode 100644
index 000000000000..efbcf7df4636
--- /dev/null
+++ b/test/general/test_entrance_rando.py
@@ -0,0 +1,387 @@
+import unittest
+from enum import IntEnum
+
+from BaseClasses import Region, EntranceType, MultiWorld, Entrance
+from entrance_rando import disconnect_entrance_for_randomization, randomize_entrances, EntranceRandomizationError, \
+    ERPlacementState, EntranceLookup, bake_target_group_lookup
+from Options import Accessibility
+from test.general import generate_test_multiworld, generate_locations, generate_items
+from worlds.generic.Rules import set_rule
+
+
+class ERTestGroups(IntEnum):
+    LEFT = 1
+    RIGHT = 2
+    TOP = 3
+    BOTTOM = 4
+
+
+directionally_matched_group_lookup = {
+    ERTestGroups.LEFT: [ERTestGroups.RIGHT],
+    ERTestGroups.RIGHT: [ERTestGroups.LEFT],
+    ERTestGroups.TOP: [ERTestGroups.BOTTOM],
+    ERTestGroups.BOTTOM: [ERTestGroups.TOP]
+}
+
+
+def generate_entrance_pair(region: Region, name_suffix: str, group: int):
+    lx = region.create_exit(region.name + name_suffix)
+    lx.randomization_group = group
+    lx.randomization_type = EntranceType.TWO_WAY
+    le = region.create_er_target(region.name + name_suffix)
+    le.randomization_group = group
+    le.randomization_type = EntranceType.TWO_WAY
+
+
+def generate_disconnected_region_grid(multiworld: MultiWorld, grid_side_length: int, region_size: int = 0,
+                                      region_type: type[Region] = Region):
+    """
+    Generates a grid-like region structure for ER testing, where menu is connected to the top-left region, and each
+    region "in vanilla" has 2 2-way exits going either down or to the right, until reaching the goal region in the
+    bottom right
+    """
+    for row in range(grid_side_length):
+        for col in range(grid_side_length):
+            index = row * grid_side_length + col
+            name = f"region{index}"
+            region = region_type(name, 1, multiworld)
+            multiworld.regions.append(region)
+            generate_locations(region_size, 1, region=region, tag=f"_{name}")
+
+            if row == 0 and col == 0:
+                multiworld.get_region("Menu", 1).connect(region)
+            if col != 0:
+                generate_entrance_pair(region, "_left", ERTestGroups.LEFT)
+            if col != grid_side_length - 1:
+                generate_entrance_pair(region, "_right", ERTestGroups.RIGHT)
+            if row != 0:
+                generate_entrance_pair(region, "_top", ERTestGroups.TOP)
+            if row != grid_side_length - 1:
+                generate_entrance_pair(region, "_bottom", ERTestGroups.BOTTOM)
+
+
+class TestEntranceLookup(unittest.TestCase):
+    def test_shuffled_targets(self):
+        """tests that get_targets shuffles targets between groups when requested"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+
+        lookup = EntranceLookup(multiworld.worlds[1].random, coupled=True)
+        er_targets = [entrance for region in multiworld.get_regions(1)
+                      for entrance in region.entrances if not entrance.parent_region]
+        for entrance in er_targets:
+            lookup.add(entrance)
+
+        retrieved_targets = lookup.get_targets([ERTestGroups.TOP, ERTestGroups.BOTTOM],
+                                               False, False)
+        prev = None
+        group_order = [prev := group.randomization_group for group in retrieved_targets
+                       if prev != group.randomization_group]
+        # technically possible that group order may not be shuffled, by some small chance, on some seeds. but generally
+        # a shuffled list should alternate more frequently which is the desired behavior here
+        self.assertGreater(len(group_order), 2)
+
+
+    def test_ordered_targets(self):
+        """tests that get_targets does not shuffle targets between groups when requested"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+
+        lookup = EntranceLookup(multiworld.worlds[1].random, coupled=True)
+        er_targets = [entrance for region in multiworld.get_regions(1)
+                      for entrance in region.entrances if not entrance.parent_region]
+        for entrance in er_targets:
+            lookup.add(entrance)
+
+        retrieved_targets = lookup.get_targets([ERTestGroups.TOP, ERTestGroups.BOTTOM],
+                                               False, True)
+        prev = None
+        group_order = [prev := group.randomization_group for group in retrieved_targets if prev != group.randomization_group]
+        self.assertEqual([ERTestGroups.TOP, ERTestGroups.BOTTOM], group_order)
+
+
+class TestBakeTargetGroupLookup(unittest.TestCase):
+    def test_lookup_generation(self):
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+        world = multiworld.worlds[1]
+        expected = {
+            ERTestGroups.LEFT: [-ERTestGroups.LEFT],
+            ERTestGroups.RIGHT: [-ERTestGroups.RIGHT],
+            ERTestGroups.TOP: [-ERTestGroups.TOP],
+            ERTestGroups.BOTTOM: [-ERTestGroups.BOTTOM]
+        }
+        actual = bake_target_group_lookup(world, lambda g: [-g])
+        self.assertEqual(expected, actual)
+
+
+class TestDisconnectForRandomization(unittest.TestCase):
+    def test_disconnect_default_2way(self):
+        multiworld = generate_test_multiworld()
+        r1 = Region("r1", 1, multiworld)
+        r2 = Region("r2", 1, multiworld)
+        e = r1.create_exit("e")
+        e.randomization_type = EntranceType.TWO_WAY
+        e.randomization_group = 1
+        e.connect(r2)
+
+        disconnect_entrance_for_randomization(e)
+
+        self.assertIsNone(e.connected_region)
+        self.assertEqual([], r2.entrances)
+
+        self.assertEqual(1, len(r1.exits))
+        self.assertEqual(e, r1.exits[0])
+
+        self.assertEqual(1, len(r1.entrances))
+        self.assertIsNone(r1.entrances[0].parent_region)
+        self.assertEqual("e", r1.entrances[0].name)
+        self.assertEqual(EntranceType.TWO_WAY, r1.entrances[0].randomization_type)
+        self.assertEqual(1, r1.entrances[0].randomization_group)
+
+    def test_disconnect_default_1way(self):
+        multiworld = generate_test_multiworld()
+        r1 = Region("r1", 1, multiworld)
+        r2 = Region("r2", 1, multiworld)
+        e = r1.create_exit("e")
+        e.randomization_type = EntranceType.ONE_WAY
+        e.randomization_group = 1
+        e.connect(r2)
+
+        disconnect_entrance_for_randomization(e)
+
+        self.assertIsNone(e.connected_region)
+        self.assertEqual([], r1.entrances)
+
+        self.assertEqual(1, len(r1.exits))
+        self.assertEqual(e, r1.exits[0])
+
+        self.assertEqual(1, len(r2.entrances))
+        self.assertIsNone(r2.entrances[0].parent_region)
+        self.assertEqual("r2", r2.entrances[0].name)
+        self.assertEqual(EntranceType.ONE_WAY, r2.entrances[0].randomization_type)
+        self.assertEqual(1, r2.entrances[0].randomization_group)
+
+    def test_disconnect_uses_alternate_group(self):
+        multiworld = generate_test_multiworld()
+        r1 = Region("r1", 1, multiworld)
+        r2 = Region("r2", 1, multiworld)
+        e = r1.create_exit("e")
+        e.randomization_type = EntranceType.ONE_WAY
+        e.randomization_group = 1
+        e.connect(r2)
+
+        disconnect_entrance_for_randomization(e, 2)
+
+        self.assertIsNone(e.connected_region)
+        self.assertEqual([], r1.entrances)
+
+        self.assertEqual(1, len(r1.exits))
+        self.assertEqual(e, r1.exits[0])
+
+        self.assertEqual(1, len(r2.entrances))
+        self.assertIsNone(r2.entrances[0].parent_region)
+        self.assertEqual("r2", r2.entrances[0].name)
+        self.assertEqual(EntranceType.ONE_WAY, r2.entrances[0].randomization_type)
+        self.assertEqual(2, r2.entrances[0].randomization_group)
+
+
+class TestRandomizeEntrances(unittest.TestCase):
+    def test_determinism(self):
+        """tests that the same output is produced for the same input"""
+        multiworld1 = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld1, 5)
+        multiworld2 = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld2, 5)
+
+        result1 = randomize_entrances(multiworld1.worlds[1], False, directionally_matched_group_lookup)
+        result2 = randomize_entrances(multiworld2.worlds[1], False, directionally_matched_group_lookup)
+        self.assertEqual(result1.pairings, result2.pairings)
+        for e1, e2 in zip(result1.placements, result2.placements):
+            self.assertEqual(e1.name, e2.name)
+            self.assertEqual(e1.parent_region.name, e1.parent_region.name)
+            self.assertEqual(e1.connected_region.name, e2.connected_region.name)
+
+    def test_all_entrances_placed(self):
+        """tests that all entrances and exits were placed, all regions are connected, and no dangling edges exist"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+
+        result = randomize_entrances(multiworld.worlds[1], False, directionally_matched_group_lookup)
+
+        self.assertEqual([], [entrance for region in multiworld.get_regions()
+                              for entrance in region.entrances if not entrance.parent_region])
+        self.assertEqual([], [exit_ for region in multiworld.get_regions()
+                              for exit_ in region.exits if not exit_.connected_region])
+        # 5x5 grid + menu
+        self.assertEqual(26, len(result.placed_regions))
+        self.assertEqual(80, len(result.pairings))
+        self.assertEqual(80, len(result.placements))
+
+    def test_coupling(self):
+        """tests that in coupled mode, all 2 way transitions have an inverse"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+        seen_placement_count = 0
+
+        def verify_coupled(_: ERPlacementState, placed_entrances: list[Entrance]):
+            nonlocal seen_placement_count
+            seen_placement_count += len(placed_entrances)
+            self.assertEqual(2, len(placed_entrances))
+            self.assertEqual(placed_entrances[0].parent_region, placed_entrances[1].connected_region)
+            self.assertEqual(placed_entrances[1].parent_region, placed_entrances[0].connected_region)
+
+        result = randomize_entrances(multiworld.worlds[1], True, directionally_matched_group_lookup,
+                                     on_connect=verify_coupled)
+        # if we didn't visit every placement the verification on_connect doesn't really mean much
+        self.assertEqual(len(result.placements), seen_placement_count)
+
+    def test_uncoupled(self):
+        """tests that in uncoupled mode, no transitions have an (intentional) inverse"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+        seen_placement_count = 0
+
+        def verify_uncoupled(state: ERPlacementState, placed_entrances: list[Entrance]):
+            nonlocal seen_placement_count
+            seen_placement_count += len(placed_entrances)
+            self.assertEqual(1, len(placed_entrances))
+
+        result = randomize_entrances(multiworld.worlds[1], False, directionally_matched_group_lookup,
+                                     on_connect=verify_uncoupled)
+        # if we didn't visit every placement the verification on_connect doesn't really mean much
+        self.assertEqual(len(result.placements), seen_placement_count)
+
+    def test_oneway_twoway_pairing(self):
+        """tests that 1 ways are only paired to 1 ways and 2 ways are only paired to 2 ways"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+        region26 = Region("region26", 1, multiworld)
+        multiworld.regions.append(region26)
+        for index, region in enumerate(["region4", "region20", "region24"]):
+            x = multiworld.get_region(region, 1).create_exit(f"{region}_bottom_1way")
+            x.randomization_type = EntranceType.ONE_WAY
+            x.randomization_group = ERTestGroups.BOTTOM
+            e = region26.create_er_target(f"region26_top_1way{index}")
+            e.randomization_type = EntranceType.ONE_WAY
+            e.randomization_group = ERTestGroups.TOP
+
+        result = randomize_entrances(multiworld.worlds[1], False, directionally_matched_group_lookup)
+        for exit_name, entrance_name in result.pairings:
+            # we have labeled our entrances in such a way that all the 1 way entrances have 1way in the name,
+            # so test for that since the ER target will have been discarded
+            if "1way" in exit_name:
+                self.assertIn("1way", entrance_name)
+
+    def test_group_constraints_satisfied(self):
+        """tests that all grouping constraints are satisfied"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+
+        result = randomize_entrances(multiworld.worlds[1], False, directionally_matched_group_lookup)
+        for exit_name, entrance_name in result.pairings:
+            # we have labeled our entrances in such a way that all the entrances contain their group in the name
+            # so test for that since the ER target will have been discarded
+            if "top" in exit_name:
+                self.assertIn("bottom", entrance_name)
+            if "bottom" in exit_name:
+                self.assertIn("top", entrance_name)
+            if "left" in exit_name:
+                self.assertIn("right", entrance_name)
+            if "right" in exit_name:
+                self.assertIn("left", entrance_name)
+
+    def test_minimal_entrance_rando(self):
+        """tests that entrance randomization can complete with minimal accessibility and unreachable exits"""
+        multiworld = generate_test_multiworld()
+        multiworld.worlds[1].options.accessibility = Accessibility.from_any(Accessibility.option_minimal)
+        multiworld.completion_condition[1] = lambda state: state.can_reach("region24", player=1)
+        generate_disconnected_region_grid(multiworld, 5, 1)
+        prog_items = generate_items(10, 1, True)
+        multiworld.itempool += prog_items
+        filler_items = generate_items(15, 1, False)
+        multiworld.itempool += filler_items
+        e = multiworld.get_entrance("region1_right", 1)
+        set_rule(e, lambda state: False)
+
+        randomize_entrances(multiworld.worlds[1], False, directionally_matched_group_lookup)
+
+        self.assertEqual([], [entrance for region in multiworld.get_regions()
+                              for entrance in region.entrances if not entrance.parent_region])
+        self.assertEqual([], [exit_ for region in multiworld.get_regions()
+                              for exit_ in region.exits if not exit_.connected_region])
+
+    def test_restrictive_region_requirement_does_not_fail(self):
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 2, 1)
+
+        region = Region("region4", 1, multiworld)
+        multiworld.regions.append(region)
+        generate_entrance_pair(multiworld.get_region("region0", 1), "_right2", ERTestGroups.RIGHT)
+        generate_entrance_pair(region, "_left", ERTestGroups.LEFT)
+
+        blocked_exits = ["region1_left", "region1_bottom",
+                         "region2_top", "region2_right",
+                         "region3_left", "region3_top"]
+        for exit_name in blocked_exits:
+            blocked_exit = multiworld.get_entrance(exit_name, 1)
+            blocked_exit.access_rule = lambda state: state.can_reach_region("region4", 1)
+            multiworld.register_indirect_condition(region, blocked_exit)
+
+        result = randomize_entrances(multiworld.worlds[1], True, directionally_matched_group_lookup)
+        # verifying that we did in fact place region3 adjacent to region0 to unblock all the other connections
+        # (and implicitly, that ER didn't fail)
+        self.assertTrue(("region0_right", "region4_left") in result.pairings
+                        or ("region0_right2", "region4_left") in result.pairings)
+
+    def test_fails_when_mismatched_entrance_and_exit_count(self):
+        """tests that entrance randomization fast-fails if the input exit and entrance count do not match"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+        multiworld.get_region("region1", 1).create_exit("extra")
+
+        self.assertRaises(EntranceRandomizationError, randomize_entrances, multiworld.worlds[1], False,
+                          directionally_matched_group_lookup)
+
+    def test_fails_when_some_unreachable_exit(self):
+        """tests that entrance randomization fails if an exit is never reachable (non-minimal accessibility)"""
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5)
+        e = multiworld.get_entrance("region1_right", 1)
+        set_rule(e, lambda state: False)
+
+        self.assertRaises(EntranceRandomizationError, randomize_entrances, multiworld.worlds[1], False,
+                          directionally_matched_group_lookup)
+
+    def test_fails_when_some_unconnectable_exit(self):
+        """tests that entrance randomization fails if an exit can't be made into a valid placement (non-minimal)"""
+        class CustomEntrance(Entrance):
+            def can_connect_to(self, other: Entrance, dead_end: bool, er_state: "ERPlacementState") -> bool:
+                if other.name == "region1_right":
+                    return False
+
+        class CustomRegion(Region):
+            entrance_type = CustomEntrance
+
+        multiworld = generate_test_multiworld()
+        generate_disconnected_region_grid(multiworld, 5, region_type=CustomRegion)
+
+        self.assertRaises(EntranceRandomizationError, randomize_entrances, multiworld.worlds[1], False,
+                          directionally_matched_group_lookup)
+
+    def test_minimal_er_fails_when_not_enough_locations_to_fit_progression(self):
+        """
+        tests that entrance randomization fails in minimal accessibility if there are not enough locations
+        available to place all progression items locally
+        """
+        multiworld = generate_test_multiworld()
+        multiworld.worlds[1].options.accessibility = Accessibility.from_any(Accessibility.option_minimal)
+        multiworld.completion_condition[1] = lambda state: state.can_reach("region24", player=1)
+        generate_disconnected_region_grid(multiworld, 5, 1)
+        prog_items = generate_items(30, 1, True)
+        multiworld.itempool += prog_items
+        e = multiworld.get_entrance("region1_right", 1)
+        set_rule(e, lambda state: False)
+
+        self.assertRaises(EntranceRandomizationError, randomize_entrances, multiworld.worlds[1], False,
+                          directionally_matched_group_lookup)

From 3bcc86f5391ea00d220bf6bf094a4a08801b162b Mon Sep 17 00:00:00 2001
From: Kory Dondzila <korydondzila@gmail.com>
Date: Fri, 27 Dec 2024 15:07:55 -0500
Subject: [PATCH 198/381] Shivers: Add events and fix require puzzle hints
 logic (#4018)

* Adds some events, renames things, fails for many players.

* Adds entrance rules for requires hints.

* Cleanup and add goal item.

* Cleanup.

* Add additional rule.

* Event and regions additions.

* Updates from merge.

* Adds collect behavior option.

* Fix missing generator location.

* Fix whitespace and optimize imports.

* Switch location order back.

* Add name replacement for storage.

* Fix test failure.

* Improve puzzle hints required.

* Add missing locations and cleanup indirect conditions.

* Fix naming.

* PR feedback.

* Missed comment.

* Cleanup imports, use strings for option equivalence, and update option description.

* Fix rule.

* Create rolling buffer goal items and remove goal items and location from default options.

* Cleanup.

* Removes dateutil.

* Fixes Subterranean World information plaque.
---
 docs/CODEOWNERS                             |   2 +-
 worlds/shivers/Constants.py                 |  20 +-
 worlds/shivers/Items.py                     | 306 +++++++++++--------
 worlds/shivers/Options.py                   | 100 ++++++-
 worlds/shivers/Rules.py                     | 315 ++++++++++++--------
 worlds/shivers/__init__.py                  | 264 +++++++++-------
 worlds/shivers/data/excluded_locations.json |   2 +-
 worlds/shivers/data/locations.json          | 144 +++++----
 worlds/shivers/data/regions.json            |  88 +++---
 worlds/shivers/docs/en_Shivers.md           |   3 +-
 10 files changed, 783 insertions(+), 461 deletions(-)

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index d58207806743..1d70531e9974 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -152,7 +152,7 @@
 /worlds/saving_princess/ @LeonarthCG
 
 # Shivers
-/worlds/shivers/ @GodlFire
+/worlds/shivers/ @GodlFire @korydondzila
 
 # A Short Hike
 /worlds/shorthike/ @chandler05 @BrandenEK
diff --git a/worlds/shivers/Constants.py b/worlds/shivers/Constants.py
index 95b3c2d56ad9..9b7f3dcebc4f 100644
--- a/worlds/shivers/Constants.py
+++ b/worlds/shivers/Constants.py
@@ -1,17 +1,25 @@
-import os
 import json
+import os
 import pkgutil
+from datetime import datetime
+
 
 def load_data_file(*args) -> dict:
     fname = "/".join(["data", *args])
     return json.loads(pkgutil.get_data(__name__, fname).decode())
 
-location_id_offset: int = 27000
 
-location_info = load_data_file("locations.json")
-location_name_to_id = {name: location_id_offset + index \
-	for index, name in enumerate(location_info["all_locations"])}
+def relative_years_from_today(dt2: datetime) -> int:
+    today = datetime.now()
+    years = today.year - dt2.year
+    if today.month < dt2.month or (today.month == dt2.month and today.day < dt2.day):
+        years -= 1
+    return years
 
-exclusion_info = load_data_file("excluded_locations.json")
 
+location_id_offset: int = 27000
+location_info = load_data_file("locations.json")
+location_name_to_id = {name: location_id_offset + index for index, name in enumerate(location_info["all_locations"])}
+exclusion_info = load_data_file("excluded_locations.json")
 region_info = load_data_file("regions.json")
+years_since_sep_30_1980 = relative_years_from_today(datetime.fromisoformat("1980-09-30"))
diff --git a/worlds/shivers/Items.py b/worlds/shivers/Items.py
index 10d234d450bb..a60bad17b8ed 100644
--- a/worlds/shivers/Items.py
+++ b/worlds/shivers/Items.py
@@ -1,132 +1,198 @@
+import enum
+from typing import NamedTuple, Optional
+
 from BaseClasses import Item, ItemClassification
-import typing
+from . import Constants
+
 
 class ShiversItem(Item):
     game: str = "Shivers"
 
-class ItemData(typing.NamedTuple):
-    code: int
-    type: str
+
+class ItemType(enum.Enum):
+    POT = "pot"
+    POT_COMPLETE = "pot-complete"
+    POT_DUPLICATE = "pot-duplicate"
+    POT_COMPELTE_DUPLICATE = "pot-complete-duplicate"
+    KEY = "key"
+    KEY_OPTIONAL = "key-optional"
+    ABILITY = "ability"
+    FILLER = "filler"
+    IXUPI_AVAILABILITY = "ixupi-availability"
+    GOAL = "goal"
+
+
+class ItemData(NamedTuple):
+    code: Optional[int]
+    type: ItemType
     classification: ItemClassification = ItemClassification.progression
 
+
 SHIVERS_ITEM_ID_OFFSET = 27000
 
+# To allow for an item with a name that changes over time (once a year)
+# while keeping the id unique we can generate a small range of them.
+goal_items = {
+    f"Mt. Pleasant Tribune: {Constants.years_since_sep_30_1980 + year_offset} year Old Mystery Solved!": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 100 + Constants.years_since_sep_30_1980 + year_offset, ItemType.GOAL
+    ) for year_offset in range(-1, 2)
+}
+
 item_table = {
-    #Pot Pieces
-    "Water Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 0, "pot"),
-    "Wax Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 1, "pot"),
-    "Ash Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 2, "pot"),
-    "Oil Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 3, "pot"),
-    "Cloth Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 4, "pot"),
-    "Wood Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 5, "pot"),
-    "Crystal Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 6, "pot"),
-    "Lightning Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 7, "pot"),
-    "Sand Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 8, "pot"),
-    "Metal Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 9, "pot"),
-    "Water Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 10, "pot"),
-    "Wax Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 11, "pot"),
-    "Ash Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 12, "pot"),
-    "Oil Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 13, "pot"),
-    "Cloth Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 14, "pot"),
-    "Wood Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 15, "pot"),
-    "Crystal Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 16, "pot"),
-    "Lightning Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 17, "pot"),
-    "Sand Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 18, "pot"),
-    "Metal Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 19, "pot"),
-    "Water Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 20, "pot_type2"),
-    "Wax Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 21, "pot_type2"),
-    "Ash Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 22, "pot_type2"),
-    "Oil Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 23, "pot_type2"),
-    "Cloth Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 24, "pot_type2"),
-    "Wood Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 25, "pot_type2"),
-    "Crystal Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 26, "pot_type2"),
-    "Lightning Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 27, "pot_type2"),
-    "Sand Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 28, "pot_type2"),
-    "Metal Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 29, "pot_type2"),
-
-    #Keys
-    "Key for Office Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 30, "key"),
-    "Key for Bedroom Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 31, "key"),
-    "Key for Three Floor Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 32, "key"),
-    "Key for Workshop": ItemData(SHIVERS_ITEM_ID_OFFSET + 33, "key"),
-    "Key for Office": ItemData(SHIVERS_ITEM_ID_OFFSET + 34, "key"),
-    "Key for Prehistoric Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 35, "key"),
-    "Key for Greenhouse Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 36, "key"),
-    "Key for Ocean Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 37, "key"),
-    "Key for Projector Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 38, "key"),
-    "Key for Generator Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 39, "key"),
-    "Key for Egypt Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 40, "key"),
-    "Key for Library Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 41, "key"),
-    "Key for Shaman Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 42, "key"),
-    "Key for UFO Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 43, "key"),
-    "Key for Torture Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 44, "key"),
-    "Key for Puzzle Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 45, "key"),
-    "Key for Bedroom": ItemData(SHIVERS_ITEM_ID_OFFSET + 46, "key"),
-    "Key for Underground Lake Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 47, "key"),
-    "Key for Janitor Closet": ItemData(SHIVERS_ITEM_ID_OFFSET + 48, "key"),
-    "Key for Front Door": ItemData(SHIVERS_ITEM_ID_OFFSET + 49, "key-optional"),
-
-    #Abilities
-    "Crawling": ItemData(SHIVERS_ITEM_ID_OFFSET + 50, "ability"),
-
-    #Event Items
-    "Victory": ItemData(SHIVERS_ITEM_ID_OFFSET + 60, "victory"),
-
-    #Duplicate pot pieces for fill_Restrictive
-    "Water Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 70, "potduplicate"),
-    "Wax Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 71, "potduplicate"),
-    "Ash Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 72, "potduplicate"),
-    "Oil Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 73, "potduplicate"),
-    "Cloth Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 74, "potduplicate"),
-    "Wood Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 75, "potduplicate"),
-    "Crystal Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 76, "potduplicate"),
-    "Lightning Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 77, "potduplicate"),
-    "Sand Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 78, "potduplicate"),
-    "Metal Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 79, "potduplicate"),
-    "Water Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 80, "potduplicate"),
-    "Wax Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 81, "potduplicate"),
-    "Ash Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 82, "potduplicate"),
-    "Oil Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 83, "potduplicate"),
-    "Cloth Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 84, "potduplicate"),
-    "Wood Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 85, "potduplicate"),
-    "Crystal Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 86, "potduplicate"),
-    "Lightning Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 87, "potduplicate"),
-    "Sand Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 88, "potduplicate"),
-    "Metal Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 89, "potduplicate"),
-    "Water Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 140, "potduplicate_type2"),
-    "Wax Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 141, "potduplicate_type2"),
-    "Ash Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 142, "potduplicate_type2"),
-    "Oil Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 143, "potduplicate_type2"),
-    "Cloth Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 144, "potduplicate_type2"),
-    "Wood Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 145, "potduplicate_type2"),
-    "Crystal Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 146, "potduplicate_type2"),
-    "Lightning Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 147, "potduplicate_type2"),
-    "Sand Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 148, "potduplicate_type2"),
-    "Metal Pot Complete DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 149, "potduplicate_type2"),
-
-    #Filler
-    "Empty": ItemData(SHIVERS_ITEM_ID_OFFSET + 90, "filler"),
-    "Easier Lyre": ItemData(SHIVERS_ITEM_ID_OFFSET + 91, "filler", ItemClassification.filler),
-    "Water Always Available in Lobby": ItemData(SHIVERS_ITEM_ID_OFFSET + 92, "filler2", ItemClassification.filler),
-    "Wax Always Available in Library": ItemData(SHIVERS_ITEM_ID_OFFSET + 93, "filler2", ItemClassification.filler),
-    "Wax Always Available in Anansi Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 94, "filler2", ItemClassification.filler),
-    "Wax Always Available in Shaman Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 95, "filler2", ItemClassification.filler),
-    "Ash Always Available in Office": ItemData(SHIVERS_ITEM_ID_OFFSET + 96, "filler2", ItemClassification.filler),
-    "Ash Always Available in Burial Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 97, "filler2", ItemClassification.filler),
-    "Oil Always Available in Prehistoric Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 98, "filler2", ItemClassification.filler),
-    "Cloth Always Available in Egypt": ItemData(SHIVERS_ITEM_ID_OFFSET + 99, "filler2", ItemClassification.filler),
-    "Cloth Always Available in Burial Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 100, "filler2", ItemClassification.filler),
-    "Wood Always Available in Workshop": ItemData(SHIVERS_ITEM_ID_OFFSET + 101, "filler2", ItemClassification.filler),
-    "Wood Always Available in Blue Maze": ItemData(SHIVERS_ITEM_ID_OFFSET + 102, "filler2", ItemClassification.filler),
-    "Wood Always Available in Pegasus Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 103, "filler2", ItemClassification.filler),
-    "Wood Always Available in Gods Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 104, "filler2", ItemClassification.filler),
-    "Crystal Always Available in Lobby": ItemData(SHIVERS_ITEM_ID_OFFSET + 105, "filler2", ItemClassification.filler),
-    "Crystal Always Available in Ocean": ItemData(SHIVERS_ITEM_ID_OFFSET + 106, "filler2", ItemClassification.filler),
-    "Sand Always Available in Greenhouse Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 107, "filler2", ItemClassification.filler),
-    "Sand Always Available in Ocean": ItemData(SHIVERS_ITEM_ID_OFFSET + 108, "filler2", ItemClassification.filler),
-    "Metal Always Available in Projector Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 109, "filler2", ItemClassification.filler),
-    "Metal Always Available in Bedroom": ItemData(SHIVERS_ITEM_ID_OFFSET + 110, "filler2", ItemClassification.filler),
-    "Metal Always Available in Prehistoric": ItemData(SHIVERS_ITEM_ID_OFFSET + 111, "filler2", ItemClassification.filler),
-    "Heal": ItemData(SHIVERS_ITEM_ID_OFFSET + 112, "filler3", ItemClassification.filler)
+    # Pot Pieces
+    "Water Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 0, ItemType.POT),
+    "Wax Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 1, ItemType.POT),
+    "Ash Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 2, ItemType.POT),
+    "Oil Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 3, ItemType.POT),
+    "Cloth Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 4, ItemType.POT),
+    "Wood Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 5, ItemType.POT),
+    "Crystal Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 6, ItemType.POT),
+    "Lightning Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 7, ItemType.POT),
+    "Sand Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 8, ItemType.POT),
+    "Metal Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 9, ItemType.POT),
+    "Water Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 10, ItemType.POT),
+    "Wax Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 11, ItemType.POT),
+    "Ash Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 12, ItemType.POT),
+    "Oil Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 13, ItemType.POT),
+    "Cloth Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 14, ItemType.POT),
+    "Wood Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 15, ItemType.POT),
+    "Crystal Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 16, ItemType.POT),
+    "Lightning Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 17, ItemType.POT),
+    "Sand Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 18, ItemType.POT),
+    "Metal Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 19, ItemType.POT),
+    "Water Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 20, ItemType.POT_COMPLETE),
+    "Wax Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 21, ItemType.POT_COMPLETE),
+    "Ash Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 22, ItemType.POT_COMPLETE),
+    "Oil Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 23, ItemType.POT_COMPLETE),
+    "Cloth Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 24, ItemType.POT_COMPLETE),
+    "Wood Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 25, ItemType.POT_COMPLETE),
+    "Crystal Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 26, ItemType.POT_COMPLETE),
+    "Lightning Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 27, ItemType.POT_COMPLETE),
+    "Sand Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 28, ItemType.POT_COMPLETE),
+    "Metal Pot Complete": ItemData(SHIVERS_ITEM_ID_OFFSET + 29, ItemType.POT_COMPLETE),
+
+    # Keys
+    "Key for Office Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 30, ItemType.KEY),
+    "Key for Bedroom Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 31, ItemType.KEY),
+    "Key for Three Floor Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 32, ItemType.KEY),
+    "Key for Workshop": ItemData(SHIVERS_ITEM_ID_OFFSET + 33, ItemType.KEY),
+    "Key for Office": ItemData(SHIVERS_ITEM_ID_OFFSET + 34, ItemType.KEY),
+    "Key for Prehistoric Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 35, ItemType.KEY),
+    "Key for Greenhouse": ItemData(SHIVERS_ITEM_ID_OFFSET + 36, ItemType.KEY),
+    "Key for Ocean Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 37, ItemType.KEY),
+    "Key for Projector Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 38, ItemType.KEY),
+    "Key for Generator Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 39, ItemType.KEY),
+    "Key for Egypt Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 40, ItemType.KEY),
+    "Key for Library": ItemData(SHIVERS_ITEM_ID_OFFSET + 41, ItemType.KEY),
+    "Key for Shaman Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 42, ItemType.KEY),
+    "Key for UFO Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 43, ItemType.KEY),
+    "Key for Torture Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 44, ItemType.KEY),
+    "Key for Puzzle Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 45, ItemType.KEY),
+    "Key for Bedroom": ItemData(SHIVERS_ITEM_ID_OFFSET + 46, ItemType.KEY),
+    "Key for Underground Lake": ItemData(SHIVERS_ITEM_ID_OFFSET + 47, ItemType.KEY),
+    "Key for Janitor Closet": ItemData(SHIVERS_ITEM_ID_OFFSET + 48, ItemType.KEY),
+    "Key for Front Door": ItemData(SHIVERS_ITEM_ID_OFFSET + 49, ItemType.KEY_OPTIONAL),
+
+    # Abilities
+    "Crawling": ItemData(SHIVERS_ITEM_ID_OFFSET + 50, ItemType.ABILITY),
+
+    # Duplicate pot pieces for fill_Restrictive
+    "Water Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Wax Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Ash Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Oil Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Cloth Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Wood Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Crystal Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Lightning Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Sand Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Metal Pot Bottom DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Water Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Wax Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Ash Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Oil Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Cloth Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Wood Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Crystal Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Lightning Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Sand Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Metal Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
+    "Water Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Wax Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Ash Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Oil Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Cloth Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Wood Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Crystal Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Lightning Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Sand Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Metal Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+
+    # Filler
+    "Empty": ItemData(None, ItemType.FILLER, ItemClassification.filler),
+    "Easier Lyre": ItemData(SHIVERS_ITEM_ID_OFFSET + 91, ItemType.FILLER, ItemClassification.useful),
+    "Water Always Available in Lobby": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 92, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Wax Always Available in Library": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 93, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Wax Always Available in Anansi Room": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 94, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Wax Always Available in Shaman Room": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 95, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Ash Always Available in Office": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 96, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Ash Always Available in Burial Room": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 97, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Oil Always Available in Prehistoric Room": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 98, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Cloth Always Available in Egypt": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 99, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Cloth Always Available in Burial Room": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 100, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Wood Always Available in Workshop": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 101, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Wood Always Available in Blue Maze": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 102, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Wood Always Available in Pegasus Room": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 103, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Wood Always Available in Gods Room": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 104, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Crystal Always Available in Lobby": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 105, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Crystal Always Available in Ocean": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 106, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Sand Always Available in Greenhouse": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 107, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Sand Always Available in Ocean": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 108, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Metal Always Available in Projector Room": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 109, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Metal Always Available in Bedroom": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 110, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Metal Always Available in Prehistoric": ItemData(
+        SHIVERS_ITEM_ID_OFFSET + 111, ItemType.IXUPI_AVAILABILITY, ItemClassification.filler
+    ),
+    "Heal": ItemData(SHIVERS_ITEM_ID_OFFSET + 112, ItemType.FILLER, ItemClassification.filler),
 
+    # Goal items
+    **goal_items
 }
diff --git a/worlds/shivers/Options.py b/worlds/shivers/Options.py
index 72791bef3e7b..2e68c4beecc0 100644
--- a/worlds/shivers/Options.py
+++ b/worlds/shivers/Options.py
@@ -1,6 +1,11 @@
-from Options import Choice, DefaultOnToggle, Toggle, PerGameCommonOptions, Range
 from dataclasses import dataclass
 
+from Options import (
+    Choice, DefaultOnToggle, ItemDict, ItemSet, LocationSet, OptionGroup, PerGameCommonOptions, Range, Toggle,
+)
+from . import ItemType, item_table
+from .Constants import location_info
+
 
 class IxupiCapturesNeeded(Range):
     """
@@ -11,12 +16,13 @@ class IxupiCapturesNeeded(Range):
     range_end = 10
     default = 10
 
+
 class LobbyAccess(Choice):
     """
     Chooses how keys needed to reach the lobby are placed.
     - Normal: Keys are placed anywhere
     - Early: Keys are placed early 
-    - Local: Keys are placed locally
+    - Local: Keys are placed locally and early
     """
     display_name = "Lobby Access"
     option_normal = 0
@@ -24,16 +30,19 @@ class LobbyAccess(Choice):
     option_local = 2
     default = 1
 
+
 class PuzzleHintsRequired(DefaultOnToggle):
     """
     If turned on puzzle hints/solutions will be available before the corresponding puzzle is required.
 
-    For example: The Red Door puzzle will be logically required only after access to the Beth's Address Book which gives you the solution.
+    For example: The Red Door puzzle will be logically required only after obtaining access to Beth's Address Book
+    which gives you the solution.
 
     Turning this off allows for greater randomization.
     """
     display_name = "Puzzle Hints Required"
 
+
 class InformationPlaques(Toggle):
     """
     Adds Information Plaques as checks.
@@ -41,12 +50,14 @@ class InformationPlaques(Toggle):
     """
     display_name = "Include Information Plaques"
 
+
 class FrontDoorUsable(Toggle):
     """
     Adds a key to unlock the front door of the museum.
     """
     display_name = "Front Door Usable"
 
+
 class ElevatorsStaySolved(DefaultOnToggle):
     """
     Adds elevators as checks and will remain open upon solving them.
@@ -54,12 +65,15 @@ class ElevatorsStaySolved(DefaultOnToggle):
     """
     display_name = "Elevators Stay Solved"
 
+
 class EarlyBeth(DefaultOnToggle):
     """
-    Beth's body is open at the start of the game. This allows any pot piece to be placed in the slide and early checks on the second half of the final riddle.
+    Beth's body is open at the start of the game.
+    This allows any pot piece to be placed in the slide and early checks on the second half of the final riddle.
     """
     display_name = "Early Beth"
 
+
 class EarlyLightning(Toggle):
     """
     Allows lightning to be captured at any point in the game. You will still need to capture all ten Ixupi for victory.
@@ -67,6 +81,7 @@ class EarlyLightning(Toggle):
     """
     display_name = "Early Lightning"
 
+
 class LocationPotPieces(Choice):
     """
     Chooses where pot pieces will be located within the multiworld.
@@ -78,6 +93,8 @@ class LocationPotPieces(Choice):
     option_own_world = 0
     option_different_world = 1
     option_any_world = 2
+    default = 2
+
 
 class FullPots(Choice):
     """
@@ -107,6 +124,61 @@ class PuzzleCollectBehavior(Choice):
     default = 1
 
 
+# Need to override the default options to remove the goal items and goal locations so that they do not show on web.
+valid_item_keys = [name for name, data in item_table.items() if data.type != ItemType.GOAL and data.code is not None]
+valid_location_keys = [name for name in location_info["all_locations"] if name != "Mystery Solved"]
+
+
+class LocalItems(ItemSet):
+    """Forces these items to be in their native world."""
+    display_name = "Local Items"
+    rich_text_doc = True
+    valid_keys = valid_item_keys
+
+
+class NonLocalItems(ItemSet):
+    """Forces these items to be outside their native world."""
+    display_name = "Non-local Items"
+    rich_text_doc = True
+    valid_keys = valid_item_keys
+
+
+class StartInventory(ItemDict):
+    """Start with these items."""
+    verify_item_name = True
+    display_name = "Start Inventory"
+    rich_text_doc = True
+    valid_keys = valid_item_keys
+
+
+class StartHints(ItemSet):
+    """Start with these item's locations prefilled into the ``!hint`` command."""
+    display_name = "Start Hints"
+    rich_text_doc = True
+    valid_keys = valid_item_keys
+
+
+class StartLocationHints(LocationSet):
+    """Start with these locations and their item prefilled into the ``!hint`` command."""
+    display_name = "Start Location Hints"
+    rich_text_doc = True
+    valid_keys = valid_location_keys
+
+
+class ExcludeLocations(LocationSet):
+    """Prevent these locations from having an important item."""
+    display_name = "Excluded Locations"
+    rich_text_doc = True
+    valid_keys = valid_location_keys
+
+
+class PriorityLocations(LocationSet):
+    """Prevent these locations from having an unimportant item."""
+    display_name = "Priority Locations"
+    rich_text_doc = True
+    valid_keys = valid_location_keys
+
+
 @dataclass
 class ShiversOptions(PerGameCommonOptions):
     ixupi_captures_needed: IxupiCapturesNeeded
@@ -120,3 +192,23 @@ class ShiversOptions(PerGameCommonOptions):
     location_pot_pieces: LocationPotPieces
     full_pots: FullPots
     puzzle_collect_behavior: PuzzleCollectBehavior
+    local_items: LocalItems
+    non_local_items: NonLocalItems
+    start_inventory: StartInventory
+    start_hints: StartHints
+    start_location_hints: StartLocationHints
+    exclude_locations: ExcludeLocations
+    priority_locations: PriorityLocations
+
+
+shivers_option_groups = [
+    OptionGroup("Item & Location Options", [
+        LocalItems,
+        NonLocalItems,
+        StartInventory,
+        StartHints,
+        StartLocationHints,
+        ExcludeLocations,
+        PriorityLocations
+    ], True),
+]
diff --git a/worlds/shivers/Rules.py b/worlds/shivers/Rules.py
index 5288fa2c9c3f..d6ea0fca5926 100644
--- a/worlds/shivers/Rules.py
+++ b/worlds/shivers/Rules.py
@@ -1,66 +1,69 @@
-from typing import Dict, TYPE_CHECKING
 from collections.abc import Callable
+from typing import Dict, TYPE_CHECKING
+
 from BaseClasses import CollectionState
 from worlds.generic.Rules import forbid_item
+from . import Constants
 
 if TYPE_CHECKING:
     from . import ShiversWorld
 
 
 def water_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Water Pot Bottom", "Water Pot Top", "Water Pot Bottom DUPE", "Water Pot Top DUPE"}, player) or \
-        state.has_all({"Water Pot Complete", "Water Pot Complete DUPE"}, player)
+    return state.has_all({"Water Pot Bottom", "Water Pot Top", "Water Pot Bottom DUPE", "Water Pot Top DUPE"}, player) \
+        or state.has_all({"Water Pot Complete", "Water Pot Complete DUPE"}, player)
 
 
 def wax_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Wax Pot Bottom", "Wax Pot Top", "Wax Pot Bottom DUPE", "Wax Pot Top DUPE"}, player) or \
-        state.has_all({"Wax Pot Complete", "Wax Pot Complete DUPE"}, player)
+    return state.has_all({"Wax Pot Bottom", "Wax Pot Top", "Wax Pot Bottom DUPE", "Wax Pot Top DUPE"}, player) \
+        or state.has_all({"Wax Pot Complete", "Wax Pot Complete DUPE"}, player)
 
 
 def ash_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Ash Pot Bottom", "Ash Pot Top", "Ash Pot Bottom DUPE", "Ash Pot Top DUPE"}, player) or \
-        state.has_all({"Ash Pot Complete", "Ash Pot Complete DUPE"}, player)
+    return state.has_all({"Ash Pot Bottom", "Ash Pot Top", "Ash Pot Bottom DUPE", "Ash Pot Top DUPE"}, player) \
+        or state.has_all({"Ash Pot Complete", "Ash Pot Complete DUPE"}, player)
 
 
 def oil_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Oil Pot Bottom", "Oil Pot Top", "Oil Pot Bottom DUPE", "Oil Pot Top DUPE"}, player) or \
-        state.has_all({"Oil Pot Complete", "Oil Pot Complete DUPE"}, player)
+    return state.has_all({"Oil Pot Bottom", "Oil Pot Top", "Oil Pot Bottom DUPE", "Oil Pot Top DUPE"}, player) \
+        or state.has_all({"Oil Pot Complete", "Oil Pot Complete DUPE"}, player)
 
 
 def cloth_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Cloth Pot Bottom", "Cloth Pot Top", "Cloth Pot Bottom DUPE", "Cloth Pot Top DUPE"}, player) or \
-        state.has_all({"Cloth Pot Complete", "Cloth Pot Complete DUPE"}, player)
+    return state.has_all({"Cloth Pot Bottom", "Cloth Pot Top", "Cloth Pot Bottom DUPE", "Cloth Pot Top DUPE"}, player) \
+        or state.has_all({"Cloth Pot Complete", "Cloth Pot Complete DUPE"}, player)
 
 
 def wood_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Wood Pot Bottom", "Wood Pot Top", "Wood Pot Bottom DUPE", "Wood Pot Top DUPE"}, player) or \
-        state.has_all({"Wood Pot Complete", "Wood Pot Complete DUPE"}, player)
+    return state.has_all({"Wood Pot Bottom", "Wood Pot Top", "Wood Pot Bottom DUPE", "Wood Pot Top DUPE"}, player) \
+        or state.has_all({"Wood Pot Complete", "Wood Pot Complete DUPE"}, player)
 
 
 def crystal_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Crystal Pot Bottom", "Crystal Pot Top", "Crystal Pot Bottom DUPE", "Crystal Pot Top DUPE"}, player) or \
-        state.has_all({"Crystal Pot Complete", "Crystal Pot Complete DUPE"}, player)
+    return state.has_all(
+        {"Crystal Pot Bottom", "Crystal Pot Top", "Crystal Pot Bottom DUPE", "Crystal Pot Top DUPE"}, player) \
+        or state.has_all({"Crystal Pot Complete", "Crystal Pot Complete DUPE"}, player)
 
 
 def sand_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Sand Pot Bottom", "Sand Pot Top", "Sand Pot Bottom DUPE", "Sand Pot Top DUPE"}, player) or \
-        state.has_all({"Sand Pot Complete", "Sand Pot Complete DUPE"}, player)
+    return state.has_all({"Sand Pot Bottom", "Sand Pot Top", "Sand Pot Bottom DUPE", "Sand Pot Top DUPE"}, player) \
+        or state.has_all({"Sand Pot Complete", "Sand Pot Complete DUPE"}, player)
 
 
 def metal_capturable(state: CollectionState, player: int) -> bool:
-    return state.has_all({"Metal Pot Bottom", "Metal Pot Top", "Metal Pot Bottom DUPE", "Metal Pot Top DUPE"}, player) or \
-        state.has_all({"Metal Pot Complete", "Metal Pot Complete DUPE"}, player)
+    return state.has_all({"Metal Pot Bottom", "Metal Pot Top", "Metal Pot Bottom DUPE", "Metal Pot Top DUPE"}, player) \
+        or state.has_all({"Metal Pot Complete", "Metal Pot Complete DUPE"}, player)
 
 
-def lightning_capturable(state: CollectionState, player: int) -> bool:
-    return (first_nine_ixupi_capturable(state, player) or state.multiworld.worlds[player].options.early_lightning.value) \
-        and (state.has_all({"Lightning Pot Bottom", "Lightning Pot Top", "Lightning Pot Bottom DUPE", "Lightning Pot Top DUPE"}, player) or \
-             state.has_all({"Lightning Pot Complete", "Lightning Pot Complete DUPE"}, player))
+def lightning_capturable(state: CollectionState, world: "ShiversWorld", player: int) -> bool:
+    return (first_nine_ixupi_capturable(state, player) or world.options.early_lightning) \
+        and (state.has_all(
+            {"Lightning Pot Bottom", "Lightning Pot Top", "Lightning Pot Bottom DUPE", "Lightning Pot Top DUPE"},
+            player) or state.has_all({"Lightning Pot Complete", "Lightning Pot Complete DUPE"}, player))
 
 
-def beths_body_available(state: CollectionState, player: int) -> bool:
-    return (first_nine_ixupi_capturable(state, player) or state.multiworld.worlds[player].options.early_beth.value) \
-        and state.can_reach("Generator", "Region", player)
+def beths_body_available(state: CollectionState, world: "ShiversWorld", player: int) -> bool:
+    return first_nine_ixupi_capturable(state, player) or world.options.early_beth
 
 
 def first_nine_ixupi_capturable(state: CollectionState, player: int) -> bool:
@@ -71,13 +74,22 @@ def first_nine_ixupi_capturable(state: CollectionState, player: int) -> bool:
         and metal_capturable(state, player)
 
 
-def all_skull_dials_available(state: CollectionState, player: int) -> bool:
-    return state.can_reach("Prehistoric", "Region", player) and state.can_reach("Tar River", "Region", player) \
-        and state.can_reach("Egypt", "Region", player) and state.can_reach("Burial", "Region", player) \
-        and state.can_reach("Gods Room", "Region", player) and state.can_reach("Werewolf", "Region", player)
+def all_skull_dials_set(state: CollectionState, player: int) -> bool:
+    return state.has_all([
+        "Set Skull Dial: Prehistoric",
+        "Set Skull Dial: Tar River",
+        "Set Skull Dial: Egypt",
+        "Set Skull Dial: Burial",
+        "Set Skull Dial: Gods Room",
+        "Set Skull Dial: Werewolf"
+    ], player)
+
+
+def completion_condition(state: CollectionState, player: int) -> bool:
+    return state.has(f"Mt. Pleasant Tribune: {Constants.years_since_sep_30_1980} year Old Mystery Solved!", player)
 
 
-def get_rules_lookup(player: int):
+def get_rules_lookup(world: "ShiversWorld", player: int):
     rules_lookup: Dict[str, Dict[str, Callable[[CollectionState], bool]]] = {
         "entrances": {
             "To Office Elevator From Underground Blue Tunnels": lambda state: state.has("Key for Office Elevator", player),
@@ -90,48 +102,58 @@ def get_rules_lookup(player: int):
             "To Workshop": lambda state: state.has("Key for Workshop", player),
             "To Lobby From Office": lambda state: state.has("Key for Office", player),
             "To Office From Lobby": lambda state: state.has("Key for Office", player),
-            "To Library From Lobby": lambda state: state.has("Key for Library Room", player),
-            "To Lobby From Library": lambda state: state.has("Key for Library Room", player),
+            "To Library From Lobby": lambda state: state.has("Key for Library", player),
+            "To Lobby From Library": lambda state: state.has("Key for Library", player),
             "To Prehistoric From Lobby": lambda state: state.has("Key for Prehistoric Room", player),
             "To Lobby From Prehistoric": lambda state: state.has("Key for Prehistoric Room", player),
-            "To Greenhouse": lambda state: state.has("Key for Greenhouse Room", player),
+            "To Greenhouse": lambda state: state.has("Key for Greenhouse", player),
             "To Ocean From Prehistoric": lambda state: state.has("Key for Ocean Room", player),
             "To Prehistoric From Ocean": lambda state: state.has("Key for Ocean Room", player),
             "To Projector Room": lambda state: state.has("Key for Projector Room", player),
-            "To Generator": lambda state: state.has("Key for Generator Room", player),
+            "To Generator From Maintenance Tunnels": lambda state: state.has("Key for Generator Room", player),
             "To Lobby From Egypt": lambda state: state.has("Key for Egypt Room", player),
             "To Egypt From Lobby": lambda state: state.has("Key for Egypt Room", player),
             "To Janitor Closet": lambda state: state.has("Key for Janitor Closet", player),
             "To Shaman From Burial": lambda state: state.has("Key for Shaman Room", player),
             "To Burial From Shaman": lambda state: state.has("Key for Shaman Room", player),
+            "To Norse Stone From Gods Room": lambda state: state.has("Aligned Planets", player),
             "To Inventions From UFO": lambda state: state.has("Key for UFO Room", player),
             "To UFO From Inventions": lambda state: state.has("Key for UFO Room", player),
+            "To Orrery From UFO": lambda state: state.has("Viewed Fortune", player),
             "To Torture From Inventions": lambda state: state.has("Key for Torture Room", player),
             "To Inventions From Torture": lambda state: state.has("Key for Torture Room", player),
             "To Torture": lambda state: state.has("Key for Puzzle Room", player),
             "To Puzzle Room Mastermind From Torture": lambda state: state.has("Key for Puzzle Room", player),
             "To Bedroom": lambda state: state.has("Key for Bedroom", player),
-            "To Underground Lake From Underground Tunnels": lambda state: state.has("Key for Underground Lake Room", player),
-            "To Underground Tunnels From Underground Lake": lambda state: state.has("Key for Underground Lake Room", player),
+            "To Underground Lake From Underground Tunnels": lambda state: state.has("Key for Underground Lake", player),
+            "To Underground Tunnels From Underground Lake": lambda state: state.has("Key for Underground Lake", player),
             "To Outside From Lobby": lambda state: state.has("Key for Front Door", player),
             "To Lobby From Outside": lambda state: state.has("Key for Front Door", player),
-            "To Maintenance Tunnels From Theater Back Hallways": lambda state: state.has("Crawling", player),
+            "To Maintenance Tunnels From Theater Back Hallway": lambda state: state.has("Crawling", player),
             "To Blue Maze From Egypt": lambda state: state.has("Crawling", player),
             "To Egypt From Blue Maze": lambda state: state.has("Crawling", player),
-            "To Lobby From Tar River": lambda state: (state.has("Crawling", player) and oil_capturable(state, player)),
-            "To Tar River From Lobby": lambda state: (state.has("Crawling", player) and oil_capturable(state, player) and state.can_reach("Tar River", "Region", player)),
-            "To Burial From Egypt": lambda state: state.can_reach("Egypt", "Region", player),
-            "To Gods Room From Anansi": lambda state: state.can_reach("Gods Room", "Region", player),
-            "To Slide Room": lambda state: all_skull_dials_available(state, player),
-            "To Lobby From Slide Room": lambda state: beths_body_available(state, player),
-            "To Water Capture From Janitor Closet": lambda state: cloth_capturable(state, player)
+            "To Lobby From Tar River": lambda state: state.has("Crawling", player) and oil_capturable(state, player),
+            "To Tar River From Lobby": lambda state: state.has("Crawling", player) and oil_capturable(state, player) and state.can_reach_region("Tar River", player),
+            "To Burial From Egypt": lambda state: state.can_reach_region("Egypt", player),
+            "To Gods Room From Anansi": lambda state: state.can_reach_region("Gods Room", player),
+            "To Slide Room": lambda state: all_skull_dials_set(state, player),
+            "To Lobby From Slide Room": lambda state: state.has("Lost Your Head", player),
+            "To Water Capture From Janitor Closet": lambda state: cloth_capturable(state, player),
+            "To Victory": lambda state: (
+                (water_capturable(state, player) + wax_capturable(state, player) + ash_capturable(state, player)
+                 + oil_capturable(state, player) + cloth_capturable(state, player) + wood_capturable(state, player)
+                 + crystal_capturable(state, player) + sand_capturable(state, player) + metal_capturable(state, player)
+                 + lightning_capturable(state, world, player)) >= world.options.ixupi_captures_needed.value
+            )
         },
         "locations_required": {
-            "Puzzle Solved Anansi Musicbox": lambda state: state.can_reach("Clock Tower", "Region", player),
-            "Accessible: Storage: Janitor Closet": lambda state: cloth_capturable(state, player),
-            "Accessible: Storage: Tar River": lambda state: oil_capturable(state, player),
-            "Accessible: Storage: Theater": lambda state: state.can_reach("Projector Room", "Region", player),
-            "Accessible: Storage: Slide": lambda state: beths_body_available(state, player) and state.can_reach("Slide Room", "Region", player),
+            "Puzzle Solved Anansi Music Box": lambda state: state.has("Set Song", player),
+            "Storage: Anansi Music Box": lambda state: state.has("Set Song", player),
+            "Storage: Clock Tower": lambda state: state.has("Set Time", player),
+            "Storage: Janitor Closet": lambda state: cloth_capturable(state, player),
+            "Storage: Tar River": lambda state: oil_capturable(state, player),
+            "Storage: Theater": lambda state: state.has("Viewed Theater Movie", player),
+            "Storage: Slide": lambda state: state.has("Lost Your Head", player) and state.can_reach_region("Slide Room", player),
             "Ixupi Captured Water": lambda state: water_capturable(state, player),
             "Ixupi Captured Wax": lambda state: wax_capturable(state, player),
             "Ixupi Captured Ash": lambda state: ash_capturable(state, player),
@@ -141,32 +163,28 @@ def get_rules_lookup(player: int):
             "Ixupi Captured Crystal": lambda state: crystal_capturable(state, player),
             "Ixupi Captured Sand": lambda state: sand_capturable(state, player),
             "Ixupi Captured Metal": lambda state: metal_capturable(state, player),
-            "Final Riddle: Planets Aligned": lambda state: state.can_reach("Fortune Teller", "Region", player),
-            "Final Riddle: Norse God Stone Message": lambda state: (state.can_reach("Fortune Teller", "Region", player) and state.can_reach("UFO", "Region", player)),
-            "Final Riddle: Beth's Body Page 17": lambda state: beths_body_available(state, player),
-            "Final Riddle: Guillotine Dropped": lambda state: beths_body_available(state, player),
-            "Puzzle Solved Skull Dial Door": lambda state: all_skull_dials_available(state, player),
-            },
-        "locations_puzzle_hints": {
-            "Puzzle Solved Clock Tower Door": lambda state: state.can_reach("Three Floor Elevator", "Region", player),
-            "Puzzle Solved Clock Chains": lambda state: state.can_reach("Bedroom", "Region", player),
-            "Puzzle Solved Shaman Drums": lambda state: state.can_reach("Clock Tower", "Region", player),
-            "Puzzle Solved Red Door": lambda state: state.can_reach("Maintenance Tunnels", "Region", player),
-            "Puzzle Solved UFO Symbols": lambda state: state.can_reach("Library", "Region", player),
-            "Puzzle Solved Maze Door": lambda state: state.can_reach("Projector Room", "Region", player),
-            "Puzzle Solved Theater Door": lambda state: state.can_reach("Underground Lake", "Region", player),
-            "Puzzle Solved Columns of RA": lambda state: state.can_reach("Underground Lake", "Region", player),
-            "Final Riddle: Guillotine Dropped": lambda state: (beths_body_available(state, player) and state.can_reach("Underground Lake", "Region", player))
-            },
+            "Puzzle Solved Skull Dial Door": lambda state: all_skull_dials_set(state, player),
+        },
+        "puzzle_hints_required": {
+            "Puzzle Solved Clock Tower Door": lambda state: state.can_reach_region("Three Floor Elevator", player),
+            "Puzzle Solved Shaman Drums": lambda state: state.can_reach_region("Clock Tower", player),
+            "Puzzle Solved Red Door": lambda state: state.can_reach_region("Maintenance Tunnels", player),
+            "Puzzle Solved UFO Symbols": lambda state: state.can_reach_region("Library", player),
+            "Storage: UFO": lambda state: state.can_reach_region("Library", player),
+            "Puzzle Solved Maze Door": lambda state: state.has("Viewed Theater Movie", player),
+            "Puzzle Solved Theater Door": lambda state: state.has("Viewed Egyptian Hieroglyphics Explained", player),
+            "Puzzle Solved Columns of RA": lambda state: state.has("Viewed Egyptian Hieroglyphics Explained", player),
+            "Puzzle Solved Atlantis": lambda state: state.can_reach_region("Office", player),
+        },
         "elevators": {
-            "Puzzle Solved Office Elevator": lambda state: ((state.can_reach("Underground Lake", "Region", player) or state.can_reach("Office", "Region", player))
-                                                                  and state.has("Key for Office Elevator", player)),
-            "Puzzle Solved Bedroom Elevator": lambda state: (state.can_reach("Office", "Region", player) and state.has_all({"Key for Bedroom Elevator","Crawling"}, player)),
-            "Puzzle Solved Three Floor Elevator": lambda state: ((state.can_reach("Maintenance Tunnels", "Region", player) or state.can_reach("Blue Maze", "Region", player))
-                                                                  and state.has("Key for Three Floor Elevator", player))
-            },
+            "Puzzle Solved Office Elevator": lambda state: (state.can_reach_region("Underground Lake", player) or state.can_reach_region("Office", player))
+                                                                  and state.has("Key for Office Elevator", player),
+            "Puzzle Solved Bedroom Elevator": lambda state: state.has_all({"Key for Bedroom Elevator", "Crawling"}, player),
+            "Puzzle Solved Three Floor Elevator": lambda state: (state.can_reach_region("Maintenance Tunnels", player) or state.can_reach_region("Blue Maze", player))
+                                                                  and state.has("Key for Three Floor Elevator", player)
+        },
         "lightning": {
-            "Ixupi Captured Lightning": lambda state: lightning_capturable(state, player)
+            "Ixupi Captured Lightning": lambda state: lightning_capturable(state, world, player)
         }
     }
     return rules_lookup
@@ -176,69 +194,128 @@ def set_rules(world: "ShiversWorld") -> None:
     multiworld = world.multiworld
     player = world.player
 
-    rules_lookup = get_rules_lookup(player)
+    rules_lookup = get_rules_lookup(world, player)
     # Set required entrance rules
     for entrance_name, rule in rules_lookup["entrances"].items():
-        multiworld.get_entrance(entrance_name, player).access_rule = rule
+        world.get_entrance(entrance_name).access_rule = rule
+
+    world.get_region("Clock Tower Staircase").connect(
+        world.get_region("Clock Chains"),
+        "To Clock Chains From Clock Tower Staircase",
+        lambda state: state.can_reach_region("Bedroom", player) if world.options.puzzle_hints_required.value else True
+    )
+
+    world.get_region("Generator").connect(
+        world.get_region("Beth's Body"),
+        "To Beth's Body From Generator",
+        lambda state: beths_body_available(state, world, player) and (
+            (state.has("Viewed Norse Stone", player) and state.can_reach_region("Theater", player))
+            if world.options.puzzle_hints_required.value else True
+        )
+    )
+
+    world.get_region("Torture").connect(
+        world.get_region("Guillotine"),
+        "To Guillotine From Torture",
+        lambda state: state.has("Viewed Page 17", player) and (
+            state.has("Viewed Egyptian Hieroglyphics Explained", player)
+            if world.options.puzzle_hints_required.value else True
+        )
+    )
 
     # Set required location rules
     for location_name, rule in rules_lookup["locations_required"].items():
-        multiworld.get_location(location_name, player).access_rule = rule
+        world.get_location(location_name).access_rule = rule
+
+        world.get_location("Jukebox").access_rule = lambda state: (
+            state.can_reach_region("Clock Tower", player) and (
+                state.can_reach_region("Anansi", player)
+                if world.options.puzzle_hints_required.value else True
+            )
+        )
 
     # Set option location rules
     if world.options.puzzle_hints_required.value:
-        for location_name, rule in rules_lookup["locations_puzzle_hints"].items():
-            multiworld.get_location(location_name, player).access_rule = rule
+        for location_name, rule in rules_lookup["puzzle_hints_required"].items():
+            world.get_location(location_name).access_rule = rule
+
+        world.get_entrance("To Theater From Lobby").access_rule = lambda state: state.has(
+            "Viewed Egyptian Hieroglyphics Explained", player
+        )
+
+        world.get_entrance("To Clock Tower Staircase From Theater Back Hallway").access_rule = lambda state: state.can_reach_region("Three Floor Elevator", player)
+        multiworld.register_indirect_condition(
+            world.get_region("Three Floor Elevator"),
+            world.get_entrance("To Clock Tower Staircase From Theater Back Hallway")
+        )
+
+        world.get_entrance("To Gods Room From Shaman").access_rule = lambda state: state.can_reach_region(
+            "Clock Tower", player
+        )
+        multiworld.register_indirect_condition(
+            world.get_region("Clock Tower"), world.get_entrance("To Gods Room From Shaman")
+        )
+
+        world.get_entrance("To Anansi From Gods Room").access_rule = lambda state: state.can_reach_region(
+            "Maintenance Tunnels", player
+        )
+        multiworld.register_indirect_condition(
+            world.get_region("Maintenance Tunnels"), world.get_entrance("To Anansi From Gods Room")
+        )
+
+        world.get_entrance("To Maze From Maze Staircase").access_rule = lambda \
+            state: state.can_reach_region("Projector Room", player)
+        multiworld.register_indirect_condition(
+            world.get_region("Projector Room"), world.get_entrance("To Maze From Maze Staircase")
+        )
+
+        multiworld.register_indirect_condition(
+            world.get_region("Bedroom"), world.get_entrance("To Clock Chains From Clock Tower Staircase")
+        )
+        multiworld.register_indirect_condition(
+            world.get_region("Theater"), world.get_entrance("To Beth's Body From Generator")
+        )
+
     if world.options.elevators_stay_solved.value:
         for location_name, rule in rules_lookup["elevators"].items():
-            multiworld.get_location(location_name, player).access_rule = rule
+            world.get_location(location_name).access_rule = rule
     if world.options.early_lightning.value:
         for location_name, rule in rules_lookup["lightning"].items():
-            multiworld.get_location(location_name, player).access_rule = rule
+            world.get_location(location_name).access_rule = rule
 
     # Register indirect conditions
-    multiworld.register_indirect_condition(world.get_region("Burial"), world.get_entrance("To Slide Room"))
-    multiworld.register_indirect_condition(world.get_region("Egypt"), world.get_entrance("To Slide Room"))
-    multiworld.register_indirect_condition(world.get_region("Gods Room"), world.get_entrance("To Slide Room"))
-    multiworld.register_indirect_condition(world.get_region("Prehistoric"), world.get_entrance("To Slide Room"))
-    multiworld.register_indirect_condition(world.get_region("Tar River"), world.get_entrance("To Slide Room"))
-    multiworld.register_indirect_condition(world.get_region("Werewolf"), world.get_entrance("To Slide Room"))
     multiworld.register_indirect_condition(world.get_region("Prehistoric"), world.get_entrance("To Tar River From Lobby"))
 
     # forbid cloth in janitor closet and oil in tar river
-    forbid_item(multiworld.get_location("Accessible: Storage: Janitor Closet", player), "Cloth Pot Bottom DUPE", player)
-    forbid_item(multiworld.get_location("Accessible: Storage: Janitor Closet", player), "Cloth Pot Top DUPE", player)
-    forbid_item(multiworld.get_location("Accessible: Storage: Janitor Closet", player), "Cloth Pot Complete DUPE", player)
-    forbid_item(multiworld.get_location("Accessible: Storage: Tar River", player), "Oil Pot Bottom DUPE", player)
-    forbid_item(multiworld.get_location("Accessible: Storage: Tar River", player), "Oil Pot Top DUPE", player)
-    forbid_item(multiworld.get_location("Accessible: Storage: Tar River", player), "Oil Pot Complete DUPE", player)
+    forbid_item(world.get_location("Storage: Janitor Closet"), "Cloth Pot Bottom DUPE", player)
+    forbid_item(world.get_location("Storage: Janitor Closet"), "Cloth Pot Top DUPE", player)
+    forbid_item(world.get_location("Storage: Janitor Closet"), "Cloth Pot Complete DUPE", player)
+    forbid_item(world.get_location("Storage: Tar River"), "Oil Pot Bottom DUPE", player)
+    forbid_item(world.get_location("Storage: Tar River"), "Oil Pot Top DUPE", player)
+    forbid_item(world.get_location("Storage: Tar River"), "Oil Pot Complete DUPE", player)
 
     # Filler Item Forbids
-    forbid_item(multiworld.get_location("Puzzle Solved Lyre", player), "Easier Lyre", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Water", player), "Water Always Available in Lobby", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Library", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Anansi Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Shaman Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Ash", player), "Ash Always Available in Office", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Ash", player), "Ash Always Available in Burial Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Oil", player), "Oil Always Available in Prehistoric Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Cloth", player), "Cloth Always Available in Egypt", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Cloth", player), "Cloth Always Available in Burial Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Wood", player), "Wood Always Available in Workshop", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Wood", player), "Wood Always Available in Blue Maze", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Wood", player), "Wood Always Available in Pegasus Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Wood", player), "Wood Always Available in Gods Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Crystal", player), "Crystal Always Available in Lobby", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Crystal", player), "Crystal Always Available in Ocean", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Sand", player), "Sand Always Available in Plants Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Sand", player), "Sand Always Available in Ocean", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Metal", player), "Metal Always Available in Projector Room", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Metal", player), "Metal Always Available in Bedroom", player)
-    forbid_item(multiworld.get_location("Ixupi Captured Metal", player), "Metal Always Available in Prehistoric", player)
+    forbid_item(world.get_location("Puzzle Solved Lyre"), "Easier Lyre", player)
+    forbid_item(world.get_location("Ixupi Captured Water"), "Water Always Available in Lobby", player)
+    forbid_item(world.get_location("Ixupi Captured Wax"), "Wax Always Available in Library", player)
+    forbid_item(world.get_location("Ixupi Captured Wax"), "Wax Always Available in Anansi Room", player)
+    forbid_item(world.get_location("Ixupi Captured Wax"), "Wax Always Available in Shaman Room", player)
+    forbid_item(world.get_location("Ixupi Captured Ash"), "Ash Always Available in Office", player)
+    forbid_item(world.get_location("Ixupi Captured Ash"), "Ash Always Available in Burial Room", player)
+    forbid_item(world.get_location("Ixupi Captured Oil"), "Oil Always Available in Prehistoric Room", player)
+    forbid_item(world.get_location("Ixupi Captured Cloth"), "Cloth Always Available in Egypt", player)
+    forbid_item(world.get_location("Ixupi Captured Cloth"), "Cloth Always Available in Burial Room", player)
+    forbid_item(world.get_location("Ixupi Captured Wood"), "Wood Always Available in Workshop", player)
+    forbid_item(world.get_location("Ixupi Captured Wood"), "Wood Always Available in Blue Maze", player)
+    forbid_item(world.get_location("Ixupi Captured Wood"), "Wood Always Available in Pegasus Room", player)
+    forbid_item(world.get_location("Ixupi Captured Wood"), "Wood Always Available in Gods Room", player)
+    forbid_item(world.get_location("Ixupi Captured Crystal"), "Crystal Always Available in Lobby", player)
+    forbid_item(world.get_location("Ixupi Captured Crystal"), "Crystal Always Available in Ocean", player)
+    forbid_item(world.get_location("Ixupi Captured Sand"), "Sand Always Available in Plants Room", player)
+    forbid_item(world.get_location("Ixupi Captured Sand"), "Sand Always Available in Ocean", player)
+    forbid_item(world.get_location("Ixupi Captured Metal"), "Metal Always Available in Projector Room", player)
+    forbid_item(world.get_location("Ixupi Captured Metal"), "Metal Always Available in Bedroom", player)
+    forbid_item(world.get_location("Ixupi Captured Metal"), "Metal Always Available in Prehistoric", player)
 
     # Set completion condition
-    multiworld.completion_condition[player] = lambda state: ((
-                water_capturable(state, player) + wax_capturable(state, player) + ash_capturable(state, player) \
-                + oil_capturable(state, player) + cloth_capturable(state, player) + wood_capturable(state, player) \
-                + crystal_capturable(state, player) + sand_capturable(state, player) + metal_capturable(state, player) \
-                + lightning_capturable(state, player)) >= world.options.ixupi_captures_needed.value)
+    multiworld.completion_condition[player] = lambda state: completion_condition(state, player)
diff --git a/worlds/shivers/__init__.py b/worlds/shivers/__init__.py
index 3ca87ae164f2..6a41dce376b3 100644
--- a/worlds/shivers/__init__.py
+++ b/worlds/shivers/__init__.py
@@ -1,11 +1,12 @@
-from typing import List
-from .Items import item_table, ShiversItem
-from .Rules import set_rules
-from BaseClasses import Item, Tutorial, Region, Location
+from typing import Dict, List, Optional
+
+from BaseClasses import Item, ItemClassification, Location, Region, Tutorial
 from Fill import fill_restrictive
 from worlds.AutoWorld import WebWorld, World
 from . import Constants, Rules
-from .Options import ShiversOptions
+from .Items import ItemType, SHIVERS_ITEM_ID_OFFSET, ShiversItem, item_table
+from .Options import ShiversOptions, shivers_option_groups
+from .Rules import set_rules
 
 
 class ShiversWeb(WebWorld):
@@ -17,10 +18,13 @@ class ShiversWeb(WebWorld):
         "setup/en",
         ["GodlFire", "Mathx2"]
     )]
+    option_groups = shivers_option_groups
+
 
 class ShiversWorld(World):
     """
-    Shivers is a horror themed point and click adventure. Explore the mysteries of Windlenot's Museum of the Strange and Unusual.
+    Shivers is a horror themed point and click adventure.
+    Explore the mysteries of Windlenot's Museum of the Strange and Unusual.
     """
 
     game = "Shivers"
@@ -28,13 +32,12 @@ class ShiversWorld(World):
     web = ShiversWeb()
     options_dataclass = ShiversOptions
     options: ShiversOptions
-
+    set_rules = set_rules
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = Constants.location_name_to_id
-    shivers_item_id_offset = 27000
+    storage_placements = []
     pot_completed_list: List[int]
 
-
     def generate_early(self):
         self.pot_completed_list = []
 
@@ -42,10 +45,14 @@ def create_item(self, name: str) -> Item:
         data = item_table[name]
         return ShiversItem(name, data.classification, data.code, self.player)
 
-    def create_event(self, region_name: str, event_name: str) -> None:
-        region = self.multiworld.get_region(region_name, self.player)
-        loc = ShiversLocation(self.player, event_name, None, region)
-        loc.place_locked_item(self.create_event_item(event_name))
+    def create_event_location(self, region_name: str, location_name: str, event_name: Optional[str] = None) -> None:
+        region = self.get_region(region_name)
+        loc = ShiversLocation(self.player, location_name, None, region)
+        if event_name is not None:
+            loc.place_locked_item(ShiversItem(event_name, ItemClassification.progression, None, self.player))
+        else:
+            loc.place_locked_item(ShiversItem(location_name, ItemClassification.progression, None, self.player))
+        loc.show_in_spoiler = False
         region.locations.append(loc)
 
     def create_regions(self) -> None:
@@ -56,162 +63,193 @@ def create_regions(self) -> None:
             for exit_name in exits:
                 r.create_exit(exit_name)
 
-
         # Bind mandatory connections
         for entr_name, region_name in Constants.region_info["mandatory_connections"]:
-            e = self.multiworld.get_entrance(entr_name, self.player)
-            r = self.multiworld.get_region(region_name, self.player)
+            e = self.get_entrance(entr_name)
+            r = self.get_region(region_name)
             e.connect(r)
         
         # Locations
         # Build exclusion list
-        self.removed_locations = set()
+        removed_locations = set()
         if not self.options.include_information_plaques:
-            self.removed_locations.update(Constants.exclusion_info["plaques"])
+            removed_locations.update(Constants.exclusion_info["plaques"])
         if not self.options.elevators_stay_solved:
-            self.removed_locations.update(Constants.exclusion_info["elevators"])
+            removed_locations.update(Constants.exclusion_info["elevators"])
         if not self.options.early_lightning:
-            self.removed_locations.update(Constants.exclusion_info["lightning"])
+            removed_locations.update(Constants.exclusion_info["lightning"])
 
         # Add locations
         for region_name, locations in Constants.location_info["locations_by_region"].items():
-            region = self.multiworld.get_region(region_name, self.player)
+            region = self.get_region(region_name)
             for loc_name in locations:
-                if loc_name not in self.removed_locations:
+                if loc_name not in removed_locations:
                     loc = ShiversLocation(self.player, loc_name, self.location_name_to_id.get(loc_name, None), region)
                     region.locations.append(loc)
 
+        self.create_event_location("Prehistoric", "Set Skull Dial: Prehistoric")
+        self.create_event_location("Tar River", "Set Skull Dial: Tar River")
+        self.create_event_location("Egypt", "Set Skull Dial: Egypt")
+        self.create_event_location("Burial", "Set Skull Dial: Burial")
+        self.create_event_location("Gods Room", "Set Skull Dial: Gods Room")
+        self.create_event_location("Werewolf", "Set Skull Dial: Werewolf")
+        self.create_event_location("Projector Room", "Viewed Theater Movie")
+        self.create_event_location("Clock Chains", "Clock Chains", "Set Time")
+        self.create_event_location("Clock Tower", "Jukebox", "Set Song")
+        self.create_event_location("Fortune Teller", "Viewed Fortune")
+        self.create_event_location("Orrery", "Orrery", "Aligned Planets")
+        self.create_event_location("Norse Stone", "Norse Stone", "Viewed Norse Stone")
+        self.create_event_location("Beth's Body", "Beth's Body", "Viewed Page 17")
+        self.create_event_location("Windlenot's Body", "Windlenot's Body", "Viewed Egyptian Hieroglyphics Explained")
+        self.create_event_location("Guillotine", "Guillotine", "Lost Your Head")
+
     def create_items(self) -> None:
-        #Add items to item pool
-        itempool = []
+        # Add items to item pool
+        item_pool = []
         for name, data in item_table.items():
-            if data.type in {"key", "ability", "filler2"}:
-                itempool.append(self.create_item(name))
+            if data.type in [ItemType.KEY, ItemType.ABILITY, ItemType.IXUPI_AVAILABILITY]:
+                item_pool.append(self.create_item(name))
 
         # Pot pieces/Completed/Mixed:
-        for i in range(10):
-            if self.options.full_pots == "pieces":
-                itempool.append(self.create_item(self.item_id_to_name[self.shivers_item_id_offset + i]))
-                itempool.append(self.create_item(self.item_id_to_name[self.shivers_item_id_offset + 10 + i]))
-            elif self.options.full_pots == "complete":
-                itempool.append(self.create_item(self.item_id_to_name[self.shivers_item_id_offset + 20 + i]))
-            else:
-                # Roll for if pieces or a complete pot will be used.
-                # Pot Pieces
+        if self.options.full_pots == "pieces":
+            item_pool += [self.create_item(name) for name, data in item_table.items() if data.type == ItemType.POT]
+        elif self.options.full_pots == "complete":
+            item_pool += [self.create_item(name) for name, data in item_table.items() if
+                          data.type == ItemType.POT_COMPLETE]
+        else:
+            # Roll for if pieces or a complete pot will be used.
+            # Pot Pieces
+            pieces = [self.create_item(name) for name, data in item_table.items() if data.type == ItemType.POT]
+            complete = [self.create_item(name) for name, data in item_table.items() if
+                        data.type == ItemType.POT_COMPLETE]
+            for i in range(10):
                 if self.random.randint(0, 1) == 0:
                     self.pot_completed_list.append(0)
-                    itempool.append(self.create_item(self.item_id_to_name[self.shivers_item_id_offset + i]))
-                    itempool.append(self.create_item(self.item_id_to_name[self.shivers_item_id_offset + 10 + i]))
+                    item_pool.append(pieces[i])
+                    item_pool.append(pieces[i + 10])
                 # Completed Pot
                 else:
                     self.pot_completed_list.append(1)
-                    itempool.append(self.create_item(self.item_id_to_name[self.shivers_item_id_offset + 20 + i]))
-
-        #Add Filler
-        itempool += [self.create_item("Easier Lyre") for i in range(9)]
+                    item_pool.append(complete[i])
 
-        #Extra filler is random between Heals and Easier Lyre. Heals weighted 95%.
-        filler_needed = len(self.multiworld.get_unfilled_locations(self.player)) - 24 - len(itempool)
-        itempool += [self.random.choices([self.create_item("Heal"), self.create_item("Easier Lyre")], weights=[95, 5])[0] for i in range(filler_needed)]
+        # Add Easier Lyre
+        item_pool += [self.create_item("Easier Lyre") for _ in range(9)]
 
-        #Place library escape items. Choose a location to place the escape item
-        library_region = self.multiworld.get_region("Library", self.player)
-        librarylocation = self.random.choice([loc for loc in library_region.locations if not loc.name.startswith("Accessible:")])
+        # Place library escape items. Choose a location to place the escape item
+        library_region = self.get_region("Library")
+        library_location = self.random.choice(
+            [loc for loc in library_region.locations if not loc.name.startswith("Storage: ")]
+        )
 
-        #Roll for which escape items will be placed in the Library
+        # Roll for which escape items will be placed in the Library
         library_random = self.random.randint(1, 3)
-        if library_random == 1: 
-            librarylocation.place_locked_item(self.create_item("Crawling"))
-
-            itempool = [item for item in itempool if item.name != "Crawling"]
-
-        elif library_random == 2: 
-            librarylocation.place_locked_item(self.create_item("Key for Library Room"))
-
-            itempool = [item for item in itempool if item.name != "Key for Library Room"]
-        elif library_random == 3: 
-            librarylocation.place_locked_item(self.create_item("Key for Three Floor Elevator"))
-            
-            librarylocationkeytwo = self.random.choice([loc for loc in library_region.locations if not loc.name.startswith("Accessible:") and loc != librarylocation])
-            librarylocationkeytwo.place_locked_item(self.create_item("Key for Egypt Room"))
-
-            itempool = [item for item in itempool if item.name not in ["Key for Three Floor Elevator", "Key for Egypt Room"]]
-
-        #If front door option is on, determine which set of keys will be used for lobby access and add front door key to item pool
-        lobby_access_keys = 1
+        if library_random == 1:
+            library_location.place_locked_item(self.create_item("Crawling"))
+            item_pool = [item for item in item_pool if item.name != "Crawling"]
+        elif library_random == 2:
+            library_location.place_locked_item(self.create_item("Key for Library"))
+            item_pool = [item for item in item_pool if item.name != "Key for Library"]
+        elif library_random == 3:
+            library_location.place_locked_item(self.create_item("Key for Three Floor Elevator"))
+            library_location_2 = self.random.choice(
+                [loc for loc in library_region.locations if
+                 not loc.name.startswith("Storage: ") and loc != library_location]
+            )
+            library_location_2.place_locked_item(self.create_item("Key for Egypt Room"))
+            item_pool = [item for item in item_pool if
+                         item.name not in ["Key for Three Floor Elevator", "Key for Egypt Room"]]
+
+        # If front door option is on, determine which set of keys will
+        # be used for lobby access and add front door key to item pool
+        lobby_access_keys = 0
         if self.options.front_door_usable:
-            lobby_access_keys = self.random.randint(1, 2)
-            itempool += [self.create_item("Key for Front Door")]
+            lobby_access_keys = self.random.randint(0, 1)
+            item_pool.append(self.create_item("Key for Front Door"))
         else:
-            itempool += [self.create_item("Heal")]
+            item_pool.append(self.create_item("Heal"))
 
-        self.multiworld.itempool += itempool
+        def set_lobby_access_keys(items: Dict[str, int]):
+            if lobby_access_keys == 0:
+                items["Key for Underground Lake"] = 1
+                items["Key for Office Elevator"] = 1
+                items["Key for Office"] = 1
+            else:
+                items["Key for Front Door"] = 1
 
-        #Lobby acess:
+        # Lobby access:
         if self.options.lobby_access == "early":
-            if lobby_access_keys == 1:
-                self.multiworld.early_items[self.player]["Key for Underground Lake Room"] = 1
-                self.multiworld.early_items[self.player]["Key for Office Elevator"] = 1
-                self.multiworld.early_items[self.player]["Key for Office"] = 1
-            elif lobby_access_keys == 2:
-                self.multiworld.early_items[self.player]["Key for Front Door"] = 1
-        if self.options.lobby_access == "local":
-            if lobby_access_keys == 1:
-                self.multiworld.local_early_items[self.player]["Key for Underground Lake Room"] = 1
-                self.multiworld.local_early_items[self.player]["Key for Office Elevator"] = 1
-                self.multiworld.local_early_items[self.player]["Key for Office"] = 1
-            elif lobby_access_keys == 2:
-                self.multiworld.local_early_items[self.player]["Key for Front Door"] = 1
-
-        #Pot piece shuffle location:
+            set_lobby_access_keys(self.multiworld.early_items[self.player])
+        elif self.options.lobby_access == "local":
+            set_lobby_access_keys(self.multiworld.local_early_items[self.player])
+
+        goal_item_code = SHIVERS_ITEM_ID_OFFSET + 100 + Constants.years_since_sep_30_1980
+        for name, data in item_table.items():
+            if data.type == ItemType.GOAL and data.code == goal_item_code:
+                goal = self.create_item(name)
+                self.get_location("Mystery Solved").place_locked_item(goal)
+
+        # Extra filler is random between Heals and Easier Lyre. Heals weighted 95%.
+        filler_needed = len(self.multiworld.get_unfilled_locations(self.player)) - len(item_pool) - 23
+        item_pool += map(self.create_item, self.random.choices(
+            ["Heal", "Easier Lyre"], weights=[95, 5], k=filler_needed
+        ))
+
+        # Pot piece shuffle location:
         if self.options.location_pot_pieces == "own_world":
-            self.options.local_items.value |= {name for name, data in item_table.items() if data.type == "pot" or data.type == "pot_type2"}
-        if self.options.location_pot_pieces == "different_world":
-            self.options.non_local_items.value |= {name for name, data in item_table.items() if data.type == "pot" or data.type == "pot_type2"}
+            self.options.local_items.value |= {name for name, data in item_table.items() if
+                                               data.type in [ItemType.POT, ItemType.POT_COMPLETE]}
+        elif self.options.location_pot_pieces == "different_world":
+            self.options.non_local_items.value |= {name for name, data in item_table.items() if
+                                                   data.type in [ItemType.POT, ItemType.POT_COMPLETE]}
+
+        self.multiworld.itempool += item_pool
 
     def pre_fill(self) -> None:
         # Prefills event storage locations with duplicate pots
-        storagelocs = []
-        storageitems = []
-        self.storage_placements = []
+        storage_locs = []
+        storage_items = []
 
         for locations in Constants.location_info["locations_by_region"].values():
             for loc_name in locations:
-                if loc_name.startswith("Accessible: "):
-                    storagelocs.append(self.multiworld.get_location(loc_name, self.player))
+                if loc_name.startswith("Storage: "):
+                    storage_locs.append(self.get_location(loc_name))
 
-        #Pot pieces/Completed/Mixed:
+        # Pot pieces/Completed/Mixed:
         if self.options.full_pots == "pieces":
-            storageitems += [self.create_item(name) for name, data in item_table.items() if data.type == 'potduplicate']
+            storage_items += [self.create_item(name) for name, data in item_table.items() if
+                              data.type == ItemType.POT_DUPLICATE]
         elif self.options.full_pots == "complete":
-            storageitems += [self.create_item(name) for name, data in item_table.items() if data.type == 'potduplicate_type2']
-            storageitems += [self.create_item("Empty") for i in range(10)]
+            storage_items += [self.create_item(name) for name, data in item_table.items() if
+                              data.type == ItemType.POT_COMPELTE_DUPLICATE]
+            storage_items += [self.create_item("Empty") for _ in range(10)]
         else:
+            pieces = [self.create_item(name) for name, data in item_table.items() if
+                      data.type == ItemType.POT_DUPLICATE]
+            complete = [self.create_item(name) for name, data in item_table.items() if
+                        data.type == ItemType.POT_COMPELTE_DUPLICATE]
             for i in range(10):
-                #Pieces
+                # Pieces
                 if self.pot_completed_list[i] == 0:
-                    storageitems += [self.create_item(self.item_id_to_name[self.shivers_item_id_offset + 70 + i])]
-                    storageitems += [self.create_item(self.item_id_to_name[self.shivers_item_id_offset + 80 + i])]
-                #Complete
+                    storage_items.append(pieces[i])
+                    storage_items.append(pieces[i + 10])
+                # Complete
                 else:
-                    storageitems += [self.create_item(self.item_id_to_name[self.shivers_item_id_offset + 140 + i])]
-                    storageitems += [self.create_item("Empty")]
+                    storage_items.append(complete[i])
+                    storage_items.append(self.create_item("Empty"))
 
-        storageitems += [self.create_item("Empty") for i in range(3)]
+        storage_items += [self.create_item("Empty") for _ in range(3)]
 
         state = self.multiworld.get_all_state(True)
 
-        self.random.shuffle(storagelocs)
-        self.random.shuffle(storageitems)
-        
-        fill_restrictive(self.multiworld, state, storagelocs.copy(), storageitems, True, True)
+        self.random.shuffle(storage_locs)
+        self.random.shuffle(storage_items)
 
-        self.storage_placements = {location.name: location.item.name for location in storagelocs}
+        fill_restrictive(self.multiworld, state, storage_locs.copy(), storage_items, True, True)
 
-    set_rules = set_rules
+        self.storage_placements = {location.name.replace("Storage: ", ""): location.item.name.replace(" DUPE", "") for
+                                   location in storage_locs}
 
     def fill_slot_data(self) -> dict:
-
         return {
             "StoragePlacements": self.storage_placements,
             "ExcludedLocations": list(self.options.exclude_locations.value),
diff --git a/worlds/shivers/data/excluded_locations.json b/worlds/shivers/data/excluded_locations.json
index 29655d4a5024..1f012964cc61 100644
--- a/worlds/shivers/data/excluded_locations.json
+++ b/worlds/shivers/data/excluded_locations.json
@@ -11,7 +11,7 @@
 		"Information Plaque: (Ocean) Poseidon",
 		"Information Plaque: (Ocean) Colossus of Rhodes",
 		"Information Plaque: (Ocean) Poseidon's Temple",
-		"Information Plaque: (Underground Maze) Subterranean World",
+		"Information Plaque: (Underground Maze Staircase) Subterranean World",
 		"Information Plaque: (Underground Maze) Dero",
 		"Information Plaque: (Egypt) Tomb of the Ixupi",
 		"Information Plaque: (Egypt) The Sphinx",
diff --git a/worlds/shivers/data/locations.json b/worlds/shivers/data/locations.json
index 64fe3647348d..41fe517061a8 100644
--- a/worlds/shivers/data/locations.json
+++ b/worlds/shivers/data/locations.json
@@ -19,7 +19,7 @@
     "Puzzle Solved Fortune Teller Door",
     "Puzzle Solved Alchemy",
     "Puzzle Solved UFO Symbols",
-    "Puzzle Solved Anansi Musicbox",
+    "Puzzle Solved Anansi Music Box",
     "Puzzle Solved Gallows",
     "Puzzle Solved Mastermind",
     "Puzzle Solved Marble Flipper",
@@ -54,7 +54,7 @@
     "Final Riddle: Norse God Stone Message",
     "Final Riddle: Beth's Body Page 17",
     "Final Riddle: Guillotine Dropped",
-    "Puzzle Hint Found: Combo Lock in Mailbox",
+    "Puzzle Hint Found: Mailbox",
     "Puzzle Hint Found: Orange Symbol",
     "Puzzle Hint Found: Silver Symbol",
     "Puzzle Hint Found: Green Symbol",
@@ -113,15 +113,19 @@
     "Puzzle Solved Office Elevator",
     "Puzzle Solved Bedroom Elevator",
     "Puzzle Solved Three Floor Elevator",
-    "Ixupi Captured Lightning"
+    "Ixupi Captured Lightning",
+    "Puzzle Solved Combination Lock",
+    "Puzzle Hint Found: Beth's Note",
+    "Mystery Solved"
   ],
   "locations_by_region": {
     "Outside": [
+      "Puzzle Solved Combination Lock",
       "Puzzle Solved Gears",
       "Puzzle Solved Stone Henge",
       "Puzzle Solved Office Elevator",
       "Puzzle Solved Three Floor Elevator",
-      "Puzzle Hint Found: Combo Lock in Mailbox",
+      "Puzzle Hint Found: Mailbox",
       "Puzzle Hint Found: Orange Symbol",
       "Puzzle Hint Found: Silver Symbol",
       "Puzzle Hint Found: Green Symbol",
@@ -130,32 +134,42 @@
       "Puzzle Hint Found: Tan Symbol"
     ],
     "Underground Lake": [
-      "Flashback Memory Obtained Windlenot's Ghost",
+      "Flashback Memory Obtained Windlenot's Ghost"
+    ],
+    "Windlenot's Body": [
       "Flashback Memory Obtained Egyptian Hieroglyphics Explained"
     ],
     "Office": [
       "Flashback Memory Obtained Scrapbook",
-      "Accessible: Storage: Desk Drawer",
+      "Storage: Desk Drawer",
       "Puzzle Hint Found: Atlantis Map",
       "Puzzle Hint Found: Tape Recorder Heard",
       "Puzzle Solved Bedroom Elevator"
     ],
     "Workshop": [
       "Puzzle Solved Workshop Drawers",
-      "Accessible: Storage: Workshop Drawers",
+      "Storage: Workshop Drawers",
       "Puzzle Hint Found: Basilisk Bone Fragments"
     ],
     "Bedroom": [
       "Flashback Memory Obtained Professor Windlenot's Diary"
     ],
+    "Lobby": [
+      "Puzzle Solved Theater Door",
+      "Flashback Memory Obtained Museum Brochure",
+      "Information Plaque: (Lobby) Jade Skull",
+      "Information Plaque: (Lobby) Transforming Masks",
+      "Storage: Slide",
+      "Storage: Transforming Mask"
+    ],
     "Library": [
       "Puzzle Solved Library Statue",
       "Flashback Memory Obtained In Search of the Unexplained",
       "Flashback Memory Obtained South American Pictographs",
       "Flashback Memory Obtained Mythology of the Stars",
       "Flashback Memory Obtained Black Book",
-      "Accessible: Storage: Library Cabinet",
-      "Accessible: Storage: Library Statue"
+      "Storage: Library Cabinet",
+      "Storage: Library Statue"
     ],
     "Maintenance Tunnels": [
       "Flashback Memory Obtained Beth's Address Book"
@@ -163,37 +177,46 @@
     "Three Floor Elevator": [
       "Puzzle Hint Found: Elevator Writing"
     ],
-    "Lobby": [
-      "Puzzle Solved Theater Door",
-      "Flashback Memory Obtained Museum Brochure",
-      "Information Plaque: (Lobby) Jade Skull",
-      "Information Plaque: (Lobby) Transforming Masks",
-      "Accessible: Storage: Slide",
-      "Accessible: Storage: Transforming Mask"
-    ],
     "Generator": [
-      "Final Riddle: Beth's Body Page 17",
       "Ixupi Captured Lightning"
     ],
-    "Theater Back Hallways": [
+    "Beth's Body": [
+      "Final Riddle: Beth's Body Page 17"
+    ],
+    "Theater": [
+      "Storage: Theater",
+      "Puzzle Hint Found: Beth's Note"
+    ],
+    "Theater Back Hallway": [
       "Puzzle Solved Clock Tower Door"
     ],
-    "Clock Tower Staircase": [
+    "Clock Chains": [
       "Puzzle Solved Clock Chains"
     ],
     "Clock Tower": [
       "Flashback Memory Obtained Beth's Ghost",
-      "Accessible: Storage: Clock Tower",
+      "Storage: Clock Tower",
       "Puzzle Hint Found: Shaman Security Camera"
     ],
     "Projector Room": [
       "Flashback Memory Obtained Theater Movie"
     ],
+    "Prehistoric": [
+      "Information Plaque: (Prehistoric) Bronze Unicorn",
+      "Information Plaque: (Prehistoric) Griffin",
+      "Information Plaque: (Prehistoric) Eagles Nest",
+      "Information Plaque: (Prehistoric) Large Spider",
+      "Information Plaque: (Prehistoric) Starfish",
+      "Storage: Eagles Nest"
+    ],
+    "Greenhouse": [
+      "Storage: Greenhouse"
+    ],
     "Ocean": [
       "Puzzle Solved Atlantis",
       "Puzzle Solved Organ",
       "Flashback Memory Obtained Museum Blueprints",
-      "Accessible: Storage: Ocean",
+      "Storage: Ocean",
       "Puzzle Hint Found: Sirens Song Heard",
       "Information Plaque: (Ocean) Quartz Crystal",
       "Information Plaque: (Ocean) Poseidon",
@@ -204,10 +227,14 @@
       "Information Plaque: (Underground Maze Staircase) Subterranean World",
       "Puzzle Solved Maze Door"
     ],
+    "Tar River": [
+      "Storage: Tar River",
+      "Information Plaque: (Underground Maze) Dero"
+    ],
     "Egypt": [
       "Puzzle Solved Columns of RA",
       "Puzzle Solved Burial Door",
-      "Accessible: Storage: Egypt",
+      "Storage: Egypt",
       "Puzzle Hint Found: Egyptian Sphinx Heard",
       "Information Plaque: (Egypt) Tomb of the Ixupi",
       "Information Plaque: (Egypt) The Sphinx",
@@ -216,7 +243,7 @@
     "Burial": [
       "Puzzle Solved Chinese Solitaire",
       "Flashback Memory Obtained Merrick's Notebook",
-      "Accessible: Storage: Chinese Solitaire",
+      "Storage: Chinese Solitaire",
       "Information Plaque: (Burial) Norse Burial Ship",
       "Information Plaque: (Burial) Paracas Burial Bundles",
       "Information Plaque: (Burial) Spectacular Coffins of Ghana",
@@ -225,15 +252,14 @@
     ],
     "Shaman": [
       "Puzzle Solved Shaman Drums",
-      "Accessible: Storage: Shaman Hut",
+      "Storage: Shaman Hut",
       "Information Plaque: (Shaman) Witch Doctors of the Congo",
       "Information Plaque: (Shaman) Sarombe doctor of Mozambique"
     ],
     "Gods Room": [
       "Puzzle Solved Lyre",
       "Puzzle Solved Red Door",
-      "Accessible: Storage: Lyre",
-      "Final Riddle: Norse God Stone Message",
+      "Storage: Lyre",
       "Information Plaque: (Gods) Fisherman's Canoe God",
       "Information Plaque: (Gods) Mayan Gods",
       "Information Plaque: (Gods) Thor",
@@ -242,6 +268,9 @@
       "Information Plaque: (Gods) Sumerian Lyre",
       "Information Plaque: (Gods) Chuen"
     ],
+    "Norse Stone": [
+      "Final Riddle: Norse God Stone Message"
+    ],
     "Blue Maze": [
       "Puzzle Solved Fortune Teller Door"
     ],
@@ -251,35 +280,46 @@
     ],
     "Inventions": [
       "Puzzle Solved Alchemy",
-      "Accessible: Storage: Alchemy"
+      "Storage: Alchemy"
     ],
     "UFO": [
       "Puzzle Solved UFO Symbols",
-      "Accessible: Storage: UFO",
-      "Final Riddle: Planets Aligned",
+      "Storage: UFO",
       "Information Plaque: (UFO) Coincidence or Extraterrestrial Visits?",
       "Information Plaque: (UFO) Planets",
       "Information Plaque: (UFO) Astronomical Construction",
       "Information Plaque: (UFO) Aliens"
     ],
+    "Orrery": [
+      "Final Riddle: Planets Aligned"
+    ],
+    "Janitor Closet": [
+      "Storage: Janitor Closet"
+    ],
+    "Werewolf": [
+      "Information Plaque: (Werewolf) Lycanthropy"
+    ],
+    "Pegasus": [
+      "Information Plaque: (Pegasus) Cyclops"
+    ],
     "Anansi": [
-      "Puzzle Solved Anansi Musicbox",
+      "Puzzle Solved Anansi Music Box",
       "Flashback Memory Obtained Ancient Astrology",
-      "Accessible: Storage: Skeleton",
-      "Accessible: Storage: Anansi",
+      "Storage: Skeleton",
+      "Storage: Anansi Music Box",
       "Information Plaque: (Anansi) African Creation Myth",
       "Information Plaque: (Anansi) Apophis the Serpent",
-      "Information Plaque: (Anansi) Death",
-      "Information Plaque: (Pegasus) Cyclops",
-      "Information Plaque: (Werewolf) Lycanthropy"
+      "Information Plaque: (Anansi) Death"
     ],
     "Torture": [
       "Puzzle Solved Gallows",
-      "Accessible: Storage: Gallows",
-      "Final Riddle: Guillotine Dropped",
+      "Storage: Gallows",
       "Puzzle Hint Found: Gallows Information Plaque",
       "Information Plaque: (Torture) Guillotine"
     ],
+    "Guillotine": [
+      "Final Riddle: Guillotine Dropped"
+    ],
     "Puzzle Room Mastermind": [
       "Puzzle Solved Mastermind",
       "Puzzle Hint Found: Mastermind Information Plaque"
@@ -287,29 +327,8 @@
     "Puzzle Room Marbles": [
       "Puzzle Solved Marble Flipper"
     ],
-    "Prehistoric": [
-      "Information Plaque: (Prehistoric) Bronze Unicorn",
-      "Information Plaque: (Prehistoric) Griffin",
-      "Information Plaque: (Prehistoric) Eagles Nest",
-      "Information Plaque: (Prehistoric) Large Spider",
-      "Information Plaque: (Prehistoric) Starfish",
-      "Accessible: Storage: Eagles Nest"
-    ],
-    "Tar River": [
-      "Accessible: Storage: Tar River",
-      "Information Plaque: (Underground Maze) Dero"
-    ],
-    "Theater": [
-      "Accessible: Storage: Theater"
-    ],
-    "Greenhouse": [
-      "Accessible: Storage: Greenhouse"
-    ],
-    "Janitor Closet": [
-      "Accessible: Storage: Janitor Closet"
-    ],
-    "Skull Dial Bridge": [
-      "Accessible: Storage: Skull Bridge",
+    "Skull Bridge": [
+      "Storage: Skull Bridge",
       "Puzzle Solved Skull Dial Door"
     ],
     "Water Capture": [
@@ -338,6 +357,9 @@
     ],
     "Metal Capture": [
       "Ixupi Captured Metal"
+    ],
+    "Victory": [
+      "Mystery Solved"
     ]
   }
 }
diff --git a/worlds/shivers/data/regions.json b/worlds/shivers/data/regions.json
index aeb5aa737366..36eaa7874cb9 100644
--- a/worlds/shivers/data/regions.json
+++ b/worlds/shivers/data/regions.json
@@ -4,22 +4,25 @@
 		["Registry", ["To Outside From Registry"]],
 		["Outside", ["To Underground Tunnels From Outside", "To Lobby From Outside"]],
 		["Underground Tunnels", ["To Underground Lake From Underground Tunnels", "To Outside From Underground"]],
-		["Underground Lake", ["To Underground Tunnels From Underground Lake", "To Underground Blue Tunnels From Underground Lake"]],
+		["Underground Lake", ["To Underground Tunnels From Underground Lake", "To Windlenot's Body From Underground Lake", "To Underground Blue Tunnels From Underground Lake"]],
+		["Windlenot's Body", ["To Underground Lake From Windlenot's Body"]],
 		["Underground Blue Tunnels", ["To Underground Lake From Underground Blue Tunnels", "To Office Elevator From Underground Blue Tunnels"]],
 		["Office Elevator", ["To Underground Blue Tunnels From Office Elevator","To Office From Office Elevator"]],
 		["Office", ["To Office Elevator From Office", "To Workshop", "To Lobby From Office", "To Bedroom Elevator From Office", "To Ash Capture From Office"]],
 		["Workshop", ["To Office From Workshop", "To Wood Capture From Workshop"]],
 		["Bedroom Elevator", ["To Office From Bedroom Elevator", "To Bedroom"]],
 		["Bedroom", ["To Bedroom Elevator From Bedroom", "To Metal Capture From Bedroom"]],
-		["Lobby", ["To Office From Lobby", "To Library From Lobby", "To Theater From Lobby", "To Prehistoric From Lobby", "To Egypt From Lobby", "To Tar River From Lobby", "To Outside From Lobby", "To Water Capture From Lobby", "To Crystal Capture From Lobby"]],
+		["Lobby", ["To Office From Lobby", "To Library From Lobby", "To Theater From Lobby", "To Prehistoric From Lobby", "To Egypt From Lobby", "To Tar River From Lobby", "To Outside From Lobby", "To Water Capture From Lobby", "To Crystal Capture From Lobby", "To Victory"]],
 		["Library", ["To Lobby From Library", "To Maintenance Tunnels From Library", "To Wax Capture From Library"]],
-		["Maintenance Tunnels", ["To Library From Maintenance Tunnels", "To Three Floor Elevator From Maintenance Tunnels", "To Generator"]],
+		["Maintenance Tunnels", ["To Library From Maintenance Tunnels", "To Three Floor Elevator From Maintenance Tunnels", "To Generator From Maintenance Tunnels"]],
 		["Generator", ["To Maintenance Tunnels From Generator"]],
-		["Theater", ["To Lobby From Theater", "To Theater Back Hallways From Theater"]],
-		["Theater Back Hallways", ["To Theater From Theater Back Hallways", "To Clock Tower Staircase From Theater Back Hallways", "To Maintenance Tunnels From Theater Back Hallways", "To Projector Room"]],
-		["Clock Tower Staircase", ["To Theater Back Hallways From Clock Tower Staircase", "To Clock Tower"]],
+		["Beth's Body", ["To Generator From Beth's Body"]],
+		["Theater", ["To Lobby From Theater", "To Theater Back Hallway From Theater"]],
+		["Theater Back Hallway", ["To Theater From Theater Back Hallway", "To Clock Tower Staircase From Theater Back Hallway", "To Maintenance Tunnels From Theater Back Hallway", "To Projector Room"]],
+		["Clock Tower Staircase", ["To Theater Back Hallway From Clock Tower Staircase", "To Clock Tower"]],
+		["Clock Chains", ["To Clock Tower Staircase From Clock Chains"]],
 		["Clock Tower", ["To Clock Tower Staircase From Clock Tower"]],
-		["Projector Room", ["To Theater Back Hallways From Projector Room", "To Metal Capture From Projector Room"]],
+		["Projector Room", ["To Theater Back Hallway From Projector Room", "To Metal Capture From Projector Room"]],
 		["Prehistoric", ["To Lobby From Prehistoric", "To Greenhouse", "To Ocean From Prehistoric", "To Oil Capture From Prehistoric", "To Metal Capture From Prehistoric"]],
 		["Greenhouse", ["To Prehistoric From Greenhouse", "To Sand Capture From Greenhouse"]],
 		["Ocean", ["To Prehistoric From Ocean", "To Maze Staircase From Ocean", "To Crystal Capture From Ocean", "To Sand Capture From Ocean"]],
@@ -28,22 +31,26 @@
 		["Tar River", ["To Maze From Tar River", "To Lobby From Tar River", "To Oil Capture From Tar River"]],
 		["Egypt", ["To Lobby From Egypt", "To Burial From Egypt", "To Blue Maze From Egypt", "To Cloth Capture From Egypt"]],
 		["Burial", ["To Egypt From Burial", "To Shaman From Burial", "To Ash Capture From Burial", "To Cloth Capture From Burial"]],
-		["Shaman", ["To Burial From Shaman", "To Gods Room", "To Wax Capture From Shaman"]],
-		["Gods Room", ["To Shaman From Gods Room", "To Anansi From Gods Room", "To Wood Capture From Gods Room"]],
-		["Anansi", ["To Gods Room From Anansi", "To Werewolf From Anansi", "To Wax Capture From Anansi", "To Wood Capture From Anansi"]],
-		["Werewolf", ["To Anansi From Werewolf", "To Night Staircase From Werewolf"]],
-		["Night Staircase", ["To Werewolf From Night Staircase", "To Janitor Closet", "To UFO"]],
+		["Shaman", ["To Burial From Shaman", "To Gods Room From Shaman", "To Wax Capture From Shaman"]],
+		["Gods Room", ["To Shaman From Gods Room", "To Anansi From Gods Room", "To Wood Capture From Gods Room", "To Norse Stone From Gods Room"]],
+		["Norse Stone", ["To Gods Room From Norse Stone"]],
+		["Anansi", ["To Gods Room From Anansi", "To Pegasus From Anansi", "To Wax Capture From Anansi"]],
+		["Pegasus", ["To Anansi From Pegasus", "To Werewolf From Pegasus", "To Wood Capture From Pegasus"]],
+		["Werewolf", ["To Pegasus From Werewolf", "To Night Staircase From Werewolf"]],
+		["Night Staircase", ["To Werewolf From Night Staircase", "To Janitor Closet", "To UFO From Night Staircase"]],
 		["Janitor Closet", ["To Night Staircase From Janitor Closet", "To Water Capture From Janitor Closet", "To Cloth Capture From Janitor Closet"]],
-		["UFO", ["To Night Staircase From UFO", "To Inventions From UFO"]],
+		["UFO", ["To Night Staircase From UFO", "To Orrery From UFO", "To Inventions From UFO"]],
+		["Orrery", ["To UFO From Orrery"]],
 		["Blue Maze", ["To Egypt From Blue Maze", "To Three Floor Elevator From Blue Maze Bottom", "To Three Floor Elevator From Blue Maze Top", "To Fortune Teller", "To Inventions From Blue Maze", "To Wood Capture From Blue Maze"]],
 		["Three Floor Elevator", ["To Maintenance Tunnels From Three Floor Elevator", "To Blue Maze From Three Floor Elevator"]],
 		["Fortune Teller", ["To Blue Maze From Fortune Teller"]],
 		["Inventions", ["To Blue Maze From Inventions", "To UFO From Inventions", "To Torture From Inventions"]],
 		["Torture", ["To Inventions From Torture", "To Puzzle Room Mastermind From Torture"]],
+		["Guillotine", ["To Torture From Guillotine"]],
 		["Puzzle Room Mastermind", ["To Torture", "To Puzzle Room Marbles From Puzzle Room Mastermind"]],
-		["Puzzle Room Marbles", ["To Puzzle Room Mastermind From Puzzle Room Marbles", "To Skull Dial Bridge From Puzzle Room Marbles"]],
-		["Skull Dial Bridge", ["To Puzzle Room Marbles From Skull Dial Bridge", "To Slide Room"]],
-		["Slide Room", ["To Skull Dial Bridge From Slide Room", "To Lobby From Slide Room"]],
+		["Puzzle Room Marbles", ["To Puzzle Room Mastermind From Puzzle Room Marbles", "To Skull Bridge From Puzzle Room Marbles"]],
+		["Skull Bridge", ["To Puzzle Room Marbles From Skull Bridge", "To Slide Room"]],
+		["Slide Room", ["To Skull Bridge From Slide Room", "To Lobby From Slide Room"]],
 		["Water Capture", []],
 		["Wax Capture", []],
 		["Ash Capture", []],
@@ -52,17 +59,20 @@
 		["Wood Capture", []],
 		["Crystal Capture", []],
 		["Sand Capture", []],
-		["Metal Capture", []]
+		["Metal Capture", []],
+		["Victory", []]
     ],
     "mandatory_connections": [
-    ["To Registry", "Registry"],
+		["To Registry", "Registry"],
 		["To Outside From Registry", "Outside"],
 		["To Outside From Underground", "Outside"],
 		["To Outside From Lobby", "Outside"],
 		["To Underground Tunnels From Outside", "Underground Tunnels"],
 		["To Underground Tunnels From Underground Lake", "Underground Tunnels"],
 		["To Underground Lake From Underground Tunnels", "Underground Lake"],
+		["To Underground Lake From Windlenot's Body", "Underground Lake"],
 		["To Underground Lake From Underground Blue Tunnels", "Underground Lake"],
+		["To Windlenot's Body From Underground Lake", "Windlenot's Body"],
 		["To Underground Blue Tunnels From Underground Lake", "Underground Blue Tunnels"],
 		["To Underground Blue Tunnels From Office Elevator", "Underground Blue Tunnels"],
 		["To Office Elevator From Underground Blue Tunnels", "Office Elevator"],
@@ -86,7 +96,7 @@
 		["To Library From Lobby", "Library"],
 		["To Library From Maintenance Tunnels", "Library"],
 		["To Theater From Lobby", "Theater" ],
-		["To Theater From Theater Back Hallways", "Theater"],
+		["To Theater From Theater Back Hallway", "Theater"],
 		["To Prehistoric From Lobby", "Prehistoric"],
 		["To Prehistoric From Greenhouse", "Prehistoric"],
 		["To Prehistoric From Ocean", "Prehistoric"],
@@ -96,15 +106,17 @@
 		["To Maintenance Tunnels From Generator", "Maintenance Tunnels"],
 		["To Maintenance Tunnels From Three Floor Elevator", "Maintenance Tunnels"],
 		["To Maintenance Tunnels From Library", "Maintenance Tunnels"],
-		["To Maintenance Tunnels From Theater Back Hallways", "Maintenance Tunnels"],
+		["To Maintenance Tunnels From Theater Back Hallway", "Maintenance Tunnels"],
 		["To Three Floor Elevator From Maintenance Tunnels", "Three Floor Elevator"],
 		["To Three Floor Elevator From Blue Maze Bottom", "Three Floor Elevator"],
 		["To Three Floor Elevator From Blue Maze Top", "Three Floor Elevator"],
-		["To Generator", "Generator"],
-		["To Theater Back Hallways From Theater", "Theater Back Hallways"],
-		["To Theater Back Hallways From Clock Tower Staircase", "Theater Back Hallways"],
-		["To Theater Back Hallways From Projector Room", "Theater Back Hallways"],
-		["To Clock Tower Staircase From Theater Back Hallways", "Clock Tower Staircase"],
+		["To Generator From Maintenance Tunnels", "Generator"],
+		["To Generator From Beth's Body", "Generator"],
+		["To Theater Back Hallway From Theater", "Theater Back Hallway"],
+		["To Theater Back Hallway From Clock Tower Staircase", "Theater Back Hallway"],
+		["To Theater Back Hallway From Projector Room", "Theater Back Hallway"],
+		["To Clock Tower Staircase From Theater Back Hallway", "Clock Tower Staircase"],
+		["To Clock Tower Staircase From Clock Chains", "Clock Tower Staircase"],
 		["To Clock Tower Staircase From Clock Tower", "Clock Tower Staircase"],
 		["To Projector Room", "Projector Room"],
 		["To Clock Tower", "Clock Tower"],
@@ -125,30 +137,37 @@
 		["To Blue Maze From Egypt", "Blue Maze"],
 		["To Shaman From Burial", "Shaman"],
 		["To Shaman From Gods Room", "Shaman"],
-		["To Gods Room", "Gods Room" ],
+		["To Gods Room From Shaman", "Gods Room" ],
+		["To Gods Room From Norse Stone", "Gods Room" ],
 		["To Gods Room From Anansi", "Gods Room"],
+		["To Norse Stone From Gods Room", "Norse Stone" ],
 		["To Anansi From Gods Room", "Anansi"],
-		["To Anansi From Werewolf", "Anansi"],
-		["To Werewolf From Anansi", "Werewolf"],
+		["To Anansi From Pegasus", "Anansi"],
+		["To Pegasus From Anansi", "Pegasus"],
+		["To Pegasus From Werewolf", "Pegasus"],
+		["To Werewolf From Pegasus", "Werewolf"],
 		["To Werewolf From Night Staircase", "Werewolf"],
 		["To Night Staircase From Werewolf", "Night Staircase"],
 		["To Night Staircase From Janitor Closet", "Night Staircase"],
 		["To Night Staircase From UFO", "Night Staircase"],
 		["To Janitor Closet", "Janitor Closet"],
-		["To UFO", "UFO"],
+		["To UFO From Night Staircase", "UFO"],
+		["To UFO From Orrery", "UFO"],
 		["To UFO From Inventions", "UFO"],
+		["To Orrery From UFO", "Orrery"],
 		["To Inventions From UFO", "Inventions"],
 		["To Inventions From Blue Maze", "Inventions"],
 		["To Inventions From Torture", "Inventions"],
 		["To Fortune Teller", "Fortune Teller"],
 		["To Torture", "Torture"],
+		["To Torture From Guillotine", "Torture"],
 		["To Torture From Inventions", "Torture"],
 		["To Puzzle Room Mastermind From Torture", "Puzzle Room Mastermind"],
 		["To Puzzle Room Mastermind From Puzzle Room Marbles", "Puzzle Room Mastermind"],
 		["To Puzzle Room Marbles From Puzzle Room Mastermind", "Puzzle Room Marbles"],
-		["To Puzzle Room Marbles From Skull Dial Bridge", "Puzzle Room Marbles"],
-		["To Skull Dial Bridge From Puzzle Room Marbles", "Skull Dial Bridge"],
-		["To Skull Dial Bridge From Slide Room", "Skull Dial Bridge"],
+		["To Puzzle Room Marbles From Skull Bridge", "Puzzle Room Marbles"],
+		["To Skull Bridge From Puzzle Room Marbles", "Skull Bridge"],
+		["To Skull Bridge From Slide Room", "Skull Bridge"],
 		["To Slide Room", "Slide Room"],
 		["To Wax Capture From Library", "Wax Capture"],
 		["To Wax Capture From Shaman", "Wax Capture"],
@@ -164,7 +183,7 @@
 		["To Cloth Capture From Janitor Closet", "Cloth Capture"],
 		["To Wood Capture From Workshop", "Wood Capture"],
 		["To Wood Capture From Gods Room", "Wood Capture"],
-		["To Wood Capture From Anansi", "Wood Capture"],
+		["To Wood Capture From Pegasus", "Wood Capture"],
 		["To Wood Capture From Blue Maze", "Wood Capture"],
 		["To Crystal Capture From Lobby", "Crystal Capture"],
 		["To Crystal Capture From Ocean", "Crystal Capture"],
@@ -172,6 +191,7 @@
 		["To Sand Capture From Ocean", "Sand Capture"],
 		["To Metal Capture From Bedroom", "Metal Capture"],
 		["To Metal Capture From Projector Room", "Metal Capture"],
-		["To Metal Capture From Prehistoric", "Metal Capture"]
+		["To Metal Capture From Prehistoric", "Metal Capture"],
+		["To Victory", "Victory"]
 	]
 }
diff --git a/worlds/shivers/docs/en_Shivers.md b/worlds/shivers/docs/en_Shivers.md
index 2c56152a7a0c..9490b577bdd0 100644
--- a/worlds/shivers/docs/en_Shivers.md
+++ b/worlds/shivers/docs/en_Shivers.md
@@ -27,5 +27,4 @@ Victory is achieved when the player has captured the required number Ixupi set i
 
 ## Encountered a bug?
 
-Please contact GodlFire on Discord for bugs related to Shivers world generation.<br>
-Please contact GodlFire or mouse on Discord for bugs related to the Shivers Randomizer.
+Please contact GodlFire or Cynbel_Terreus on Discord for bugs related to Shivers world generation or the Shivers Randomizer.

From ca1b3df45b0c9939dffa9cada01dee3c23291911 Mon Sep 17 00:00:00 2001
From: Kory Dondzila <korydondzila@gmail.com>
Date: Fri, 27 Dec 2024 17:38:01 -0500
Subject: [PATCH 199/381] Shivers: Follow on PR to cleanup options #4401

---
 worlds/shivers/Options.py | 80 +++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 46 deletions(-)

diff --git a/worlds/shivers/Options.py b/worlds/shivers/Options.py
index 2e68c4beecc0..5aa6c207cfc1 100644
--- a/worlds/shivers/Options.py
+++ b/worlds/shivers/Options.py
@@ -1,7 +1,8 @@
 from dataclasses import dataclass
 
 from Options import (
-    Choice, DefaultOnToggle, ItemDict, ItemSet, LocationSet, OptionGroup, PerGameCommonOptions, Range, Toggle,
+    Choice, DefaultOnToggle, ExcludeLocations, LocalItems, NonLocalItems, OptionGroup, PerGameCommonOptions,
+    PriorityLocations, Range, StartHints, StartInventory, StartLocationHints, Toggle,
 )
 from . import ItemType, item_table
 from .Constants import location_info
@@ -129,53 +130,38 @@ class PuzzleCollectBehavior(Choice):
 valid_location_keys = [name for name in location_info["all_locations"] if name != "Mystery Solved"]
 
 
-class LocalItems(ItemSet):
-    """Forces these items to be in their native world."""
-    display_name = "Local Items"
-    rich_text_doc = True
+class ShiversLocalItems(LocalItems):
+    __doc__ = LocalItems.__doc__
     valid_keys = valid_item_keys
 
 
-class NonLocalItems(ItemSet):
-    """Forces these items to be outside their native world."""
-    display_name = "Non-local Items"
-    rich_text_doc = True
+class ShiversNonLocalItems(NonLocalItems):
+    __doc__ = NonLocalItems.__doc__
     valid_keys = valid_item_keys
 
 
-class StartInventory(ItemDict):
-    """Start with these items."""
-    verify_item_name = True
-    display_name = "Start Inventory"
-    rich_text_doc = True
+class ShiversStartInventory(StartInventory):
+    __doc__ = StartInventory.__doc__
     valid_keys = valid_item_keys
 
 
-class StartHints(ItemSet):
-    """Start with these item's locations prefilled into the ``!hint`` command."""
-    display_name = "Start Hints"
-    rich_text_doc = True
+class ShiversStartHints(StartHints):
+    __doc__ = StartHints.__doc__
     valid_keys = valid_item_keys
 
 
-class StartLocationHints(LocationSet):
-    """Start with these locations and their item prefilled into the ``!hint`` command."""
-    display_name = "Start Location Hints"
-    rich_text_doc = True
+class ShiversStartLocationHints(StartLocationHints):
+    __doc__ = StartLocationHints.__doc__
     valid_keys = valid_location_keys
 
 
-class ExcludeLocations(LocationSet):
-    """Prevent these locations from having an important item."""
-    display_name = "Excluded Locations"
-    rich_text_doc = True
+class ShiversExcludeLocations(ExcludeLocations):
+    __doc__ = ExcludeLocations.__doc__
     valid_keys = valid_location_keys
 
 
-class PriorityLocations(LocationSet):
-    """Prevent these locations from having an unimportant item."""
-    display_name = "Priority Locations"
-    rich_text_doc = True
+class ShiversPriorityLocations(PriorityLocations):
+    __doc__ = PriorityLocations.__doc__
     valid_keys = valid_location_keys
 
 
@@ -192,23 +178,25 @@ class ShiversOptions(PerGameCommonOptions):
     location_pot_pieces: LocationPotPieces
     full_pots: FullPots
     puzzle_collect_behavior: PuzzleCollectBehavior
-    local_items: LocalItems
-    non_local_items: NonLocalItems
-    start_inventory: StartInventory
-    start_hints: StartHints
-    start_location_hints: StartLocationHints
-    exclude_locations: ExcludeLocations
-    priority_locations: PriorityLocations
+    local_items: ShiversLocalItems
+    non_local_items: ShiversNonLocalItems
+    start_inventory: ShiversStartInventory
+    start_hints: ShiversStartHints
+    start_location_hints: ShiversStartLocationHints
+    exclude_locations: ShiversExcludeLocations
+    priority_locations: ShiversPriorityLocations
 
 
 shivers_option_groups = [
-    OptionGroup("Item & Location Options", [
-        LocalItems,
-        NonLocalItems,
-        StartInventory,
-        StartHints,
-        StartLocationHints,
-        ExcludeLocations,
-        PriorityLocations
-    ], True),
+    OptionGroup(
+        "Item & Location Options", [
+            ShiversLocalItems,
+            ShiversNonLocalItems,
+            ShiversStartInventory,
+            ShiversStartHints,
+            ShiversStartLocationHints,
+            ShiversExcludeLocations,
+            ShiversPriorityLocations
+        ], True,
+    ),
 ]

From 2065246186a56a345593232c928afff3e587e34b Mon Sep 17 00:00:00 2001
From: CaitSith2 <d_good@caitsith2.com>
Date: Sun, 29 Dec 2024 11:13:34 -0800
Subject: [PATCH 200/381] Factorio: Make it possible to use rocket part in
 blueprint parameterization. (#4396)

This allows for example, making a blueprint of your rocket silo with requester chests specifying a request for the 2-8 rocket part ingredients needed to build the rocket.
---
 worlds/factorio/data/mod_template/data-final-fixes.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/factorio/data/mod_template/data-final-fixes.lua b/worlds/factorio/data/mod_template/data-final-fixes.lua
index dc068c4f62aa..60a56068b788 100644
--- a/worlds/factorio/data/mod_template/data-final-fixes.lua
+++ b/worlds/factorio/data/mod_template/data-final-fixes.lua
@@ -1,6 +1,7 @@
 {% from "macros.lua" import dict_to_recipe, variable_to_lua %}
 -- this file gets written automatically by the Archipelago Randomizer and is in its raw form a Jinja2 Template
 require('lib')
+data.raw["item"]["rocket-part"].hidden = false
 data.raw["rocket-silo"]["rocket-silo"].fluid_boxes = {
     {
         production_type = "input",

From fa95ae4b24fb2b954e9a9923d3672b2f45ce9fc4 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun, 29 Dec 2024 20:55:40 +0100
Subject: [PATCH 201/381] Factorio: require version that fixes a randomizer
 exploit (#4391)

---
 worlds/factorio/Mod.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/factorio/Mod.py b/worlds/factorio/Mod.py
index 7dee04afbee3..8ea0b24c3d27 100644
--- a/worlds/factorio/Mod.py
+++ b/worlds/factorio/Mod.py
@@ -37,8 +37,8 @@
     "description": "Integration client for the Archipelago Randomizer",
     "factorio_version": "2.0",
     "dependencies": [
-        "base >= 2.0.15",
-        "? quality >= 2.0.15",
+        "base >= 2.0.28",
+        "? quality >= 2.0.28",
         "! space-age",
         "? science-not-invited",
         "? factory-levels"

From 0de1369ec5dd8f37f8b31148f7c354804a3f8876 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun, 29 Dec 2024 20:56:41 +0100
Subject: [PATCH 202/381] Factorio: hide hidden vanilla techs in factoriopedia
 too (#4332)

---
 worlds/factorio/data/mod_template/data-final-fixes.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/factorio/data/mod_template/data-final-fixes.lua b/worlds/factorio/data/mod_template/data-final-fixes.lua
index 60a56068b788..8092062bc3f2 100644
--- a/worlds/factorio/data/mod_template/data-final-fixes.lua
+++ b/worlds/factorio/data/mod_template/data-final-fixes.lua
@@ -163,6 +163,7 @@ data.raw["ammo"]["artillery-shell"].stack_size = 10
 {# each randomized tech gets set to be invisible, with new nodes added that trigger those #}
 {%- for original_tech_name in base_tech_table -%}
 technologies["{{ original_tech_name }}"].hidden = true
+technologies["{{ original_tech_name }}"].hidden_in_factoriopedia = true
 {% endfor %}
 {%- for location, item in locations %}
 {#- the tech researched by the local player #}

From 8dbecf3d57fe4dbcabe7bb3068104d074193b7f7 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Mon, 30 Dec 2024 00:50:39 +0100
Subject: [PATCH 203/381] The Witness: Make location order in the spoiler log
 deterministic (#3895)

* Fix location order

* Update worlds/witness/data/static_logic.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/witness/data/static_logic.py |  2 ++
 worlds/witness/regions.py           | 29 +++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/worlds/witness/data/static_logic.py b/worlds/witness/data/static_logic.py
index 58f2e894e849..6cc4e1431d07 100644
--- a/worlds/witness/data/static_logic.py
+++ b/worlds/witness/data/static_logic.py
@@ -106,6 +106,7 @@ def read_logic_file(self, lines: List[str]) -> None:
                     "entityType": location_id,
                     "locationType": None,
                     "area": current_area,
+                    "order": len(self.ENTITIES_BY_HEX),
                 }
 
                 self.ENTITIES_BY_NAME[self.ENTITIES_BY_HEX[entity_hex]["checkName"]] = self.ENTITIES_BY_HEX[entity_hex]
@@ -186,6 +187,7 @@ def read_logic_file(self, lines: List[str]) -> None:
                 "entityType": entity_type,
                 "locationType": location_type,
                 "area": current_area,
+                "order": len(self.ENTITIES_BY_HEX),
             }
 
             self.ENTITY_ID_TO_NAME[entity_hex] = full_entity_name
diff --git a/worlds/witness/regions.py b/worlds/witness/regions.py
index 1df438f68b0d..a1f7df8a310c 100644
--- a/worlds/witness/regions.py
+++ b/worlds/witness/regions.py
@@ -114,7 +114,7 @@ def create_regions(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic
             if k not in player_logic.UNREACHABLE_REGIONS
         }
 
-        event_locations_per_region = defaultdict(list)
+        event_locations_per_region = defaultdict(dict)
 
         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"]
@@ -122,20 +122,33 @@ def create_regions(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic
                 region_name = "Entry"
             else:
                 region_name = region["name"]
-            event_locations_per_region[region_name].append(event_location)
+            order = self.reference_logic.ENTITIES_BY_HEX[event_item_and_entity[1]]["order"]
+            event_locations_per_region[region_name][event_location] = order
 
         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
+            location_entities_for_this_region = [
+                self.reference_logic.ENTITIES_BY_HEX[entity] for entity in region["entities"]
             ]
+            locations_for_this_region = {
+                entity["checkName"]: entity["order"] for entity in location_entities_for_this_region
+                if entity["checkName"] in self.player_locations.CHECK_LOCATION_TABLE
+            }
 
-            locations_for_this_region += event_locations_per_region[region_name]
+            events = event_locations_per_region[region_name]
+            locations_for_this_region.update(events)
+
+            # First, sort by keys.
+            locations_for_this_region = dict(sorted(locations_for_this_region.items()))
+
+            # Then, sort by game order (values)
+            locations_for_this_region = dict(sorted(
+                locations_for_this_region.items(),
+                key=lambda location_name_and_order: location_name_and_order[1]
+            ))
 
             all_locations = all_locations | set(locations_for_this_region)
 
-            new_region = create_region(world, region_name, self.player_locations, locations_for_this_region)
+            new_region = create_region(world, region_name, self.player_locations, list(locations_for_this_region))
 
             regions_by_name[region_name] = new_region
 

From c4bbcf989036ffe698fe11179defcbd107dc55e8 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Tue, 31 Dec 2024 04:57:09 +0000
Subject: [PATCH 204/381] TUNIC: Add relics and abilities to the item pool in
 deterministic order (#4411)

---
 worlds/tunic/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 29dbf150125c..8525a3fc437d 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -284,12 +284,14 @@ def remove_filler(amount: int) -> None:
 
             remove_filler(items_to_create[gold_hexagon])
 
-            for hero_relic in item_name_groups["Hero Relics"]:
+            # Sort for deterministic order
+            for hero_relic in sorted(item_name_groups["Hero Relics"]):
                 tunic_items.append(self.create_item(hero_relic, ItemClassification.useful))
                 items_to_create[hero_relic] = 0
 
         if not self.options.ability_shuffling:
-            for page in item_name_groups["Abilities"]:
+            # Sort for deterministic order
+            for page in sorted(item_name_groups["Abilities"]):
                 if items_to_create[page] > 0:
                     tunic_items.append(self.create_item(page, ItemClassification.useful))
                     items_to_create[page] = 0

From 3c9270d8029ac5445d6055cac5c9a464b3a33ba8 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Tue, 31 Dec 2024 14:02:02 +0000
Subject: [PATCH 205/381] FFMQ: Create itempool in deterministic order (#4413)

---
 worlds/ffmq/Items.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/worlds/ffmq/Items.py b/worlds/ffmq/Items.py
index f1c102d34ef8..31453a0fef29 100644
--- a/worlds/ffmq/Items.py
+++ b/worlds/ffmq/Items.py
@@ -260,7 +260,8 @@ def add_item(item_name):
         items.append(i)
 
     for item_group in ("Key Items", "Spells", "Armors", "Helms", "Shields", "Accessories", "Weapons"):
-        for item in self.item_name_groups[item_group]:
+        # Sort for deterministic order
+        for item in sorted(self.item_name_groups[item_group]):
             add_item(item)
 
     if self.options.brown_boxes == "include":

From 6e59ee2926410ed791cbcd6413ffa0b158974a94 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Tue, 31 Dec 2024 14:16:29 +0000
Subject: [PATCH 206/381] Zork Grand Inquisitor: Precollect Start with Hotspot
 Items in deterministic order (#4412)

---
 worlds/zork_grand_inquisitor/world.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/zork_grand_inquisitor/world.py b/worlds/zork_grand_inquisitor/world.py
index a93f2c2134c1..3698ad7f8960 100644
--- a/worlds/zork_grand_inquisitor/world.py
+++ b/worlds/zork_grand_inquisitor/world.py
@@ -176,7 +176,7 @@ def create_items(self) -> None:
 
         if start_with_hotspot_items:
             item: ZorkGrandInquisitorItems
-            for item in items_with_tag(ZorkGrandInquisitorTags.HOTSPOT):
+            for item in sorted(items_with_tag(ZorkGrandInquisitorTags.HOTSPOT), key=lambda item: item.name):
                 self.multiworld.push_precollected(self.create_item(item.value))
 
     def create_item(self, name: str) -> ZorkGrandInquisitorItem:

From 917335ec54210c4b368cb3ba7b202e133a1c12c9 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Wed, 1 Jan 2025 02:02:18 +0100
Subject: [PATCH 207/381] Core: it's 2025 (#4417)

---
 LICENSE                                | 2 +-
 WebHostLib/templates/islandFooter.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 40716cff4275..60d31b7b7de8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2017 LLCoolDave
-Copyright (c) 2022 Berserker66
+Copyright (c) 2025 Berserker66
 Copyright (c) 2022 CaitSith2
 Copyright (c) 2021 LegendaryLinux
 
diff --git a/WebHostLib/templates/islandFooter.html b/WebHostLib/templates/islandFooter.html
index 08cf227990b8..7de14f0d827c 100644
--- a/WebHostLib/templates/islandFooter.html
+++ b/WebHostLib/templates/islandFooter.html
@@ -1,6 +1,6 @@
 {% block footer %}
     <footer id="island-footer">
-        <div id="copyright-notice">Copyright 2024 Archipelago</div>
+        <div id="copyright-notice">Copyright 2025 Archipelago</div>
         <div id="links">
             <a href="/sitemap">Site Map</a>
             -

From a7b483e4b72e8a983875e660a2d92762baedbf62 Mon Sep 17 00:00:00 2001
From: Kory Dondzila <korydondzila@gmail.com>
Date: Thu, 2 Jan 2025 10:12:00 -0500
Subject: [PATCH 208/381] Shivers: Adds ixupi captures priority option (#4403)

---
 worlds/shivers/Options.py       |  8 ++++++++
 worlds/shivers/__init__.py      | 24 +++++++++++++++---------
 worlds/shivers/docs/setup_en.md |  7 ++++++-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/worlds/shivers/Options.py b/worlds/shivers/Options.py
index 5aa6c207cfc1..25b3cffe434c 100644
--- a/worlds/shivers/Options.py
+++ b/worlds/shivers/Options.py
@@ -110,6 +110,13 @@ class FullPots(Choice):
     option_mixed = 2
 
 
+class IxupiCapturesPriority(DefaultOnToggle):
+    """
+    Ixupi captures are set to priority locations. This forces a progression item into these locations if possible.
+    """
+    display_name = "Ixupi Captures are Priority"
+
+
 class PuzzleCollectBehavior(Choice):
     """
     Defines what happens to puzzles on collect.
@@ -177,6 +184,7 @@ class ShiversOptions(PerGameCommonOptions):
     early_lightning: EarlyLightning
     location_pot_pieces: LocationPotPieces
     full_pots: FullPots
+    ixupi_captures_priority: IxupiCapturesPriority
     puzzle_collect_behavior: PuzzleCollectBehavior
     local_items: ShiversLocalItems
     non_local_items: ShiversNonLocalItems
diff --git a/worlds/shivers/__init__.py b/worlds/shivers/__init__.py
index 6a41dce376b3..9e0330defea9 100644
--- a/worlds/shivers/__init__.py
+++ b/worlds/shivers/__init__.py
@@ -16,7 +16,7 @@ class ShiversWeb(WebWorld):
         "English",
         "setup_en.md",
         "setup/en",
-        ["GodlFire", "Mathx2"]
+        ["GodlFire", "Cynbel_Terreus"]
     )]
     option_groups = shivers_option_groups
 
@@ -41,6 +41,20 @@ class ShiversWorld(World):
     def generate_early(self):
         self.pot_completed_list = []
 
+        # Pot piece shuffle location:
+        if self.options.location_pot_pieces == "own_world":
+            self.options.local_items.value |= {name for name, data in item_table.items() if
+                                               data.type in [ItemType.POT, ItemType.POT_COMPLETE]}
+        elif self.options.location_pot_pieces == "different_world":
+            self.options.non_local_items.value |= {name for name, data in item_table.items() if
+                                                   data.type in [ItemType.POT, ItemType.POT_COMPLETE]}
+
+        # Ixupi captures priority locations:
+        if self.options.ixupi_captures_priority:
+            self.options.priority_locations.value |= (
+                {name for name in self.location_names if name.startswith('Ixupi Captured')}
+            )
+
     def create_item(self, name: str) -> Item:
         data = item_table[name]
         return ShiversItem(name, data.classification, data.code, self.player)
@@ -194,14 +208,6 @@ def set_lobby_access_keys(items: Dict[str, int]):
             ["Heal", "Easier Lyre"], weights=[95, 5], k=filler_needed
         ))
 
-        # Pot piece shuffle location:
-        if self.options.location_pot_pieces == "own_world":
-            self.options.local_items.value |= {name for name, data in item_table.items() if
-                                               data.type in [ItemType.POT, ItemType.POT_COMPLETE]}
-        elif self.options.location_pot_pieces == "different_world":
-            self.options.non_local_items.value |= {name for name, data in item_table.items() if
-                                                   data.type in [ItemType.POT, ItemType.POT_COMPLETE]}
-
         self.multiworld.itempool += item_pool
 
     def pre_fill(self) -> None:
diff --git a/worlds/shivers/docs/setup_en.md b/worlds/shivers/docs/setup_en.md
index c53edcdf2b57..a495c87b226a 100644
--- a/worlds/shivers/docs/setup_en.md
+++ b/worlds/shivers/docs/setup_en.md
@@ -7,6 +7,11 @@
 - [ScummVM](https://www.scummvm.org/downloads/) version 2.7.0 or later
 - [Shivers Randomizer](https://github.com/GodlFire/Shivers-Randomizer-CSharp/releases/latest) Latest release version
 
+## Optional Software
+
+- [PopTracker](https://github.com/black-sliver/PopTracker/releases/)
+  - [Jax's Shivers PopTracker pack](https://github.com/blazik-barth/Shivers-Tracker/releases/)
+
 ## Setup ScummVM for Shivers
 
 ### GOG version of Shivers
@@ -57,4 +62,4 @@ validator page: [YAML Validation page](/mysterycheck)
 - Every puzzle
 - Every puzzle hint/solution
 - Every document that is considered a Flashback
-- Optionally information plaques.
+- Optionally information plaques

From 82c44aaa226312727d055e47921bd45ff9ad92de Mon Sep 17 00:00:00 2001
From: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Date: Thu, 2 Jan 2025 22:03:07 -0500
Subject: [PATCH 209/381] FFMQ: Fix encoding issue with Game Page (#4299)

---
 worlds/ffmq/docs/en_Final Fantasy Mystic Quest.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/ffmq/docs/en_Final Fantasy Mystic Quest.md b/worlds/ffmq/docs/en_Final Fantasy Mystic Quest.md
index 4e093930739d..e1316b655f7c 100644
--- a/worlds/ffmq/docs/en_Final Fantasy Mystic Quest.md	
+++ b/worlds/ffmq/docs/en_Final Fantasy Mystic Quest.md	
@@ -1,7 +1,7 @@
 # Final Fantasy Mystic Quest
 
 ## Game page in other languages:
-* [Français](/games/Final%20Fantasy%20Mystic%20Quest/info/fr)
+* [Français](/games/Final%20Fantasy%20Mystic%20Quest/info/fr)
 
 ## Where is the options page?
 

From 2a11d9fec3fd721fb545533c8b40b47a8d8ad1db Mon Sep 17 00:00:00 2001
From: CaitSith2 <d_good@caitsith2.com>
Date: Thu, 2 Jan 2025 19:45:32 -0800
Subject: [PATCH 210/381] try again to award the starting items post cutscene
 if needed. (#4408)

---
 worlds/factorio/data/mod_template/control.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/worlds/factorio/data/mod_template/control.lua b/worlds/factorio/data/mod_template/control.lua
index e486c7433095..40903250461c 100644
--- a/worlds/factorio/data/mod_template/control.lua
+++ b/worlds/factorio/data/mod_template/control.lua
@@ -445,6 +445,10 @@ end
 
 script.on_event(defines.events.on_player_main_inventory_changed, update_player_event)
 
+-- Update players when the cutscene is cancelled or finished.  (needed for skins_factored)
+script.on_event(defines.events.on_cutscene_cancelled, update_player_event)
+script.on_event(defines.events.on_cutscene_finished, update_player_event)
+
 function add_samples(force, name, count)
     local function add_to_table(t)
         if count <= 0 then

From 592792631411765f2e1e67d615abbf09410fca5a Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Fri, 3 Jan 2025 12:03:30 +0000
Subject: [PATCH 211/381] Blasphemous: Fix starting_location: random affecting
 all Blasphemous worlds (#4428)

Option resolution for the `StartingLocation` option (the only
`ChoiceIsRandom` subclass) was writing to the `randomized` attribute on
the class instead of on the instance, meaning that
`self.options.starting_location.randomized` would be `True` for all
Blasphemous players in the multiworld if any one of the players set
their `StartingLocation` option to `"random"`.

This patch fixes the issue by writing to the `randomized` attribute on
the new instance instead of on the class.
---
 worlds/blasphemous/Options.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/worlds/blasphemous/Options.py b/worlds/blasphemous/Options.py
index e0bbcd770758..2cb2d8a1d34d 100644
--- a/worlds/blasphemous/Options.py
+++ b/worlds/blasphemous/Options.py
@@ -4,14 +4,17 @@
 
 
 class ChoiceIsRandom(Choice):
-    randomized: bool = False
+    randomized: bool
+
+    def __init__(self, value: int, randomized: bool = False):
+        super().__init__(value)
+        self.randomized = randomized
 
     @classmethod
     def from_text(cls, text: str) -> Choice:
         text = text.lower()
         if text == "random":
-            cls.randomized = True
-            return cls(random.choice(list(cls.name_lookup)))
+            return cls(random.choice(list(cls.name_lookup)), True)
         for option_name, value in cls.options.items():
             if option_name == text:
                 return cls(value)

From 25381ef2c2bf233362eeb8f18775ac171cafa5b0 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sat, 4 Jan 2025 07:29:30 -0500
Subject: [PATCH 212/381] Core: Make the error for a missing option display the
 player name (#4430)

---
 Generate.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Generate.py b/Generate.py
index 35c39627b139..8a2e72d1ce6a 100644
--- a/Generate.py
+++ b/Generate.py
@@ -500,7 +500,8 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
     for option_key in game_weights:
         if option_key in {"triggers", *valid_keys}:
             continue
-        logging.warning(f"{option_key} is not a valid option name for {ret.game} and is not present in triggers.")
+        logging.warning(f"{option_key} is not a valid option name for {ret.game} and is not present in triggers "
+                        f"for player {ret.name}.")
     if PlandoOptions.items in plando_options:
         ret.plando_items = copy.deepcopy(game_weights.get("plando_items", []))
     if ret.game == "A Link to the Past":

From 1cef659b780f0954ab3c59b0251ce5c66132066f Mon Sep 17 00:00:00 2001
From: Kory Dondzila <korydondzila@gmail.com>
Date: Sat, 4 Jan 2025 07:42:34 -0500
Subject: [PATCH 213/381] Shivers: Fix spelling error in naming (#4425)

---
 worlds/shivers/Items.py    | 22 +++++++++++-----------
 worlds/shivers/__init__.py |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/worlds/shivers/Items.py b/worlds/shivers/Items.py
index a60bad17b8ed..fd31ef426b73 100644
--- a/worlds/shivers/Items.py
+++ b/worlds/shivers/Items.py
@@ -13,7 +13,7 @@ class ItemType(enum.Enum):
     POT = "pot"
     POT_COMPLETE = "pot-complete"
     POT_DUPLICATE = "pot-duplicate"
-    POT_COMPELTE_DUPLICATE = "pot-complete-duplicate"
+    POT_COMPLETE_DUPLICATE = "pot-complete-duplicate"
     KEY = "key"
     KEY_OPTIONAL = "key-optional"
     ABILITY = "ability"
@@ -117,16 +117,16 @@ class ItemData(NamedTuple):
     "Lightning Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
     "Sand Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
     "Metal Pot Top DUPE": ItemData(None, ItemType.POT_DUPLICATE),
-    "Water Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Wax Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Ash Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Oil Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Cloth Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Wood Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Crystal Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Lightning Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Sand Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
-    "Metal Pot Complete DUPE": ItemData(None, ItemType.POT_COMPELTE_DUPLICATE),
+    "Water Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Wax Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Ash Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Oil Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Cloth Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Wood Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Crystal Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Lightning Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Sand Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
+    "Metal Pot Complete DUPE": ItemData(None, ItemType.POT_COMPLETE_DUPLICATE),
 
     # Filler
     "Empty": ItemData(None, ItemType.FILLER, ItemClassification.filler),
diff --git a/worlds/shivers/__init__.py b/worlds/shivers/__init__.py
index 9e0330defea9..5c6203fd5761 100644
--- a/worlds/shivers/__init__.py
+++ b/worlds/shivers/__init__.py
@@ -226,13 +226,13 @@ def pre_fill(self) -> None:
                               data.type == ItemType.POT_DUPLICATE]
         elif self.options.full_pots == "complete":
             storage_items += [self.create_item(name) for name, data in item_table.items() if
-                              data.type == ItemType.POT_COMPELTE_DUPLICATE]
+                              data.type == ItemType.POT_COMPLETE_DUPLICATE]
             storage_items += [self.create_item("Empty") for _ in range(10)]
         else:
             pieces = [self.create_item(name) for name, data in item_table.items() if
                       data.type == ItemType.POT_DUPLICATE]
             complete = [self.create_item(name) for name, data in item_table.items() if
-                        data.type == ItemType.POT_COMPELTE_DUPLICATE]
+                        data.type == ItemType.POT_COMPLETE_DUPLICATE]
             for i in range(10):
                 # Pieces
                 if self.pot_completed_list[i] == 0:

From daf94fcdb28af37e8829dc545f8637503f58ece9 Mon Sep 17 00:00:00 2001
From: coveleski <coveleski@users.noreply.github.com>
Date: Sat, 4 Jan 2025 07:27:41 -0600
Subject: [PATCH 214/381] Pokemon RB: Fixing misnamed locations (#4404)

---
 worlds/pokemon_rb/locations.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py
index 467139c39e94..de9209d1d8ab 100644
--- a/worlds/pokemon_rb/locations.py
+++ b/worlds/pokemon_rb/locations.py
@@ -749,8 +749,8 @@ def __init__(self, flag):
     LocationData("Cinnabar Gym", "Super Nerd 2", None, rom_addresses["Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_2_ITEM"], EventFlag(372), inclusion=trainersanity),
     LocationData("Cinnabar Gym", "Burglar 2", None, rom_addresses["Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_3_ITEM"], EventFlag(371), inclusion=trainersanity),
     LocationData("Cinnabar Gym", "Super Nerd 3", None, rom_addresses["Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_4_ITEM"], EventFlag(370), inclusion=trainersanity),
-    LocationData("Cinnabar Gym", "Super Nerd 4", None, rom_addresses["Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_5_ITEM"], EventFlag(369), inclusion=trainersanity),
-    LocationData("Cinnabar Gym", "Super Nerd 5", None, rom_addresses["Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_6_ITEM"], EventFlag(368), inclusion=trainersanity),
+    LocationData("Cinnabar Gym", "Burglar 3", None, rom_addresses["Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_5_ITEM"], EventFlag(369), inclusion=trainersanity),
+    LocationData("Cinnabar Gym", "Super Nerd 4", None, rom_addresses["Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_6_ITEM"], EventFlag(368), inclusion=trainersanity),
 
     LocationData("Celadon Prize Corner", "Item Prize 1", "TM23 Dragon Rage", rom_addresses["Prize_Item_A"], EventFlag(0x69a), inclusion=prizesanity),
     LocationData("Celadon Prize Corner", "Item Prize 2", "TM15 Hyper Beam", rom_addresses["Prize_Item_B"], EventFlag(0x69B), inclusion=prizesanity),

From aadcb4c90322dba3f93f3af01b43d5444c3d4fc3 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 6 Jan 2025 09:21:44 -0500
Subject: [PATCH 215/381] HK: use rich_text_options_doc to make webhost
 formatting look better (#4079)

---
 worlds/hk/Options.py  | 9 ++++++++-
 worlds/hk/__init__.py | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py
index 0dc38e744e50..d85f300f0d08 100644
--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -213,6 +213,7 @@ class MaximumEssencePrice(MinimumEssencePrice):
 class MinimumEggPrice(Range):
     """The minimum rancid egg price in the range of prices that an item should cost from Jiji.
     Only takes effect if the EggSlotShops option is greater than 0."""
+    rich_text_doc = False
     display_name = "Minimum Egg Price"
     range_start = 1
     range_end = 20
@@ -222,6 +223,7 @@ class MinimumEggPrice(Range):
 class MaximumEggPrice(MinimumEggPrice):
     """The maximum rancid egg price in the range of prices that an item should cost from Jiji.
     Only takes effect if the EggSlotShops option is greater than 0."""
+    rich_text_doc = False
     display_name = "Maximum Egg Price"
     default = 10
 
@@ -265,6 +267,7 @@ class RandomCharmCosts(NamedRange):
     Set to -1 or vanilla for vanilla costs.
     Set to -2 or shuffle to shuffle around the vanilla costs to different charms."""
 
+    rich_text_doc = False
     display_name = "Randomize Charm Notch Costs"
     range_start = 0
     range_end = 240
@@ -437,6 +440,7 @@ class Goal(Choice):
 class GrubHuntGoal(NamedRange):
     """The amount of grubs required to finish Grub Hunt.
     On 'All' any grubs from item links replacements etc. will be counted"""
+    rich_text_doc = False
     display_name = "Grub Hunt Goal"
     range_start = 1
     range_end = 46
@@ -446,7 +450,7 @@ class GrubHuntGoal(NamedRange):
 
 class WhitePalace(Choice):
     """
-    Whether or not to include White Palace or not.  Note: Even if excluded, the King Fragment check may still be
+    Whether or not to include White Palace or not. Note: Even if excluded, the King Fragment check may still be
     required if charms are vanilla.
     """
     display_name = "White Palace"
@@ -483,6 +487,7 @@ class DeathLinkShade(Choice):
     ** Self-death shade behavior is not changed; if a self-death normally creates a shade in vanilla, it will override
         your existing shade, if any.
     """
+    rich_text_doc = False
     option_vanilla = 0
     option_shadeless = 1
     option_shade = 2
@@ -497,6 +502,7 @@ class DeathLinkBreaksFragileCharms(Toggle):
     ** Self-death fragile charm behavior is not changed; if a self-death normally breaks fragile charms in vanilla, it
         will continue to do so.
     """
+    rich_text_doc = False
     display_name = "Deathlink Breaks Fragile Charms"
 
 
@@ -515,6 +521,7 @@ class CostSanity(Choice):
 
     These costs can be in Geo (except Grubfather, Seer and Eggshop), Grubs, Charms, Essence and/or Rancid Eggs
     """
+    rich_text_doc = False
     option_off = 0
     alias_no = 0
     option_on = 1
diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index 81d939dcf1ea..bcd904521db1 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -134,7 +134,9 @@ class DisableMapModSpoilers(Bool):
 
 
 class HKWeb(WebWorld):
-    setup_en  = Tutorial(
+    rich_text_options_doc = True
+
+    setup_en = Tutorial(
         "Mod Setup and Use Guide",
         "A guide to playing Hollow Knight with Archipelago.",
         "English",
@@ -143,7 +145,7 @@ class HKWeb(WebWorld):
         ["Ijwu"]
     )
 
-    setup_pt_br  = Tutorial(
+    setup_pt_br = Tutorial(
         setup_en.tutorial_name,
         setup_en.description,
         "Português Brasileiro",

From 7d506990f57d22766ff07eadd0dce9bceba3abc6 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 6 Jan 2025 09:35:12 -0500
Subject: [PATCH 216/381] HK: add location counts to option descriptions
 (#4083)

---
 worlds/hk/Options.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py
index d85f300f0d08..53dda96e2b53 100644
--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -132,7 +132,13 @@
 for option_name, option_data in pool_options.items():
     extra_data = {"__module__": __name__, "items": option_data[0], "locations": option_data[1]}
     if option_name in option_docstrings:
-        extra_data["__doc__"] = option_docstrings[option_name]
+        if option_name == "RandomizeFocus":
+            # pool options for focus are just lying
+            count = 1
+        else:
+            count = len([loc for loc in option_data[1] if loc != "Start"])
+        extra_data["__doc__"] = option_docstrings[option_name] + \
+            f"\n    This option adds approximately {count} location{'s' if count != 1 else ''}."
     if option_name in default_on:
         option = type(option_name, (DefaultOnToggle,), extra_data)
     else:

From 16f8b41cb94b974a88b3e8d4f8ff552e18d5459b Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 6 Jan 2025 09:35:37 -0500
Subject: [PATCH 217/381] Core: add docstrings for launcher components (#4148)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/LauncherComponents.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index 7f178f1739fc..d1b274c19ae7 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -18,16 +18,42 @@ class Type(Enum):
 
 
 class Component:
+    """
+    A Component represents a process launchable by Archipelago Launcher, either by a User action in the GUI,
+    by resolving an archipelago://user:pass@host:port link from the WebHost, by resolving a patch file's metadata,
+    or by using a component name arg while running the Launcher in CLI i.e. `ArchipelagoLauncher.exe "Text Client"`
+
+    Expected to be appended to LauncherComponents.component list to be used.
+    """
     display_name: str
+    """Used as the GUI button label and the component name in the CLI args"""
     type: Type
+    """
+    Enum "Type" classification of component intent, for filtering in the Launcher GUI
+    If not set in the constructor, it will be inferred by display_name
+    """
     script_name: Optional[str]
+    """Recommended to use func instead; Name of file to run when the component is called"""
     frozen_name: Optional[str]
+    """Recommended to use func instead; Name of the frozen executable file for this component"""
     icon: str  # just the name, no suffix
+    """Lookup ID for the icon path in LauncherComponents.icon_paths"""
     cli: bool
+    """Bool to control if the component gets launched in an appropriate Terminal for the OS"""
     func: Optional[Callable]
+    """
+    Function that gets called when the component gets launched
+    Any arg besides the component name arg is passed into the func as well, so handling *args is suggested
+    """
     file_identifier: Optional[Callable[[str], bool]]
+    """
+    Function that is run against patch file arg to identify which component is appropriate to launch
+    If the function is an Instance of SuffixIdentifier the suffixes will also be valid for the Open Patch component
+    """
     game_name: Optional[str]
+    """Game name to identify component when handling launch links from WebHost"""
     supports_uri: Optional[bool]
+    """Bool to identify if a component supports being launched by launch links from WebHost"""
 
     def __init__(self, display_name: str, script_name: Optional[str] = None, frozen_name: Optional[str] = None,
                  cli: bool = False, icon: str = 'icon', component_type: Optional[Type] = None,

From 7c89a83d19158a3de47692ea311aecce2667bb72 Mon Sep 17 00:00:00 2001
From: eudaimonistic <94811100+eudaimonistic@users.noreply.github.com>
Date: Mon, 6 Jan 2025 09:42:18 -0500
Subject: [PATCH 218/381] Docs: Clarify !alias commands in commands_en.md
 (#4426)

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
---
 worlds/generic/docs/commands_en.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/worlds/generic/docs/commands_en.md b/worlds/generic/docs/commands_en.md
index 317f724109e1..3848bb4c507c 100644
--- a/worlds/generic/docs/commands_en.md
+++ b/worlds/generic/docs/commands_en.md
@@ -27,6 +27,7 @@ including the exclamation point.
 - `!countdown <number of seconds>` Starts a countdown using the given seconds value. Useful for synchronizing starts.
   Defaults to 10 seconds if no argument is provided.
 - `!alias <alias>` Sets your alias, which allows you to use commands with the alias rather than your provided name.
+  `!alias` on its own will reset the alias to the player's original name.
 - `!admin <command>` Executes a command as if you typed it into the server console. Remote administration must be
   enabled.
 
@@ -65,6 +66,7 @@ including the exclamation point.
   argument is provided.
 - `/option <option name> <option value>` Set a server option. For a list of options, use the `/options` command.
 - `/alias <player name> <alias name>` Assign a player an alias, allowing you to reference the player by the alias in commands.
+  `!alias <player name>` on its own will reset the alias to the player's original name.
 
 
 ### Collect/Release

From 2d3faea713ca32f6c739f047c0a13505f9cd1d2f Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Mon, 6 Jan 2025 09:52:33 -0500
Subject: [PATCH 219/381] Core: Include unfilled locations in error when there
 are not enough locations for progression items (#4285)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 Fill.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Fill.py b/Fill.py
index 5bbbfa79c28f..a040794fd1c6 100644
--- a/Fill.py
+++ b/Fill.py
@@ -531,7 +531,8 @@ def mark_for_locking(location: Location):
         if progitempool:
             raise FillError(
                 f"Not enough locations for progression items. "
-                f"There are {len(progitempool)} more progression items than there are available locations.",
+                f"There are {len(progitempool)} more progression items than there are available locations.\n"
+                f"Unfilled locations:\n{multiworld.get_unfilled_locations()}.",
                 multiworld=multiworld,
             )
         accessibility_corrections(multiworld, multiworld.state, defaultlocations)

From 07e896508c512bc1264088e3b5707c8b10c0ee30 Mon Sep 17 00:00:00 2001
From: shananas <47014056+shananas@users.noreply.github.com>
Date: Mon, 6 Jan 2025 14:02:04 -0500
Subject: [PATCH 220/381] KH2: Doc Updates (#4434)

---
 worlds/kh2/docs/setup_en.md | 56 ++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/worlds/kh2/docs/setup_en.md b/worlds/kh2/docs/setup_en.md
index 9fe9b23a1350..cb80ec609887 100644
--- a/worlds/kh2/docs/setup_en.md
+++ b/worlds/kh2/docs/setup_en.md
@@ -7,18 +7,21 @@
 
 <h2 style="text-transform:none";>Required Software:</h2>
 
-`Kingdom Hearts II Final Mix` from the [Epic Games Store](https://store.epicgames.com/en-US/discover/kingdom-hearts) or [Steam](https://store.steampowered.com/app/2552430/KINGDOM_HEARTS_HD_1525_ReMIX/)
+Kingdom Hearts II Final Mix from the [Epic Games Store](https://store.epicgames.com/en-US/discover/kingdom-hearts) or [Steam](https://store.steampowered.com/app/2552430/KINGDOM_HEARTS_HD_1525_ReMIX/)
 
 - Follow this Guide to set up these requirements [KH2Rando.com](https://tommadness.github.io/KH2Randomizer/setup/Panacea-ModLoader/)
-    1. `Version 3.3.0 or greater OpenKH Mod Manager with Panacea`
-    2. `Lua Backend from the OpenKH Mod Manager`
-    3. `Install the mod KH2FM-Mods-Num/GoA-ROM-Edition using OpenKH Mod Manager`
+    1. Version 3.4.0 or greater OpenKH Mod Manager with Panacea
+    2. Lua Backend from the OpenKH Mod Manager
+    3. Install the mod `KH2FM-Mods-Num/GoA-ROM-Edition` using OpenKH Mod Manager
 - Needed for Archipelago 
-    1. [`ArchipelagoKH2Client.exe`](https://github.com/ArchipelagoMW/Archipelago/releases)
-    2. `Install the Archipelago Companion mod from JaredWeakStrike/APCompanion using OpenKH Mod Manager`
-    3. `Install the Archipelago Quality Of Life mod from JaredWeakStrike/AP_QOL using OpenKH Mod Manager`
-    4. `Install the mod from KH2FM-Mods-equations19/auto-save using OpenKH Mod Manager`
-    5. `AP Randomizer Seed`
+    1. [ArchipelagoKH2Client.exe](https://github.com/ArchipelagoMW/Archipelago/releases)
+    2. Install the Archipelago Companion mod from `JaredWeakStrike/APCompanion` using OpenKH Mod Manager
+    3. Install the mod from `KH2FM-Mods-equations19/auto-save` using OpenKH Mod Manager
+    4. Install the mod from `KH2FM-Mods-equations19/KH2-Lua-Library` using OpenKH Mod Manager
+    5. AP Randomizer Seed
+- Optional Quality of Life Mods for Archipelago
+    1. Optionally Install the Archipelago Quality Of Life mod from `JaredWeakStrike/AP_QOL` using OpenKH Mod Manager
+    2. Optionally Install the Quality Of Life mod from `shananas/BearSkip` using OpenKH Mod Manager
 
 <h3 style="text-transform:none";>Required: Archipelago Companion Mod</h3>
 
@@ -26,15 +29,21 @@ Load this mod just like the <b>GoA ROM</b> you did during the KH2 Rando setup. `
 Have this mod second-highest priority below the .zip seed.<br>
 This mod is based upon Num's Garden of Assemblege Mod and requires it to work. Without Num this could not be possible. 
 
-<h3 style="text-transform:none";>Required: Auto Save Mod</h3>
+<h3 style="text-transform:none";>Required: Auto Save Mod and KH2 Lua Library</h3>
 
-Load this mod just like the GoA ROM you did during the KH2 Rando setup. `KH2FM-Mods-equations19/auto-save` Location doesn't matter, required in case of crashes. See [Best Practices](en#best-practices) on how to load the auto save
+Load these mods just like you loaded the GoA ROM mod during the KH2 Rando setup. `KH2FM-Mods-equations19/auto-save` and `KH2FM-Mods-equations19/KH2-Lua-Library` Location doesn't matter, required in case of crashes. See [Best Practices](en#best-practices) on how to load the auto save
+
+<h3 style="text-transform:none";>Optional QoL Mods: AP QoL and Bear Skip</h3>
+
+`JaredWeakStrike/AP_QOL` Makes the urns minigames much faster, makes Cavern of Remembrance orbs drop significantly more drive orbs for refilling drive/leveling master form, skips the animation when using the bulky vendor RC, skips carpet escape auto scroller in Agrabah 2, and prevents the wardrobe in the Beasts Castle wardrobe push minigame from waking up while being pushed.
+
+`shananas/BearSkip` Skips all minigames in 100 Acre Woods except the Spooky Cave minigame since there are chests in Spooky Cave you can only get during the minigame. For Spooky Cave, Pooh is moved to the other side of the invisible wall that prevents you from using his RC to finish the minigame.
 
 <h3 style="text-transform:none";>Installing A Seed</h3>
 
-When you generate a game you will see a download link for a KH2 .zip seed on the room page. Download the seed then open OpenKH Mod Manager and click the green plus and `Select and install Mod Archive`.<br>
+When you generate a game you will see a download link for a KH2 .zip seed on the room page. Download the seed then open OpenKH Mod Manager and click the green plus and "Select and install Mod Archive".<br>
 Make sure the seed is on the top of the list (Highest Priority)<br>
-After Installing the seed click `Mod Loader -> Build/Build and Run`. Every slot is a unique mod to install and will be needed be repatched for different slots/rooms.
+After Installing the seed click "Mod Loader -> Build/Build and Run". Every slot is a unique mod to install and will be needed be repatched for different slots/rooms.
 
 <h2 style="text-transform:none";>Optional Software:</h2>
 
@@ -48,18 +57,21 @@ After Installing the seed click `Mod Loader -> Build/Build and Run`. Every slot
 
 <h2 style="text-transform:none";>Using the KH2 Client</h2>
 
-Once you have started the game through OpenKH Mod Manager and are on the title screen run the [ArchipelagoKH2Client.exe](https://github.com/ArchipelagoMW/Archipelago/releases).<br>
+Start the game through OpenKH Mod Manager. If starting a new run, enter the Garden of Assemblage from a new save. If returning to a run, load the save and enter the Garden of Assemblage. Then run the [ArchipelagoKH2Client.exe](https://github.com/ArchipelagoMW/Archipelago/releases).<br>
 When you successfully connect to the server the client will automatically hook into the game to send/receive checks. <br>
 If the client ever loses connection to the game, it will also disconnect from the server and you will need to reconnect.<br> 
-`Make sure the game is open whenever you try to connect the client to the server otherwise it will immediately disconnect you.`<br>
+
+Make sure the game is open whenever you try to connect the client to the server otherwise it will immediately disconnect you.<br>
+
 Most checks will be sent to you anywhere outside a load or cutscene.<br>
-`If you obtain magic, you will need to pause your game to have it show up in your inventory, then enter a new room for it to become properly usable.`
+
+If you obtain magic, you will need to pause your game to have it show up in your inventory, then enter a new room for it to become properly usable.
 
 <h2 style="text-transform:none";>KH2 Client should look like this: </h2>
 
 ![image](https://i.imgur.com/qP6CmV8.png)
 
-Enter `The room's port number` into the top box <b> where the x's are</b> and press "Connect". Follow the prompts there and you should be connected
+Enter The room's port number into the top box <b> where the x's are</b> and press "Connect". Follow the prompts there and you should be connected
 
 <h2 style="text-transform:none";>Common Pitfalls</h2>
 
@@ -102,7 +114,7 @@ This pack will handle logic, received items, checked locations and autotabbing f
 - Why is my Client giving me a "Cannot Open Process: " error?
     - Due to how the client reads kingdom hearts 2 memory some people's computer flags it as a virus. Run the client as admin.
 - Why is my HP/MP continuously increasing without stopping?
-    - You do not have `JaredWeakStrike/APCompanion` set up correctly. Make sure it is above the `GoA ROM Mod` in the mod manager.
+    - You do not have `JaredWeakStrike/APCompanion` set up correctly. Make sure it is above the GoA ROM Edition Mod in the mod manager.
 - Why is my HP/MP continuously increasing without stopping when I have the APCompanion Mod?
     - You have a leftover GOA lua script in your `Documents\KINGDOM HEARTS HD 1.5+2.5 ReMIX\scripts\KH2`.
 - Why am I missing worlds/portals in the GoA?
@@ -110,9 +122,9 @@ This pack will handle logic, received items, checked locations and autotabbing f
 - Why did I not load into the correct visit?
     - You need to trigger a cutscene or visit The World That Never Was for it to register that you have received the item.
 - What versions of Kingdom Hearts 2 are supported?
-    - Currently the `only` supported versions are `Epic Games Version 1.0.0.9_WW` and `Steam Build Version 14716933`.
+    - Currently the only supported versions are Epic Games Version 1.0.0.10_WW and Steam Build Version 15194255.
 - Why am I getting wallpapered while going into a world for the first time?
-    - Your `Lua Backend` was not configured correctly. Look over the step in the [KH2Rando.com](https://tommadness.github.io/KH2Randomizer/setup/Panacea-ModLoader/) guide.
+    - Your Lua Backend was not configured correctly. Look over the step in the [KH2Rando.com](https://tommadness.github.io/KH2Randomizer/setup/Panacea-ModLoader/) guide.
 - Why am I not getting magic?
     - If you obtain magic, you will need to pause your game to have it show up in your inventory, then enter a new room for it to become properly usable.
 - Why did I crash after picking my dream weapon?
@@ -124,7 +136,7 @@ This pack will handle logic, received items, checked locations and autotabbing f
     - You will need to get the `JaredWeakStrike/APCompanion` (you can find how to get this if you scroll up)
 - Why am I not sending or receiving items?
     - Make sure you are connected to the KH2 client and the correct room (for more information scroll up)
-- Why should I install the auto save mod at `KH2FM-Mods-equations19/auto-save`?
-    - Because Kingdom Hearts 2 is prone to crashes and will keep you from losing your progress.
+- Why should I install the auto save mod at `KH2FM-Mods-equations19/auto-save` and `KH2FM-Mods-equations19/KH2-Lua-Library`?
+    - Because Kingdom Hearts 2 is prone to crashes and will keep you from losing your progress. Both mods are needed for auto save to work.
 - How do I load an auto save?
     - To load an auto-save, hold down the Select or your equivalent on your prefered controller while choosing a file. Make sure to hold the button down the whole time.

From 3204680662282c62276f2be006e96f3384ee7ae0 Mon Sep 17 00:00:00 2001
From: TheLX5 <luisyuregi@gmail.com>
Date: Mon, 6 Jan 2025 16:10:23 -0700
Subject: [PATCH 221/381] SNIClient: Let clients based on SNIClient monitor
 packages via on_package method (#3093)

---
 SNIClient.py            | 3 +++
 worlds/AutoSNIClient.py | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/SNIClient.py b/SNIClient.py
index 19440e1dc5be..9140c73c14e2 100644
--- a/SNIClient.py
+++ b/SNIClient.py
@@ -243,6 +243,9 @@ def on_package(self, cmd: str, args: typing.Dict[str, typing.Any]) -> None:
                 # Once the games handled by SNIClient gets made to be remote items,
                 # this will no longer be needed.
                 async_start(self.send_msgs([{"cmd": "LocationScouts", "locations": list(new_locations)}]))
+                
+        if self.client_handler is not None:
+            self.client_handler.on_package(self, cmd, args)
 
     def run_gui(self) -> None:
         from kvui import GameManager
diff --git a/worlds/AutoSNIClient.py b/worlds/AutoSNIClient.py
index f9444eee73c6..28515d90c416 100644
--- a/worlds/AutoSNIClient.py
+++ b/worlds/AutoSNIClient.py
@@ -86,3 +86,7 @@ async def game_watcher(self, ctx: SNIContext) -> None:
     async def deathlink_kill_player(self, ctx: SNIContext) -> None:
         """ override this with implementation to kill player """
         pass
+
+    def on_package(self, ctx: SNIContext, cmd: str, args: Dict[str, Any]) -> None:
+        """ override this with code to handle packages from the server """
+        pass

From de58cb03da9f3e7c67f5642c427175839234240b Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Tue, 7 Jan 2025 16:24:19 -0500
Subject: [PATCH 222/381] Core: Pickle hints by value (#4441)

---
 NetUtils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NetUtils.py b/NetUtils.py
index 64a778c55ce8..d58bbe81e304 100644
--- a/NetUtils.py
+++ b/NetUtils.py
@@ -10,7 +10,7 @@
 from Utils import ByValue, Version
 
 
-class HintStatus(enum.IntEnum):
+class HintStatus(ByValue, enum.IntEnum):
     HINT_FOUND = 0
     HINT_UNSPECIFIED = 1
     HINT_NO_PRIORITY = 10

From fe06fe075e8906282086c7e38d2cd4c04aef4d95 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Tue, 7 Jan 2025 23:06:48 +0100
Subject: [PATCH 223/381] Factorio: add fluid mining technology to logic
 requirements (#4385)

---
 worlds/factorio/Technologies.py | 24 ++++++++++++++++++------
 worlds/factorio/data/techs.json |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/worlds/factorio/Technologies.py b/worlds/factorio/Technologies.py
index 6111462e8ca9..192cd1fefb82 100644
--- a/worlds/factorio/Technologies.py
+++ b/worlds/factorio/Technologies.py
@@ -63,17 +63,19 @@ def __hash__(self):
 
 
 class Technology(FactorioElement):  # maybe make subclass of Location?
-    has_modifier: bool
     factorio_id: int
     progressive: Tuple[str]
     unlocks: Union[Set[str], bool]  # bool case is for progressive technologies
+    modifiers: list[str]
 
     def __init__(self, technology_name: str, factorio_id: int, progressive: Tuple[str] = (),
-                 has_modifier: bool = False, unlocks: Union[Set[str], bool] = None):
+                 modifiers: list[str] = None, unlocks: Union[Set[str], bool] = None):
         self.name = technology_name
         self.factorio_id = factorio_id
         self.progressive = progressive
-        self.has_modifier = has_modifier
+        if modifiers is None:
+            modifiers = []
+        self.modifiers =  modifiers
         if unlocks:
             self.unlocks = unlocks
         else:
@@ -82,6 +84,10 @@ def __init__(self, technology_name: str, factorio_id: int, progressive: Tuple[st
     def __hash__(self):
         return self.factorio_id
 
+    @property
+    def has_modifier(self) -> bool:
+        return bool(self.modifiers)
+
     def get_custom(self, world, allowed_packs: Set[str], player: int) -> CustomTechnology:
         return CustomTechnology(self, world, allowed_packs, player)
 
@@ -191,13 +197,14 @@ def __init__(self, name, categories):
 
 
 recipe_sources: Dict[str, Set[str]] = {}  # recipe_name -> technology source
+mining_with_fluid_sources: set[str] = set()
 
 # recipes and technologies can share names in Factorio
 for technology_name, data in sorted(techs_future.result().items()):
     technology = Technology(
         technology_name,
         factorio_tech_id,
-        has_modifier=data["has_modifier"],
+        modifiers=data.get("modifiers", []),
         unlocks=set(data["unlocks"]) - start_unlocked_recipes,
     )
     factorio_tech_id += 1
@@ -205,7 +212,8 @@ def __init__(self, name, categories):
     technology_table[technology_name] = technology
     for recipe_name in technology.unlocks:
         recipe_sources.setdefault(recipe_name, set()).add(technology_name)
-
+    if "mining-with-fluid" in technology.modifiers:
+        mining_with_fluid_sources.add(technology_name)
 del techs_future
 
 recipes = {}
@@ -221,6 +229,8 @@ def __init__(self, name, categories):
         "energy": resource_data["mining_time"],
         "category": resource_data["category"]
     }
+    if "required_fluid" in resource_data:
+        recipe_sources.setdefault(f"mining-{resource_name}", set()).update(mining_with_fluid_sources)
 del resources_future
 
 for recipe_name, recipe_data in raw_recipes.items():
@@ -431,7 +441,9 @@ def get_rocket_requirements(silo_recipe: Optional[Recipe], part_recipe: Recipe,
     factorio_tech_id += 1
     progressive_technology = Technology(root, factorio_tech_id,
                                         tuple(progressive),
-                                        has_modifier=any(technology_table[tech].has_modifier for tech in progressive),
+                                        modifiers=sorted(set.union(
+                                            *(set(technology_table[tech].modifiers) for tech in progressive)
+                                        )),
                                         unlocks=any(technology_table[tech].unlocks for tech in progressive),)
     progressive_tech_table[root] = progressive_technology.factorio_id
     progressive_technology_table[root] = progressive_technology
diff --git a/worlds/factorio/data/techs.json b/worlds/factorio/data/techs.json
index ecb31126e1dc..ced2b631d6c0 100644
--- a/worlds/factorio/data/techs.json
+++ b/worlds/factorio/data/techs.json
@@ -1 +1 @@
-{"advanced-circuit":{"unlocks":["advanced-circuit"],"requires":["plastics"],"has_modifier":false},"advanced-combinators":{"unlocks":["selector-combinator"],"requires":["circuit-network","chemical-science-pack"],"has_modifier":false},"advanced-material-processing":{"unlocks":["steel-furnace"],"requires":["steel-processing","logistic-science-pack"],"has_modifier":false},"advanced-material-processing-2":{"unlocks":["electric-furnace"],"requires":["advanced-material-processing","chemical-science-pack"],"has_modifier":false},"advanced-oil-processing":{"unlocks":["advanced-oil-processing","heavy-oil-cracking","light-oil-cracking","solid-fuel-from-heavy-oil","solid-fuel-from-light-oil"],"requires":["chemical-science-pack"],"has_modifier":false},"artillery":{"unlocks":["artillery-wagon","artillery-turret","artillery-shell"],"requires":["military-4","tank","concrete","radar"],"has_modifier":false},"atomic-bomb":{"unlocks":["atomic-bomb"],"requires":["military-4","kovarex-enrichment-process","rocketry"],"has_modifier":false},"automated-rail-transportation":{"unlocks":["train-stop","rail-signal","rail-chain-signal"],"requires":["railway"],"has_modifier":false},"automation":{"unlocks":["assembling-machine-1","long-handed-inserter"],"requires":["automation-science-pack"],"has_modifier":false},"automation-2":{"unlocks":["assembling-machine-2"],"requires":["automation","steel-processing","logistic-science-pack"],"has_modifier":false},"automation-3":{"unlocks":["assembling-machine-3"],"requires":["speed-module","production-science-pack","electric-engine"],"has_modifier":false},"automation-science-pack":{"unlocks":["automation-science-pack"],"requires":["steam-power","electronics"],"has_modifier":false},"automobilism":{"unlocks":["car"],"requires":["logistics-2","engine"],"has_modifier":false},"battery":{"unlocks":["battery"],"requires":["sulfur-processing"],"has_modifier":false},"battery-equipment":{"unlocks":["battery-equipment"],"requires":["battery","solar-panel-equipment"],"has_modifier":false},"battery-mk2-equipment":{"unlocks":["battery-mk2-equipment"],"requires":["battery-equipment","low-density-structure","power-armor"],"has_modifier":false},"belt-immunity-equipment":{"unlocks":["belt-immunity-equipment"],"requires":["solar-panel-equipment"],"has_modifier":false},"braking-force-1":{"unlocks":{},"requires":["railway","chemical-science-pack"],"has_modifier":true},"braking-force-2":{"unlocks":{},"requires":["braking-force-1"],"has_modifier":true},"braking-force-3":{"unlocks":{},"requires":["braking-force-2","production-science-pack"],"has_modifier":true},"braking-force-4":{"unlocks":{},"requires":["braking-force-3"],"has_modifier":true},"braking-force-5":{"unlocks":{},"requires":["braking-force-4"],"has_modifier":true},"braking-force-6":{"unlocks":{},"requires":["braking-force-5","utility-science-pack"],"has_modifier":true},"braking-force-7":{"unlocks":{},"requires":["braking-force-6"],"has_modifier":true},"bulk-inserter":{"unlocks":["bulk-inserter"],"requires":["fast-inserter","logistics-2","advanced-circuit"],"has_modifier":true},"chemical-science-pack":{"unlocks":["chemical-science-pack"],"requires":["advanced-circuit","sulfur-processing"],"has_modifier":false},"circuit-network":{"unlocks":["arithmetic-combinator","decider-combinator","constant-combinator","power-switch","programmable-speaker","display-panel","iron-stick"],"requires":["logistic-science-pack"],"has_modifier":true},"cliff-explosives":{"unlocks":["cliff-explosives"],"requires":["explosives","military-2"],"has_modifier":true},"coal-liquefaction":{"unlocks":["coal-liquefaction"],"requires":["advanced-oil-processing","production-science-pack"],"has_modifier":false},"concrete":{"unlocks":["concrete","hazard-concrete","refined-concrete","refined-hazard-concrete","iron-stick"],"requires":["advanced-material-processing","automation-2"],"has_modifier":false},"construction-robotics":{"unlocks":["roboport","passive-provider-chest","storage-chest","construction-robot"],"requires":["robotics"],"has_modifier":true},"defender":{"unlocks":["defender-capsule"],"requires":["military-science-pack"],"has_modifier":true},"destroyer":{"unlocks":["destroyer-capsule"],"requires":["military-4","distractor","speed-module"],"has_modifier":false},"discharge-defense-equipment":{"unlocks":["discharge-defense-equipment"],"requires":["laser-turret","military-3","power-armor","solar-panel-equipment"],"has_modifier":false},"distractor":{"unlocks":["distractor-capsule"],"requires":["defender","military-3","laser"],"has_modifier":false},"effect-transmission":{"unlocks":["beacon"],"requires":["processing-unit","production-science-pack"],"has_modifier":false},"efficiency-module":{"unlocks":["efficiency-module"],"requires":["modules"],"has_modifier":false},"efficiency-module-2":{"unlocks":["efficiency-module-2"],"requires":["efficiency-module","processing-unit"],"has_modifier":false},"efficiency-module-3":{"unlocks":["efficiency-module-3"],"requires":["efficiency-module-2","production-science-pack"],"has_modifier":false},"electric-energy-accumulators":{"unlocks":["accumulator"],"requires":["electric-energy-distribution-1","battery"],"has_modifier":false},"electric-energy-distribution-1":{"unlocks":["medium-electric-pole","big-electric-pole","iron-stick"],"requires":["steel-processing","logistic-science-pack"],"has_modifier":false},"electric-energy-distribution-2":{"unlocks":["substation"],"requires":["electric-energy-distribution-1","chemical-science-pack"],"has_modifier":false},"electric-engine":{"unlocks":["electric-engine-unit"],"requires":["lubricant"],"has_modifier":false},"electric-mining-drill":{"unlocks":["electric-mining-drill"],"requires":["automation-science-pack"],"has_modifier":false},"electronics":{"unlocks":["copper-cable","electronic-circuit","lab","inserter","small-electric-pole"],"requires":{},"has_modifier":false},"energy-shield-equipment":{"unlocks":["energy-shield-equipment"],"requires":["solar-panel-equipment","military-science-pack"],"has_modifier":false},"energy-shield-mk2-equipment":{"unlocks":["energy-shield-mk2-equipment"],"requires":["energy-shield-equipment","military-3","low-density-structure","power-armor"],"has_modifier":false},"engine":{"unlocks":["engine-unit"],"requires":["steel-processing","logistic-science-pack"],"has_modifier":false},"exoskeleton-equipment":{"unlocks":["exoskeleton-equipment"],"requires":["processing-unit","electric-engine","solar-panel-equipment"],"has_modifier":false},"explosive-rocketry":{"unlocks":["explosive-rocket"],"requires":["rocketry","military-3"],"has_modifier":false},"explosives":{"unlocks":["explosives"],"requires":["sulfur-processing"],"has_modifier":false},"fast-inserter":{"unlocks":["fast-inserter"],"requires":["automation-science-pack"],"has_modifier":false},"fission-reactor-equipment":{"unlocks":["fission-reactor-equipment"],"requires":["utility-science-pack","power-armor","military-science-pack","nuclear-power"],"has_modifier":false},"flamethrower":{"unlocks":["flamethrower","flamethrower-ammo","flamethrower-turret"],"requires":["flammables","military-science-pack"],"has_modifier":false},"flammables":{"unlocks":{},"requires":["oil-processing"],"has_modifier":false},"fluid-handling":{"unlocks":["storage-tank","pump","barrel","water-barrel","empty-water-barrel","sulfuric-acid-barrel","empty-sulfuric-acid-barrel","crude-oil-barrel","empty-crude-oil-barrel","heavy-oil-barrel","empty-heavy-oil-barrel","light-oil-barrel","empty-light-oil-barrel","petroleum-gas-barrel","empty-petroleum-gas-barrel","lubricant-barrel","empty-lubricant-barrel"],"requires":["automation-2","engine"],"has_modifier":false},"fluid-wagon":{"unlocks":["fluid-wagon"],"requires":["railway","fluid-handling"],"has_modifier":false},"follower-robot-count-1":{"unlocks":{},"requires":["defender"],"has_modifier":true},"follower-robot-count-2":{"unlocks":{},"requires":["follower-robot-count-1"],"has_modifier":true},"follower-robot-count-3":{"unlocks":{},"requires":["follower-robot-count-2","chemical-science-pack"],"has_modifier":true},"follower-robot-count-4":{"unlocks":{},"requires":["follower-robot-count-3","destroyer"],"has_modifier":true},"gate":{"unlocks":["gate"],"requires":["stone-wall","military-2"],"has_modifier":false},"gun-turret":{"unlocks":["gun-turret"],"requires":["automation-science-pack"],"has_modifier":false},"heavy-armor":{"unlocks":["heavy-armor"],"requires":["military","steel-processing"],"has_modifier":false},"inserter-capacity-bonus-1":{"unlocks":{},"requires":["bulk-inserter"],"has_modifier":true},"inserter-capacity-bonus-2":{"unlocks":{},"requires":["inserter-capacity-bonus-1"],"has_modifier":true},"inserter-capacity-bonus-3":{"unlocks":{},"requires":["inserter-capacity-bonus-2","chemical-science-pack"],"has_modifier":true},"inserter-capacity-bonus-4":{"unlocks":{},"requires":["inserter-capacity-bonus-3","production-science-pack"],"has_modifier":true},"inserter-capacity-bonus-5":{"unlocks":{},"requires":["inserter-capacity-bonus-4"],"has_modifier":true},"inserter-capacity-bonus-6":{"unlocks":{},"requires":["inserter-capacity-bonus-5"],"has_modifier":true},"inserter-capacity-bonus-7":{"unlocks":{},"requires":["inserter-capacity-bonus-6","utility-science-pack"],"has_modifier":true},"kovarex-enrichment-process":{"unlocks":["kovarex-enrichment-process","nuclear-fuel"],"requires":["production-science-pack","uranium-processing","rocket-fuel"],"has_modifier":false},"lamp":{"unlocks":["small-lamp"],"requires":["automation-science-pack"],"has_modifier":false},"land-mine":{"unlocks":["land-mine"],"requires":["explosives","military-science-pack"],"has_modifier":false},"landfill":{"unlocks":["landfill"],"requires":["logistic-science-pack"],"has_modifier":false},"laser":{"unlocks":{},"requires":["battery","chemical-science-pack"],"has_modifier":false},"laser-shooting-speed-1":{"unlocks":{},"requires":["laser","military-science-pack"],"has_modifier":true},"laser-shooting-speed-2":{"unlocks":{},"requires":["laser-shooting-speed-1"],"has_modifier":true},"laser-shooting-speed-3":{"unlocks":{},"requires":["laser-shooting-speed-2"],"has_modifier":true},"laser-shooting-speed-4":{"unlocks":{},"requires":["laser-shooting-speed-3"],"has_modifier":true},"laser-shooting-speed-5":{"unlocks":{},"requires":["laser-shooting-speed-4","utility-science-pack"],"has_modifier":true},"laser-shooting-speed-6":{"unlocks":{},"requires":["laser-shooting-speed-5"],"has_modifier":true},"laser-shooting-speed-7":{"unlocks":{},"requires":["laser-shooting-speed-6"],"has_modifier":true},"laser-turret":{"unlocks":["laser-turret"],"requires":["laser","military-science-pack"],"has_modifier":false},"laser-weapons-damage-1":{"unlocks":{},"requires":["laser","military-science-pack"],"has_modifier":true},"laser-weapons-damage-2":{"unlocks":{},"requires":["laser-weapons-damage-1"],"has_modifier":true},"laser-weapons-damage-3":{"unlocks":{},"requires":["laser-weapons-damage-2"],"has_modifier":true},"laser-weapons-damage-4":{"unlocks":{},"requires":["laser-weapons-damage-3"],"has_modifier":true},"laser-weapons-damage-5":{"unlocks":{},"requires":["laser-weapons-damage-4","utility-science-pack"],"has_modifier":true},"laser-weapons-damage-6":{"unlocks":{},"requires":["laser-weapons-damage-5"],"has_modifier":true},"logistic-robotics":{"unlocks":["roboport","passive-provider-chest","storage-chest","logistic-robot"],"requires":["robotics"],"has_modifier":true},"logistic-science-pack":{"unlocks":["logistic-science-pack"],"requires":["automation-science-pack"],"has_modifier":false},"logistic-system":{"unlocks":["active-provider-chest","requester-chest","buffer-chest"],"requires":["utility-science-pack","logistic-robotics"],"has_modifier":true},"logistics":{"unlocks":["underground-belt","splitter"],"requires":["automation-science-pack"],"has_modifier":false},"logistics-2":{"unlocks":["fast-transport-belt","fast-underground-belt","fast-splitter"],"requires":["logistics","logistic-science-pack"],"has_modifier":false},"logistics-3":{"unlocks":["express-transport-belt","express-underground-belt","express-splitter"],"requires":["production-science-pack","lubricant"],"has_modifier":false},"low-density-structure":{"unlocks":["low-density-structure"],"requires":["advanced-material-processing","chemical-science-pack"],"has_modifier":false},"lubricant":{"unlocks":["lubricant"],"requires":["advanced-oil-processing"],"has_modifier":false},"military":{"unlocks":["submachine-gun","shotgun","shotgun-shell"],"requires":["automation-science-pack"],"has_modifier":false},"military-2":{"unlocks":["piercing-rounds-magazine","grenade"],"requires":["military","steel-processing","logistic-science-pack"],"has_modifier":false},"military-3":{"unlocks":["poison-capsule","slowdown-capsule","combat-shotgun"],"requires":["chemical-science-pack","military-science-pack"],"has_modifier":false},"military-4":{"unlocks":["piercing-shotgun-shell","cluster-grenade"],"requires":["military-3","utility-science-pack","explosives"],"has_modifier":false},"military-science-pack":{"unlocks":["military-science-pack"],"requires":["military-2","stone-wall"],"has_modifier":false},"mining-productivity-1":{"unlocks":{},"requires":["advanced-circuit"],"has_modifier":true},"mining-productivity-2":{"unlocks":{},"requires":["mining-productivity-1","chemical-science-pack"],"has_modifier":true},"mining-productivity-3":{"unlocks":{},"requires":["mining-productivity-2","production-science-pack","utility-science-pack"],"has_modifier":true},"modular-armor":{"unlocks":["modular-armor"],"requires":["heavy-armor","advanced-circuit"],"has_modifier":false},"modules":{"unlocks":{},"requires":["advanced-circuit"],"has_modifier":false},"night-vision-equipment":{"unlocks":["night-vision-equipment"],"requires":["solar-panel-equipment"],"has_modifier":false},"nuclear-fuel-reprocessing":{"unlocks":["nuclear-fuel-reprocessing"],"requires":["nuclear-power","production-science-pack"],"has_modifier":false},"nuclear-power":{"unlocks":["nuclear-reactor","heat-exchanger","heat-pipe","steam-turbine","uranium-fuel-cell"],"requires":["uranium-processing"],"has_modifier":false},"oil-gathering":{"unlocks":["pumpjack"],"requires":["fluid-handling"],"has_modifier":false},"oil-processing":{"unlocks":["oil-refinery","chemical-plant","basic-oil-processing","solid-fuel-from-petroleum-gas"],"requires":["oil-gathering"],"has_modifier":false},"personal-laser-defense-equipment":{"unlocks":["personal-laser-defense-equipment"],"requires":["laser-turret","military-3","low-density-structure","power-armor","solar-panel-equipment"],"has_modifier":false},"personal-roboport-equipment":{"unlocks":["personal-roboport-equipment"],"requires":["construction-robotics","solar-panel-equipment"],"has_modifier":false},"personal-roboport-mk2-equipment":{"unlocks":["personal-roboport-mk2-equipment"],"requires":["personal-roboport-equipment","utility-science-pack"],"has_modifier":false},"physical-projectile-damage-1":{"unlocks":{},"requires":["military"],"has_modifier":true},"physical-projectile-damage-2":{"unlocks":{},"requires":["physical-projectile-damage-1","logistic-science-pack"],"has_modifier":true},"physical-projectile-damage-3":{"unlocks":{},"requires":["physical-projectile-damage-2","military-science-pack"],"has_modifier":true},"physical-projectile-damage-4":{"unlocks":{},"requires":["physical-projectile-damage-3"],"has_modifier":true},"physical-projectile-damage-5":{"unlocks":{},"requires":["physical-projectile-damage-4","chemical-science-pack"],"has_modifier":true},"physical-projectile-damage-6":{"unlocks":{},"requires":["physical-projectile-damage-5","utility-science-pack"],"has_modifier":true},"plastics":{"unlocks":["plastic-bar"],"requires":["oil-processing"],"has_modifier":false},"power-armor":{"unlocks":["power-armor"],"requires":["modular-armor","electric-engine","processing-unit"],"has_modifier":false},"power-armor-mk2":{"unlocks":["power-armor-mk2"],"requires":["power-armor","military-4","speed-module-2","efficiency-module-2"],"has_modifier":false},"processing-unit":{"unlocks":["processing-unit"],"requires":["chemical-science-pack"],"has_modifier":false},"production-science-pack":{"unlocks":["production-science-pack"],"requires":["productivity-module","advanced-material-processing-2","railway"],"has_modifier":false},"productivity-module":{"unlocks":["productivity-module"],"requires":["modules"],"has_modifier":false},"productivity-module-2":{"unlocks":["productivity-module-2"],"requires":["productivity-module","processing-unit"],"has_modifier":false},"productivity-module-3":{"unlocks":["productivity-module-3"],"requires":["productivity-module-2","production-science-pack"],"has_modifier":false},"radar":{"unlocks":["radar"],"requires":["automation-science-pack"],"has_modifier":false},"railway":{"unlocks":["rail","locomotive","cargo-wagon","iron-stick"],"requires":["logistics-2","engine"],"has_modifier":false},"refined-flammables-1":{"unlocks":{},"requires":["flamethrower"],"has_modifier":true},"refined-flammables-2":{"unlocks":{},"requires":["refined-flammables-1"],"has_modifier":true},"refined-flammables-3":{"unlocks":{},"requires":["refined-flammables-2","chemical-science-pack"],"has_modifier":true},"refined-flammables-4":{"unlocks":{},"requires":["refined-flammables-3","utility-science-pack"],"has_modifier":true},"refined-flammables-5":{"unlocks":{},"requires":["refined-flammables-4"],"has_modifier":true},"refined-flammables-6":{"unlocks":{},"requires":["refined-flammables-5"],"has_modifier":true},"repair-pack":{"unlocks":["repair-pack"],"requires":["automation-science-pack"],"has_modifier":false},"research-speed-1":{"unlocks":{},"requires":["automation-2"],"has_modifier":true},"research-speed-2":{"unlocks":{},"requires":["research-speed-1"],"has_modifier":true},"research-speed-3":{"unlocks":{},"requires":["research-speed-2","chemical-science-pack"],"has_modifier":true},"research-speed-4":{"unlocks":{},"requires":["research-speed-3"],"has_modifier":true},"research-speed-5":{"unlocks":{},"requires":["research-speed-4","production-science-pack"],"has_modifier":true},"research-speed-6":{"unlocks":{},"requires":["research-speed-5","utility-science-pack"],"has_modifier":true},"robotics":{"unlocks":["flying-robot-frame"],"requires":["electric-engine","battery"],"has_modifier":false},"rocket-fuel":{"unlocks":["rocket-fuel"],"requires":["flammables","advanced-oil-processing"],"has_modifier":false},"rocket-silo":{"unlocks":["rocket-silo","rocket-part","cargo-landing-pad","satellite"],"requires":["concrete","rocket-fuel","electric-energy-accumulators","solar-energy","utility-science-pack","speed-module-3","productivity-module-3","radar"],"has_modifier":false},"rocketry":{"unlocks":["rocket-launcher","rocket"],"requires":["explosives","flammables","military-science-pack"],"has_modifier":false},"solar-energy":{"unlocks":["solar-panel"],"requires":["steel-processing","logistic-science-pack"],"has_modifier":false},"solar-panel-equipment":{"unlocks":["solar-panel-equipment"],"requires":["modular-armor","solar-energy"],"has_modifier":false},"space-science-pack":{"unlocks":{},"requires":["rocket-silo"],"has_modifier":false},"speed-module":{"unlocks":["speed-module"],"requires":["modules"],"has_modifier":false},"speed-module-2":{"unlocks":["speed-module-2"],"requires":["speed-module","processing-unit"],"has_modifier":false},"speed-module-3":{"unlocks":["speed-module-3"],"requires":["speed-module-2","production-science-pack"],"has_modifier":false},"spidertron":{"unlocks":["spidertron"],"requires":["military-4","exoskeleton-equipment","fission-reactor-equipment","rocketry","efficiency-module-3","radar"],"has_modifier":false},"steam-power":{"unlocks":["pipe","pipe-to-ground","offshore-pump","boiler","steam-engine"],"requires":{},"has_modifier":false},"steel-axe":{"unlocks":{},"requires":["steel-processing"],"has_modifier":true},"steel-processing":{"unlocks":["steel-plate","steel-chest"],"requires":["automation-science-pack"],"has_modifier":false},"stone-wall":{"unlocks":["stone-wall"],"requires":["automation-science-pack"],"has_modifier":false},"stronger-explosives-1":{"unlocks":{},"requires":["military-2"],"has_modifier":true},"stronger-explosives-2":{"unlocks":{},"requires":["stronger-explosives-1","military-science-pack"],"has_modifier":true},"stronger-explosives-3":{"unlocks":{},"requires":["stronger-explosives-2","chemical-science-pack"],"has_modifier":true},"stronger-explosives-4":{"unlocks":{},"requires":["stronger-explosives-3","utility-science-pack"],"has_modifier":true},"stronger-explosives-5":{"unlocks":{},"requires":["stronger-explosives-4"],"has_modifier":true},"stronger-explosives-6":{"unlocks":{},"requires":["stronger-explosives-5"],"has_modifier":true},"sulfur-processing":{"unlocks":["sulfuric-acid","sulfur"],"requires":["oil-processing"],"has_modifier":false},"tank":{"unlocks":["tank","cannon-shell","explosive-cannon-shell"],"requires":["automobilism","military-3","explosives"],"has_modifier":false},"toolbelt":{"unlocks":{},"requires":["logistic-science-pack"],"has_modifier":true},"uranium-ammo":{"unlocks":["uranium-rounds-magazine","uranium-cannon-shell","explosive-uranium-cannon-shell"],"requires":["uranium-processing","military-4","tank"],"has_modifier":false},"uranium-mining":{"unlocks":{},"requires":["chemical-science-pack","concrete"],"has_modifier":true},"uranium-processing":{"unlocks":["centrifuge","uranium-processing"],"requires":["uranium-mining"],"has_modifier":false},"utility-science-pack":{"unlocks":["utility-science-pack"],"requires":["robotics","processing-unit","low-density-structure"],"has_modifier":false},"weapon-shooting-speed-1":{"unlocks":{},"requires":["military"],"has_modifier":true},"weapon-shooting-speed-2":{"unlocks":{},"requires":["weapon-shooting-speed-1","logistic-science-pack"],"has_modifier":true},"weapon-shooting-speed-3":{"unlocks":{},"requires":["weapon-shooting-speed-2","military-science-pack"],"has_modifier":true},"weapon-shooting-speed-4":{"unlocks":{},"requires":["weapon-shooting-speed-3"],"has_modifier":true},"weapon-shooting-speed-5":{"unlocks":{},"requires":["weapon-shooting-speed-4","chemical-science-pack"],"has_modifier":true},"weapon-shooting-speed-6":{"unlocks":{},"requires":["weapon-shooting-speed-5","utility-science-pack"],"has_modifier":true},"worker-robots-speed-1":{"unlocks":{},"requires":["robotics"],"has_modifier":true},"worker-robots-speed-2":{"unlocks":{},"requires":["worker-robots-speed-1"],"has_modifier":true},"worker-robots-speed-3":{"unlocks":{},"requires":["worker-robots-speed-2","utility-science-pack"],"has_modifier":true},"worker-robots-speed-4":{"unlocks":{},"requires":["worker-robots-speed-3"],"has_modifier":true},"worker-robots-speed-5":{"unlocks":{},"requires":["worker-robots-speed-4","production-science-pack"],"has_modifier":true},"worker-robots-storage-1":{"unlocks":{},"requires":["robotics"],"has_modifier":true},"worker-robots-storage-2":{"unlocks":{},"requires":["worker-robots-storage-1","production-science-pack"],"has_modifier":true},"worker-robots-storage-3":{"unlocks":{},"requires":["worker-robots-storage-2","utility-science-pack"],"has_modifier":true}}
\ No newline at end of file
+{"advanced-circuit":{"unlocks":["advanced-circuit"],"requires":["plastics"],"infinite":false},"advanced-combinators":{"unlocks":["selector-combinator"],"requires":["circuit-network","chemical-science-pack"],"infinite":false},"advanced-material-processing":{"unlocks":["steel-furnace"],"requires":["steel-processing","logistic-science-pack"],"infinite":false},"advanced-material-processing-2":{"unlocks":["electric-furnace"],"requires":["advanced-material-processing","chemical-science-pack"],"infinite":false},"advanced-oil-processing":{"unlocks":["advanced-oil-processing","heavy-oil-cracking","light-oil-cracking","solid-fuel-from-heavy-oil","solid-fuel-from-light-oil"],"requires":["chemical-science-pack"],"infinite":false},"artillery":{"unlocks":["artillery-wagon","artillery-turret","artillery-shell"],"requires":["military-4","tank","concrete","radar"],"infinite":false},"atomic-bomb":{"unlocks":["atomic-bomb"],"requires":["military-4","kovarex-enrichment-process","rocketry"],"infinite":false},"automated-rail-transportation":{"unlocks":["train-stop","rail-signal","rail-chain-signal"],"requires":["railway"],"infinite":false},"automation":{"unlocks":["assembling-machine-1","long-handed-inserter"],"requires":["automation-science-pack"],"infinite":false},"automation-2":{"unlocks":["assembling-machine-2"],"requires":["automation","steel-processing","logistic-science-pack"],"infinite":false},"automation-3":{"unlocks":["assembling-machine-3"],"requires":["speed-module","production-science-pack","electric-engine"],"infinite":false},"automation-science-pack":{"unlocks":["automation-science-pack"],"requires":["steam-power","electronics"],"infinite":false},"automobilism":{"unlocks":["car"],"requires":["logistics-2","engine"],"infinite":false},"battery":{"unlocks":["battery"],"requires":["sulfur-processing"],"infinite":false},"battery-equipment":{"unlocks":["battery-equipment"],"requires":["battery","solar-panel-equipment"],"infinite":false},"battery-mk2-equipment":{"unlocks":["battery-mk2-equipment"],"requires":["battery-equipment","low-density-structure","power-armor"],"infinite":false},"belt-immunity-equipment":{"unlocks":["belt-immunity-equipment"],"requires":["solar-panel-equipment"],"infinite":false},"braking-force-1":{"unlocks":{},"requires":["railway","chemical-science-pack"],"infinite":false,"modifiers":["train-braking-force-bonus"]},"braking-force-2":{"unlocks":{},"requires":["braking-force-1"],"infinite":false,"modifiers":["train-braking-force-bonus"]},"braking-force-3":{"unlocks":{},"requires":["braking-force-2","production-science-pack"],"infinite":false,"modifiers":["train-braking-force-bonus"]},"braking-force-4":{"unlocks":{},"requires":["braking-force-3"],"infinite":false,"modifiers":["train-braking-force-bonus"]},"braking-force-5":{"unlocks":{},"requires":["braking-force-4"],"infinite":false,"modifiers":["train-braking-force-bonus"]},"braking-force-6":{"unlocks":{},"requires":["braking-force-5","utility-science-pack"],"infinite":false,"modifiers":["train-braking-force-bonus"]},"braking-force-7":{"unlocks":{},"requires":["braking-force-6"],"infinite":false,"modifiers":["train-braking-force-bonus"]},"bulk-inserter":{"unlocks":["bulk-inserter"],"requires":["fast-inserter","logistics-2","advanced-circuit"],"infinite":false,"modifiers":["bulk-inserter-capacity-bonus"]},"chemical-science-pack":{"unlocks":["chemical-science-pack"],"requires":["advanced-circuit","sulfur-processing"],"infinite":false},"circuit-network":{"unlocks":["arithmetic-combinator","decider-combinator","constant-combinator","power-switch","programmable-speaker","display-panel","iron-stick"],"requires":["logistic-science-pack"],"infinite":false,"modifiers":["unlock-circuit-network"]},"cliff-explosives":{"unlocks":["cliff-explosives"],"requires":["explosives","military-2"],"infinite":false,"modifiers":["cliff-deconstruction-enabled"]},"coal-liquefaction":{"unlocks":["coal-liquefaction"],"requires":["advanced-oil-processing","production-science-pack"],"infinite":false},"concrete":{"unlocks":["concrete","hazard-concrete","refined-concrete","refined-hazard-concrete","iron-stick"],"requires":["advanced-material-processing","automation-2"],"infinite":false},"construction-robotics":{"unlocks":["roboport","passive-provider-chest","storage-chest","construction-robot"],"requires":["robotics"],"infinite":false,"modifiers":["create-ghost-on-entity-death"]},"defender":{"unlocks":["defender-capsule"],"requires":["military-science-pack"],"infinite":false,"modifiers":["maximum-following-robots-count"]},"destroyer":{"unlocks":["destroyer-capsule"],"requires":["military-4","distractor","speed-module"],"infinite":false},"discharge-defense-equipment":{"unlocks":["discharge-defense-equipment"],"requires":["laser-turret","military-3","power-armor","solar-panel-equipment"],"infinite":false},"distractor":{"unlocks":["distractor-capsule"],"requires":["defender","military-3","laser"],"infinite":false},"effect-transmission":{"unlocks":["beacon"],"requires":["processing-unit","production-science-pack"],"infinite":false},"efficiency-module":{"unlocks":["efficiency-module"],"requires":["modules"],"infinite":false},"efficiency-module-2":{"unlocks":["efficiency-module-2"],"requires":["efficiency-module","processing-unit"],"infinite":false},"efficiency-module-3":{"unlocks":["efficiency-module-3"],"requires":["efficiency-module-2","production-science-pack"],"infinite":false},"electric-energy-accumulators":{"unlocks":["accumulator"],"requires":["electric-energy-distribution-1","battery"],"infinite":false},"electric-energy-distribution-1":{"unlocks":["medium-electric-pole","big-electric-pole","iron-stick"],"requires":["steel-processing","logistic-science-pack"],"infinite":false},"electric-energy-distribution-2":{"unlocks":["substation"],"requires":["electric-energy-distribution-1","chemical-science-pack"],"infinite":false},"electric-engine":{"unlocks":["electric-engine-unit"],"requires":["lubricant"],"infinite":false},"electric-mining-drill":{"unlocks":["electric-mining-drill"],"requires":["automation-science-pack"],"infinite":false},"electronics":{"unlocks":["copper-cable","electronic-circuit","lab","inserter","small-electric-pole"],"requires":{},"infinite":false},"energy-shield-equipment":{"unlocks":["energy-shield-equipment"],"requires":["solar-panel-equipment","military-science-pack"],"infinite":false},"energy-shield-mk2-equipment":{"unlocks":["energy-shield-mk2-equipment"],"requires":["energy-shield-equipment","military-3","low-density-structure","power-armor"],"infinite":false},"engine":{"unlocks":["engine-unit"],"requires":["steel-processing","logistic-science-pack"],"infinite":false},"exoskeleton-equipment":{"unlocks":["exoskeleton-equipment"],"requires":["processing-unit","electric-engine","solar-panel-equipment"],"infinite":false},"explosive-rocketry":{"unlocks":["explosive-rocket"],"requires":["rocketry","military-3"],"infinite":false},"explosives":{"unlocks":["explosives"],"requires":["sulfur-processing"],"infinite":false},"fast-inserter":{"unlocks":["fast-inserter"],"requires":["automation-science-pack"],"infinite":false},"fission-reactor-equipment":{"unlocks":["fission-reactor-equipment"],"requires":["utility-science-pack","power-armor","military-science-pack","nuclear-power"],"infinite":false},"flamethrower":{"unlocks":["flamethrower","flamethrower-ammo","flamethrower-turret"],"requires":["flammables","military-science-pack"],"infinite":false},"flammables":{"unlocks":{},"requires":["oil-processing"],"infinite":false},"fluid-handling":{"unlocks":["storage-tank","pump","barrel","water-barrel","empty-water-barrel","sulfuric-acid-barrel","empty-sulfuric-acid-barrel","crude-oil-barrel","empty-crude-oil-barrel","heavy-oil-barrel","empty-heavy-oil-barrel","light-oil-barrel","empty-light-oil-barrel","petroleum-gas-barrel","empty-petroleum-gas-barrel","lubricant-barrel","empty-lubricant-barrel"],"requires":["automation-2","engine"],"infinite":false},"fluid-wagon":{"unlocks":["fluid-wagon"],"requires":["railway","fluid-handling"],"infinite":false},"follower-robot-count-1":{"unlocks":{},"requires":["defender"],"infinite":false,"modifiers":["maximum-following-robots-count"]},"follower-robot-count-2":{"unlocks":{},"requires":["follower-robot-count-1"],"infinite":false,"modifiers":["maximum-following-robots-count"]},"follower-robot-count-3":{"unlocks":{},"requires":["follower-robot-count-2","chemical-science-pack"],"infinite":false,"modifiers":["maximum-following-robots-count"]},"follower-robot-count-4":{"unlocks":{},"requires":["follower-robot-count-3","destroyer"],"infinite":false,"modifiers":["maximum-following-robots-count"]},"gate":{"unlocks":["gate"],"requires":["stone-wall","military-2"],"infinite":false},"gun-turret":{"unlocks":["gun-turret"],"requires":["automation-science-pack"],"infinite":false},"heavy-armor":{"unlocks":["heavy-armor"],"requires":["military","steel-processing"],"infinite":false},"inserter-capacity-bonus-1":{"unlocks":{},"requires":["bulk-inserter"],"infinite":false,"modifiers":["bulk-inserter-capacity-bonus"]},"inserter-capacity-bonus-2":{"unlocks":{},"requires":["inserter-capacity-bonus-1"],"infinite":false,"modifiers":["inserter-stack-size-bonus","bulk-inserter-capacity-bonus"]},"inserter-capacity-bonus-3":{"unlocks":{},"requires":["inserter-capacity-bonus-2","chemical-science-pack"],"infinite":false,"modifiers":["bulk-inserter-capacity-bonus"]},"inserter-capacity-bonus-4":{"unlocks":{},"requires":["inserter-capacity-bonus-3","production-science-pack"],"infinite":false,"modifiers":["bulk-inserter-capacity-bonus"]},"inserter-capacity-bonus-5":{"unlocks":{},"requires":["inserter-capacity-bonus-4"],"infinite":false,"modifiers":["bulk-inserter-capacity-bonus"]},"inserter-capacity-bonus-6":{"unlocks":{},"requires":["inserter-capacity-bonus-5"],"infinite":false,"modifiers":["bulk-inserter-capacity-bonus"]},"inserter-capacity-bonus-7":{"unlocks":{},"requires":["inserter-capacity-bonus-6","utility-science-pack"],"infinite":false,"modifiers":["inserter-stack-size-bonus","bulk-inserter-capacity-bonus"]},"kovarex-enrichment-process":{"unlocks":["kovarex-enrichment-process","nuclear-fuel"],"requires":["production-science-pack","uranium-processing","rocket-fuel"],"infinite":false},"lamp":{"unlocks":["small-lamp"],"requires":["automation-science-pack"],"infinite":false},"land-mine":{"unlocks":["land-mine"],"requires":["explosives","military-science-pack"],"infinite":false},"landfill":{"unlocks":["landfill"],"requires":["logistic-science-pack"],"infinite":false},"laser":{"unlocks":{},"requires":["battery","chemical-science-pack"],"infinite":false},"laser-shooting-speed-1":{"unlocks":{},"requires":["laser","military-science-pack"],"infinite":false,"modifiers":["gun-speed"]},"laser-shooting-speed-2":{"unlocks":{},"requires":["laser-shooting-speed-1"],"infinite":false,"modifiers":["gun-speed"]},"laser-shooting-speed-3":{"unlocks":{},"requires":["laser-shooting-speed-2"],"infinite":false,"modifiers":["gun-speed"]},"laser-shooting-speed-4":{"unlocks":{},"requires":["laser-shooting-speed-3"],"infinite":false,"modifiers":["gun-speed"]},"laser-shooting-speed-5":{"unlocks":{},"requires":["laser-shooting-speed-4","utility-science-pack"],"infinite":false,"modifiers":["gun-speed"]},"laser-shooting-speed-6":{"unlocks":{},"requires":["laser-shooting-speed-5"],"infinite":false,"modifiers":["gun-speed"]},"laser-shooting-speed-7":{"unlocks":{},"requires":["laser-shooting-speed-6"],"infinite":false,"modifiers":["gun-speed"]},"laser-turret":{"unlocks":["laser-turret"],"requires":["laser","military-science-pack"],"infinite":false},"laser-weapons-damage-1":{"unlocks":{},"requires":["laser","military-science-pack"],"infinite":false,"modifiers":["ammo-damage"]},"laser-weapons-damage-2":{"unlocks":{},"requires":["laser-weapons-damage-1"],"infinite":false,"modifiers":["ammo-damage"]},"laser-weapons-damage-3":{"unlocks":{},"requires":["laser-weapons-damage-2"],"infinite":false,"modifiers":["ammo-damage"]},"laser-weapons-damage-4":{"unlocks":{},"requires":["laser-weapons-damage-3"],"infinite":false,"modifiers":["ammo-damage"]},"laser-weapons-damage-5":{"unlocks":{},"requires":["laser-weapons-damage-4","utility-science-pack"],"infinite":false,"modifiers":["ammo-damage","ammo-damage"]},"laser-weapons-damage-6":{"unlocks":{},"requires":["laser-weapons-damage-5"],"infinite":false,"modifiers":["ammo-damage","ammo-damage","ammo-damage"]},"logistic-robotics":{"unlocks":["roboport","passive-provider-chest","storage-chest","logistic-robot"],"requires":["robotics"],"infinite":false,"modifiers":["character-logistic-requests","character-logistic-trash-slots"]},"logistic-science-pack":{"unlocks":["logistic-science-pack"],"requires":["automation-science-pack"],"infinite":false},"logistic-system":{"unlocks":["active-provider-chest","requester-chest","buffer-chest"],"requires":["utility-science-pack","logistic-robotics"],"infinite":false,"modifiers":["vehicle-logistics"]},"logistics":{"unlocks":["underground-belt","splitter"],"requires":["automation-science-pack"],"infinite":false},"logistics-2":{"unlocks":["fast-transport-belt","fast-underground-belt","fast-splitter"],"requires":["logistics","logistic-science-pack"],"infinite":false},"logistics-3":{"unlocks":["express-transport-belt","express-underground-belt","express-splitter"],"requires":["production-science-pack","lubricant"],"infinite":false},"low-density-structure":{"unlocks":["low-density-structure"],"requires":["advanced-material-processing","chemical-science-pack"],"infinite":false},"lubricant":{"unlocks":["lubricant"],"requires":["advanced-oil-processing"],"infinite":false},"military":{"unlocks":["submachine-gun","shotgun","shotgun-shell"],"requires":["automation-science-pack"],"infinite":false},"military-2":{"unlocks":["piercing-rounds-magazine","grenade"],"requires":["military","steel-processing","logistic-science-pack"],"infinite":false},"military-3":{"unlocks":["poison-capsule","slowdown-capsule","combat-shotgun"],"requires":["chemical-science-pack","military-science-pack"],"infinite":false},"military-4":{"unlocks":["piercing-shotgun-shell","cluster-grenade"],"requires":["military-3","utility-science-pack","explosives"],"infinite":false},"military-science-pack":{"unlocks":["military-science-pack"],"requires":["military-2","stone-wall"],"infinite":false},"mining-productivity-1":{"unlocks":{},"requires":["advanced-circuit"],"infinite":false,"modifiers":["mining-drill-productivity-bonus"]},"mining-productivity-2":{"unlocks":{},"requires":["mining-productivity-1","chemical-science-pack"],"infinite":false,"modifiers":["mining-drill-productivity-bonus"]},"mining-productivity-3":{"unlocks":{},"requires":["mining-productivity-2","production-science-pack","utility-science-pack"],"infinite":false,"modifiers":["mining-drill-productivity-bonus"]},"modular-armor":{"unlocks":["modular-armor"],"requires":["heavy-armor","advanced-circuit"],"infinite":false},"modules":{"unlocks":{},"requires":["advanced-circuit"],"infinite":false},"night-vision-equipment":{"unlocks":["night-vision-equipment"],"requires":["solar-panel-equipment"],"infinite":false},"nuclear-fuel-reprocessing":{"unlocks":["nuclear-fuel-reprocessing"],"requires":["nuclear-power","production-science-pack"],"infinite":false},"nuclear-power":{"unlocks":["nuclear-reactor","heat-exchanger","heat-pipe","steam-turbine","uranium-fuel-cell"],"requires":["uranium-processing"],"infinite":false},"oil-gathering":{"unlocks":["pumpjack"],"requires":["fluid-handling"],"infinite":false},"oil-processing":{"unlocks":["oil-refinery","chemical-plant","basic-oil-processing","solid-fuel-from-petroleum-gas"],"requires":["oil-gathering"],"infinite":false},"personal-laser-defense-equipment":{"unlocks":["personal-laser-defense-equipment"],"requires":["laser-turret","military-3","low-density-structure","power-armor","solar-panel-equipment"],"infinite":false},"personal-roboport-equipment":{"unlocks":["personal-roboport-equipment"],"requires":["construction-robotics","solar-panel-equipment"],"infinite":false},"personal-roboport-mk2-equipment":{"unlocks":["personal-roboport-mk2-equipment"],"requires":["personal-roboport-equipment","utility-science-pack"],"infinite":false},"physical-projectile-damage-1":{"unlocks":{},"requires":["military"],"infinite":false,"modifiers":["ammo-damage","turret-attack","ammo-damage"]},"physical-projectile-damage-2":{"unlocks":{},"requires":["physical-projectile-damage-1","logistic-science-pack"],"infinite":false,"modifiers":["ammo-damage","turret-attack","ammo-damage"]},"physical-projectile-damage-3":{"unlocks":{},"requires":["physical-projectile-damage-2","military-science-pack"],"infinite":false,"modifiers":["ammo-damage","turret-attack","ammo-damage"]},"physical-projectile-damage-4":{"unlocks":{},"requires":["physical-projectile-damage-3"],"infinite":false,"modifiers":["ammo-damage","turret-attack","ammo-damage"]},"physical-projectile-damage-5":{"unlocks":{},"requires":["physical-projectile-damage-4","chemical-science-pack"],"infinite":false,"modifiers":["ammo-damage","turret-attack","ammo-damage","ammo-damage"]},"physical-projectile-damage-6":{"unlocks":{},"requires":["physical-projectile-damage-5","utility-science-pack"],"infinite":false,"modifiers":["ammo-damage","turret-attack","ammo-damage","ammo-damage"]},"plastics":{"unlocks":["plastic-bar"],"requires":["oil-processing"],"infinite":false},"power-armor":{"unlocks":["power-armor"],"requires":["modular-armor","electric-engine","processing-unit"],"infinite":false},"power-armor-mk2":{"unlocks":["power-armor-mk2"],"requires":["power-armor","military-4","speed-module-2","efficiency-module-2"],"infinite":false},"processing-unit":{"unlocks":["processing-unit"],"requires":["chemical-science-pack"],"infinite":false},"production-science-pack":{"unlocks":["production-science-pack"],"requires":["productivity-module","advanced-material-processing-2","railway"],"infinite":false},"productivity-module":{"unlocks":["productivity-module"],"requires":["modules"],"infinite":false},"productivity-module-2":{"unlocks":["productivity-module-2"],"requires":["productivity-module","processing-unit"],"infinite":false},"productivity-module-3":{"unlocks":["productivity-module-3"],"requires":["productivity-module-2","production-science-pack"],"infinite":false},"radar":{"unlocks":["radar"],"requires":["automation-science-pack"],"infinite":false},"railway":{"unlocks":["rail","locomotive","cargo-wagon","iron-stick"],"requires":["logistics-2","engine"],"infinite":false},"refined-flammables-1":{"unlocks":{},"requires":["flamethrower"],"infinite":false,"modifiers":["ammo-damage","turret-attack"]},"refined-flammables-2":{"unlocks":{},"requires":["refined-flammables-1"],"infinite":false,"modifiers":["ammo-damage","turret-attack"]},"refined-flammables-3":{"unlocks":{},"requires":["refined-flammables-2","chemical-science-pack"],"infinite":false,"modifiers":["ammo-damage","turret-attack"]},"refined-flammables-4":{"unlocks":{},"requires":["refined-flammables-3","utility-science-pack"],"infinite":false,"modifiers":["ammo-damage","turret-attack"]},"refined-flammables-5":{"unlocks":{},"requires":["refined-flammables-4"],"infinite":false,"modifiers":["ammo-damage","turret-attack"]},"refined-flammables-6":{"unlocks":{},"requires":["refined-flammables-5"],"infinite":false,"modifiers":["ammo-damage","turret-attack"]},"repair-pack":{"unlocks":["repair-pack"],"requires":["automation-science-pack"],"infinite":false},"research-speed-1":{"unlocks":{},"requires":["automation-2"],"infinite":false,"modifiers":["laboratory-speed"]},"research-speed-2":{"unlocks":{},"requires":["research-speed-1"],"infinite":false,"modifiers":["laboratory-speed"]},"research-speed-3":{"unlocks":{},"requires":["research-speed-2","chemical-science-pack"],"infinite":false,"modifiers":["laboratory-speed"]},"research-speed-4":{"unlocks":{},"requires":["research-speed-3"],"infinite":false,"modifiers":["laboratory-speed"]},"research-speed-5":{"unlocks":{},"requires":["research-speed-4","production-science-pack"],"infinite":false,"modifiers":["laboratory-speed"]},"research-speed-6":{"unlocks":{},"requires":["research-speed-5","utility-science-pack"],"infinite":false,"modifiers":["laboratory-speed"]},"robotics":{"unlocks":["flying-robot-frame"],"requires":["electric-engine","battery"],"infinite":false},"rocket-fuel":{"unlocks":["rocket-fuel"],"requires":["flammables","advanced-oil-processing"],"infinite":false},"rocket-silo":{"unlocks":["rocket-silo","rocket-part","cargo-landing-pad","satellite"],"requires":["concrete","rocket-fuel","electric-energy-accumulators","solar-energy","utility-science-pack","speed-module-3","productivity-module-3","radar"],"infinite":false},"rocketry":{"unlocks":["rocket-launcher","rocket"],"requires":["explosives","flammables","military-science-pack"],"infinite":false},"solar-energy":{"unlocks":["solar-panel"],"requires":["steel-processing","logistic-science-pack"],"infinite":false},"solar-panel-equipment":{"unlocks":["solar-panel-equipment"],"requires":["modular-armor","solar-energy"],"infinite":false},"space-science-pack":{"unlocks":{},"requires":["rocket-silo"],"infinite":false},"speed-module":{"unlocks":["speed-module"],"requires":["modules"],"infinite":false},"speed-module-2":{"unlocks":["speed-module-2"],"requires":["speed-module","processing-unit"],"infinite":false},"speed-module-3":{"unlocks":["speed-module-3"],"requires":["speed-module-2","production-science-pack"],"infinite":false},"spidertron":{"unlocks":["spidertron"],"requires":["military-4","exoskeleton-equipment","fission-reactor-equipment","rocketry","efficiency-module-3","radar"],"infinite":false},"steam-power":{"unlocks":["pipe","pipe-to-ground","offshore-pump","boiler","steam-engine"],"requires":{},"infinite":false},"steel-axe":{"unlocks":{},"requires":["steel-processing"],"infinite":false,"modifiers":["character-mining-speed"]},"steel-processing":{"unlocks":["steel-plate","steel-chest"],"requires":["automation-science-pack"],"infinite":false},"stone-wall":{"unlocks":["stone-wall"],"requires":["automation-science-pack"],"infinite":false},"stronger-explosives-1":{"unlocks":{},"requires":["military-2"],"infinite":false,"modifiers":["ammo-damage"]},"stronger-explosives-2":{"unlocks":{},"requires":["stronger-explosives-1","military-science-pack"],"infinite":false,"modifiers":["ammo-damage","ammo-damage"]},"stronger-explosives-3":{"unlocks":{},"requires":["stronger-explosives-2","chemical-science-pack"],"infinite":false,"modifiers":["ammo-damage","ammo-damage","ammo-damage"]},"stronger-explosives-4":{"unlocks":{},"requires":["stronger-explosives-3","utility-science-pack"],"infinite":false,"modifiers":["ammo-damage","ammo-damage","ammo-damage"]},"stronger-explosives-5":{"unlocks":{},"requires":["stronger-explosives-4"],"infinite":false,"modifiers":["ammo-damage","ammo-damage","ammo-damage"]},"stronger-explosives-6":{"unlocks":{},"requires":["stronger-explosives-5"],"infinite":false,"modifiers":["ammo-damage","ammo-damage","ammo-damage"]},"sulfur-processing":{"unlocks":["sulfuric-acid","sulfur"],"requires":["oil-processing"],"infinite":false},"tank":{"unlocks":["tank","cannon-shell","explosive-cannon-shell"],"requires":["automobilism","military-3","explosives"],"infinite":false},"toolbelt":{"unlocks":{},"requires":["logistic-science-pack"],"infinite":false,"modifiers":["character-inventory-slots-bonus"]},"uranium-ammo":{"unlocks":["uranium-rounds-magazine","uranium-cannon-shell","explosive-uranium-cannon-shell"],"requires":["uranium-processing","military-4","tank"],"infinite":false},"uranium-mining":{"unlocks":{},"requires":["chemical-science-pack","concrete"],"infinite":false,"modifiers":["mining-with-fluid"]},"uranium-processing":{"unlocks":["centrifuge","uranium-processing"],"requires":["uranium-mining"],"infinite":false},"utility-science-pack":{"unlocks":["utility-science-pack"],"requires":["robotics","processing-unit","low-density-structure"],"infinite":false},"weapon-shooting-speed-1":{"unlocks":{},"requires":["military"],"infinite":false,"modifiers":["gun-speed","gun-speed"]},"weapon-shooting-speed-2":{"unlocks":{},"requires":["weapon-shooting-speed-1","logistic-science-pack"],"infinite":false,"modifiers":["gun-speed","gun-speed"]},"weapon-shooting-speed-3":{"unlocks":{},"requires":["weapon-shooting-speed-2","military-science-pack"],"infinite":false,"modifiers":["gun-speed","gun-speed","gun-speed"]},"weapon-shooting-speed-4":{"unlocks":{},"requires":["weapon-shooting-speed-3"],"infinite":false,"modifiers":["gun-speed","gun-speed","gun-speed"]},"weapon-shooting-speed-5":{"unlocks":{},"requires":["weapon-shooting-speed-4","chemical-science-pack"],"infinite":false,"modifiers":["gun-speed","gun-speed","gun-speed","gun-speed"]},"weapon-shooting-speed-6":{"unlocks":{},"requires":["weapon-shooting-speed-5","utility-science-pack"],"infinite":false,"modifiers":["gun-speed","gun-speed","gun-speed","gun-speed"]},"worker-robots-speed-1":{"unlocks":{},"requires":["robotics"],"infinite":false,"modifiers":["worker-robot-speed"]},"worker-robots-speed-2":{"unlocks":{},"requires":["worker-robots-speed-1"],"infinite":false,"modifiers":["worker-robot-speed"]},"worker-robots-speed-3":{"unlocks":{},"requires":["worker-robots-speed-2","utility-science-pack"],"infinite":false,"modifiers":["worker-robot-speed"]},"worker-robots-speed-4":{"unlocks":{},"requires":["worker-robots-speed-3"],"infinite":false,"modifiers":["worker-robot-speed"]},"worker-robots-speed-5":{"unlocks":{},"requires":["worker-robots-speed-4","production-science-pack"],"infinite":false,"modifiers":["worker-robot-speed"]},"worker-robots-storage-1":{"unlocks":{},"requires":["robotics"],"infinite":false,"modifiers":["worker-robot-storage"]},"worker-robots-storage-2":{"unlocks":{},"requires":["worker-robots-storage-1","production-science-pack"],"infinite":false,"modifiers":["worker-robot-storage"]},"worker-robots-storage-3":{"unlocks":{},"requires":["worker-robots-storage-2","utility-science-pack"],"infinite":false,"modifiers":["worker-robot-storage"]}}
\ No newline at end of file

From a29ba4a6c447bb3945817e0eb9fdcf75a92a1791 Mon Sep 17 00:00:00 2001
From: Aaron Wagener <mmmcheese158@gmail.com>
Date: Tue, 7 Jan 2025 16:11:26 -0600
Subject: [PATCH 224/381] The Messenger: reduce strictness of output path check
 (#4442)

---
 worlds/messenger/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/messenger/__init__.py b/worlds/messenger/__init__.py
index 59e724d3fb7f..043be455bc1f 100644
--- a/worlds/messenger/__init__.py
+++ b/worlds/messenger/__init__.py
@@ -381,7 +381,7 @@ def stage_generate_output(cls, multiworld: MultiWorld, output_directory: str) ->
             return
         # the messenger client calls into AP with specific args, so check the out path matches what the client sends
         out_path = output_path(multiworld.get_out_file_name_base(1) + ".aptm")
-        if "The Messenger\\Archipelago\\output" not in out_path:
+        if "Messenger\\Archipelago\\output" not in out_path:
             return
         import orjson
         data = {

From d3ed40cd4dc7af86b0b083e7b4e05381f6e287e3 Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Wed, 8 Jan 2025 02:13:32 -0500
Subject: [PATCH 225/381] Stardew Valley: Hide the Mods from the simple options
 page (#4446)

---
 worlds/stardew_valley/options/options.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/stardew_valley/options/options.py b/worlds/stardew_valley/options/options.py
index 5d3b25b4da13..db949718834e 100644
--- a/worlds/stardew_valley/options/options.py
+++ b/worlds/stardew_valley/options/options.py
@@ -772,6 +772,7 @@ class Gifting(Toggle):
 
 class Mods(OptionSet):
     """List of mods that will be included in the shuffling."""
+    visibility = Visibility.all & ~Visibility.simple_ui
     internal_name = "mods"
     display_name = "Mods"
     valid_keys = {ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,

From 874197d940def1edb9509a294916892096b8b558 Mon Sep 17 00:00:00 2001
From: ruby0b <106119328+ruby0b@users.noreply.github.com>
Date: Fri, 10 Jan 2025 01:27:49 +0100
Subject: [PATCH 226/381] Linux: move the user home Archipelago dir to
 $XDG_DATA_HOME (#4347)

This affects builds with non-writable installation directories.
Instead of saving data in ~/Archipelago we now use $XDG_DATA_HOME/Archipelago
(defaulting to ~/.local/share/Archipelago).
If ~/Archipelago still exists we move it to the new location and link ~/Archipelago to it.

Motivation: This follows the [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/latest/)
to at least some degree and doesn't clutter the user's home directory.
---
 Utils.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Utils.py b/Utils.py
index 574c006b503d..43b3ef9c8ff9 100644
--- a/Utils.py
+++ b/Utils.py
@@ -152,8 +152,15 @@ def home_path(*path: str) -> str:
     if hasattr(home_path, 'cached_path'):
         pass
     elif sys.platform.startswith('linux'):
-        home_path.cached_path = os.path.expanduser('~/Archipelago')
-        os.makedirs(home_path.cached_path, 0o700, exist_ok=True)
+        xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.expanduser('~/.local/share'))
+        home_path.cached_path = xdg_data_home + '/Archipelago'
+        if not os.path.isdir(home_path.cached_path):
+            legacy_home_path = os.path.expanduser('~/Archipelago')
+            if os.path.isdir(legacy_home_path):
+                os.renames(legacy_home_path, home_path.cached_path)
+                os.symlink(home_path.cached_path, legacy_home_path)
+            else:
+                os.makedirs(home_path.cached_path, 0o700, exist_ok=True)
     else:
         # not implemented
         home_path.cached_path = local_path()  # this will generate the same exceptions we got previously

From 894a8571ee1a3bbbdc16bb6a64192819779ba7b3 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:21:02 +0100
Subject: [PATCH 227/381] kvui: add autocompleting new hint text input (#3535)

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
Co-authored-by: Silvris <58583688+Silvris@users.noreply.github.com>
---
 data/client.kv |  5 ++++
 kvui.py        | 65 +++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/data/client.kv b/data/client.kv
index 3455f2a23657..f0f31769e411 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -147,3 +147,8 @@
             rectangle: self.x-2, self.y-2, self.width+4, self.height+4
 <ServerToolTip>:
     pos_hint: {'center_y': 0.5, 'center_x': 0.5}
+<AutocompleteHintInput>
+    size_hint_y: None
+    height: dp(30)
+    multiline: False
+    write_tab: False
diff --git a/kvui.py b/kvui.py
index b2ab004e274a..f47e45b93c07 100644
--- a/kvui.py
+++ b/kvui.py
@@ -40,7 +40,7 @@
 from kivy.base import ExceptionHandler, ExceptionManager
 from kivy.clock import Clock
 from kivy.factory import Factory
-from kivy.properties import BooleanProperty, ObjectProperty
+from kivy.properties import BooleanProperty, ObjectProperty, NumericProperty
 from kivy.metrics import dp
 from kivy.effects.scroll import ScrollEffect
 from kivy.uix.widget import Widget
@@ -64,6 +64,7 @@
 from kivy.uix.recycleview.layout import LayoutSelectionBehavior
 from kivy.animation import Animation
 from kivy.uix.popup import Popup
+from kivy.uix.dropdown import DropDown
 from kivy.uix.image import AsyncImage
 
 fade_in_animation = Animation(opacity=0, duration=0) + Animation(opacity=1, duration=0.25)
@@ -305,6 +306,50 @@ def apply_selection(self, rv, index, is_selected):
         """ Respond to the selection of items in the view. """
         self.selected = is_selected
 
+        
+class AutocompleteHintInput(TextInput):
+    min_chars = NumericProperty(3)
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        self.dropdown = DropDown()
+        self.dropdown.bind(on_select=lambda instance, x: setattr(self, 'text', x))
+        self.bind(on_text_validate=self.on_message)
+
+    def on_message(self, instance):
+        App.get_running_app().commandprocessor("!hint "+instance.text)
+
+    def on_text(self, instance, value):
+        if len(value) >= self.min_chars:
+            self.dropdown.clear_widgets()
+            ctx: context_type = App.get_running_app().ctx
+            if not ctx.game:
+                return
+            item_names = ctx.item_names._game_store[ctx.game].values()
+
+            def on_press(button: Button):
+                split_text = MarkupLabel(text=button.text).markup
+                return self.dropdown.select("".join(text_frag for text_frag in split_text
+                                                    if not text_frag.startswith("[")))
+            lowered = value.lower()
+            for item_name in item_names:
+                try:
+                    index = item_name.lower().index(lowered)
+                except ValueError:
+                    pass  # substring not found
+                else:
+                    text = escape_markup(item_name)
+                    text = text[:index] + "[b]" + text[index:index+len(value)]+"[/b]"+text[index+len(value):]
+                    btn = Button(text=text, size_hint_y=None, height=dp(30), markup=True)
+                    btn.bind(on_release=on_press)
+                    self.dropdown.add_widget(btn)
+            if not self.dropdown.attach_to:
+                self.dropdown.open(self)
+        else:
+            self.dropdown.dismiss()
+
+
 class HintLabel(RecycleDataViewBehavior, BoxLayout):
     selected = BooleanProperty(False)
     striped = BooleanProperty(False)
@@ -570,8 +615,10 @@ def connect_bar_validate(sender):
                 # show Archipelago tab if other logging is present
                 self.tabs.add_widget(panel)
 
-        hint_panel = self.add_client_tab("Hints", HintLog(self.json_to_kivy_parser))
+        hint_panel = self.add_client_tab("Hints", HintLayout())
+        self.hint_log = HintLog(self.json_to_kivy_parser)
         self.log_panels["Hints"] = hint_panel.content
+        hint_panel.content.add_widget(self.hint_log)
 
         if len(self.logging_pairs) == 1:
             self.tabs.default_tab_text = "Archipelago"
@@ -698,7 +745,7 @@ def set_new_energy_link_value(self):
 
     def update_hints(self):
         hints = self.ctx.stored_data.get(f"_read_hints_{self.ctx.team}_{self.ctx.slot}", [])
-        self.log_panels["Hints"].refresh_hints(hints)
+        self.hint_log.refresh_hints(hints)
 
     # default F1 keybind, opens a settings menu, that seems to break the layout engine once closed
     def open_settings(self, *largs):
@@ -753,6 +800,17 @@ def fix_heights(self):
                 element.height = element.texture_size[1]
 
 
+class HintLayout(BoxLayout):
+    orientation = "vertical"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        boxlayout = BoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
+        boxlayout.add_widget(Label(text="New Hint:", size_hint_x=None, size_hint_y=None, height=dp(30)))
+        boxlayout.add_widget(AutocompleteHintInput())
+        self.add_widget(boxlayout)
+
+        
 status_names: typing.Dict[HintStatus, str] = {
     HintStatus.HINT_FOUND: "Found",
     HintStatus.HINT_UNSPECIFIED: "Unspecified",
@@ -769,6 +827,7 @@ def fix_heights(self):
 }
 
 
+
 class HintLog(RecycleView):
     header = {
         "receiving": {"text": "[u]Receiving Player[/u]"},

From 043ba418ecbe73420cb0b8ebcc4960e1702db96d Mon Sep 17 00:00:00 2001
From: lordlou <87331798+lordlou@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:46:17 -0500
Subject: [PATCH 228/381] SM generate without rom (#3460)

* - 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

* 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

* SM Varia can now generate without ROM

* removed stage_assert_generate
---
 worlds/sm/Rom.py                            | 45 ++++++++++++++-
 worlds/sm/__init__.py                       | 30 ++++------
 worlds/sm/variaRandomizer/randomizer.py     | 26 +++------
 worlds/sm/variaRandomizer/rom/ips.py        | 19 ++++++-
 worlds/sm/variaRandomizer/rom/rom.py        | 62 ++++++++++++++++++++-
 worlds/sm/variaRandomizer/rom/rompatcher.py |  9 +--
 6 files changed, 142 insertions(+), 49 deletions(-)

diff --git a/worlds/sm/Rom.py b/worlds/sm/Rom.py
index ac516ae48b75..c5b6645ed8ef 100644
--- a/worlds/sm/Rom.py
+++ b/worlds/sm/Rom.py
@@ -4,18 +4,59 @@
 import json
 import Utils
 from Utils import read_snes_rom
-from worlds.Files import APDeltaPatch
+from worlds.Files import APPatchExtension, APProcedurePatch, APTokenMixin, APTokenTypes
 from .variaRandomizer.utils.utils import openFile
 
 SMJUHASH = '21f3e98df4780ee1c667b84e57d88675'
 SM_ROM_MAX_PLAYERID = 65535
 SM_ROM_PLAYERDATA_COUNT = 202
 
-class SMDeltaPatch(APDeltaPatch):
+class SMPatchExtensions(APPatchExtension):
+    game = "Super Metroid"
+
+    @staticmethod
+    def write_crc(caller: APProcedurePatch, rom: bytes) -> bytes:
+        def checksum_mirror_sum(start, length, mask = 0x800000):
+            while not(length & mask) and mask:
+                mask >>= 1
+
+            part1 = sum(start[:mask]) & 0xFFFF
+            part2 = 0
+
+            next_length = length - mask
+            if next_length:
+                part2 = checksum_mirror_sum(start[mask:], next_length, mask >> 1)
+
+                while (next_length < mask):
+                    next_length += next_length
+                    part2 += part2
+
+            return (part1 + part2) & 0xFFFF
+
+        def write_bytes(buffer, startaddress: int, values):
+            buffer[startaddress:startaddress + len(values)] = values
+
+        buffer = bytearray(rom)
+        crc = checksum_mirror_sum(buffer, len(buffer))
+        inv = crc ^ 0xFFFF
+        write_bytes(buffer, 0x7FDC, [inv & 0xFF, (inv >> 8) & 0xFF, crc & 0xFF, (crc >> 8) & 0xFF])
+        return bytes(buffer)
+
+class SMProcedurePatch(APProcedurePatch, APTokenMixin):
     hash = SMJUHASH
     game = "Super Metroid"
     patch_file_ending = ".apsm"
 
+    procedure = [
+        ("apply_tokens", ["token_data.bin"]),
+        ("write_crc", [])
+    ]
+
+    def write_tokens(self, patches):
+        for addr, data in patches.items():
+            self.write_token(APTokenTypes.WRITE, addr, bytes(data))
+        self.write_file("token_data.bin", self.get_token_binary())
+
     @classmethod
     def get_source_data(cls) -> bytes:
         return get_base_rom_bytes()
diff --git a/worlds/sm/__init__.py b/worlds/sm/__init__.py
index 160b7e4ec78b..5d53270d61a4 100644
--- a/worlds/sm/__init__.py
+++ b/worlds/sm/__init__.py
@@ -17,7 +17,7 @@
 
 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
+from .Rom import SM_ROM_MAX_PLAYERID, SM_ROM_PLAYERDATA_COUNT, SMProcedurePatch, get_sm_symbols
 import Utils
 
 from .variaRandomizer.logic.smboolmanager import SMBoolManager
@@ -40,7 +40,7 @@ class RomFile(settings.SNESRomPath):
         """File name of the v1.0 J rom"""
         description = "Super Metroid (JU) ROM"
         copy_to = "Super Metroid (JU).sfc"
-        md5s = [SMDeltaPatch.hash]
+        md5s = [SMProcedurePatch.hash]
 
     rom_file: RomFile = RomFile(RomFile.copy_to)
 
@@ -120,12 +120,6 @@ def __init__(self, world: MultiWorld, player: int):
         self.locations = {}
         super().__init__(world, player)
 
-    @classmethod
-    def stage_assert_generate(cls, multiworld: MultiWorld):
-        rom_file = get_base_rom_path()
-        if not os.path.exists(rom_file):
-            raise FileNotFoundError(rom_file)
-
     def generate_early(self):
         Logic.factory('vanilla')
 
@@ -802,23 +796,19 @@ def resolve_symbols_to_file_offset_based_dict(byte_edits_arr: List[ByteEdit]) ->
         romPatcher.end()
 
     def generate_output(self, output_directory: str):
-        self.variaRando.args.rom = get_base_rom_path()
-        outfilebase = self.multiworld.get_out_file_name_base(self.player)
-        outputFilename = os.path.join(output_directory, f"{outfilebase}.sfc")
-
         try:
-            self.variaRando.PatchRom(outputFilename, self.APPrePatchRom, self.APPostPatchRom)
-            self.write_crc(outputFilename)
+            patcher = self.variaRando.PatchRom(self.APPrePatchRom, self.APPostPatchRom)
             self.rom_name = self.romName
+
+            patch = SMProcedurePatch(player=self.player, player_name=self.multiworld.player_name[self.player])
+            patch.write_tokens(patcher.romFile.getPatchDict())
+            rom_path = os.path.join(output_directory, f"{self.multiworld.get_out_file_name_base(self.player)}"
+                                                      f"{patch.patch_file_ending}")
+            patch.write(rom_path)
+            
         except:
             raise
-        else:
-            patch = SMDeltaPatch(os.path.splitext(outputFilename)[0] + SMDeltaPatch.patch_file_ending, player=self.player,
-                                 player_name=self.multiworld.player_name[self.player], patched_path=outputFilename)
-            patch.write()
         finally:
-            if os.path.exists(outputFilename):
-                os.unlink(outputFilename)
             self.rom_name_available_event.set()  # make sure threading continues and errors are collected
 
     def checksum_mirror_sum(self, start, length, mask = 0x800000):
diff --git a/worlds/sm/variaRandomizer/randomizer.py b/worlds/sm/variaRandomizer/randomizer.py
index 8a7a2ea0e2a5..22712aa44255 100644
--- a/worlds/sm/variaRandomizer/randomizer.py
+++ b/worlds/sm/variaRandomizer/randomizer.py
@@ -680,7 +680,7 @@ def forceArg(arg, value, msg, altValue=None, webArg=None, webValue=None):
             #dumpErrorMsg(args.output, self.randoExec.errorMsg)
             raise Exception("Can't generate " + self.fileName + " with the given parameters: {}".format(self.randoExec.errorMsg))
 
-    def PatchRom(self, outputFilename, customPrePatchApply = None, customPostPatchApply = None):
+    def PatchRom(self, customPrePatchApply = None, customPostPatchApply = None) -> RomPatcher:
         args = self.args
         optErrMsgs = self.optErrMsgs
 
@@ -758,9 +758,9 @@ def PatchRom(self, outputFilename, customPrePatchApply = None, customPostPatchAp
             # args.output is not None: generate local json named args.output
             if args.rom is not None:
                 # patch local rom
-                romFileName = args.rom
-                shutil.copyfile(romFileName, outputFilename)
-                romPatcher = RomPatcher(settings=patcherSettings, romFileName=outputFilename, magic=args.raceMagic, player=self.player)
+                # romFileName = args.rom
+                # shutil.copyfile(romFileName, outputFilename)
+                romPatcher = RomPatcher(settings=patcherSettings, magic=args.raceMagic, player=self.player)
             else:
                 romPatcher = RomPatcher(settings=patcherSettings, magic=args.raceMagic)
 
@@ -779,24 +779,12 @@ def PatchRom(self, outputFilename, customPrePatchApply = None, customPostPatchAp
                 #msg = randoExec.errorMsg
                 msg = ''
 
-            if args.rom is None: # web mode
-                data = romPatcher.romFile.data
-                self.fileName = '{}.sfc'.format(self.fileName)
-                data["fileName"] = self.fileName
-                # error msg in json to be displayed by the web site
-                data["errorMsg"] = msg
-                # replaced parameters to update stats in database
-                if len(self.forcedArgs) > 0:
-                    data["forcedArgs"] = self.forcedArgs
-                with open(outputFilename, 'w') as jsonFile:
-                    json.dump(data, jsonFile)
-            else: # CLI mode
-                if msg != "":
-                    print(msg)
+            return romPatcher
+
         except Exception as e:
             import traceback
             traceback.print_exc(file=sys.stdout)
-            raise Exception("Error patching {}: ({}: {})".format(outputFilename, type(e).__name__, e))
+            raise Exception("Error patching: ({}: {})".format(type(e).__name__, e))
             #dumpErrorMsg(args.output, msg)
 
 #        if stuck == True:
diff --git a/worlds/sm/variaRandomizer/rom/ips.py b/worlds/sm/variaRandomizer/rom/ips.py
index dd3f30a3ac0b..add187a86afe 100644
--- a/worlds/sm/variaRandomizer/rom/ips.py
+++ b/worlds/sm/variaRandomizer/rom/ips.py
@@ -21,10 +21,23 @@ def __init__(self, patchDict=None):
     def toDict(self):
         ret = {}
         for record in self.records:
-            if 'rle_count' in record:
-                ret[record['address']] = [int.from_bytes(record['data'],'little')]*record['rle_count']
+            if record['address'] in ret.keys():
+                if 'rle_count' in record:
+                    if len(ret[record['address']]) > record['rle_count']:
+                        ret[record['address']][:record['rle_count']] = [int.from_bytes(record['data'],'little')]*record['rle_count']
+                    else:
+                        ret[record['address']] = [int.from_bytes(record['data'],'little')]*record['rle_count']
+                else:
+                    size = len(record['data'])
+                    if len(ret[record['address']]) > size:
+                        ret[record['address']][:size] = [int(b) for b in record['data']]  
+                    else:
+                        ret[record['address']] = [int(b) for b in record['data']]            
             else:
-                ret[record['address']] = [int(b) for b in record['data']]
+                if 'rle_count' in record:
+                    ret[record['address']] = [int.from_bytes(record['data'],'little')]*record['rle_count']
+                else:
+                    ret[record['address']] = [int(b) for b in record['data']]
         return ret
 
     @staticmethod
diff --git a/worlds/sm/variaRandomizer/rom/rom.py b/worlds/sm/variaRandomizer/rom/rom.py
index 37c15698a2f6..f0f37b76a37e 100644
--- a/worlds/sm/variaRandomizer/rom/rom.py
+++ b/worlds/sm/variaRandomizer/rom/rom.py
@@ -86,7 +86,67 @@ def fillToNextBank(self):
             self.seek(self.maxAddress + BANK_SIZE - off - 1)
             self.writeByte(0xff)
         assert (self.maxAddress % BANK_SIZE) == 0
-        
+
+class FakeROM(ROM):
+    # to have the same code for real ROM and the webservice
+    def __init__(self, data={}):
+        super(FakeROM, self).__init__()
+        self.data = data
+        self.ipsPatches = []
+
+    def write(self, bytes):
+        for byte in bytes:
+            self.data[self.address] = byte
+            self.inc()
+
+    def read(self, byteCount):
+        bytes = []
+        for i in range(byteCount):
+            bytes.append(self.data[self.address])
+            self.inc()
+
+        return bytes
+
+    def ipsPatch(self, ipsPatches):
+        self.ipsPatches += ipsPatches
+
+    # generate ips from self data
+    def ips(self):
+        groupedData = {}
+        startAddress = -1
+        prevAddress = -1
+        curData = []
+        for address in sorted(self.data):
+            if address == prevAddress + 1:
+                curData.append(self.data[address])
+                prevAddress = address
+            else:
+                if len(curData) > 0:
+                    groupedData[startAddress] = curData
+                startAddress = address
+                prevAddress = address
+                curData = [self.data[startAddress]]
+        if startAddress != -1:
+            groupedData[startAddress] = curData
+
+        return IPS_Patch(groupedData)
+
+    # generate final IPS for web patching with first the IPS patches, then written data
+    def close(self):
+        self.mergedIPS = IPS_Patch()
+        for ips in self.ipsPatches:
+            self.mergedIPS.append(ips)
+        self.mergedIPS.append(self.ips())
+        #patchData = mergedIPS.encode()
+        #self.data = {}
+        #self.data["ips"] = base64.b64encode(patchData).decode()
+        #if mergedIPS.truncate_length is not None:
+        #    self.data["truncate_length"] = mergedIPS.truncate_length
+        #self.data["max_size"] = mergedIPS.max_size
+
+    def getPatchDict(self):
+        return self.mergedIPS.toDict()
+                
 class RealROM(ROM):
     def __init__(self, name):
         super(RealROM, self).__init__()
diff --git a/worlds/sm/variaRandomizer/rom/rompatcher.py b/worlds/sm/variaRandomizer/rom/rompatcher.py
index 2dcf554a0065..a350764a9c0e 100644
--- a/worlds/sm/variaRandomizer/rom/rompatcher.py
+++ b/worlds/sm/variaRandomizer/rom/rompatcher.py
@@ -7,7 +7,7 @@
 from ..utils.objectives import Objectives
 from ..graph.graph_utils import GraphUtils, getAccessPoint, locIdsByAreaAddresses, graphAreas
 from ..logic.logic import Logic
-from ..rom.rom import RealROM, snes_to_pc, pc_to_snes
+from ..rom.rom import FakeROM, snes_to_pc, pc_to_snes
 from ..rom.addresses import Addresses
 from ..rom.rom_patches import RomPatches
 from ..patches.patchaccess import PatchAccess
@@ -52,10 +52,10 @@ class RomPatcher:
     def __init__(self, settings=None, romFileName=None, magic=None, player=0):
         self.log = log.get('RomPatcher')
         self.settings = settings
-        self.romFileName = romFileName
+        #self.romFileName = romFileName
         self.patchAccess = PatchAccess()
         self.race = None
-        self.romFile = RealROM(romFileName)
+        self.romFile = FakeROM()
         #if magic is not None:
         #    from rom.race_mode import RaceModePatcher
         #    self.race = RaceModePatcher(self, magic)
@@ -312,7 +312,7 @@ def applyIPSPatches(self):
             self.applyStartAP(self.settings["startLocation"], plms, doors)
             self.applyPLMs(plms)
         except Exception as e:
-            raise Exception("Error patching {}. ({})".format(self.romFileName, e))
+            raise Exception("Error patching. ({})".format(e))
 
     def applyIPSPatch(self, patchName, patchDict=None, ipsDir=None):
         if patchDict is None:
@@ -493,6 +493,7 @@ def appendRoomWord(w, data):
 
     def commitIPS(self):
         self.romFile.ipsPatch(self.ipsPatches)
+        self.ipsPatches = []
 
     def writeSeed(self, seed):
         random.seed(seed)

From 258ea10c529e3ed1b5bfecd19c8aae9e1a54dbf8 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Fri, 10 Jan 2025 15:49:13 -0500
Subject: [PATCH 229/381] TUNIC: Modify UT support to make a better pattern
 (#3860)

* Modify UT support to make a better pattern

* Handle keyerror for logic_rules option

* Missed self.passthrough value setting

* Less laziness for passthrough

* Remove extra newline

* Fix missing using_ut = True, also remove now unnecessary try except since 0.5.1 is out

* New UT thing, it goes in this PR because it's been open for 5 months for a very very tiny change
---
 worlds/tunic/__init__.py   | 49 ++++++++++++++++++--------------
 worlds/tunic/er_scripts.py | 57 ++++++++++++++++++--------------------
 2 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 8525a3fc437d..1c326f78bd43 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -90,6 +90,10 @@ class TunicWorld(World):
     item_link_locations: Dict[int, Dict[str, List[Tuple[int, str]]]] = {}
     player_item_link_locations: Dict[str, List[Location]]
 
+    using_ut: bool  # so we can check if we're using UT only once
+    passthrough: Dict[str, Any]
+    ut_can_gen_without_yaml = True  # class var that tells it to ignore the player yaml
+
     def generate_early(self) -> None:
         if self.options.logic_rules >= LogicRules.option_no_major_glitches:
             self.options.laurels_zips.value = LaurelsZips.option_true
@@ -113,23 +117,28 @@ def generate_early(self) -> None:
         # Universal tracker stuff, shouldn't do anything in standard gen
         if hasattr(self.multiworld, "re_gen_passthrough"):
             if "TUNIC" in self.multiworld.re_gen_passthrough:
-                passthrough = self.multiworld.re_gen_passthrough["TUNIC"]
-                self.options.start_with_sword.value = passthrough["start_with_sword"]
-                self.options.keys_behind_bosses.value = passthrough["keys_behind_bosses"]
-                self.options.sword_progression.value = passthrough["sword_progression"]
-                self.options.ability_shuffling.value = passthrough["ability_shuffling"]
-                self.options.laurels_zips.value = passthrough["laurels_zips"]
-                self.options.ice_grappling.value = passthrough["ice_grappling"]
-                self.options.ladder_storage.value = passthrough["ladder_storage"]
-                self.options.ladder_storage_without_items = passthrough["ladder_storage_without_items"]
-                self.options.lanternless.value = passthrough["lanternless"]
-                self.options.maskless.value = passthrough["maskless"]
-                self.options.hexagon_quest.value = passthrough["hexagon_quest"]
-                self.options.entrance_rando.value = passthrough["entrance_rando"]
-                self.options.shuffle_ladders.value = passthrough["shuffle_ladders"]
+                self.using_ut = True
+                self.passthrough = self.multiworld.re_gen_passthrough["TUNIC"]
+                self.options.start_with_sword.value = self.passthrough["start_with_sword"]
+                self.options.keys_behind_bosses.value = self.passthrough["keys_behind_bosses"]
+                self.options.sword_progression.value = self.passthrough["sword_progression"]
+                self.options.ability_shuffling.value = self.passthrough["ability_shuffling"]
+                self.options.laurels_zips.value = self.passthrough["laurels_zips"]
+                self.options.ice_grappling.value = self.passthrough["ice_grappling"]
+                self.options.ladder_storage.value = self.passthrough["ladder_storage"]
+                self.options.ladder_storage_without_items = self.passthrough["ladder_storage_without_items"]
+                self.options.lanternless.value = self.passthrough["lanternless"]
+                self.options.maskless.value = self.passthrough["maskless"]
+                self.options.hexagon_quest.value = self.passthrough["hexagon_quest"]
+                self.options.entrance_rando.value = self.passthrough["entrance_rando"]
+                self.options.shuffle_ladders.value = self.passthrough["shuffle_ladders"]
                 self.options.fixed_shop.value = self.options.fixed_shop.option_false
                 self.options.laurels_location.value = self.options.laurels_location.option_anywhere
-                self.options.combat_logic.value = passthrough["combat_logic"]
+                self.options.combat_logic.value = self.passthrough["combat_logic"]
+            else:
+                self.using_ut = False
+        else:
+            self.using_ut = False
 
     @classmethod
     def stage_generate_early(cls, multiworld: MultiWorld) -> None:
@@ -331,12 +340,10 @@ def create_regions(self) -> None:
         self.ability_unlocks = randomize_ability_unlocks(self.random, self.options)
 
         # stuff for universal tracker support, can be ignored for standard gen
-        if hasattr(self.multiworld, "re_gen_passthrough"):
-            if "TUNIC" in self.multiworld.re_gen_passthrough:
-                passthrough = self.multiworld.re_gen_passthrough["TUNIC"]
-                self.ability_unlocks["Pages 24-25 (Prayer)"] = passthrough["Hexagon Quest Prayer"]
-                self.ability_unlocks["Pages 42-43 (Holy Cross)"] = passthrough["Hexagon Quest Holy Cross"]
-                self.ability_unlocks["Pages 52-53 (Icebolt)"] = passthrough["Hexagon Quest Icebolt"]
+        if self.using_ut:
+            self.ability_unlocks["Pages 24-25 (Prayer)"] = self.passthrough["Hexagon Quest Prayer"]
+            self.ability_unlocks["Pages 42-43 (Holy Cross)"] = self.passthrough["Hexagon Quest Holy Cross"]
+            self.ability_unlocks["Pages 52-53 (Icebolt)"] = self.passthrough["Hexagon Quest Icebolt"]
 
         # Ladders and Combat Logic uses ER rules with vanilla connections for easier maintenance
         if self.options.entrance_rando or self.options.shuffle_ladders or self.options.combat_logic:
diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py
index aa5833b4db36..ed9fc0120ddc 100644
--- a/worlds/tunic/er_scripts.py
+++ b/worlds/tunic/er_scripts.py
@@ -177,7 +177,7 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
     logic_tricks: Tuple[bool, int, int] = (laurels_zips, ice_grappling, ladder_storage)
 
     # marking that you don't immediately have laurels
-    if laurels_location == "10_fairies" and not hasattr(world.multiworld, "re_gen_passthrough"):
+    if laurels_location == "10_fairies" and not world.using_ut:
         has_laurels = False
 
     shop_count = 6
@@ -191,9 +191,8 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
                 break
 
     # If using Universal Tracker, restore portal_map. Could be cleaner, but it does not matter for UT even a little bit
-    if hasattr(world.multiworld, "re_gen_passthrough"):
-        if "TUNIC" in world.multiworld.re_gen_passthrough:
-            portal_map = portal_mapping.copy()
+    if world.using_ut:
+        portal_map = portal_mapping.copy()
 
     # create separate lists for dead ends and non-dead ends
     for portal in portal_map:
@@ -232,25 +231,24 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
         plando_connections = world.seed_groups[world.options.entrance_rando.value]["plando"]
 
     # universal tracker support stuff, don't need to care about region dependency
-    if hasattr(world.multiworld, "re_gen_passthrough"):
-        if "TUNIC" in world.multiworld.re_gen_passthrough:
-            plando_connections.clear()
-            # universal tracker stuff, won't do anything in normal gen
-            for portal1, portal2 in world.multiworld.re_gen_passthrough["TUNIC"]["Entrance Rando"].items():
-                portal_name1 = ""
-                portal_name2 = ""
-
-                for portal in portal_mapping:
-                    if portal.scene_destination() == portal1:
-                        portal_name1 = portal.name
-                        # connected_regions.update(add_dependent_regions(portal.region, logic_rules))
-                    if portal.scene_destination() == portal2:
-                        portal_name2 = portal.name
-                        # connected_regions.update(add_dependent_regions(portal.region, logic_rules))
-                # shops have special handling
-                if not portal_name2 and portal2 == "Shop, Previous Region_":
-                    portal_name2 = "Shop Portal"
-                plando_connections.append(PlandoConnection(portal_name1, portal_name2, "both"))
+    if world.using_ut:
+        plando_connections.clear()
+        # universal tracker stuff, won't do anything in normal gen
+        for portal1, portal2 in world.passthrough["Entrance Rando"].items():
+            portal_name1 = ""
+            portal_name2 = ""
+
+            for portal in portal_mapping:
+                if portal.scene_destination() == portal1:
+                    portal_name1 = portal.name
+                    # connected_regions.update(add_dependent_regions(portal.region, logic_rules))
+                if portal.scene_destination() == portal2:
+                    portal_name2 = portal.name
+                    # connected_regions.update(add_dependent_regions(portal.region, logic_rules))
+            # shops have special handling
+            if not portal_name2 and portal2 == "Shop, Previous Region_":
+                portal_name2 = "Shop Portal"
+            plando_connections.append(PlandoConnection(portal_name1, portal_name2, "both"))
 
     non_dead_end_regions = set()
     for region_name, region_info in world.er_regions.items():
@@ -362,7 +360,7 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
         # if we have plando connections, our connected regions may change somewhat
         connected_regions = update_reachable_regions(connected_regions, traversal_reqs, has_laurels, logic_tricks)
 
-    if fixed_shop and not hasattr(world.multiworld, "re_gen_passthrough"):
+    if fixed_shop and not world.using_ut:
         portal1 = None
         for portal in two_plus:
             if portal.scene_destination() == "Overworld Redux, Windmill_":
@@ -392,7 +390,7 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
     fail_count = 0
     while len(connected_regions) < len(non_dead_end_regions):
         # if this is universal tracker, just break immediately and move on
-        if hasattr(world.multiworld, "re_gen_passthrough"):
+        if world.using_ut:
             break
         # if the connected regions length stays unchanged for too long, it's stuck in a loop
         # should, hopefully, only ever occur if someone plandos connections poorly
@@ -445,9 +443,8 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
             random_object.shuffle(two_plus)
 
     # for universal tracker, we want to skip shop gen
-    if hasattr(world.multiworld, "re_gen_passthrough"):
-        if "TUNIC" in world.multiworld.re_gen_passthrough:
-            shop_count = 0
+    if world.using_ut:
+        shop_count = 0
     
     for i in range(shop_count):
         portal1 = two_plus.pop()
@@ -462,7 +459,7 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
     # connect dead ends to random non-dead ends
     # none of the key events are in dead ends, so we don't need to do gate_before_switch
     while len(dead_ends) > 0:
-        if hasattr(world.multiworld, "re_gen_passthrough"):
+        if world.using_ut:
             break
         portal1 = two_plus.pop()
         portal2 = dead_ends.pop()
@@ -470,7 +467,7 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
     # then randomly connect the remaining portals to each other
     # every region is accessible, so gate_before_switch is not necessary
     while len(two_plus) > 1:
-        if hasattr(world.multiworld, "re_gen_passthrough"):
+        if world.using_ut:
             break
         portal1 = two_plus.pop()
         portal2 = two_plus.pop()

From 96b500679d263859dc4efb2d3b56385bc65fd84b Mon Sep 17 00:00:00 2001
From: Alchav <59858495+Alchav@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:40:50 -0500
Subject: [PATCH 230/381] LTTP: Add missing GT Pre-Moldorm Bomb Wall Logic
 (#4440)

---
 worlds/alttp/Rules.py                         |  4 ++--
 worlds/alttp/test/dungeons/TestGanonsTower.py | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/worlds/alttp/Rules.py b/worlds/alttp/Rules.py
index a664f8ac9b79..386e0b0e9e11 100644
--- a/worlds/alttp/Rules.py
+++ b/worlds/alttp/Rules.py
@@ -592,9 +592,9 @@ def global_rules(multiworld: MultiWorld, player: int):
              lambda state: can_kill_most_things(state, player, 8) and has_fire_source(state, player) and state.multiworld.get_entrance('Ganons Tower Torch Rooms', player).parent_region.dungeon.bosses['middle'].can_defeat(state))
     set_rule(multiworld.get_location('Ganons Tower - Mini Helmasaur Key Drop', player), lambda state: can_kill_most_things(state, player, 1))
     set_rule(multiworld.get_location('Ganons Tower - Pre-Moldorm Chest', player),
-             lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 7))
+             lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 7) and can_use_bombs(state, player))
     set_rule(multiworld.get_entrance('Ganons Tower Moldorm Door', player),
-             lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 8))
+             lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 8) and can_use_bombs(state, player))
     set_rule(multiworld.get_entrance('Ganons Tower Moldorm Gap', player),
              lambda state: state.has('Hookshot', player) and state.multiworld.get_entrance('Ganons Tower Moldorm Gap', player).parent_region.dungeon.bosses['top'].can_defeat(state))
     set_defeat_dungeon_boss_rule(multiworld.get_location('Agahnim 2', player))
diff --git a/worlds/alttp/test/dungeons/TestGanonsTower.py b/worlds/alttp/test/dungeons/TestGanonsTower.py
index 08274d0fe7d9..4b8fc4c295b2 100644
--- a/worlds/alttp/test/dungeons/TestGanonsTower.py
+++ b/worlds/alttp/test/dungeons/TestGanonsTower.py
@@ -130,19 +130,21 @@ def testGanonsTower(self):
 
             ["Ganons Tower - Pre-Moldorm Chest", False, []],
             ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Progressive Bow']],
+            ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Bomb Upgrade (50)']],
             ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Big Key (Ganons Tower)']],
             ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Lamp', 'Fire Rod']],
-            ["Ganons Tower - Pre-Moldorm Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp']],
-            ["Ganons Tower - Pre-Moldorm Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod']],
+            ["Ganons Tower - Pre-Moldorm Chest", True, ['Bomb Upgrade (50)', 'Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp']],
+            ["Ganons Tower - Pre-Moldorm Chest", True, ['Bomb Upgrade (50)', 'Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod']],
 
             ["Ganons Tower - Validation Chest", False, []],
             ["Ganons Tower - Validation Chest", False, [], ['Hookshot']],
             ["Ganons Tower - Validation Chest", False, [], ['Progressive Bow']],
+            ["Ganons Tower - Validation Chest", False, [], ['Bomb Upgrade (50)']],
             ["Ganons Tower - Validation Chest", False, [], ['Big Key (Ganons Tower)']],
             ["Ganons Tower - Validation Chest", False, [], ['Lamp', 'Fire Rod']],
             ["Ganons Tower - Validation Chest", False, [], ['Progressive Sword', 'Hammer']],
-            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Progressive Sword']],
-            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Progressive Sword']],
-            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Hammer']],
-            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Validation Chest", True, ['Bomb Upgrade (50)', 'Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Progressive Sword']],
+            ["Ganons Tower - Validation Chest", True, ['Bomb Upgrade (50)', 'Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Progressive Sword']],
+            ["Ganons Tower - Validation Chest", True, ['Bomb Upgrade (50)', 'Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Validation Chest", True, ['Bomb Upgrade (50)', 'Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Hammer']],
         ])
\ No newline at end of file

From 112bfe0933742e45c5c423e303235a9b8a433440 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Fri, 10 Jan 2025 16:48:15 -0500
Subject: [PATCH 231/381] TUNIC: Logic for Beneath the Vault Bridge Switch
 #4432

---
 worlds/tunic/er_rules.py | 2 +-
 worlds/tunic/rules.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index 6e9ae551dba2..f7568df81e49 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1675,7 +1675,7 @@ def set_er_location_rules(world: "TunicWorld") -> None:
 
     # Beneath the Vault
     set_rule(world.get_location("Beneath the Fortress - Bridge"),
-             lambda state: has_melee(state, player) or state.has_any({laurels, fire_wand}, player))
+             lambda state: has_melee(state, player) or state.has_any((laurels, fire_wand, ice_dagger, gun), player))
 
     # Quarry
     set_rule(world.get_location("Quarry - [Central] Above Ladder Dash Chest"),
diff --git a/worlds/tunic/rules.py b/worlds/tunic/rules.py
index 30b7cee9d07b..959376787d0e 100644
--- a/worlds/tunic/rules.py
+++ b/worlds/tunic/rules.py
@@ -323,7 +323,7 @@ def set_location_rules(world: "TunicWorld") -> None:
 
     # Beneath the Vault
     set_rule(world.get_location("Beneath the Fortress - Bridge"),
-             lambda state: has_melee(state, player) or state.has_any({laurels, fire_wand}, player))
+             lambda state: has_melee(state, player) or state.has_any((laurels, fire_wand, ice_dagger, gun), player))
     set_rule(world.get_location("Beneath the Fortress - Obscured Behind Waterfall"),
              lambda state: has_melee(state, player) and has_lantern(state, world))
 

From c2bd9df0f721cf71b154abe25e128bb9b3b8865e Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Fri, 10 Jan 2025 23:28:38 +0100
Subject: [PATCH 232/381] Subnautica: fix typo and remove no longer used logger
 (#4456)

---
 worlds/subnautica/__init__.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/worlds/subnautica/__init__.py b/worlds/subnautica/__init__.py
index c3cf40a7c010..850c23c7dd24 100644
--- a/worlds/subnautica/__init__.py
+++ b/worlds/subnautica/__init__.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging
 import itertools
 from typing import List, Dict, Any, cast
 
@@ -10,13 +9,11 @@
 from . import locations
 from . import creatures
 from . import options
-from .items import item_table, group_items, items_by_type, ItemType
+from .items import item_table, group_items
 from .rules import set_rules
 
-logger = logging.getLogger("Subnautica")
 
-
-class SubnaticaWeb(WebWorld):
+class SubnauticaWeb(WebWorld):
     tutorials = [Tutorial(
         "Multiworld Setup Guide",
         "A guide to setting up the Subnautica randomizer connected to an Archipelago Multiworld",
@@ -38,7 +35,7 @@ class SubnauticaWorld(World):
     You must find a cure for yourself, build an escape rocket, and leave the planet.
     """
     game = "Subnautica"
-    web = SubnaticaWeb()
+    web = SubnauticaWeb()
 
     item_name_to_id = {data.name: item_id for item_id, data in items.item_table.items()}
     location_name_to_id = all_locations

From d97ee5d209245e436f141d4aae042c454ef631f0 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Fri, 10 Jan 2025 23:28:57 +0100
Subject: [PATCH 233/381] Core: update certifi (#4453)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 946546cb6961..cd045b874bdd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ schema>=0.7.7
 kivy>=2.3.0
 bsdiff4>=1.2.4
 platformdirs>=4.2.2
-certifi>=2024.8.30
+certifi>=2024.12.14
 cython>=3.0.11
 cymem>=2.0.8
 orjson>=3.10.7

From 29b34ca9fde17cbf697b691dd8136c55db322cc9 Mon Sep 17 00:00:00 2001
From: Alchav <59858495+Alchav@users.noreply.github.com>
Date: Fri, 10 Jan 2025 19:31:29 -0500
Subject: [PATCH 234/381] =?UTF-8?q?Pok=C3=A9mon=20R/B:=20Fix=20Route=2011-?=
 =?UTF-8?q?E=20to=20Route-12-W=20logic=20(#4435)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worlds/pokemon_rb/regions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/pokemon_rb/regions.py b/worlds/pokemon_rb/regions.py
index 575f4a61ca6f..d4b8a8f50678 100644
--- a/worlds/pokemon_rb/regions.py
+++ b/worlds/pokemon_rb/regions.py
@@ -1718,7 +1718,7 @@ def create_regions(world):
     connect(multiworld, player, "Vermilion City", "Vermilion City-Dock", lambda state: state.has("S.S. Ticket", player))
     connect(multiworld, player, "Vermilion City", "Route 11")
     connect(multiworld, player, "Route 12-N", "Route 12-S", lambda state: logic.can_surf(state, world, player))
-    connect(multiworld, player, "Route 12-W", "Route 11-E", lambda state: state.has("Poke Flute", player))
+    connect(multiworld, player, "Route 12-W", "Route 11-E")
     connect(multiworld, player, "Route 12-W", "Route 12-N", lambda state: state.has("Poke Flute", player))
     connect(multiworld, player, "Route 12-W", "Route 12-S", lambda state: state.has("Poke Flute", player))
     connect(multiworld, player, "Route 12-S", "Route 12-Grass", lambda state: logic.can_cut(state, world, player), one_way=True)

From adcb2f59ca94bc472cd82f2eb3c96a53ce639cba Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sat, 11 Jan 2025 22:16:01 +0100
Subject: [PATCH 235/381] MultiServer: Correct tying of Context.groups (#4460)

---
 MultiServer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MultiServer.py b/MultiServer.py
index 0601e179152c..8aabdea3e2bf 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -444,7 +444,7 @@ def _load(self, decoded_obj: dict, game_data_packages: typing.Dict[str, typing.A
 
         self.slot_info = decoded_obj["slot_info"]
         self.games = {slot: slot_info.game for slot, slot_info in self.slot_info.items()}
-        self.groups = {slot: slot_info.group_members for slot, slot_info in self.slot_info.items()
+        self.groups = {slot: set(slot_info.group_members) for slot, slot_info in self.slot_info.items()
                        if slot_info.type == SlotType.group}
 
         self.clients = {0: {}}

From 70942eda8cec0f3a92bc1ebcb8dba2401f7ed90a Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Sat, 11 Jan 2025 22:54:48 -0800
Subject: [PATCH 236/381] BizHawkClient: Fix version warning not falling
 through to regular execution (#4463)

---
 data/lua/connector_bizhawk_generic.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/lua/connector_bizhawk_generic.lua b/data/lua/connector_bizhawk_generic.lua
index 00021b241f9a..6c5af87e1a67 100644
--- a/data/lua/connector_bizhawk_generic.lua
+++ b/data/lua/connector_bizhawk_generic.lua
@@ -613,9 +613,11 @@ end)
 
 if bizhawk_major < 2 or (bizhawk_major == 2 and bizhawk_minor < 7) then
     print("Must use BizHawk 2.7.0 or newer")
-elseif bizhawk_major > 2 or (bizhawk_major == 2 and bizhawk_minor > 9) then
-    print("Warning: This version of BizHawk is newer than this script. If it doesn't work, consider downgrading to 2.9.")
 else
+    if bizhawk_major > 2 or (bizhawk_major == 2 and bizhawk_minor > 10) then
+        print("Warning: This version of BizHawk is newer than this script. If it doesn't work, consider downgrading to 2.10.")
+    end
+
     if emu.getsystemid() == "NULL" then
         print("No ROM is loaded. Please load a ROM.")
         while emu.getsystemid() == "NULL" do

From 4edca0ce541daf9941a659290145213ce31bf0e9 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Sat, 11 Jan 2025 23:03:31 -0800
Subject: [PATCH 237/381] BizHawkClient: Add command to get size of memory
 domain (#4439)

* Mega Man 2: Remove mm2 commands from client if rom size too small
---
 data/lua/connector_bizhawk_generic.lua | 23 +++++++++++++++++++++++
 worlds/_bizhawk/__init__.py            | 12 +++++++++++-
 worlds/mm2/client.py                   | 11 ++++++++++-
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/data/lua/connector_bizhawk_generic.lua b/data/lua/connector_bizhawk_generic.lua
index 6c5af87e1a67..c2e8f91c0d97 100644
--- a/data/lua/connector_bizhawk_generic.lua
+++ b/data/lua/connector_bizhawk_generic.lua
@@ -121,6 +121,14 @@ Response:
 
     Expected Response Type: `HASH_RESPONSE`
 
+- `MEMORY_SIZE`  
+    Returns the size in bytes of the specified memory domain.
+
+    Expected Response Type: `MEMORY_SIZE_RESPONSE`
+
+    Additional Fields:
+    - `domain` (`string`): The name of the memory domain to check
+
 - `GUARD`  
     Checks a section of memory against `expected_data`. If the bytes starting
     at `address` do not match `expected_data`, the response will have `value`
@@ -216,6 +224,12 @@ Response:
     Additional Fields:
     - `value` (`string`): The returned hash
 
+- `MEMORY_SIZE_RESPONSE`  
+    Contains the size in bytes of the specified memory domain.
+
+    Additional Fields:
+    - `value` (`number`): The size of the domain in bytes
+
 - `GUARD_RESPONSE`  
     The result of an attempted `GUARD` request.
 
@@ -376,6 +390,15 @@ request_handlers = {
         return res
     end,
 
+    ["MEMORY_SIZE"] = function (req)
+        local res = {}
+
+        res["type"] = "MEMORY_SIZE_RESPONSE"
+        res["value"] = memory.getmemorydomainsize(req["domain"])
+
+        return res
+    end,
+
     ["GUARD"] = function (req)
         local res = {}
         local expected_data = base64.decode(req["expected_data"])
diff --git a/worlds/_bizhawk/__init__.py b/worlds/_bizhawk/__init__.py
index 3627f385c2d3..e7b8edc0b6d7 100644
--- a/worlds/_bizhawk/__init__.py
+++ b/worlds/_bizhawk/__init__.py
@@ -151,7 +151,7 @@ async def ping(ctx: BizHawkContext) -> None:
 
 
 async def get_hash(ctx: BizHawkContext) -> str:
-    """Gets the system name for the currently loaded ROM"""
+    """Gets the hash value of the currently loaded ROM"""
     res = (await send_requests(ctx, [{"type": "HASH"}]))[0]
 
     if res["type"] != "HASH_RESPONSE":
@@ -160,6 +160,16 @@ async def get_hash(ctx: BizHawkContext) -> str:
     return res["value"]
 
 
+async def get_memory_size(ctx: BizHawkContext, domain: str) -> int:
+    """Gets the size in bytes of the specified memory domain"""
+    res = (await send_requests(ctx, [{"type": "MEMORY_SIZE", "domain": domain}]))[0]
+
+    if res["type"] != "MEMORY_SIZE_RESPONSE":
+        raise SyncError(f"Expected response of type MEMORY_SIZE_RESPONSE but got {res['type']}")
+
+    return res["value"]
+
+
 async def get_system(ctx: BizHawkContext) -> str:
     """Gets the system name for the currently loaded ROM"""
     res = (await send_requests(ctx, [{"type": "SYSTEM"}]))[0]
diff --git a/worlds/mm2/client.py b/worlds/mm2/client.py
index aaa0813c763a..96c477757dcd 100644
--- a/worlds/mm2/client.py
+++ b/worlds/mm2/client.py
@@ -214,10 +214,19 @@ class MegaMan2Client(BizHawkClient):
     last_wily: Optional[int] = None  # default to wily 1
 
     async def validate_rom(self, ctx: "BizHawkClientContext") -> bool:
-        from worlds._bizhawk import RequestFailedError, read
+        from worlds._bizhawk import RequestFailedError, read, get_memory_size
         from . import MM2World
 
         try:
+            if (await get_memory_size(ctx.bizhawk_ctx, "PRG ROM")) < 0x3FFB0:
+                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
+
             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):

From 0fc722cb28b17b155de2d16baef487eaf711766b Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Sun, 12 Jan 2025 11:01:02 -0500
Subject: [PATCH 238/381] Stardew Valley: Remove seasonal farming event, use
 regions instead (#4379)

---
 worlds/stardew_valley/__init__.py             | 28 +++----------------
 worlds/stardew_valley/logic/farming_logic.py  | 15 +++++-----
 .../strings/ap_names/event_names.py           |  4 ---
 worlds/stardew_valley/test/rules/TestTools.py |  5 +---
 4 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 6ba0e35e0a3a..9da650520f05 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -5,29 +5,23 @@
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
 from Options import PerGameCommonOptions
 from worlds.AutoWorld import World, WebWorld
-from . import rules
 from .bundles.bundle_room import BundleRoom
 from .bundles.bundles import get_all_bundles
-from .content import content_packs, StardewContent, unpack_content, create_content
+from .content import StardewContent, create_content
 from .early_items import setup_early_items
 from .items import item_table, create_items, ItemData, Group, items_by_group, get_all_filler_items, remove_limited_amount_packs
 from .locations import location_table, create_locations, LocationData, locations_by_tag
-from .logic.bundle_logic import BundleLogic
 from .logic.logic import StardewLogic
-from .logic.time_logic import MAX_MONTHS
 from .options import StardewValleyOptions, SeasonRandomization, Goal, BundleRandomization, EnabledFillerBuffs, NumberOfMovementBuffs, \
-    BuildingProgression, ExcludeGingerIsland, TrapItems, EntranceRandomization, FarmType, Walnutsanity
+    BuildingProgression, ExcludeGingerIsland, TrapItems, EntranceRandomization, FarmType
 from .options.forced_options import force_change_options_if_incompatible
 from .options.option_groups import sv_option_groups
 from .options.presets import sv_options_presets
 from .regions import create_regions
 from .rules import set_rules
-from .stardew_rule import True_, StardewRule, HasProgressionPercent, true_
+from .stardew_rule import True_, StardewRule, HasProgressionPercent
 from .strings.ap_names.event_names import Event
-from .strings.entrance_names import Entrance as EntranceName
 from .strings.goal_names import Goal as GoalName
-from .strings.metal_names import Ore
-from .strings.region_names import Region as RegionName, LogicRegion
 
 logger = logging.getLogger(__name__)
 
@@ -159,7 +153,7 @@ def create_items(self):
         self.multiworld.itempool += created_items
 
         setup_early_items(self.multiworld, self.options, self.content, self.player, self.random)
-        self.setup_player_events()
+        self.setup_logic_events()
         self.setup_victory()
 
         # This is really a best-effort to get the total progression items count. It is mostly used to spread grinds across spheres are push back locations that
@@ -199,20 +193,6 @@ def precollect_farm_type_items(self):
         if self.options.farm_type == FarmType.option_meadowlands and self.options.building_progression & BuildingProgression.option_progressive:
             self.multiworld.push_precollected(self.create_starting_item("Progressive Coop"))
 
-    def setup_player_events(self):
-        self.setup_action_events()
-        self.setup_logic_events()
-
-    def setup_action_events(self):
-        spring_farming = LocationData(None, LogicRegion.spring_farming, Event.spring_farming)
-        self.create_event_location(spring_farming, true_, Event.spring_farming)
-        summer_farming = LocationData(None, LogicRegion.summer_farming, Event.summer_farming)
-        self.create_event_location(summer_farming, true_, Event.summer_farming)
-        fall_farming = LocationData(None, LogicRegion.fall_farming, Event.fall_farming)
-        self.create_event_location(fall_farming, true_, Event.fall_farming)
-        winter_farming = LocationData(None, LogicRegion.winter_farming, Event.winter_farming)
-        self.create_event_location(winter_farming, true_, Event.winter_farming)
-
     def setup_logic_events(self):
         def register_event(name: str, region: str, rule: StardewRule):
             event_location = LocationData(None, region, name)
diff --git a/worlds/stardew_valley/logic/farming_logic.py b/worlds/stardew_valley/logic/farming_logic.py
index 88523bb85d8e..cb8a55e6b42f 100644
--- a/worlds/stardew_valley/logic/farming_logic.py
+++ b/worlds/stardew_valley/logic/farming_logic.py
@@ -10,17 +10,16 @@
 from .tool_logic import ToolLogicMixin
 from .. import options
 from ..stardew_rule import StardewRule, True_, false_
-from ..strings.ap_names.event_names import Event
 from ..strings.fertilizer_names import Fertilizer
-from ..strings.region_names import Region
+from ..strings.region_names import Region, LogicRegion
 from ..strings.season_names import Season
 from ..strings.tool_names import Tool
 
-farming_event_by_season = {
-    Season.spring: Event.spring_farming,
-    Season.summer: Event.summer_farming,
-    Season.fall: Event.fall_farming,
-    Season.winter: Event.winter_farming,
+farming_region_by_season = {
+    Season.spring: LogicRegion.spring_farming,
+    Season.summer: LogicRegion.summer_farming,
+    Season.fall: LogicRegion.fall_farming,
+    Season.winter: LogicRegion.winter_farming,
 }
 
 
@@ -54,7 +53,7 @@ def can_plant_and_grow_item(self, seasons: Union[str, Tuple[str]]) -> StardewRul
         if isinstance(seasons, str):
             seasons = (seasons,)
 
-        return self.logic.or_(*(self.logic.received(farming_event_by_season[season]) for season in seasons))
+        return self.logic.or_(*(self.logic.region.can_reach(farming_region_by_season[season]) for season in seasons))
 
     def has_island_farm(self) -> StardewRule:
         if self.options.exclude_ginger_island == options.ExcludeGingerIsland.option_false:
diff --git a/worlds/stardew_valley/strings/ap_names/event_names.py b/worlds/stardew_valley/strings/ap_names/event_names.py
index 449bb6720964..b7881b3bfd79 100644
--- a/worlds/stardew_valley/strings/ap_names/event_names.py
+++ b/worlds/stardew_valley/strings/ap_names/event_names.py
@@ -8,9 +8,5 @@ def event(name: str):
 
 class Event:
     victory = event("Victory")
-    spring_farming = event("Spring Farming")
-    summer_farming = event("Summer Farming")
-    fall_farming = event("Fall Farming")
-    winter_farming = event("Winter Farming")
 
     received_walnuts = event("Received Walnuts")
diff --git a/worlds/stardew_valley/test/rules/TestTools.py b/worlds/stardew_valley/test/rules/TestTools.py
index 5b8975f4e707..31dd5819165e 100644
--- a/worlds/stardew_valley/test/rules/TestTools.py
+++ b/worlds/stardew_valley/test/rules/TestTools.py
@@ -1,7 +1,7 @@
 from collections import Counter
 
 from .. import SVTestBase
-from ... import Event, options
+from ... import options
 from ...options import ToolProgression, SeasonRandomization
 from ...strings.entrance_names import Entrance
 from ...strings.region_names import Region
@@ -74,12 +74,10 @@ def test_old_master_cannoli(self):
         self.assert_rule_true(rule, self.multiworld.state)
 
         self.remove(fall)
-        self.remove(self.create_item(Event.fall_farming))
         self.assert_rule_false(rule, self.multiworld.state)
         self.remove(tuesday)
 
         green_house = self.create_item("Greenhouse")
-        self.collect(self.create_item(Event.fall_farming))
         self.multiworld.state.collect(green_house)
         self.assert_rule_false(rule, self.multiworld.state)
 
@@ -88,7 +86,6 @@ def test_old_master_cannoli(self):
         self.assertTrue(self.multiworld.get_location("Old Master Cannoli", 1).access_rule(self.multiworld.state))
 
         self.remove(green_house)
-        self.remove(self.create_item(Event.fall_farming))
         self.assert_rule_false(rule, self.multiworld.state)
         self.remove(friday)
 

From 9928639ce2c64414fd1a96a1d85d63d33d70e073 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sun, 12 Jan 2025 11:01:42 -0500
Subject: [PATCH 239/381] Docs: Fix Typo in Rich Text Options Flag
 Documentation (#4462)

---
 Options.py          | 2 +-
 docs/options api.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Options.py b/Options.py
index f4724e9747b0..135a1dcb5398 100644
--- a/Options.py
+++ b/Options.py
@@ -137,7 +137,7 @@ class Option(typing.Generic[T], metaclass=AssembleOptions):
     If this is False, the docstring is instead interpreted as plain text, and
     displayed as-is on the WebHost with whitespace preserved.
 
-    If this is None, it inherits the value of `World.rich_text_options_doc`. For
+    If this is None, it inherits the value of `WebWorld.rich_text_options_doc`. For
     backwards compatibility, this defaults to False, but worlds are encouraged to
     set it to True and use reStructuredText for their Option documentation.
 
diff --git a/docs/options api.md b/docs/options api.md
index d48a56d6c76d..453cbc7e2d36 100644
--- a/docs/options api.md	
+++ b/docs/options api.md	
@@ -95,7 +95,7 @@ user hovers over the yellow "(?)" icon, and included in the YAML templates gener
 The WebHost can display Option documentation either as plain text with all whitespace preserved (other than the base
 indentation), or as HTML generated from the standard Python [reStructuredText] format. Although plain text is the
 default for backwards compatibility, world authors are encouraged to write their Option documentation as
-reStructuredText and enable rich text rendering by setting `World.rich_text_options_doc = True`.
+reStructuredText and enable rich text rendering by setting `WebWorld.rich_text_options_doc = True`.
 
 [reStructuredText]: https://docutils.sourceforge.io/rst.html
 

From 3f935aac13251d3e6780c127592b7542cc65f770 Mon Sep 17 00:00:00 2001
From: Justus Lind <DeamonHunter@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:59:16 +1000
Subject: [PATCH 240/381] Muse Dash: Change Data storage from a .txt file to a
 .py file and Filter Webhost Song Lists correctly (#4234)

---
 worlds/musedash/Items.py                     |   1 +
 worlds/musedash/MuseDashCollection.py        |  98 +--
 worlds/musedash/MuseDashData.py              | 615 +++++++++++++++++++
 worlds/musedash/MuseDashData.txt             | 597 ------------------
 worlds/musedash/Options.py                   |  29 +-
 worlds/musedash/__init__.py                  |   9 +-
 worlds/musedash/test/TestDifficultyRanges.py |  12 +-
 7 files changed, 656 insertions(+), 705 deletions(-)
 create mode 100644 worlds/musedash/MuseDashData.py
 delete mode 100644 worlds/musedash/MuseDashData.txt

diff --git a/worlds/musedash/Items.py b/worlds/musedash/Items.py
index 63fd3aa51b94..027a9002d525 100644
--- a/worlds/musedash/Items.py
+++ b/worlds/musedash/Items.py
@@ -6,6 +6,7 @@ class SongData(NamedTuple):
     """Special data container to contain the metadata of each song to make filtering work."""
 
     code: Optional[int]
+    uid: str
     album: str
     streamer_mode: bool
     easy: Optional[int]
diff --git a/worlds/musedash/MuseDashCollection.py b/worlds/musedash/MuseDashCollection.py
index 9e8c9214a1dd..64aa6ca49ae3 100644
--- a/worlds/musedash/MuseDashCollection.py
+++ b/worlds/musedash/MuseDashCollection.py
@@ -1,13 +1,9 @@
-from .Items import SongData, AlbumData
-from typing import Dict, List, Set, Optional
+from .Items import SongData
+from .MuseDashData import SONG_DATA
+from typing import Dict, List, Set
 from collections import ChainMap
 
 
-def load_text_file(name: str) -> str:
-    import pkgutil
-    return pkgutil.get_data(__name__, name).decode()
-
-
 class MuseDashCollections:
     """Contains all the data of Muse Dash, loaded from MuseDashData.txt."""
     STARTING_CODE = 2900000
@@ -33,15 +29,6 @@ class MuseDashCollections:
         "Rin Len's Mirrorland",  # Paid DLC not included in Muse Plus
     ]
 
-    DIFF_OVERRIDES: List[str] = [
-        "MuseDash ka nanika hi",
-        "Rush-Hour",
-        "Find this Month's Featured Playlist",
-        "PeroPero in the Universe",
-        "umpopoff",
-        "P E R O P E R O Brother Dance",
-    ]
-    
     REMOVED_SONGS = [
         "CHAOS Glitch",
         "FM 17314 SUGAR RADIO",
@@ -50,9 +37,7 @@ class MuseDashCollections:
         "Tsukuyomi Ni Naru Replaced",
     ]
 
-    album_items: Dict[str, AlbumData] = {}
-    album_locations: Dict[str, int] = {}
-    song_items: Dict[str, SongData] = {}
+    song_items = SONG_DATA
     song_locations: Dict[str, int] = {}
 
     trap_items: Dict[str, int] = {
@@ -65,7 +50,7 @@ class MuseDashCollections:
         "Gray Scale Trap": STARTING_CODE + 7,
         "Nyaa SFX Trap": STARTING_CODE + 8,
         "Error SFX Trap": STARTING_CODE + 9,
-        "Focus Line Trap": STARTING_CODE + 10,  
+        "Focus Line Trap": STARTING_CODE + 10,
     }
 
     sfx_trap_items: List[str] = [
@@ -85,65 +70,13 @@ class MuseDashCollections:
         "Extra Life": 1,
     }
 
-    item_names_to_id: ChainMap = ChainMap({}, filler_items, trap_items)
-    location_names_to_id: ChainMap = ChainMap(song_locations, album_locations)
+    item_names_to_id: ChainMap = ChainMap({k: v.code for k, v in SONG_DATA.items()}, filler_items, trap_items)
+    location_names_to_id: ChainMap = ChainMap(song_locations)
 
     def __init__(self) -> None:
         self.item_names_to_id[self.MUSIC_SHEET_NAME] = self.MUSIC_SHEET_CODE
 
-        item_id_index = self.STARTING_CODE + 50
-        full_file = load_text_file("MuseDashData.txt")
-        seen_albums = set()
-        for line in full_file.splitlines():
-            line = line.strip()
-            sections = line.split("|")
-
-            album = sections[2]
-            if album not in seen_albums:
-                seen_albums.add(album)
-                self.album_items[album] = AlbumData(item_id_index)
-                item_id_index += 1
-
-            # Data is in the format 'Song|UID|Album|StreamerMode|EasyDiff|HardDiff|MasterDiff|SecretDiff'
-            song_name = sections[0]
-            # [1] is used in the client copy to make sure item id's match.
-            steamer_mode = sections[3] == "True"
-
-            if song_name in self.DIFF_OVERRIDES:
-                # These songs use non-standard difficulty values. Which are being overriden with standard values.
-                # But also avoid filling any missing difficulties (i.e. 0s) with a difficulty value.
-                if sections[4] != '0':
-                    diff_of_easy = 4
-                else:
-                    diff_of_easy = None
-
-                if sections[5] != '0':
-                    diff_of_hard = 7
-                else:
-                    diff_of_hard = None
-
-                if sections[6] != '0':
-                    diff_of_master = 10
-                else:
-                    diff_of_master = None
-            else:
-                diff_of_easy = self.parse_song_difficulty(sections[4])
-                diff_of_hard = self.parse_song_difficulty(sections[5])
-                diff_of_master = self.parse_song_difficulty(sections[6])
-
-            self.song_items[song_name] = SongData(item_id_index, album, steamer_mode,
-                                                  diff_of_easy, diff_of_hard, diff_of_master)
-            item_id_index += 1
-
-        self.item_names_to_id.update({name: data.code for name, data in self.song_items.items()})
-        self.item_names_to_id.update({name: data.code for name, data in self.album_items.items()})
-
         location_id_index = self.STARTING_CODE
-        for name in self.album_items.keys():
-            self.album_locations[f"{name}-0"] = location_id_index
-            self.album_locations[f"{name}-1"] = location_id_index + 1
-            location_id_index += 2
-
         for name in self.song_items.keys():
             self.song_locations[f"{name}-0"] = location_id_index
             self.song_locations[f"{name}-1"] = location_id_index + 1
@@ -157,7 +90,7 @@ def get_songs_with_settings(self, dlc_songs: Set[str], streamer_mode_active: boo
         for songKey, songData in self.song_items.items():
             if not self.song_matches_dlc_filter(songData, dlc_songs):
                 continue
-                
+
             if songKey in self.REMOVED_SONGS:
                 continue
 
@@ -193,18 +126,3 @@ def song_matches_dlc_filter(self, song: SongData, dlc_songs: Set[str]) -> bool:
             return True
 
         return False
-
-    def parse_song_difficulty(self, difficulty: str) -> Optional[int]:
-        """Attempts to parse the song difficulty."""
-        if len(difficulty) <= 0 or difficulty == "?" or difficulty == "¿":
-            return None
-
-        # 0 is used as a filler and no songs actually have a 0 difficulty song.
-        if difficulty == "0":
-            return None
-
-        # Curse the 2023 april fools update. Used on 3rd Avenue.
-        if difficulty == "〇":
-            return 10
-
-        return int(difficulty)
diff --git a/worlds/musedash/MuseDashData.py b/worlds/musedash/MuseDashData.py
new file mode 100644
index 000000000000..1700f956aa35
--- /dev/null
+++ b/worlds/musedash/MuseDashData.py
@@ -0,0 +1,615 @@
+from .Items import SongData
+from typing import Dict
+
+
+# Auto Generated
+SONG_DATA: Dict[str, SongData] = {
+    "Magical Wonderland": SongData(2900051, "0-48", "Default Music", True, 1, 3, None),
+    "Iyaiya": SongData(2900052, "0-0", "Default Music", True, 1, 4, None),
+    "Wonderful Pain": SongData(2900053, "0-2", "Default Music", False, 1, 3, None),
+    "Breaking Dawn": SongData(2900054, "0-3", "Default Music", True, 2, 4, None),
+    "One-Way Subway": SongData(2900055, "0-4", "Default Music", True, 1, 4, None),
+    "Frost Land": SongData(2900056, "0-1", "Default Music", False, 1, 3, 6),
+    "Heart-Pounding Flight": SongData(2900057, "0-5", "Default Music", True, 2, 5, None),
+    "Pancake is Love": SongData(2900058, "0-29", "Default Music", True, 2, 4, 7),
+    "Shiguang Tuya": SongData(2900059, "0-6", "Default Music", True, 2, 5, None),
+    "Evolution": SongData(2900060, "0-37", "Default Music", False, 2, 4, 7),
+    "Dolphin and Broadcast": SongData(2900061, "0-7", "Default Music", True, 2, 5, None),
+    "Yuki no Shizuku Ame no Oto": SongData(2900062, "0-8", "Default Music", True, 2, 4, 6),
+    "Best One feat.tooko": SongData(2900063, "0-43", "Default Music", False, 3, 5, None),
+    "Candy-coloured Love Theory": SongData(2900064, "0-31", "Default Music", False, 2, 4, 6),
+    "Night Wander": SongData(2900065, "0-38", "Default Music", False, 3, 5, 7),
+    "Dohna Dohna no Uta": SongData(2900066, "0-46", "Default Music", False, 2, 4, 6),
+    "Spring Carnival": SongData(2900067, "0-9", "Default Music", False, 2, 4, 7),
+    "DISCO NIGHT": SongData(2900068, "0-30", "Default Music", True, 2, 4, 7),
+    "Koi no Moonlight": SongData(2900069, "0-49", "Default Music", False, 2, 5, 8),
+    "Lian Ai Audio Navigation": SongData(2900070, "0-10", "Default Music", False, 3, 5, 7),
+    "Lights of Muse": SongData(2900071, "0-11", "Default Music", True, 4, 6, 8),
+    "midstream jam": SongData(2900072, "0-12", "Default Music", False, 2, 5, 8),
+    "Nihao": SongData(2900073, "0-40", "Default Music", False, 3, 5, 7),
+    "Confession": SongData(2900074, "0-13", "Default Music", False, 3, 5, 8),
+    "Galaxy Striker": SongData(2900075, "0-32", "Default Music", False, 4, 7, 9),
+    "Departure Road": SongData(2900076, "0-14", "Default Music", True, 2, 5, 8),
+    "Bass Telekinesis": SongData(2900077, "0-15", "Default Music", False, 2, 5, 8),
+    "Cage of Almeria": SongData(2900078, "0-16", "Default Music", True, 3, 5, 7),
+    "Ira": SongData(2900079, "0-17", "Default Music", True, 4, 6, 8),
+    "Blackest Luxury Car": SongData(2900080, "0-18", "Default Music", True, 3, 6, 8),
+    "Medicine of Sing": SongData(2900081, "0-19", "Default Music", False, 3, 6, 8),
+    "irregulyze": SongData(2900082, "0-20", "Default Music", True, 3, 6, 8),
+    "I don't care about Christmas though": SongData(2900083, "0-47", "Default Music", False, 4, 6, 8),
+    "Imaginary World": SongData(2900084, "0-21", "Default Music", True, 4, 6, 8),
+    "Dysthymia": SongData(2900085, "0-22", "Default Music", True, 4, 7, 9),
+    "From the New World": SongData(2900086, "0-42", "Default Music", False, 2, 5, 7),
+    "NISEGAO": SongData(2900087, "0-33", "Default Music", True, 4, 7, 9),
+    "Say! Fanfare!": SongData(2900088, "0-44", "Default Music", False, 4, 6, 9),
+    "Star Driver": SongData(2900089, "0-34", "Default Music", True, 5, 7, 9),
+    "Formation": SongData(2900090, "0-23", "Default Music", True, 4, 6, 9),
+    "Shinsou Masui": SongData(2900091, "0-24", "Default Music", True, 4, 6, 10),
+    "Mezame Eurythmics": SongData(2900092, "0-50", "Default Music", False, 4, 6, 9),
+    "Shenri Kuaira -repeat-": SongData(2900093, "0-51", "Default Music", False, 5, 7, 9),
+    "Latitude": SongData(2900094, "0-25", "Default Music", True, 3, 6, 9),
+    "Aqua Stars": SongData(2900095, "0-39", "Default Music", False, 5, 7, 10),
+    "Funkotsu Saishin Casino": SongData(2900096, "0-26", "Default Music", False, 5, 7, 10),
+    "Clock Room & Spiritual World": SongData(2900097, "0-27", "Default Music", True, 4, 6, 9),
+    "INTERNET OVERDOSE": SongData(2900098, "0-52", "Default Music", False, 3, 6, 9),
+    "Tu Hua": SongData(2900099, "0-35", "Default Music", True, 4, 7, 9),
+    "Mujinku-Vacuum": SongData(2900100, "0-28", "Default Music", False, 5, 7, 11),
+    "MilK": SongData(2900101, "0-36", "Default Music", False, 5, 7, 9),
+    "umpopoff": SongData(2900102, "0-41", "Default Music", False, None, 7, None),
+    "Mopemope": SongData(2900103, "0-45", "Default Music", False, 4, 7, 9),
+    "The Happycore Idol": SongData(2900105, "43-0", "MD Plus Project", True, 2, 5, 7),
+    "Amatsumikaboshi": SongData(2900106, "43-1", "MD Plus Project", True, 4, 6, 8),
+    "ARIGA THESIS": SongData(2900107, "43-2", "MD Plus Project", True, 3, 6, 10),
+    "Night of Nights": SongData(2900108, "43-3", "MD Plus Project", False, 4, 7, 10),
+    "#Psychedelic_Meguro_River": SongData(2900109, "43-4", "MD Plus Project", False, 3, 6, 8),
+    "can you feel it": SongData(2900110, "43-5", "MD Plus Project", False, 4, 6, 8),
+    "Midnight O'clock": SongData(2900111, "43-6", "MD Plus Project", True, 3, 6, 8),
+    "Rin": SongData(2900112, "43-7", "MD Plus Project", True, 5, 7, 10),
+    "Smile-mileS": SongData(2900113, "43-8", "MD Plus Project", False, 6, 8, 10),
+    "Believing and Being": SongData(2900114, "43-9", "MD Plus Project", True, 4, 6, 9),
+    "Catalyst": SongData(2900115, "43-10", "MD Plus Project", False, 5, 7, 9),
+    "don't!stop!eroero!": SongData(2900116, "43-11", "MD Plus Project", True, 5, 7, 9),
+    "pa pi pu pi pu pi pa": SongData(2900117, "43-12", "MD Plus Project", False, 6, 8, 10),
+    "Sand Maze": SongData(2900118, "43-13", "MD Plus Project", True, 6, 8, 10),
+    "Diffraction": SongData(2900119, "43-14", "MD Plus Project", True, 5, 8, 10),
+    "AKUMU": SongData(2900120, "43-15", "MD Plus Project", False, 4, 6, 8),
+    "Queen Aluett": SongData(2900121, "43-16", "MD Plus Project", True, 7, 9, 11),
+    "DROPS": SongData(2900122, "43-17", "MD Plus Project", False, 2, 5, 8),
+    "Frightfully-insane Flan-chan's frightful song": SongData(2900123, "43-18", "MD Plus Project", False, 5, 7, 10),
+    "snooze": SongData(2900124, "43-19", "MD Plus Project", False, 5, 7, 10),
+    "Kuishinbo Hacker feat.Kuishinbo Akachan": SongData(2900125, "43-20", "MD Plus Project", True, 5, 7, 9),
+    "Inu no outa": SongData(2900126, "43-21", "MD Plus Project", True, 3, 5, 7),
+    "Prism Fountain": SongData(2900127, "43-22", "MD Plus Project", True, 7, 9, 11),
+    "Gospel": SongData(2900128, "43-23", "MD Plus Project", False, 4, 6, 9),
+    "East Ai Li Lovely": SongData(2900130, "62-0", "Happy Otaku Pack Vol.17", False, 2, 4, 7),
+    "Mori Umi no Fune": SongData(2900131, "62-1", "Happy Otaku Pack Vol.17", True, 5, 7, 9),
+    "Ooi": SongData(2900132, "62-2", "Happy Otaku Pack Vol.17", True, 5, 7, 10),
+    "Numatta!!": SongData(2900133, "62-3", "Happy Otaku Pack Vol.17", True, 5, 7, 9),
+    "SATELLITE": SongData(2900134, "62-4", "Happy Otaku Pack Vol.17", False, 5, 7, 9),
+    "Fantasia Sonata Colorful feat. V!C": SongData(2900135, "62-5", "Happy Otaku Pack Vol.17", True, 6, 8, 11),
+    "MuseDash ka nanika hi": SongData(2900137, "61-0", "Ola Dash", True, 4, 7, 10),
+    "Aleph-0": SongData(2900138, "61-1", "Ola Dash", True, 7, 9, 11),
+    "Buttoba Supernova": SongData(2900139, "61-2", "Ola Dash", False, 5, 7, 10),
+    "Rush-Hour": SongData(2900140, "61-3", "Ola Dash", False, 4, 7, 10),
+    "3rd Avenue": SongData(2900141, "61-4", "Ola Dash", False, 3, 5, 10),
+    "WORLDINVADER": SongData(2900142, "61-5", "Ola Dash", True, 5, 8, 10),
+    "N3V3R G3T OV3R": SongData(2900144, "60-0", "maimai DX Limited-time Suite", True, 4, 7, 10),
+    "Oshama Scramble!": SongData(2900145, "60-1", "maimai DX Limited-time Suite", True, 5, 7, 10),
+    "Valsqotch": SongData(2900146, "60-2", "maimai DX Limited-time Suite", True, 5, 9, 11),
+    "Paranormal My Mind": SongData(2900147, "60-3", "maimai DX Limited-time Suite", True, 5, 7, 9),
+    "Flower, snow and Drum'n'bass.": SongData(2900148, "60-4", "maimai DX Limited-time Suite", True, 5, 8, 10),
+    "Amenohoakari": SongData(2900149, "60-5", "maimai DX Limited-time Suite", True, 6, 8, 10),
+    "Boiling Blood": SongData(2900151, "59-0", "MSR Anthology", True, 5, 8, 10),
+    "ManiFesto": SongData(2900152, "59-1", "MSR Anthology", True, 4, 6, 9),
+    "Operation Blade": SongData(2900153, "59-2", "MSR Anthology", True, 3, 5, 7),
+    "Radiant": SongData(2900154, "59-3", "MSR Anthology", True, 3, 5, 8),
+    "Renegade": SongData(2900155, "59-4", "MSR Anthology", True, 3, 5, 8),
+    "Speed of Light": SongData(2900156, "59-5", "MSR Anthology", False, 1, 4, 7),
+    "Dossoles Holiday": SongData(2900157, "59-6", "MSR Anthology", True, 5, 7, 9),
+    "Autumn Moods": SongData(2900158, "59-7", "MSR Anthology", True, 3, 5, 7),
+    "People People": SongData(2900160, "58-0", "Nanahira Paradise", True, 5, 7, 9),
+    "Endless Error Loop": SongData(2900161, "58-1", "Nanahira Paradise", True, 4, 7, 9),
+    "Forbidden Pizza!": SongData(2900162, "58-2", "Nanahira Paradise", True, 5, 7, 9),
+    "Don't Make the Vocalist do Anything Insane": SongData(2900163, "58-3", "Nanahira Paradise", True, 5, 8, 9),
+    "Tokimeki*Meteostrike": SongData(2900165, "57-0", "Happy Otaku Pack Vol.16", True, 3, 6, 8),
+    "Down Low": SongData(2900166, "57-1", "Happy Otaku Pack Vol.16", True, 4, 6, 8),
+    "LOUDER MACHINE": SongData(2900167, "57-2", "Happy Otaku Pack Vol.16", True, 5, 7, 9),
+    "Sorewa mo Lovechu": SongData(2900168, "57-3", "Happy Otaku Pack Vol.16", True, 5, 7, 10),
+    "Rave_Tech": SongData(2900169, "57-4", "Happy Otaku Pack Vol.16", True, 5, 8, 10),
+    "Brilliant & Shining!": SongData(2900170, "57-5", "Happy Otaku Pack Vol.16", False, 5, 8, 10),
+    "Psyched Fevereiro": SongData(2900172, "56-0", "Give Up TREATMENT Vol.11", False, 5, 8, 10),
+    "Inferno City": SongData(2900173, "56-1", "Give Up TREATMENT Vol.11", False, 6, 8, 10),
+    "Paradigm Shift": SongData(2900174, "56-2", "Give Up TREATMENT Vol.11", False, 4, 7, 10),
+    "Snapdragon": SongData(2900175, "56-3", "Give Up TREATMENT Vol.11", False, 5, 7, 10),
+    "Prestige and Vestige": SongData(2900176, "56-4", "Give Up TREATMENT Vol.11", True, 6, 8, 11),
+    "Tiny Fate": SongData(2900177, "56-5", "Give Up TREATMENT Vol.11", False, 7, 9, 11),
+    "Tsuki ni Murakumo Hana ni Kaze": SongData(2900179, "55-0", "Touhou Mugakudan -II-", False, 3, 5, 7),
+    "Patchouli's - Best Hit GSK": SongData(2900180, "55-1", "Touhou Mugakudan -II-", False, 3, 5, 8),
+    "Monosugoi Space Shuttle de Koishi ga Monosugoi uta": SongData(2900181, "55-2", "Touhou Mugakudan -II-", False, 3, 5, 7),
+    "Kakoinaki Yo wa Ichigo no Tsukikage": SongData(2900182, "55-3", "Touhou Mugakudan -II-", False, 3, 6, 8),
+    "Psychedelic Kizakura Doumei": SongData(2900183, "55-4", "Touhou Mugakudan -II-", False, 4, 7, 10),
+    "Mischievous Sensation": SongData(2900184, "55-5", "Touhou Mugakudan -II-", False, 5, 7, 9),
+    "White Canvas": SongData(2900186, "54-0", "MEGAREX THE FUTURE", False, 3, 6, 8),
+    "Gloomy Flash": SongData(2900187, "54-1", "MEGAREX THE FUTURE", False, 5, 8, 10),
+    "Find this Month's Featured Playlist": SongData(2900188, "54-2", "MEGAREX THE FUTURE", False, 4, 7, 10),
+    "Sunday Night": SongData(2900189, "54-3", "MEGAREX THE FUTURE", False, 3, 6, 9),
+    "Goodbye Goodnight": SongData(2900190, "54-4", "MEGAREX THE FUTURE", False, 4, 6, 9),
+    "ENDLESS CIDER": SongData(2900191, "54-5", "MEGAREX THE FUTURE", False, 4, 6, 8),
+    "On And On!!": SongData(2900193, "53-0", "Happy Otaku Pack Vol.15", True, 4, 7, 9),
+    "Trip!": SongData(2900194, "53-1", "Happy Otaku Pack Vol.15", True, 3, 5, 7),
+    "Hoshi no otoshimono": SongData(2900195, "53-2", "Happy Otaku Pack Vol.15", False, 5, 7, 9),
+    "Plucky Race": SongData(2900196, "53-3", "Happy Otaku Pack Vol.15", True, 5, 8, 10),
+    "Fantasia Sonata Destiny": SongData(2900197, "53-4", "Happy Otaku Pack Vol.15", True, 3, 7, 10),
+    "Run through": SongData(2900198, "53-5", "Happy Otaku Pack Vol.15", False, 5, 8, 10),
+    "marooned night": SongData(2900200, "52-0", "MUSE RADIO FM103", False, 2, 4, 6),
+    "daydream girl": SongData(2900201, "52-1", "MUSE RADIO FM103", False, 3, 6, 8),
+    "Not Ornament": SongData(2900202, "52-2", "MUSE RADIO FM103", True, 3, 5, 8),
+    "Baby Pink": SongData(2900203, "52-3", "MUSE RADIO FM103", False, 3, 5, 8),
+    "I'm Here": SongData(2900204, "52-4", "MUSE RADIO FM103", False, 4, 6, 8),
+    "Masquerade Diary": SongData(2900206, "51-0", "Virtual Idol Production", True, 2, 5, 8),
+    "Reminiscence": SongData(2900207, "51-1", "Virtual Idol Production", True, 5, 7, 9),
+    "DarakuDatenshi": SongData(2900208, "51-2", "Virtual Idol Production", True, 3, 6, 9),
+    "D.I.Y.": SongData(2900209, "51-3", "Virtual Idol Production", False, 4, 6, 9),
+    "Boys in Virtual Land": SongData(2900210, "51-4", "Virtual Idol Production", False, 4, 7, 9),
+    "kui": SongData(2900211, "51-5", "Virtual Idol Production", True, 5, 7, 9),
+    "Nyan Cat": SongData(2900213, "50-0", "Nyanya Universe!", False, 4, 7, 9),
+    "PeroPero in the Universe": SongData(2900214, "50-1", "Nyanya Universe!", True, 4, 7, 10),
+    "In-kya Yo-kya Onmyoji": SongData(2900215, "50-2", "Nyanya Universe!", False, 6, 8, 10),
+    "KABOOOOOM!!!!": SongData(2900216, "50-3", "Nyanya Universe!", True, 4, 6, 8),
+    "Doppelganger": SongData(2900217, "50-4", "Nyanya Universe!", True, 5, 7, 9),
+    "Pray a LOVE": SongData(2900219, "49-0", "DokiDoki! Valentine!", False, 2, 5, 8),
+    "Love-Avoidance Addiction": SongData(2900220, "49-1", "DokiDoki! Valentine!", False, 3, 5, 7),
+    "Daisuki Dayo feat.Wotoha": SongData(2900221, "49-2", "DokiDoki! Valentine!", False, 5, 7, 10),
+    "glory day": SongData(2900223, "48-0", "DJMAX Reflect", False, 2, 5, 7),
+    "Bright Dream": SongData(2900224, "48-1", "DJMAX Reflect", False, 2, 4, 7),
+    "Groovin Up": SongData(2900225, "48-2", "DJMAX Reflect", False, 4, 6, 8),
+    "I Want You": SongData(2900226, "48-3", "DJMAX Reflect", False, 3, 6, 8),
+    "OBLIVION": SongData(2900227, "48-4", "DJMAX Reflect", False, 3, 6, 9),
+    "Elastic STAR": SongData(2900228, "48-5", "DJMAX Reflect", False, 4, 6, 8),
+    "U.A.D": SongData(2900229, "48-6", "DJMAX Reflect", False, 4, 6, 8),
+    "Jealousy": SongData(2900230, "48-7", "DJMAX Reflect", False, 3, 5, 7),
+    "Memory of Beach": SongData(2900231, "48-8", "DJMAX Reflect", False, 3, 6, 8),
+    "Don't Die": SongData(2900232, "48-9", "DJMAX Reflect", False, 6, 8, 10),
+    "Y CE Ver.": SongData(2900233, "48-10", "DJMAX Reflect", False, 4, 6, 9),
+    "Fancy Night": SongData(2900234, "48-11", "DJMAX Reflect", False, 4, 6, 8),
+    "Can We Talk": SongData(2900235, "48-12", "DJMAX Reflect", False, 4, 6, 8),
+    "Give Me 5": SongData(2900236, "48-13", "DJMAX Reflect", False, 2, 6, 8),
+    "Nightmare": SongData(2900237, "48-14", "DJMAX Reflect", False, 7, 9, 11),
+    "Haze of Autumn": SongData(2900239, "47-0", "Arcaea", True, 3, 6, 9),
+    "GIMME DA BLOOD": SongData(2900240, "47-1", "Arcaea", False, 3, 6, 9),
+    "Libertas": SongData(2900241, "47-2", "Arcaea", False, 4, 7, 10),
+    "Cyaegha": SongData(2900242, "47-3", "Arcaea", False, 5, 7, 9),
+    "Bang!!": SongData(2900244, "46-0", "Happy Otaku Pack Vol.14", False, 4, 6, 8),
+    "Paradise 2": SongData(2900245, "46-1", "Happy Otaku Pack Vol.14", False, 4, 6, 8),
+    "Symbol": SongData(2900246, "46-2", "Happy Otaku Pack Vol.14", False, 5, 7, 9),
+    "Nekojarashi": SongData(2900247, "46-3", "Happy Otaku Pack Vol.14", False, 5, 8, 10),
+    "A Philosophical Wanderer": SongData(2900248, "46-4", "Happy Otaku Pack Vol.14", False, 4, 6, 10),
+    "Isouten": SongData(2900249, "46-5", "Happy Otaku Pack Vol.14", True, 6, 8, 10),
+    "ONOMATO Pairing!!!": SongData(2900251, "45-0", "WACCA Horizon", False, 4, 6, 9),
+    "with U": SongData(2900252, "45-1", "WACCA Horizon", False, 6, 8, 10),
+    "Chariot": SongData(2900253, "45-2", "WACCA Horizon", False, 3, 6, 9),
+    "GASHATT": SongData(2900254, "45-3", "WACCA Horizon", False, 5, 7, 10),
+    "LIN NE KRO NE feat. lasah": SongData(2900255, "45-4", "WACCA Horizon", False, 6, 8, 10),
+    "ANGEL HALO": SongData(2900256, "45-5", "WACCA Horizon", False, 5, 8, 11),
+    "Party in the HOLLOWood": SongData(2900258, "44-0", "Happy Otaku Pack Vol.13", False, 3, 6, 8),
+    "Ying Ying da Zuozhan": SongData(2900259, "44-1", "Happy Otaku Pack Vol.13", True, 5, 7, 9),
+    "Howlin' Pumpkin": SongData(2900260, "44-2", "Happy Otaku Pack Vol.13", True, 4, 6, 8),
+    "Bad Apple!! feat. Nomico": SongData(2900262, "42-0", "Touhou Mugakudan -I-", False, 1, 3, 6),
+    "Iro wa Nioedo, Chirinuru wo": SongData(2900263, "42-1", "Touhou Mugakudan -I-", False, 2, 4, 7),
+    "Cirno's Perfect Math Class": SongData(2900264, "42-2", "Touhou Mugakudan -I-", False, 4, 7, 9),
+    "Hiiro Gekka Kyousai no Zetsu": SongData(2900265, "42-3", "Touhou Mugakudan -I-", False, 4, 6, 8),
+    "Flowery Moonlit Night": SongData(2900266, "42-4", "Touhou Mugakudan -I-", False, 3, 6, 8),
+    "Unconscious Requiem": SongData(2900267, "42-5", "Touhou Mugakudan -I-", False, 3, 6, 8),
+    "Super Battleworn Insomniac": SongData(2900269, "41-0", "7th Beat Games", True, 4, 7, 9),
+    "Bomb-Sniffing Pomeranian": SongData(2900270, "41-1", "7th Beat Games", True, 4, 6, 8),
+    "Rollerdisco Rumble": SongData(2900271, "41-2", "7th Beat Games", True, 4, 6, 9),
+    "Rose Garden": SongData(2900272, "41-3", "7th Beat Games", False, 5, 8, 9),
+    "EMOMOMO": SongData(2900273, "41-4", "7th Beat Games", True, 4, 7, 10),
+    "Heracles": SongData(2900274, "41-5", "7th Beat Games", False, 6, 8, 10),
+    "Rush-More": SongData(2900276, "40-0", "Happy Otaku Pack Vol.12", False, 4, 7, 9),
+    "Kill My Fortune": SongData(2900277, "40-1", "Happy Otaku Pack Vol.12", False, 5, 7, 10),
+    "Yosari Tsukibotaru Suminoborite": SongData(2900278, "40-2", "Happy Otaku Pack Vol.12", False, 5, 7, 9),
+    "JUMP! HardCandy": SongData(2900279, "40-3", "Happy Otaku Pack Vol.12", False, 3, 6, 8),
+    "Hibari": SongData(2900280, "40-4", "Happy Otaku Pack Vol.12", False, 3, 5, 8),
+    "OCCHOCO-REST-LESS": SongData(2900281, "40-5", "Happy Otaku Pack Vol.12", True, 4, 7, 9),
+    "See-Saw Day": SongData(2900283, "39-0", "MUSE RADIO FM102", True, 1, 3, 6),
+    "happy hour": SongData(2900284, "39-1", "MUSE RADIO FM102", True, 2, 4, 7),
+    "Seikimatsu no Natsu": SongData(2900285, "39-2", "MUSE RADIO FM102", True, 4, 6, 8),
+    "twinkle night": SongData(2900286, "39-3", "MUSE RADIO FM102", False, 3, 6, 8),
+    "ARUYA HARERUYA": SongData(2900287, "39-4", "MUSE RADIO FM102", False, 2, 5, 7),
+    "Blush": SongData(2900288, "39-5", "MUSE RADIO FM102", False, 2, 4, 7),
+    "Naked Summer": SongData(2900289, "39-6", "MUSE RADIO FM102", True, 4, 6, 8),
+    "BLESS ME": SongData(2900290, "39-7", "MUSE RADIO FM102", True, 2, 5, 7),
+    "FM 17314 SUGAR RADIO": SongData(2900291, "39-8", "MUSE RADIO FM102", True, None, None, None),
+    "NO ONE YES MAN": SongData(2900293, "38-0", "Phigros", False, 5, 7, 9),
+    "Snowfall, Merry Christmas": SongData(2900294, "38-1", "Phigros", False, 5, 8, 10),
+    "Igallta": SongData(2900295, "38-2", "Phigros", False, 6, 8, 10),
+    "Colored Glass": SongData(2900297, "37-0", "Cute Is Everything Vol.7", False, 1, 4, 7),
+    "Neonlights": SongData(2900298, "37-1", "Cute Is Everything Vol.7", False, 4, 7, 9),
+    "Hope for the flowers": SongData(2900299, "37-2", "Cute Is Everything Vol.7", False, 4, 7, 9),
+    "Seaside Cycling on May 30": SongData(2900300, "37-3", "Cute Is Everything Vol.7", False, 3, 6, 8),
+    "SKY HIGH": SongData(2900301, "37-4", "Cute Is Everything Vol.7", False, 2, 4, 6),
+    "Mousou Chu!!": SongData(2900302, "37-5", "Cute Is Everything Vol.7", False, 4, 7, 8),
+    "NightTheater": SongData(2900304, "36-0", "Give Up TREATMENT Vol.10", True, 6, 8, 11),
+    "Cutter": SongData(2900305, "36-1", "Give Up TREATMENT Vol.10", False, 4, 7, 10),
+    "bamboo": SongData(2900306, "36-2", "Give Up TREATMENT Vol.10", False, 6, 8, 10),
+    "enchanted love": SongData(2900307, "36-3", "Give Up TREATMENT Vol.10", False, 2, 6, 9),
+    "c.s.q.n.": SongData(2900308, "36-4", "Give Up TREATMENT Vol.10", False, 5, 8, 11),
+    "Booouncing!!": SongData(2900309, "36-5", "Give Up TREATMENT Vol.10", False, 5, 7, 10),
+    "PeroPeroGames goes Bankrupt": SongData(2900311, "35-0", "Happy Otaku Pack SP", True, 6, 8, 10),
+    "MARENOL": SongData(2900312, "35-1", "Happy Otaku Pack SP", False, 4, 7, 10),
+    "I am really good at Japanese style": SongData(2900313, "35-2", "Happy Otaku Pack SP", True, 6, 8, 10),
+    "Rush B": SongData(2900314, "35-3", "Happy Otaku Pack SP", True, 4, 7, 9),
+    "DataErr0r": SongData(2900315, "35-4", "Happy Otaku Pack SP", False, 5, 7, 9),
+    "Burn": SongData(2900316, "35-5", "Happy Otaku Pack SP", True, 4, 7, 9),
+    "ALiVE": SongData(2900318, "34-0", "HARDCORE TANO*C", False, 5, 7, 10),
+    "BATTLE NO.1": SongData(2900319, "34-1", "HARDCORE TANO*C", False, 5, 8, 10),
+    "Cthugha": SongData(2900320, "34-2", "HARDCORE TANO*C", False, 6, 8, 10),
+    "TWINKLE*MAGIC": SongData(2900321, "34-3", "HARDCORE TANO*C", False, 4, 7, 10),
+    "Comet Coaster": SongData(2900322, "34-4", "HARDCORE TANO*C", False, 6, 8, 10),
+    "XODUS": SongData(2900323, "34-5", "HARDCORE TANO*C", False, 7, 9, 11),
+    "Fireflies": SongData(2900325, "33-0", "cyTus", True, 1, 4, 7),
+    "Light up my love!!": SongData(2900326, "33-1", "cyTus", True, 3, 5, 7),
+    "Happiness Breeze": SongData(2900327, "33-2", "cyTus", True, 4, 6, 8),
+    "Chrome VOX": SongData(2900328, "33-3", "cyTus", True, 6, 8, 10),
+    "CHAOS": SongData(2900329, "33-4", "cyTus", True, 3, 6, 9),
+    "Saika": SongData(2900330, "33-5", "cyTus", True, 3, 5, 8),
+    "Standby for Action": SongData(2900331, "33-6", "cyTus", True, 4, 6, 8),
+    "Hydrangea": SongData(2900332, "33-7", "cyTus", True, 5, 7, 9),
+    "Amenemhat": SongData(2900333, "33-8", "cyTus", True, 6, 8, 10),
+    "Santouka": SongData(2900334, "33-9", "cyTus", True, 2, 5, 8),
+    "HEXENNACHTROCK-katashihaya-": SongData(2900335, "33-10", "cyTus", True, 4, 8, 10),
+    "Blah!!": SongData(2900336, "33-11", "cyTus", True, 5, 8, 11),
+    "CHAOS Glitch": SongData(2900337, "33-12", "cyTus", True, None, None, None),
+    "Preparara": SongData(2900339, "32-0", "Let's Do Bad Things Together", False, 1, 4, 6),
+    "Whatcha;Whatcha Doin'": SongData(2900340, "32-1", "Let's Do Bad Things Together", False, 3, 6, 9),
+    "Madara": SongData(2900341, "32-2", "Let's Do Bad Things Together", False, 4, 6, 9),
+    "pICARESq": SongData(2900342, "32-3", "Let's Do Bad Things Together", False, 4, 6, 8),
+    "Desastre": SongData(2900343, "32-4", "Let's Do Bad Things Together", False, 4, 6, 8),
+    "Shoot for the Moon": SongData(2900344, "32-5", "Let's Do Bad Things Together", False, 2, 5, 8),
+    "The 90's Decision": SongData(2900346, "31-0", "Happy Otaku Pack Vol.11", True, 5, 7, 9),
+    "Medusa": SongData(2900347, "31-1", "Happy Otaku Pack Vol.11", False, 4, 6, 8),
+    "Final Step!": SongData(2900348, "31-2", "Happy Otaku Pack Vol.11", False, 5, 7, 10),
+    "MAGENTA POTION": SongData(2900349, "31-3", "Happy Otaku Pack Vol.11", False, 4, 7, 9),
+    "Cross Ray": SongData(2900350, "31-4", "Happy Otaku Pack Vol.11", False, 3, 6, 9),
+    "Square Lake": SongData(2900351, "31-5", "Happy Otaku Pack Vol.11", False, 6, 8, 9),
+    "Girly Cupid": SongData(2900353, "30-0", "Cute Is Everything Vol.6", False, 3, 6, 8),
+    "sheep in the light": SongData(2900354, "30-1", "Cute Is Everything Vol.6", False, 2, 5, 8),
+    "Breaker city": SongData(2900355, "30-2", "Cute Is Everything Vol.6", False, 4, 6, 9),
+    "heterodoxy": SongData(2900356, "30-3", "Cute Is Everything Vol.6", False, 4, 6, 8),
+    "Computer Music Girl": SongData(2900357, "30-4", "Cute Is Everything Vol.6", False, 3, 5, 7),
+    "Focus Point": SongData(2900358, "30-5", "Cute Is Everything Vol.6", True, 2, 5, 7),
+    "Groove Prayer": SongData(2900360, "29-0", "Let' s GROOVE!", True, 3, 5, 7),
+    "FUJIN Rumble": SongData(2900361, "29-1", "Let' s GROOVE!", True, 5, 7, 10),
+    "Marry me, Nightmare": SongData(2900362, "29-2", "Let' s GROOVE!", False, 6, 8, 11),
+    "HG Makaizou Polyvinyl Shounen": SongData(2900363, "29-3", "Let' s GROOVE!", True, 4, 7, 9),
+    "Seizya no Ibuki": SongData(2900364, "29-4", "Let' s GROOVE!", True, 6, 8, 10),
+    "ouroboros -twin stroke of the end-": SongData(2900365, "29-5", "Let' s GROOVE!", True, 4, 6, 9),
+    "Heisha Onsha": SongData(2900367, "28-0", "Happy Otaku Pack Vol.10", False, 4, 6, 8),
+    "Ginevra": SongData(2900368, "28-1", "Happy Otaku Pack Vol.10", True, 5, 7, 10),
+    "Paracelestia": SongData(2900369, "28-2", "Happy Otaku Pack Vol.10", False, 5, 8, 10),
+    "un secret": SongData(2900370, "28-3", "Happy Otaku Pack Vol.10", False, 2, 4, 6),
+    "Good Life": SongData(2900371, "28-4", "Happy Otaku Pack Vol.10", False, 4, 6, 8),
+    "nini-nini-": SongData(2900372, "28-5", "Happy Otaku Pack Vol.10", False, 4, 7, 9),
+    "Can I friend you on Bassbook? lol": SongData(2900374, "27-0", "Nanahira Festival", False, 3, 6, 8),
+    "Gaming*Everything": SongData(2900375, "27-1", "Nanahira Festival", False, 5, 8, 11),
+    "Renji de haochi": SongData(2900376, "27-2", "Nanahira Festival", False, 5, 7, 9),
+    "You Make My Life 1UP": SongData(2900377, "27-3", "Nanahira Festival", False, 4, 6, 8),
+    "Newbies, Geeks, Internets": SongData(2900378, "27-4", "Nanahira Festival", False, 6, 8, 10),
+    "Onegai!Kon kon Oinarisama": SongData(2900379, "27-5", "Nanahira Festival", False, 3, 6, 9),
+    "Legend of Eastern Rabbit -SKY DEFENDER-": SongData(2900381, "26-0", "Give Up TREATMENT Vol.9", False, 4, 6, 9),
+    "ENERGY SYNERGY MATRIX": SongData(2900382, "26-1", "Give Up TREATMENT Vol.9", False, 6, 8, 10),
+    "Punai Punai Genso": SongData(2900383, "26-2", "Give Up TREATMENT Vol.9", False, 2, 7, 11),
+    "Better Graphic Animation": SongData(2900384, "26-3", "Give Up TREATMENT Vol.9", False, 5, 8, 11),
+    "Variant Cross": SongData(2900385, "26-4", "Give Up TREATMENT Vol.9", False, 4, 7, 10),
+    "Ultra Happy Miracle Bazoooooka!!": SongData(2900386, "26-5", "Give Up TREATMENT Vol.9", False, 7, 9, 11),
+    "tape/stop/night": SongData(2900388, "25-0", "MUSE RADIO FM101", True, 3, 5, 7),
+    "Pixel Galaxy": SongData(2900389, "25-1", "MUSE RADIO FM101", False, 2, 5, 8),
+    "Notice": SongData(2900390, "25-2", "MUSE RADIO FM101", False, 4, 7, 10),
+    "Strawberry Godzilla": SongData(2900391, "25-3", "MUSE RADIO FM101", True, 2, 5, 7),
+    "OKIMOCHI EXPRESSION": SongData(2900392, "25-4", "MUSE RADIO FM101", False, 4, 6, 10),
+    "Kimi to pool disco": SongData(2900393, "25-5", "MUSE RADIO FM101", False, 4, 6, 8),
+    "The Last Page": SongData(2900395, "24-0", "Happy Otaku Pack Vol.9", False, 3, 5, 7),
+    "IKAROS": SongData(2900396, "24-1", "Happy Otaku Pack Vol.9", False, 4, 7, 10),
+    "Tsukuyomi": SongData(2900397, "24-2", "Happy Otaku Pack Vol.9", False, 3, 6, 9),
+    "Future Stream": SongData(2900398, "24-3", "Happy Otaku Pack Vol.9", False, 4, 6, 8),
+    "FULi AUTO SHOOTER": SongData(2900399, "24-4", "Happy Otaku Pack Vol.9", True, 4, 7, 9),
+    "GOODFORTUNE": SongData(2900400, "24-5", "Happy Otaku Pack Vol.9", False, 5, 7, 9),
+    "The Dessert After Rain": SongData(2900402, "23-0", "Cute Is Everything Vol.5", True, 2, 4, 6),
+    "Confession Support Formula": SongData(2900403, "23-1", "Cute Is Everything Vol.5", False, 3, 5, 7),
+    "Omatsuri": SongData(2900404, "23-2", "Cute Is Everything Vol.5", False, 1, 3, 6),
+    "FUTUREPOP": SongData(2900405, "23-3", "Cute Is Everything Vol.5", True, 2, 5, 7),
+    "The Breeze": SongData(2900406, "23-4", "Cute Is Everything Vol.5", False, 1, 4, 6),
+    "I LOVE LETTUCE FRIED RICE!!": SongData(2900407, "23-5", "Cute Is Everything Vol.5", False, 3, 7, 9),
+    "The NightScape": SongData(2900409, "22-0", "Give Up TREATMENT Vol.8", False, 4, 7, 9),
+    "FREEDOM DiVE": SongData(2900410, "22-1", "Give Up TREATMENT Vol.8", False, 6, 8, 10),
+    "Phi": SongData(2900411, "22-2", "Give Up TREATMENT Vol.8", False, 5, 8, 10),
+    "Lueur de la nuit": SongData(2900412, "22-3", "Give Up TREATMENT Vol.8", False, 6, 8, 11),
+    "Creamy Sugary OVERDRIVE!!!": SongData(2900413, "22-4", "Give Up TREATMENT Vol.8", True, 4, 7, 10),
+    "Disorder": SongData(2900414, "22-5", "Give Up TREATMENT Vol.8", False, 5, 7, 11),
+    "Glimmer": SongData(2900416, "21-0", "Budget Is Burning: Nano Core", False, 2, 5, 8),
+    "EXIST": SongData(2900417, "21-1", "Budget Is Burning: Nano Core", False, 3, 5, 8),
+    "Irreplaceable": SongData(2900418, "21-2", "Budget Is Burning: Nano Core", False, 4, 6, 8),
+    "Moonlight Banquet": SongData(2900420, "20-0", "Happy Otaku Pack Vol.8", True, 2, 5, 8),
+    "Flashdance": SongData(2900421, "20-1", "Happy Otaku Pack Vol.8", False, 3, 6, 9),
+    "INFiNiTE ENERZY -Overdoze-": SongData(2900422, "20-2", "Happy Otaku Pack Vol.8", False, 4, 7, 9),
+    "One Way Street": SongData(2900423, "20-3", "Happy Otaku Pack Vol.8", False, 3, 6, 10),
+    "This Club is Not 4 U": SongData(2900424, "20-4", "Happy Otaku Pack Vol.8", False, 4, 7, 9),
+    "ULTRA MEGA HAPPY PARTY!!!": SongData(2900425, "20-5", "Happy Otaku Pack Vol.8", False, 5, 7, 10),
+    "INFINITY": SongData(2900427, "19-0", "Give Up TREATMENT Vol.7", True, 5, 8, 10),
+    "Punai Punai Senso": SongData(2900428, "19-1", "Give Up TREATMENT Vol.7", False, 2, 7, 11),
+    "Maxi": SongData(2900429, "19-2", "Give Up TREATMENT Vol.7", False, 5, 8, 10),
+    "YInMn Blue": SongData(2900430, "19-3", "Give Up TREATMENT Vol.7", False, 6, 8, 10),
+    "Plumage": SongData(2900431, "19-4", "Give Up TREATMENT Vol.7", False, 4, 7, 10),
+    "Dr.Techro": SongData(2900432, "19-5", "Give Up TREATMENT Vol.7", False, 7, 9, 11),
+    "SWEETSWEETSWEET": SongData(2900434, "18-0", "Cute Is Everything Vol.4", True, 2, 5, 7),
+    "Deep Blue and the Breaths of the Night": SongData(2900435, "18-1", "Cute Is Everything Vol.4", True, 2, 4, 6),
+    "Joy Connection": SongData(2900436, "18-2", "Cute Is Everything Vol.4", False, 3, 6, 8),
+    "Self Willed Girl Ver.B": SongData(2900437, "18-3", "Cute Is Everything Vol.4", True, 4, 6, 8),
+    "Just Disobedient": SongData(2900438, "18-4", "Cute Is Everything Vol.4", False, 3, 6, 8),
+    "Holy Sh*t Grass Snake": SongData(2900439, "18-5", "Cute Is Everything Vol.4", False, 2, 6, 9),
+    "Cotton Candy Wonderland": SongData(2900441, "17-0", "Happy Otaku Pack Vol.7", False, 2, 5, 8),
+    "Punai Punai Taiso": SongData(2900442, "17-1", "Happy Otaku Pack Vol.7", False, 2, 7, 10),
+    "Fly High": SongData(2900443, "17-2", "Happy Otaku Pack Vol.7", False, 3, 5, 7),
+    "prejudice": SongData(2900444, "17-3", "Happy Otaku Pack Vol.7", True, 4, 6, 9),
+    "The 89's Momentum": SongData(2900445, "17-4", "Happy Otaku Pack Vol.7", True, 5, 7, 9),
+    "energy night": SongData(2900446, "17-5", "Happy Otaku Pack Vol.7", True, 5, 7, 10),
+    "Future Dive": SongData(2900448, "16-0", "Give Up TREATMENT Vol.6", True, 4, 6, 9),
+    "Re End of a Dream": SongData(2900449, "16-1", "Give Up TREATMENT Vol.6", False, 5, 8, 11),
+    "Etude -Storm-": SongData(2900450, "16-2", "Give Up TREATMENT Vol.6", True, 6, 8, 10),
+    "Unlimited Katharsis": SongData(2900451, "16-3", "Give Up TREATMENT Vol.6", False, 4, 6, 10),
+    "Magic Knight Girl": SongData(2900452, "16-4", "Give Up TREATMENT Vol.6", False, 4, 7, 9),
+    "Eeliaas": SongData(2900453, "16-5", "Give Up TREATMENT Vol.6", False, 6, 9, 11),
+    "Magic Spell": SongData(2900455, "15-0", "Cute Is Everything Vol.3", True, 2, 5, 7),
+    "Colorful Star, Colored Drawing, Travel Poem": SongData(2900456, "15-1", "Cute Is Everything Vol.3", False, 3, 4, 6),
+    "Satell Knight": SongData(2900457, "15-2", "Cute Is Everything Vol.3", False, 3, 6, 8),
+    "Black River Feat.Mes": SongData(2900458, "15-3", "Cute Is Everything Vol.3", True, 1, 4, 6),
+    "I am sorry": SongData(2900459, "15-4", "Cute Is Everything Vol.3", False, 2, 5, 8),
+    "Ueta Tori Tachi": SongData(2900460, "15-5", "Cute Is Everything Vol.3", False, 3, 6, 8),
+    "Elysion's Old Mans": SongData(2900462, "14-0", "Happy Otaku Pack Vol.6", False, 3, 5, 8),
+    "AXION": SongData(2900463, "14-1", "Happy Otaku Pack Vol.6", False, 4, 5, 8),
+    "Amnesia": SongData(2900464, "14-2", "Happy Otaku Pack Vol.6", True, 3, 6, 9),
+    "Onsen Dai Sakusen": SongData(2900465, "14-3", "Happy Otaku Pack Vol.6", True, 4, 6, 8),
+    "Gleam stone": SongData(2900466, "14-4", "Happy Otaku Pack Vol.6", False, 4, 7, 9),
+    "GOODWORLD": SongData(2900467, "14-5", "Happy Otaku Pack Vol.6", False, 4, 7, 10),
+    "Instant Soluble Neon": SongData(2900469, "13-0", "Cute Is Everything Vol.2", True, 2, 4, 7),
+    "Retrospective Poem on the Planet": SongData(2900470, "13-1", "Cute Is Everything Vol.2", False, 3, 5, 7),
+    "I'm Gonna Buy! Buy! Buy!": SongData(2900471, "13-2", "Cute Is Everything Vol.2", True, 4, 6, 8),
+    "Dating Manifesto": SongData(2900472, "13-3", "Cute Is Everything Vol.2", True, 2, 4, 6),
+    "First Snow": SongData(2900473, "13-4", "Cute Is Everything Vol.2", True, 2, 3, 6),
+    "Xin Shang Huahai": SongData(2900474, "13-5", "Cute Is Everything Vol.2", False, 3, 6, 8),
+    "Gaikan Chrysalis": SongData(2900476, "12-0", "Give Up TREATMENT Vol.5", False, 4, 6, 8),
+    "Sterelogue": SongData(2900477, "12-1", "Give Up TREATMENT Vol.5", True, 5, 7, 10),
+    "Cheshire's Dance": SongData(2900478, "12-2", "Give Up TREATMENT Vol.5", True, 4, 7, 10),
+    "Skrik": SongData(2900479, "12-3", "Give Up TREATMENT Vol.5", True, 5, 7, 11),
+    "Soda Pop Canva5!": SongData(2900480, "12-4", "Give Up TREATMENT Vol.5", False, 5, 8, 10),
+    "RUBY LINTe": SongData(2900481, "12-5", "Give Up TREATMENT Vol.5", False, 5, 8, 11),
+    "Brave My Heart": SongData(2900483, "11-0", "Happy Otaku Pack Vol.5", True, 3, 5, 7),
+    "Sakura Fubuki": SongData(2900484, "11-1", "Happy Otaku Pack Vol.5", False, 4, 7, 10),
+    "8bit Adventurer": SongData(2900485, "11-2", "Happy Otaku Pack Vol.5", False, 6, 8, 10),
+    "Suffering of screw": SongData(2900486, "11-3", "Happy Otaku Pack Vol.5", False, 3, 5, 8),
+    "tiny lady": SongData(2900487, "11-4", "Happy Otaku Pack Vol.5", True, 4, 6, 9),
+    "Power Attack": SongData(2900488, "11-5", "Happy Otaku Pack Vol.5", False, 5, 7, 10),
+    "Destr0yer": SongData(2900490, "10-0", "Give Up TREATMENT Vol.4", False, 4, 7, 9),
+    "Noel": SongData(2900491, "10-1", "Give Up TREATMENT Vol.4", False, 5, 8, 10),
+    "Kyoukiranbu": SongData(2900492, "10-2", "Give Up TREATMENT Vol.4", False, 7, 9, 11),
+    "Two Phace": SongData(2900493, "10-3", "Give Up TREATMENT Vol.4", True, 4, 7, 10),
+    "Fly Again": SongData(2900494, "10-4", "Give Up TREATMENT Vol.4", False, 5, 7, 10),
+    "ouroVoros": SongData(2900495, "10-5", "Give Up TREATMENT Vol.4", False, 7, 9, 11),
+    "Leave It Alone": SongData(2900497, "9-0", "Happy Otaku Pack Vol.4", True, 2, 5, 8),
+    "Tsubasa no Oreta Tenshitachi no Requiem": SongData(2900498, "9-1", "Happy Otaku Pack Vol.4", False, 4, 7, 9),
+    "Chronomia": SongData(2900499, "9-2", "Happy Otaku Pack Vol.4", False, 5, 7, 10),
+    "Dandelion's Daydream": SongData(2900500, "9-3", "Happy Otaku Pack Vol.4", True, 5, 7, 8),
+    "Lorikeet Flat design": SongData(2900501, "9-4", "Happy Otaku Pack Vol.4", True, 5, 7, 10),
+    "GOODRAGE": SongData(2900502, "9-5", "Happy Otaku Pack Vol.4", False, 6, 9, 11),
+    "Altale": SongData(2900504, "8-0", "Give Up TREATMENT Vol.3", False, 3, 5, 7),
+    "Brain Power": SongData(2900505, "8-1", "Give Up TREATMENT Vol.3", False, 4, 7, 10),
+    "Berry Go!!": SongData(2900506, "8-2", "Give Up TREATMENT Vol.3", False, 3, 6, 9),
+    "Sweet* Witch* Girl*": SongData(2900507, "8-3", "Give Up TREATMENT Vol.3", False, 6, 8, 10),
+    "trippers feeling!": SongData(2900508, "8-4", "Give Up TREATMENT Vol.3", True, 5, 7, 9),
+    "Lilith ambivalence lovers": SongData(2900509, "8-5", "Give Up TREATMENT Vol.3", False, 5, 8, 10),
+    "Brave My Soul": SongData(2900511, "7-0", "Give Up TREATMENT Vol.2", False, 4, 6, 8),
+    "Halcyon": SongData(2900512, "7-1", "Give Up TREATMENT Vol.2", False, 4, 7, 10),
+    "Crimson Nightingale": SongData(2900513, "7-2", "Give Up TREATMENT Vol.2", True, 4, 7, 10),
+    "Invader": SongData(2900514, "7-3", "Give Up TREATMENT Vol.2", True, 3, 7, 11),
+    "Lyrith": SongData(2900515, "7-4", "Give Up TREATMENT Vol.2", False, 5, 7, 10),
+    "GOODBOUNCE": SongData(2900516, "7-5", "Give Up TREATMENT Vol.2", False, 4, 6, 9),
+    "Out of Sense": SongData(2900518, "6-0", "Budget Is Burning Vol.1", False, 3, 5, 8),
+    "My Life Is For You": SongData(2900519, "6-1", "Budget Is Burning Vol.1", False, 2, 4, 7),
+    "Etude -Sunset-": SongData(2900520, "6-2", "Budget Is Burning Vol.1", True, 5, 7, 9),
+    "Goodbye Boss": SongData(2900521, "6-3", "Budget Is Burning Vol.1", False, 4, 6, 8),
+    "Stargazer": SongData(2900522, "6-4", "Budget Is Burning Vol.1", True, 2, 5, 8),
+    "Lys Tourbillon": SongData(2900523, "6-5", "Budget Is Burning Vol.1", True, 4, 6, 8),
+    "Thirty Million Persona": SongData(2900525, "5-0", "Happy Otaku Pack Vol.3", False, 2, 4, 6),
+    "conflict": SongData(2900526, "5-1", "Happy Otaku Pack Vol.3", False, 2, 6, 9),
+    "Enka Dance Music": SongData(2900527, "5-2", "Happy Otaku Pack Vol.3", False, 3, 5, 7),
+    "XING": SongData(2900528, "5-3", "Happy Otaku Pack Vol.3", True, 4, 6, 8),
+    "Amakakeru Soukyuu no Serenade": SongData(2900529, "5-4", "Happy Otaku Pack Vol.3", False, 3, 6, 9),
+    "Gift box": SongData(2900530, "5-5", "Happy Otaku Pack Vol.3", False, 5, 7, 10),
+    "MUSEDASH!!!!": SongData(2900532, "4-0", "Happy Otaku Pack Vol.2", False, 2, 6, 9),
+    "Imprinting": SongData(2900533, "4-1", "Happy Otaku Pack Vol.2", False, 3, 6, 9),
+    "Skyward": SongData(2900534, "4-2", "Happy Otaku Pack Vol.2", True, 4, 7, 10),
+    "La nuit de vif": SongData(2900535, "4-3", "Happy Otaku Pack Vol.2", True, 2, 5, 8),
+    "Bit-alize": SongData(2900536, "4-4", "Happy Otaku Pack Vol.2", False, 3, 6, 8),
+    "GOODTEK": SongData(2900537, "4-5", "Happy Otaku Pack Vol.2", False, 4, 6, 9),
+    "Maharajah": SongData(2900539, "3-0", "Happy Otaku Pack Vol.1", False, 1, 3, 6),
+    "keep on running": SongData(2900540, "3-1", "Happy Otaku Pack Vol.1", False, 5, 7, 9),
+    "Kafig": SongData(2900541, "3-2", "Happy Otaku Pack Vol.1", True, 4, 6, 8),
+    "-+": SongData(2900542, "3-3", "Happy Otaku Pack Vol.1", True, 4, 6, 8),
+    "Tenri Kaku Jou": SongData(2900543, "3-4", "Happy Otaku Pack Vol.1", True, 3, 6, 9),
+    "Adjudicatorz-DanZai-": SongData(2900544, "3-5", "Happy Otaku Pack Vol.1", False, 3, 7, 10),
+    "Oriens": SongData(2900546, "2-0", "Give Up TREATMENT Vol.1", True, 3, 7, 9),
+    "PUPA": SongData(2900547, "2-1", "Give Up TREATMENT Vol.1", False, 6, 8, 11),
+    "Luna Express 2032": SongData(2900548, "2-2", "Give Up TREATMENT Vol.1", False, 4, 6, 8),
+    "Ukiyoe Yokochou": SongData(2900549, "2-3", "Give Up TREATMENT Vol.1", False, 6, 7, 9),
+    "Alice in Misanthrope": SongData(2900550, "2-4", "Give Up TREATMENT Vol.1", False, 5, 7, 10),
+    "GOODMEN": SongData(2900551, "2-5", "Give Up TREATMENT Vol.1", False, 5, 7, 10),
+    "Sunshine and Rainbow after August Rain": SongData(2900553, "1-0", "Cute Is Everything Vol.1", False, 2, 5, 8),
+    "Magical Number": SongData(2900554, "1-1", "Cute Is Everything Vol.1", False, 2, 5, 8),
+    "Dreaming Girl": SongData(2900555, "1-2", "Cute Is Everything Vol.1", False, 2, 5, 6),
+    "Daruma-san Fell Over": SongData(2900556, "1-3", "Cute Is Everything Vol.1", False, 3, 4, 6),
+    "Different": SongData(2900557, "1-4", "Cute Is Everything Vol.1", False, 1, 3, 6),
+    "The Future of the Phantom": SongData(2900558, "1-5", "Cute Is Everything Vol.1", False, 1, 3, 5),
+    "Doki Doki Jump!": SongData(2900560, "63-0", "MUSE RADIO FM104", True, 3, 5, 7),
+    "Centennial Streamers High": SongData(2900561, "63-1", "MUSE RADIO FM104", False, 4, 7, 9),
+    "Love Patrol": SongData(2900562, "63-2", "MUSE RADIO FM104", True, 3, 5, 7),
+    "Mahorova": SongData(2900563, "63-3", "MUSE RADIO FM104", True, 3, 5, 8),
+    "Yoru no machi": SongData(2900564, "63-4", "MUSE RADIO FM104", True, 1, 4, 7),
+    "INTERNET YAMERO": SongData(2900565, "63-5", "MUSE RADIO FM104", True, 6, 8, 10),
+    "Abracadabra": SongData(2900566, "43-24", "MD Plus Project", False, 6, 8, 10),
+    "Squalldecimator feat. EZ-Ven": SongData(2900567, "43-25", "MD Plus Project", True, 5, 7, 9),
+    "Amateras Rhythm": SongData(2900568, "43-26", "MD Plus Project", True, 6, 8, 11),
+    "Record one's Dream": SongData(2900569, "43-27", "MD Plus Project", False, 4, 7, 10),
+    "Lunatic": SongData(2900570, "43-28", "MD Plus Project", True, 5, 8, 10),
+    "Jiumeng": SongData(2900571, "43-29", "MD Plus Project", True, 3, 6, 8),
+    "The Day We Become Family": SongData(2900572, "43-30", "MD Plus Project", True, 3, 5, 8),
+    "Sutori ma FIRE!?!?": SongData(2900574, "64-0", "COSMIC RADIO PEROLIST", True, 3, 5, 8),
+    "Tanuki Step": SongData(2900575, "64-1", "COSMIC RADIO PEROLIST", True, 5, 7, 10),
+    "Space Stationery": SongData(2900576, "64-2", "COSMIC RADIO PEROLIST", True, 5, 7, 10),
+    "Songs Are Judged 90% by Chorus feat. Mameko": SongData(2900577, "64-3", "COSMIC RADIO PEROLIST", True, 6, 8, 10),
+    "Kawai Splendid Space Thief": SongData(2900578, "64-4", "COSMIC RADIO PEROLIST", False, 6, 8, 10),
+    "Night City Runway": SongData(2900579, "64-5", "COSMIC RADIO PEROLIST", True, 4, 6, 8),
+    "Chaos Shotgun feat. ChumuNote": SongData(2900580, "64-6", "COSMIC RADIO PEROLIST", True, 6, 8, 10),
+    "mew mew magical summer": SongData(2900581, "64-7", "COSMIC RADIO PEROLIST", False, 5, 8, 10),
+    "BrainDance": SongData(2900583, "65-0", "NeonAbyss", True, 3, 6, 9),
+    "My Focus!": SongData(2900584, "65-1", "NeonAbyss", True, 5, 7, 10),
+    "ABABABA BURST": SongData(2900585, "65-2", "NeonAbyss", True, 5, 7, 9),
+    "ULTRA HIGHER": SongData(2900586, "65-3", "NeonAbyss", True, 4, 7, 10),
+    "Silver Bullet": SongData(2900587, "43-31", "MD Plus Project", True, 5, 7, 10),
+    "Random": SongData(2900588, "43-32", "MD Plus Project", True, 4, 7, 9),
+    "OTOGE-BOSS-KYOKU-CHAN": SongData(2900589, "43-33", "MD Plus Project", False, 6, 8, 10),
+    "Crow Rabbit": SongData(2900590, "43-34", "MD Plus Project", True, 7, 9, 11),
+    "SyZyGy": SongData(2900591, "43-35", "MD Plus Project", True, 6, 8, 10),
+    "Mermaid Radio": SongData(2900592, "43-36", "MD Plus Project", True, 3, 5, 7),
+    "Helixir": SongData(2900593, "43-37", "MD Plus Project", False, 6, 8, 10),
+    "Highway Cruisin'": SongData(2900594, "43-38", "MD Plus Project", False, 3, 5, 8),
+    "JACK PT BOSS": SongData(2900595, "43-39", "MD Plus Project", False, 6, 8, 10),
+    "Time Capsule": SongData(2900596, "43-40", "MD Plus Project", False, 7, 9, 11),
+    "39 Music!": SongData(2900598, "66-0", "Miku in Museland", False, 3, 5, 8),
+    "Hand in Hand": SongData(2900599, "66-1", "Miku in Museland", False, 1, 3, 6),
+    "Cynical Night Plan": SongData(2900600, "66-2", "Miku in Museland", False, 4, 6, 8),
+    "God-ish": SongData(2900601, "66-3", "Miku in Museland", False, 4, 7, 10),
+    "Darling Dance": SongData(2900602, "66-4", "Miku in Museland", False, 4, 7, 9),
+    "Hatsune Creation Myth": SongData(2900603, "66-5", "Miku in Museland", False, 6, 8, 10),
+    "The Vampire": SongData(2900604, "66-6", "Miku in Museland", False, 4, 6, 9),
+    "Future Eve": SongData(2900605, "66-7", "Miku in Museland", False, 4, 8, 11),
+    "Unknown Mother Goose": SongData(2900606, "66-8", "Miku in Museland", False, 4, 8, 10),
+    "Shun-ran": SongData(2900607, "66-9", "Miku in Museland", False, 4, 7, 9),
+    "NICE TYPE feat. monii": SongData(2900608, "43-41", "MD Plus Project", True, 3, 6, 8),
+    "Rainy Angel": SongData(2900610, "67-0", "Happy Otaku Pack Vol.18", True, 4, 6, 9),
+    "Gullinkambi": SongData(2900611, "67-1", "Happy Otaku Pack Vol.18", True, 4, 7, 10),
+    "RakiRaki Rebuilders!!!": SongData(2900612, "67-2", "Happy Otaku Pack Vol.18", True, 5, 7, 10),
+    "Laniakea": SongData(2900613, "67-3", "Happy Otaku Pack Vol.18", False, 5, 8, 10),
+    "OTTAMA GAZER": SongData(2900614, "67-4", "Happy Otaku Pack Vol.18", True, 5, 8, 10),
+    "Sleep Tight feat.Macoto": SongData(2900615, "67-5", "Happy Otaku Pack Vol.18", True, 3, 5, 8),
+    "New York Back Raise": SongData(2900617, "68-0", "Gambler's Tricks", True, 6, 8, 10),
+    "slic.hertz": SongData(2900618, "68-1", "Gambler's Tricks", True, 5, 7, 9),
+    "Fuzzy-Navel": SongData(2900619, "68-2", "Gambler's Tricks", True, 6, 8, 10),
+    "Swing Edge": SongData(2900620, "68-3", "Gambler's Tricks", True, 4, 8, 10),
+    "Twisted Escape": SongData(2900621, "68-4", "Gambler's Tricks", True, 5, 8, 10),
+    "Swing Sweet Twee Dance": SongData(2900622, "68-5", "Gambler's Tricks", False, 4, 7, 10),
+    "Sanyousei SAY YA!!!": SongData(2900623, "43-42", "MD Plus Project", False, 4, 6, 8),
+    "YUKEMURI TAMAONSEN II": SongData(2900624, "43-43", "MD Plus Project", False, 3, 6, 9),
+    "Samayoi no mei Amatsu": SongData(2900626, "69-0", "Touhou Mugakudan -III-", False, 4, 6, 9),
+    "INTERNET SURVIVOR": SongData(2900627, "69-1", "Touhou Mugakudan -III-", False, 5, 8, 10),
+    "Shuki*RaiRai": SongData(2900628, "69-2", "Touhou Mugakudan -III-", False, 5, 7, 9),
+    "HELLOHELL": SongData(2900629, "69-3", "Touhou Mugakudan -III-", False, 4, 7, 10),
+    "Calamity Fortune": SongData(2900630, "69-4", "Touhou Mugakudan -III-", True, 6, 8, 10),
+    "Tsurupettan": SongData(2900631, "69-5", "Touhou Mugakudan -III-", True, 2, 5, 8),
+    "Twilight Poems": SongData(2900632, "43-44", "MD Plus Project", True, 3, 6, 8),
+    "All My Friends feat. RANASOL": SongData(2900633, "43-45", "MD Plus Project", True, 4, 7, 9),
+    "Heartache": SongData(2900634, "43-46", "MD Plus Project", True, 5, 7, 10),
+    "Blue Lemonade": SongData(2900635, "43-47", "MD Plus Project", True, 3, 6, 8),
+    "Haunted Dance": SongData(2900636, "43-48", "MD Plus Project", False, 6, 9, 11),
+    "Hey Vincent.": SongData(2900637, "43-49", "MD Plus Project", True, 6, 8, 10),
+    "Meteor feat. TEA": SongData(2900638, "43-50", "MD Plus Project", True, 3, 6, 9),
+    "Narcissism Angel": SongData(2900639, "43-51", "MD Plus Project", True, 1, 3, 6),
+    "AlterLuna": SongData(2900640, "43-52", "MD Plus Project", True, 6, 8, 11),
+    "Niki Tousen": SongData(2900641, "43-53", "MD Plus Project", True, 6, 8, 10),
+    "Rettou Joutou": SongData(2900643, "70-0", "Rin Len's Mirrorland", False, 4, 7, 9),
+    "Telecaster B-Boy": SongData(2900644, "70-1", "Rin Len's Mirrorland", False, 5, 7, 10),
+    "Iya Iya Iya": SongData(2900645, "70-2", "Rin Len's Mirrorland", False, 2, 4, 7),
+    "Nee Nee Nee": SongData(2900646, "70-3", "Rin Len's Mirrorland", False, 4, 6, 8),
+    "Chaotic Love Revolution": SongData(2900647, "70-4", "Rin Len's Mirrorland", False, 4, 6, 8),
+    "Dance of the Corpses": SongData(2900648, "70-5", "Rin Len's Mirrorland", False, 2, 5, 8),
+    "Bitter Choco Decoration": SongData(2900649, "70-6", "Rin Len's Mirrorland", False, 3, 6, 9),
+    "Dance Robot Dance": SongData(2900650, "70-7", "Rin Len's Mirrorland", False, 4, 7, 10),
+    "Sweet Devil": SongData(2900651, "70-8", "Rin Len's Mirrorland", False, 5, 7, 9),
+    "Someday'z Coming": SongData(2900652, "70-9", "Rin Len's Mirrorland", False, 5, 7, 9),
+    "Yume Ou Mono Yo Secret": SongData(2900653, "0-53", "Default Music", True, 6, 8, 10),
+    "Yume Ou Mono Yo": SongData(2900654, "0-54", "Default Music", True, 1, 4, None),
+    "Sweet Dream VIVINOS": SongData(2900656, "71-0", "Valentine Stage", False, 1, 4, 7),
+    "Ruler Of My Heart VIVINOS": SongData(2900657, "71-1", "Valentine Stage", False, 2, 4, 6),
+    "Reality Show": SongData(2900658, "71-2", "Valentine Stage", False, 5, 7, 10),
+    "SIG feat.Tobokegao": SongData(2900659, "71-3", "Valentine Stage", True, 3, 6, 8),
+    "Rose Love": SongData(2900660, "71-4", "Valentine Stage", True, 2, 4, 7),
+    "Euphoria": SongData(2900661, "71-5", "Valentine Stage", True, 1, 3, 6),
+    "P E R O P E R O Brother Dance": SongData(2900663, "72-0", "Legends of Muse Warriors", True, None, 7, None),
+    "PA PPA PANIC": SongData(2900664, "72-1", "Legends of Muse Warriors", False, 4, 8, 10),
+    "How To Make Music Game Song!": SongData(2900665, "72-2", "Legends of Muse Warriors", True, 6, 8, 10),
+    "Re Re": SongData(2900666, "72-3", "Legends of Muse Warriors", True, 7, 9, 11),
+    "Marmalade Twins": SongData(2900667, "72-4", "Legends of Muse Warriors", True, 5, 8, 10),
+    "DOMINATOR": SongData(2900668, "72-5", "Legends of Muse Warriors", True, 7, 9, 11),
+    "Teshikani TESHiKANi": SongData(2900669, "72-6", "Legends of Muse Warriors", True, 5, 7, 9),
+    "Urban Magic": SongData(2900671, "73-0", "Happy Otaku Pack Vol.19", True, 3, 5, 7),
+    "Maid's Prank": SongData(2900672, "73-1", "Happy Otaku Pack Vol.19", True, 5, 7, 10),
+    "Dance Dance Good Night Dance": SongData(2900673, "73-2", "Happy Otaku Pack Vol.19", True, 2, 4, 7),
+    "Ops Limone": SongData(2900674, "73-3", "Happy Otaku Pack Vol.19", True, 5, 8, 11),
+    "NOVA": SongData(2900675, "73-4", "Happy Otaku Pack Vol.19", True, 6, 8, 10),
+    "Heaven's Gradius": SongData(2900676, "73-5", "Happy Otaku Pack Vol.19", True, 6, 8, 10),
+    "Ray Tuning": SongData(2900678, "74-0", "CHUNITHM COURSE MUSE", True, 6, 8, 10),
+    "World Vanquisher": SongData(2900679, "74-1", "CHUNITHM COURSE MUSE", True, 6, 8, 10),
+    "Tsukuyomi Ni Naru Replaced": SongData(2900680, "74-2", "CHUNITHM COURSE MUSE", True, 5, 7, 9),
+    "The wheel to the right": SongData(2900681, "74-3", "CHUNITHM COURSE MUSE", True, 5, 7, 9),
+    "Climax": SongData(2900682, "74-4", "CHUNITHM COURSE MUSE", True, 4, 8, 11),
+    "Spider's Thread": SongData(2900683, "74-5", "CHUNITHM COURSE MUSE", True, 5, 8, 10),
+    "HIT ME UP": SongData(2900684, "43-54", "MD Plus Project", True, 4, 6, 8),
+    "Test Me feat. Uyeon": SongData(2900685, "43-55", "MD Plus Project", True, 3, 5, 9),
+    "Assault TAXI": SongData(2900686, "43-56", "MD Plus Project", True, 4, 7, 10),
+    "No": SongData(2900687, "43-57", "MD Plus Project", False, 4, 6, 9),
+    "Pop it": SongData(2900688, "43-58", "MD Plus Project", True, 1, 3, 6),
+    "HEARTBEAT! KyunKyun!": SongData(2900689, "43-59", "MD Plus Project", True, 4, 6, 9),
+    "SUPERHERO": SongData(2900691, "75-0", "Novice Rider Pack", False, 2, 4, 7),
+    "Highway_Summer": SongData(2900692, "75-1", "Novice Rider Pack", True, 2, 4, 6),
+    "Mx. Black Box": SongData(2900693, "75-2", "Novice Rider Pack", True, 5, 7, 9),
+    "Sweet Encounter": SongData(2900694, "75-3", "Novice Rider Pack", True, 2, 4, 7),
+    "Echo over you... Secret": SongData(2900695, "0-55", "Default Music", False, 6, 8, 10),
+    "Echo over you...": SongData(2900696, "0-56", "Default Music", False, 1, 4, None),
+    "Tsukuyomi Ni Naru": SongData(2900697, "74-6", "CHUNITHM COURSE MUSE", True, 5, 8, 10),
+    "disco light": SongData(2900699, "76-0", "MUSE RADIO FM105", True, 5, 7, 9),
+    "room light feat.chancylemon": SongData(2900700, "76-1", "MUSE RADIO FM105", True, 3, 5, 7),
+    "Invisible": SongData(2900701, "76-2", "MUSE RADIO FM105", True, 3, 5, 8),
+    "Christmas Season-LLABB": SongData(2900702, "76-3", "MUSE RADIO FM105", True, 1, 4, 7),
+    "Hyouryu": SongData(2900704, "77-0", "Let's Rhythm Jam!", False, 6, 8, 10),
+    "The Whole Rest": SongData(2900705, "77-1", "Let's Rhythm Jam!", False, 5, 8, 10),
+    "Hydra": SongData(2900706, "77-2", "Let's Rhythm Jam!", False, 4, 7, 11),
+    "Pastel Lines": SongData(2900707, "77-3", "Let's Rhythm Jam!", False, 3, 6, 9),
+    "LINK x LIN#S": SongData(2900708, "77-4", "Let's Rhythm Jam!", False, 3, 6, 9),
+    "Arcade ViruZ": SongData(2900709, "77-5", "Let's Rhythm Jam!", False, 6, 8, 11),
+    "Eve Avenir": SongData(2900711, "78-0", "Endless Pirouette", True, 6, 8, 10),
+    "Silverstring": SongData(2900712, "78-1", "Endless Pirouette", True, 5, 7, 10),
+    "Melusia": SongData(2900713, "78-2", "Endless Pirouette", False, 5, 7, 10),
+    "Devil's Castle": SongData(2900714, "78-3", "Endless Pirouette", True, 4, 7, 10),
+    "Abatement": SongData(2900715, "78-4", "Endless Pirouette", True, 6, 8, 10),
+    "Azalea": SongData(2900716, "78-5", "Endless Pirouette", False, 4, 8, 10),
+    "Brightly World": SongData(2900717, "78-6", "Endless Pirouette", True, 6, 8, 10),
+    "We'll meet in every world ***": SongData(2900718, "78-7", "Endless Pirouette", True, 7, 9, 11),
+    "Collapsar": SongData(2900719, "78-8", "Endless Pirouette", True, 7, 9, 10),
+    "Parousia": SongData(2900720, "78-9", "Endless Pirouette", False, 6, 8, 10),
+    "Gunners in the Rain": SongData(2900722, "79-0", "Ensemble Arcanum", False, 5, 8, 10),
+    "Halzion": SongData(2900723, "79-1", "Ensemble Arcanum", False, 2, 5, 8),
+    "SHOWTIME!!": SongData(2900724, "79-2", "Ensemble Arcanum", False, 6, 8, 10),
+    "Achromic Riddle": SongData(2900725, "79-3", "Ensemble Arcanum", False, 6, 8, 10),
+    "karanosu": SongData(2900726, "79-4", "Ensemble Arcanum", False, 3, 6, 8),
+    "Necromantic": SongData(2900727, "43-60", "MD Plus Project", False, 6, 8, 10),
+    "Saishuu kichiku imouto Flandre-S": SongData(2900729, "80-0", "Touhou Mugakudan -IV-", False, 6, 8, 10),
+    "Kachoufuugetsu": SongData(2900730, "80-1", "Touhou Mugakudan -IV-", False, 2, 6, 8),
+    "Maid heart is a puppet": SongData(2900731, "80-2", "Touhou Mugakudan -IV-", False, 5, 7, 9),
+    "Trance dance anarchy": SongData(2900732, "80-3", "Touhou Mugakudan -IV-", False, 4, 7, 10),
+    "fairy stage": SongData(2900733, "80-4", "Touhou Mugakudan -IV-", False, 4, 6, 9),
+    "Scarlet Police on Ghetto Patrol": SongData(2900734, "80-5", "Touhou Mugakudan -IV-", False, 5, 7, 10),
+    "Unwelcome School": SongData(2900735, "81-0", "MD-level Tactical Training Blu-ray", False, 6, 8, 10),
+    "Usagi Flap": SongData(2900736, "81-1", "MD-level Tactical Training Blu-ray", False, 3, 6, 8),
+    "RE Aoharu": SongData(2900737, "81-2", "MD-level Tactical Training Blu-ray", False, 3, 5, 8),
+    "Operation*DOTABATA!": SongData(2900738, "81-3", "MD-level Tactical Training Blu-ray", False, 5, 7, 10),
+}
diff --git a/worlds/musedash/MuseDashData.txt b/worlds/musedash/MuseDashData.txt
deleted file mode 100644
index d913449ed540..000000000000
--- a/worlds/musedash/MuseDashData.txt
+++ /dev/null
@@ -1,597 +0,0 @@
-Magical Wonderland|0-48|Default Music|True|1|3|0|
-Iyaiya|0-0|Default Music|True|1|4|0|
-Wonderful Pain|0-2|Default Music|False|1|3|0|
-Breaking Dawn|0-3|Default Music|True|2|4|0|
-One-Way Subway|0-4|Default Music|True|1|4|0|
-Frost Land|0-1|Default Music|False|1|3|6|
-Heart-Pounding Flight|0-5|Default Music|True|2|5|0|
-Pancake is Love|0-29|Default Music|True|2|4|7|
-Shiguang Tuya|0-6|Default Music|True|2|5|0|
-Evolution|0-37|Default Music|False|2|4|7|
-Dolphin and Broadcast|0-7|Default Music|True|2|5|0|
-Yuki no Shizuku Ame no Oto|0-8|Default Music|True|2|4|6|
-Best One feat.tooko|0-43|Default Music|False|3|5|0|
-Candy-coloured Love Theory|0-31|Default Music|False|2|4|6|
-Night Wander|0-38|Default Music|False|3|5|7|
-Dohna Dohna no Uta|0-46|Default Music|False|2|4|6|
-Spring Carnival|0-9|Default Music|False|2|4|7|
-DISCO NIGHT|0-30|Default Music|True|2|4|7|
-Koi no Moonlight|0-49|Default Music|False|2|5|8|
-Lian Ai Audio Navigation|0-10|Default Music|False|3|5|7|
-Lights of Muse|0-11|Default Music|True|4|6|8|10
-midstream jam|0-12|Default Music|False|2|5|8|
-Nihao|0-40|Default Music|False|3|5|7|
-Confession|0-13|Default Music|False|3|5|8|
-Galaxy Striker|0-32|Default Music|False|4|7|9|
-Departure Road|0-14|Default Music|True|2|5|8|
-Bass Telekinesis|0-15|Default Music|False|2|5|8|
-Cage of Almeria|0-16|Default Music|True|3|5|7|
-Ira|0-17|Default Music|True|4|6|8|
-Blackest Luxury Car|0-18|Default Music|True|3|6|8|
-Medicine of Sing|0-19|Default Music|False|3|6|8|
-irregulyze|0-20|Default Music|True|3|6|8|
-I don't care about Christmas though|0-47|Default Music|False|4|6|8|
-Imaginary World|0-21|Default Music|True|4|6|8|10
-Dysthymia|0-22|Default Music|True|4|7|9|
-From the New World|0-42|Default Music|False|2|5|7|
-NISEGAO|0-33|Default Music|True|4|7|9|
-Say! Fanfare!|0-44|Default Music|False|4|6|9|
-Star Driver|0-34|Default Music|True|5|7|9|
-Formation|0-23|Default Music|True|4|6|9|
-Shinsou Masui|0-24|Default Music|True|4|6|10|
-Mezame Eurythmics|0-50|Default Music|False|4|6|9|
-Shenri Kuaira -repeat-|0-51|Default Music|False|5|7|9|
-Latitude|0-25|Default Music|True|3|6|9|
-Aqua Stars|0-39|Default Music|False|5|7|10|
-Funkotsu Saishin Casino|0-26|Default Music|False|5|7|10|
-Clock Room & Spiritual World|0-27|Default Music|True|4|6|9|
-INTERNET OVERDOSE|0-52|Default Music|False|3|6|9|
-Tu Hua|0-35|Default Music|True|4|7|9|
-Mujinku-Vacuum|0-28|Default Music|False|5|7|11|
-MilK|0-36|Default Music|False|5|7|9|
-umpopoff|0-41|Default Music|False|0|?|0|
-Mopemope|0-45|Default Music|False|4|7|9|11
-The Happycore Idol|43-0|MD Plus Project|True|2|5|7|
-Amatsumikaboshi|43-1|MD Plus Project|True|4|6|8|10
-ARIGA THESIS|43-2|MD Plus Project|True|3|6|10|
-Night of Nights|43-3|MD Plus Project|False|4|7|10|
-#Psychedelic_Meguro_River|43-4|MD Plus Project|False|3|6|8|
-can you feel it|43-5|MD Plus Project|False|4|6|8|9
-Midnight O'clock|43-6|MD Plus Project|True|3|6|8|
-Rin|43-7|MD Plus Project|True|5|7|10|
-Smile-mileS|43-8|MD Plus Project|False|6|8|10|
-Believing and Being|43-9|MD Plus Project|True|4|6|9|
-Catalyst|43-10|MD Plus Project|False|5|7|9|
-don't!stop!eroero!|43-11|MD Plus Project|True|5|7|9|
-pa pi pu pi pu pi pa|43-12|MD Plus Project|False|6|8|10|
-Sand Maze|43-13|MD Plus Project|True|6|8|10|11
-Diffraction|43-14|MD Plus Project|True|5|8|10|
-AKUMU|43-15|MD Plus Project|False|4|6|8|
-Queen Aluett|43-16|MD Plus Project|True|7|9|11|
-DROPS|43-17|MD Plus Project|False|2|5|8|
-Frightfully-insane Flan-chan's frightful song|43-18|MD Plus Project|False|5|7|10|
-snooze|43-19|MD Plus Project|False|5|7|10|
-Kuishinbo Hacker feat.Kuishinbo Akachan|43-20|MD Plus Project|True|5|7|9|
-Inu no outa|43-21|MD Plus Project|True|3|5|7|
-Prism Fountain|43-22|MD Plus Project|True|7|9|11|
-Gospel|43-23|MD Plus Project|False|4|6|9|
-East Ai Li Lovely|62-0|Happy Otaku Pack Vol.17|False|2|4|7|
-Mori Umi no Fune|62-1|Happy Otaku Pack Vol.17|True|5|7|9|
-Ooi|62-2|Happy Otaku Pack Vol.17|True|5|7|10|
-Numatta!!|62-3|Happy Otaku Pack Vol.17|True|5|7|9|
-SATELLITE|62-4|Happy Otaku Pack Vol.17|False|5|7|9|10
-Fantasia Sonata Colorful feat. V!C|62-5|Happy Otaku Pack Vol.17|True|6|8|11|
-MuseDash ka nanika hi|61-0|Ola Dash|True|?|?|¿|
-Aleph-0|61-1|Ola Dash|True|7|9|11|
-Buttoba Supernova|61-2|Ola Dash|False|5|7|10|11
-Rush-Hour|61-3|Ola Dash|False|IG|Jh|a2|Eh
-3rd Avenue|61-4|Ola Dash|False|3|5|〇|
-WORLDINVADER|61-5|Ola Dash|True|5|8|10|11
-N3V3R G3T OV3R|60-0|maimai DX Limited-time Suite|True|4|7|10|
-Oshama Scramble!|60-1|maimai DX Limited-time Suite|True|5|7|10|
-Valsqotch|60-2|maimai DX Limited-time Suite|True|5|9|11|
-Paranormal My Mind|60-3|maimai DX Limited-time Suite|True|5|7|9|
-Flower, snow and Drum'n'bass.|60-4|maimai DX Limited-time Suite|True|5|8|10|?
-Amenohoakari|60-5|maimai DX Limited-time Suite|True|6|8|10|
-Boiling Blood|59-0|MSR Anthology|True|5|8|10|
-ManiFesto|59-1|MSR Anthology|True|4|6|9|
-Operation Blade|59-2|MSR Anthology|True|3|5|7|
-Radiant|59-3|MSR Anthology|True|3|5|8|
-Renegade|59-4|MSR Anthology|True|3|5|8|
-Speed of Light|59-5|MSR Anthology|False|1|4|7|
-Dossoles Holiday|59-6|MSR Anthology|True|5|7|9|
-Autumn Moods|59-7|MSR Anthology|True|3|5|7|
-People People|58-0|Nanahira Paradise|True|5|7|9|11
-Endless Error Loop|58-1|Nanahira Paradise|True|4|7|9|
-Forbidden Pizza!|58-2|Nanahira Paradise|True|5|7|9|
-Don't Make the Vocalist do Anything Insane|58-3|Nanahira Paradise|True|5|8|9|
-Tokimeki*Meteostrike|57-0|Happy Otaku Pack Vol.16|True|3|6|8|
-Down Low|57-1|Happy Otaku Pack Vol.16|True|4|6|8|
-LOUDER MACHINE|57-2|Happy Otaku Pack Vol.16|True|5|7|9|
-Sorewa mo Lovechu|57-3|Happy Otaku Pack Vol.16|True|5|7|10|
-Rave_Tech|57-4|Happy Otaku Pack Vol.16|True|5|8|10|
-Brilliant & Shining!|57-5|Happy Otaku Pack Vol.16|False|5|8|10|
-Psyched Fevereiro|56-0|Give Up TREATMENT Vol.11|False|5|8|10|
-Inferno City|56-1|Give Up TREATMENT Vol.11|False|6|8|10|
-Paradigm Shift|56-2|Give Up TREATMENT Vol.11|False|4|7|10|
-Snapdragon|56-3|Give Up TREATMENT Vol.11|False|5|7|10|
-Prestige and Vestige|56-4|Give Up TREATMENT Vol.11|True|6|8|11|
-Tiny Fate|56-5|Give Up TREATMENT Vol.11|False|7|9|11|
-Tsuki ni Murakumo Hana ni Kaze|55-0|Touhou Mugakudan -2-|False|3|5|7|
-Patchouli's - Best Hit GSK|55-1|Touhou Mugakudan -2-|False|3|5|8|
-Monosugoi Space Shuttle de Koishi ga Monosugoi uta|55-2|Touhou Mugakudan -2-|False|3|5|7|11
-Kakoinaki Yo wa Ichigo no Tsukikage|55-3|Touhou Mugakudan -2-|False|3|6|8|
-Psychedelic Kizakura Doumei|55-4|Touhou Mugakudan -2-|False|4|7|10|
-Mischievous Sensation|55-5|Touhou Mugakudan -2-|False|5|7|9|
-White Canvas|54-0|MEGAREX THE FUTURE|False|3|6|8|
-Gloomy Flash|54-1|MEGAREX THE FUTURE|False|5|8|10|
-Find this Month's Featured Playlist|54-2|MEGAREX THE FUTURE|False|?|?|¿|
-Sunday Night|54-3|MEGAREX THE FUTURE|False|3|6|9|
-Goodbye Goodnight|54-4|MEGAREX THE FUTURE|False|4|6|9|
-ENDLESS CIDER|54-5|MEGAREX THE FUTURE|False|4|6|8|
-On And On!!|53-0|Happy Otaku Pack Vol.15|True|4|7|9|11
-Trip!|53-1|Happy Otaku Pack Vol.15|True|3|5|7|
-Hoshi no otoshimono|53-2|Happy Otaku Pack Vol.15|False|5|7|9|
-Plucky Race|53-3|Happy Otaku Pack Vol.15|True|5|8|10|11
-Fantasia Sonata Destiny|53-4|Happy Otaku Pack Vol.15|True|3|7|10|
-Run through|53-5|Happy Otaku Pack Vol.15|False|5|8|10|
-marooned night|52-0|MUSE RADIO FM103|False|2|4|6|
-daydream girl|52-1|MUSE RADIO FM103|False|3|6|8|
-Not Ornament|52-2|MUSE RADIO FM103|True|3|5|8|
-Baby Pink|52-3|MUSE RADIO FM103|False|3|5|8|
-I'm Here|52-4|MUSE RADIO FM103|False|4|6|8|
-Masquerade Diary|51-0|Virtual Idol Production|True|2|5|8|
-Reminiscence|51-1|Virtual Idol Production|True|5|7|9|
-DarakuDatenshi|51-2|Virtual Idol Production|True|3|6|9|
-D.I.Y.|51-3|Virtual Idol Production|False|4|6|9|
-Boys in Virtual Land|51-4|Virtual Idol Production|False|4|7|9|
-kui|51-5|Virtual Idol Production|True|5|7|9|11
-Nyan Cat|50-0|Nyanya Universe!|False|4|7|9|
-PeroPero in the Universe|50-1|Nyanya Universe!|True|?|?|¿|
-In-kya Yo-kya Onmyoji|50-2|Nyanya Universe!|False|6|8|10|
-KABOOOOOM!!!!|50-3|Nyanya Universe!|True|4|6|8|
-Doppelganger|50-4|Nyanya Universe!|True|5|7|9|12
-Pray a LOVE|49-0|DokiDoki! Valentine!|False|2|5|8|
-Love-Avoidance Addiction|49-1|DokiDoki! Valentine!|False|3|5|7|
-Daisuki Dayo feat.Wotoha|49-2|DokiDoki! Valentine!|False|5|7|10|
-glory day|48-0|DJMAX Reflect|False|2|5|7|
-Bright Dream|48-1|DJMAX Reflect|False|2|4|7|
-Groovin Up|48-2|DJMAX Reflect|False|4|6|8|
-I Want You|48-3|DJMAX Reflect|False|3|6|8|
-OBLIVION|48-4|DJMAX Reflect|False|3|6|9|
-Elastic STAR|48-5|DJMAX Reflect|False|4|6|8|
-U.A.D|48-6|DJMAX Reflect|False|4|6|8|10
-Jealousy|48-7|DJMAX Reflect|False|3|5|7|
-Memory of Beach|48-8|DJMAX Reflect|False|3|6|8|
-Don't Die|48-9|DJMAX Reflect|False|6|8|10|
-Y CE Ver.|48-10|DJMAX Reflect|False|4|6|9|
-Fancy Night|48-11|DJMAX Reflect|False|4|6|8|
-Can We Talk|48-12|DJMAX Reflect|False|4|6|8|
-Give Me 5|48-13|DJMAX Reflect|False|2|6|8|
-Nightmare|48-14|DJMAX Reflect|False|7|9|11|
-Haze of Autumn|47-0|Arcaea|True|3|6|9|
-GIMME DA BLOOD|47-1|Arcaea|False|3|6|9|
-Libertas|47-2|Arcaea|False|4|7|10|
-Cyaegha|47-3|Arcaea|False|5|7|9|11
-Bang!!|46-0|Happy Otaku Pack Vol.14|False|4|6|8|
-Paradise 2|46-1|Happy Otaku Pack Vol.14|False|4|6|8|
-Symbol|46-2|Happy Otaku Pack Vol.14|False|5|7|9|
-Nekojarashi|46-3|Happy Otaku Pack Vol.14|False|5|8|10|11
-A Philosophical Wanderer|46-4|Happy Otaku Pack Vol.14|False|4|6|10|
-Isouten|46-5|Happy Otaku Pack Vol.14|True|6|8|10|11
-ONOMATO Pairing!!!|45-0|WACCA Horizon|False|4|6|9|
-with U|45-1|WACCA Horizon|False|6|8|10|11
-Chariot|45-2|WACCA Horizon|False|3|6|9|
-GASHATT|45-3|WACCA Horizon|False|5|7|10|
-LIN NE KRO NE feat. lasah|45-4|WACCA Horizon|False|6|8|10|
-ANGEL HALO|45-5|WACCA Horizon|False|5|8|11|
-Party in the HOLLOWood|44-0|Happy Otaku Pack Vol.13|False|3|6|8|
-Ying Ying da Zuozhan|44-1|Happy Otaku Pack Vol.13|True|5|7|9|
-Howlin' Pumpkin|44-2|Happy Otaku Pack Vol.13|True|4|6|8|
-Bad Apple!! feat. Nomico|42-0|Touhou Mugakudan -1-|False|1|3|6|8
-Iro wa Nioedo, Chirinuru wo|42-1|Touhou Mugakudan -1-|False|2|4|7|
-Cirno's Perfect Math Class|42-2|Touhou Mugakudan -1-|False|4|7|9|
-Hiiro Gekka Kyousai no Zetsu|42-3|Touhou Mugakudan -1-|False|4|6|8|
-Flowery Moonlit Night|42-4|Touhou Mugakudan -1-|False|3|6|8|
-Unconscious Requiem|42-5|Touhou Mugakudan -1-|False|3|6|8|
-Super Battleworn Insomniac|41-0|7th Beat Games|True|4|7|9|?
-Bomb-Sniffing Pomeranian|41-1|7th Beat Games|True|4|6|8|
-Rollerdisco Rumble|41-2|7th Beat Games|True|4|6|9|
-Rose Garden|41-3|7th Beat Games|False|5|8|9|
-EMOMOMO|41-4|7th Beat Games|True|4|7|10|
-Heracles|41-5|7th Beat Games|False|6|8|10|?
-Rush-More|40-0|Happy Otaku Pack Vol.12|False|4|7|9|
-Kill My Fortune|40-1|Happy Otaku Pack Vol.12|False|5|7|10|
-Yosari Tsukibotaru Suminoborite|40-2|Happy Otaku Pack Vol.12|False|5|7|9|
-JUMP! HardCandy|40-3|Happy Otaku Pack Vol.12|False|3|6|8|
-Hibari|40-4|Happy Otaku Pack Vol.12|False|3|5|8|
-OCCHOCO-REST-LESS|40-5|Happy Otaku Pack Vol.12|True|4|7|9|
-See-Saw Day|39-0|MUSE RADIO FM102|True|1|3|6|
-happy hour|39-1|MUSE RADIO FM102|True|2|4|7|
-Seikimatsu no Natsu|39-2|MUSE RADIO FM102|True|4|6|8|
-twinkle night|39-3|MUSE RADIO FM102|False|3|6|8|
-ARUYA HARERUYA|39-4|MUSE RADIO FM102|False|2|5|7|
-Blush|39-5|MUSE RADIO FM102|False|2|4|7|
-Naked Summer|39-6|MUSE RADIO FM102|True|4|6|8|
-BLESS ME|39-7|MUSE RADIO FM102|True|2|5|7|
-FM 17314 SUGAR RADIO|39-8|MUSE RADIO FM102|True|?|?|?|
-NO ONE YES MAN|38-0|Phigros|False|5|7|9|
-Snowfall, Merry Christmas|38-1|Phigros|False|5|8|10|
-Igallta|38-2|Phigros|False|6|8|10|11
-Colored Glass|37-0|Cute Is Everything Vol.7|False|1|4|7|
-Neonlights|37-1|Cute Is Everything Vol.7|False|4|7|9|
-Hope for the flowers|37-2|Cute Is Everything Vol.7|False|4|7|9|
-Seaside Cycling on May 30|37-3|Cute Is Everything Vol.7|False|3|6|8|
-SKY HIGH|37-4|Cute Is Everything Vol.7|False|2|4|6|
-Mousou Chu!!|37-5|Cute Is Everything Vol.7|False|4|7|8|
-NightTheater|36-0|Give Up TREATMENT Vol.10|True|6|8|11|
-Cutter|36-1|Give Up TREATMENT Vol.10|False|4|7|10|
-bamboo|36-2|Give Up TREATMENT Vol.10|False|6|8|10|11
-enchanted love|36-3|Give Up TREATMENT Vol.10|False|2|6|9|
-c.s.q.n.|36-4|Give Up TREATMENT Vol.10|False|5|8|11|
-Booouncing!!|36-5|Give Up TREATMENT Vol.10|False|5|7|10|
-PeroPeroGames goes Bankrupt|35-0|Happy Otaku Pack SP|True|6|8|10|
-MARENOL|35-1|Happy Otaku Pack SP|False|4|7|10|
-I am really good at Japanese style|35-2|Happy Otaku Pack SP|True|6|8|10|
-Rush B|35-3|Happy Otaku Pack SP|True|4|7|9|
-DataErr0r|35-4|Happy Otaku Pack SP|False|5|7|9|?
-Burn|35-5|Happy Otaku Pack SP|True|4|7|9|
-ALiVE|34-0|HARDCORE TANO*C|False|5|7|10|
-BATTLE NO.1|34-1|HARDCORE TANO*C|False|5|8|10|11
-Cthugha|34-2|HARDCORE TANO*C|False|6|8|10|11
-TWINKLE*MAGIC|34-3|HARDCORE TANO*C|False|4|7|10|11
-Comet Coaster|34-4|HARDCORE TANO*C|False|6|8|10|11
-XODUS|34-5|HARDCORE TANO*C|False|7|9|11|12
-Fireflies|33-0|cyTus|True|1|4|7|
-Light up my love!!|33-1|cyTus|True|3|5|7|
-Happiness Breeze|33-2|cyTus|True|4|6|8|9
-Chrome VOX|33-3|cyTus|True|6|8|10|11
-CHAOS|33-4|cyTus|True|3|6|9|
-Saika|33-5|cyTus|True|3|5|8|
-Standby for Action|33-6|cyTus|True|4|6|8|
-Hydrangea|33-7|cyTus|True|5|7|9|
-Amenemhat|33-8|cyTus|True|6|8|10|
-Santouka|33-9|cyTus|True|2|5|8|
-HEXENNACHTROCK-katashihaya-|33-10|cyTus|True|4|8|10|
-Blah!!|33-11|cyTus|True|5|8|11|
-CHAOS Glitch|33-12|cyTus|True|0|?|0|
-Preparara|32-0|Let's Do Bad Things Together|False|1|4|6|
-Whatcha;Whatcha Doin'|32-1|Let's Do Bad Things Together|False|3|6|9|
-Madara|32-2|Let's Do Bad Things Together|False|4|6|9|
-pICARESq|32-3|Let's Do Bad Things Together|False|4|6|8|
-Desastre|32-4|Let's Do Bad Things Together|False|4|6|8|
-Shoot for the Moon|32-5|Let's Do Bad Things Together|False|2|5|8|
-The 90's Decision|31-0|Happy Otaku Pack Vol.11|True|5|7|9|
-Medusa|31-1|Happy Otaku Pack Vol.11|False|4|6|8|10
-Final Step!|31-2|Happy Otaku Pack Vol.11|False|5|7|10|
-MAGENTA POTION|31-3|Happy Otaku Pack Vol.11|False|4|7|9|
-Cross Ray|31-4|Happy Otaku Pack Vol.11|False|3|6|9|
-Square Lake|31-5|Happy Otaku Pack Vol.11|False|6|8|9|11
-Girly Cupid|30-0|Cute Is Everything Vol.6|False|3|6|8|
-sheep in the light|30-1|Cute Is Everything Vol.6|False|2|5|8|
-Breaker city|30-2|Cute Is Everything Vol.6|False|4|6|9|
-heterodoxy|30-3|Cute Is Everything Vol.6|False|4|6|8|
-Computer Music Girl|30-4|Cute Is Everything Vol.6|False|3|5|7|
-Focus Point|30-5|Cute Is Everything Vol.6|True|2|5|7|
-Groove Prayer|29-0|Let' s GROOVE!|True|3|5|7|
-FUJIN Rumble|29-1|Let' s GROOVE!|True|5|7|10|11
-Marry me, Nightmare|29-2|Let' s GROOVE!|False|6|8|11|
-HG Makaizou Polyvinyl Shounen|29-3|Let' s GROOVE!|True|4|7|9|10
-Seizya no Ibuki|29-4|Let' s GROOVE!|True|6|8|10|
-ouroboros -twin stroke of the end-|29-5|Let' s GROOVE!|True|4|6|9|12
-Heisha Onsha|28-0|Happy Otaku Pack Vol.10|False|4|6|8|
-Ginevra|28-1|Happy Otaku Pack Vol.10|True|5|7|10|10
-Paracelestia|28-2|Happy Otaku Pack Vol.10|False|5|8|10|
-un secret|28-3|Happy Otaku Pack Vol.10|False|2|4|6|
-Good Life|28-4|Happy Otaku Pack Vol.10|False|4|6|8|
-nini-nini-|28-5|Happy Otaku Pack Vol.10|False|4|7|9|
-Can I friend you on Bassbook? lol|27-0|Nanahira Festival|False|3|6|8|
-Gaming*Everything|27-1|Nanahira Festival|False|5|8|11|
-Renji de haochi|27-2|Nanahira Festival|False|5|7|9|
-You Make My Life 1UP|27-3|Nanahira Festival|False|4|6|8|
-Newbies, Geeks, Internets|27-4|Nanahira Festival|False|6|8|10|
-Onegai!Kon kon Oinarisama|27-5|Nanahira Festival|False|3|6|9|
-Legend of Eastern Rabbit -SKY DEFENDER-|26-0|Give Up TREATMENT Vol.9|False|4|6|9|
-ENERGY SYNERGY MATRIX|26-1|Give Up TREATMENT Vol.9|False|6|8|10|
-Punai Punai Genso|26-2|Give Up TREATMENT Vol.9|False|2|7|11|
-Better Graphic Animation|26-3|Give Up TREATMENT Vol.9|False|5|8|11|
-Variant Cross|26-4|Give Up TREATMENT Vol.9|False|4|7|10|
-Ultra Happy Miracle Bazoooooka!!|26-5|Give Up TREATMENT Vol.9|False|7|9|11|
-tape/stop/night|25-0|MUSE RADIO FM101|True|3|5|7|
-Pixel Galaxy|25-1|MUSE RADIO FM101|False|2|5|8|
-Notice|25-2|MUSE RADIO FM101|False|4|7|10|
-Strawberry Godzilla|25-3|MUSE RADIO FM101|True|2|5|7|
-OKIMOCHI EXPRESSION|25-4|MUSE RADIO FM101|False|4|6|10|
-Kimi to pool disco|25-5|MUSE RADIO FM101|False|4|6|8|
-The Last Page|24-0|Happy Otaku Pack Vol.9|False|3|5|7|
-IKAROS|24-1|Happy Otaku Pack Vol.9|False|4|7|10|
-Tsukuyomi|24-2|Happy Otaku Pack Vol.9|False|3|6|9|
-Future Stream|24-3|Happy Otaku Pack Vol.9|False|4|6|8|
-FULi AUTO SHOOTER|24-4|Happy Otaku Pack Vol.9|True|4|7|9|
-GOODFORTUNE|24-5|Happy Otaku Pack Vol.9|False|5|7|9|
-The Dessert After Rain|23-0|Cute Is Everything Vol.5|True|2|4|6|
-Confession Support Formula|23-1|Cute Is Everything Vol.5|False|3|5|7|
-Omatsuri|23-2|Cute Is Everything Vol.5|False|1|3|6|
-FUTUREPOP|23-3|Cute Is Everything Vol.5|True|2|5|7|
-The Breeze|23-4|Cute Is Everything Vol.5|False|1|4|6|
-I LOVE LETTUCE FRIED RICE!!|23-5|Cute Is Everything Vol.5|False|3|7|9|
-The NightScape|22-0|Give Up TREATMENT Vol.8|False|4|7|9|
-FREEDOM DiVE|22-1|Give Up TREATMENT Vol.8|False|6|8|10|12
-Phi|22-2|Give Up TREATMENT Vol.8|False|5|8|10|
-Lueur de la nuit|22-3|Give Up TREATMENT Vol.8|False|6|8|11|
-Creamy Sugary OVERDRIVE!!!|22-4|Give Up TREATMENT Vol.8|True|4|7|10|
-Disorder|22-5|Give Up TREATMENT Vol.8|False|5|7|11|
-Glimmer|21-0|Budget Is Burning: Nano Core|False|2|5|8|
-EXIST|21-1|Budget Is Burning: Nano Core|False|3|5|8|
-Irreplaceable|21-2|Budget Is Burning: Nano Core|False|4|6|8|
-Moonlight Banquet|20-0|Happy Otaku Pack Vol.8|True|2|5|8|
-Flashdance|20-1|Happy Otaku Pack Vol.8|False|3|6|9|
-INFiNiTE ENERZY -Overdoze-|20-2|Happy Otaku Pack Vol.8|False|4|7|9|10
-One Way Street|20-3|Happy Otaku Pack Vol.8|False|3|6|10|
-This Club is Not 4 U|20-4|Happy Otaku Pack Vol.8|False|4|7|9|
-ULTRA MEGA HAPPY PARTY!!!|20-5|Happy Otaku Pack Vol.8|False|5|7|10|
-INFINITY|19-0|Give Up TREATMENT Vol.7|True|5|8|10|
-Punai Punai Senso|19-1|Give Up TREATMENT Vol.7|False|2|7|11|
-Maxi|19-2|Give Up TREATMENT Vol.7|False|5|8|10|
-YInMn Blue|19-3|Give Up TREATMENT Vol.7|False|6|8|10|
-Plumage|19-4|Give Up TREATMENT Vol.7|False|4|7|10|
-Dr.Techro|19-5|Give Up TREATMENT Vol.7|False|7|9|11|
-SWEETSWEETSWEET|18-0|Cute Is Everything Vol.4|True|2|5|7|
-Deep Blue and the Breaths of the Night|18-1|Cute Is Everything Vol.4|True|2|4|6|
-Joy Connection|18-2|Cute Is Everything Vol.4|False|3|6|8|
-Self Willed Girl Ver.B|18-3|Cute Is Everything Vol.4|True|4|6|8|
-Just Disobedient|18-4|Cute Is Everything Vol.4|False|3|6|8|
-Holy Sh*t Grass Snake|18-5|Cute Is Everything Vol.4|False|2|6|9|
-Cotton Candy Wonderland|17-0|Happy Otaku Pack Vol.7|False|2|5|8|
-Punai Punai Taiso|17-1|Happy Otaku Pack Vol.7|False|2|7|10|
-Fly High|17-2|Happy Otaku Pack Vol.7|False|3|5|7|
-prejudice|17-3|Happy Otaku Pack Vol.7|True|4|6|9|
-The 89's Momentum|17-4|Happy Otaku Pack Vol.7|True|5|7|9|
-energy night|17-5|Happy Otaku Pack Vol.7|True|5|7|10|
-Future Dive|16-0|Give Up TREATMENT Vol.6|True|4|6|9|
-Re End of a Dream|16-1|Give Up TREATMENT Vol.6|False|5|8|11|
-Etude -Storm-|16-2|Give Up TREATMENT Vol.6|True|6|8|10|
-Unlimited Katharsis|16-3|Give Up TREATMENT Vol.6|False|4|6|10|
-Magic Knight Girl|16-4|Give Up TREATMENT Vol.6|False|4|7|9|
-Eeliaas|16-5|Give Up TREATMENT Vol.6|False|6|9|11|
-Magic Spell|15-0|Cute Is Everything Vol.3|True|2|5|7|
-Colorful Star, Colored Drawing, Travel Poem|15-1|Cute Is Everything Vol.3|False|3|4|6|
-Satell Knight|15-2|Cute Is Everything Vol.3|False|3|6|8|
-Black River Feat.Mes|15-3|Cute Is Everything Vol.3|True|1|4|6|
-I am sorry|15-4|Cute Is Everything Vol.3|False|2|5|8|
-Ueta Tori Tachi|15-5|Cute Is Everything Vol.3|False|3|6|8|
-Elysion's Old Mans|14-0|Happy Otaku Pack Vol.6|False|3|5|8|
-AXION|14-1|Happy Otaku Pack Vol.6|False|4|5|8|
-Amnesia|14-2|Happy Otaku Pack Vol.6|True|3|6|9|
-Onsen Dai Sakusen|14-3|Happy Otaku Pack Vol.6|True|4|6|8|
-Gleam stone|14-4|Happy Otaku Pack Vol.6|False|4|7|9|
-GOODWORLD|14-5|Happy Otaku Pack Vol.6|False|4|7|10|
-Instant Soluble Neon|13-0|Cute Is Everything Vol.2|True|2|4|7|
-Retrospective Poem on the Planet|13-1|Cute Is Everything Vol.2|False|3|5|7|
-I'm Gonna Buy! Buy! Buy!|13-2|Cute Is Everything Vol.2|True|4|6|8|
-Dating Manifesto|13-3|Cute Is Everything Vol.2|True|2|4|6|
-First Snow|13-4|Cute Is Everything Vol.2|True|2|3|6|
-Xin Shang Huahai|13-5|Cute Is Everything Vol.2|False|3|6|8|
-Gaikan Chrysalis|12-0|Give Up TREATMENT Vol.5|False|4|6|8|
-Sterelogue|12-1|Give Up TREATMENT Vol.5|True|5|7|10|
-Cheshire's Dance|12-2|Give Up TREATMENT Vol.5|True|4|7|10|
-Skrik|12-3|Give Up TREATMENT Vol.5|True|5|7|11|
-Soda Pop Canva5!|12-4|Give Up TREATMENT Vol.5|False|5|8|10|
-RUBY LINTe|12-5|Give Up TREATMENT Vol.5|False|5|8|11|
-Brave My Heart|11-0|Happy Otaku Pack Vol.5|True|3|5|7|
-Sakura Fubuki|11-1|Happy Otaku Pack Vol.5|False|4|7|10|
-8bit Adventurer|11-2|Happy Otaku Pack Vol.5|False|6|8|10|
-Suffering of screw|11-3|Happy Otaku Pack Vol.5|False|3|5|8|
-tiny lady|11-4|Happy Otaku Pack Vol.5|True|4|6|9|
-Power Attack|11-5|Happy Otaku Pack Vol.5|False|5|7|10|
-Destr0yer|10-0|Give Up TREATMENT Vol.4|False|4|7|9|
-Noel|10-1|Give Up TREATMENT Vol.4|False|5|8|10|
-Kyoukiranbu|10-2|Give Up TREATMENT Vol.4|False|7|9|11|
-Two Phace|10-3|Give Up TREATMENT Vol.4|True|4|7|10|
-Fly Again|10-4|Give Up TREATMENT Vol.4|False|5|7|10|
-ouroVoros|10-5|Give Up TREATMENT Vol.4|False|7|9|11|
-Leave It Alone|9-0|Happy Otaku Pack Vol.4|True|2|5|8|
-Tsubasa no Oreta Tenshitachi no Requiem|9-1|Happy Otaku Pack Vol.4|False|4|7|9|
-Chronomia|9-2|Happy Otaku Pack Vol.4|False|5|7|10|
-Dandelion's Daydream|9-3|Happy Otaku Pack Vol.4|True|5|7|8|
-Lorikeet Flat design|9-4|Happy Otaku Pack Vol.4|True|5|7|10|
-GOODRAGE|9-5|Happy Otaku Pack Vol.4|False|6|9|11|
-Altale|8-0|Give Up TREATMENT Vol.3|False|3|5|7|10
-Brain Power|8-1|Give Up TREATMENT Vol.3|False|4|7|10|
-Berry Go!!|8-2|Give Up TREATMENT Vol.3|False|3|6|9|
-Sweet* Witch* Girl*|8-3|Give Up TREATMENT Vol.3|False|6|8|10|?
-trippers feeling!|8-4|Give Up TREATMENT Vol.3|True|5|7|9|11
-Lilith ambivalence lovers|8-5|Give Up TREATMENT Vol.3|False|5|8|10|
-Brave My Soul|7-0|Give Up TREATMENT Vol.2|False|4|6|8|
-Halcyon|7-1|Give Up TREATMENT Vol.2|False|4|7|10|
-Crimson Nightingale|7-2|Give Up TREATMENT Vol.2|True|4|7|10|
-Invader|7-3|Give Up TREATMENT Vol.2|True|3|7|11|
-Lyrith|7-4|Give Up TREATMENT Vol.2|False|5|7|10|
-GOODBOUNCE|7-5|Give Up TREATMENT Vol.2|False|4|6|9|
-Out of Sense|6-0|Budget Is Burning Vol.1|False|3|5|8|
-My Life Is For You|6-1|Budget Is Burning Vol.1|False|2|4|7|
-Etude -Sunset-|6-2|Budget Is Burning Vol.1|True|5|7|9|
-Goodbye Boss|6-3|Budget Is Burning Vol.1|False|4|6|8|
-Stargazer|6-4|Budget Is Burning Vol.1|True|2|5|8|9
-Lys Tourbillon|6-5|Budget Is Burning Vol.1|True|4|6|8|
-Thirty Million Persona|5-0|Happy Otaku Pack Vol.3|False|2|4|6|
-conflict|5-1|Happy Otaku Pack Vol.3|False|2|6|9|10
-Enka Dance Music|5-2|Happy Otaku Pack Vol.3|False|3|5|7|
-XING|5-3|Happy Otaku Pack Vol.3|True|4|6|8|9
-Amakakeru Soukyuu no Serenade|5-4|Happy Otaku Pack Vol.3|False|3|6|9|
-Gift box|5-5|Happy Otaku Pack Vol.3|False|5|7|10|
-MUSEDASH!!!!|4-0|Happy Otaku Pack Vol.2|False|2|6|9|0
-Imprinting|4-1|Happy Otaku Pack Vol.2|False|3|6|9|0
-Skyward|4-2|Happy Otaku Pack Vol.2|True|4|7|10|0
-La nuit de vif|4-3|Happy Otaku Pack Vol.2|True|2|5|8|0
-Bit-alize|4-4|Happy Otaku Pack Vol.2|False|3|6|8|0
-GOODTEK|4-5|Happy Otaku Pack Vol.2|False|4|6|9|?
-Maharajah|3-0|Happy Otaku Pack Vol.1|False|1|3|6|
-keep on running|3-1|Happy Otaku Pack Vol.1|False|5|7|9|
-Kafig|3-2|Happy Otaku Pack Vol.1|True|4|6|8|
--+|3-3|Happy Otaku Pack Vol.1|True|4|6|8|
-Tenri Kaku Jou|3-4|Happy Otaku Pack Vol.1|True|3|6|9|
-Adjudicatorz-DanZai-|3-5|Happy Otaku Pack Vol.1|False|3|7|10|
-Oriens|2-0|Give Up TREATMENT Vol.1|True|3|7|9|
-PUPA|2-1|Give Up TREATMENT Vol.1|False|6|8|11|
-Luna Express 2032|2-2|Give Up TREATMENT Vol.1|False|4|6|8|
-Ukiyoe Yokochou|2-3|Give Up TREATMENT Vol.1|False|6|7|9|
-Alice in Misanthrope|2-4|Give Up TREATMENT Vol.1|False|5|7|10|
-GOODMEN|2-5|Give Up TREATMENT Vol.1|False|5|7|10|
-Sunshine and Rainbow after August Rain|1-0|Cute Is Everything Vol.1|False|2|5|8|
-Magical Number|1-1|Cute Is Everything Vol.1|False|2|5|8|
-Dreaming Girl|1-2|Cute Is Everything Vol.1|False|2|5|6|
-Daruma-san Fell Over|1-3|Cute Is Everything Vol.1|False|3|4|6|
-Different|1-4|Cute Is Everything Vol.1|False|1|3|6|
-The Future of the Phantom|1-5|Cute Is Everything Vol.1|False|1|3|5|
-Doki Doki Jump!|63-0|MUSE RADIO FM104|True|3|5|7|
-Centennial Streamers High|63-1|MUSE RADIO FM104|False|4|7|9|
-Love Patrol|63-2|MUSE RADIO FM104|True|3|5|7|
-Mahorova|63-3|MUSE RADIO FM104|True|3|5|8|
-Yoru no machi|63-4|MUSE RADIO FM104|True|1|4|7|
-INTERNET YAMERO|63-5|MUSE RADIO FM104|True|6|8|10|
-Abracadabra|43-24|MD Plus Project|False|6|8|10|
-Squalldecimator feat. EZ-Ven|43-25|MD Plus Project|True|5|7|9|
-Amateras Rhythm|43-26|MD Plus Project|True|6|8|11|
-Record one's Dream|43-27|MD Plus Project|False|4|7|10|
-Lunatic|43-28|MD Plus Project|True|5|8|10|
-Jiumeng|43-29|MD Plus Project|True|3|6|8|
-The Day We Become Family|43-30|MD Plus Project|True|3|5|8|
-Sutori ma FIRE!?!?|64-0|COSMIC RADIO PEROLIST|True|3|5|8|
-Tanuki Step|64-1|COSMIC RADIO PEROLIST|True|5|7|10|11
-Space Stationery|64-2|COSMIC RADIO PEROLIST|True|5|7|10|
-Songs Are Judged 90% by Chorus feat. Mameko|64-3|COSMIC RADIO PEROLIST|True|6|8|10|
-Kawai Splendid Space Thief|64-4|COSMIC RADIO PEROLIST|False|6|8|10|11
-Night City Runway|64-5|COSMIC RADIO PEROLIST|True|4|6|8|
-Chaos Shotgun feat. ChumuNote|64-6|COSMIC RADIO PEROLIST|True|6|8|10|
-mew mew magical summer|64-7|COSMIC RADIO PEROLIST|False|5|8|10|11
-BrainDance|65-0|NeonAbyss|True|3|6|9|
-My Focus!|65-1|NeonAbyss|True|5|7|10|
-ABABABA BURST|65-2|NeonAbyss|True|5|7|9|
-ULTRA HIGHER|65-3|NeonAbyss|True|4|7|10|
-Silver Bullet|43-31|MD Plus Project|True|5|7|10|
-Random|43-32|MD Plus Project|True|4|7|9|
-OTOGE-BOSS-KYOKU-CHAN|43-33|MD Plus Project|False|6|8|10|11
-Crow Rabbit|43-34|MD Plus Project|True|7|9|11|
-SyZyGy|43-35|MD Plus Project|True|6|8|10|11
-Mermaid Radio|43-36|MD Plus Project|True|3|5|7|
-Helixir|43-37|MD Plus Project|False|6|8|10|
-Highway Cruisin'|43-38|MD Plus Project|False|3|5|8|
-JACK PT BOSS|43-39|MD Plus Project|False|6|8|10|
-Time Capsule|43-40|MD Plus Project|False|7|9|11|
-39 Music!|66-0|Miku in Museland|False|3|5|8|
-Hand in Hand|66-1|Miku in Museland|False|1|3|6|
-Cynical Night Plan|66-2|Miku in Museland|False|4|6|8|
-God-ish|66-3|Miku in Museland|False|4|7|10|
-Darling Dance|66-4|Miku in Museland|False|4|7|9|
-Hatsune Creation Myth|66-5|Miku in Museland|False|6|8|10|11
-The Vampire|66-6|Miku in Museland|False|4|6|9|
-Future Eve|66-7|Miku in Museland|False|4|8|11|
-Unknown Mother Goose|66-8|Miku in Museland|False|4|8|10|
-Shun-ran|66-9|Miku in Museland|False|4|7|9|
-NICE TYPE feat. monii|43-41|MD Plus Project|True|3|6|8|
-Rainy Angel|67-0|Happy Otaku Pack Vol.18|True|4|6|9|11
-Gullinkambi|67-1|Happy Otaku Pack Vol.18|True|4|7|10|
-RakiRaki Rebuilders!!!|67-2|Happy Otaku Pack Vol.18|True|5|7|10|
-Laniakea|67-3|Happy Otaku Pack Vol.18|False|5|8|10|
-OTTAMA GAZER|67-4|Happy Otaku Pack Vol.18|True|5|8|10|
-Sleep Tight feat.Macoto|67-5|Happy Otaku Pack Vol.18|True|3|5|8|
-New York Back Raise|68-0|Gambler's Tricks|True|6|8|10|
-slic.hertz|68-1|Gambler's Tricks|True|5|7|9|
-Fuzzy-Navel|68-2|Gambler's Tricks|True|6|8|10|11
-Swing Edge|68-3|Gambler's Tricks|True|4|8|10|
-Twisted Escape|68-4|Gambler's Tricks|True|5|8|10|11
-Swing Sweet Twee Dance|68-5|Gambler's Tricks|False|4|7|10|
-Sanyousei SAY YA!!!|43-42|MD Plus Project|False|4|6|8|
-YUKEMURI TAMAONSEN II|43-43|MD Plus Project|False|3|6|9|
-Samayoi no mei Amatsu|69-0|Touhou Mugakudan -3-|False|4|6|9|
-INTERNET SURVIVOR|69-1|Touhou Mugakudan -3-|False|5|8|10|
-Shuki*RaiRai|69-2|Touhou Mugakudan -3-|False|5|7|9|
-HELLOHELL|69-3|Touhou Mugakudan -3-|False|4|7|10|
-Calamity Fortune|69-4|Touhou Mugakudan -3-|True|6|8|10|11
-Tsurupettan|69-5|Touhou Mugakudan -3-|True|2|5|8|
-Twilight Poems|43-44|MD Plus Project|True|3|6|8|
-All My Friends feat. RANASOL|43-45|MD Plus Project|True|4|7|9|
-Heartache|43-46|MD Plus Project|True|5|7|10|
-Blue Lemonade|43-47|MD Plus Project|True|3|6|8|
-Haunted Dance|43-48|MD Plus Project|False|6|9|11|
-Hey Vincent.|43-49|MD Plus Project|True|6|8|10|
-Meteor feat. TEA|43-50|MD Plus Project|True|3|6|9|
-Narcissism Angel|43-51|MD Plus Project|True|1|3|6|
-AlterLuna|43-52|MD Plus Project|True|6|8|11|12
-Niki Tousen|43-53|MD Plus Project|True|6|8|10|12
-Rettou Joutou|70-0|Rin Len's Mirrorland|False|4|7|9|
-Telecaster B-Boy|70-1|Rin Len's Mirrorland|False|5|7|10|
-Iya Iya Iya|70-2|Rin Len's Mirrorland|False|2|4|7|
-Nee Nee Nee|70-3|Rin Len's Mirrorland|False|4|6|8|
-Chaotic Love Revolution|70-4|Rin Len's Mirrorland|False|4|6|8|
-Dance of the Corpses|70-5|Rin Len's Mirrorland|False|2|5|8|
-Bitter Choco Decoration|70-6|Rin Len's Mirrorland|False|3|6|9|
-Dance Robot Dance|70-7|Rin Len's Mirrorland|False|4|7|10|
-Sweet Devil|70-8|Rin Len's Mirrorland|False|5|7|9|
-Someday'z Coming|70-9|Rin Len's Mirrorland|False|5|7|9|
-Yume Ou Mono Yo Secret|0-53|Default Music|True|6|8|10|
-Yume Ou Mono Yo|0-54|Default Music|True|1|4|0|
-Sweet Dream VIVINOS|71-0|Valentine Stage|False|1|4|7|
-Ruler Of My Heart VIVINOS|71-1|Valentine Stage|False|2|4|6|
-Reality Show|71-2|Valentine Stage|False|5|7|10|
-SIG feat.Tobokegao|71-3|Valentine Stage|True|3|6|8|
-Rose Love|71-4|Valentine Stage|True|2|4|7|
-Euphoria|71-5|Valentine Stage|True|1|3|6|
-P E R O P E R O Brother Dance|72-0|Legends of Muse Warriors|True|0|?|0|
-PA PPA PANIC|72-1|Legends of Muse Warriors|False|4|8|10|
-How To Make Music Game Song!|72-2|Legends of Muse Warriors|True|6|8|10|11
-Re Re|72-3|Legends of Muse Warriors|True|7|9|11|12
-Marmalade Twins|72-4|Legends of Muse Warriors|True|5|8|10|
-DOMINATOR|72-5|Legends of Muse Warriors|True|7|9|11|
-Teshikani TESHiKANi|72-6|Legends of Muse Warriors|True|5|7|9|
-Urban Magic|73-0|Happy Otaku Pack Vol.19|True|3|5|7|
-Maid's Prank|73-1|Happy Otaku Pack Vol.19|True|5|7|10|
-Dance Dance Good Night Dance|73-2|Happy Otaku Pack Vol.19|True|2|4|7|
-Ops Limone|73-3|Happy Otaku Pack Vol.19|True|5|8|11|
-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 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
-HIT ME UP|43-54|MD Plus Project|True|4|6|8|
-Test Me feat. Uyeon|43-55|MD Plus Project|True|3|5|9|
-Assault TAXI|43-56|MD Plus Project|True|4|7|10|
-No|43-57|MD Plus Project|False|4|6|9|
-Pop it|43-58|MD Plus Project|True|1|3|6|
-HEARTBEAT! KyunKyun!|43-59|MD Plus Project|True|4|6|9|
-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|11|
-Eve Avenir|78-0|Endless Pirouette|True|6|8|10|
-Silverstring|78-1|Endless Pirouette|True|5|7|10|
-Melusia|78-2|Endless Pirouette|False|5|7|10|11
-Devil's Castle|78-3|Endless Pirouette|True|4|7|10|
-Abatement|78-4|Endless Pirouette|True|6|8|10|11
-Azalea|78-5|Endless Pirouette|False|4|8|10|
-Brightly World|78-6|Endless Pirouette|True|6|8|10|
-We'll meet in every world ***|78-7|Endless Pirouette|True|7|9|11|
-Collapsar|78-8|Endless Pirouette|True|7|9|10|11
-Parousia|78-9|Endless Pirouette|False|6|8|10|
-Gunners in the Rain|79-0|Ensemble Arcanum|False|5|8|10|
-Halzion|79-1|Ensemble Arcanum|False|2|5|8|
-SHOWTIME!!|79-2|Ensemble Arcanum|False|6|8|10|
-Achromic Riddle|79-3|Ensemble Arcanum|False|6|8|10|11
-karanosu|79-4|Ensemble Arcanum|False|3|6|8|
diff --git a/worlds/musedash/Options.py b/worlds/musedash/Options.py
index b8c969c39b0f..9f729c2d03e2 100644
--- a/worlds/musedash/Options.py
+++ b/worlds/musedash/Options.py
@@ -1,13 +1,14 @@
-from Options import Toggle, Range, Choice, DeathLink, ItemSet, OptionSet, PerGameCommonOptions, OptionGroup, Removed
+from Options import Toggle, Range, Choice, DeathLink, OptionSet, PerGameCommonOptions, OptionGroup, Removed
 from dataclasses import dataclass
 
 from .MuseDashCollection import MuseDashCollections
+from .MuseDashData import SONG_DATA
 
 
 class DLCMusicPacks(OptionSet):
     """
     Choose which DLC Packs will be included in the pool of chooseable songs.
-    
+
     Note: The [Just As Planned] DLC contains all [Muse Plus] songs.
     """
     display_name = "DLC Packs"
@@ -17,7 +18,7 @@ class DLCMusicPacks(OptionSet):
 class StreamerModeEnabled(Toggle):
     """
     In Muse Dash, an option named 'Streamer Mode' removes songs which may trigger copyright issues when streaming.
-    
+
     If this is enabled, only songs available under Streamer Mode will be available for randomization.
     """
     display_name = "Streamer Mode Only Songs"
@@ -69,7 +70,7 @@ class DifficultyMode(Choice):
 class DifficultyModeOverrideMin(Range):
     """
     Ensures that 1 difficulty has at least 1 this value or higher per song.
-    
+
     Note: Difficulty Mode must be set to Manual.
     """
     display_name = "Manual Difficulty Min"
@@ -82,7 +83,7 @@ class DifficultyModeOverrideMin(Range):
 class DifficultyModeOverrideMax(Range):
     """
     Ensures that 1 difficulty has at least 1 this value or lower per song.
-    
+
     Note: Difficulty Mode must be set to Manual.
     """
     display_name = "Manual Difficulty Max"
@@ -114,7 +115,7 @@ class GradeNeeded(Choice):
 class MusicSheetCountPercentage(Range):
     """
     Controls how many music sheets are added to the pool based on the number of songs, including starting songs.
-    
+
     Higher numbers leads to more consistent game lengths, but will cause individual music sheets to be less important.
     """
     range_start = 10
@@ -137,7 +138,7 @@ class ChosenTraps(OptionSet):
     - Traps last the length of a song, or until you die.
     - VFX Traps consist of visual effects that play over the song. (i.e. Grayscale.)
     - SFX Traps consist of changing your sfx setting to one possibly more annoying sfx.
-    
+
     Note: SFX traps are only available if [Just as Planned] DLC songs are enabled.
     """
     display_name = "Chosen Traps"
@@ -152,24 +153,26 @@ class TrapCountPercentage(Range):
     display_name = "Trap Percentage"
 
 
-class IncludeSongs(ItemSet):
+class SongSet(OptionSet):
+    valid_keys = SONG_DATA.keys()
+
+
+class IncludeSongs(SongSet):
     """
     These songs will be guaranteed to show up within the seed.
     - You must have the DLC enabled to play these songs.
     - Difficulty options will not affect these songs.
     - If there are too many included songs, this will act as a whitelist ignoring song difficulty.
     """
-    verify_item_name = True
     display_name = "Include Songs"
 
 
-class ExcludeSongs(ItemSet):
+class ExcludeSongs(SongSet):
     """
     These songs will be guaranteed to not show up within the seed.
-    
+
     Note: Does not affect songs within the "Include Songs" list.
     """
-    verify_item_name = True
     display_name = "Exclude Songs"
 
 
@@ -211,7 +214,7 @@ class MuseDashOptions(PerGameCommonOptions):
     death_link: DeathLink
     include_songs: IncludeSongs
     exclude_songs: ExcludeSongs
-    
+
     # Removed
     allow_just_as_planned_dlc_songs: Removed
     available_trap_types: Removed
diff --git a/worlds/musedash/__init__.py b/worlds/musedash/__init__.py
index be2eec2f87b8..d793308a7c0e 100644
--- a/worlds/musedash/__init__.py
+++ b/worlds/musedash/__init__.py
@@ -63,6 +63,11 @@ class MuseDashWorld(World):
 
     item_name_to_id = {name: code for name, code in md_collection.item_names_to_id.items()}
     location_name_to_id = {name: code for name, code in md_collection.location_names_to_id.items()}
+    item_name_groups = {
+        "Songs": {name for name in md_collection.song_items.keys()},
+        "Filler Items": {name for name in md_collection.filler_items.keys()},
+        "Traps": {name for name in md_collection.trap_items.keys()}
+    }
 
     # Working Data
     victory_song_name: str = ""
@@ -179,10 +184,6 @@ def create_item(self, name: str) -> Item:
         if trap:
             return MuseDashFixedItem(name, ItemClassification.trap, trap, self.player)
 
-        album = self.md_collection.album_items.get(name)
-        if album:
-            return MuseDashSongItem(name, self.player, album)
-
         song = self.md_collection.song_items[name]
         return MuseDashSongItem(name, self.player, song)
 
diff --git a/worlds/musedash/test/TestDifficultyRanges.py b/worlds/musedash/test/TestDifficultyRanges.py
index a9c36985afae..27798243a559 100644
--- a/worlds/musedash/test/TestDifficultyRanges.py
+++ b/worlds/musedash/test/TestDifficultyRanges.py
@@ -1,7 +1,17 @@
 from . import MuseDashTestBase
+from typing import List
 
 
 class DifficultyRanges(MuseDashTestBase):
+    DIFF_OVERRIDES: List[str] = [
+        "MuseDash ka nanika hi",
+        "Rush-Hour",
+        "Find this Month's Featured Playlist",
+        "PeroPero in the Universe",
+        "umpopoff",
+        "P E R O P E R O Brother Dance",
+    ]
+
     def test_all_difficulty_ranges(self) -> None:
         muse_dash_world = self.get_world()
         dlc_set = {x for x in muse_dash_world.md_collection.DLC}
@@ -63,7 +73,7 @@ def test_range(input_range, lower, upper):
     def test_songs_have_difficulty(self) -> None:
         muse_dash_world = self.get_world()
 
-        for song_name in muse_dash_world.md_collection.DIFF_OVERRIDES:
+        for song_name in self.DIFF_OVERRIDES:
             song = muse_dash_world.md_collection.song_items[song_name]
 
             # Some songs are weird and have less than the usual 3 difficulties.

From 172ad4e57d440809685462927454252609ea45fa Mon Sep 17 00:00:00 2001
From: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Date: Sun, 12 Jan 2025 13:00:20 -0500
Subject: [PATCH 241/381] Adventure: Optimize imports (#4300)

---
 worlds/adventure/Options.py  |  5 ++---
 worlds/adventure/Regions.py  |  2 +-
 worlds/adventure/Rom.py      |  8 ++++----
 worlds/adventure/__init__.py | 23 ++++++-----------------
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/worlds/adventure/Options.py b/worlds/adventure/Options.py
index e6a8e4c20200..4b3f30df242d 100644
--- a/worlds/adventure/Options.py
+++ b/worlds/adventure/Options.py
@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from typing import Dict
-
 from dataclasses import dataclass
-from Options import Choice, Option, DefaultOnToggle, DeathLink, Range, Toggle, PerGameCommonOptions
+
+from Options import Choice, DefaultOnToggle, DeathLink, Range, Toggle, PerGameCommonOptions
 
 
 class FreeincarnateMax(Range):
diff --git a/worlds/adventure/Regions.py b/worlds/adventure/Regions.py
index 4e4dd1e7baa1..a0a04be2aa30 100644
--- a/worlds/adventure/Regions.py
+++ b/worlds/adventure/Regions.py
@@ -1,6 +1,6 @@
 from BaseClasses import MultiWorld, Region, Entrance, LocationProgressType
 from Options import PerGameCommonOptions
-from .Locations import location_table, LocationData, AdventureLocation, dragon_room_to_region
+from .Locations import location_table, AdventureLocation, dragon_room_to_region
 
 
 def connect(world: MultiWorld, player: int, source: str, target: str, rule: callable = lambda state: True,
diff --git a/worlds/adventure/Rom.py b/worlds/adventure/Rom.py
index 643f7a6c766c..4d56cd19e529 100644
--- a/worlds/adventure/Rom.py
+++ b/worlds/adventure/Rom.py
@@ -2,14 +2,14 @@
 import json
 import os
 import zipfile
-from typing import Optional, Any
+from typing import Any
+
+import bsdiff4
 
 import Utils
-from .Locations import AdventureLocation, LocationData
 from settings import get_settings
 from worlds.Files import APPatch, AutoPatchRegister
-
-import bsdiff4
+from .Locations import LocationData
 
 ADVENTUREHASH: str = "157bddb7192754a45372be196797f284"
 
diff --git a/worlds/adventure/__init__.py b/worlds/adventure/__init__.py
index 4fde1482cfe1..9dab2ffcef6a 100644
--- a/worlds/adventure/__init__.py
+++ b/worlds/adventure/__init__.py
@@ -1,35 +1,24 @@
-import base64
 import copy
-import itertools
 import math
 import os
-import settings
 import typing
-from enum import IntFlag
-from typing import Any, ClassVar, Dict, List, Optional, Set, Tuple
+from typing import ClassVar, Dict, Optional, Tuple
 
-from BaseClasses import Entrance, Item, ItemClassification, MultiWorld, Region, Tutorial, \
-    LocationProgressType
+import settings
+from BaseClasses import Item, ItemClassification, MultiWorld, Tutorial, LocationProgressType
 from Utils import __version__
-from Options import AssembleOptions
 from worlds.AutoWorld import WebWorld, World
-from Fill import fill_restrictive
-from worlds.generic.Rules import add_rule, set_rule
-from .Options import DragonRandoType, DifficultySwitchA, DifficultySwitchB, \
-    AdventureOptions
-from .Rom import get_base_rom_bytes, get_base_rom_path, AdventureDeltaPatch, apply_basepatch, \
-    AdventureAutoCollectLocation
+from worlds.LauncherComponents import Component, components, SuffixIdentifier
 from .Items import item_table, ItemData, nothing_item_id, event_table, AdventureItem, standard_item_max
 from .Locations import location_table, base_location_id, LocationData, get_random_room_in_regions
 from .Offsets import static_item_data_location, items_ram_start, static_item_element_size, item_position_table, \
     static_first_dragon_index, connector_port_offset, yorgle_speed_data_location, grundle_speed_data_location, \
     rhindle_speed_data_location, item_ram_addresses, start_castle_values, start_castle_offset
+from .Options import DragonRandoType, DifficultySwitchA, DifficultySwitchB, AdventureOptions
 from .Regions import create_regions
+from .Rom import get_base_rom_bytes, get_base_rom_path, AdventureDeltaPatch, apply_basepatch, AdventureAutoCollectLocation
 from .Rules import set_rules
 
-
-from worlds.LauncherComponents import Component, components, SuffixIdentifier
-
 # Adventure
 components.append(Component('Adventure Client', 'AdventureClient', file_identifier=SuffixIdentifier('.apadvn')))
 

From 1f966ee705e576f385c71b3a19d013a0995f0df1 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sun, 12 Jan 2025 12:01:16 -0600
Subject: [PATCH 242/381] BizhawkClient: set metadata from patch file (#4346)

---
 worlds/_bizhawk/context.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/worlds/_bizhawk/context.py b/worlds/_bizhawk/context.py
index 2a3965a54fcd..8d029f92ec71 100644
--- a/worlds/_bizhawk/context.py
+++ b/worlds/_bizhawk/context.py
@@ -231,12 +231,14 @@ async def _run_game(rom: str):
         )
 
 
-async def _patch_and_run_game(patch_file: str):
+def _patch_and_run_game(patch_file: str):
     try:
         metadata, output_file = Patch.create_rom_file(patch_file)
         Utils.async_start(_run_game(output_file))
+        return metadata
     except Exception as exc:
         logger.exception(exc)
+        return {}
 
 
 def launch(*launch_args) -> None:
@@ -245,6 +247,11 @@ async def main():
         parser.add_argument("patch_file", default="", type=str, nargs="?", help="Path to an Archipelago patch file")
         args = parser.parse_args(launch_args)
 
+        if args.patch_file != "":
+            metadata = _patch_and_run_game(args.patch_file)
+            if "server" in metadata:
+                args.connect = metadata["server"]
+
         ctx = BizHawkClientContext(args.connect, args.password)
         ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")
 
@@ -252,9 +259,6 @@ async def main():
             ctx.run_gui()
         ctx.run_cli()
 
-        if args.patch_file != "":
-            Utils.async_start(_patch_and_run_game(args.patch_file))
-
         watcher_task = asyncio.create_task(_game_watcher(ctx), name="GameWatcher")
 
         try:

From 4c734b467fe087f2c6e2676a3d16c4191cddbb37 Mon Sep 17 00:00:00 2001
From: Alchav <59858495+Alchav@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:32:59 -0500
Subject: [PATCH 243/381] LTTP: Shop and Arrow fixes (#4067)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/alttp/Bosses.py                       |  4 +-
 worlds/alttp/ItemPool.py                     |  5 +--
 worlds/alttp/Items.py                        |  6 +--
 worlds/alttp/Shops.py                        |  3 +-
 worlds/alttp/StateHelpers.py                 | 47 +++++++++++---------
 worlds/alttp/test/dungeons/TestMiseryMire.py |  2 +-
 6 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/worlds/alttp/Bosses.py b/worlds/alttp/Bosses.py
index 965a86db008a..02970edb9f55 100644
--- a/worlds/alttp/Bosses.py
+++ b/worlds/alttp/Bosses.py
@@ -119,7 +119,9 @@ def KholdstareDefeatRule(state, player: int) -> bool:
 
 
 def VitreousDefeatRule(state, player: int) -> bool:
-    return can_shoot_arrows(state, player) or has_melee_weapon(state, player)
+    return ((can_shoot_arrows(state, player) and can_use_bombs(state, player, 10))
+            or can_shoot_arrows(state, player, 35) or state.has("Silver Bow", player)
+            or has_melee_weapon(state, player))
 
 
 def TrinexxDefeatRule(state, player: int) -> bool:
diff --git a/worlds/alttp/ItemPool.py b/worlds/alttp/ItemPool.py
index c6c1770414db..77d02f9770cc 100644
--- a/worlds/alttp/ItemPool.py
+++ b/worlds/alttp/ItemPool.py
@@ -484,8 +484,7 @@ def cut_item(items, item_to_cut, minimum_items):
     if multiworld.randomize_cost_types[player]:
         # Heart and Arrow costs require all Heart Container/Pieces and Arrow Upgrades to be advancement items for logic
         for item in items:
-            if (item.name in ("Boss Heart Container", "Sanctuary Heart Container", "Piece of Heart")
-                    or "Arrow Upgrade" in item.name):
+            if item.name in ("Boss Heart Container", "Sanctuary Heart Container", "Piece of Heart"):
                 item.classification = ItemClassification.progression
     else:
         # Otherwise, logic has some branches where having 4 hearts is one possible requirement (of several alternatives)
@@ -713,7 +712,7 @@ def place_item(loc, item):
         pool.remove("Rupees (20)")
 
     if retro_bow:
-        replace = {'Single Arrow', 'Arrows (10)', 'Arrow Upgrade (+5)', 'Arrow Upgrade (+10)', 'Arrow Upgrade (50)'}
+        replace = {'Single Arrow', 'Arrows (10)', 'Arrow Upgrade (+5)', 'Arrow Upgrade (+10)', 'Arrow Upgrade (70)'}
         pool = ['Rupees (5)' if item in replace else item for item in pool]
     if world.small_key_shuffle[player] == small_key_shuffle.option_universal:
         pool.extend(diff.universal_keys)
diff --git a/worlds/alttp/Items.py b/worlds/alttp/Items.py
index cb44f35d58f1..7e36d7a35ede 100644
--- a/worlds/alttp/Items.py
+++ b/worlds/alttp/Items.py
@@ -110,9 +110,9 @@ def as_init_dict(self) -> typing.Dict[str, typing.Any]:
               'Crystal 7': ItemData(IC.progression, 'Crystal', (0x08, 0x34, 0x64, 0x40, 0x7C, 0x06), None, None, None, None, None, None, "a blue crystal"),
               'Single Arrow': ItemData(IC.filler, None, 0x43, 'a lonely arrow\nsits here.', 'and the arrow', 'stick-collecting kid', 'sewing needle for sale', 'fungus for arrow', 'archer boy sews again', 'an arrow'),
               'Arrows (10)': ItemData(IC.filler, None, 0x44, 'This will give\nyou ten shots\nwith your bow!', 'and the arrow pack','stick-collecting kid', 'sewing kit for sale', 'fungus for arrows', 'archer boy sews again','ten arrows'),
-              'Arrow Upgrade (+10)': ItemData(IC.useful, None, 0x54, 'increase arrow\nstorage, low\nlow price', 'and the quiver', 'quiver-enlarging kid', 'arrow boost for sale', 'witch and more skewers', 'upgrade boy sews more again', 'arrow capacity'),
-              'Arrow Upgrade (+5)': ItemData(IC.useful, None, 0x53, 'increase arrow\nstorage, low\nlow price', 'and the quiver', 'quiver-enlarging kid', 'arrow boost for sale', 'witch and more skewers', 'upgrade boy sews more again', 'arrow capacity'),
-              'Arrow Upgrade (70)': ItemData(IC.useful, None, 0x4D, 'increase arrow\nstorage, low\nlow price', 'and the quiver', 'quiver-enlarging kid', 'arrow boost for sale', 'witch and more skewers', 'upgrade boy sews more again', 'arrow capacity'),
+              'Arrow Upgrade (+10)': ItemData(IC.progression_skip_balancing, None, 0x54, 'increase arrow\nstorage, low\nlow price', 'and the quiver', 'quiver-enlarging kid', 'arrow boost for sale', 'witch and more skewers', 'upgrade boy sews more again', 'arrow capacity'),
+              'Arrow Upgrade (+5)': ItemData(IC.progression_skip_balancing, None, 0x53, 'increase arrow\nstorage, low\nlow price', 'and the quiver', 'quiver-enlarging kid', 'arrow boost for sale', 'witch and more skewers', 'upgrade boy sews more again', 'arrow capacity'),
+              'Arrow Upgrade (70)': ItemData(IC.progression_skip_balancing, None, 0x4D, 'increase arrow\nstorage, low\nlow price', 'and the quiver', 'quiver-enlarging kid', 'arrow boost for sale', 'witch and more skewers', 'upgrade boy sews more again', 'arrow capacity'),
               'Single Bomb': ItemData(IC.filler, None, 0x27, 'I make things\ngo BOOM! But\njust once.', 'and the explosion', 'the bomb-holding kid', 'firecracker for sale', 'blend fungus into bomb', '\'splosion boy explodes again', 'a bomb'),
               'Bombs (3)': ItemData(IC.filler, None, 0x28, 'I make things\ngo triple\nBOOM!!!', 'and the explosions', 'the bomb-holding kid', 'firecrackers for sale', 'blend fungus into bombs', '\'splosion boy explodes again', 'three bombs'),
               'Bombs (10)': ItemData(IC.filler, None, 0x31, 'I make things\ngo BOOM! Ten\ntimes!', 'and the explosions', 'the bomb-holding kid', 'firecrackers for sale', 'blend fungus into bombs', '\'splosion boy explodes again', 'ten bombs'),
diff --git a/worlds/alttp/Shops.py b/worlds/alttp/Shops.py
index db2b5b680c1d..055eb2da934b 100644
--- a/worlds/alttp/Shops.py
+++ b/worlds/alttp/Shops.py
@@ -170,7 +170,8 @@ def push_shop_inventories(multiworld):
         # Retro Bow arrows will already have been pushed
         if (not multiworld.retro_bow[location.player]) or ((item_name, location.item.player)
                                                            != ("Single Arrow", location.player)):
-            location.shop.push_inventory(location.shop_slot, item_name, location.shop_price,
+            location.shop.push_inventory(location.shop_slot, item_name,
+                                         round(location.shop_price * get_price_modifier(location.item)),
                                          1, location.item.player if location.item.player != location.player else 0,
                                          location.shop_price_type)
             location.shop_price = location.shop.inventory[location.shop_slot]["price"] = min(location.shop_price,
diff --git a/worlds/alttp/StateHelpers.py b/worlds/alttp/StateHelpers.py
index 964a77fefbaf..8661632b836e 100644
--- a/worlds/alttp/StateHelpers.py
+++ b/worlds/alttp/StateHelpers.py
@@ -15,18 +15,18 @@ def can_bomb_clip(state: CollectionState, region: LTTPRegion, player: int) -> bo
 
 def can_buy_unlimited(state: CollectionState, item: str, player: int) -> bool:
     return any(shop.region.player == player and shop.has_unlimited(item) and shop.region.can_reach(state) for
-                shop in state.multiworld.shops)
+               shop in state.multiworld.shops)
 
 
 def can_buy(state: CollectionState, item: str, player: int) -> bool:
     return any(shop.region.player == player and shop.has(item) and shop.region.can_reach(state) for
-                shop in state.multiworld.shops)
+               shop in state.multiworld.shops)
 
 
-def can_shoot_arrows(state: CollectionState, player: int) -> bool:
+def can_shoot_arrows(state: CollectionState, player: int, count: int = 0) -> bool:
     if state.multiworld.retro_bow[player]:
         return (state.has('Bow', player) or state.has('Silver Bow', player)) and can_buy(state, 'Single Arrow', player)
-    return state.has('Bow', player) or state.has('Silver Bow', player)
+    return (state.has('Bow', player) or state.has('Silver Bow', player)) and can_hold_arrows(state, player, count)
 
 
 def has_triforce_pieces(state: CollectionState, player: int) -> bool:
@@ -61,13 +61,13 @@ def heart_count(state: CollectionState, player: int) -> int:
     # Warning: This only considers items that are marked as advancement items
     diff = state.multiworld.worlds[player].difficulty_requirements
     return min(state.count('Boss Heart Container', player), diff.boss_heart_container_limit) \
-            + state.count('Sanctuary Heart Container', player) \
+        + state.count('Sanctuary Heart Container', player) \
         + min(state.count('Piece of Heart', player), diff.heart_piece_limit) // 4 \
-            + 3  # starting hearts
+        + 3  # starting hearts
 
 
 def can_extend_magic(state: CollectionState, player: int, smallmagic: int = 16,
-                        fullrefill: bool = False):  # This reflects the total magic Link has, not the total extra he has.
+                     fullrefill: bool = False):  # This reflects the total magic Link has, not the total extra he has.
     basemagic = 8
     if state.has('Magic Upgrade (1/4)', player):
         basemagic = 32
@@ -84,11 +84,18 @@ def can_extend_magic(state: CollectionState, player: int, smallmagic: int = 16,
 
 
 def can_hold_arrows(state: CollectionState, player: int, quantity: int):
-    arrows = 30 + ((state.count("Arrow Upgrade (+5)", player) * 5) + (state.count("Arrow Upgrade (+10)", player) * 10)
-                   + (state.count("Bomb Upgrade (50)", player) * 50))
-    # Arrow Upgrade (+5) beyond the 6th gives +10
-    arrows += max(0, ((state.count("Arrow Upgrade (+5)", player) - 6) * 10))
-    return min(70, arrows) >= quantity
+    if state.multiworld.worlds[player].options.shuffle_capacity_upgrades:
+        if quantity == 0:
+            return True
+        if state.has("Arrow Upgrade (70)", player):
+            arrows = 70
+        else:
+            arrows = (30 + (state.count("Arrow Upgrade (+5)", player) * 5)
+                      + (state.count("Arrow Upgrade (+10)", player) * 10))
+            # Arrow Upgrade (+5) beyond the 6th gives +10
+            arrows += max(0, ((state.count("Arrow Upgrade (+5)", player) - 6) * 10))
+        return min(70, arrows) >= quantity
+    return quantity <= 30 or state.has("Capacity Upgrade Shop", player)
 
 
 def can_use_bombs(state: CollectionState, player: int, quantity: int = 1) -> bool:
@@ -146,19 +153,19 @@ def can_get_good_bee(state: CollectionState, player: int) -> bool:
 def can_retrieve_tablet(state: CollectionState, player: int) -> bool:
     return state.has('Book of Mudora', player) and (has_beam_sword(state, player) or
                                                     (state.multiworld.swordless[player] and
-                                                    state.has("Hammer", player)))
+                                                     state.has("Hammer", player)))
 
 
 def has_sword(state: CollectionState, player: int) -> bool:
     return state.has('Fighter Sword', player) \
-            or state.has('Master Sword', player) \
-            or state.has('Tempered Sword', player) \
-            or state.has('Golden Sword', player)
+        or state.has('Master Sword', player) \
+        or state.has('Tempered Sword', player) \
+        or state.has('Golden Sword', player)
 
 
 def has_beam_sword(state: CollectionState, player: int) -> bool:
     return state.has('Master Sword', player) or state.has('Tempered Sword', player) or state.has('Golden Sword',
-                                                                                                player)
+                                                                                                 player)
 
 
 def has_melee_weapon(state: CollectionState, player: int) -> bool:
@@ -171,9 +178,9 @@ def has_fire_source(state: CollectionState, player: int) -> bool:
 
 def can_melt_things(state: CollectionState, player: int) -> bool:
     return state.has('Fire Rod', player) or \
-            (state.has('Bombos', player) and
-            (state.multiworld.swordless[player] or
-                has_sword(state, player)))
+        (state.has('Bombos', player) and
+         (state.multiworld.swordless[player] or
+          has_sword(state, player)))
 
 
 def has_misery_mire_medallion(state: CollectionState, player: int) -> bool:
diff --git a/worlds/alttp/test/dungeons/TestMiseryMire.py b/worlds/alttp/test/dungeons/TestMiseryMire.py
index ca74e9365ee6..90b7055b764a 100644
--- a/worlds/alttp/test/dungeons/TestMiseryMire.py
+++ b/worlds/alttp/test/dungeons/TestMiseryMire.py
@@ -77,5 +77,5 @@ def testMiseryMire(self):
             ["Misery Mire - Boss", False, [], ['Bomb Upgrade (+5)', 'Bomb Upgrade (+10)', 'Bomb Upgrade (50)']],
             ["Misery Mire - Boss", True, ['Bomb Upgrade (+5)', 'Big Key (Misery Mire)', 'Lamp', 'Cane of Somaria', 'Progressive Sword', 'Pegasus Boots']],
             ["Misery Mire - Boss", True, ['Bomb Upgrade (+5)', 'Big Key (Misery Mire)', 'Lamp', 'Cane of Somaria', 'Hammer', 'Pegasus Boots']],
-            ["Misery Mire - Boss", True, ['Bomb Upgrade (+5)', 'Big Key (Misery Mire)', 'Lamp', 'Cane of Somaria', 'Progressive Bow', 'Pegasus Boots']],
+            ["Misery Mire - Boss", True, ['Bomb Upgrade (+5)', 'Big Key (Misery Mire)', 'Lamp', 'Cane of Somaria', 'Progressive Bow', 'Arrow Upgrade (+5)', 'Pegasus Boots']],
         ])
\ No newline at end of file

From 0f1c119c76b78e894ca7c21dc14ed14a3ca0e5a5 Mon Sep 17 00:00:00 2001
From: Sam Merritt <spam@andcheese.org>
Date: Mon, 13 Jan 2025 00:52:21 -0800
Subject: [PATCH 244/381] Factorio: improve error message for config validation
 (#4421)

---
 worlds/factorio/Options.py              | 14 +++++++--
 worlds/factorio/test_file_validation.py | 39 +++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 worlds/factorio/test_file_validation.py

diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index 72f438778b60..0fa75e1b8bfa 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -3,13 +3,23 @@
 from dataclasses import dataclass
 import typing
 
-from schema import Schema, Optional, And, Or
+from schema import Schema, Optional, And, Or, SchemaError
 
 from Options import Choice, OptionDict, OptionSet, DefaultOnToggle, Range, DeathLink, Toggle, \
     StartInventoryPool, PerGameCommonOptions, OptionGroup
 
 # schema helpers
-FloatRange = lambda low, high: And(Or(int, float), lambda f: low <= f <= high)
+class FloatRange:
+    def __init__(self, low, high):
+        self._low = low
+        self._high = high
+
+    def validate(self, value):
+        if not isinstance(value, (float, int)):
+            raise SchemaError(f"should be instance of float or int, but was {value!r}")
+        if not self._low <= value <= self._high:
+            raise SchemaError(f"{value} is not between {self._low} and {self._high}")
+
 LuaBool = Or(bool, And(int, lambda n: n in (0, 1)))
 
 
diff --git a/worlds/factorio/test_file_validation.py b/worlds/factorio/test_file_validation.py
new file mode 100644
index 000000000000..df56ec608c17
--- /dev/null
+++ b/worlds/factorio/test_file_validation.py
@@ -0,0 +1,39 @@
+"""Tests for error messages from YAML validation."""
+
+import os
+import unittest
+
+import WebHostLib.check
+
+FACTORIO_YAML="""
+game: Factorio
+Factorio:
+  world_gen:
+    autoplace_controls:
+      coal:
+        richness: 1
+        frequency: {}
+        size: 1
+"""
+
+def yamlWithFrequency(f):
+    return FACTORIO_YAML.format(f)
+
+
+class TestFileValidation(unittest.TestCase):
+    def test_out_of_range(self):
+        results, _ = WebHostLib.check.roll_options({"bob.yaml": yamlWithFrequency(1000)})
+        self.assertIn("between 0 and 6", results["bob.yaml"])
+
+    def test_bad_non_numeric(self):
+        results, _ = WebHostLib.check.roll_options({"bob.yaml": yamlWithFrequency("not numeric")})
+        self.assertIn("float", results["bob.yaml"])
+        self.assertIn("int", results["bob.yaml"])
+
+    def test_good_float(self):
+        results, _ = WebHostLib.check.roll_options({"bob.yaml": yamlWithFrequency(1.0)})
+        self.assertIs(results["bob.yaml"], True)
+
+    def test_good_int(self):
+        results, _ = WebHostLib.check.roll_options({"bob.yaml": yamlWithFrequency(1)})
+        self.assertIs(results["bob.yaml"], True)

From f9cc19e150d7e8210372615402d15c10be31864e Mon Sep 17 00:00:00 2001
From: Aaron Wagener <mmmcheese158@gmail.com>
Date: Mon, 13 Jan 2025 09:52:10 -0600
Subject: [PATCH 245/381] Fill: Crash if there are remaining unfilled locations
 (#2830)

---
 Fill.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Fill.py b/Fill.py
index a040794fd1c6..0da2d5def978 100644
--- a/Fill.py
+++ b/Fill.py
@@ -571,6 +571,26 @@ def mark_for_locking(location: Location):
         print_data = {"items": items_counter, "locations": locations_counter}
         logging.info(f"Per-Player counts: {print_data})")
 
+        more_locations = locations_counter - items_counter
+        more_items = items_counter - locations_counter
+        for player in multiworld.player_ids:
+            if more_locations[player]:
+                logging.error(
+                    f"Player {multiworld.get_player_name(player)} had {more_locations[player]} more locations than items.")
+            elif more_items[player]:
+                logging.warning(
+                    f"Player {multiworld.get_player_name(player)} had {more_items[player]} more items than locations.")
+        if unfilled:
+            raise FillError(
+                f"Unable to fill all locations.\n" +
+                f"Unfilled locations({len(unfilled)}): {unfilled}"
+            )
+        else:
+            logging.warning(
+                f"Unable to place all items.\n" +
+                f"Unplaced items({len(unplaced)}): {unplaced}"
+            )
+
 
 def flood_items(multiworld: MultiWorld) -> None:
     # get items to distribute

From 93e8613da7a39fb3bd87cf132993f6c304e3d4cc Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 13 Jan 2025 11:08:46 -0500
Subject: [PATCH 246/381] HK: Abstract and default grub counts (#4336)

---
 worlds/hk/__init__.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index bcd904521db1..7e9b7442a746 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -181,6 +181,7 @@ class HKWorld(World):
     charm_costs: typing.List[int]
     cached_filler_items = {}
     grub_count: int
+    grub_player_count: typing.Dict[int, int]
 
     def __init__(self, multiworld, player):
         super(HKWorld, self).__init__(multiworld, player)
@@ -190,7 +191,6 @@ def __init__(self, multiworld, player):
         self.ranges = {}
         self.created_shop_items = 0
         self.vanilla_shop_costs = deepcopy(vanilla_shop_costs)
-        self.grub_count = 0
 
     def generate_early(self):
         options = self.options
@@ -204,7 +204,14 @@ def generate_early(self):
             mini.value = min(mini.value, maxi.value)
             self.ranges[term] = mini.value, maxi.value
         self.multiworld.push_precollected(HKItem(starts[options.StartLocation.current_key],
-                                       True, None, "Event", self.player))
+                                          True, None, "Event", self.player))
+
+        # defaulting so completion condition isn't incorrect before pre_fill
+        self.grub_count = (
+            46 if options.GrubHuntGoal == GrubHuntGoal.special_range_names["all"]
+            else options.GrubHuntGoal
+            )
+        self.grub_player_count = {self.player: self.grub_count}
 
     def white_palace_exclusions(self):
         exclusions = set()
@@ -469,25 +476,20 @@ def set_rules(self):
         elif goal == Goal.option_godhome_flower:
             multiworld.completion_condition[player] = lambda state: state.count("Godhome_Flower_Quest", player)
         elif goal == Goal.option_grub_hunt:
-            pass  # will set in stage_pre_fill()
+            multiworld.completion_condition[player] = lambda state: self.can_grub_goal(state)
         else:
             # Any goal
             multiworld.completion_condition[player] = lambda state: _hk_siblings_ending(state, player) and \
-                _hk_can_beat_radiance(state, player) and state.count("Godhome_Flower_Quest", player)
+                _hk_can_beat_radiance(state, player) and state.count("Godhome_Flower_Quest", player) and \
+                self.can_grub_goal(state)
 
         set_rules(self)
 
+    def can_grub_goal(self, state: CollectionState) -> bool:
+        return all(state.has("Grub", owner, count) for owner, count in self.grub_player_count.items())
+
     @classmethod
     def stage_pre_fill(cls, multiworld: "MultiWorld"):
-        def set_goal(player, grub_rule: typing.Callable[[CollectionState], bool]):
-            world = multiworld.worlds[player]
-
-            if world.options.Goal == "grub_hunt":
-                multiworld.completion_condition[player] = grub_rule
-            else:
-                old_rule = multiworld.completion_condition[player]
-                multiworld.completion_condition[player] = lambda state: old_rule(state) and grub_rule(state)
-
         worlds = [world for world in multiworld.get_game_worlds(cls.game) if world.options.Goal in ["any", "grub_hunt"]]
         if worlds:
             grubs = [item for item in multiworld.get_items() if item.name == "Grub"]
@@ -525,13 +527,13 @@ def set_goal(player, grub_rule: typing.Callable[[CollectionState], bool]):
 
             for player, grub_player_count in per_player_grubs_per_player.items():
                 if player in all_grub_players:
-                    set_goal(player, lambda state, g=grub_player_count: all(state.has("Grub", owner, count) for owner, count in g.items()))
+                    multiworld.worlds[player].grub_player_count = grub_player_count
 
         for world in worlds:
             if world.player not in all_grub_players:
                 world.grub_count = world.options.GrubHuntGoal.value
                 player = world.player
-                set_goal(player, lambda state, p=player, c=world.grub_count: state.has("Grub", p, c))
+                world.grub_player_count = {player: world.grub_count}
 
     def fill_slot_data(self):
         slot_data = {}

From 4cb8fa3cdd435ee646b56c06747d581d57126de8 Mon Sep 17 00:00:00 2001
From: Louis M <prog@tioui.com>
Date: Mon, 13 Jan 2025 14:09:39 -0500
Subject: [PATCH 247/381] Aquaria: Fixing itemlink not working (#4473)

---
 worlds/aquaria/__init__.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/worlds/aquaria/__init__.py b/worlds/aquaria/__init__.py
index 1f7b956bb34b..54158b280bf4 100644
--- a/worlds/aquaria/__init__.py
+++ b/worlds/aquaria/__init__.py
@@ -93,7 +93,7 @@ class AquariaWorld(World):
     options: AquariaOptions
     "Every options of the world"
 
-    regions: AquariaRegions
+    regions: AquariaRegions | None
     "Used to manage Regions"
 
     exclude: List[str]
@@ -101,10 +101,17 @@ class AquariaWorld(World):
     def __init__(self, multiworld: MultiWorld, player: int):
         """Initialisation of the Aquaria World"""
         super(AquariaWorld, self).__init__(multiworld, player)
-        self.regions = AquariaRegions(multiworld, player)
+        self.regions = None
         self.ingredients_substitution = []
         self.exclude = []
 
+    def generate_early(self) -> None:
+        """
+        Run before any general steps of the MultiWorld other than options. Useful for getting and adjusting option
+        results and determining layouts for entrance rando etc. start inventory gets pushed after this step.
+        """
+        self.regions = AquariaRegions(self.multiworld, self.player)
+
     def create_regions(self) -> None:
         """
         Create every Region in `regions`

From 20119e3162f17d8af060377986921cee54836e59 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:35:01 -0500
Subject: [PATCH 248/381] Faxanadu: Fix generations with itemlinks (#4395)

---
 worlds/faxanadu/__init__.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/worlds/faxanadu/__init__.py b/worlds/faxanadu/__init__.py
index c4ae1ccaa198..ca17c0675982 100644
--- a/worlds/faxanadu/__init__.py
+++ b/worlds/faxanadu/__init__.py
@@ -44,8 +44,13 @@ class FaxanaduWorld(World):
     location_name_to_id = {loc.name: loc.id for loc in Locations.locations if loc.id is not None}
 
     def __init__(self, world: MultiWorld, player: int):
-        self.filler_ratios: Dict[str, int] = {}
-        
+        self.filler_ratios: Dict[str, int] = {
+            item.name: item.count
+            for item in Items.items
+            if item.classification in [ItemClassification.filler, ItemClassification.trap]
+        }
+        # Remove poison by default to respect itemlinking
+        self.filler_ratios["Poison"] = 0
         super().__init__(world, player)
 
     def create_regions(self):
@@ -160,19 +165,13 @@ def create_items(self) -> None:
                 for i in range(item.progression_count):
                     itempool.append(FaxanaduItem(item.name, ItemClassification.progression, item.id, self.player))
 
-        # Set up filler ratios
-        self.filler_ratios = {
-            item.name: item.count
-            for item in Items.items
-            if item.classification in [ItemClassification.filler, ItemClassification.trap]
-        }
-
+        # Adjust filler ratios
         # If red potions are locked in shops, remove the count from the ratio.
         self.filler_ratios["Red Potion"] -= red_potion_in_shop_count
 
-        # Remove poisons if not desired
-        if not self.options.include_poisons:
-            self.filler_ratios["Poison"] = 0
+        # Add poisons if desired
+        if self.options.include_poisons:
+            self.filler_ratios["Poison"] = self.item_name_to_item["Poison"].count
 
         # Randomly add fillers to the pool with ratios based on og game occurrence counts.
         filler_count = len(Locations.locations) - len(itempool) - prefilled_count

From 6220963195c5b12edea12d46057a657cc5f73f64 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:35:44 -0500
Subject: [PATCH 249/381] Tests: No Creating Items/Locations/Regions in
 __init__ (#4474)

---
 test/general/test_implemented.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/general/test_implemented.py b/test/general/test_implemented.py
index 756cfa8bb67d..7abf9959936a 100644
--- a/test/general/test_implemented.py
+++ b/test/general/test_implemented.py
@@ -117,3 +117,12 @@ def test_explicit_indirect_conditions_spheres(self):
                                       f"\nUnexpectedly reachable locations in sphere {sphere_num}:"
                                       f"\n{reachable_only_with_explicit}")
                 self.fail("Unreachable")
+
+    def test_no_items_or_locations_or_regions_submitted_in_init(self):
+        """Test that worlds don't submit items/locations/regions to the multiworld in __init__"""
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest("Game", game=game_name):
+                multiworld = setup_solo_multiworld(world_type, ())
+                self.assertEqual(len(multiworld.itempool), 0)
+                self.assertEqual(len(multiworld.get_locations()), 0)
+                self.assertEqual(len(multiworld.get_regions()), 0)

From ffd0c8b3413727ab46692339c4e3e69fda2780dc Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 13 Jan 2025 19:34:56 -0500
Subject: [PATCH 250/381] Blasphemous: Move Locality Changes Earlier (#4422)

---
 worlds/blasphemous/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/worlds/blasphemous/__init__.py b/worlds/blasphemous/__init__.py
index a967fbac9289..4b151f41f860 100644
--- a/worlds/blasphemous/__init__.py
+++ b/worlds/blasphemous/__init__.py
@@ -103,6 +103,9 @@ def generate_early(self):
         if not self.options.wall_climb_shuffle:
             self.multiworld.push_precollected(self.create_item("Wall Climb Ability"))
 
+        if self.options.thorn_shuffle == "local_only":
+            self.options.local_items.value.add("Thorn Upgrade")
+
         if not self.options.boots_of_pleading:
             self.disabled_locations.append("RE401")
 
@@ -200,9 +203,6 @@ def create_items(self):
 
         if not self.options.skill_randomizer:
             self.place_items_from_dict(skill_dict)
-
-        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):

From 0f1dc6e19c1682b2bd3cdf6d900620a8c3dbde71 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Mon, 13 Jan 2025 19:35:29 -0500
Subject: [PATCH 251/381] Codeowners: @threeandthreee as LADX maintainer #4216

---
 docs/CODEOWNERS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index 1d70531e9974..c4cb83e42f38 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -99,6 +99,9 @@
 # Lingo
 /worlds/lingo/ @hatkirby
 
+# Links Awakening DX
+/worlds/ladx/ @threeandthreee
+
 # Lufia II Ancient Cave
 /worlds/lufia2ac/ @el-u
 /worlds/lufia2ac/docs/ @wordfcuk @el-u
@@ -236,9 +239,6 @@
 # Final Fantasy (1)
 # /worlds/ff1/
 
-# Links Awakening DX
-# /worlds/ladx/
-
 # Ocarina of Time
 # /worlds/oot/
 

From 0f3818e7115a37f4e18d17a1c71e8eb3e0972cf8 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Tue, 14 Jan 2025 04:45:59 -0500
Subject: [PATCH 252/381] Utils: Visualize Regions showing the reachable
 regions in color (#4436)

* Utils with coloring

* Update example use

* Update Utils.py

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 Utils.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Utils.py b/Utils.py
index 43b3ef9c8ff9..8f5ba1a0f84f 100644
--- a/Utils.py
+++ b/Utils.py
@@ -940,7 +940,7 @@ def freeze_support() -> None:
 
 def visualize_regions(root_region: Region, file_name: str, *,
                       show_entrance_names: bool = False, show_locations: bool = True, show_other_regions: bool = True,
-                      linetype_ortho: bool = True) -> None:
+                      linetype_ortho: bool = True, regions_to_highlight: set[Region] | None = None) -> None:
     """Visualize the layout of a world as a PlantUML diagram.
 
     :param root_region: The region from which to start the diagram from. (Usually the "Menu" region of your world.)
@@ -956,16 +956,22 @@ def visualize_regions(root_region: Region, file_name: str, *,
             Items without ID will be shown in italics.
     :param show_other_regions: (default True) If enabled, regions that can't be reached by traversing exits are shown.
     :param linetype_ortho: (default True) If enabled, orthogonal straight line parts will be used; otherwise polylines.
+    :param regions_to_highlight: Regions that will be highlighted in green if they are reachable.
 
     Example usage in World code:
     from Utils import visualize_regions
-    visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
+    state = self.multiworld.get_all_state(False)
+    state.update_reachable_regions(self.player)
+    visualize_regions(self.get_region("Menu"), "my_world.puml", show_entrance_names=True,
+                      regions_to_highlight=state.reachable_regions[self.player])
 
     Example usage in Main code:
     from Utils import visualize_regions
     for player in multiworld.player_ids:
         visualize_regions(multiworld.get_region("Menu", player), f"{multiworld.get_out_file_name_base(player)}.puml")
     """
+    if regions_to_highlight is None:
+        regions_to_highlight = set()
     assert root_region.multiworld, "The multiworld attribute of root_region has to be filled"
     from BaseClasses import Entrance, Item, Location, LocationProgressType, MultiWorld, Region
     from collections import deque
@@ -1018,7 +1024,7 @@ def visualize_locations(region: Region) -> None:
                 uml.append(f"\"{fmt(region)}\" : {{field}} {lock}{fmt(location)}")
 
     def visualize_region(region: Region) -> None:
-        uml.append(f"class \"{fmt(region)}\"")
+        uml.append(f"class \"{fmt(region)}\" {'#00FF00' if region in regions_to_highlight else ''}")
         if show_locations:
             visualize_locations(region)
         visualize_exits(region)

From 04928bd83d6835c5e169d3f35fdc0a7bb6f2a2ae Mon Sep 17 00:00:00 2001
From: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Date: Tue, 14 Jan 2025 04:49:30 -0500
Subject: [PATCH 253/381] DKC3: Remove unused variables and imports #4302

---
 worlds/dkc3/Client.py   | 3 +--
 worlds/dkc3/Items.py    | 2 +-
 worlds/dkc3/Options.py  | 3 +--
 worlds/dkc3/Regions.py  | 5 ++---
 worlds/dkc3/Rom.py      | 3 +--
 worlds/dkc3/Rules.py    | 4 ++--
 worlds/dkc3/__init__.py | 8 +++-----
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/worlds/dkc3/Client.py b/worlds/dkc3/Client.py
index ee2bd1dbdfb8..40216e81e37a 100644
--- a/worlds/dkc3/Client.py
+++ b/worlds/dkc3/Client.py
@@ -1,5 +1,4 @@
 import logging
-import asyncio
 
 from NetUtils import ClientStatus, color
 from worlds.AutoSNIClient import SNIClient
@@ -32,7 +31,7 @@ async def deathlink_kill_player(self, ctx):
 
 
     async def validate_rom(self, ctx):
-        from SNIClient import snes_buffered_write, snes_flush_writes, snes_read
+        from SNIClient import snes_read
 
         rom_name = await snes_read(ctx, DKC3_ROMHASH_START, ROMHASH_SIZE)
         if rom_name is None or rom_name == bytes([0] * ROMHASH_SIZE) or rom_name[:2] != b"D3":
diff --git a/worlds/dkc3/Items.py b/worlds/dkc3/Items.py
index 358873cd2010..e6cac91ea90f 100644
--- a/worlds/dkc3/Items.py
+++ b/worlds/dkc3/Items.py
@@ -1,6 +1,6 @@
 import typing
 
-from BaseClasses import Item, ItemClassification
+from BaseClasses import Item
 from .Names import ItemName
 
 
diff --git a/worlds/dkc3/Options.py b/worlds/dkc3/Options.py
index b114a503b982..3f220bce446d 100644
--- a/worlds/dkc3/Options.py
+++ b/worlds/dkc3/Options.py
@@ -1,7 +1,6 @@
 from dataclasses import dataclass
-import typing
 
-from Options import Choice, Range, Toggle, DeathLink, DefaultOnToggle, OptionGroup, PerGameCommonOptions
+from Options import Choice, Range, Toggle, DefaultOnToggle, OptionGroup, PerGameCommonOptions
 
 
 class Goal(Choice):
diff --git a/worlds/dkc3/Regions.py b/worlds/dkc3/Regions.py
index ae505b78d84b..6e968dbe1e30 100644
--- a/worlds/dkc3/Regions.py
+++ b/worlds/dkc3/Regions.py
@@ -1,10 +1,9 @@
 import typing
 
-from BaseClasses import MultiWorld, Region, Entrance
-from .Items import DKC3Item
+from BaseClasses import Region, Entrance
+from worlds.AutoWorld import World
 from .Locations import DKC3Location
 from .Names import LocationName, ItemName
-from worlds.AutoWorld import World
 
 
 def create_regions(world: World, active_locations):
diff --git a/worlds/dkc3/Rom.py b/worlds/dkc3/Rom.py
index 0dc722a73868..fb8bc2b122a4 100644
--- a/worlds/dkc3/Rom.py
+++ b/worlds/dkc3/Rom.py
@@ -2,7 +2,6 @@
 from Utils import read_snes_rom
 from worlds.AutoWorld import World
 from worlds.Files import APDeltaPatch
-from .Locations import lookup_id_to_name, all_locations
 from .Levels import level_list, level_dict
 
 USHASH = '120abf304f0c40fe059f6a192ed4f947'
@@ -436,7 +435,7 @@
 
 class LocalRom:
 
-    def __init__(self, file, patch=True, vanillaRom=None, name=None, hash=None):
+    def __init__(self, file, name=None, hash=None):
         self.name = name
         self.hash = hash
         self.orig_buffer = None
diff --git a/worlds/dkc3/Rules.py b/worlds/dkc3/Rules.py
index cc45e4ef3ad5..3d68aefb716a 100644
--- a/worlds/dkc3/Rules.py
+++ b/worlds/dkc3/Rules.py
@@ -1,8 +1,8 @@
 import math
 
+from worlds.AutoWorld import World
+from worlds.generic.Rules import add_rule
 from .Names import LocationName, ItemName
-from worlds.AutoWorld import LogicMixin, World
-from worlds.generic.Rules import add_rule, set_rule
 
 
 def set_rules(world: World):
diff --git a/worlds/dkc3/__init__.py b/worlds/dkc3/__init__.py
index de6fb4a44a03..1dabeb0539d2 100644
--- a/worlds/dkc3/__init__.py
+++ b/worlds/dkc3/__init__.py
@@ -1,15 +1,13 @@
 import dataclasses
-import os
-import typing
 import math
+import os
 import threading
+import typing
 
+import settings
 from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification
 from Options import PerGameCommonOptions
-import Patch
-import settings
 from worlds.AutoWorld import WebWorld, World
-
 from .Client import DKC3SNIClient
 from .Items import DKC3Item, ItemData, item_table, inventory_table, junk_table
 from .Levels import level_list

From dae9d4c575d17d5ced32153d5209b0272e4085b8 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Tue, 14 Jan 2025 12:34:40 -0500
Subject: [PATCH 254/381] LTTP: Fix Itemlinks (#4479)

---
 worlds/alttp/Items.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/alttp/Items.py b/worlds/alttp/Items.py
index 7e36d7a35ede..5f081e65fc8b 100644
--- a/worlds/alttp/Items.py
+++ b/worlds/alttp/Items.py
@@ -7,7 +7,7 @@
 def GetBeemizerItem(world, player: int, item):
     item_name = item if isinstance(item, str) else item.name
 
-    if item_name not in trap_replaceable:
+    if item_name not in trap_replaceable or player in world.groups:
         return item
 
     # first roll - replaceable item should be replaced, within beemizer_total_chance

From 79e6beeec3fe11e5f7df716d9ddec3847f4755f6 Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Tue, 14 Jan 2025 12:47:12 -0500
Subject: [PATCH 255/381] Stardew Valley: Update Mod Content (#4416)

---
 worlds/stardew_valley/data/craftable_data.py  | 10 +++++++-
 worlds/stardew_valley/data/locations.csv      |  6 ++++-
 worlds/stardew_valley/locations.py            |  9 +++++++-
 worlds/stardew_valley/options/options.py      | 23 +++++++++++--------
 .../stardew_valley/strings/craftable_names.py |  4 ++++
 .../test/TestNumberLocations.py               |  9 ++++----
 worlds/stardew_valley/test/__init__.py        |  7 ++++++
 7 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/worlds/stardew_valley/data/craftable_data.py b/worlds/stardew_valley/data/craftable_data.py
index 713db4732075..1bb4b2bea73b 100644
--- a/worlds/stardew_valley/data/craftable_data.py
+++ b/worlds/stardew_valley/data/craftable_data.py
@@ -11,7 +11,7 @@
 from ..strings.crop_names import Fruit, Vegetable
 from ..strings.currency_names import Currency
 from ..strings.fertilizer_names import Fertilizer, RetainingSoil, SpeedGro
-from ..strings.fish_names import Fish, WaterItem, ModTrash
+from ..strings.fish_names import Fish, WaterItem, ModTrash, Trash
 from ..strings.flower_names import Flower
 from ..strings.food_names import Meal
 from ..strings.forageable_names import Forageable, SVEForage, DistantLandsForageable, Mushroom
@@ -378,4 +378,12 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource,
 advanced_recycling_machine = skill_recipe(ModMachine.advanced_recycling_machine, ModSkill.binning, 9,
                                           {MetalBar.iridium: 5, ArtisanGood.battery_pack: 2, MetalBar.quartz: 10}, ModNames.binning_skill)
 
+coppper_slot_machine = skill_recipe(ModMachine.copper_slot_machine, ModSkill.luck, 2, {MetalBar.copper: 15, Material.stone: 1, Material.wood: 1,
+                                                                                       Material.fiber: 1, Material.sap: 1, Loot.slime: 1,
+                                                                                       Forageable.salmonberry: 1, Material.clay: 1, Trash.joja_cola: 1}, ModNames.luck_skill)
+
+gold_slot_machine = skill_recipe(ModMachine.gold_slot_machine, ModSkill.luck, 4, {MetalBar.gold: 15, ModMachine.copper_slot_machine: 1}, ModNames.luck_skill)
+iridium_slot_machine = skill_recipe(ModMachine.iridium_slot_machine, ModSkill.luck, 4, {MetalBar.iridium: 15, ModMachine.gold_slot_machine: 1}, ModNames.luck_skill)
+radioactive_slot_machine = skill_recipe(ModMachine.radioactive_slot_machine, ModSkill.luck, 4, {MetalBar.radioactive: 15, ModMachine.iridium_slot_machine: 1}, ModNames.luck_skill)
+
 all_crafting_recipes_by_name = {recipe.item: recipe for recipe in all_crafting_recipes}
diff --git a/worlds/stardew_valley/data/locations.csv b/worlds/stardew_valley/data/locations.csv
index 680ddfcbacbf..43883b86f8ac 100644
--- a/worlds/stardew_valley/data/locations.csv
+++ b/worlds/stardew_valley/data/locations.csv
@@ -2935,6 +2935,10 @@ id,region,name,tags,mod_name
 7433,Farm,Craft Composter,CRAFTSANITY,Binning Skill
 7434,Farm,Craft Recycling Bin,CRAFTSANITY,Binning Skill
 7435,Farm,Craft Advanced Recycling Machine,CRAFTSANITY,Binning Skill
+7440,Farm,Craft Copper Slot Machine,"CRAFTSANITY",Luck Skill
+7441,Farm,Craft Gold Slot Machine,"CRAFTSANITY",Luck Skill
+7442,Farm,Craft Iridium Slot Machine,"CRAFTSANITY",Luck Skill
+7443,Farm,Craft Radioactive Slot Machine,"CRAFTSANITY",Luck Skill
 7451,Adventurer's Guild,Magic Elixir Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Magic
 7452,Adventurer's Guild,Travel Core Recipe,CRAFTSANITY,Magic
 7453,Alesia Shop,Haste Elixir Recipe,CRAFTSANITY,Stardew Valley Expanded
@@ -3241,7 +3245,7 @@ id,region,name,tags,mod_name
 8199,Shipping,Shipsanity: Hardwood Display,SHIPSANITY,Archaeology
 8200,Shipping,Shipsanity: Wooden Display,SHIPSANITY,Archaeology
 8201,Shipping,Shipsanity: Dwarf Gadget: Infinite Volcano Simulation,"SHIPSANITY,GINGER_ISLAND",Archaeology
-8202,Shipping,Shipsanity: Water Shifter,SHIPSANITY,Archaeology
+8202,Shipping,Shipsanity: Water Shifter,"SHIPSANITY,DEPRECATED",Archaeology
 8203,Shipping,Shipsanity: Brown Amanita,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
 8204,Shipping,Shipsanity: Swamp Herb,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul
 8205,Shipping,Shipsanity: Void Mint Seeds,SHIPSANITY,Distant Lands - Witch Swamp Overhaul
diff --git a/worlds/stardew_valley/locations.py b/worlds/stardew_valley/locations.py
index b3a8db6f0341..02c8a5441c52 100644
--- a/worlds/stardew_valley/locations.py
+++ b/worlds/stardew_valley/locations.py
@@ -110,6 +110,8 @@ class LocationTags(enum.Enum):
     MAGIC_LEVEL = enum.auto()
     ARCHAEOLOGY_LEVEL = enum.auto()
 
+    DEPRECATED = enum.auto()
+
 
 @dataclass(frozen=True)
 class LocationData:
@@ -519,6 +521,10 @@ def create_locations(location_collector: StardewLocationCollector,
         location_collector(location_data.name, location_data.code, location_data.region)
 
 
+def filter_deprecated_locations(locations: Iterable[LocationData]) -> Iterable[LocationData]:
+    return [location for location in locations if LocationTags.DEPRECATED not in location.tags]
+
+
 def filter_farm_type(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]:
     # On Meadowlands, "Feeding Animals" replaces "Raising Animals"
     if options.farm_type == FarmType.option_meadowlands:
@@ -549,7 +555,8 @@ def filter_modded_locations(options: StardewValleyOptions, locations: Iterable[L
 
 
 def filter_disabled_locations(options: StardewValleyOptions, content: StardewContent, locations: Iterable[LocationData]) -> Iterable[LocationData]:
-    locations_farm_filter = filter_farm_type(options, locations)
+    locations_deprecated_filter = filter_deprecated_locations(locations)
+    locations_farm_filter = filter_farm_type(options, locations_deprecated_filter)
     locations_island_filter = filter_ginger_island(options, locations_farm_filter)
     locations_qi_filter = filter_qi_order_locations(options, locations_island_filter)
     locations_masteries_filter = filter_masteries_locations(content, locations_qi_filter)
diff --git a/worlds/stardew_valley/options/options.py b/worlds/stardew_valley/options/options.py
index db949718834e..f66ec3bdad80 100644
--- a/worlds/stardew_valley/options/options.py
+++ b/worlds/stardew_valley/options/options.py
@@ -757,6 +757,14 @@ class Gifting(Toggle):
     default = 1
 
 
+all_mods = {ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,
+            ModNames.luck_skill, ModNames.magic, ModNames.socializing_skill, ModNames.archaeology,
+            ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna,
+            ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene,
+            ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores,
+            ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator, ModNames.sve, ModNames.distant_lands,
+            ModNames.alecto, ModNames.lacey, ModNames.boarding_house}
+
 # These mods have been disabled because either they are not updated for the current supported version of Stardew Valley,
 # or we didn't find the time to validate that they work or fix compatibility issues if they do.
 # Once a mod is validated to be functional, it can simply be removed from this list
@@ -766,8 +774,7 @@ class Gifting(Toggle):
                  ModNames.wellwick, ModNames.shiko, ModNames.delores, ModNames.riley,
                  ModNames.boarding_house}
 
-if 'unittest' in sys.modules.keys() or 'pytest' in sys.modules.keys():
-    disabled_mods = {}
+enabled_mods = all_mods.difference(disabled_mods)
 
 
 class Mods(OptionSet):
@@ -775,13 +782,11 @@ class Mods(OptionSet):
     visibility = Visibility.all & ~Visibility.simple_ui
     internal_name = "mods"
     display_name = "Mods"
-    valid_keys = {ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,
-                  ModNames.luck_skill, ModNames.magic, ModNames.socializing_skill, ModNames.archaeology,
-                  ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna,
-                  ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene,
-                  ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores,
-                  ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator, ModNames.sve, ModNames.distant_lands,
-                  ModNames.alecto, ModNames.lacey, ModNames.boarding_house}.difference(disabled_mods)
+    valid_keys = enabled_mods
+    # In tests, we keep even the disabled mods active, because we expect some of them to eventually get updated for SV 1.6
+    # In that case, we want to maintain content and logic for them, and therefore keep testing them
+    if 'unittest' in sys.modules.keys() or 'pytest' in sys.modules.keys():
+        valid_keys = all_mods
 
 
 class BundlePlando(OptionSet):
diff --git a/worlds/stardew_valley/strings/craftable_names.py b/worlds/stardew_valley/strings/craftable_names.py
index 83445c702c32..891330c3ae51 100644
--- a/worlds/stardew_valley/strings/craftable_names.py
+++ b/worlds/stardew_valley/strings/craftable_names.py
@@ -201,6 +201,10 @@ class ModMachine:
     composter = "Composter"
     recycling_bin = "Recycling Bin"
     advanced_recycling_machine = "Advanced Recycling Machine"
+    copper_slot_machine = "Copper Slot Machine"
+    gold_slot_machine = "Gold Slot Machine"
+    iridium_slot_machine = "Iridium Slot Machine"
+    radioactive_slot_machine = "Radioactive Slot Machine"
 
 
 class ModFloor:
diff --git a/worlds/stardew_valley/test/TestNumberLocations.py b/worlds/stardew_valley/test/TestNumberLocations.py
index ef552c10e8d5..a1c6a96741a1 100644
--- a/worlds/stardew_valley/test/TestNumberLocations.py
+++ b/worlds/stardew_valley/test/TestNumberLocations.py
@@ -1,5 +1,6 @@
 from . import SVTestBase, allsanity_no_mods_6_x_x, \
-    allsanity_mods_6_x_x, minimal_locations_maximal_items, minimal_locations_maximal_items_with_island, get_minsanity_options, default_6_x_x
+    allsanity_mods_6_x_x, minimal_locations_maximal_items, minimal_locations_maximal_items_with_island, get_minsanity_options, default_6_x_x, \
+    allsanity_mods_6_x_x_exclude_disabled
 from .. import location_table
 from ..items import Group, item_table
 
@@ -70,7 +71,7 @@ class TestAllSanitySettingsHasAllExpectedLocations(SVTestBase):
     options = allsanity_no_mods_6_x_x()
 
     def test_allsanity_without_mods_has_at_least_locations(self):
-        expected_locations = 2238
+        expected_locations = 2256
         real_locations = self.get_real_locations()
         number_locations = len(real_locations)
         print(f"Stardew Valley - Allsanity Locations without mods: {number_locations}")
@@ -83,10 +84,10 @@ def test_allsanity_without_mods_has_at_least_locations(self):
 
 
 class TestAllSanityWithModsSettingsHasAllExpectedLocations(SVTestBase):
-    options = allsanity_mods_6_x_x()
+    options = allsanity_mods_6_x_x_exclude_disabled()
 
     def test_allsanity_with_mods_has_at_least_locations(self):
-        expected_locations = 3096
+        expected_locations = 2908
         real_locations = self.get_real_locations()
         number_locations = len(real_locations)
         print(f"Stardew Valley - Allsanity Locations with all mods: {number_locations}")
diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py
index de0ed97882e3..880a3fda5ca0 100644
--- a/worlds/stardew_valley/test/__init__.py
+++ b/worlds/stardew_valley/test/__init__.py
@@ -13,6 +13,7 @@
 from .options.utils import fill_namespace_with_default, parse_class_option_keys, fill_dataclass_with_default
 from .. import StardewValleyWorld, options, StardewItem
 from ..options import StardewValleyOption
+from ..options.options import enabled_mods
 
 logger = logging.getLogger(__name__)
 
@@ -98,6 +99,12 @@ def allsanity_mods_6_x_x():
     return allsanity
 
 
+def allsanity_mods_6_x_x_exclude_disabled():
+    allsanity = allsanity_no_mods_6_x_x()
+    allsanity.update({options.Mods.internal_name: frozenset(enabled_mods)})
+    return allsanity
+
+
 def get_minsanity_options():
     return {
         options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled,

From b91a7ac6fbfc0060c5262402669e2e84c56d9fcd Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Tue, 14 Jan 2025 13:52:58 -0500
Subject: [PATCH 256/381] LADX: Move Locality Changes Earlier (#4478)

---
 worlds/ladx/__init__.py | 47 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index b8de6da812df..09a25eb1cd09 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -140,6 +140,28 @@ def convert_ap_options_to_ladxr_logic(self):
         self.ladxr_logic = LADXRLogic(configuration_options=self.ladxr_settings, world_setup=world_setup)
         self.ladxr_itempool = LADXRItemPool(self.ladxr_logic, self.ladxr_settings, self.random).toDict()
 
+    def generate_early(self) -> None:
+        self.dungeon_item_types = {
+        }
+        for dungeon_item_type in ["maps", "compasses", "small_keys", "nightmare_keys", "stone_beaks", "instruments"]:
+            option_name = "shuffle_" + dungeon_item_type
+            option: DungeonItemShuffle = getattr(self.options, option_name)
+
+            self.dungeon_item_types[option.ladxr_item] = option.value
+
+            # The color dungeon does not contain an instrument
+            num_items = 8 if dungeon_item_type == "instruments" else 9
+
+            # For any and different world, set item rule instead
+            if option.value == DungeonItemShuffle.option_own_world:
+                self.options.local_items.value |= {
+                    ladxr_item_to_la_item_name[f"{option.ladxr_item}{i}"] for i in range(1, num_items + 1)
+                }
+            elif option.value == DungeonItemShuffle.option_different_world:
+                self.options.non_local_items.value |= {
+                    ladxr_item_to_la_item_name[f"{option.ladxr_item}{i}"] for i in range(1, num_items + 1)
+                }
+
     def create_regions(self) -> None:
         # Initialize
         self.convert_ap_options_to_ladxr_logic()
@@ -185,32 +207,9 @@ def create_event(self, event: str):
     def create_items(self) -> None:
         exclude = [item.name for item in self.multiworld.precollected_items[self.player]]
 
-        dungeon_item_types = {
-
-        }
-
         self.prefill_original_dungeon = [ [], [], [], [], [], [], [], [], [] ]
         self.prefill_own_dungeons = []
         self.pre_fill_items = []
-        # For any and different world, set item rule instead
-        
-        for dungeon_item_type in ["maps", "compasses", "small_keys", "nightmare_keys", "stone_beaks", "instruments"]:
-            option_name = "shuffle_" + dungeon_item_type
-            option: DungeonItemShuffle = getattr(self.options, option_name)
-
-            dungeon_item_types[option.ladxr_item] = option.value
-
-            # The color dungeon does not contain an instrument
-            num_items = 8 if dungeon_item_type == "instruments" else 9
-
-            if option.value == DungeonItemShuffle.option_own_world:
-                self.options.local_items.value |= {
-                    ladxr_item_to_la_item_name[f"{option.ladxr_item}{i}"] for i in range(1, num_items + 1)
-                }
-            elif option.value == DungeonItemShuffle.option_different_world:
-                self.options.non_local_items.value |= {
-                    ladxr_item_to_la_item_name[f"{option.ladxr_item}{i}"] for i in range(1, num_items + 1)
-                }
         # option_original_dungeon = 0
         # option_own_dungeons = 1
         # option_own_world = 2
@@ -238,7 +237,7 @@ def create_items(self) -> None:
 
                     if isinstance(item.item_data, DungeonItemData):
                         item_type = item.item_data.ladxr_id[:-1]
-                        shuffle_type = dungeon_item_types[item_type]
+                        shuffle_type = self.dungeon_item_types[item_type]
 
                         if item.item_data.dungeon_item_type == DungeonItemType.INSTRUMENT and shuffle_type == ShuffleInstruments.option_vanilla:
                             # Find instrument, lock

From bedf746f1d90f128072034dedc3b6603541befe7 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Tue, 14 Jan 2025 21:37:10 +0100
Subject: [PATCH 257/381] MultiServer: Revert hints being created for already
 found locations #4367

---
 MultiServer.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/MultiServer.py b/MultiServer.py
index 8aabdea3e2bf..c3f62e156114 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -743,16 +743,17 @@ def notify_hints(self, team: int, hints: typing.List[Hint], only_new: bool = Fal
                 concerns[player].append(data)
             if not hint.local and data not in concerns[hint.finding_player]:
                 concerns[hint.finding_player].append(data)
-            # remember hints in all cases
-
-            # since hints are bidirectional, finding player and receiving player,
-            # we can check once if hint already exists
-            if hint not in self.hints[team, hint.finding_player]:
-                self.hints[team, hint.finding_player].add(hint)
-                new_hint_events.add(hint.finding_player)
-                for player in self.slot_set(hint.receiving_player):
-                    self.hints[team, player].add(hint)
-                    new_hint_events.add(player)
+
+            # only remember hints that were not already found at the time of creation
+            if not hint.found:
+                # since hints are bidirectional, finding player and receiving player,
+                # we can check once if hint already exists
+                if hint not in self.hints[team, hint.finding_player]:
+                    self.hints[team, hint.finding_player].add(hint)
+                    new_hint_events.add(hint.finding_player)
+                    for player in self.slot_set(hint.receiving_player):
+                        self.hints[team, player].add(hint)
+                        new_hint_events.add(player)
 
             self.logger.info("Notice (Team #%d): %s" % (team + 1, format_hint(self, team, hint)))
         for slot in new_hint_events:

From 01df35f2152365bff0c82ebfb51f126e3b7af554 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Tue, 14 Jan 2025 22:24:46 +0100
Subject: [PATCH 258/381] Factorio: fix Evolution Trap crashing bound server
 (#4366)

---
 worlds/factorio/data/mod_template/control.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/worlds/factorio/data/mod_template/control.lua b/worlds/factorio/data/mod_template/control.lua
index 40903250461c..87669beaf199 100644
--- a/worlds/factorio/data/mod_template/control.lua
+++ b/worlds/factorio/data/mod_template/control.lua
@@ -717,8 +717,10 @@ TRAP_TABLE = {
     game.surfaces["nauvis"].build_enemy_base(game.forces["player"].get_spawn_position(game.get_surface(1)), 25)
 end,
 ["Evolution Trap"] = function ()
-    game.forces["enemy"].evolution_factor = game.forces["enemy"].evolution_factor + (TRAP_EVO_FACTOR * (1 - game.forces["enemy"].evolution_factor))
-    game.print({"", "New evolution factor:", game.forces["enemy"].evolution_factor})
+    local new_factor = game.forces["enemy"].get_evolution_factor("nauvis") +
+        (TRAP_EVO_FACTOR * (1 - game.forces["enemy"].get_evolution_factor("nauvis")))
+    game.forces["enemy"].set_evolution_factor(new_factor, "nauvis")
+    game.print({"", "New evolution factor:", new_factor})
 end,
 ["Teleport Trap"] = function ()
     for _, player in ipairs(game.forces["player"].players) do

From 207a76d1b5e123656ae2c547482a544467c7dba5 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Tue, 14 Jan 2025 16:39:13 -0500
Subject: [PATCH 259/381] OoT: Two Bugfixes (#4389)

---
 worlds/oot/Patches.py  | 2 +-
 worlds/oot/__init__.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/worlds/oot/Patches.py b/worlds/oot/Patches.py
index 561d7c3f7b6e..cd940e052a2b 100644
--- a/worlds/oot/Patches.py
+++ b/worlds/oot/Patches.py
@@ -2200,7 +2200,7 @@ def update_scrub_text(message, text_replacement, default_price, price, item_name
                 elif world.shuffle_bosses != 'off':
                     vanilla_reward = world.get_location(boss_name).vanilla_item
                     vanilla_reward_location = world.multiworld.find_item(vanilla_reward, world.player) # hinted_dungeon_reward_locations[vanilla_reward.name]
-                    area = HintArea.at(vanilla_reward_location).text(world.clearer_hints, preposition=True)
+                    area = HintArea.at(vanilla_reward_location).text(world.hint_rng, world.clearer_hints, preposition=True)
                     compass_message = "\x13\x75\x08You found the \x05\x41Compass\x05\x40\x01for %s\x05\x40!\x01The %s can be found\x01%s!\x09" % (dungeon_name, vanilla_reward, area)
                 else:
                     boss_location = next(filter(lambda loc: loc.type == 'Boss', world.get_entrance(f'{dungeon} Boss Door -> {boss_name} Boss Room').connected_region.locations))
diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py
index 975902ae6e64..3de55f68243b 100644
--- a/worlds/oot/__init__.py
+++ b/worlds/oot/__init__.py
@@ -582,8 +582,7 @@ def load_regions_from_json(self, file_path):
                     new_exit = OOTEntrance(self.player, self.multiworld, '%s -> %s' % (new_region.name, exit), new_region)
                     new_exit.vanilla_connected_region = exit
                     new_exit.rule_string = rule
-                    if self.options.logic_rules != 'no_logic':
-                        self.parser.parse_spot_rule(new_exit)
+                    self.parser.parse_spot_rule(new_exit)
                     if new_exit.never:
                         logger.debug('Dropping unreachable exit: %s', new_exit.name)
                     else:

From 1eefe23f1101e4d1c795b599f44ca2b4b9d04531 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 15 Jan 2025 15:13:29 -0500
Subject: [PATCH 260/381] Lingo: Add speed boost mode (#3989)

* Add speed boost mode

* Update generated.dat

* Modify the actual trap weights option when speed boost mode is on

* EOF newline

* Update generated.dat
---
 worlds/lingo/__init__.py         |  12 +++++++++---
 worlds/lingo/data/generated.dat  | Bin 149485 -> 149504 bytes
 worlds/lingo/data/ids.yaml       |   1 +
 worlds/lingo/items.py            |   1 +
 worlds/lingo/options.py          |  10 ++++++++++
 worlds/lingo/test/TestOptions.py |   9 ++++++++-
 worlds/lingo/utils/assign_ids.rb |   3 +++
 7 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/worlds/lingo/__init__.py b/worlds/lingo/__init__.py
index 2a61a71f5fce..141fca0743bc 100644
--- a/worlds/lingo/__init__.py
+++ b/worlds/lingo/__init__.py
@@ -128,6 +128,9 @@ def create_items(self):
                     pool.append(self.create_item("Puzzle Skip"))
 
             if traps:
+                if self.options.speed_boost_mode:
+                    self.options.trap_weights.value["Slowness Trap"] = 0
+
                 total_weight = sum(self.options.trap_weights.values())
 
                 if total_weight == 0:
@@ -171,7 +174,7 @@ def fill_slot_data(self):
             "death_link", "victory_condition", "shuffle_colors", "shuffle_doors", "shuffle_paintings", "shuffle_panels",
             "enable_pilgrimage", "sunwarp_access", "mastery_achievements", "level_2_requirement", "location_checks",
             "early_color_hallways", "pilgrimage_allows_roof_access", "pilgrimage_allows_paintings", "shuffle_sunwarps",
-            "group_doors"
+            "group_doors", "speed_boost_mode"
         ]
 
         slot_data = {
@@ -188,5 +191,8 @@ def fill_slot_data(self):
         return slot_data
 
     def get_filler_item_name(self) -> str:
-        filler_list = [":)", "The Feeling of Being Lost", "Wanderlust", "Empty White Hallways"]
-        return self.random.choice(filler_list)
+        if self.options.speed_boost_mode:
+            return "Speed Boost"
+        else:
+            filler_list = [":)", "The Feeling of Being Lost", "Wanderlust", "Empty White Hallways"]
+            return self.random.choice(filler_list)
diff --git a/worlds/lingo/data/generated.dat b/worlds/lingo/data/generated.dat
index 8b159d4ae4ac7c565e2372b1cc43d7a349b2ca7c..646ce3b5d7430dad51aa01a3a3f0e73b62106884 100644
GIT binary patch
delta 2672
zcmZY9c~I147zgluf3V9fP{<*N%Oz`SEZ1^)g}5AR6bfD>*}|?ZZ^Y^zf(g4INQ!Hk
ztiFm?+A%dXIa(Q3X2;a1lVeje4VPS6jcIC5CSw=9&+~3Hll;N+<?}qxyZiojhwHoi
zT6X*GUarj2YxD-SG0jkun`Y1$^jX!J)rRbh^mMhlIx{C-f85?ZLF6YwNKG#@7fF%K
z)k~t;Y4~-%NQz>&ddW=R0&|_&vd&(|=Jt_T*4Im>u<jx$AlwyJW-&i$F<Py)8;#0B
zqux@-Gh5k5ib)eY+()8$ImJtEQ;tlw#H+*I>UQ~MD$DKl4SLIZH|^w1vF9y%S^w{`
zkbXR6c0ZZn-wvk`m}KT8Db+{px3fL{B!#rF5Bo_hFMa(aj+Y}tBsRGPHpJNh<+Y7A
zld`bRY_@n_8N2e1uCk+HA^27h6z~G}u93V5W*Z=pq?PR)Ai2Dp86erbObn1bUh)P>
zPCzT1FNXzd*Vuwc)|4XM$37h(3O;aj5a;HPk|Z{qA_f2JW`H2oe{gt|B(j!^WGY|U
zcagt&2fH#xltJFw##)=_tvXozrF$rNh|DIAo_RxLAt75>(=f^4<=8Mu<z;l3r11m!
zdrxA`<HX1FwD1}UEF@o2ObWkIGTT2wg2c5F+0AhxXBS3@;+_k(<V*gOd;EsUY|bbN
z=6n2_@N)ceYF_x2GQ_UGcsRkaQEZ$~MmZ-xLzldwc$rq~xuBCxA0y$B*cM+D?@H~m
zM<=_bV<aX5yW->YDlb_z*=!jj5#nV0@LY0jNl|gdWcwIDnK;=Q{!qoU&EbVVPYo~p
z87kS(VkyXTD+hC3B6AneB}67Oby6jiDjLHJO@(ZvNl=PtB$Qej1|`UJ+|+0K#`Lji
z18w8bBfm_>NvJEJe7(_VP%bi?tv0vL_gv5K-;?0z$i0I_GW^l4Ij4}hyh;kRZe7(m
z#ff;SNgaA+zD(BaR?(}x>SSjXvaZl~!hLmwCp*2y&a0(dzw6LbczPP05B6^0BK-w=
zzFe&I7K)1g3gpL$-iG84={HuHCdCEb0SLwYan_zD)vvvaOY{$DgyAuN3i%skD#`?k
zijoDK!r?dxQUoL~NRg1dAx(oMhZGG-!Iq{=8BQM#&2H)kuH<f|{z3vl;!%Qx1cM}?
zgbKMIBoHM`NH|C$N`#OokR+68C@LBQl+207!kTUd#5hPPkfyVU3`x0IiPJOz{1x0!
z6p{?`Aj%9ODv(r^nJ6kc3rNjwYWTm>E`FSDju=e^&%{x+kaUo2lnfLV%>v5dL^Y7|
zc(T)MPcxVOl_6!4JeHm*IpXGdbO8(&z{)~MT3mUEUC5NON*93?qZHsc)q?1_SZSe<
zVvr>$B`7YRQoYq?v}|(gN|7H%R(0v6FlNY-Vw{hN%`(_5!;z&z%0ZT*R0vrCQjW4x
z$ZC)Zlu99MK$fFa30VuW0_6!I)gUWTYMg?MK&z0}2{D1JMyVC@6i6jXosfEv$56~d
zHh`=_u?Vq&RH4{WRI~x;aZawlMa-d*RErxy^jzpBNY#*@fm8!&Gb95~cG|=v|DroU
zj9jc#TtG!z*;S2{5Vi$6CY)`<Sry&Nl-W{Feg|~w;JjxcJq>9aq<WrQ@<OxSVs-1x
zz}tb>L+XUIfhRlN!470g56s&MVuRjuknE6lLD~puH>3tg&qHeD$xiq12>*iIY$97y
zI``tAl)=DeK47K$Jp<i9O|X3sQZsHJ!X|wY#DU{42{{7dM0r`rs~{~XuL*e_WDCk0
zLf*^=YD0QU(AyyGC`W}H1KEmlT*$j19VqXyksN-F_eJ9*G`3;m10f%Q%tARO<TS{3
zluv|w2GWW0xsWeFcA$KTqM~PjT%24}D$ET=i&9%}v*_z<jBee|vvPQ{XIWdWv^@SR
z7~I1L?eskE(yvANR+R79-CQZw*(d%Q;6=9=UujUt5Xe51VH6b|1!A1&7^MA>E<rlL
ylbv41G5P~YH!l7t<O;|^l%IrL13APc(Mo?7bOY!G9J(pwwkUUcPUcBjLH_^^#ynR5

delta 2618
zcmZY9c}&x17zgmaFNao69U#bIxukPWC@tl1U_5HEjKKsP9%vA%<sDLNsdxY_9;jFa
zweot*P2;jF&gmAz=H{Z=GPjwSm@MH?1l)|y&CSd?%#6DCdESmK8-MV8`8?12zQ5nw
z23M!@Zilk7Ol3Cft99vSvqn>;)o1F`H2Q3vPOnWfudLEmrLV|3?Kt$5&@-W=s)t|b
zA(OaU{E7%Gwpmx%%yxUtTC-}7wbp7|>8SPaJM(BXSND=&-eIHxyuXJ$%Zqx6lD}c3
zQT&{d#_;l9Vk9npw3kGS@|h^vt}KP3z^BdA>TxS|suD+CW2LR$!`cNi?D@)G#(#S}
zv=4Wg)<>q0O}wO!<cYGkkED=RezuRqiqhLh;zT(%Kw^_y;UKwLKuOKI28(K5t<`Gt
z9)(@MwtdAX!$R<E1b;Z2zcfOk`8!i+2tVIX{7DPn)lafTx!6xKMS0p!azx3wO0oi4
z;1EApW#2cP7s)$P=!CyloxF;3xkDt02VEoKVvQBDO8w8yM~6rvcgbegHSzFHetVdx
z`1I$g{}_2GP9A?lNb$cVWPnT~&h8fm$V@`E@TTiTE6S<sBvq85>qH~Y5)YlkJ4eVE
z?>_ka2|>Ou7R{RHy##!hWPV_f1j!dl<n^<tAHO_E{QviABZDMVOo_Kj=EV<*a&%kq
zf^eRAw=_}28)@a*aq?P1Vx#!^C&ZUO8X^HvO>kiZKVrYq`~?Ps_feYo<Y5vKiEa7q
z@Lg<JP&C>t940Xnu`54PpOX3IqfOT^nJ9P0576yrm~YH49c`ZyJCi1UQCzIN-z-tY
zrRqfyH>u+H=F*_i+jid|Gx98JSQt?#EWK<q6eBBuVrG$|uq4RsmI_Od<s3@|i2*sy
zR8VRxSGxVaCnKag<R%G<jx;U(#$Vy~nLo$iF;$4T|B_JwKWB8bDNT7RSD|S3sM(MF
zlQf!4?(o4hnoWM@Q5u?@dKa7QS5Zu3zxG$y**)+0Z$L^x>^`J%kbdW@H8d{p0l;_x
z4)zD<8d|sfAueKnLL&^fc_igANI1$96g5-i35tO22&9RSD5OY8K9D9s@`V%)$&Xj3
zQ?1iqK(mL91y>2TGo_ROka(0pDZwBKD4|j&fCQpEBPARp5hX%OBuElU6pETf10@S$
zF<}s=K#YZy0x6D9)l${W$vDm8!H?tm1Sv@%(@~P8q=2NNs8Q5xD&L`{xu$7yU^)!w
za3EER1|$<D9YxJ_Kv{xV2BaL398B+RX7NxR)sbv&(9xE-8D7nW!8x!b50U|w%;dv5
znqiy;l8-VQ$JtyElMp*INHKyGpyZ>t#}roD8_c%#9#bK50k6oQdS{`WFM|1EY!pjb
z0P-?QiIg&s5|o8f%0Ws|7D-tGQiifr$}*6JD9fc(g1myV!YQd5s2s^GWfjOG6pIuF
zvKZx6DXT%2pwvmJ2U&`;Mv5Jz0;K^(&DH`f6XXt@&G+c3dTt{~r4Y6b(h5lHAyq-z
z0I6Ce2iqv3_)<56n1$F`3yPY#_+vdyh-!t71!p&TJ6nKi_--wY<i(jZI(#cYE$rL|
zX*Hy6+?7cqBDMq61MGmb1~+QwCo<_&ryHaJdb=PwAnk^<7E%YKMo68I)`{d`dqjkP
zCi{Ta3vvf9GS}8x8&$I_ZMGV-&12etgB~1YT`;#%h@Elo(t|)vf}HFS#Acj7j9qpF
zqy^_+mvR)uiE>QJaS#{En^N8a*@W`8ly^Zkqr4~O1jrVY_oXC$0JIh9l%x+q+E6}1
z;d`_++_??qjGXC)ne8YaOF0Yj9LlFs&VlSe`CQ6*kam;{QoaD$iSi|intcW27UT{t
zwKke<Dnng^t+I~q%%<bWMc$Q7%i_O<nZ07h!7kx4c3GAyvV6w_b7-uyNB-3(ifKO{
z(l6y2NEgZgikb}qaY1Yd(g8@rkPeFEU^j4#{Qz<Z7v7X|3*<1$Z7Fv^UK5gNXFo~0
U3v>jBevxutmIvLJa%e`-UnIXM1ONa4

diff --git a/worlds/lingo/data/ids.yaml b/worlds/lingo/data/ids.yaml
index 13b77145ea2c..0a43592d3fc2 100644
--- a/worlds/lingo/data/ids.yaml
+++ b/worlds/lingo/data/ids.yaml
@@ -17,6 +17,7 @@ special_items:
   Iceland Trap: 444411
   Atbash Trap: 444412
   Puzzle Skip: 444413
+  Speed Boost: 444680
 panels:
   Starting Room:
     HI: 444400
diff --git a/worlds/lingo/items.py b/worlds/lingo/items.py
index 78b288e7c2df..7e75cc76c739 100644
--- a/worlds/lingo/items.py
+++ b/worlds/lingo/items.py
@@ -85,6 +85,7 @@ def load_item_data():
         "The Feeling of Being Lost": ItemClassification.filler,
         "Wanderlust":                ItemClassification.filler,
         "Empty White Hallways":      ItemClassification.filler,
+        "Speed Boost":               ItemClassification.filler,
         **{trap_name: ItemClassification.trap for trap_name in TRAP_ITEMS},
         "Puzzle Skip":               ItemClassification.useful,
     }
diff --git a/worlds/lingo/options.py b/worlds/lingo/options.py
index 2d6e9967dfc4..f9d04f68fc8e 100644
--- a/worlds/lingo/options.py
+++ b/worlds/lingo/options.py
@@ -232,6 +232,14 @@ class TrapWeights(OptionDict):
     default = {trap_name: 1 for trap_name in TRAP_ITEMS}
 
 
+class SpeedBoostMode(Toggle):
+    """
+    If on, the player's default speed is halved, as if affected by a Slowness Trap. Speed Boosts are added to
+    the item pool, which temporarily return the player to normal speed. Slowness Traps are removed from the pool.
+    """
+    display_name = "Speed Boost Mode"
+
+
 class PuzzleSkipPercentage(Range):
     """Replaces junk items with puzzle skips, at the specified rate."""
     display_name = "Puzzle Skip Percentage"
@@ -260,6 +268,7 @@ class DeathLink(Toggle):
         Level2Requirement,
         TrapPercentage,
         TrapWeights,
+        SpeedBoostMode,
         PuzzleSkipPercentage,
     ])
 ]
@@ -287,6 +296,7 @@ class LingoOptions(PerGameCommonOptions):
     shuffle_postgame: ShufflePostgame
     trap_percentage: TrapPercentage
     trap_weights: TrapWeights
+    speed_boost_mode: SpeedBoostMode
     puzzle_skip_percentage: PuzzleSkipPercentage
     death_link: DeathLink
     start_inventory_from_pool: StartInventoryPool
diff --git a/worlds/lingo/test/TestOptions.py b/worlds/lingo/test/TestOptions.py
index bd8ed81d7a12..224dbe0f7573 100644
--- a/worlds/lingo/test/TestOptions.py
+++ b/worlds/lingo/test/TestOptions.py
@@ -59,4 +59,11 @@ class TestShuffleSunwarpsAccess(LingoTestBase):
         "victory_condition": "pilgrimage",
         "shuffle_sunwarps": "true",
         "sunwarp_access": "individual"
-    }
\ No newline at end of file
+    }
+
+
+class TestSpeedBoostMode(LingoTestBase):
+    options = {
+        "location_checks": "insanity",
+        "speed_boost_mode": "true",
+    }
diff --git a/worlds/lingo/utils/assign_ids.rb b/worlds/lingo/utils/assign_ids.rb
index f7de3d03f582..bcb8018ebcc3 100644
--- a/worlds/lingo/utils/assign_ids.rb
+++ b/worlds/lingo/utils/assign_ids.rb
@@ -216,3 +216,6 @@
 end
 
 File.write(outputpath, old_generated.to_yaml)
+
+puts "Next item ID: #{next_item_id}"
+puts "Next location ID: #{next_location_id}"

From 9dac7d9cc3bf313127f02d1a6d2ba9bd01a451ee Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:50:20 +0100
Subject: [PATCH 261/381] MultiServer: update InvalidPacket text for location
 scouts (#4485)

---
 MultiServer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MultiServer.py b/MultiServer.py
index c3f62e156114..81426cb132d8 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -1888,7 +1888,8 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
             for location in args["locations"]:
                 if type(location) is not int:
                     await ctx.send_msgs(client,
-                                        [{'cmd': 'InvalidPacket', "type": "arguments", "text": 'LocationScouts',
+                                        [{'cmd': 'InvalidPacket', "type": "arguments",
+                                          "text": 'Locations has to be a list of integers',
                                           "original_cmd": cmd}])
                     return
 

From b7baaed39112d9a5e1c5b17b1914bf5205328535 Mon Sep 17 00:00:00 2001
From: Silent <110704408+silent-destroyer@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:17:07 -0500
Subject: [PATCH 262/381] TUNIC: Grass Randomizer (#3913)

* Fix certain items not being added to slot data

* Change where items get added to slot data

* Add initial grass randomizer stuff

* Fix rules

* Update grass.py

Improve location names

* Remove wand and gun from logic

* Update __init__.py

* Fix logic for two pieces of grass in atoll

* Make early bushes only contain grass

* Backport changes to grass rando (#20)

* Backport changes to grass rando

* add_rule instead of set_rule for the special cases, add special cases for back of swamp laurels area cause I should've made a new region for the swamp upper entrance

* Remove item name group for grass

* Update grass rando option descriptions

- Also ignore grass fill for single player games

* Ignore grass fill option for solo rando

* Update er_rules.py

* Fix pre fill issue

* Remove duplicate option

* Add excluded grass locations back

* Hide grass fill option from simple ui options page

* Check for start with sword before setting grass rules

* Update worlds/tunic/options.py

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Exclude grass from get_filler_item_name

- non-grass rando games were accidentally seeing grass items get shuffled in as filler, which is funny but probably shouldn't happen

* Update worlds/tunic/__init__.py

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Apply suggestions from code review

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* change the rest of grass_fill to local_fill

* Filter out grass from filler_items

* remove -> discard

* Update worlds/tunic/__init__.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* change has_stick to has_melee

* Update grass list with combat logic regions

* More fixes from combat logic merge

* Fix some dumb stuff (#21)

* Reorganize pre fill for grass

* Update option value passthrough

* Update __init__.py

* Fix region name

* Make separate pools for the grass and non-grass fills (#22)

* Make separate pools for the grass and non-grass fills

* Update worlds/tunic/__init__.py

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* Fix those things in the PR (#23)

* Use excludable property

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/tunic/__init__.py   |  120 +-
 worlds/tunic/er_data.py    |   14 +-
 worlds/tunic/er_rules.py   |   40 +-
 worlds/tunic/er_scripts.py |    6 +-
 worlds/tunic/grass.py      | 7944 ++++++++++++++++++++++++++++++++++++
 worlds/tunic/items.py      |    3 +-
 worlds/tunic/locations.py  |   25 +-
 worlds/tunic/options.py    |   32 +-
 8 files changed, 8156 insertions(+), 28 deletions(-)
 create mode 100644 worlds/tunic/grass.py

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 1c326f78bd43..09279dd1bd86 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -1,19 +1,20 @@
-from typing import Dict, List, Any, Tuple, TypedDict, ClassVar, Union
+from typing import Dict, List, Any, Tuple, TypedDict, ClassVar, Union, Set
 from logging import warning
 from BaseClasses import Region, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
 from .items import (item_name_to_id, item_table, item_name_groups, fool_tiers, filler_items, slot_data_item_names,
                     combat_items)
-from .locations import location_table, location_name_groups, location_name_to_id, hexagon_locations
+from .locations import location_table, location_name_groups, standard_location_name_to_id, hexagon_locations, sphere_one
 from .rules import set_location_rules, set_region_rules, randomize_ability_unlocks, gold_hexagon
 from .er_rules import set_er_location_rules
 from .regions import tunic_regions
 from .er_scripts import create_er_regions
+from .grass import grass_location_table, grass_location_name_to_id, grass_location_name_groups, excluded_grass_locations
 from .er_data import portal_mapping, RegionInfo, tunic_er_regions
 from .options import (TunicOptions, EntranceRando, tunic_option_groups, tunic_option_presets, TunicPlandoConnections,
                       LaurelsLocation, LogicRules, LaurelsZips, IceGrappling, LadderStorage)
 from .combat_logic import area_data, CombatState
 from worlds.AutoWorld import WebWorld, World
-from Options import PlandoConnection
+from Options import PlandoConnection, OptionError
 from decimal import Decimal, ROUND_HALF_UP
 from settings import Group, Bool
 
@@ -22,7 +23,11 @@ class TunicSettings(Group):
     class DisableLocalSpoiler(Bool):
         """Disallows the TUNIC client from creating a local spoiler log."""
 
+    class LimitGrassRando(Bool):
+        """Limits the impact of Grass Randomizer on the multiworld by disallowing local_fill percentages below 95."""
+
     disable_local_spoiler: Union[DisableLocalSpoiler, bool] = False
+    limit_grass_rando: Union[LimitGrassRando, bool] = True
 
 
 class TunicWeb(WebWorld):
@@ -73,10 +78,13 @@ class TunicWorld(World):
     settings: ClassVar[TunicSettings]
     item_name_groups = item_name_groups
     location_name_groups = location_name_groups
+    location_name_groups.update(grass_location_name_groups)
 
     item_name_to_id = item_name_to_id
-    location_name_to_id = location_name_to_id
+    location_name_to_id = standard_location_name_to_id.copy()
+    location_name_to_id.update(grass_location_name_to_id)
 
+    player_location_table: Dict[str, int]
     ability_unlocks: Dict[str, int]
     slot_data_items: List[TunicItem]
     tunic_portal_pairs: Dict[str, str]
@@ -85,6 +93,11 @@ class TunicWorld(World):
     shop_num: int = 1  # need to make it so that you can walk out of shops, but also that they aren't all connected
     er_regions: Dict[str, RegionInfo]  # absolutely needed so outlet regions work
 
+    # for the local_fill option
+    fill_items: List[TunicItem]
+    fill_locations: List[TunicLocation]
+    amount_to_local_fill: int
+
     # so we only loop the multiworld locations once
     # if these are locations instead of their info, it gives a memory leak error
     item_link_locations: Dict[int, Dict[str, List[Tuple[int, str]]]] = {}
@@ -132,6 +145,7 @@ def generate_early(self) -> None:
                 self.options.hexagon_quest.value = self.passthrough["hexagon_quest"]
                 self.options.entrance_rando.value = self.passthrough["entrance_rando"]
                 self.options.shuffle_ladders.value = self.passthrough["shuffle_ladders"]
+                self.options.grass_randomizer.value = self.passthrough.get("grass_randomizer", 0)
                 self.options.fixed_shop.value = self.options.fixed_shop.option_false
                 self.options.laurels_location.value = self.options.laurels_location.option_anywhere
                 self.options.combat_logic.value = self.passthrough["combat_logic"]
@@ -140,6 +154,22 @@ def generate_early(self) -> None:
         else:
             self.using_ut = False
 
+        self.player_location_table = standard_location_name_to_id.copy()
+
+        if self.options.local_fill == -1:
+            if self.options.grass_randomizer:
+                self.options.local_fill.value = 95
+            else:
+                self.options.local_fill.value = 0
+
+        if self.options.grass_randomizer:
+            if self.settings.limit_grass_rando and self.options.local_fill < 95 and self.multiworld.players > 1:
+                raise OptionError(f"TUNIC: Player {self.player_name} has their Local Fill option set too low. "
+                                  f"They must either bring it above 95% or the host needs to disable limit_grass_rando "
+                                  f"in their host.yaml settings")
+
+            self.player_location_table.update(grass_location_name_to_id)
+
     @classmethod
     def stage_generate_early(cls, multiworld: MultiWorld) -> None:
         tunic_worlds: Tuple[TunicWorld] = multiworld.get_game_worlds("TUNIC")
@@ -245,6 +275,14 @@ def create_items(self) -> None:
                 self.get_location("Secret Gathering Place - 10 Fairy Reward").place_locked_item(laurels)
             items_to_create["Hero's Laurels"] = 0
 
+        if self.options.grass_randomizer:
+            items_to_create["Grass"] = len(grass_location_table)
+            tunic_items.append(self.create_item("Glass Cannon", ItemClassification.progression))
+            items_to_create["Glass Cannon"] = 0
+            for grass_location in excluded_grass_locations:
+                self.get_location(grass_location).place_locked_item(self.create_item("Grass"))
+            items_to_create["Grass"] -= len(excluded_grass_locations)
+
         if self.options.keys_behind_bosses:
             for rgb_hexagon, location in hexagon_locations.items():
                 hex_item = self.create_item(gold_hexagon if self.options.hexagon_quest else rgb_hexagon)
@@ -332,8 +370,73 @@ def remove_filler(amount: int) -> None:
             if tunic_item.name in slot_data_item_names:
                 self.slot_data_items.append(tunic_item)
 
+        # pull out the filler so that we can place it manually during pre_fill
+        self.fill_items = []
+        if self.options.local_fill > 0 and self.multiworld.players > 1:
+            # skip items marked local or non-local, let fill deal with them in its own way
+            # discard grass from non_local if it's meant to be limited
+            if self.settings.limit_grass_rando:
+                self.options.non_local_items.value.discard("Grass")
+            all_filler: List[TunicItem] = []
+            non_filler: List[TunicItem] = []
+            for tunic_item in tunic_items:
+                if (tunic_item.excludable
+                        and tunic_item.name not in self.options.local_items
+                        and tunic_item.name not in self.options.non_local_items):
+                    all_filler.append(tunic_item)
+                else:
+                    non_filler.append(tunic_item)
+            self.amount_to_local_fill = int(self.options.local_fill.value * len(all_filler) / 100)
+            self.fill_items += all_filler[:self.amount_to_local_fill]
+            del all_filler[:self.amount_to_local_fill]
+            tunic_items = all_filler + non_filler
+
         self.multiworld.itempool += tunic_items
 
+    def pre_fill(self) -> None:
+        self.fill_locations = []
+
+        if self.options.local_fill > 0 and self.multiworld.players > 1:
+            # we need to reserve a couple locations so that we don't fill up every sphere 1 location
+            reserved_locations: Set[str] = set(self.random.sample(sphere_one, 2))
+            viable_locations = [loc for loc in self.multiworld.get_unfilled_locations(self.player)
+                                if loc.name not in reserved_locations
+                                and loc.name not in self.options.priority_locations.value]
+
+            if len(viable_locations) < self.amount_to_local_fill:
+                raise OptionError(f"TUNIC: Not enough locations for local_fill option for {self.player_name}. "
+                                  f"This is likely due to excess plando or priority locations.")
+
+            self.fill_locations += viable_locations
+
+    @classmethod
+    def stage_pre_fill(cls, multiworld: MultiWorld) -> None:
+        tunic_fill_worlds: List[TunicWorld] = [world for world in multiworld.get_game_worlds("TUNIC")
+                                               if world.options.local_fill.value > 0]
+        if tunic_fill_worlds:
+            grass_fill: List[TunicItem] = []
+            non_grass_fill: List[TunicItem] = []
+            grass_fill_locations: List[Location] = []
+            non_grass_fill_locations: List[Location] = []
+            for world in tunic_fill_worlds:
+                if world.options.grass_randomizer:
+                    grass_fill.extend(world.fill_items)
+                    grass_fill_locations.extend(world.fill_locations)
+                else:
+                    non_grass_fill.extend(world.fill_items)
+                    non_grass_fill_locations.extend(world.fill_locations)
+
+            multiworld.random.shuffle(grass_fill)
+            multiworld.random.shuffle(non_grass_fill)
+            multiworld.random.shuffle(grass_fill_locations)
+            multiworld.random.shuffle(non_grass_fill_locations)
+
+            for filler_item in grass_fill:
+                multiworld.push_item(grass_fill_locations.pop(), filler_item, collect=False)
+
+            for filler_item in non_grass_fill:
+                multiworld.push_item(non_grass_fill_locations.pop(), filler_item, collect=False)
+
     def create_regions(self) -> None:
         self.tunic_portal_pairs = {}
         self.er_portal_hints = {}
@@ -346,7 +449,8 @@ def create_regions(self) -> None:
             self.ability_unlocks["Pages 52-53 (Icebolt)"] = self.passthrough["Hexagon Quest Icebolt"]
 
         # Ladders and Combat Logic uses ER rules with vanilla connections for easier maintenance
-        if self.options.entrance_rando or self.options.shuffle_ladders or self.options.combat_logic:
+        if (self.options.entrance_rando or self.options.shuffle_ladders or self.options.combat_logic
+                or self.options.grass_randomizer):
             portal_pairs = create_er_regions(self)
             if self.options.entrance_rando:
                 # these get interpreted by the game to tell it which entrances to connect
@@ -362,7 +466,7 @@ def create_regions(self) -> None:
                 region = self.get_region(region_name)
                 region.add_exits(exits)
 
-            for location_name, location_id in self.location_name_to_id.items():
+            for location_name, location_id in self.player_location_table.items():
                 region = self.get_region(location_table[location_name].region)
                 location = TunicLocation(self.player, location_name, location_id, region)
                 region.locations.append(location)
@@ -375,7 +479,8 @@ def create_regions(self) -> None:
 
     def set_rules(self) -> None:
         # same reason as in create_regions, could probably be put into create_regions
-        if self.options.entrance_rando or self.options.shuffle_ladders or self.options.combat_logic:
+        if (self.options.entrance_rando or self.options.shuffle_ladders or self.options.combat_logic
+                or self.options.grass_randomizer):
             set_er_location_rules(self)
         else:
             set_region_rules(self)
@@ -463,6 +568,7 @@ def fill_slot_data(self) -> Dict[str, Any]:
             "maskless": self.options.maskless.value,
             "entrance_rando": int(bool(self.options.entrance_rando.value)),
             "shuffle_ladders": self.options.shuffle_ladders.value,
+            "grass_randomizer": self.options.grass_randomizer.value,
             "combat_logic": self.options.combat_logic.value,
             "Hexagon Quest Prayer": self.ability_unlocks["Pages 24-25 (Prayer)"],
             "Hexagon Quest Holy Cross": self.ability_unlocks["Pages 42-43 (Holy Cross)"],
diff --git a/worlds/tunic/er_data.py b/worlds/tunic/er_data.py
index 1dc06d586d6f..f1a428cce1b5 100644
--- a/worlds/tunic/er_data.py
+++ b/worlds/tunic/er_data.py
@@ -629,14 +629,16 @@ class DeadEnd(IntEnum):
     "Beneath the Well Back": RegionInfo("Sewer"),  # the back two portals, and all 4 upper chests
     "West Garden before Terry": RegionInfo("Archipelagos Redux"),  # the lower entry point, near hero grave
     "West Garden after Terry": RegionInfo("Archipelagos Redux"),  # after Terry, up until next chompignons
+    "West Garden West Combat": RegionInfo("Archipelagos Redux"),  # for grass rando basically
     "West Garden at Dagger House": RegionInfo("Archipelagos Redux"),  # just outside magic dagger house
-    "West Garden South Checkpoint": RegionInfo("Archipelagos Redux"),
+    "West Garden South Checkpoint": RegionInfo("Archipelagos Redux"),  # the checkpoint and the blue lines area
     "Magic Dagger House": RegionInfo("archipelagos_house", dead_end=DeadEnd.all_cats),
-    "West Garden Portal": RegionInfo("Archipelagos Redux", dead_end=DeadEnd.restricted, outlet_region="West Garden by Portal"),
+    "West Garden Portal": RegionInfo("Archipelagos Redux", dead_end=DeadEnd.restricted,
+                                     outlet_region="West Garden by Portal"),
     "West Garden by Portal": RegionInfo("Archipelagos Redux", dead_end=DeadEnd.restricted),
     "West Garden Portal Item": RegionInfo("Archipelagos Redux", dead_end=DeadEnd.restricted),
     "West Garden Laurels Exit Region": RegionInfo("Archipelagos Redux"),
-    "West Garden before Boss": RegionInfo("Archipelagos Redux"),  # main west garden
+    "West Garden before Boss": RegionInfo("Archipelagos Redux"),  # up the ladder before garden knight
     "West Garden after Boss": RegionInfo("Archipelagos Redux"),
     "West Garden Hero's Grave Region": RegionInfo("Archipelagos Redux", outlet_region="West Garden before Terry"),
     "Ruined Atoll": RegionInfo("Atoll Redux"),
@@ -1165,8 +1167,10 @@ class DeadEnd(IntEnum):
     "West Garden after Terry": {
         "West Garden before Terry":
             [],
-        "West Garden South Checkpoint":
+        "West Garden West Combat":
             [],
+        "West Garden South Checkpoint":
+            [["Hyperdash"]],
         "West Garden Laurels Exit Region":
             [["LS1"]],
     },
@@ -1176,6 +1180,8 @@ class DeadEnd(IntEnum):
         "West Garden at Dagger House":
             [],
         "West Garden after Terry":
+            [["Hyperdash"]],
+        "West Garden West Combat":
             [],
     },
     "West Garden before Boss": {
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index f7568df81e49..08b088f7e4a7 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1,12 +1,13 @@
 from typing import Dict, FrozenSet, Tuple, TYPE_CHECKING
 from worlds.generic.Rules import set_rule, add_rule, forbid_item
+from BaseClasses import Region, CollectionState
 from .options import IceGrappling, LadderStorage, CombatLogic
 from .rules import (has_ability, has_sword, has_melee, has_ice_grapple_logic, has_lantern, has_mask, can_ladder_storage,
                     laurels_zip, bomb_walls)
 from .er_data import Portal, get_portal_outlet_region
 from .ladder_storage_data import ow_ladder_groups, region_ladders, easy_ls, medium_ls, hard_ls
 from .combat_logic import has_combat_reqs
-from BaseClasses import Region, CollectionState
+from .grass import set_grass_location_rules
 
 if TYPE_CHECKING:
     from . import TunicWorld
@@ -555,7 +556,6 @@ def get_paired_portal(portal_sd: str) -> Tuple[str, str]:
     regions["Dark Tomb Upper"].connect(
         connecting_region=regions["Dark Tomb Entry Point"])
 
-    # ice grapple through the wall, get the little secret sound to trigger
     regions["Dark Tomb Upper"].connect(
         connecting_region=regions["Dark Tomb Main"],
         rule=lambda state: has_ladder("Ladder in Dark Tomb", state, world)
@@ -577,11 +577,24 @@ def get_paired_portal(portal_sd: str) -> Tuple[str, str]:
     wg_after_to_before_terry = regions["West Garden after Terry"].connect(
         connecting_region=regions["West Garden before Terry"])
 
-    regions["West Garden after Terry"].connect(
-        connecting_region=regions["West Garden South Checkpoint"])
-    wg_checkpoint_to_after_terry = regions["West Garden South Checkpoint"].connect(
+    wg_after_terry_to_west_combat = regions["West Garden after Terry"].connect(
+        connecting_region=regions["West Garden West Combat"])
+    regions["West Garden West Combat"].connect(
         connecting_region=regions["West Garden after Terry"])
 
+    wg_checkpoint_to_west_combat = regions["West Garden South Checkpoint"].connect(
+        connecting_region=regions["West Garden West Combat"])
+    regions["West Garden West Combat"].connect(
+        connecting_region=regions["West Garden South Checkpoint"])
+
+    # if not laurels, it goes through the west combat region instead
+    regions["West Garden after Terry"].connect(
+        connecting_region=regions["West Garden South Checkpoint"],
+        rule=lambda state: state.has(laurels, player))
+    regions["West Garden South Checkpoint"].connect(
+        connecting_region=regions["West Garden after Terry"],
+        rule=lambda state: state.has(laurels, player))
+
     wg_checkpoint_to_dagger = regions["West Garden South Checkpoint"].connect(
         connecting_region=regions["West Garden at Dagger House"])
     regions["West Garden at Dagger House"].connect(
@@ -1402,12 +1415,16 @@ def ls_connect(origin_name: str, portal_sdt: str) -> None:
         set_rule(wg_after_to_before_terry,
                  lambda state: state.has_any({laurels, ice_dagger}, player)
                  or has_combat_reqs("West Garden", state, player))
-        # laurels through, probably to the checkpoint, or just fight
-        set_rule(wg_checkpoint_to_after_terry,
-                 lambda state: state.has(laurels, player) or has_combat_reqs("West Garden", state, player))
-        set_rule(wg_checkpoint_to_before_boss,
+
+        set_rule(wg_after_terry_to_west_combat,
+                 lambda state: has_combat_reqs("West Garden", state, player))
+        set_rule(wg_checkpoint_to_west_combat,
                  lambda state: has_combat_reqs("West Garden", state, player))
 
+        # maybe a little too generous? probably fine though
+        set_rule(wg_checkpoint_to_before_boss,
+                 lambda state: state.has(laurels, player) or has_combat_reqs("West Garden", state, player))
+
         add_rule(btv_front_to_main,
                  lambda state: has_combat_reqs("Beneath the Vault", state, player))
         add_rule(btv_back_to_main,
@@ -1528,6 +1545,9 @@ def ls_connect(origin_name: str, portal_sdt: str) -> None:
 def set_er_location_rules(world: "TunicWorld") -> None:
     player = world.player
 
+    if world.options.grass_randomizer:
+        set_grass_location_rules(world)
+
     forbid_item(world.get_location("Secret Gathering Place - 20 Fairy Reward"), fairies, player)
 
     # Ability Shuffle Exclusive Rules
@@ -1852,6 +1872,8 @@ def combat_logic_to_loc(loc_name: str, combat_req_area: str, set_instead: bool =
         combat_logic_to_loc("West Garden - [Central Lowlands] Chest Beneath Faeries", "West Garden")
         combat_logic_to_loc("West Garden - [Central Lowlands] Chest Beneath Save Point", "West Garden")
         combat_logic_to_loc("West Garden - [West Highlands] Upper Left Walkway", "West Garden")
+        combat_logic_to_loc("West Garden - [Central Highlands] Holy Cross (Blue Lines)", "West Garden")
+        combat_logic_to_loc("West Garden - [Central Highlands] Behind Guard Captain", "West Garden")
 
         # with combat logic on, I presume the player will want to be able to see to avoid the spiders
         set_rule(world.get_location("Beneath the Fortress - Bridge"),
diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py
index ed9fc0120ddc..4cd0f49ddf9b 100644
--- a/worlds/tunic/er_scripts.py
+++ b/worlds/tunic/er_scripts.py
@@ -1,6 +1,6 @@
 from typing import Dict, List, Set, Tuple, TYPE_CHECKING
 from BaseClasses import Region, ItemClassification, Item, Location
-from .locations import location_table
+from .locations import all_locations
 from .er_data import Portal, portal_mapping, traversal_requirements, DeadEnd, RegionInfo
 from .er_rules import set_er_region_rules
 from Options import PlandoConnection
@@ -53,8 +53,8 @@ def create_er_regions(world: "TunicWorld") -> Dict[Portal, Portal]:
 
     set_er_region_rules(world, regions, portal_pairs)
 
-    for location_name, location_id in world.location_name_to_id.items():
-        region = regions[location_table[location_name].er_region]
+    for location_name, location_id in world.player_location_table.items():
+        region = regions[all_locations[location_name].er_region]
         location = TunicERLocation(world.player, location_name, location_id, region)
         region.locations.append(location)
 
diff --git a/worlds/tunic/grass.py b/worlds/tunic/grass.py
new file mode 100644
index 000000000000..592b2938b118
--- /dev/null
+++ b/worlds/tunic/grass.py
@@ -0,0 +1,7944 @@
+from typing import Dict, NamedTuple, Optional, TYPE_CHECKING, Set
+
+from BaseClasses import CollectionState
+from worlds.generic.Rules import set_rule, add_rule
+from .rules import has_sword, has_melee
+if TYPE_CHECKING:
+    from . import TunicWorld
+
+
+class TunicLocationData(NamedTuple):
+    region: str
+    er_region: str  # entrance rando region
+    location_group: Optional[str] = None
+
+
+location_base_id = 509342400
+
+grass_location_table: Dict[str, TunicLocationData] = {
+    "Overworld - Overworld Grass (576) (7.0, 4.0, -223.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (572) (6.0, 4.0, -223.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (574) (7.0, 4.0, -224.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (568) (5.0, 4.0, -223.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (562) (4.0, 4.0, -223.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (570) (6.0, 4.0, -224.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (569) (5.0, 4.0, -225.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (566) (5.0, 4.0, -224.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (563) (4.0, 4.0, -224.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (564) (4.0, 4.0, -225.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (573) (6.0, 4.0, -225.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (577) (7.0, 4.0, -225.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (578) (3.0, 4.0, -223.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (575) (2.0, 4.0, -223.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (579) (3.0, 4.0, -224.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (571) (2.0, 4.0, -224.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (583) (-2.4, 4.0, -224.4)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (580) (-3.4, 4.0, -224.4)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (581) (-2.4, 4.0, -225.4)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (582) (-3.4, 4.0, -225.4)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (586) (-3.4, 4.0, -219.6)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (584) (-3.4, 4.0, -218.6)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (585) (-2.4, 4.0, -219.6)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (587) (-2.4, 4.0, -218.6)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (615) (13.0, 8.0, -217.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (616) (14.0, 8.0, -217.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (614) (13.0, 8.0, -216.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (613) (14.0, 8.0, -216.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (142) (13.0, 8.0, -224.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (141) (13.0, 8.0, -226.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (140) (13.0, 8.0, -228.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (591) (-8.0, 12.0, -212.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (590) (-8.0, 12.0, -212.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (589) (-9.0, 12.0, -212.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (588) (-9.0, 12.0, -213.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (592) (-8.0, 12.0, -213.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (606) (8.0, 12.0, -208.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (607) (8.0, 12.0, -209.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (608) (9.0, 12.0, -208.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (605) (9.0, 12.0, -209.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (600) (12.0, 12.0, -199.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (598) (12.0, 12.0, -200.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (599) (13.0, 12.0, -199.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (597) (13.0, 12.0, -200.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (602) (12.0, 12.0, -198.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (603) (13.0, 12.0, -197.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (601) (13.0, 12.0, -198.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (604) (12.0, 12.0, -197.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (593) (8.0, 12.0, -190.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (596) (9.0, 12.0, -190.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (594) (9.0, 12.0, -189.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (595) (8.0, 12.0, -189.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (612) (-8.0, 12.0, -188.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (609) (-8.0, 12.0, -189.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (610) (-9.0, 12.0, -188.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (611) (-9.0, 12.0, -189.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (895) (-6.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (894) (-6.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (891) (-6.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (892) (-7.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (889) (-7.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (893) (-7.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (899) (-7.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (905) (-8.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (890) (-6.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (906) (-9.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (907) (-10.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (908) (-10.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (898) (-15.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (897) (-15.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (909) (-14.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (887) (-15.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (900) (-16.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (888) (-16.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (896) (-16.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (901) (-17.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (886) (-16.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (904) (-17.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (902) (-18.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (903) (-18.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (334) (-20.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (322) (-20.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (320) (-20.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (321) (-21.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (332) (-21.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (323) (-21.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (337) (-22.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (336) (-22.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (339) (-23.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (338) (-23.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (335) (-20.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (333) (-21.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (349) (-21.0, 12.0, -141.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (344) (-22.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (346) (-23.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (345) (-22.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (347) (-23.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (340) (-20.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (343) (-21.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (342) (-21.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (356) (-21.0, 12.0, -144.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (353) (-19.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (351) (-20.0, 12.0, -141.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (358) (-20.0, 12.0, -144.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (341) (-20.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (348) (-21.0, 12.0, -140.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (354) (-18.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (352) (-19.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (350) (-20.0, 12.0, -140.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (359) (-20.0, 12.0, -145.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (357) (-21.0, 12.0, -145.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (355) (-18.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (131) (13.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (130) (13.0, 12.0, -141.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (129) (15.0, 12.0, -141.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (372) (14.5, 12.0, -139.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (128) (13.0, 12.0, -139.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (375) (14.5, 12.0, -138.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (373) (15.5, 12.0, -139.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (379) (16.5, 12.0, -138.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (376) (16.5, 12.0, -139.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (374) (15.5, 12.0, -138.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (369) (15.5, 12.0, -137.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (368) (14.5, 12.0, -137.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (366) (13.5, 12.0, -136.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (365) (13.5, 12.0, -137.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (371) (14.5, 12.0, -136.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (364) (12.5, 12.0, -137.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (367) (12.5, 12.0, -136.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (361) (13.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (127) (15.0, 12.0, -135.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (370) (15.5, 12.0, -136.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (362) (13.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (363) (12.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (360) (12.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (388) (16.5, 12.0, -137.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (389) (17.5, 12.0, -137.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (378) (17.5, 12.0, -138.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (377) (17.5, 12.0, -139.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (391) (16.5, 12.0, -136.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (392) (18.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (390) (17.5, 12.0, -136.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (385) (17.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (384) (16.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (386) (17.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (387) (16.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (382) (17.5, 12.0, -140.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (383) (16.5, 12.0, -140.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (381) (17.5, 12.0, -141.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (395) (18.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (394) (19.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (285) (19.5, 12.0, -132.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (279) (19.5, 12.0, -133.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (124) (18.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (393) (19.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (397) (20.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (282) (20.5, 12.0, -133.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (284) (20.5, 12.0, -132.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (289) (21.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (287) (21.5, 12.0, -133.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (281) (22.5, 12.0, -132.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (278) (22.5, 12.0, -133.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (286) (21.5, 12.0, -132.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (267) (21.5, 12.0, -131.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (126) (20.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (125) (18.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (283) (22.5, 12.0, -134.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (277) (23.5, 12.0, -132.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (276) (23.5, 12.0, -133.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (271) (22.5, 12.0, -131.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (269) (24.5, 12.0, -132.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (268) (24.5, 12.0, -133.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (266) (24.5, 12.0, -131.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (270) (24.5, 12.0, -130.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (275) (23.5, 12.0, -131.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (274) (23.5, 12.0, -130.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (272) (22.5, 12.0, -130.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (273) (21.5, 12.0, -130.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (396) (20.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (288) (21.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (280) (22.5, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (380) (16.5, 12.0, -141.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (262) (44.0, 12.0, -145.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (264) (45.0, 12.0, -144.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (263) (45.0, 12.0, -145.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (255) (39.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (256) (39.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (251) (39.5, 12.0, -152.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (254) (38.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (252) (38.5, 12.0, -152.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (257) (38.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (261) (40.5, 12.0, -152.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (258) (40.5, 12.0, -153.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (250) (39.5, 12.0, -153.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (260) (41.5, 12.0, -152.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (259) (41.5, 12.0, -153.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (253) (38.5, 12.0, -153.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (106) (47.0, 12.0, -147.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (31) (48.0, 12.0, -153.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (249) (50.5, 12.0, -153.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (245) (50.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (247) (50.5, 12.0, -152.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (242) (50.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (246) (51.5, 12.0, -152.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (244) (51.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (248) (51.5, 12.0, -153.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (17) (53.0, 12.0, -153.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (16) (53.0, 12.0, -151.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (243) (51.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (30) (51.0, 12.0, -149.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (32) (55.0, 12.0, -153.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (28) (55.0, 12.0, -149.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (13) (53.0, 12.0, -149.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (11) (53.0, 12.0, -147.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (27) (55.0, 12.0, -147.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (29) (51.0, 12.0, -147.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (33) (55.0, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (876) (68.0, 12.0, -156.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (878) (69.0, 12.0, -155.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (877) (69.0, 12.0, -154.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (879) (70.0, 12.0, -155.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (880) (70.0, 12.0, -154.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (873) (67.0, 12.0, -156.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (875) (68.0, 12.0, -157.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (874) (67.0, 12.0, -157.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (184) (69.5, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (183) (71.5, 12.0, -155.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (182) (71.5, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (871) (74.0, 12.0, -155.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (185) (73.5, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (870) (73.0, 12.0, -155.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (869) (73.0, 12.0, -154.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (872) (74.0, 12.0, -154.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (195) (65.5, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (950) (75.0, 12.0, -156.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (951) (75.0, 12.0, -157.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (953) (76.0, 12.0, -156.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (952) (76.0, 12.0, -157.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (194) (73.5, 12.0, -150.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (954) (76.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (189) (75.5, 12.0, -148.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (193) (73.5, 12.0, -148.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (955) (76.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (867) (78.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (866) (77.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (861) (79.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (862) (79.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (868) (78.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (865) (77.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (964) (78.5, 12.0, -156.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (965) (78.5, 12.0, -157.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (967) (79.5, 12.0, -156.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (966) (79.5, 12.0, -157.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (960) (80.5, 12.0, -156.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (962) (81.5, 12.0, -157.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (956) (80.5, 12.0, -158.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (961) (80.5, 12.0, -157.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (963) (81.5, 12.0, -156.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (957) (80.5, 12.0, -159.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (959) (81.5, 12.0, -158.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (958) (81.5, 12.0, -159.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (930) (84.5, 12.0, -158.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (933) (85.5, 12.0, -158.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (913) (86.5, 12.0, -155.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (40) (87.0, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (39) (87.0, 12.0, -159.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (41) (89.0, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (914) (87.5, 12.0, -155.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (48) (89.0, 12.0, -155.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (915) (87.5, 12.0, -154.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (912) (86.5, 12.0, -154.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (42) (91.0, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (47) (91.0, 12.0, -155.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (940) (89.5, 12.0, -153.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (938) (88.5, 12.0, -152.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (939) (88.5, 12.0, -153.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (941) (89.5, 12.0, -152.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (943) (88.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (944) (89.5, 12.0, -151.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (945) (89.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (942) (88.5, 12.0, -150.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (948) (89.5, 12.0, -149.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (949) (89.5, 12.0, -148.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (947) (88.5, 12.0, -149.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (946) (88.5, 12.0, -148.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (934) (94.5, 12.0, -154.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (85) (93.0, 12.0, -155.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (43) (93.0, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (935) (94.5, 12.0, -155.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (936) (95.5, 12.0, -155.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (84) (95.0, 12.0, -157.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (937) (95.5, 12.0, -154.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (932) (85.5, 12.0, -159.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (928) (85.5, 12.0, -161.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (929) (85.5, 12.0, -160.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (916) (84.5, 12.0, -160.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (931) (84.5, 12.0, -159.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (38) (87.0, 12.0, -161.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (310) (86.5, 12.0, -162.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (917) (84.5, 12.0, -161.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (313) (87.5, 12.0, -162.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (311) (86.5, 12.0, -163.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (312) (87.5, 12.0, -163.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (980) (86.5, 12.0, -170.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (981) (86.5, 12.0, -171.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (982) (87.5, 12.0, -171.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (983) (87.5, 12.0, -170.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (968) (86.5, 12.0, -174.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (969) (86.5, 12.0, -175.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (979) (85.5, 12.0, -174.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (971) (87.5, 12.0, -174.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (970) (87.5, 12.0, -175.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (975) (87.5, 12.0, -176.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (978) (85.5, 12.0, -175.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (976) (84.5, 12.0, -174.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (977) (84.5, 12.0, -175.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (972) (86.5, 12.0, -176.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (973) (86.5, 12.0, -177.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (974) (87.5, 12.0, -177.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (619) (-3.0, 20.0, -126.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (621) (-4.0, 20.0, -126.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (626) (-5.0, 20.0, -126.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (623) (-5.0, 20.0, -127.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (624) (-6.0, 20.0, -126.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (622) (-3.0, 20.0, -127.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (620) (-4.0, 20.0, -127.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (452) (-3.0, 20.0, -128.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (451) (-3.0, 20.0, -129.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (625) (-6.0, 20.0, -127.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (627) (-14.0, 20.0, -126.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (630) (-14.0, 20.0, -127.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (629) (-15.0, 20.0, -126.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (628) (-15.0, 20.0, -127.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (423) (-9.0, 20.0, -116.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (449) (-8.0, 20.0, -118.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (415) (-8.0, 20.0, -116.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (446) (-8.0, 20.0, -117.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (448) (-7.0, 20.0, -117.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (447) (-7.0, 20.0, -118.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (425) (-10.0, 20.0, -116.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (417) (-7.0, 20.0, -116.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (411) (-7.0, 20.0, -115.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (413) (-8.0, 20.0, -115.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (424) (-9.0, 20.0, -115.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (422) (-10.0, 20.0, -115.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (840) (14.0, 20.0, -117.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (844) (16.0, 20.0, -118.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (841) (16.0, 20.0, -117.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (838) (15.0, 20.0, -117.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (839) (15.0, 20.0, -116.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (837) (14.0, 20.0, -116.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (843) (17.0, 20.0, -117.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (833) (14.0, 20.0, -114.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (836) (14.0, 20.0, -115.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (834) (15.0, 20.0, -115.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (835) (15.0, 20.0, -114.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (831) (19.5, 20.0, -128.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (830) (19.5, 20.0, -129.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (829) (18.5, 20.0, -128.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (832) (18.5, 20.0, -129.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (821) (20.5, 20.0, -128.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (828) (20.5, 20.0, -127.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (822) (21.5, 20.0, -129.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (826) (21.5, 20.0, -127.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (823) (21.5, 20.0, -128.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (824) (20.5, 20.0, -129.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (825) (20.5, 20.0, -126.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (827) (21.5, 20.0, -126.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (536) (8.0, 28.0, -94.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (508) (9.0, 28.0, -94.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (534) (7.0, 28.0, -94.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (506) (10.0, 28.0, -94.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (509) (10.0, 28.0, -93.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (507) (9.0, 28.0, -93.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (535) (8.0, 28.0, -93.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (537) (7.0, 28.0, -93.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (500) (12.0, 28.0, -95.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (503) (12.0, 28.0, -96.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (504) (12.0, 28.0, -97.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (498) (13.0, 28.0, -95.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (505) (13.0, 28.0, -96.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (502) (13.0, 28.0, -97.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (499) (12.0, 28.0, -94.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (501) (13.0, 28.0, -94.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (517) (7.0, 28.0, -99.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (515) (8.0, 28.0, -99.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (514) (7.0, 28.0, -100.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (516) (8.0, 28.0, -100.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (484) (12.0, 28.0, -102.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (483) (12.0, 28.0, -103.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (491) (11.0, 28.0, -104.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (485) (13.0, 28.0, -102.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (489) (12.0, 28.0, -104.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (482) (13.0, 28.0, -103.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (486) (12.0, 28.0, -105.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (488) (13.0, 28.0, -105.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (487) (13.0, 28.0, -104.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (492) (11.0, 28.0, -105.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (493) (10.0, 28.0, -104.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (490) (10.0, 28.0, -105.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (513) (9.0, 28.0, -106.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (511) (10.0, 28.0, -106.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (512) (10.0, 28.0, -107.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (510) (9.0, 28.0, -107.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (495) (8.0, 28.0, -104.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (496) (8.0, 28.0, -105.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (497) (7.0, 28.0, -104.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (494) (7.0, 28.0, -105.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (520) (-4.0, 28.0, -94.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (521) (-5.0, 28.0, -93.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (525) (-5.0, 28.0, -95.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (518) (-5.0, 28.0, -94.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (519) (-4.0, 28.0, -93.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (523) (-6.0, 28.0, -95.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (631) (-7.0, 28.0, -95.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (522) (-5.0, 28.0, -96.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (524) (-6.0, 28.0, -96.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (632) (-7.0, 28.0, -96.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (533) (-7.0, 28.0, -97.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (633) (-8.0, 28.5, -95.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (634) (-8.0, 28.0, -96.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (531) (-8.0, 28.0, -97.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (532) (-8.0, 28.0, -98.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (530) (-7.0, 28.0, -98.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (769) (-8.5, 28.0, -105.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (772) (-8.5, 28.0, -104.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (770) (-9.5, 28.0, -104.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (771) (-9.5, 28.0, -105.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (758) (-7.5, 28.0, -107.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (760) (-6.5, 28.0, -107.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (754) (-5.5, 28.0, -107.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (757) (-6.5, 28.0, -108.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (755) (-5.5, 28.0, -108.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (764) (-6.5, 28.0, -109.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (753) (-4.5, 28.0, -108.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (756) (-4.5, 28.0, -107.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (765) (-2.5, 28.0, -107.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (168) (-3.0, 28.0, -109.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (767) (-3.5, 28.0, -107.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (766) (-3.5, 28.0, -106.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (768) (-2.5, 28.0, -106.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (169) (-5.0, 28.0, -111.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (166) (-3.0, 28.0, -111.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (167) (-5.0, 28.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (116) (-3.0, 28.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (761) (-6.5, 28.0, -110.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (762) (-7.5, 28.0, -109.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (759) (-7.5, 28.0, -108.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (763) (-7.5, 28.0, -110.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (151) (-21.0, 28.0, -109.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (170) (-21.0, 28.0, -111.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (171) (-19.0, 28.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (149) (-23.0, 28.0, -107.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (24) (-25.0, 28.0, -109.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (138) (-25.0, 28.0, -111.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (148) (-25.0, 28.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (172) (-23.0, 28.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (25) (-25.0, 28.0, -107.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (150) (-21.0, 28.0, -107.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (26) (-19.0, 28.0, -107.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (23) (-19.0, 28.0, -105.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (9) (-19.0, 28.0, -103.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (471) (-16.0, 36.0, -87.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (472) (-16.0, 36.0, -86.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (470) (-17.0, 36.0, -86.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (473) (-17.0, 36.0, -87.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (468) (-17.0, 36.0, -88.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (466) (-16.0, 36.0, -88.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (474) (-15.0, 36.0, -88.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (467) (-17.0, 36.0, -89.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (469) (-16.0, 36.0, -89.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (477) (-15.0, 36.0, -89.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (475) (-14.0, 36.0, -89.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (476) (-14.0, 36.0, -88.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (459) (-4.0, 36.0, -75.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (460) (-4.0, 36.0, -74.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (458) (-3.0, 36.0, -74.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (461) (-3.0, 36.0, -75.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (457) (-4.0, 36.0, -73.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (455) (-3.0, 36.0, -73.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (456) (-3.0, 36.0, -72.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (454) (-4.0, 36.0, -72.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (463) (-9.0, 36.0, -70.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (465) (-8.0, 36.0, -70.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (462) (-8.0, 36.0, -69.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (464) (-9.0, 36.0, -69.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (567) (-7.0, 36.0, -68.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (617) (-7.0, 36.0, -67.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (618) (-6.0, 36.0, -68.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (565) (-6.0, 36.0, -67.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (792) (-14.5, 36.0, -63.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (789) (-14.5, 36.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (790) (-15.5, 36.0, -63.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (791) (-15.5, 36.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (180) (-13.0, 36.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (776) (-12.5, 36.0, -59.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (779) (-11.5, 36.0, -60.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (778) (-11.5, 36.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (777) (-10.5, 36.0, -60.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (780) (-10.5, 36.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (774) (-13.5, 36.0, -59.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (178) (-11.0, 36.0, -59.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (773) (-12.5, 36.0, -58.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (775) (-13.5, 36.0, -58.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (785) (-14.5, 36.0, -58.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (788) (-14.5, 36.0, -59.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (786) (-15.5, 36.0, -59.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (179) (-13.0, 36.0, -57.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (177) (-11.0, 36.0, -57.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (174) (-13.0, 36.0, -55.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (784) (-14.5, 36.0, -57.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (781) (-14.5, 36.0, -56.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (176) (-15.0, 36.0, -55.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (783) (-15.5, 36.0, -56.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (782) (-15.5, 36.0, -57.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (787) (-15.5, 36.0, -58.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (173) (-11.0, 36.0, -55.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (181) (-17.0, 36.0, -58.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (800) (-16.5, 36.0, -53.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (175) (-15.0, 36.0, -53.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (797) (-16.5, 36.0, -52.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (136) (-15.0, 36.0, -51.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (796) (-16.5, 36.0, -51.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (793) (-16.5, 36.0, -50.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (794) (-17.5, 36.0, -51.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (799) (-17.5, 36.0, -52.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (798) (-17.5, 36.0, -53.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (135) (-15.0, 36.0, -49.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (134) (-17.0, 36.0, -49.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (795) (-17.5, 36.0, -50.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (132) (-15.0, 36.0, -47.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (133) (-17.0, 36.0, -47.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (437) (11.0, 36.0, -72.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (434) (11.0, 36.0, -71.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (435) (10.0, 36.0, -72.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (433) (10.0, 36.0, -70.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (436) (10.0, 36.0, -71.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (432) (11.0, 36.0, -70.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (441) (9.0, 36.0, -72.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (438) (9.0, 36.0, -71.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (440) (8.0, 36.0, -71.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (439) (8.0, 36.0, -72.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (445) (8.0, 36.0, -74.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (442) (8.0, 36.0, -73.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (430) (10.0, 36.0, -69.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (431) (11.0, 36.0, -69.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (444) (7.0, 36.0, -73.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (443) (7.0, 36.0, -74.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (652) (28.0, 36.0, -110.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (647) (27.0, 36.0, -112.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (648) (26.0, 36.0, -112.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (654) (28.0, 36.0, -111.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (646) (28.0, 36.0, -112.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (645) (28.0, 36.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (649) (27.0, 36.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (653) (29.0, 36.0, -111.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (643) (29.0, 36.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (644) (29.0, 36.0, -112.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (651) (29.0, 36.0, -110.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (650) (26.0, 36.0, -113.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (845) (-4.5, 44.0, -68.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (847) (-3.5, 44.0, -68.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (846) (-4.5, 44.0, -69.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (848) (-3.5, 44.0, -69.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (850) (9.5, 44.0, -65.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (856) (7.5, 44.0, -66.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (853) (8.5, 44.0, -65.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (854) (8.5, 44.0, -66.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (859) (7.5, 44.0, -67.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (860) (7.5, 44.0, -68.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (857) (8.5, 44.0, -67.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (858) (8.5, 44.0, -68.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (849) (9.5, 44.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (851) (10.5, 44.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (852) (10.5, 44.0, -65.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (855) (7.5, 44.0, -65.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (410) (-6.0, 44.0, -64.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (416) (-6.0, 44.0, -65.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (421) (-4.0, 44.0, -63.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (407) (-6.0, 44.0, -63.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (420) (-5.0, 44.0, -63.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (403) (-6.0, 44.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (409) (-7.0, 44.0, -63.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (418) (-5.0, 44.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (412) (-7.0, 44.0, -64.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (405) (-7.0, 44.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (400) (-7.0, 44.0, -61.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (414) (-7.0, 44.0, -65.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (402) (-8.0, 44.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (399) (-8.0, 44.0, -61.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (406) (-8.0, 44.0, -63.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (401) (-6.0, 44.0, -61.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (404) (-9.0, 44.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (408) (-9.0, 44.0, -63.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (426) (-8.0, 44.0, -60.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (398) (-9.0, 44.0, -61.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (429) (-8.0, 44.0, -59.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (428) (-9.0, 44.0, -59.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (427) (-9.0, 44.0, -60.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (667) (-6.0, 44.0, -50.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (669) (-5.0, 44.0, -50.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (668) (-5.0, 44.0, -51.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (670) (-6.0, 44.0, -51.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (665) (-6.0, 44.0, -48.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (666) (-5.0, 44.0, -48.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (664) (-6.0, 44.0, -47.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (663) (-5.0, 44.0, -47.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (672) (8.0, 44.0, -48.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (674) (7.0, 44.0, -48.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (671) (7.0, 44.0, -47.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (677) (6.0, 44.0, -48.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (676) (6.0, 44.0, -49.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (675) (5.0, 44.0, -48.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (678) (5.0, 44.0, -49.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (673) (8.0, 44.0, -47.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (5) (12.0, 44.0, -6.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (4) (13.0, 44.0, -6.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (3) (12.0, 44.0, -5.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1) (13.0, 44.0, -5.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (6) (11.0, 44.0, -5.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (13.0, 44.0, -4.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (2) (12.0, 44.0, -4.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (7) (11.0, 44.0, -4.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (30) (10.0, 44.0, -4.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1137) (8.0, 46.0, -2.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1135) (9.0, 46.0, -2.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1138) (9.0, 46.0, -3.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1136) (8.0, 46.0, -1.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1134) (9.0, 46.0, -1.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1139) (-4.0, 46.0, -1.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1141) (-4.0, 46.0, -2.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1142) (-5.0, 46.0, -2.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1140) (-5.0, 46.0, -1.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (26) (-6.5, 44.0, -5.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (27) (-6.5, 44.0, -4.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (24) (-7.5, 44.0, -5.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (25) (-7.5, 44.0, -4.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (28) (-8.5, 44.0, -6.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (22) (-8.5, 44.0, -5.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (21) (-8.5, 44.0, -4.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (29) (-9.5, 44.0, -6.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (18) (-8.5, 44.0, -10.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (11) (-8.5, 44.0, -12.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (13) (-8.5, 44.0, -11.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (19) (-9.5, 44.0, -10.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (12) (-9.5, 44.0, -11.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (15) (-7.5, 44.0, -12.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (9) (-9.5, 44.0, -12.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (8) (-9.5, 44.0, -13.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (10) (-8.5, 44.0, -13.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (16) (-6.5, 44.0, -12.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (17) (-6.5, 44.0, -13.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (14) (-7.5, 44.0, -13.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (698) (-32.0, 38.0, -49.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (699) (-31.0, 38.0, -49.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (697) (-32.0, 38.0, -50.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (700) (-31.0, 38.0, -50.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (696) (-32.5, 38.0, -46.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (693) (-33.5, 38.5, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (695) (-33.5, 38.0, -46.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (694) (-33.5, 38.5, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (691) (-34.5, 38.0, -46.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (692) (-34.5, 38.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (560) (-32.0, 40.0, -33.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (554) (-31.0, 40.0, -34.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (553) (-31.0, 40.0, -33.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (555) (-30.0, 40.0, -34.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (557) (-31.0, 40.0, -35.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (550) (-31.0, 40.0, -32.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (552) (-30.0, 40.0, -33.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (551) (-30.0, 40.0, -32.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (559) (-32.0, 40.0, -32.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (558) (-33.0, 40.0, -32.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (561) (-33.0, 40.0, -33.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (139) (-31.0, 40.0, -28.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (145) (-33.0, 40.0, -30.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (143) (-33.0, 40.0, -28.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (556) (-30.0, 40.0, -35.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (137) (-39.0, 40.0, -28.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (93) (-41.0, 40.0, -28.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (94) (-39.0, 40.0, -33.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (479) (-38.5, 40.0, -34.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (480) (-38.5, 40.0, -35.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (478) (-39.5, 40.0, -34.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (190) (-37.0, 40.0, -33.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (481) (-39.5, 40.0, -35.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (-41.0, 40.0, -37.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (6) (-39.0, 40.0, -37.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (1) (-41.0, 40.0, -39.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (4) (-39.0, 40.0, -39.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (2) (-41.0, 40.0, -41.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (7) (-39.0, 40.0, -41.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (128) (-39.5, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (130) (-39.5, 40.0, -42.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (5) (-41.0, 40.0, -43.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (545) (-37.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (538) (-37.5, 40.0, -42.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (131) (-38.5, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (126) (-38.5, 40.0, -42.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (544) (-36.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (542) (-37.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (543) (-36.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (541) (-37.5, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (540) (-36.5, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (539) (-36.5, 40.0, -42.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (546) (-35.5, 40.0, -42.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (548) (-34.5, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (549) (-35.5, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (547) (-34.5, 40.0, -42.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (191) (-38.0, 40.0, -45.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (689) (-40.0, 40.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (687) (-41.0, 40.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (690) (-40.0, 40.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (688) (-41.0, 40.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (117) (-42.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (114) (-42.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (98) (-43.0, 40.0, -39.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (116) (-43.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (115) (-43.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (121) (-44.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (113) (-44.5, 40.0, -39.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (118) (-44.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (192) (-43.0, 40.0, -43.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (110) (-44.5, 40.0, -38.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (95) (-43.0, 40.0, -37.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (96) (-45.0, 40.0, -37.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (112) (-45.5, 40.0, -38.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (111) (-45.5, 40.0, -39.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (124) (-46.5, 40.0, -38.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (97) (-47.0, 40.0, -37.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (122) (-47.5, 40.0, -38.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (123) (-46.5, 40.0, -39.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (125) (-47.5, 40.0, -39.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (134) (-46.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (120) (-45.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (119) (-45.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (108) (-48.5, 40.0, -37.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (109) (-49.5, 40.0, -37.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (136) (-47.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (135) (-47.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (137) (-46.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (196) (-47.3, 40.0, -43.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (133) (-49.0, 40.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (686) (-50.0, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (685) (-51.0, 40.0, -42.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (684) (-52.0, 40.0, -42.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (683) (-52.0, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (682) (-51.0, 40.0, -43.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (680) (-52.0, 40.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (127) (-50.0, 40.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (129) (-51.0, 40.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (450) (-51.0, 40.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (681) (-52.0, 40.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (453) (-50.0, 40.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (679) (-49.0, 40.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (115) (-53.5, 40.0, -43.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (8) (-51.0, 40.0, -39.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (99) (-51.0, 40.0, -37.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (106) (-49.5, 40.0, -36.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (3) (-53.0, 40.0, -37.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (107) (-48.5, 40.0, -36.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (138) (-71.5, 40.0, -38.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (141) (-71.5, 40.0, -39.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (140) (-72.5, 40.0, -38.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (139) (-72.5, 40.0, -39.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (102) (-72.0, 40.0, -41.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (105) (-72.0, 40.0, -43.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (104) (-74.0, 40.0, -41.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (101) (-74.0, 40.0, -39.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (153) (-76.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (145) (-75.5, 40.0, -39.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (152) (-75.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (151) (-75.5, 40.0, -41.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (143) (-76.5, 40.0, -39.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (150) (-76.5, 40.0, -40.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (103) (-74.0, 40.0, -43.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (144) (-76.5, 40.0, -38.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (142) (-75.5, 40.0, -38.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (100) (-76.0, 40.0, -37.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (147) (-77.5, 40.0, -37.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (148) (-77.5, 40.0, -36.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (149) (-78.5, 40.0, -37.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (146) (-78.5, 40.0, -36.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (156) (-82.5, 40.0, -36.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (155) (-82.5, 40.0, -37.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (154) (-83.5, 40.0, -36.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (157) (-83.5, 40.0, -37.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (907) (-48.5, 43.0, 20.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (908) (-48.5, 43.0, 21.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (905) (-49.5, 43.0, 21.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (906) (-49.5, 43.0, 20.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (911) (-53.8, 43.0, 20.3)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (909) (-53.8, 43.0, 21.3)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (910) (-54.8, 43.0, 21.3)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (819) (-52.0, 28.0, -52.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (817) (-51.0, 28.0, -52.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (818) (-52.0, 28.0, -53.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (820) (-51.0, 28.0, -53.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (813) (-46.5, 28.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (816) (-46.5, 28.0, -62.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (814) (-47.5, 28.0, -62.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (815) (-47.5, 28.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (807) (-44.0, 28.0, -62.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (803) (-45.0, 28.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (806) (-44.0, 28.0, -63.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (801) (-44.0, 28.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (805) (-43.0, 28.0, -62.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (808) (-43.0, 28.0, -63.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (811) (-42.0, 28.0, -63.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (809) (-41.0, 28.0, -63.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (810) (-42.0, 28.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (812) (-41.0, 28.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (804) (-44.0, 28.0, -65.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (802) (-45.0, 28.0, -65.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (529) (-35.0, 28.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (527) (-34.0, 28.0, -61.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (528) (-34.0, 28.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (526) (-35.0, 28.0, -61.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (641) (-32.0, 28.0, -65.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (642) (-32.0, 28.0, -66.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (640) (-31.0, 28.0, -65.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (636) (-30.0, 28.0, -65.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (639) (-31.0, 28.0, -66.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (637) (-29.0, 28.0, -66.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (635) (-29.0, 28.0, -65.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (638) (-30.0, 28.0, -66.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (744) (-32.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (741) (-32.5, 28.0, -86.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (158) (-32.0, 28.0, -84.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (742) (-31.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (743) (-31.5, 28.0, -86.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (748) (-29.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (745) (-30.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (746) (-30.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (163) (-30.0, 28.0, -88.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (162) (-30.0, 28.0, -86.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (747) (-29.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (750) (-30.5, 28.0, -90.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (749) (-30.5, 28.0, -89.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (751) (-29.5, 28.0, -89.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (752) (-29.5, 28.0, -90.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (165) (-57.5, 28.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (162) (-57.5, 28.0, -63.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (164) (-58.5, 28.0, -63.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (163) (-58.5, 28.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (176) (-59.5, 28.0, -65.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (173) (-59.5, 28.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (170) (-59.5, 28.0, -63.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (159) (-59.5, 28.0, -62.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (172) (-60.5, 28.0, -63.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (174) (-60.5, 28.0, -65.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (171) (-60.5, 28.0, -64.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (175) (-59.5, 28.0, -66.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (177) (-60.5, 28.0, -66.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (112) (-56.0, 28.0, -64.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (110) (-58.0, 28.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (111) (-56.0, 28.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (160) (-59.5, 28.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (169) (-59.5, 28.0, -60.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (108) (-58.0, 28.0, -60.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (158) (-60.5, 28.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (161) (-60.5, 28.0, -62.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (109) (-56.0, 28.0, -60.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (107) (-58.0, 28.0, -58.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (166) (-59.5, 28.0, -59.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (168) (-60.5, 28.0, -59.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (167) (-60.5, 28.0, -60.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (180) (-61.5, 28.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (178) (-62.5, 28.0, -61.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (179) (-61.5, 28.0, -62.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (181) (-62.5, 28.0, -62.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (713) (-62.5, 28.0, -74.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (714) (-62.5, 28.0, -75.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (715) (-63.5, 28.0, -74.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (716) (-63.5, 28.0, -75.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (711) (-66.0, 28.0, -76.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (710) (-66.0, 28.0, -77.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (712) (-67.0, 28.0, -76.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (709) (-67.0, 28.0, -77.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (160) (-61.5, 28.0, -81.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (157) (-59.5, 28.0, -81.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (156) (-59.5, 28.0, -79.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (154) (-57.5, 28.0, -79.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (159) (-61.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (155) (-59.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (152) (-57.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (153) (-57.5, 28.0, -81.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (727) (-63.0, 28.0, -83.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (725) (-64.0, 28.0, -83.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (728) (-64.0, 28.0, -84.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (726) (-63.0, 28.0, -84.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (722) (-63.0, 28.0, -86.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (723) (-63.0, 28.0, -85.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (721) (-64.0, 28.0, -85.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (717) (-62.0, 28.0, -85.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (720) (-62.0, 28.0, -86.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (719) (-61.0, 28.0, -85.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (724) (-64.0, 28.0, -86.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (718) (-61.0, 28.0, -86.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (234) (-69.5, 28.0, -96.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (236) (-68.5, 28.0, -96.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (237) (-69.5, 28.0, -97.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (230) (-69.5, 28.0, -98.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (240) (-67.5, 28.0, -98.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (232) (-68.5, 28.0, -98.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (235) (-68.5, 28.0, -97.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (233) (-69.5, 28.0, -99.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (231) (-68.5, 28.0, -99.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (239) (-67.5, 28.0, -99.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (241) (-66.5, 28.0, -99.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (238) (-66.5, 28.0, -98.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (739) (-71.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (737) (-72.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (734) (-73.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (735) (-73.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (733) (-74.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (736) (-74.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (740) (-72.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (738) (-71.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (731) (-74.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (729) (-75.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (732) (-75.5, 28.0, -86.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (730) (-74.5, 28.0, -86.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (227) (-83.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (229) (-84.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (228) (-83.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (226) (-84.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (222) (-85.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (119) (-86.0, 28.0, -82.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (122) (-86.0, 28.0, -84.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (224) (-86.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (211) (-87.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (208) (-87.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (210) (-88.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (209) (-88.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (223) (-86.5, 28.0, -86.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (161) (-88.0, 28.0, -86.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (225) (-85.5, 28.0, -86.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (217) (-89.5, 28.0, -86.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (186) (-88.0, 28.0, -88.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (165) (-88.0, 28.0, -88.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (164) (-86.0, 28.0, -88.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (203) (-89.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (218) (-89.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (214) (-89.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (216) (-90.5, 28.0, -85.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (215) (-90.5, 28.0, -84.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (202) (-90.5, 28.0, -83.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (219) (-90.5, 28.0, -86.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (207) (-89.5, 28.0, -82.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (198) (-89.5, 28.0, -81.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (123) (-88.0, 28.0, -82.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (213) (-89.5, 28.0, -80.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (199) (-90.5, 28.0, -82.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (121) (-88.0, 28.0, -80.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (200) (-89.5, 28.0, -79.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (212) (-90.5, 28.0, -79.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (201) (-90.5, 28.0, -80.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (206) (-90.5, 28.0, -81.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (220) (-91.5, 28.0, -81.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (205) (-91.5, 28.0, -82.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (221) (-92.5, 28.0, -82.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (204) (-92.5, 28.0, -81.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (120) (-86.0, 28.0, -80.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (118) (-88.0, 28.0, -78.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (703) (-78.0, 28.0, -75.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (704) (-78.0, 28.0, -76.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (705) (-77.0, 28.0, -74.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (702) (-77.0, 28.0, -75.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (701) (-77.0, 28.0, -76.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (706) (-76.0, 28.0, -74.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (708) (-77.0, 28.0, -73.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (707) (-76.0, 28.0, -73.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (117) (-57.0, 28.0, -47.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (114) (-55.0, 28.0, -45.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Bush (113) (-57.0, 28.0, -45.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (183) (-58.5, 28.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (184) (-58.5, 28.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (185) (-59.5, 28.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (197) (-60.5, 28.0, -46.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (196) (-61.5, 28.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (195) (-61.5, 28.0, -46.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (194) (-60.5, 28.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (190) (-62.5, 28.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (193) (-62.5, 28.0, -46.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (191) (-63.5, 28.0, -46.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (182) (-59.5, 28.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (192) (-63.5, 28.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (189) (-64.5, 28.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (186) (-64.5, 28.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (187) (-65.5, 28.0, -45.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (188) (-65.5, 28.0, -44.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (-132.0, 28.0, -52.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (3) (-132.0, 28.0, -53.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1) (-133.0, 28.0, -52.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (2) (-131.0, 28.0, -52.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (5) (-120.5, 28.0, -52.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (4) (-119.5, 28.0, -52.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (7) (-119.5, 28.0, -51.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (8) (-117.5, 28.0, -55.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (6) (-116.5, 28.0, -55.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (9) (-116.5, 28.0, -54.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1083) (-86.5, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1082) (-85.5, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1084) (-85.5, 12.0, -130.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1085) (-86.5, 12.0, -130.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1087) (-87.5, 12.0, -130.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1089) (-88.5, 12.0, -130.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1086) (-87.5, 12.0, -129.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1088) (-88.5, 12.0, -129.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1080) (-89.0, 12.0, -143.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1081) (-90.0, 12.0, -143.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1078) (-89.0, 12.0, -144.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1075) (-88.0, 12.0, -144.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1079) (-90.0, 12.0, -144.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1074) (-87.0, 12.0, -144.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1077) (-88.0, 12.0, -145.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1076) (-87.0, 12.0, -145.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1070) (-78.0, 12.0, -142.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1072) (-77.0, 12.0, -143.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1071) (-77.0, 12.0, -142.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1073) (-78.0, 12.0, -143.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (294) (-64.0, 12.0, -144.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (292) (-64.0, 12.0, -145.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (290) (-64.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (74) (-65.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (293) (-63.0, 12.0, -144.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (132) (-63.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (291) (-63.0, 12.0, -145.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (77) (-64.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (76) (-63.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (73) (-65.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (75) (-66.0, 12.0, -143.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (70) (-66.0, 12.0, -142.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1093) (-55.0, 12.0, -136.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1092) (-54.0, 12.0, -136.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1090) (-55.0, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1091) (-54.0, 12.0, -135.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1056) (-68.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1054) (-69.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1050) (-67.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1057) (-68.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1052) (-66.0, 12.0, -134.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1053) (-66.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1051) (-67.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1060) (-68.0, 12.5, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1055) (-69.0, 12.0, -133.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1058) (-69.0, 12.5, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1062) (-70.0, 12.5, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1061) (-68.0, 12.5, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1059) (-69.0, 12.5, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1063) (-70.0, 12.5, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1065) (-71.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1064) (-71.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1047) (-72.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1068) (-72.0, 13.0, -129.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1067) (-72.0, 12.5, -130.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1048) (-72.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1066) (-73.0, 12.5, -130.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1069) (-73.0, 12.5, -129.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1046) (-73.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1044) (-74.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1043) (-74.0, 12.0, -130.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1049) (-73.0, 12.0, -132.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1045) (-75.0, 12.0, -131.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (1042) (-75.0, 12.0, -130.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (842) (17.0, 20.0, -118.5)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Grass (419) (-4.0, 44.0, -62.0)": TunicLocationData("Overworld", "Overworld"),
+    "Overworld - Overworld Swamp Lower Entry Grass (1103) (80.5, 2.7, -175.6)": TunicLocationData(
+        "Overworld Swamp Lower Entry", "Overworld Swamp Lower Entry"),
+    "Overworld - Overworld Swamp Lower Entry Grass (1102) (80.5, 2.7, -174.6)": TunicLocationData(
+        "Overworld Swamp Lower Entry", "Overworld Swamp Lower Entry"),
+    "Overworld - Overworld Swamp Lower Entry Grass (1100) (79.5, 2.1, -174.6)": TunicLocationData(
+        "Overworld Swamp Lower Entry", "Overworld Swamp Lower Entry"),
+    "Overworld - Overworld Swamp Lower Entry Grass (1101) (79.5, 2.1, -175.6)": TunicLocationData(
+        "Overworld Swamp Lower Entry", "Overworld Swamp Lower Entry"),
+    "Overworld - Overworld Swamp Lower Entry Grass (1096) (78.4, 2.2, -171.6)": TunicLocationData(
+        "Overworld Swamp Lower Entry", "Overworld Swamp Lower Entry"),
+    "Overworld - Overworld Swamp Lower Entry Grass (1097) (77.5, 2.0, -171.6)": TunicLocationData(
+        "Overworld Swamp Lower Entry", "Overworld Swamp Lower Entry"),
+    "Overworld - Overworld Swamp Lower Entry Grass (1099) (77.4, 2.2, -170.6)": TunicLocationData(
+        "Overworld Swamp Lower Entry", "Overworld Swamp Lower Entry"),
+    "Overworld - Overworld Swamp Lower Entry Grass (1098) (78.5, 2.6, -170.6)": TunicLocationData(
+        "Overworld Swamp Lower Entry", "Overworld Swamp Lower Entry"),
+    "Overworld - After Ruined Passage Grass (327) (53.0, 20.0, -144.0)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (296) (52.0, 20.0, -144.0)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (297) (51.0, 20.0, -144.0)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (326) (54.0, 20.0, -144.0)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (295) (52.0, 20.0, -145.0)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (265) (51.0, 20.0, -145.0)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (325) (53.0, 20.0, -145.0)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (298) (54.0, 20.0, -145.0)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (661) (47.5, 20.0, -142.5)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (328) (47.5, 20.0, -141.5)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (662) (46.5, 20.0, -142.5)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - After Ruined Passage Grass (660) (46.5, 20.0, -141.5)": TunicLocationData("After Ruined Passage",
+                                                                                           "After Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (31) (66.0, 28.0, -120.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (29) (67.0, 28.0, -120.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (28) (67.0, 28.0, -119.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (26) (67.0, 28.0, -118.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (30) (66.0, 28.0, -119.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (21) (67.0, 28.0, -116.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (27) (67.0, 28.0, -117.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (25) (66.0, 28.0, -117.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (24) (66.0, 28.0, -118.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (20) (67.0, 28.0, -115.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (23) (66.0, 28.0, -116.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (22) (66.0, 28.0, -115.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (12) (56.0, 28.0, -126.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (10) (56.0, 28.0, -128.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (13) (56.0, 28.0, -127.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (14) (55.0, 28.0, -126.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (15) (55.0, 28.0, -127.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (5) (55.0, 28.0, -128.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (11) (57.0, 28.0, -128.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (9) (57.0, 28.0, -129.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (8) (56.0, 28.0, -129.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (18) (54.0, 28.0, -127.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (4) (54.0, 28.0, -128.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (6) (54.0, 28.0, -129.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (17) (53.0, 28.0, -126.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (16) (53.0, 28.0, -127.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (3) (53.0, 28.0, -128.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (2) (53.0, 28.0, -129.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (1) (52.0, 28.0, -128.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (52.0, 28.0, -129.0)": TunicLocationData("Above Ruined Passage",
+                                                                                     "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (7) (55.0, 28.0, -129.0)": TunicLocationData("Above Ruined Passage",
+                                                                                         "Above Ruined Passage"),
+    "Overworld - Above Ruined Passage Grass (19) (54.0, 28.0, -126.0)": TunicLocationData("Above Ruined Passage",
+                                                                                          "Above Ruined Passage"),
+    "Overworld - East Overworld Grass (1118) (98.5, 36.0, -136.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1119) (98.5, 36.0, -137.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1116) (99.5, 36.0, -136.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1115) (98.5, 36.0, -139.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1114) (98.5, 36.0, -138.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1112) (99.5, 36.0, -138.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1117) (99.5, 36.0, -137.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1113) (99.5, 36.0, -139.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1109) (95.0, 36.0, -127.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1104) (95.0, 36.0, -128.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1108) (95.0, 36.0, -126.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1111) (94.0, 36.0, -127.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1110) (94.0, 36.0, -126.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1106) (94.0, 36.0, -128.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1107) (94.0, 36.0, -129.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1105) (95.0, 36.0, -129.0)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (331) (86.0, 36.0, -128.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (329) (85.0, 36.0, -128.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (655) (85.0, 36.0, -129.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (657) (84.0, 36.0, -129.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (658) (84.0, 36.0, -128.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (330) (86.0, 36.0, -129.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (656) (83.0, 36.0, -128.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (659) (83.0, 36.0, -129.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1120) (86.0, 36.0, -123.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1124) (86.0, 36.0, -122.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1126) (83.0, 36.0, -120.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1127) (82.0, 36.0, -120.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (309) (81.5, 36.0, -118.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (308) (81.5, 36.0, -119.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (307) (80.5, 36.0, -118.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (324) (80.5, 36.0, -119.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (305) (79.5, 36.0, -118.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (304) (79.5, 36.0, -119.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (300) (79.5, 36.0, -121.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (301) (79.5, 36.0, -120.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1128) (82.0, 36.0, -121.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (303) (78.5, 36.0, -118.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (306) (78.5, 36.0, -119.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (299) (78.5, 36.0, -120.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1122) (77.5, 36.0, -120.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1123) (77.5, 36.0, -121.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1121) (76.5, 36.0, -121.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (302) (78.5, 36.0, -121.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Bush (18) (82.5, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (20) (82.5, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (92) (84.5, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (19) (82.5, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (78) (79.0, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (83) (80.0, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (85) (80.0, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (84) (81.0, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (80) (79.0, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (87) (82.0, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (82) (81.0, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (86) (83.0, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (89) (82.0, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (88) (83.0, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (81) (78.0, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (52) (76.0, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (50) (76.0, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (53) (75.0, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (79) (78.0, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (51) (75.0, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (57) (78.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (21) (80.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (56) (76.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (54) (76.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (55) (75.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (57) (75.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (103) (90.0, 44.0, -113.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (105) (90.0, 44.0, -112.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (102) (91.0, 44.0, -112.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (104) (91.0, 44.0, -113.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Bush (44) (93.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (45) (95.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (1150) (94.5, 44.0, -111.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1149) (95.5, 44.0, -111.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1151) (94.5, 44.0, -110.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Bush (50) (97.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (56) (97.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (1148) (95.5, 44.0, -110.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (96) (94.5, 44.0, -109.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (95) (93.5, 44.0, -109.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (101) (95.5, 44.0, -109.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (94) (94.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (97) (93.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (99) (95.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (46) (95.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (22) (93.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (90) (91.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (55) (97.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (49) (97.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (92) (91.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (91) (90.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (93) (90.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (46) (71.0, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (15) (72.5, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (48) (71.0, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (61) (70.5, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (10) (70.5, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (49) (70.0, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (62) (69.0, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (63) (68.5, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (65) (68.0, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (58) (67.0, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (45) (68.0, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (43) (68.0, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (44) (69.0, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (42) (69.0, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (47) (70.0, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (64) (69.0, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (63) (68.0, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (60) (67.0, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (59) (66.0, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (61) (66.0, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (60) (66.5, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (83) (64.5, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (62) (66.5, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (80) (66.5, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (58) (58.0, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (30) (56.5, 44.0, -109.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (59) (58.0, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (34) (56.5, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (36) (56.5, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (14) (58.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (32) (56.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (64) (56.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (37) (55.5, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (31) (55.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (33) (55.5, 44.0, -109.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (35) (55.5, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (38) (54.5, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (40) (54.5, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (41) (53.5, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (81) (54.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (39) (53.5, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (26) (52.5, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (65) (54.0, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (28) (52.5, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (16) (52.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (14) (52.5, 44.0, -109.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (17) (51.5, 44.0, -109.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (27) (51.5, 44.0, -110.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (29) (51.5, 44.0, -111.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (12) (58.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (66) (54.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (11) (52.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (12) (51.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (15) (51.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (24) (50.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (18) (50.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (22) (50.5, 44.0, -109.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (25) (49.5, 44.0, -109.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (21) (49.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (23) (49.5, 44.0, -108.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (13) (51.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (10) (52.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (20) (50.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (19) (49.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (69) (48.0, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (68) (48.0, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (67) (48.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (72) (46.0, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (70) (46.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (71) (46.0, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (76) (44.0, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (73) (44.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (66) (46.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (69) (45.5, 44.0, -107.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (67) (45.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (82) (44.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (68) (46.5, 44.0, -106.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (79) (42.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (78) (42.0, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (74) (40.0, 44.0, -109.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (77) (42.0, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (75) (42.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (88) (40.0, 44.0, -107.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (1006) (33.5, 44.0, -109.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1008) (33.5, 44.0, -108.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Bush (89) (33.0, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (72) (34.5, 44.0, -112.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Bush (90) (33.0, 44.0, -113.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (984) (35.5, 44.0, -112.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (985) (34.5, 44.0, -113.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (71) (35.5, 44.0, -113.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (1009) (32.5, 44.0, -109.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1007) (32.5, 44.0, -108.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (986) (31.5, 44.0, -109.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Bush (91) (31.0, 44.0, -111.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (989) (30.5, 44.0, -109.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (987) (30.5, 44.0, -108.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (988) (31.5, 44.0, -108.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1000) (31.5, 44.0, -106.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (998) (31.5, 44.0, -107.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1001) (30.5, 44.0, -107.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (999) (30.5, 44.0, -106.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1005) (30.5, 44.0, -105.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1002) (31.5, 44.0, -105.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1004) (31.5, 44.0, -104.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (1003) (30.5, 44.0, -104.5)": TunicLocationData("East Overworld",
+                                                                                      "East Overworld"),
+    "Overworld - East Overworld Grass (993) (36.5, 44.0, -105.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (990) (37.5, 44.0, -105.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (991) (36.5, 44.0, -104.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (992) (37.5, 44.0, -104.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (994) (37.5, 44.0, -103.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (996) (37.5, 44.0, -102.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (997) (36.5, 44.0, -103.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (995) (36.5, 44.0, -102.5)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (881) (27.8, 44.0, -74.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (864) (28.8, 44.0, -75.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (863) (28.8, 44.0, -74.0)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (1012) (23.5, 44.0, -98.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1011) (22.5, 44.0, -98.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1013) (22.5, 44.0, -99.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (1010) (23.5, 44.0, -99.0)": TunicLocationData("East Overworld",
+                                                                                     "East Overworld"),
+    "Overworld - East Overworld Grass (319) (36.5, 44.0, -40.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (318) (35.5, 44.0, -40.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (315) (35.5, 44.0, -41.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (316) (34.5, 44.0, -41.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (882) (65.3, 44.0, -15.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (317) (65.3, 44.0, -14.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - East Overworld Grass (883) (64.3, 44.0, -14.5)": TunicLocationData("East Overworld", "East Overworld"),
+    "Overworld - Upper Overworld Grass (904) (30.3, 66.0, 26.5)": TunicLocationData("Upper Overworld",
+                                                                                    "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (901) (29.3, 66.0, 27.3)": TunicLocationData("Upper Overworld",
+                                                                                    "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (903) (29.3, 66.0, 26.5)": TunicLocationData("Upper Overworld",
+                                                                                    "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (902) (28.3, 66.0, 27.3)": TunicLocationData("Upper Overworld",
+                                                                                    "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (898) (17.5, 66.0, 25.3)": TunicLocationData("Upper Overworld",
+                                                                                    "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (899) (17.5, 66.0, 26.3)": TunicLocationData("Upper Overworld",
+                                                                                    "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (900) (16.5, 66.0, 26.3)": TunicLocationData("Upper Overworld",
+                                                                                    "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (897) (16.5, 66.0, 25.3)": TunicLocationData("Upper Overworld",
+                                                                                    "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (927) (-30.8, 66.0, 34.3)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (924) (-30.8, 66.0, 35.3)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (925) (-31.8, 66.0, 34.3)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (926) (-31.8, 66.0, 35.3)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (922) (-40.3, 66.0, 33.5)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (919) (-40.3, 66.0, 34.5)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (923) (-41.3, 66.0, 33.5)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (918) (-40.3, 66.0, 35.5)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (921) (-41.3, 66.0, 35.5)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Upper Overworld Grass (920) (-41.3, 66.0, 34.5)": TunicLocationData("Upper Overworld",
+                                                                                     "Upper Overworld"),
+    "Overworld - Overworld at Patrol Cave Grass (1094) (65.0, 44.0, 17.5)": TunicLocationData(
+        "Overworld at Patrol Cave", "Overworld at Patrol Cave"),
+    "Overworld - Overworld at Patrol Cave Grass (885) (65.0, 44.0, 18.5)": TunicLocationData("Overworld at Patrol Cave",
+                                                                                             "Overworld at Patrol Cave"),
+    "Overworld - Overworld at Patrol Cave Grass (314) (66.0, 44.0, 19.5)": TunicLocationData("Overworld at Patrol Cave",
+                                                                                             "Overworld at Patrol Cave"),
+    "Overworld - Overworld at Patrol Cave Grass (1095) (66.0, 44.0, 18.5)": TunicLocationData(
+        "Overworld at Patrol Cave", "Overworld at Patrol Cave"),
+    "Overworld - Overworld at Patrol Cave Grass (884) (65.0, 44.0, 19.5)": TunicLocationData("Overworld at Patrol Cave",
+                                                                                             "Overworld at Patrol Cave"),
+    "Overworld - Overworld at Patrol Cave Grass (888) (57.0, 44.0, 18.3)": TunicLocationData("Overworld at Patrol Cave",
+                                                                                             "Overworld at Patrol Cave"),
+    "Overworld - Overworld at Patrol Cave Grass (887) (57.0, 44.0, 19.3)": TunicLocationData("Overworld at Patrol Cave",
+                                                                                             "Overworld at Patrol Cave"),
+    "Overworld - Overworld at Patrol Cave Grass (893) (56.0, 44.0, 19.3)": TunicLocationData("Overworld at Patrol Cave",
+                                                                                             "Overworld at Patrol Cave"),
+    "Overworld - Overworld at Patrol Cave Grass (892) (56.0, 44.0, 18.3)": TunicLocationData("Overworld at Patrol Cave",
+                                                                                             "Overworld at Patrol Cave"),
+    "Overworld - Overworld above Patrol Cave Grass (895) (44.0, 55.0, 23.5)": TunicLocationData(
+        "Overworld above Patrol Cave", "Overworld above Patrol Cave"),
+    "Overworld - Overworld above Patrol Cave Grass (896) (43.0, 55.0, 23.5)": TunicLocationData(
+        "Overworld above Patrol Cave", "Overworld above Patrol Cave"),
+    "Overworld - Overworld above Patrol Cave Grass (886) (37.3, 55.0, 23.5)": TunicLocationData(
+        "Overworld above Patrol Cave", "Overworld above Patrol Cave"),
+    "Overworld - Overworld above Patrol Cave Grass (889) (37.3, 55.0, 22.5)": TunicLocationData(
+        "Overworld above Patrol Cave", "Overworld above Patrol Cave"),
+    "Overworld - Overworld above Patrol Cave Grass (891) (36.3, 55.0, 23.5)": TunicLocationData(
+        "Overworld above Patrol Cave", "Overworld above Patrol Cave"),
+    "Overworld - Overworld above Patrol Cave Grass (890) (36.3, 55.0, 22.5)": TunicLocationData(
+        "Overworld above Patrol Cave", "Overworld above Patrol Cave"),
+    "Overworld - Overworld above Patrol Cave Grass (894) (35.3, 55.0, 23.5)": TunicLocationData(
+        "Overworld above Patrol Cave", "Overworld above Patrol Cave"),
+    "Overworld - Overworld to West Garden from Furnace Grass (1145) (-182.5, 4.0, -45.5)": TunicLocationData(
+        "West Garden", "Overworld to West Garden from Furnace"),
+    "Overworld - Overworld to West Garden from Furnace Grass (1143) (-181.5, 4.0, -44.5)": TunicLocationData(
+        "West Garden", "Overworld to West Garden from Furnace"),
+    "Overworld - Overworld to West Garden from Furnace Grass (1144) (-182.5, 4.0, -44.5)": TunicLocationData(
+        "West Garden", "Overworld to West Garden from Furnace"),
+    "Overworld - Overworld to West Garden from Furnace Grass (1146) (-183.5, 4.0, -45.5)": TunicLocationData(
+        "West Garden", "Overworld to West Garden from Furnace"),
+    "Overworld - Overworld to West Garden from Furnace Grass (1147) (-183.5, 4.0, -44.5)": TunicLocationData(
+        "West Garden", "Overworld to West Garden from Furnace"),
+    "Overworld - Overworld Beach Grass (1032) (-118.5, 3.5, -144.0)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1031) (-118.5, 3.5, -143.0)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1036) (-118.5, 3.5, -142.0)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1033) (-119.5, 3.5, -144.0)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1037) (-119.5, 3.5, -142.0)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1034) (-119.5, 3.5, -141.0)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1030) (-119.5, 3.5, -143.0)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1035) (-118.5, 3.5, -141.0)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1023) (-118.5, 3.5, -136.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1024) (-118.5, 3.5, -137.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1025) (-119.5, 3.5, -137.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1027) (-118.5, 3.5, -134.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1028) (-118.5, 3.5, -135.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1022) (-119.5, 3.5, -136.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1029) (-119.5, 3.5, -135.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1026) (-119.5, 3.5, -134.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1016) (-120.5, 3.5, -135.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1017) (-121.5, 3.5, -135.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1040) (-118.5, 3.5, -131.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1041) (-119.5, 3.5, -131.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1015) (-120.5, 3.5, -134.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1038) (-119.5, 3.5, -130.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1020) (-120.5, 3.5, -133.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1019) (-120.5, 3.5, -132.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1018) (-121.5, 3.5, -132.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1021) (-121.5, 3.5, -133.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1014) (-121.5, 3.5, -134.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1039) (-118.5, 3.5, -130.5)": TunicLocationData("Overworld Beach",
+                                                                                        "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1131) (-167.0, 1.0, -88.5)": TunicLocationData("Overworld Beach",
+                                                                                       "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1125) (-166.0, 1.0, -87.5)": TunicLocationData("Overworld Beach",
+                                                                                       "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1130) (-167.0, 1.0, -87.5)": TunicLocationData("Overworld Beach",
+                                                                                       "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1129) (-166.0, 1.0, -86.5)": TunicLocationData("Overworld Beach",
+                                                                                       "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1132) (-168.0, 1.0, -88.5)": TunicLocationData("Overworld Beach",
+                                                                                       "Overworld Beach"),
+    "Overworld - Overworld Beach Grass (1133) (-168.0, 1.0, -87.5)": TunicLocationData("Overworld Beach",
+                                                                                       "Overworld Beach"),
+    "Stick House - Stick House Grass (1) (14.0, 0.0, 9.0)": TunicLocationData("Stick House", "Stick House"),
+    "Stick House - Stick House Grass (4) (15.0, 0.0, 10.0)": TunicLocationData("Stick House", "Stick House"),
+    "Stick House - Stick House Grass (3) (15.0, 0.0, 8.0)": TunicLocationData("Stick House", "Stick House"),
+    "Stick House - Stick House Grass (15.0, 0.0, 9.0)": TunicLocationData("Stick House", "Stick House"),
+    "Stick House - Stick House Grass (2) (14.0, 0.0, 10.0)": TunicLocationData("Stick House", "Stick House"),
+    "Ruined Passage - Ruined Passage Grass (2) (186.5, 16.8, 40.3)": TunicLocationData("Ruined Passage",
+                                                                                       "Ruined Passage"),
+    "Ruined Passage - Ruined Passage Grass (4) (187.7, 16.5, 39.3)": TunicLocationData("Ruined Passage",
+                                                                                       "Ruined Passage"),
+    "Ruined Passage - Ruined Passage Grass (1) (187.7, 16.8, 40.3)": TunicLocationData("Ruined Passage",
+                                                                                       "Ruined Passage"),
+    "Ruined Passage - Ruined Passage Grass (3) (186.5, 17.0, 41.5)": TunicLocationData("Ruined Passage",
+                                                                                       "Ruined Passage"),
+    "Ruined Passage - Ruined Passage Grass (187.7, 17.0, 41.4)": TunicLocationData("Ruined Passage", "Ruined Passage"),
+    "Forest Belltower - Forest Belltower Upper Grass (65) (592.5, 62.0, 114.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (64) (593.5, 62.0, 114.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (62) (592.5, 62.0, 115.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (66) (591.5, 62.0, 114.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (56) (593.5, 62.0, 115.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (68) (591.5, 62.0, 115.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (72) (600.8, 62.3, 112.5)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (74) (601.8, 62.3, 112.5)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (75) (601.8, 62.3, 113.5)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (70) (600.8, 62.3, 114.5)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (73) (600.8, 62.3, 113.5)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (67) (599.8, 62.3, 114.5)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (69) (599.8, 62.3, 115.5)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (71) (600.8, 62.3, 115.5)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (55) (601.5, 62.0, 107.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (54) (601.5, 62.0, 106.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (52) (602.5, 62.0, 106.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (53) (602.5, 62.0, 107.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (58) (603.5, 62.0, 108.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (60) (602.5, 62.0, 108.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (59) (603.5, 62.0, 109.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (61) (602.5, 62.0, 109.3)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (79) (602.8, 62.0, 102.1)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (76) (603.8, 62.0, 103.1)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (78) (603.8, 62.0, 102.1)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (77) (602.8, 62.0, 103.1)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (593.0, 14.0, 91.0)": TunicLocationData("Forest Belltower Upper",
+                                                                                             "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (3) (592.0, 14.0, 91.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (10) (591.0, 14.0, 91.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (1) (593.0, 14.0, 90.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (2) (592.0, 14.0, 90.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (9) (591.0, 14.0, 90.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (11) (590.0, 14.0, 91.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (8) (590.0, 14.0, 90.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (7) (592.0, 14.0, 89.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (6) (592.0, 14.0, 88.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (5) (593.0, 14.0, 89.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (4) (593.0, 14.0, 88.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (35) (589.0, 14.0, 84.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (30) (589.0, 14.0, 85.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (31) (589.0, 14.0, 86.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (29) (588.0, 14.0, 85.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (39) (591.0, 14.0, 84.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (36) (590.0, 14.0, 84.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (28) (588.0, 14.0, 86.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (34) (589.0, 14.0, 83.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (33) (588.0, 14.0, 83.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (32) (588.0, 14.0, 84.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (37) (590.0, 14.0, 83.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (43) (589.0, 14.0, 82.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (38) (591.0, 14.0, 83.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (40) (588.0, 14.0, 82.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (41) (588.0, 14.0, 81.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (42) (589.0, 14.0, 81.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (50) (583.0, 14.0, 92.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (13) (584.0, 14.0, 92.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (51) (583.0, 14.0, 93.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (14) (585.0, 14.0, 92.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (15) (585.0, 14.0, 93.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (12) (584.0, 14.0, 93.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (49) (582.0, 14.0, 92.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (48) (582.0, 14.0, 93.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (47) (581.0, 14.0, 93.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (46) (581.0, 14.0, 92.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (44) (580.0, 14.0, 93.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (45) (580.0, 14.0, 92.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (27) (592.0, 14.0, 76.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (20) (593.0, 14.0, 78.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (21) (593.0, 14.0, 77.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (24) (591.0, 14.0, 76.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (19) (594.0, 14.0, 76.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (22) (594.0, 14.0, 77.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (16) (593.0, 14.0, 76.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (17) (593.0, 14.0, 75.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (23) (594.0, 14.0, 78.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (26) (592.0, 14.0, 75.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (18) (594.0, 14.0, 75.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Upper Grass (25) (591.0, 14.0, 75.0)": TunicLocationData(
+        "Forest Belltower Upper", "Forest Belltower Upper"),
+    "Forest Belltower - Forest Belltower Main Bush (3) (469.0, 38.0, 118.0)": TunicLocationData("Forest Belltower Main",
+                                                                                                "Forest Belltower Main"),
+    "Forest Belltower - Forest Belltower Main Bush (4) (467.0, 38.0, 118.0)": TunicLocationData("Forest Belltower Main",
+                                                                                                "Forest Belltower Main"),
+    "Forest Belltower - Forest Belltower Main Bush (469.0, 38.0, 120.0)": TunicLocationData("Forest Belltower Main",
+                                                                                            "Forest Belltower Main"),
+    "Forest Belltower - Forest Belltower Main Bush (1) (467.0, 38.0, 120.0)": TunicLocationData("Forest Belltower Main",
+                                                                                                "Forest Belltower Main"),
+    "Forest Belltower - Forest Belltower Main Bush (8) (465.0, 38.0, 119.0)": TunicLocationData("Forest Belltower Main",
+                                                                                                "Forest Belltower Main"),
+    "Forest Belltower - Forest Belltower Main Bush (7) (477.0, 38.0, 117.0)": TunicLocationData("Forest Belltower Main",
+                                                                                                "Forest Belltower Main"),
+    "Forest Belltower - Forest Belltower Main Bush (6) (476.0, 38.0, 119.0)": TunicLocationData("Forest Belltower Main",
+                                                                                                "Forest Belltower Main"),
+    "Forest Belltower - Forest Belltower Main Bush (5) (460.0, 38.0, 116.0)": TunicLocationData("Forest Belltower Main",
+                                                                                                "Forest Belltower Main"),
+    "East Forest - East Forest Grass (486) (78.0, 8.0, 71.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (488) (78.0, 8.0, 72.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (482) (77.0, 8.0, 73.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (487) (79.0, 8.0, 71.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (489) (79.0, 8.0, 72.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (483) (78.0, 8.0, 73.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (484) (77.0, 8.0, 74.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (485) (78.0, 8.0, 74.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (454) (82.5, 8.0, 62.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (457) (83.5, 8.0, 62.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (455) (82.5, 8.0, 63.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (456) (83.5, 8.0, 63.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (450) (80.8, 4.0, 56.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (453) (81.8, 4.0, 56.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (451) (80.8, 4.0, 57.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (448) (83.3, 4.0, 54.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (447) (82.3, 4.0, 54.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (452) (81.8, 4.0, 57.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (446) (82.3, 4.0, 53.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (449) (83.3, 4.0, 53.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (458) (78.8, 0.0, 47.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (357) (84.0, 0.0, 48.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (356) (84.0, 0.0, 47.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (367) (83.0, 0.0, 50.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (366) (83.0, 0.0, 51.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (365) (82.0, 0.0, 51.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (359) (85.0, 0.0, 47.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (358) (85.0, 0.0, 48.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (361) (87.0, 0.0, 46.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (74) (86.5, 0.0, 48.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (363) (88.0, 0.0, 45.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (362) (88.0, 0.0, 46.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (360) (87.0, 0.0, 45.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (461) (77.8, 0.0, 47.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (460) (77.8, 0.0, 46.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (459) (78.8, 0.0, 46.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (389) (71.5, 0.0, 38.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (387) (70.5, 0.0, 37.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (388) (70.5, 0.0, 38.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (390) (71.5, 0.0, 37.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (393) (71.5, 0.0, 36.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (392) (70.5, 0.0, 36.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (391) (70.5, 0.0, 35.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (394) (71.5, 0.0, 35.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (396) (71.5, 0.0, 34.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (397) (72.5, 0.0, 34.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (81) (69.0, 0.0, 37.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (80) (69.0, 0.0, 39.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (401) (69.5, 0.0, 35.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (439) (67.5, 0.0, 37.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (400) (68.5, 0.0, 35.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (399) (68.5, 0.0, 34.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (440) (67.5, 0.0, 36.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (82) (67.0, 0.0, 35.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (402) (69.5, 0.0, 34.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (438) (66.5, 0.0, 36.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (443) (67.5, 0.0, 33.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (445) (66.5, 0.0, 33.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (442) (66.5, 0.0, 32.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (444) (67.5, 0.0, 32.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (436) (67.5, 0.0, 38.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (435) (67.5, 0.0, 39.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (379) (68.5, 0.0, 40.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (380) (68.5, 0.0, 41.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (382) (69.5, 0.0, 40.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (381) (69.5, 0.0, 41.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (437) (66.5, 0.0, 39.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (434) (66.5, 0.0, 38.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (441) (66.5, 0.0, 37.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (375) (68.5, 0.0, 42.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (376) (68.5, 0.0, 43.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (432) (67.5, 0.0, 43.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (433) (67.5, 0.0, 42.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (378) (69.5, 0.0, 42.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (377) (69.5, 0.0, 43.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (383) (70.5, 0.0, 42.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (418) (67.5, 0.0, 44.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (429) (67.5, 0.0, 44.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (78) (69.0, 0.0, 45.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (428) (67.5, 0.0, 45.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (417) (67.5, 0.0, 45.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (431) (66.5, 0.0, 42.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (427) (66.5, 0.0, 44.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (430) (66.5, 0.0, 43.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (415) (66.5, 0.0, 44.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (384) (70.5, 0.0, 43.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (386) (71.5, 0.0, 42.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (385) (71.5, 0.0, 43.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (371) (70.5, 0.0, 44.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (374) (71.5, 0.0, 44.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (373) (71.5, 0.0, 45.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (372) (70.5, 0.0, 45.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (76) (69.0, 0.0, 47.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (77) (71.0, 0.0, 47.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (416) (66.5, 0.0, 45.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (364) (72.5, 0.0, 46.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (370) (73.5, 0.0, 46.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (369) (73.5, 0.0, 47.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (368) (72.5, 0.0, 47.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (79) (67.0, 0.0, 47.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (422) (65.5, 0.0, 46.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (421) (65.5, 0.0, 47.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (83) (65.0, 0.0, 45.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (419) (64.5, 0.0, 46.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (420) (64.5, 0.0, 47.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (426) (67.5, 0.0, 48.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (423) (66.5, 0.0, 48.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (425) (67.5, 0.0, 49.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (424) (66.5, 0.0, 49.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (398) (72.5, 0.0, 33.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (395) (71.5, 0.0, 33.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (404) (72.5, 0.0, 32.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (405) (73.5, 0.0, 32.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (413) (72.5, 0.0, 30.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (403) (72.5, 0.0, 31.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (412) (71.5, 0.0, 30.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (406) (73.5, 0.0, 31.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (408) (73.5, 0.0, 30.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (411) (71.5, 0.0, 29.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (414) (72.5, 0.0, 29.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (407) (73.5, 0.0, 29.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (409) (74.5, 0.0, 30.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (410) (74.5, 0.0, 29.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (341) (100.3, 0.0, 30.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (340) (100.3, 0.0, 29.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (343) (101.3, 0.0, 29.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (342) (101.3, 0.0, 30.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (345) (102.3, 0.0, 30.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (346) (103.3, 0.0, 30.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (352) (103.3, 0.0, 31.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (347) (103.3, 0.0, 29.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (344) (102.3, 0.0, 29.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (350) (105.3, 0.0, 30.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (351) (105.3, 0.0, 29.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (348) (104.3, 0.0, 29.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (349) (104.3, 0.0, 30.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (355) (104.3, 0.0, 31.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (354) (104.3, 0.0, 32.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (353) (103.3, 0.0, 32.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (463) (106.5, 0.0, 46.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (465) (106.5, 0.0, 45.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (462) (107.5, 0.0, 45.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (339) (109.8, 0.0, 47.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (464) (107.5, 0.0, 46.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (336) (108.8, 0.0, 47.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (337) (108.8, 0.0, 48.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (338) (109.8, 0.0, 48.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (330) (104.3, 0.0, 49.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (331) (104.3, 0.0, 48.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (328) (103.3, 0.0, 48.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (329) (103.3, 0.0, 49.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (327) (102.3, 0.0, 48.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (326) (102.3, 0.0, 49.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (324) (101.3, 0.0, 48.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (325) (101.3, 0.0, 49.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (72) (101.8, 0.0, 50.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (71) (99.5, 0.0, 50.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (67) (97.5, 0.0, 50.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (316) (97.0, 0.0, 49.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (323) (96.0, 0.0, 50.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (317) (98.0, 0.0, 49.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (73) (99.5, 0.0, 48.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (318) (98.0, 0.0, 48.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (333) (98.0, 0.0, 47.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (319) (97.0, 0.0, 48.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (334) (99.0, 0.0, 47.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (332) (98.0, 0.0, 46.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (335) (99.0, 0.0, 46.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (322) (96.0, 0.0, 51.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (321) (95.0, 0.0, 51.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (320) (95.0, 0.0, 50.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (309) (127.3, 0.0, 43.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (308) (128.3, 0.0, 43.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (70) (129.3, 0.0, 43.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (306) (128.3, 0.0, 44.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (307) (127.2, 0.0, 44.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (278) (131.8, 0.0, 38.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (280) (131.8, 0.0, 37.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (279) (132.8, 0.0, 38.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (281) (132.8, 0.0, 37.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (276) (133.8, 0.0, 37.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (274) (133.8, 0.0, 38.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (284) (133.8, 0.0, 39.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (285) (134.8, 0.0, 39.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (277) (134.8, 0.0, 37.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (275) (134.8, 0.0, 38.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (283) (134.8, 0.0, 40.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (282) (133.8, 0.0, 40.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (271) (133.8, 0.0, 36.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (270) (132.8, 0.0, 36.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (273) (133.8, 0.0, 35.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (272) (132.8, 0.0, 35.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (267) (131.8, 0.0, 34.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (69) (133.3, 0.0, 34.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (66) (135.3, 0.0, 36.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (266) (130.8, 0.0, 34.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (269) (131.8, 0.0, 33.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (255) (132.8, 0.0, 32.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (262) (131.8, 0.0, 32.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (252) (133.8, 0.0, 32.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (268) (130.8, 0.0, 33.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (68) (135.3, 0.0, 32.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (265) (130.8, 0.0, 32.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (264) (131.8, 0.0, 31.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (254) (132.8, 0.0, 31.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (253) (133.8, 0.0, 31.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (260) (132.8, 0.0, 29.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (261) (132.8, 0.0, 30.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (256) (134.8, 0.0, 30.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (258) (134.8, 0.0, 29.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (259) (133.8, 0.0, 30.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (257) (133.8, 0.0, 29.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (299) (135.8, 0.0, 27.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (263) (130.8, 0.0, 31.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (295) (135.8, 0.0, 25.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (301) (135.8, 0.0, 26.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (294) (134.8, 0.0, 25.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (300) (134.8, 0.0, 26.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (296) (134.8, 0.0, 24.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (298) (134.8, 0.0, 27.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (302) (131.8, 0.0, 23.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (304) (131.8, 0.0, 22.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (290) (133.8, 0.0, 23.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (303) (132.8, 0.0, 23.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (305) (132.8, 0.0, 22.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (292) (133.8, 0.0, 22.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (297) (135.8, 0.0, 24.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (291) (134.8, 0.0, 23.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (289) (134.8, 0.0, 20.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (293) (134.8, 0.0, 22.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (287) (134.8, 0.0, 21.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (286) (133.8, 0.0, 21.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (288) (133.8, 0.0, 20.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (466) (117.5, 0.0, 13.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (469) (117.5, 0.0, 12.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (470) (117.5, 0.0, 11.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (468) (116.5, 0.0, 13.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (467) (116.5, 0.0, 12.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (472) (116.5, 0.0, 11.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (471) (116.5, 0.0, 10.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (473) (117.5, 0.0, 10.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (315) (109.3, -1.3, 0.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (310) (110.3, -0.8, 2.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (314) (110.3, -1.3, 0.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (313) (108.3, 0.0, 3.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (311) (108.3, 0.0, 4.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (312) (107.3, 0.0, 3.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (497) (105.8, 0.0, 8.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (501) (103.5, 0.0, 7.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (502) (103.5, 0.0, 6.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (495) (104.8, 0.0, 8.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (493) (105.8, 0.0, 10.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (494) (105.8, 0.0, 9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (496) (104.8, 0.0, 9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (498) (103.5, 0.0, 8.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (490) (105.8, 0.0, 11.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (491) (104.8, 0.0, 10.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (492) (104.8, 0.0, 11.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (505) (103.5, 0.0, 5.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (499) (102.5, 0.0, 7.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (504) (102.5, 0.0, 6.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (500) (102.5, 0.0, 8.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (503) (102.5, 0.0, 5.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (507) (87.3, -4.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (509) (88.3, -4.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (513) (86.3, -4.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (506) (88.3, -4.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (508) (87.3, -4.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (510) (86.3, -4.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (512) (85.3, -4.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (511) (77.3, -4.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (514) (77.3, -4.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (516) (76.3, -4.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (515) (76.3, -4.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (519) (88.5, -4.0, -11.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (520) (88.5, -4.0, -12.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (524) (89.8, -4.0, -10.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (517) (89.5, -4.0, -12.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (518) (89.5, -4.0, -11.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (523) (89.8, -4.0, -9.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (521) (90.8, -4.0, -10.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (522) (90.8, -4.0, -9.8)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (89) (131.5, 0.0, -5.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (87) (132.5, 0.0, -6.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (84) (132.5, 0.0, -7.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (85) (133.5, 0.0, -7.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (88) (130.5, 0.0, -5.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (86) (133.5, 0.0, -6.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (78) (133.5, 0.0, -4.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (77) (133.5, 0.0, -5.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (76) (132.5, 0.0, -5.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (90) (131.5, 0.0, -4.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (91) (130.5, 0.0, -4.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (79) (132.5, 0.0, -4.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (80) (132.5, 0.0, -3.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (93) (131.5, 0.0, -2.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (92) (130.5, 0.0, -2.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (83) (132.5, 0.0, -2.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (94) (131.5, 0.0, -1.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (95) (130.5, 0.0, -1.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (81) (133.5, 0.0, -3.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (43) (135.0, 0.0, -5.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (82) (133.5, 0.0, -2.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (44) (135.0, 0.0, -7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (58) (137.5, 0.0, -7.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (73) (137.5, 0.0, -8.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (74) (136.5, 0.0, -8.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (75) (136.5, 0.0, -9.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (59) (136.5, 0.0, -7.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (56) (137.5, 0.0, -6.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (57) (136.5, 0.0, -6.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (98) (135.5, 0.0, -12.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (46) (135.0, 0.0, -11.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (99) (134.5, 0.0, -12.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (96) (134.5, 0.0, -13.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (55) (136.5, 0.0, -11.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (52) (136.5, 0.0, -10.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (97) (135.5, 0.0, -13.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (33) (137.0, 0.0, -13.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (32) (139.0, 0.0, -13.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (54) (137.5, 0.0, -11.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (38) (139.0, 0.0, -11.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (53) (137.5, 0.0, -10.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (72) (137.5, 0.0, -9.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (29) (141.0, 0.0, -13.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (68) (142.5, 0.0, -10.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (35) (141.0, 0.0, -11.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (70) (139.5, 0.0, -9.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (37) (141.0, 0.0, -9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (65) (139.5, 0.0, -8.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (71) (138.5, 0.0, -9.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (66) (138.5, 0.0, -8.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (42) (143.0, 0.0, -9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (63) (142.5, 0.0, -7.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (60) (143.5, 0.0, -7.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (62) (142.5, 0.0, -6.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (39) (141.0, 0.0, -7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (69) (143.5, 0.0, -10.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (67) (144.5, 0.0, -8.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (64) (144.5, 0.0, -9.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (41) (145.0, 0.0, -7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (61) (143.5, 0.0, -6.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (40) (143.0, 0.0, -5.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (102) (135.5, 0.0, -18.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (100) (134.5, 0.0, -19.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (103) (134.5, 0.0, -18.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (101) (135.5, 0.0, -19.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (34) (137.0, 0.0, -19.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (107) (138.5, 0.0, -20.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (31) (139.0, 0.0, -19.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (104) (138.5, 0.0, -21.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (106) (139.5, 0.0, -20.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (105) (139.5, 0.0, -21.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (36) (141.0, 0.0, -21.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (30) (141.0, 0.0, -19.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (115) (138.0, 0.0, -24.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (112) (138.0, 0.0, -25.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (114) (139.0, 0.0, -24.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (113) (139.0, 0.0, -25.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (111) (140.5, 0.0, -26.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (118) (133.5, 0.0, -26.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (117) (133.5, 0.0, -27.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (119) (132.5, 0.0, -26.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (116) (132.5, 0.0, -27.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (110) (141.5, 0.0, -26.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (108) (140.5, 0.0, -27.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (109) (141.5, 0.0, -27.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (123) (142.5, 0.0, -28.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (120) (142.5, 0.0, -29.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (122) (143.5, 0.0, -28.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (121) (143.5, 0.0, -29.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (244) (135.5, 8.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (247) (135.5, 8.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (246) (134.5, 8.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (245) (134.5, 8.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (250) (140.5, 8.0, -2.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (249) (140.5, 8.0, -3.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (251) (141.5, 8.0, -3.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (248) (141.5, 8.0, -2.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (213) (147.5, 8.0, 0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (215) (146.5, 8.0, 0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (212) (146.5, 8.0, 1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (203) (146.5, 8.0, 2.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (207) (143.5, 8.0, 4.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (61) (143.0, 8.0, 3.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (237) (141.5, 8.0, 2.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (205) (142.5, 8.0, 4.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (238) (141.5, 8.0, 3.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (239) (140.5, 8.0, 2.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (236) (140.5, 8.0, 3.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (1) (141.0, 8.0, 5.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (7) (139.0, 8.0, 5.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (206) (142.5, 8.0, 5.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (204) (143.5, 8.0, 5.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (60) (145.0, 8.0, 5.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (3) (143.0, 8.0, 9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (2) (141.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (242) (137.5, 8.0, 5.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (5) (137.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (4) (139.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (240) (136.5, 8.0, 5.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (243) (136.5, 8.0, 4.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (241) (137.5, 8.0, 4.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (137.0, 8.0, 9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (6) (135.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (211) (144.5, 8.0, 6.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (208) (144.5, 8.0, 7.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (209) (145.5, 8.0, 6.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (210) (145.5, 8.0, 7.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (56) (149.0, 8.0, 5.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (59) (147.0, 8.0, 5.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (58) (147.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (15) (149.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (9) (145.0, 8.0, 9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (201) (146.5, 8.0, 3.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (200) (147.5, 8.0, 3.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (202) (147.5, 8.0, 2.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (57) (149.0, 8.0, 3.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (63) (151.0, 8.0, 1.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (214) (147.5, 8.0, 1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (62) (149.0, 8.0, 1.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (224) (153.5, 8.0, 1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (225) (152.5, 8.0, 0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (226) (152.5, 8.0, 1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (65) (151.0, 8.0, 5.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (64) (151.0, 8.0, 3.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (17) (153.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (16) (151.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (18) (155.0, 8.0, 7.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (233) (157.5, 8.0, 10.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (20) (155.0, 8.0, 9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (235) (156.5, 8.0, 10.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (232) (156.5, 8.0, 11.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (23) (155.0, 8.0, 11.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (22) (153.0, 8.0, 11.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (19) (153.0, 8.0, 9.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (234) (157.5, 8.0, 11.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (230) (154.5, 8.0, 1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (228) (155.5, 8.0, 1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (229) (154.5, 8.0, 0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (227) (153.5, 8.0, 0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (231) (155.5, 8.0, 0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (218) (149.5, 8.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (217) (149.5, 8.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (219) (148.5, 8.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (216) (148.5, 8.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (221) (150.5, 8.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (222) (150.5, 8.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (220) (151.5, 8.0, -0.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (223) (151.5, 8.0, -1.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (546) (167.0, 7.8, -23.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (545) (167.0, 7.8, -22.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (543) (166.0, 7.8, -22.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (544) (166.0, 7.8, -23.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (167) (130.0, 24.0, 52.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (164) (130.0, 24.0, 53.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (165) (131.0, 24.0, 52.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (166) (131.0, 24.0, 53.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (135) (125.5, 24.0, 52.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (133) (124.5, 24.0, 52.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (49) (123.0, 24.0, 53.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (131) (121.5, 24.0, 52.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (128) (121.5, 24.0, 53.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (129) (120.5, 24.0, 52.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (176) (119.5, 24.0, 47.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (178) (118.5, 24.0, 47.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (177) (118.5, 24.0, 46.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (179) (119.5, 24.0, 46.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (134) (124.5, 24.0, 53.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (132) (125.5, 24.0, 53.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (137) (124.5, 24.0, 56.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (139) (125.5, 24.0, 56.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (48) (123.0, 24.0, 57.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (45) (121.0, 24.0, 55.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (130) (120.5, 24.0, 53.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (149) (119.5, 24.0, 54.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (145) (119.5, 24.0, 56.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (47) (121.0, 24.0, 57.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (150) (119.5, 24.0, 55.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (146) (119.5, 24.0, 57.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (144) (118.5, 24.0, 57.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (147) (118.5, 24.0, 56.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (148) (118.5, 24.0, 55.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (173) (117.5, 24.0, 56.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (151) (118.5, 24.0, 54.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (174) (117.5, 24.0, 57.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (172) (116.5, 24.0, 57.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (175) (116.5, 24.0, 56.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Bush (50) (115.0, 24.0, 57.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (170) (113.5, 24.0, 57.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (126) (113.5, 24.0, 58.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (125) (113.5, 24.0, 59.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (169) (113.5, 24.0, 56.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (127) (112.5, 24.0, 58.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (124) (112.5, 24.0, 59.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (168) (112.5, 24.0, 57.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (171) (112.5, 24.0, 56.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (141) (121.5, 24.0, 58.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (155) (123.5, 24.0, 58.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (153) (122.5, 24.0, 58.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (142) (121.5, 24.0, 59.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (152) (123.5, 24.0, 59.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (154) (122.5, 24.0, 59.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (143) (120.5, 24.0, 58.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (140) (120.5, 24.0, 59.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (159) (126.0, 24.0, 62.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (163) (128.0, 24.0, 60.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (157) (125.0, 24.0, 62.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (161) (127.0, 24.0, 60.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (162) (127.0, 24.0, 61.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (160) (128.0, 24.0, 61.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (156) (126.0, 24.0, 63.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (158) (125.0, 24.0, 63.0)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (136) (125.5, 24.0, 57.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (138) (124.5, 24.0, 57.5)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (476) (130.0, 0.0, 8.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (474) (131.0, 0.0, 8.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (477) (131.0, 0.0, 7.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (475) (130.0, 0.0, 7.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (479) (132.5, 0.0, 9.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (481) (133.5, 0.0, 9.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (478) (133.5, 0.0, 10.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Grass (480) (132.5, 0.0, 10.3)": TunicLocationData("East Forest", "East Forest"),
+    "East Forest - East Forest Dance Fox Spot Grass (548) (95.5, 16.0, 75.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (550) (96.5, 16.0, 75.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (547) (95.5, 16.0, 76.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (549) (96.5, 16.0, 76.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (180) (88.0, 16.0, 65.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (181) (88.0, 16.0, 64.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (182) (87.0, 16.0, 64.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (183) (87.0, 16.0, 65.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Bush (52) (89.5, 16.0, 64.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Bush (55) (89.5, 16.0, 62.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (189) (85.0, 16.0, 61.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (190) (84.0, 16.0, 60.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (188) (84.0, 16.0, 61.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (191) (85.0, 16.0, 60.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Bush (51) (89.5, 16.0, 60.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Bush (54) (95.5, 16.0, 62.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Bush (53) (95.5, 16.0, 64.5)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (197) (91.5, 16.0, 56.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (198) (90.5, 16.0, 55.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (196) (90.5, 16.0, 56.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (199) (91.5, 16.0, 55.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (187) (90.5, 16.0, 54.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (184) (91.5, 16.0, 54.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (186) (91.5, 16.0, 53.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (185) (90.5, 16.0, 53.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (194) (92.5, 16.0, 53.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (192) (92.5, 16.0, 54.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (193) (93.5, 16.0, 54.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - East Forest Dance Fox Spot Grass (195) (93.5, 16.0, 53.0)": TunicLocationData(
+        "East Forest Dance Fox Spot", "East Forest Dance Fox Spot"),
+    "East Forest - Lower Forest Grass (528) (86.5, -12.0, -15.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (529) (87.5, -12.0, -16.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (525) (87.5, -12.0, -15.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (527) (86.5, -12.0, -14.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (526) (87.5, -12.0, -14.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (533) (86.0, -20.3, -21.8)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (530) (87.0, -20.3, -21.8)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (531) (87.0, -20.3, -20.8)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (532) (86.0, -20.3, -20.8)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (14) (99.0, -26.0, -53.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (8) (99.0, -26.0, -49.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (13) (99.0, -26.0, -51.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (10) (104.0, -26.0, -49.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (1) (98.0, -26.0, -57.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (15) (98.0, -26.0, -56.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (12) (98.0, -26.0, -55.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (16) (97.0, -26.0, -57.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (13) (99.0, -26.0, -56.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (99.0, -26.0, -57.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (14) (99.0, -26.0, -55.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (31) (105.0, -26.0, -50.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (26) (105.0, -26.0, -51.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (29) (106.0, -26.0, -50.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (24) (106.0, -26.0, -51.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (23) (106.0, -26.0, -54.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (27) (106.0, -26.0, -52.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (20) (106.0, -26.0, -53.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (22) (105.0, -26.0, -53.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (25) (105.0, -26.0, -52.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (28) (105.0, -26.0, -55.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (21) (105.0, -26.0, -54.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (30) (106.0, -26.0, -55.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (5) (99.0, -26.0, -60.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (24) (105.0, -26.0, -61.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (26) (105.0, -26.0, -59.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (25) (107.0, -26.0, -59.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (38) (109.0, -26.0, -59.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (37) (109.0, -26.0, -60.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (39) (110.0, -26.0, -60.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (36) (110.0, -26.0, -59.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (35) (112.0, -26.0, -60.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (41) (112.0, -26.0, -62.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (42) (112.0, -26.0, -61.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (40) (111.0, -26.0, -61.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (33) (111.0, -26.0, -60.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (43) (111.0, -26.0, -62.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (32) (112.0, -26.0, -59.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (34) (111.0, -26.0, -59.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (6) (99.0, -26.0, -59.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (2) (98.0, -26.0, -58.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (7) (98.0, -26.0, -60.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (4) (98.0, -26.0, -59.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (3) (99.0, -26.0, -58.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (10) (99.0, -26.0, -61.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (9) (99.0, -26.0, -62.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (8) (98.0, -26.0, -61.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (11) (98.0, -26.0, -62.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (19) (97.0, -26.0, -58.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (17) (96.0, -26.0, -58.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (18) (96.0, -26.0, -57.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (50) (99.0, -26.0, -66.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (48) (98.0, -26.0, -66.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (44) (96.0, -26.0, -66.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (46) (97.0, -26.0, -66.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (45) (97.0, -26.0, -67.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (47) (96.0, -26.0, -67.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (49) (99.0, -26.0, -67.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (51) (98.0, -26.0, -67.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (27) (91.0, -26.0, -52.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Bush (28) (91.0, -26.0, -54.0)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (68) (100.3, -30.5, -69.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (73) (100.3, -30.5, -70.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (65) (100.3, -30.5, -68.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (67) (101.3, -30.5, -69.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (74) (101.3, -30.5, -70.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (66) (101.3, -30.5, -68.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (71) (99.3, -30.5, -69.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (70) (99.3, -30.5, -68.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (69) (98.3, -30.5, -68.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (72) (98.3, -30.5, -69.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (75) (101.3, -30.5, -71.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (534) (100.3, -30.5, -71.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (541) (85.3, -30.5, -52.8)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (536) (88.8, -30.5, -55.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (535) (87.8, -30.5, -55.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (542) (84.3, -30.5, -52.8)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (540) (85.3, -30.5, -51.8)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (539) (84.3, -30.5, -51.8)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (538) (87.8, -30.5, -56.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (537) (88.8, -30.5, -56.3)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (53) (142.8, -26.0, -52.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (54) (142.8, -26.0, -51.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (52) (141.8, -26.0, -52.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (55) (141.8, -26.0, -51.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (56) (141.8, -26.0, -35.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (57) (142.8, -26.0, -35.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (60) (141.8, -26.0, -34.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (59) (142.8, -26.0, -34.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (62) (130.5, -26.0, -34.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (63) (130.5, -26.0, -33.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (64) (129.5, -26.0, -33.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "East Forest - Lower Forest Grass (61) (129.5, -26.0, -34.5)": TunicLocationData("Lower Forest", "Lower Forest"),
+    "Guardhouse 1 - Guard House 1 West Grass (40) (129.0, 0.0, 50.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (44) (127.0, 0.0, 52.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (46) (127.0, 0.0, 51.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (36) (127.0, 0.0, 50.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (45) (128.0, 0.0, 51.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (47) (128.0, 0.0, 52.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (39) (128.0, 0.0, 50.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (43) (130.0, 0.0, 50.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (32) (125.0, 0.0, 49.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (34) (125.0, 0.0, 50.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (33) (126.0, 0.0, 50.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (35) (126.0, 0.0, 49.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (38) (127.0, 0.0, 49.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (42) (129.0, 0.0, 49.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (37) (128.0, 0.0, 49.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (41) (130.0, 0.0, 49.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (24) (118.0, 0.0, 55.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (26) (118.0, 0.0, 56.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (30) (118.0, 0.0, 54.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (27) (119.0, 0.0, 55.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (25) (119.0, 0.0, 56.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (29) (119.0, 0.0, 54.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (31) (119.0, 0.0, 53.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (28) (118.0, 0.0, 53.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (22) (130.0, 0.0, 69.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (9) (128.0, 0.0, 69.0)": TunicLocationData("Guard House 1 West",
+                                                                                        "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (10) (128.0, 0.0, 68.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (21) (129.0, 0.0, 70.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (20) (129.0, 0.0, 69.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (11) (127.0, 0.0, 68.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (14) (133.0, 0.0, 72.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (15) (132.0, 0.0, 71.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (12) (132.0, 0.0, 72.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (23) (130.0, 0.0, 70.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (8) (127.0, 0.0, 69.0)": TunicLocationData("Guard House 1 West",
+                                                                                        "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (13) (133.0, 0.0, 71.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (18) (134.0, 0.0, 73.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (16) (133.0, 0.0, 73.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (19) (134.0, 0.0, 74.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (17) (133.0, 0.0, 74.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (3) (116.0, 16.0, 78.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (1) (117.0, 16.0, 79.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (2) (117.0, 16.0, 78.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (116.0, 16.0, 79.0)": TunicLocationData("Guard House 1 West",
+                                                                                     "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (5) (117.0, 16.0, 74.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (7) (118.0, 16.0, 73.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (4) (118.0, 16.0, 74.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 1 - Guard House 1 West Grass (6) (117.0, 16.0, 73.0)": TunicLocationData("Guard House 1 West",
+                                                                                         "Guard House 1 West"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (25) (150.5, 0.0, -15.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (11) (150.5, 0.0, -13.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (26) (150.5, 0.0, -14.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (24) (151.5, 0.0, -14.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (9) (151.5, 0.0, -13.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (27) (151.5, 0.0, -15.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (7) (155.0, 0.0, -17.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                         "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (5) (153.0, 0.0, -15.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                         "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (6) (153.0, 0.0, -17.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                         "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (7) (152.5, 0.0, -13.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (6) (153.5, 0.0, -12.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (5) (153.5, 0.0, -13.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (1) (154.5, 0.0, -12.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (2) (154.5, 0.0, -13.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (4) (155.0, 0.0, -15.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                         "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (155.5, 0.0, -12.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                      "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (3) (155.5, 0.0, -13.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (32) (156.5, 0.0, -14.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (9) (153.0, 0.0, -11.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                         "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (4) (152.5, 0.0, -12.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (10) (151.5, 0.0, -12.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (13) (151.5, 0.0, -9.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (8) (151.0, 0.0, -11.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                         "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (8) (150.5, 0.0, -12.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (15) (150.5, 0.0, -9.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (35) (156.5, 0.0, -15.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (29) (155.5, 0.0, -19.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (30) (155.5, 0.0, -18.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (31) (154.5, 0.0, -19.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (28) (154.5, 0.0, -18.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (33) (157.5, 0.0, -15.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (34) (157.5, 0.0, -14.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (3) (157.0, 0.0, -13.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                         "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (37) (157.5, 0.0, -11.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (38) (157.5, 0.0, -10.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (39) (156.5, 0.0, -11.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (36) (156.5, 0.0, -10.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                           "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (2) (155.0, 0.0, -11.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                         "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (41) (154.5, 0.0, -9.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (43) (155.5, 0.0, -9.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (40) (155.5, 0.0, -8.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (42) (154.5, 0.0, -8.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (14) (151.5, 0.0, -8.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (19) (151.5, 0.0, -7.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (16) (151.5, 0.0, -6.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (18) (150.5, 0.0, -6.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (153.0, 0.0, -7.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                    "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Bush (1) (153.0, 0.0, -9.0)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                        "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (17) (150.5, 0.0, -7.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (12) (150.5, 0.0, -8.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (23) (149.5, 0.0, -7.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (20) (149.5, 0.0, -6.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (22) (148.5, 0.0, -6.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Guardhouse 2 - Guard House 2 Upper Grass (21) (148.5, 0.0, -7.5)": TunicLocationData("Guard House 2 Upper after bushes",
+                                                                                          "Guard House 2 Upper after bushes"),
+    "Forest Grave Path - Forest Grave Path Main Bush (110) (-70.0, -4.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (112) (-66.0, -4.0, -181.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (111) (-64.0, -4.0, -181.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (113) (-64.0, -4.0, -183.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (76) (-62.8, -4.0, -182.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (82) (-59.8, -4.0, -181.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (83) (-60.8, -4.0, -181.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (78) (-61.8, -4.0, -181.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (77) (-61.8, -4.0, -182.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (79) (-62.8, -4.0, -181.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (119) (-65.0, -4.0, -193.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (118) (-65.0, -4.0, -195.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (120) (-63.0, -4.0, -195.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (90) (-59.5, -4.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (121) (-59.0, -4.0, -197.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (122) (-57.0, -4.0, -191.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (91) (-58.5, -4.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (86) (-57.5, -4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (89) (-57.5, -4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (87) (-56.5, -4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (88) (-56.5, -4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (106) (-53.0, -4.0, -191.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (107) (-55.0, -4.0, -191.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (104) (-53.0, -4.0, -187.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (115) (-55.0, -4.0, -187.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (108) (-55.0, -4.0, -189.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (105) (-53.0, -4.0, -189.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (117) (-55.0, -4.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (109) (-57.0, -4.0, -187.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (92) (-58.5, -4.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (93) (-59.5, -4.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (103) (-53.0, -4.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (81) (-52.5, -4.0, -181.8)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (116) (-53.0, -4.0, -183.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (85) (-53.5, -4.0, -180.8)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (80) (-53.5, -4.0, -181.8)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (84) (-52.5, -4.0, -180.8)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (133) (-45.0, 0.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (136) (-43.0, 0.0, -189.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (135) (-43.0, 0.0, -187.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (42) (-42.5, 0.0, -190.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (47) (-41.5, 0.0, -188.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (56) (-41.5, 0.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (44) (-41.5, 0.0, -189.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (45) (-40.5, 0.0, -189.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (33) (-46.5, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (134) (-43.0, 0.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (43) (-43.5, 0.0, -190.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (34) (-46.5, 0.0, -184.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (35) (-47.5, 0.0, -184.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (32) (-47.5, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (59) (-41.5, 0.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (137) (-41.0, 0.0, -191.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (40) (-43.5, 0.0, -191.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (138) (-43.0, 0.0, -193.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (41) (-42.5, 0.0, -191.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (61) (-40.5, 0.0, -195.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (36) (-41.5, 0.0, -193.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (39) (-41.5, 0.0, -192.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (60) (-41.5, 0.0, -195.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (63) (-41.5, 0.0, -194.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (62) (-40.5, 0.0, -194.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (38) (-40.5, 0.0, -192.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (37) (-40.5, 0.0, -193.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (53) (-38.5, 0.0, -189.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (50) (-38.5, 0.0, -190.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (49) (-38.5, 0.0, -191.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (48) (-39.5, 0.0, -191.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (52) (-39.5, 0.0, -189.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (51) (-39.5, 0.0, -190.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (46) (-40.5, 0.0, -188.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (54) (-38.5, 0.0, -188.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (55) (-39.5, 0.0, -188.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (57) (-40.5, 0.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (58) (-40.5, 0.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (141) (-47.0, 0.0, -195.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (139) (-43.0, 0.0, -195.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (140) (-45.0, 0.0, -195.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (66) (-43.0, 0.0, -200.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (67) (-44.0, 0.0, -200.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (64) (-44.0, 0.0, -201.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (65) (-43.0, 0.0, -201.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (68) (-40.0, 0.0, -201.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (71) (-40.0, 0.0, -200.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (70) (-39.0, 0.0, -200.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (69) (-39.0, 0.0, -201.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (75) (-31.5, 0.0, -192.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (72) (-31.5, 0.0, -193.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (73) (-30.5, 0.0, -193.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (74) (-30.5, 0.0, -192.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (147) (-35.0, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (146) (-33.0, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (28) (-33.5, 0.0, -184.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (29) (-32.5, 0.0, -184.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (23) (-31.5, 0.0, -184.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (20) (-31.5, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (21) (-30.5, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (26) (-32.5, 0.0, -181.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (30) (-32.5, 0.0, -183.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (25) (-32.5, 0.0, -182.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (31) (-33.5, 0.0, -183.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (24) (-33.5, 0.0, -182.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (27) (-33.5, 0.0, -181.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (148) (-35.0, 0.0, -183.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (22) (-30.5, 0.0, -184.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (12) (-29.5, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (13) (-28.5, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (10) (-27.5, 0.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (11) (-27.5, 0.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (15) (-29.5, 0.0, -184.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (3) (-23.5, 0.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (132) (-25.0, 0.0, -187.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (8) (-26.5, 0.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (9) (-26.5, 0.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (130) (-25.0, 0.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (131) (-27.0, 0.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (14) (-28.5, 0.0, -184.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (-23.5, 0.0, -186.5)": TunicLocationData("Forest Grave Path Main",
+                                                                                               "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (2) (-22.5, 0.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (1) (-22.5, 0.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (126) (-19.0, 0.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (6) (-20.5, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (4) (-20.5, 0.0, -184.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (7) (-21.5, 0.0, -185.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (5) (-21.5, 0.0, -184.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (129) (-23.0, 0.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (19) (-17.5, 0.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (16) (-17.5, 0.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (18) (-16.5, 0.0, -186.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (17) (-16.5, 0.0, -187.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (125) (-15.0, 0.0, -187.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (124) (-15.0, 0.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (123) (-17.0, 0.0, -185.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (127) (-14.0, 0.0, -194.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (116) (-23.8, -4.3, -205.8)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (97) (-27.3, -6.3, -210.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (96) (-26.3, -6.3, -210.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (117) (-22.8, -4.3, -205.8)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (119) (-22.8, -4.3, -204.8)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (95) (-26.3, -6.3, -211.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (118) (-23.8, -4.3, -204.8)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (123) (-20.5, -4.3, -208.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (121) (-20.5, -4.3, -209.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (114) (-15.5, -4.3, -212.3)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (112) (-15.5, -4.3, -213.3)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (115) (-14.5, -4.3, -212.3)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (113) (-14.5, -4.3, -213.3)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (110) (-13.5, -4.3, -213.3)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (111) (-12.5, -4.3, -213.3)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (109) (-12.5, -4.3, -212.3)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (108) (-13.5, -4.3, -212.3)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (106) (-24.3, -6.2, -215.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (102) (-24.3, -6.3, -214.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (103) (-23.3, -6.3, -214.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (99) (-25.3, -6.3, -213.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (101) (-26.3, -6.3, -212.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (98) (-26.3, -6.3, -213.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (94) (-27.3, -6.3, -211.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (107) (-23.3, -6.3, -215.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (105) (-24.3, -6.3, -213.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (100) (-25.3, -6.3, -212.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Grass (104) (-23.3, -6.3, -213.5)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (144) (-21.5, 8.0, -179.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (145) (-23.5, 8.0, -179.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path Main Bush (149) (-25.5, 8.0, -179.0)": TunicLocationData(
+        "Forest Grave Path Main", "Forest Grave Path Main"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (58) (8.5, 4.0, -190.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (57) (8.5, 4.0, -191.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (102) (9.0, 4.0, -189.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (59) (9.5, 4.0, -191.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (56) (9.5, 4.0, -190.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (52) (12.5, 4.0, -190.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (55) (12.5, 4.0, -191.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (54) (13.5, 4.0, -190.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (53) (13.5, 4.0, -191.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (47) (14.5, 4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (44) (14.5, 4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (49) (13.5, 4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (50) (13.5, 4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (51) (12.5, 4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (48) (12.5, 4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (100) (11.0, 4.0, -189.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (99) (15.0, 4.0, -191.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (45) (15.5, 4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (7) (16.5, 4.0, -190.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (5) (16.5, 4.0, -191.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (21) (19.5, 4.0, -193.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (30) (19.5, 4.0, -194.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (22) (19.5, 4.0, -192.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (14) (18.5, 4.0, -191.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (20) (18.5, 4.0, -192.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (28) (18.5, 4.0, -194.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (23) (18.5, 4.0, -193.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (98) (17.0, 4.0, -193.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (6) (17.5, 4.0, -191.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (9) (19.5, 4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (15) (19.5, 4.0, -191.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (11) (19.5, 4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (13) (19.5, 4.0, -190.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (8) (18.5, 4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (12) (18.5, 4.0, -190.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (10) (18.5, 4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (2) (17.5, 4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (4) (17.5, 4.0, -190.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (1) (17.5, 4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (3) (16.5, 4.0, -189.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (97) (17.0, 4.0, -187.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (16.5, 4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (46) (15.5, 4.0, -188.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (89) (21.0, 4.0, -195.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (31) (18.5, 4.0, -195.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (29) (19.5, 4.0, -195.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (26) (23.5, 4.0, -192.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (25) (23.5, 4.0, -193.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (90) (23.0, 4.0, -195.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (27) (22.5, 4.0, -193.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (24) (22.5, 4.0, -192.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (88) (21.0, 4.0, -193.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (75) (21.0, 4.0, -191.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (71) (21.0, 4.0, -189.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (37) (22.5, 4.0, -187.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (91) (25.0, 4.0, -195.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (93) (29.0, 4.0, -195.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (92) (27.0, 4.0, -195.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (35) (23.5, 4.0, -185.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (33) (22.5, 4.0, -185.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (38) (22.5, 4.0, -186.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (36) (23.5, 4.0, -186.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (39) (23.5, 4.0, -187.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (95) (27.0, 4.0, -185.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (96) (25.0, 4.0, -185.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (32) (23.5, 4.0, -184.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (40) (21.5, 4.0, -184.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (43) (21.5, 4.0, -185.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (34) (22.5, 4.0, -184.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (42) (20.5, 4.0, -184.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (41) (20.5, 4.0, -185.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Bush (94) (29.0, 4.0, -185.0)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (17) (17.5, 4.0, -184.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (19) (17.5, 4.0, -185.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (16) (16.5, 4.0, -184.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "Forest Grave Path - Forest Grave Path by Grave Grass (18) (16.5, 4.0, -185.5)": TunicLocationData(
+        "Forest Grave Path by Grave", "Forest Grave Path by Grave"),
+    "West Garden - West Garden Grass (297) (-115.0, 4.0, 159.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (300) (-113.8, 4.0, 159.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (296) (-115.0, 4.0, 160.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (298) (-116.0, 4.0, 160.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (187) (-125.5, 4.0, 160.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (189) (-124.5, 4.0, 160.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (185) (-131.0, 4.0, 160.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (206) (-131.0, 4.0, 159.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (188) (-131.0, 4.0, 159.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (186) (-132.0, 4.0, 160.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (218) (-131.8, 2.3, 151.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (219) (-131.8, 1.8, 150.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (217) (-130.5, 2.3, 151.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (216) (-130.5, 2.8, 152.8)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (241) (-161.6, 2.0, 124.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (192) (-158.0, 1.5, 122.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (191) (-158.0, 1.5, 123.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (193) (-157.0, 1.5, 122.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (190) (-157.0, 1.5, 123.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (239) (-159.7, 1.5, 117.7)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (235) (-159.8, 1.5, 116.7)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (236) (-160.8, 1.5, 116.7)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (237) (-161.8, 1.5, 116.7)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (194) (-165.4, 2.0, 121.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (196) (-162.5, 2.0, 123.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (238) (-162.5, 2.0, 124.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (195) (-165.4, 2.0, 120.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (240) (-162.5, 2.0, 125.4)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (20) (-162.0, 10.0, 139.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (18) (-160.0, 10.0, 139.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (19) (-160.0, 10.0, 141.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (295) (-159.5, 9.8, 160.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (21) (-180.0, 10.0, 139.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (23) (-180.0, 10.0, 141.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (22) (-178.0, 10.0, 139.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (212) (-174.5, 2.0, 123.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (213) (-174.5, 2.0, 124.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (214) (-174.5, 2.0, 125.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (215) (-175.5, 2.0, 124.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (24) (-185.0, 1.9, 143.9)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (198) (-185.0, 2.5, 148.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (197) (-185.0, 2.5, 149.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (202) (-185.0, 2.5, 150.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (201) (-186.0, 2.5, 150.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (200) (-186.0, 2.5, 149.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (216) (-192.3, 1.0, 145.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (217) (-192.3, 1.0, 146.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (211) (-193.3, 0.9, 145.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (406) (-190.8, 1.3, 149.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (405) (-189.8, 1.3, 149.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (25) (-196.0, 0.8, 152.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (203) (-198.5, 1.0, 150.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (199) (-198.5, 1.0, 151.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (205) (-199.5, 1.0, 151.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (204) (-199.5, 1.0, 150.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (213) (-196.0, 4.0, 160.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (214) (-197.0, 4.0, 159.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (212) (-197.0, 4.0, 160.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (211) (-198.0, 4.0, 160.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (215) (-198.0, 4.0, 159.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (31) (-250.5, 4.0, 147.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (34) (-251.5, 4.0, 147.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (10) (-253.5, 3.8, 150.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (7) (-252.5, 3.8, 150.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (8) (-253.5, 3.8, 151.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (40) (-261.0, 4.0, 151.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (42) (-261.0, 4.0, 150.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (37) (-262.0, 4.0, 151.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (36) (-263.0, 4.0, 151.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (35) (-262.0, 4.0, 150.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (38) (-263.0, 4.0, 150.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (5) (-256.1, 4.0, 160.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (4) (-255.1, 4.0, 160.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (6) (-256.1, 4.0, 161.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (3) (-255.1, 4.0, 161.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (11) (-262.5, 4.0, 172.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (13) (-262.5, 4.0, 173.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (12) (-263.5, 4.0, 173.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (14) (-263.5, 4.0, 172.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (18) (-256.0, 4.0, 173.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (17) (-255.0, 4.0, 174.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (15) (-255.0, 4.0, 173.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (16) (-256.0, 4.0, 174.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (22) (-260.5, 4.0, 177.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (19) (-259.5, 4.0, 177.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (21) (-259.5, 4.0, 178.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (20) (-260.5, 4.0, 178.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (75) (-254.0, 4.0, 183.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (30) (-253.0, 4.0, 183.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (28) (-253.0, 4.0, 181.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (29) (-252.0, 4.0, 181.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (26) (-265.3, 4.0, 167.8)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (27) (-267.3, 4.0, 167.8)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Bush (28) (-271.8, 4.0, 162.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (41) (-278.0, 1.0, 168.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (39) (-278.0, 1.0, 167.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (207) (-310.8, 1.3, 164.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (210) (-310.8, 1.3, 165.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (209) (-312.0, 1.3, 165.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (208) (-312.0, 1.3, 164.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (103) (-323.5, 4.0, 128.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (101) (-323.5, 4.0, 129.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (102) (-324.5, 4.0, 129.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (104) (-324.5, 4.0, 128.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (95) (-332.0, 4.0, 127.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (348) (-331.0, 4.0, 128.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (94) (-331.0, 4.0, 127.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (343) (-331.0, 4.0, 129.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (353) (-330.1, 4.0, 129.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (354) (-330.1, 4.0, 128.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (344) (-332.0, 4.0, 129.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (347) (-332.0, 4.0, 128.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (349) (-333.0, 4.0, 129.3)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (90) (-323.5, 4.0, 113.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (89) (-323.5, 4.0, 112.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (92) (-322.5, 4.0, 113.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (93) (-322.5, 4.0, 112.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (91) (-324.5, 4.0, 113.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (1) (-324.5, 4.0, 112.5)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (115) (-334.0, 4.0, 109.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (116) (-333.0, 4.0, 109.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (117) (-334.0, 4.0, 108.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (100) (-339.5, 4.0, 114.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (99) (-339.5, 4.0, 115.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (98) (-340.5, 4.0, 115.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (171) (-348.5, 4.0, 124.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (167) (-348.5, 4.0, 123.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (114) (-349.5, 4.0, 123.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (170) (-349.5, 4.0, 124.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (168) (-348.5, 4.0, 122.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (169) (-349.5, 4.0, 122.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (341) (-345.6, 4.0, 127.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (119) (-348.5, 4.0, 129.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (120) (-348.5, 4.0, 128.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (118) (-349.5, 4.0, 129.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (340) (-344.6, 4.0, 126.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (338) (-345.6, 4.0, 126.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (342) (-344.6, 4.0, 127.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (346) (-342.6, 4.0, 127.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (345) (-343.6, 4.0, 127.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (44) (-325.0, 4.0, 88.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (45) (-325.0, 4.0, 87.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (74) (-327.9, 4.0, 88.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (73) (-326.9, 4.0, 88.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (49) (-326.0, 4.0, 88.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (48) (-326.0, 4.0, 87.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (43) (-324.0, 4.0, 88.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (46) (-324.0, 4.0, 87.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (51) (-324.5, 4.0, 78.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (54) (-324.5, 4.0, 77.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (52) (-323.5, 4.0, 77.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (53) (-323.5, 4.0, 78.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (397) (-328.9, 4.0, 68.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (398) (-329.9, 4.0, 67.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (396) (-327.9, 4.0, 67.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (395) (-327.9, 4.0, 68.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (393) (-328.9, 4.0, 67.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (55) (-342.5, 4.0, 78.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (57) (-341.5, 4.0, 78.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (56) (-341.5, 4.0, 77.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (58) (-342.5, 4.0, 77.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (97) (-346.8, 4.0, 72.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (394) (-346.8, 4.0, 73.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (392) (-345.8, 4.0, 72.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (96) (-345.8, 4.0, 71.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (76) (-346.8, 4.0, 71.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Bush (30) (-285.5, 0.5, 74.9)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Bush (29) (-283.4, 0.5, 74.9)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (153) (-295.5, 0.8, 70.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (264) (-295.5, 0.8, 69.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (152) (-296.5, 0.8, 70.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (154) (-296.5, 0.8, 69.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Bush (32) (-291.4, 0.5, 69.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Bush (33) (-293.1, 0.5, 67.1)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Bush (31) (-289.5, 0.5, 69.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (133) (-261.0, 0.3, 61.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (132) (-261.0, 0.3, 62.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (135) (-262.3, 0.3, 62.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (134) (-262.3, 0.3, 61.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (429) (-249.3, 4.0, 113.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (427) (-250.3, 4.0, 112.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (426) (-250.3, 4.0, 113.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (425) (-251.3, 4.0, 113.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (428) (-249.3, 4.0, 112.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (424) (-251.3, 4.0, 112.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (434) (-241.3, 4.0, 117.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (435) (-240.3, 4.0, 117.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (431) (-241.3, 4.0, 118.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (430) (-240.3, 4.0, 118.5)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (141) (-273.5, 0.0, 37.8)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (140) (-272.5, 0.0, 37.8)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (142) (-273.5, 0.3, 36.8)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (180) (-275.8, 0.8, 37.8)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (177) (-275.8, 0.8, 38.8)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (221) (-274.8, 0.6, 37.8)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (219) (-271.9, 0.0, 35.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (220) (-271.9, 0.3, 34.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (218) (-270.9, 0.0, 35.4)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (139) (-283.0, 2.0, 41.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (138) (-284.0, 2.0, 41.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (137) (-284.0, 2.0, 42.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (136) (-283.0, 2.0, 42.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (126) (-308.5, 2.0, 39.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (355) (-308.5, 2.0, 42.1)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (127) (-308.5, 2.0, 40.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (352) (-308.5, 2.0, 41.1)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (351) (-309.5, 2.0, 41.1)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (124) (-309.5, 2.0, 40.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (125) (-309.5, 2.0, 39.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (350) (-309.5, 2.0, 42.1)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (359) (-300.4, 2.0, 24.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (356) (-301.4, 2.0, 24.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (357) (-301.4, 2.0, 23.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (358) (-300.4, 2.0, 23.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (112) (-322.0, 2.0, 43.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (110) (-322.0, 2.0, 44.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (113) (-321.0, 2.0, 43.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (108) (-321.0, 2.0, 45.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (109) (-321.0, 2.0, 44.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (111) (-322.0, 2.0, 45.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (360) (-323.0, 2.0, 45.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (414) (-337.8, 2.0, 44.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (413) (-338.8, 2.0, 44.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (412) (-338.8, 2.0, 45.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (411) (-337.8, 2.0, 45.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (416) (-343.8, 2.0, 42.3)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (415) (-344.8, 2.0, 42.3)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (106) (-359.0, 1.5, 45.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (105) (-359.0, 1.5, 46.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (407) (-358.0, 1.8, 46.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (408) (-358.0, 1.8, 45.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (409) (-358.0, 1.8, 47.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (410) (-359.0, 1.5, 47.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (107) (-360.0, 1.3, 45.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (123) (-322.5, 1.8, 14.8)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (121) (-321.5, 1.8, 15.8)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (122) (-322.5, 1.8, 15.8)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (251) (-313.8, 2.0, 12.3)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (250) (-313.8, 2.0, 13.3)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (253) (-312.8, 2.0, 13.3)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (173) (-308.5, 2.0, 14.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (172) (-309.5, 2.0, 14.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (175) (-309.5, 2.0, 13.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (252) (-310.6, 2.0, 13.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (128) (-308.5, 2.0, -4.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (130) (-309.5, 2.0, -5.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (129) (-309.5, 2.0, -4.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (364) (-291.4, 2.0, -6.9)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (365) (-291.4, 2.0, -5.8)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (363) (-292.4, 2.0, -6.9)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (362) (-292.4, 2.0, -5.9)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (361) (-293.4, 2.0, -5.9)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (249) (-287.3, 2.0, -8.9)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (254) (-286.3, 2.0, -8.9)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (255) (-286.3, 2.0, -9.9)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (256) (-285.3, 1.8, -9.9)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (257) (-285.3, 1.8, -8.8)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (367) (-284.3, 1.5, -10.8)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (368) (-283.3, 1.4, -10.8)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (369) (-283.3, 1.4, -9.6)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (366) (-284.3, 1.5, -9.8)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (131) (-279.0, 2.0, -4.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (143) (-278.0, 2.0, -4.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (146) (-278.0, 2.0, -5.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (145) (-277.0, 2.0, -5.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (144) (-277.0, 2.0, -4.5)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (374) (-245.5, 1.0, 1.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (371) (-243.5, 1.0, 1.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (373) (-244.5, 1.0, 2.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (372) (-244.5, 1.0, 1.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (375) (-245.5, 1.0, 2.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (149) (-246.5, 1.0, 3.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (148) (-245.5, 1.0, 3.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (150) (-246.5, 1.0, 4.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (147) (-245.5, 1.0, 4.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (370) (-243.5, 1.0, 2.0)": TunicLocationData("none", "West Garden West Combat"),
+    "West Garden - West Garden Grass (377) (-256.8, 1.9, 16.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (376) (-256.8, 1.9, 15.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (378) (-257.8, 1.9, 15.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (382) (-256.8, 1.9, 17.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (379) (-257.8, 1.9, 16.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (380) (-257.8, 1.9, 17.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (384) (-255.8, 1.9, 17.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (386) (-254.8, 1.9, 17.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (383) (-256.8, 1.9, 18.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (381) (-257.8, 1.9, 18.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (229) (-234.6, 8.0, 8.6)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (230) (-234.6, 8.0, 7.6)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (225) (-233.6, 8.0, 7.6)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (227) (-233.6, 8.0, 8.6)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (228) (-233.6, 8.0, 9.6)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (181) (-240.5, 8.0, 5.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (184) (-240.5, 8.0, 4.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (182) (-241.5, 8.0, 5.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (183) (-241.5, 8.0, 4.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (223) (-228.5, 8.0, 37.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (226) (-228.5, 8.0, 36.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (419) (-228.5, 8.0, 35.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (417) (-227.5, 8.0, 36.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (25) (-226.0, 8.0, 35.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (423) (-226.5, 8.0, 36.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (222) (-227.5, 8.0, 37.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (418) (-227.5, 8.0, 35.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (420) (-225.5, 8.0, 36.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (421) (-225.5, 8.0, 37.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (422) (-226.5, 8.0, 37.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (224) (-229.5, 8.0, 37.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (26) (-224.3, 8.0, 36.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    # these 4 are above the magic dagger house, choosing south checkpoint based on vibes
+    "West Garden - West Garden Grass (157) (-193.0, 8.0, 40.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (156) (-192.0, 8.0, 40.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (151) (-192.0, 8.0, 41.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (158) (-193.0, 8.0, 41.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (248) (-197.4, 1.0, 22.3)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (245) (-195.4, 1.0, 23.3)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (246) (-196.4, 1.0, 23.3)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (247) (-197.4, 1.0, 23.3)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (162) (-206.5, 1.0, 28.0)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (159) (-205.5, 1.0, 28.0)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (160) (-206.5, 1.0, 29.0)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (161) (-205.5, 1.0, 29.0)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (163) (-211.5, 1.0, 35.0)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (166) (-212.5, 1.0, 35.0)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (165) (-211.5, 1.0, 36.0)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (164) (-212.5, 1.0, 36.0)": TunicLocationData("none", "West Garden at Dagger House"),
+    "West Garden - West Garden Grass (318) (-243.8, 8.0, 72.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (319) (-244.8, 8.0, 72.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (313) (-247.5, 8.0, 67.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (62) (-244.0, 8.0, 65.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (61) (-245.0, 8.0, 64.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (64) (-244.0, 8.0, 64.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (63) (-245.0, 8.0, 65.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (314) (-246.5, 8.0, 68.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (317) (-244.8, 8.0, 71.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (315) (-247.5, 8.0, 68.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (320) (-243.8, 8.0, 71.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (316) (-246.5, 8.0, 67.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (50) (-247.5, 8.0, 83.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (59) (-246.5, 8.0, 83.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (47) (-247.5, 8.0, 84.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (60) (-246.5, 8.0, 84.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (65) (-226.0, 8.0, 67.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (68) (-225.0, 8.0, 67.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (67) (-226.0, 8.0, 68.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (66) (-225.0, 8.0, 68.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (69) (-226.0, 8.0, 72.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (72) (-225.0, 8.0, 72.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (71) (-226.0, 8.0, 73.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (70) (-225.0, 8.0, 73.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (303) (-215.3, 8.0, 83.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (17) (-215.0, 8.0, 85.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (27) (-217.0, 8.0, 81.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (24) (-217.0, 8.0, 87.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (301) (-215.3, 8.0, 82.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (13) (-213.0, 8.0, 83.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (304) (-214.3, 8.0, 82.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (302) (-214.3, 8.0, 83.8)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (16) (-211.0, 8.0, 85.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (12) (-213.0, 8.0, 85.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (14) (-213.0, 8.0, 87.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (15) (-211.0, 8.0, 87.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (309) (-203.5, 8.0, 86.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (11) (-203.0, 8.0, 85.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (312) (-202.5, 8.0, 86.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (2) (-199.0, 8.0, 83.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (308) (-200.5, 8.0, 84.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (305) (-201.5, 8.0, 84.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (307) (-201.5, 8.0, 85.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (-199.0, 8.0, 87.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (306) (-200.5, 8.0, 85.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (7) (-201.0, 8.0, 87.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (310) (-202.5, 8.0, 87.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (311) (-203.5, 8.0, 87.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (1) (-199.0, 8.0, 85.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (4) (-197.0, 8.0, 85.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (5) (-197.0, 8.0, 83.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (3) (-197.0, 8.0, 87.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (6) (-197.0, 8.0, 81.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (10) (-191.0, 8.0, 81.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (8) (-191.0, 8.0, 87.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Bush (9) (-193.0, 8.0, 87.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (333) (-226.0, 8.0, 92.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (336) (-225.0, 8.0, 92.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (334) (-225.0, 8.0, 93.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (339) (-226.0, 8.0, 97.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (337) (-225.0, 8.0, 97.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (335) (-225.0, 8.0, 98.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (329) (-229.3, 8.0, 101.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (332) (-228.3, 8.0, 101.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (331) (-229.3, 8.0, 102.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (328) (-229.3, 8.0, 103.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (330) (-228.3, 8.0, 102.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (325) (-230.3, 8.0, 103.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (326) (-229.3, 8.0, 104.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (327) (-230.3, 8.0, 104.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (321) (-232.8, 8.0, 109.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (324) (-231.8, 8.0, 109.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (323) (-232.8, 8.0, 110.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (322) (-231.8, 8.0, 110.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (399) (-233.8, 8.0, 111.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (400) (-234.8, 8.0, 111.3)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (84) (-244.0, 8.0, 101.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (81) (-245.0, 8.0, 101.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (82) (-244.0, 8.0, 100.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (83) (-245.0, 8.0, 100.5)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (77) (-247.5, 8.0, 98.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (80) (-246.5, 8.0, 98.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (79) (-247.5, 8.0, 97.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (78) (-246.5, 8.0, 97.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (88) (-246.5, 8.0, 109.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (85) (-247.5, 8.0, 109.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (86) (-246.5, 8.0, 110.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (87) (-247.5, 8.0, 110.0)": TunicLocationData("none", "West Garden South Checkpoint"),
+    "West Garden - West Garden Grass (283) (-225.4, 20.0, 172.9)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (284) (-225.4, 20.0, 173.9)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (282) (-226.4, 20.0, 172.9)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (285) (-226.4, 20.0, 173.9)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (279) (-222.3, 20.0, 177.6)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (278) (-222.3, 20.0, 178.6)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (32) (-221.3, 20.0, 178.8)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (33) (-221.3, 20.0, 177.8)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (280) (-221.3, 20.0, 176.6)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (275) (-222.3, 20.0, 179.8)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (9) (-221.3, 20.0, 179.8)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (281) (-223.3, 20.0, 179.8)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (385) (-246.6, 20.0, 172.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (294) (-247.6, 20.0, 172.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (291) (-247.6, 20.0, 173.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (290) (-247.6, 20.0, 174.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (292) (-246.6, 20.0, 174.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (293) (-246.6, 20.0, 173.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (287) (-244.8, 20.0, 176.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (288) (-244.8, 20.0, 175.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (286) (-245.8, 20.0, 175.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (289) (-245.8, 20.0, 176.0)": TunicLocationData("none", "West Garden before Boss"),
+    "West Garden - West Garden Grass (-287.0, 4.0, 117.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (2) (-287.0, 4.0, 118.0)": TunicLocationData("none", "West Garden before Terry"),
+    "West Garden - West Garden Grass (174) (-243.9, 0.5, 52.1)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (262) (-244.8, 0.5, 51.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (263) (-244.8, 0.5, 52.3)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (179) (-334.0, 4.0, 103.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (176) (-335.0, 4.0, 103.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Grass (178) (-334.0, 4.0, 102.0)": TunicLocationData("none", "West Garden after Terry"),
+    "West Garden - West Garden Portal Grass (243) (-202.5, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
+    "West Garden - West Garden Portal Grass (244) (-203.4, 8.0, -20.9)": TunicLocationData("none", "West Garden Portal"),
+    "West Garden - West Garden Portal Grass (242) (-203.6, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
+    "West Garden - West Garden Portal Grass (233) (-197.4, 8.0, -20.9)": TunicLocationData("none", "West Garden Portal"),
+    "West Garden - West Garden Portal Grass (232) (-198.4, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
+    "West Garden - West Garden Portal Grass (234) (-197.4, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
+    "West Garden - West Garden Portal Grass (231) (-196.4, 8.0, -19.9)": TunicLocationData("none", "West Garden Portal"),
+    "West Garden - West Garden Laurels Exit Grass (261) (-182.8, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (259) (-183.8, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (258) (-184.8, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (260) (-183.8, 2.0, 74.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (404) (-172.1, 2.0, 80.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (402) (-172.1, 2.0, 82.5)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (299) (-172.1, 2.0, 81.5)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (403) (-173.4, 2.0, 81.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (401) (-173.4, 2.0, 82.5)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (269) (-162.5, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (267) (-161.3, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (268) (-161.3, 2.0, 74.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (273) (-152.8, 2.0, 73.5)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (271) (-154.0, 2.0, 72.5)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (272) (-152.8, 2.0, 72.5)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (270) (-154.0, 2.0, 71.3)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (274) (-137.0, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (277) (-136.0, 2.0, 74.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "West Garden - West Garden Laurels Exit Grass (276) (-136.0, 2.0, 75.0)": TunicLocationData("none", "West Garden Laurels Exit Region"),
+    "Ruined Atoll - Ruined Atoll Grass beach (132) (-17.0, 0.3, 59.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (133) (-17.0, 0.3, 60.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (131) (-16.0, 0.0, 59.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (130) (-16.0, 0.0, 60.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (129) (-15.0, 0.0, 60.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (134) (-15.0, 0.3, 61.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (139) (-20.0, 0.5, 47.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (140) (-20.0, 0.5, 48.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (138) (-19.0, 0.0, 46.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (137) (-19.0, 0.0, 47.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (136) (-19.0, 0.0, 48.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (141) (-20.0, 0.5, 49.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (135) (-19.0, 0.0, 49.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (109) (-30.3, 2.0, 40.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (106) (-31.3, 2.0, 40.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (107) (-31.3, 1.8, 39.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (110) (-32.3, 2.0, 39.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (108) (-30.3, 1.8, 39.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (111) (-31.3, 1.5, 38.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (123) (-27.8, 1.5, 61.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (121) (-27.8, 1.5, 62.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (118) (-27.8, 1.5, 63.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (122) (-26.8, 1.8, 62.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (117) (-26.8, 1.8, 63.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (115) (-26.8, 2.0, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (114) (-25.8, 2.3, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (113) (-25.8, 2.8, 65.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (112) (-26.8, 2.3, 65.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (119) (-27.8, 1.8, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (120) (-27.8, 1.8, 65.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (179) (-30.3, 0.0, 23.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (176) (-31.3, 0.0, 22.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (178) (-31.3, 0.0, 23.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (177) (-30.3, 0.3, 22.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (174) (-31.3, 0.5, 21.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (180) (-30.3, 0.3, 21.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (182) (-32.0, 0.5, 17.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (183) (-31.0, 0.8, 17.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (184) (-31.0, 0.8, 16.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (185) (-32.0, 0.5, 16.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (186) (-32.0, 0.5, 15.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (187) (-33.0, 0.3, 15.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (126) (-29.3, 2.0, 3.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (116) (-28.3, 2.0, 3.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (128) (-28.3, 2.3, 4.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (127) (-29.3, 2.3, 4.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (143) (-27.3, 2.3, 5.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (142) (-28.3, 2.3, 5.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (147) (-26.3, 2.3, 5.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (146) (-26.3, 2.3, 6.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (145) (-27.3, 2.3, 6.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (171) (-34.3, 0.0, -6.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (170) (-34.3, 0.0, -7.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (156) (-33.3, 0.5, -8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (173) (-33.3, 0.5, -7.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (172) (-33.3, 0.5, -6.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (157) (-34.3, 0.0, -8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (144) (-32.3, 0.5, -8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (125) (-32.3, 0.5, -9.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (155) (-32.3, 0.5, -8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (124) (-33.3, 0.5, -9.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (152) (-19.3, 1.5, -5.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (151) (-19.3, 1.5, -4.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (158) (-17.3, 1.3, -6.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (159) (-17.3, 1.5, -5.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (161) (-16.3, 1.3, -5.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (153) (-20.3, 1.5, -5.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (150) (-20.3, 1.5, -4.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (149) (-21.3, 1.8, -4.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (154) (-21.3, 1.8, -5.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (148) (-22.3, 2.0, -4.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (166) (-16.3, 1.3, -8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (169) (-15.3, 1.5, -9.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (162) (-16.3, 1.3, -7.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (165) (-15.3, 1.5, -8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (163) (-15.3, 1.5, -7.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (160) (-16.3, 1.3, -6.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (164) (-15.3, 1.3, -6.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (168) (-14.3, 1.8, -9.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (167) (-14.3, 1.8, -8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (181) (-20.5, 0.5, -16.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (188) (-19.5, 0.5, -16.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (189) (-19.5, 0.5, -17.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (175) (-20.5, 0.3, -17.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (192) (-20.5, 0.0, -18.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (190) (-21.5, 0.3, -17.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (191) (-21.5, -0.3, -18.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (21) (32.0, 0.9, 9.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (81) (30.0, 0.8, 7.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (82) (31.0, 0.8, 7.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (79) (31.0, 0.8, 9.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (19) (31.0, 0.6, 10.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (80) (30.0, 0.8, 9.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (83) (29.0, 0.8, 7.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (84) (29.0, 0.8, 8.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (20) (32.0, 0.8, 10.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (75) (41.0, 0.5, 9.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (77) (41.0, 0.5, 8.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (22) (42.0, 0.5, 9.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (78) (42.0, 0.5, 8.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (23) (42.0, 0.3, 10.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (76) (41.0, 0.5, 10.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (74) (42.0, 0.5, 11.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (25) (43.0, 0.3, 11.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (26) (43.0, 0.3, 10.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (91) (21.0, 1.3, 41.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (89) (22.0, 1.3, 40.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (28) (23.0, 1.0, 41.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (27) (23.0, 1.3, 40.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (93) (22.0, 1.0, 42.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (90) (22.0, 1.3, 41.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (92) (21.0, 1.0, 42.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (24) (24.0, 1.3, 40.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (29) (15.5, 0.8, 47.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (30) (15.5, 0.8, 48.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (33) (15.5, 0.8, 49.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (34) (15.5, 0.8, 50.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (31) (14.5, 0.8, 48.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (32) (14.5, 0.8, 49.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (86) (10.5, 3.0, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (14) (9.5, 3.0, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (35) (9.5, 2.5, 63.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (85) (8.5, 2.5, 63.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (15) (8.5, 3.0, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (87) (24.0, 1.5, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (18) (25.0, 1.5, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (16) (25.0, 1.5, 65.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (17) (24.0, 1.5, 65.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (88) (23.0, 2.0, 65.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (237) (-99.0, 0.3, 61.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (393) (-100.0, 0.0, 62.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (226) (-100.0, 0.0, 61.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (228) (-99.0, 0.3, 60.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (227) (-100.0, 0.0, 60.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (390) (-99.0, 0.3, 59.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (260) (-83.7, 2.0, 19.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (261) (-83.7, 1.8, 18.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (259) (-82.5, 1.5, 18.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (257) (-82.5, 1.8, 19.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (258) (-81.2, 1.3, 18.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (256) (-81.2, 1.5, 19.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (255) (-80.5, 1.5, 14.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (254) (-80.5, 1.8, 13.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (249) (-79.5, 2.0, 12.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (248) (-79.5, 1.8, 13.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (251) (-80.5, 1.8, 11.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (252) (-80.5, 1.8, 12.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (247) (-79.5, 1.8, 14.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (246) (-79.5, 1.5, 15.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (253) (-79.5, 2.0, 10.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (250) (-79.5, 2.0, 11.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (264) (-53.8, 1.3, 14.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (265) (-53.8, 1.0, 13.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (263) (-52.8, 1.0, 14.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (266) (-53.8, 0.8, 12.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (262) (-52.8, 0.5, 13.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (267) (-53.3, 1.3, 20.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (270) (-54.3, 1.8, 20.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (268) (-53.3, 1.0, 21.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (269) (-54.3, 1.5, 21.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (272) (-69.5, 1.8, -23.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (273) (-69.5, 1.8, -23.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (271) (-69.5, 1.8, -22.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (274) (-70.2, 1.0, -33.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (275) (-70.2, 0.8, -34.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (277) (-69.2, 1.0, -33.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (278) (-69.2, 0.5, -34.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (276) (-69.2, 1.0, -34.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (279) (-68.2, 0.5, -34.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (193) (-88.2, 1.8, -52.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (194) (-88.2, 1.8, -53.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (195) (-88.2, 2.0, -54.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (197) (-87.2, 1.8, -53.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (196) (-87.2, 1.8, -54.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (192) (-97.2, 1.5, -66.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (191) (-96.5, 1.5, -66.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (189) (-96.5, 1.5, -67.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (190) (-95.5, 1.5, -67.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (187) (-95.5, 1.5, -68.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (188) (-96.5, 1.5, -68.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (186) (-95.5, 1.5, -69.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (185) (-96.0, 1.8, -72.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (184) (-96.0, 2.0, -73.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (183) (-96.5, 2.0, -73.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (169) (-100.5, 1.5, -74.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (165) (-99.5, 1.5, -75.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (167) (-101.5, 1.3, -75.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (168) (-101.5, 1.3, -74.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (170) (-102.5, 1.3, -74.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (166) (-100.5, 1.5, -75.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (176) (-103.5, 1.0, -68.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (172) (-103.5, 1.3, -69.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (179) (-102.5, 1.3, -67.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (180) (-101.5, 1.3, -67.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (181) (-101.5, 1.3, -66.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (177) (-103.5, 1.0, -67.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (182) (-102.5, 1.3, -66.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (171) (-103.5, 1.3, -70.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (173) (-104.5, 1.3, -69.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (175) (-104.5, 1.0, -68.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (178) (-104.5, 1.0, -67.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (174) (-104.5, 1.3, -70.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (153) (-98.0, 1.8, -80.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (156) (-99.0, 1.8, -80.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (148) (-96.7, 1.8, -82.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (151) (-96.7, 1.8, -83.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (152) (-96.7, 1.8, -84.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (150) (-95.7, 1.8, -83.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (149) (-95.7, 1.8, -82.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (155) (-95.7, 1.8, -84.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (154) (-95.7, 1.8, -85.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (145) (-91.5, 3.0, -87.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (146) (-91.5, 3.3, -86.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (144) (-90.5, 3.3, -87.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (143) (-89.5, 3.5, -87.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (147) (-90.5, 3.8, -86.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (142) (-89.5, 4.0, -86.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (158) (-102.8, 1.0, -91.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (157) (-102.8, 1.0, -92.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (159) (-104.0, 1.0, -92.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (160) (-104.0, 1.0, -93.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (161) (-102.0, 1.8, -97.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (162) (-101.0, 1.8, -97.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (163) (-102.0, 0.8, -98.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (122) (-85.7, 2.8, -94.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (141) (-85.5, 3.3, -89.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (139) (-85.5, 3.3, -90.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (140) (-84.5, 3.3, -90.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (121) (-84.7, 3.0, -94.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (118) (-83.7, 3.3, -94.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (120) (-84.7, 2.8, -95.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (119) (-83.7, 2.8, -95.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (125) (-78.2, 3.5, -94.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (128) (-78.2, 3.3, -95.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (127) (-78.2, 3.0, -96.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (126) (-79.2, 3.0, -96.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (123) (-79.2, 3.5, -95.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (124) (-79.2, 3.5, -94.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (113) (-83.7, 1.3, -104.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (114) (-83.7, 0.8, -105.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (115) (-82.7, 0.8, -105.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (112) (-82.7, 1.3, -104.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (109) (-80.7, 1.3, -104.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (116) (-80.7, 1.5, -103.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (111) (-81.7, 1.3, -104.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (117) (-81.7, 1.5, -103.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (17) (-37.0, 1.9, -82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (18) (-36.0, 1.9, -82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (22) (-35.0, 1.9, -82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (24) (-35.0, 1.9, -81.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (20) (-36.0, 1.9, -81.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (19) (-37.0, 1.9, -81.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (21) (-34.0, 1.9, -81.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (27) (-34.0, 1.9, -80.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (23) (-34.0, 1.9, -82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (26) (-35.0, 1.9, -80.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (28) (-35.0, 1.9, -79.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (25) (-34.0, 2.4, -79.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (30) (-29.0, 1.9, -85.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (31) (-28.0, 1.9, -85.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (38) (-28.0, 1.9, -86.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (39) (-28.0, 2.4, -87.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (32) (-29.0, 1.9, -84.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (35) (-27.0, 1.9, -85.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (37) (-27.0, 1.9, -86.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (40) (-27.0, 2.3, -87.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (29) (-28.0, 1.9, -84.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (34) (-27.0, 1.9, -84.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (33) (-26.0, 1.9, -84.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (36) (-26.0, 1.9, -85.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (80) (-26.2, 3.6, -74.6)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (78) (-26.2, 3.6, -73.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (81) (-25.2, 3.1, -74.6)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (77) (-25.2, 3.1, -73.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (79) (-27.3, 4.4, -73.6)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (82) (-24.1, 2.4, -73.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (10) (-14.0, 2.7, -76.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (9) (-14.0, 2.9, -77.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (1) (-12.0, 2.9, -77.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (4) (-13.0, 2.9, -77.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (3) (-13.0, 2.9, -76.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (8) (-13.0, 2.9, -78.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (2) (-12.0, 2.9, -78.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (-12.0, 2.9, -76.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (7) (-11.0, 3.1, -78.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (12) (-11.0, 2.8, -79.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (5) (-12.0, 2.9, -79.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (11) (-11.0, 2.6, -80.9)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (6) (-12.0, 2.4, -80.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (90) (-10.0, 1.9, -95.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (93) (-10.0, 1.9, -96.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (94) (-10.0, 1.9, -97.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (83) (-9.0, 1.9, -96.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (89) (-9.0, 1.9, -95.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (86) (-9.0, 1.9, -97.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (87) (-9.0, 1.9, -98.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (84) (-8.0, 1.9, -96.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (88) (-8.0, 1.9, -98.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (91) (-7.0, 1.9, -96.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (92) (-7.0, 1.9, -97.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (85) (-8.0, 1.9, -97.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (95) (-18.8, 0.8, -97.4)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (96) (-18.8, 0.9, -96.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (98) (-17.8, 0.9, -97.4)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (97) (-17.7, 1.1, -96.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (101) (-18.0, 0.7, -98.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (100) (-18.9, 0.6, -98.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (99) (-19.9, 0.7, -97.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (164) (-101.0, 1.5, -98.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (74) (-89.5, 7.8, -82.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (75) (-89.5, 7.8, -81.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (70) (-84.5, 8.0, -84.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (71) (-84.5, 8.0, -85.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (73) (-82.5, 8.0, -85.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (69) (-82.5, 8.0, -84.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (68) (-83.5, 8.0, -84.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (72) (-83.5, 8.0, -85.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (65) (-82.5, 8.0, -83.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (66) (-82.5, 8.0, -84.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (64) (-83.5, 8.0, -83.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (67) (-83.5, 8.0, -84.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (63) (-85.7, 13.3, -70.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (60) (-88.5, 12.8, -72.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (62) (-85.7, 13.8, -69.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (58) (-88.5, 13.3, -70.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (59) (-88.5, 12.8, -71.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (78) (-81.7, 15.0, -61.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (77) (-82.7, 15.0, -61.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (76) (-83.7, 15.0, -61.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (202) (-83.0, 15.0, -62.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (203) (-84.0, 15.0, -62.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (79) (-79.7, 18.3, -78.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (80) (-79.7, 18.0, -79.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (87) (-77.5, 25.0, -69.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (88) (-77.5, 25.0, -70.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (86) (-78.5, 25.0, -69.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (85) (-70.2, 25.0, -77.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (83) (-71.2, 25.0, -78.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (82) (-70.2, 25.0, -78.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (81) (-69.2, 25.0, -78.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (84) (-69.2, 25.0, -77.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (297) (-99.0, 0.8, 7.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (296) (-98.0, 0.8, 7.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (103) (-8.0, 1.8, -40.4)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (102) (-8.0, 1.8, -39.4)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (104) (-9.0, 1.8, -40.4)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (197) (-11.3, 1.5, -30.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (196) (-12.3, 1.3, -30.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (195) (-12.3, 1.0, -31.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (199) (-12.3, 1.0, -29.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (194) (-13.3, 0.8, -31.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (193) (-13.3, 0.8, -30.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (198) (-11.3, 1.3, -29.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (201) (-12.0, 0.0, -46.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (202) (-12.0, 0.3, -45.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (204) (-13.0, 0.0, -46.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (200) (-11.0, 0.0, -46.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (203) (-11.0, 0.3, -45.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (206) (-30.0, 0.3, -33.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (205) (-30.0, 0.3, -32.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (207) (-29.0, 0.0, -33.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (208) (-29.0, 0.0, -32.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (245) (48.0, 1.0, 51.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (242) (48.0, 0.8, 52.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (244) (47.3, 0.8, 51.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (243) (48.0, 0.8, 53.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (240) (47.3, 0.5, 53.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (241) (47.3, 0.8, 52.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (231) (46.3, 0.5, 53.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (239) (47.3, 0.5, 54.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (238) (46.3, 0.5, 54.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (235) (64.8, 0.8, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (229) (64.8, 0.8, 54.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (234) (65.8, 0.5, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (232) (65.8, 0.8, 54.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (233) (62.8, 0.8, 54.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (230) (63.8, 0.8, 54.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (236) (62.8, 0.8, 55.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (223) (68.5, 1.5, 52.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (224) (68.5, 1.5, 51.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (220) (69.5, 2.0, 52.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (221) (69.5, 2.0, 51.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (222) (68.5, 1.8, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (219) (69.5, 2.0, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (5) (53.5, 6.0, 70.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (4) (53.5, 6.0, 70.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (23) (52.5, 6.0, 70.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (25) (55.8, 6.0, 72.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (27) (56.8, 6.0, 74.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (26) (56.8, 6.0, 73.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (24) (55.8, 6.0, 73.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (43) (67.8, 5.8, 82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (42) (68.8, 5.8, 82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (33) (67.8, 5.8, 83.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (35) (69.8, 5.8, 83.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (41) (69.8, 5.8, 82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (34) (68.8, 5.8, 83.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (49) (69.8, 5.8, 84.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (50) (70.8, 5.8, 84.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (46) (74.8, 5.8, 82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (45) (75.8, 5.8, 82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (44) (76.8, 5.8, 82.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (48) (76.8, 5.8, 83.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (47) (75.8, 5.8, 83.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (113) (72.5, 2.8, 87.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (111) (71.5, 2.8, 86.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (112) (72.5, 2.8, 86.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (114) (71.5, 2.8, 87.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (115) (70.5, 2.8, 87.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (110) (70.5, 2.8, 86.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (90) (69.8, 12.8, 80.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (30) (59.8, 7.8, 62.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (31) (58.8, 7.8, 62.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (32) (58.8, 8.0, 61.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (29) (59.8, 8.0, 61.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (28) (59.8, 8.3, 60.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (38) (68.5, 11.8, 59.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (39) (67.5, 11.8, 60.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (37) (68.5, 11.8, 60.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (108) (61.8, 12.8, 67.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (109) (61.8, 12.8, 68.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (89) (69.8, 12.8, 79.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (51) (68.8, 12.8, 79.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (91) (68.8, 12.8, 80.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (106) (64.5, 13.5, 63.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (107) (65.5, 14.0, 63.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (92) (64.5, 13.5, 64.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (200) (69.8, 15.8, 62.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (198) (70.8, 16.0, 62.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (95) (78.5, 18.8, 64.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (94) (79.5, 18.8, 64.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (93) (79.5, 18.8, 65.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (104) (75.5, 20.8, 66.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (105) (74.5, 20.8, 66.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (97) (63.8, 20.8, 69.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (96) (62.8, 20.8, 69.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (98) (62.8, 20.8, 68.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (103) (68.8, 20.8, 77.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (102) (69.8, 20.8, 77.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (99) (68.8, 20.8, 78.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (100) (69.8, 20.8, 78.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (101) (70.8, 20.8, 78.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (215) (72.3, 0.3, 26.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (216) (72.3, 0.3, 25.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (214) (73.3, 0.3, 26.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (217) (68.5, 1.3, 15.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (211) (68.5, 1.0, 14.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (212) (69.5, 1.3, 14.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (209) (69.5, 1.3, 13.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (213) (69.5, 1.3, 15.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (210) (68.5, 1.0, 13.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (218) (69.5, 1.3, 16.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (62.0, 2.0, 5.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (1) (62.0, 2.0, 4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (2) (63.0, 2.5, 4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (73) (54.5, 0.5, -1.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (72) (53.5, 0.5, -1.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (5) (54.5, 1.0, -2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (6) (53.5, 0.5, -2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (7) (53.5, 0.5, -3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (70) (52.5, 0.5, -3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (71) (52.5, 0.5, -2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (4) (54.5, 0.5, -3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (8) (54.5, 0.5, -4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (10) (55.5, 1.0, -3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (9) (55.5, 0.5, -4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (382) (83.5, 3.3, 69.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (381) (83.5, 3.3, 70.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (379) (82.5, 3.5, 69.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (380) (82.5, 3.5, 70.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (372) (85.0, 3.3, 75.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (371) (85.0, 3.3, 76.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (370) (84.0, 3.5, 76.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (373) (84.0, 3.5, 77.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (374) (84.0, 3.5, 78.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (369) (84.0, 3.5, 75.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (378) (83.0, 4.0, 77.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (375) (84.0, 3.3, 79.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (377) (83.0, 4.0, 78.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (376) (83.0, 3.8, 79.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (368) (89.0, 2.0, 79.9)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (367) (88.0, 2.0, 79.9)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (366) (88.0, 2.3, 78.9)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (364) (89.0, 2.3, 78.9)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (365) (90.0, 2.3, 78.9)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (389) (92.6, 1.9, 72.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (388) (92.6, 2.2, 71.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (383) (93.6, 1.4, 72.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (384) (93.6, 1.9, 71.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (386) (94.6, 1.9, 70.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (385) (94.6, 1.7, 71.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (387) (93.6, 1.9, 70.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (357) (98.5, 3.5, 67.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (356) (99.5, 3.5, 67.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (360) (100.5, 3.5, 67.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (358) (99.5, 3.3, 68.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (359) (100.5, 3.3, 68.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (363) (102.5, 3.3, 67.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (355) (102.5, 3.5, 65.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (361) (103.5, 3.0, 65.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (362) (103.5, 2.8, 67.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (292) (68.3, 0.8, -39.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (293) (68.3, 0.8, -40.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (294) (69.5, 1.0, -41.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (290) (69.3, 1.0, -39.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (289) (69.3, 1.3, -40.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (291) (69.3, 0.8, -38.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (295) (70.3, 1.0, -41.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (287) (60.0, 1.0, -29.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (288) (60.0, 1.3, -28.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (286) (59.0, 0.8, -29.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (284) (59.0, 1.0, -28.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (285) (59.0, 1.3, -27.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (282) (58.0, 1.3, -27.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (283) (58.0, 0.8, -28.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (94) (36.5, 1.3, -20.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (36) (37.5, 1.3, -20.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (96) (37.5, 1.3, -21.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (95) (36.5, 1.3, -19.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (37) (37.5, 1.1, -19.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (38) (38.5, 0.9, -20.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (97) (38.5, 1.3, -21.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (50) (21.4, 0.8, -33.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (51) (21.4, 0.8, -34.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (60) (21.4, 0.8, -32.4)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (48) (20.4, 0.4, -34.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (59) (20.4, 0.4, -35.6)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (49) (20.4, 0.4, -33.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (63) (25.0, 0.5, -42.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (64) (24.0, 0.0, -42.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (61) (25.0, 0.4, -43.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (65) (24.0, 0.0, -43.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (62) (25.0, 0.5, -44.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (103) (26.0, 0.6, -44.4)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (104) (26.0, 0.5, -43.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (101) (33.5, 0.8, -38.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (100) (33.5, 0.8, -37.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (99) (32.5, 0.8, -36.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (67) (34.5, 0.6, -37.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (102) (34.5, 0.8, -38.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (66) (34.5, 0.6, -36.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (68) (33.5, 0.8, -36.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (98) (32.5, 0.8, -35.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (69) (33.5, 0.8, -35.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (46) (36.0, 0.1, -49.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (45) (36.0, 0.1, -48.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (47) (35.0, 0.3, -48.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (41) (33.5, 2.6, -72.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (40) (34.5, 3.1, -71.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (39) (34.5, 3.1, -72.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (42) (34.5, 3.1, -73.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (43) (39.0, 2.5, -74.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (44) (40.0, 2.5, -74.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (105) (40.0, 2.5, -74.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (54) (41.4, 1.3, -87.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (56) (40.4, 1.3, -86.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (55) (42.4, 1.0, -87.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (53) (41.4, 1.3, -86.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (52) (42.4, 1.0, -86.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (58) (41.5, 1.1, -85.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (57) (40.4, 1.3, -85.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (105) (30.3, 2.0, -106.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (107) (31.3, 2.0, -106.3)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (110) (30.5, 0.3, -109.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (106) (30.5, 0.5, -108.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (280) (31.5, 1.0, -108.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (108) (31.5, 1.0, -108.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (281) (31.5, 0.3, -109.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (61) (19.1, 2.1, -100.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (59) (19.1, 2.1, -101.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (63) (18.1, 2.1, -100.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (62) (18.1, 2.1, -99.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (64) (19.1, 2.0, -99.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (60) (18.1, 2.1, -101.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (44) (17.1, 2.1, -101.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (41) (16.1, 2.1, -101.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (45) (17.1, 2.1, -102.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (43) (16.1, 2.1, -103.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (42) (16.1, 2.1, -102.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (58) (18.1, 2.1, -102.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (46) (17.1, 2.1, -103.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (57) (19.1, 2.1, -102.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (48) (16.1, 2.1, -104.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (47) (17.1, 2.1, -104.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (52) (18.1, 2.1, -97.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (50) (18.1, 2.1, -96.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (53) (18.1, 2.1, -95.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (55) (18.1, 2.1, -94.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (54) (17.1, 2.1, -95.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (49) (17.1, 2.1, -97.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (51) (17.1, 2.1, -96.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (56) (17.1, 2.1, -94.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (66) (16.1, 2.1, -110.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (68) (16.1, 2.1, -111.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (65) (17.1, 2.1, -110.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (67) (17.1, 2.1, -111.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (72) (18.1, 2.1, -111.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (71) (18.1, 2.1, -110.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (73) (18.1, 2.1, -109.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (74) (19.1, 2.1, -109.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (70) (19.1, 2.1, -110.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (76) (18.1, 2.1, -108.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (75) (19.1, 2.1, -108.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (69) (19.1, 2.1, -111.1)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (130) (-3.5, 0.5, -116.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (131) (-3.5, 0.5, -117.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (129) (-2.5, 0.3, -116.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (132) (-2.5, 0.3, -117.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (133) (-2.5, 0.3, -118.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (138) (8.0, 0.5, -124.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (137) (8.0, 0.0, -125.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (135) (10.0, 0.5, -124.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (136) (9.0, 0.0, -125.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (134) (9.0, 0.5, -124.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (395) (67.8, 2.5, -80.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (394) (67.8, 2.5, -79.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (391) (66.8, 2.5, -79.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (397) (68.8, 2.5, -79.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (396) (66.8, 2.5, -80.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (392) (65.8, 2.5, -79.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (400) (63.3, 2.8, -74.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (399) (64.3, 3.0, -74.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (401) (63.3, 2.8, -73.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (398) (64.3, 3.0, -73.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (402) (62.3, 2.5, -73.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (405) (60.5, 1.3, -68.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (404) (59.5, 0.5, -68.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (406) (60.5, 1.3, -69.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (403) (59.5, 0.5, -69.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (407) (61.5, 1.5, -69.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (325) (-111.8, 1.3, 2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (323) (-111.8, 1.3, 1.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (316) (-110.5, 1.3, 3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (319) (-111.5, 1.3, 4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (317) (-111.5, 1.3, 3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (318) (-110.5, 1.3, 4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (321) (-112.3, 1.3, 4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (320) (-112.3, 1.3, 3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (326) (-112.8, 1.3, 2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (327) (-113.5, 1.3, 2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (324) (-112.8, 1.3, 1.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (322) (-113.5, 1.3, 1.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (328) (-112.0, 0.8, -2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (329) (-112.0, 0.5, -3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (333) (-111.3, 0.8, -2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (331) (-111.3, 0.5, -3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (330) (-110.3, 0.5, -3.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (332) (-110.3, 0.8, -2.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (334) (-111.0, 0.3, -4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (337) (-110.3, 0.3, -4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (354) (-113.0, 0.3, -4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (353) (-112.0, 0.3, -4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (336) (-109.3, 0.3, -4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (338) (-109.3, -0.3, -5.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (339) (-110.3, -0.3, -5.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (335) (-111.0, -0.3, -5.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (350) (-112.0, -0.3, -5.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (349) (-113.8, 0.3, -4.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (351) (-113.0, -0.3, -5.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (352) (-113.8, -0.3, -5.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (314) (-112.3, 0.8, 6.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (315) (-112.3, 0.8, 7.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (313) (-111.5, 0.8, 6.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (311) (-111.5, 0.8, 7.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (310) (-110.5, 0.8, 7.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (306) (-110.5, 0.8, 8.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (312) (-110.5, 0.8, 6.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (307) (-109.5, 0.8, 8.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (308) (-111.5, 0.8, 8.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (300) (-107.5, 0.0, 10.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (301) (-107.5, 0.3, 9.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (304) (-108.3, 0.0, 10.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (299) (-108.5, 0.0, 10.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (303) (-110.5, 0.3, 9.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (302) (-109.5, 0.3, 9.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (305) (-109.5, 0.0, 10.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (298) (-108.5, 0.3, 9.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (341) (-113.5, 0.8, 10.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (344) (-113.5, 0.5, 11.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (346) (-113.5, 0.8, 9.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (309) (-111.5, 0.5, 9.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (345) (-112.5, 0.8, 9.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (342) (-112.5, 0.8, 8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (340) (-112.5, 0.8, 10.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (347) (-114.3, 0.8, 8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (348) (-114.3, 0.8, 9.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass beach (343) (-113.5, 0.8, 8.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (191) (-89.5, 6.5, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (190) (-89.5, 6.5, 54.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (189) (-88.5, 6.5, 54.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (188) (-88.5, 6.5, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (197) (-87.0, 13.0, 75.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (194) (-87.0, 13.0, 74.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (184) (-86.0, 13.0, 73.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (183) (-86.0, 13.0, 74.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (181) (-86.0, 13.0, 75.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (185) (-84.7, 13.0, 73.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (182) (-83.0, 13.0, 72.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (199) (-83.0, 13.0, 70.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (201) (-84.0, 13.0, 70.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (135) (-83.5, 13.0, 58.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (128) (-82.5, 13.0, 57.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (130) (-82.5, 13.0, 58.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (147) (-86.0, 13.0, 54.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (132) (-82.5, 13.0, 60.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (134) (-83.5, 13.0, 59.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (131) (-82.5, 13.0, 59.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (136) (-78.5, 13.0, 56.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (139) (-79.5, 13.0, 55.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (133) (-79.5, 13.0, 56.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (138) (-80.5, 13.0, 55.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (137) (-80.5, 13.0, 56.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (143) (-85.0, 13.0, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (142) (-86.0, 13.0, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (145) (-87.0, 13.0, 53.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (146) (-87.0, 13.0, 54.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (140) (-85.0, 13.0, 52.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (141) (-86.0, 13.0, 52.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (144) (-84.0, 13.0, 52.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (192) (-70.5, 13.0, 56.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (186) (-69.5, 13.0, 56.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (187) (-69.5, 13.0, 55.8)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (123) (-82.5, 13.0, 44.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (126) (-82.5, 13.0, 45.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (121) (-83.5, 13.0, 45.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (124) (-83.5, 13.0, 44.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (125) (-83.5, 13.0, 43.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (151) (-82.5, 13.0, 27.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (152) (-82.5, 13.0, 26.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (150) (-81.5, 13.0, 27.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (148) (-81.5, 13.0, 25.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (149) (-81.5, 13.0, 26.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (154) (-79.0, 13.0, 23.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (153) (-78.0, 13.0, 23.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (161) (-68.0, 13.0, 26.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (162) (-68.0, 13.0, 27.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (165) (-69.0, 13.0, 27.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (164) (-69.0, 13.0, 28.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (163) (-68.0, 13.0, 28.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (166) (-68.0, 13.0, 29.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (167) (-63.0, 13.0, 24.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (168) (-62.0, 13.0, 24.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (170) (-61.0, 13.0, 25.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (169) (-62.0, 13.0, 25.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (172) (-62.0, 13.0, 26.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (178) (-61.0, 13.0, 43.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (175) (-60.0, 13.0, 43.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (177) (-61.0, 13.0, 44.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (174) (-59.0, 13.0, 42.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (173) (-59.0, 13.0, 43.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (171) (-59.0, 13.0, 44.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (176) (-60.0, 13.0, 44.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (159) (-83.5, 8.0, 23.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (160) (-83.5, 8.0, 24.5)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (158) (-83.5, 8.0, 22.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (155) (-82.5, 8.0, 24.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (157) (-82.5, 8.0, 22.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Grass (156) (-82.5, 8.0, 23.0)": TunicLocationData("Ruined Atoll", "Ruined Atoll"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (413) (-10.3, 0.3, 128.5)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (414) (-10.3, 0.3, 127.5)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (412) (-11.3, 0.0, 129.5)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (411) (-11.3, 0.0, 128.5)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (410) (-11.3, 0.0, 127.5)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (408) (-4.0, 1.0, 118.0)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (13) (-4.0, 1.0, 116.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (12) (-3.0, 1.0, 116.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (409) (-3.0, 0.8, 115.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (11) (-3.0, 1.0, 117.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (3) (-3.0, 1.0, 118.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass (129) (32.5, 0.8, 84.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass (179) (33.5, 0.8, 84.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass (180) (34.5, 0.8, 84.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass (195) (33.5, 0.3, 85.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass (193) (35.3, 0.8, 84.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass (196) (34.5, 0.3, 85.8)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (418) (54.5, 0.8, 78.3)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (419) (54.5, 0.8, 77.3)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (417) (55.8, 0.8, 78.3)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (416) (55.8, 1.0, 77.3)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Lower Entry Area Grass beach (415) (56.8, 0.8, 78.3)": TunicLocationData(
+        "Ruined Atoll Lower Entry Area", "Ruined Atoll Lower Entry Area"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (20) (87.5, 12.5, 59.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (17) (86.5, 12.5, 59.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (16) (86.5, 12.5, 60.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (21) (87.5, 12.5, 60.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (15) (91.5, 12.5, 58.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (14) (91.5, 12.5, 57.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (13) (92.5, 12.5, 57.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (12) (92.5, 12.5, 58.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (10) (93.5, 12.5, 57.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Ruined Atoll - Ruined Atoll Frog Mouth Grass (11) (93.5, 12.5, 58.0)": TunicLocationData("Ruined Atoll Frog Mouth",
+                                                                                              "Ruined Atoll Frog Mouth"),
+    "Frog Stairway - Frog Stairs Upper Grass (24) (187.0, 106.0, -65.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (23) (188.0, 106.0, -65.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (22) (189.0, 106.0, -64.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (20) (188.0, 106.0, -64.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (17) (187.0, 106.0, -64.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (14) (191.0, 106.0, -64.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (12) (192.0, 106.0, -63.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (15) (191.0, 106.0, -63.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (13) (192.0, 106.0, -64.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (25) (192.0, 106.0, -65.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (16) (189.0, 106.0, -63.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (21) (188.0, 106.0, -63.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (10) (193.0, 106.0, -64.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (11) (193.0, 106.0, -63.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (26) (193.0, 106.0, -62.0)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Upper Grass (27) (196.6, 106.0, -62.5)": TunicLocationData("Frog Stairs Upper",
+                                                                                            "Frog Stairs Upper"),
+    "Frog Stairway - Frog Stairs Lower Grass (9) (179.8, 61.9, -67.1)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (8) (178.6, 61.9, -67.1)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (7) (204.4, 58.1, -94.1)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (5) (205.5, 58.1, -94.1)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (6) (205.5, 58.1, -93.0)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (2) (205.5, 54.0, -77.0)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (205.5, 54.0, -76.0)": TunicLocationData("Frog Stairs Lower",
+                                                                                      "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (1) (204.5, 54.0, -76.0)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (4) (201.4, 54.3, -71.3)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Frog Stairway - Frog Stairs Lower Grass (3) (200.4, 54.3, -71.3)": TunicLocationData("Frog Stairs Lower",
+                                                                                          "Frog Stairs Lower"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (77) (-8.8, -4.0, -169.5)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (78) (-7.8, -4.0, -169.5)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (81) (-7.8, -4.0, -168.5)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (80) (-6.8, -4.0, -168.5)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (79) (-6.8, -4.0, -169.5)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Bush (8) (-7.3, -4.0, -171.0)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (25) (-5.5, -4.0, -150.0)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (28) (-4.5, -4.0, -151.0)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (26) (-4.5, -4.0, -150.0)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (24) (-3.3, -4.0, -149.0)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (23) (-4.5, -4.0, -149.0)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (22) (-8.3, -4.0, -138.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (21) (-7.3, -4.0, -138.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (18) (-7.3, -4.0, -137.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (20) (-8.3, -4.0, -137.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (13) (-2.0, -4.0, -137.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (17) (-1.0, -4.0, -138.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (14) (-1.0, -4.0, -137.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (16) (0.0, -4.0, -138.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (15) (0.0, -4.0, -137.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Bush (6) (-18.0, -4.0, -145.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (12) (-18.3, -4.0, -144.0)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (10) (-17.0, -4.0, -142.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (11) (-18.3, -4.0, -142.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (76) (-17.3, -4.0, -151.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (74) (-17.3, -4.0, -152.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (438) (-18.3, -4.0, -150.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (75) (-18.3, -4.0, -151.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (73) (-18.3, -4.0, -152.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (32) (-2.5, -4.0, -156.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (29) (-1.5, -4.0, -156.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (31) (-2.5, -4.0, -157.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from East Forest Grass (30) (-1.5, -4.0, -157.8)": TunicLocationData(
+        "Fortress Exterior from East Forest", "Fortress Exterior from East Forest"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (44) (-26.8, -5.0, -135.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (39) (-26.8, -5.0, -134.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (38) (-26.8, -5.0, -133.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (41) (-28.8, -5.0, -134.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (37) (-27.8, -5.0, -133.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (40) (-27.8, -5.0, -134.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (43) (-27.8, -5.0, -135.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (42) (-28.8, -5.0, -135.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (49) (-21.5, -5.0, -133.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (47) (-20.5, -5.0, -134.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (48) (-21.5, -5.0, -132.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (46) (-20.5, -5.0, -133.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (45) (-20.5, -5.0, -132.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (34) (-16.8, -5.5, -126.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (27) (-17.8, -5.6, -125.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (33) (-17.8, -5.5, -126.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (19) (-16.8, -5.5, -125.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (154) (-20.0, -4.5, -118.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (155) (-19.0, -4.5, -118.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (153) (-20.0, -4.5, -117.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (152) (-19.0, -4.5, -117.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (157) (-26.0, -5.0, -116.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (156) (-26.0, -5.0, -117.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (158) (-25.0, -5.0, -117.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (160) (-26.0, -5.0, -118.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (159) (-25.0, -5.0, -118.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (58) (-24.5, -4.5, -110.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (57) (-24.5, -4.5, -109.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (56) (-24.5, -4.5, -108.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (55) (-25.5, -4.5, -108.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (54) (-25.5, -4.5, -109.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (59) (-25.5, -4.5, -110.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (53) (-26.5, -4.5, -109.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (52) (-18.5, -4.3, -109.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (50) (-18.5, -4.3, -108.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (51) (-19.5, -4.3, -108.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (67) (-14.5, 0.0, -94.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (63) (-15.5, 0.0, -93.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (66) (-13.5, 0.0, -94.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (64) (-14.5, 0.0, -93.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (69) (-16.5, 0.0, -93.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (1) (-17.3, 0.0, -95.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (62) (-15.5, 0.0, -92.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (68) (-16.5, 0.0, -92.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (60) (-13.5, 0.0, -92.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (65) (-13.5, 0.0, -93.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (61) (-14.5, 0.0, -92.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (-12.0, 0.0, -94.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (3) (-7.3, 0.0, -102.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (2) (-9.3, 0.0, -102.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (4) (-7.3, 0.0, -104.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (72) (-5.8, 0.0, -91.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (70) (-4.8, 0.0, -90.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (71) (-5.8, 0.0, -90.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (8) (9.0, 0.0, -90.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (7) (8.0, 0.0, -90.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (9) (7.0, 0.0, -89.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (5) (9.0, 0.0, -89.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (6) (8.0, 0.0, -89.8)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (5) (4.8, 0.0, -90.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (84) (1.8, 0.0, -74.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (122) (3.0, 0.0, -74.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (82) (-1.8, 0.0, -74.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (86) (-1.8, 0.0, -75.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (83) (-2.8, 0.0, -74.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (87) (-2.8, 0.0, -75.3)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (85) (-2.6, 0.0, -71.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (88) (-3.6, 0.0, -71.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (89) (-2.6, 0.0, -70.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (11) (-15.5, 0.0, -70.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (7) (-17.5, 0.0, -68.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (9) (-15.5, 0.0, -68.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (164) (-26.0, 0.0, -74.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (163) (-25.0, 0.0, -74.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (168) (-24.3, 0.0, -74.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (167) (-23.3, 0.0, -74.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (162) (-25.0, 0.0, -75.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (161) (-26.0, 0.0, -75.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (166) (-23.3, 0.0, -75.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (165) (-24.3, 0.0, -75.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (102) (-26.0, 0.0, -82.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (13) (-28.5, 0.0, -83.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (103) (-24.0, 0.0, -83.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (101) (-25.0, 0.0, -82.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (100) (-25.0, 0.0, -83.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (99) (-26.0, 0.0, -83.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (12) (-30.5, 0.0, -85.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Bush (10) (-28.5, 0.0, -85.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (110) (-34.0, 0.0, -85.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (111) (-35.0, 0.0, -84.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (109) (-35.0, 0.0, -85.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (106) (-21.0, 0.0, -85.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (107) (-20.0, 0.0, -85.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (104) (-20.0, 0.0, -86.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (105) (-21.0, 0.0, -86.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (108) (-19.0, 0.0, -86.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (93) (-41.5, 0.0, -61.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (92) (-40.5, 0.0, -61.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (90) (-41.5, 0.0, -60.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (91) (-40.5, 0.0, -60.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (97) (-52.0, 0.0, -63.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (95) (-52.0, 0.0, -62.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (96) (-51.0, 0.0, -62.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (94) (-53.0, 0.0, -62.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (98) (-53.0, 0.0, -63.5)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (2) (11.0, 9.0, -92.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (3) (11.0, 9.0, -93.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior from Overworld Grass (4) (10.0, 9.0, -92.0)": TunicLocationData(
+        "Fortress Exterior from Overworld", "Fortress Exterior from Overworld"),
+    "Fortress Courtyard - Fortress Exterior near cave Grass (113) (-54.0, 0.0, -34.0)": TunicLocationData(
+        "Fortress Exterior near cave", "Fortress Exterior near cave"),
+    "Fortress Courtyard - Fortress Exterior near cave Grass (112) (-54.0, 0.0, -33.0)": TunicLocationData(
+        "Fortress Exterior near cave", "Fortress Exterior near cave"),
+    "Fortress Courtyard - Fortress Exterior near cave Grass (114) (-55.0, 0.0, -33.0)": TunicLocationData(
+        "Fortress Exterior near cave", "Fortress Exterior near cave"),
+    "Fortress Courtyard - Fortress Exterior near cave Grass (115) (-50.0, 0.0, -43.5)": TunicLocationData(
+        "Fortress Exterior near cave", "Fortress Exterior near cave"),
+    "Fortress Courtyard - Fortress Exterior near cave Grass (116) (-50.0, 0.0, -44.5)": TunicLocationData(
+        "Fortress Exterior near cave", "Fortress Exterior near cave"),
+    "Fortress Courtyard - Fortress Courtyard Grass (355) (-14.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (353) (-14.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (346) (-13.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (348) (-13.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (344) (-13.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (349) (-12.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (347) (-12.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (354) (-15.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (342) (-15.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (352) (-15.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (340) (-15.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (350) (-15.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (341) (-14.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (343) (-14.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (351) (-14.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (345) (-12.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (339) (-14.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (325) (-13.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (324) (-13.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (315) (-16.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (309) (-16.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (317) (-16.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (316) (-17.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (314) (-17.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (321) (-14.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (323) (-14.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (313) (-14.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (311) (-14.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (319) (-14.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (310) (-15.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (312) (-15.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (318) (-15.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (338) (-15.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (320) (-15.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (322) (-15.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (300) (-17.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (304) (-17.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (302) (-17.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (305) (-16.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (301) (-16.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (303) (-16.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (306) (-15.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (307) (-15.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (308) (-17.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (295) (-16.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (293) (-16.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (288) (-14.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (289) (-14.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (283) (-15.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (287) (-15.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (285) (-15.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (272) (-18.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (278) (-18.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (291) (-18.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (280) (-18.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (274) (-16.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (284) (-16.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (282) (-16.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (286) (-16.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (276) (-16.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (281) (-17.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (294) (-17.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (279) (-17.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (273) (-17.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (292) (-17.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (290) (-19.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (296) (-19.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (299) (-18.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (297) (-18.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (298) (-19.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (277) (-15.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (275) (-15.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (135) (-14.8, 0.0, -6.5)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (133) (-13.8, 0.0, -6.5)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (134) (-13.8, 0.0, -7.5)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (132) (-12.8, 0.0, -7.5)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (131) (-12.8, 0.0, -6.5)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (367) (-29.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (365) (-29.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (363) (-29.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (368) (-28.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (369) (-27.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (373) (-27.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (371) (-27.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (362) (-30.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (364) (-30.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (366) (-30.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (356) (-30.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (357) (-29.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (361) (-29.0, 0.0, -31.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (359) (-29.0, 0.0, -31.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (358) (-30.0, 0.0, -31.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (360) (-30.0, 0.0, -31.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (372) (-28.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (370) (-28.0, 0.0, -30.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (117) (-15.9, 2.9, -44.6)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (120) (-14.9, 3.1, -45.6)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (118) (-14.9, 3.1, -44.6)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (121) (-13.8, 3.4, -44.6)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (328) (7.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (334) (4.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (336) (4.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (335) (5.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (337) (5.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (333) (6.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (332) (6.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (327) (9.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (329) (8.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (331) (8.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (330) (7.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (264) (12.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (262) (12.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (226) (12.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (249) (11.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (326) (9.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (246) (10.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (248) (10.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (247) (11.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (254) (12.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (260) (12.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (252) (12.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (256) (10.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (257) (11.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (228) (12.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (236) (12.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (227) (13.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (237) (13.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (229) (13.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (261) (13.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (259) (11.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (258) (10.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (238) (12.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (239) (13.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (270) (16.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (268) (16.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (233) (15.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (245) (15.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (241) (15.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (243) (15.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (235) (15.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (244) (14.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (232) (14.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (234) (14.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (240) (14.0, 0.0, -28.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (242) (14.0, 0.0, -29.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (269) (17.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (267) (17.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (271) (17.0, 0.0, -27.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (266) (16.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (224) (16.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (222) (16.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (231) (15.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (219) (15.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (230) (14.0, 0.0, -26.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (218) (14.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (265) (13.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (263) (13.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (220) (16.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (217) (15.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (209) (15.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (216) (14.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (208) (14.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (255) (13.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (253) (13.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (207) (15.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (210) (16.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (214) (16.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (212) (16.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (198) (18.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (223) (17.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (221) (17.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (225) (17.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (196) (18.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (195) (21.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (193) (21.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (191) (21.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (194) (20.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (190) (20.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (200) (20.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (192) (20.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (183) (19.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (197) (19.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (185) (19.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (189) (19.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (187) (19.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (184) (18.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (186) (18.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (182) (18.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (188) (18.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (215) (17.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (213) (17.0, 0.0, -23.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (211) (17.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (176) (18.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (180) (18.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (174) (18.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (179) (17.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (35) (17.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (171) (17.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (169) (17.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (16.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                          "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (36) (16.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (178) (16.0, 0.0, -21.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (170) (16.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (206) (14.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (251) (13.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (250) (12.0, 0.0, -22.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (199) (19.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (181) (19.0, 0.0, -20.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (173) (19.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (177) (19.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (175) (19.0, 0.0, -19.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (172) (18.0, 0.0, -18.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (202) (20.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (204) (20.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (201) (21.0, 0.0, -24.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (203) (21.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (205) (21.0, 0.0, -25.0)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (126) (26.8, 0.0, -15.8)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (127) (25.8, 0.0, -15.8)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (125) (26.8, 0.0, -14.8)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (128) (25.8, 0.0, -14.8)": TunicLocationData("Fortress Courtyard",
+                                                                                                "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (119) (-21.8, 2.0, -51.3)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (130) (-20.8, 2.0, -50.3)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (129) (-20.8, 2.0, -51.3)": TunicLocationData("Fortress Courtyard",
+                                                                                                 "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (124) (16.5, 0.0, -6.5)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Grass (123) (17.5, 0.0, -6.5)": TunicLocationData("Fortress Courtyard",
+                                                                                               "Fortress Courtyard"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (421) (32.5, 8.0, -41.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (143) (32.5, 8.0, -42.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (145) (32.5, 8.0, -43.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (419) (32.5, 8.0, -41.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (382) (36.5, 8.0, -39.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (384) (36.5, 8.0, -39.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (380) (36.5, 8.0, -38.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (383) (37.5, 8.0, -39.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (385) (37.5, 8.0, -39.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (381) (37.5, 8.0, -38.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (144) (31.5, 8.0, -43.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (142) (31.5, 8.0, -42.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (141) (37.5, 8.0, -35.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (375) (37.5, 8.0, -36.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (379) (37.5, 8.0, -37.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (377) (37.5, 8.0, -37.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (374) (36.5, 8.0, -36.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (376) (36.5, 8.0, -37.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (140) (36.5, 8.0, -35.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (378) (36.5, 8.0, -37.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (431) (35.5, 8.0, -38.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (429) (35.5, 8.0, -37.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (433) (35.5, 8.0, -38.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (432) (34.5, 8.0, -38.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (430) (34.5, 8.0, -38.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (415) (32.5, 8.0, -39.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (413) (32.5, 8.0, -39.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (408) (32.5, 8.0, -36.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (411) (32.5, 8.0, -38.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (409) (32.5, 8.0, -37.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (405) (32.5, 8.0, -35.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (407) (31.5, 8.0, -37.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (404) (31.5, 8.0, -36.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (423) (34.5, 8.0, -35.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (427) (34.5, 8.0, -36.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (428) (34.5, 8.0, -37.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (425) (34.5, 8.0, -36.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (424) (33.5, 8.0, -36.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (422) (33.5, 8.0, -35.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (426) (33.5, 8.0, -36.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (416) (31.5, 8.0, -40.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (414) (31.5, 8.0, -39.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (412) (31.5, 8.0, -39.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (410) (31.5, 8.0, -38.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (417) (32.5, 8.0, -40.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (420) (31.5, 8.0, -41.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (418) (31.5, 8.0, -41.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (138) (36.5, 8.0, -34.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (137) (37.5, 8.0, -34.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (136) (37.5, 8.0, -33.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (139) (36.5, 8.0, -33.5)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (406) (31.5, 8.0, -35.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (396) (36.5, 8.0, -22.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (394) (36.5, 8.0, -22.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (389) (36.5, 8.0, -20.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (398) (36.5, 8.0, -23.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (392) (36.5, 8.0, -21.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (397) (37.5, 8.0, -22.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (391) (37.5, 8.0, -20.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (395) (37.5, 8.0, -22.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (393) (37.5, 8.0, -21.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (401) (37.5, 8.0, -24.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (399) (37.5, 8.0, -23.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (436) (37.5, 8.0, -25.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (403) (37.5, 8.0, -24.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (400) (36.5, 8.0, -24.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (402) (36.5, 8.0, -24.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (437) (36.5, 8.0, -25.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (390) (37.5, 8.0, -19.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (387) (37.5, 8.0, -18.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (388) (36.5, 8.0, -18.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (386) (36.5, 8.0, -19.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (435) (37.5, 8.0, -26.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (434) (36.5, 8.0, -26.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (150) (31.8, 8.0, -9.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (146) (31.8, 8.0, -7.8)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (147) (32.8, 8.0, -7.8)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (149) (32.8, 8.0, -6.8)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (151) (32.8, 8.0, -9.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (148) (31.8, 8.0, -6.8)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Fortress Courtyard - Fortress Courtyard Upper Grass (1) (72.0, 8.0, -29.0)": TunicLocationData(
+        "Fortress Courtyard Upper", "Fortress Courtyard Upper"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (12) (-94.8, 7.0, 41.0)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (14) (-94.8, 7.0, 42.0)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (15) (-95.8, 7.0, 41.0)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (13) (-95.8, 7.0, 42.0)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (23) (-60.5, -1.0, 38.5)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (20) (-59.5, -1.0, 38.5)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (21) (-60.5, -1.0, 39.5)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (22) (-59.5, -1.0, 39.5)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (10) (-42.0, -1.0, 17.0)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (9) (-41.0, -1.0, 17.0)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (11) (-42.0, -1.0, 18.0)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (8) (-41.0, -1.0, 18.0)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (4) (-3.3, 7.0, 63.8)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (5) (-3.3, 7.0, 62.8)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (6) (-4.3, 7.0, 63.8)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (7) (-4.3, 7.0, 62.8)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (2) (6.3, 7.0, 66.3)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (3) (5.3, 7.0, 66.3)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (1) (6.3, 7.0, 67.3)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Eastern Vault Fortress - Eastern Vault Fortress Grass (5.3, 7.0, 67.3)": TunicLocationData(
+        "Eastern Vault Fortress", "Eastern Vault Fortress"),
+    "Fortress Grave Path - Fortress Grave Path Grass (90) (122.0, 0.0, -40.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (88) (121.0, 0.0, -40.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (89) (122.0, 0.0, -41.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (91) (121.0, 0.0, -41.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (95) (121.0, 0.0, -42.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (92) (121.0, 0.0, -43.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (93) (122.0, 0.0, -42.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (94) (122.0, 0.0, -43.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (44) (132.0, 0.0, -42.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (72) (132.0, 0.0, -45.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (85) (131.0, 0.0, -45.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (46) (133.0, 0.0, -42.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (74) (133.0, 0.0, -45.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (47) (132.0, 0.0, -41.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (56) (134.0, 0.0, -43.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (51) (134.0, 0.0, -42.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (59) (134.0, 0.0, -44.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (49) (135.0, 0.0, -42.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (48) (134.0, 0.0, -41.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (45) (133.0, 0.0, -41.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (43) (132.0, 0.0, -40.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (52) (134.0, 0.0, -40.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (41) (133.0, 0.0, -40.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (87) (130.0, 0.0, -45.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (86) (131.0, 0.0, -46.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (84) (130.0, 0.0, -46.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (83) (130.0, 0.0, -48.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (80) (130.0, 0.0, -47.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (75) (132.0, 0.0, -46.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (82) (131.0, 0.0, -47.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (81) (131.0, 0.0, -48.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (77) (133.0, 0.0, -47.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (73) (133.0, 0.0, -46.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (76) (132.0, 0.0, -48.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (79) (132.0, 0.0, -47.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (60) (134.0, 0.0, -46.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (63) (134.0, 0.0, -45.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (78) (133.0, 0.0, -48.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (62) (135.0, 0.0, -46.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (64) (136.0, 0.0, -46.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (67) (136.0, 0.0, -47.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (68) (136.0, 0.0, -45.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (61) (135.0, 0.0, -45.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (57) (135.0, 0.0, -44.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (109) (136.0, 0.0, -48.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (65) (137.0, 0.0, -47.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (66) (137.0, 0.0, -46.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (70) (137.0, 0.0, -45.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (71) (136.0, 0.0, -44.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (69) (137.0, 0.0, -44.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (58) (135.0, 0.0, -43.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (108) (137.0, 0.0, -48.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (110) (136.0, 0.0, -49.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (111) (137.0, 0.0, -49.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (112) (138.0, 0.0, -49.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (115) (138.0, 0.0, -48.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (113) (139.0, 0.0, -48.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (118) (140.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (119) (139.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (114) (139.0, 0.0, -49.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (117) (139.0, 0.0, -51.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (116) (138.0, 0.0, -51.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (120) (138.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (130) (143.0, 0.0, -51.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (129) (143.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (128) (142.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (131) (142.0, 0.0, -51.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (167) (141.5, 0.0, -47.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (121) (141.0, 0.0, -51.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (122) (141.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (165) (141.5, 0.0, -46.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (166) (140.5, 0.0, -46.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (123) (140.0, 0.0, -51.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (124) (144.0, 0.0, -51.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (127) (144.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (50) (135.0, 0.0, -41.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (54) (135.0, 0.0, -40.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (53) (135.0, 0.0, -39.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (55) (134.0, 0.0, -39.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (42) (133.0, 0.0, -39.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (35) (132.0, 0.0, -38.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (40) (132.0, 0.0, -39.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (34) (133.0, 0.0, -37.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (33) (133.0, 0.0, -38.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (17) (137.0, 0.0, -34.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (38) (133.0, 0.0, -36.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (29) (134.0, 0.0, -34.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (31) (134.0, 0.0, -35.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (26) (134.0, 0.0, -36.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (27) (135.0, 0.0, -35.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (25) (135.0, 0.0, -34.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (28) (135.0, 0.0, -33.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (30) (135.0, 0.0, -36.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (16) (136.0, 0.0, -33.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (23) (136.0, 0.0, -34.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (37) (133.0, 0.0, -35.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (36) (132.0, 0.0, -36.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (39) (132.0, 0.0, -35.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (32) (132.0, 0.0, -37.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (22) (137.0, 0.0, -33.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (24) (134.0, 0.0, -33.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (12) (139.0, 0.0, -31.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (21) (137.0, 0.0, -32.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (14) (138.0, 0.0, -32.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (15) (139.0, 0.0, -32.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (3) (139.0, 0.0, -30.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (2) (138.0, 0.0, -30.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (1) (138.0, 0.0, -29.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (13) (138.0, 0.0, -31.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (18) (137.0, 0.0, -31.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (20) (136.0, 0.0, -32.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (19) (136.0, 0.0, -31.0)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (139.0, 0.0, -29.0)": TunicLocationData("Fortress Grave Path",
+                                                                                             "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (125) (145.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (126) (145.0, 0.0, -51.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (132) (146.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (135) (146.0, 0.0, -49.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (133) (147.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (137) (149.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (139) (148.0, 0.0, -50.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (143) (150.0, 0.0, -47.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (140) (150.0, 0.0, -48.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (145) (149.0, 0.0, -47.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (138) (149.0, 0.0, -49.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (146) (149.0, 0.0, -48.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (147) (148.0, 0.0, -48.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (136) (148.0, 0.0, -49.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (144) (148.0, 0.0, -47.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (134) (147.0, 0.0, -49.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (141) (151.0, 0.0, -47.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (142) (151.0, 0.0, -48.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (148) (151.0, 0.0, -46.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (149) (151.0, 0.0, -45.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (153) (151.0, 0.0, -41.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (152) (151.0, 0.0, -42.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (150) (151.0, 0.0, -43.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (151) (151.0, 0.0, -44.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (164) (150.0, 0.0, -43.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (169) (149.0, 0.0, -43.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (170) (149.0, 0.0, -44.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (168) (150.0, 0.0, -44.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (154) (151.0, 0.0, -39.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (155) (151.0, 0.0, -40.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (157) (151.0, 0.0, -37.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (159) (151.0, 0.0, -36.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (156) (151.0, 0.0, -38.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (162) (150.0, 0.0, -37.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (163) (150.0, 0.0, -36.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (160) (151.0, 0.0, -34.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (158) (151.0, 0.0, -35.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (161) (151.0, 0.0, -33.0)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (4) (148.5, 0.0, -31.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (7) (148.5, 0.0, -32.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (5) (147.5, 0.0, -31.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (6) (147.5, 0.0, -32.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (106) (150.5, 0.0, -31.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (107) (149.5, 0.0, -32.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (104) (149.5, 0.0, -31.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (99) (162.5, 0.0, -49.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (9) (162.5, 0.0, -50.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (96) (162.5, 0.0, -48.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (10) (162.5, 0.0, -51.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (11) (163.5, 0.0, -51.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (8) (163.5, 0.0, -50.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                 "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (97) (163.5, 0.0, -49.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (102) (163.5, 0.0, -47.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (98) (163.5, 0.0, -48.5)": TunicLocationData("Fortress Grave Path",
+                                                                                                  "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (101) (163.5, 0.0, -46.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (100) (162.5, 0.0, -47.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Grass (103) (162.5, 0.0, -46.5)": TunicLocationData(
+        "Fortress Grave Path", "Fortress Grave Path Combat"),
+    "Fortress Grave Path - Fortress Grave Path Dusty Entrance Grass (172) (184.5, -1.0, -12.5)": TunicLocationData(
+        "Fortress Grave", "Fortress Grave Path Dusty Entrance Region"),
+    "Fortress Grave Path - Fortress Grave Path Dusty Entrance Grass (105) (185.5, -1.0, -13.5)": TunicLocationData(
+        "Fortress Grave", "Fortress Grave Path Dusty Entrance Region"),
+    "Fortress Grave Path - Fortress Grave Path Dusty Entrance Grass (171) (185.5, -1.0, -12.5)": TunicLocationData(
+        "Fortress Grave", "Fortress Grave Path Dusty Entrance Region"),
+    "Fortress Arena - Fortress Arena Grass (91) (2.0, -4.0, 26.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (90) (3.0, -4.0, 26.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (92) (2.0, -4.0, 25.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (89) (3.0, -4.0, 25.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (60) (2.0, 8.0, 155.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (61) (2.0, 8.0, 154.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (63) (3.0, 8.0, 154.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (62) (3.0, 8.0, 155.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (57) (4.0, 8.0, 154.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (53) (7.0, 8.0, 155.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (52) (7.0, 8.0, 156.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (54) (6.0, 8.0, 156.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (55) (6.0, 8.0, 155.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (59) (5.0, 8.0, 154.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (58) (5.0, 8.0, 155.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (56) (4.0, 8.0, 155.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (25) (3.0, 8.0, 172.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (24) (3.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (7) (4.0, 8.0, 172.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (17) (4.0, 8.0, 170.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (16) (4.0, 8.0, 171.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (3) (4.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (6) (5.0, 8.0, 172.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (27) (2.0, 8.0, 172.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (26) (2.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (9) (6.0, 8.0, 170.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (32) (6.0, 8.0, 169.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (8) (6.0, 8.0, 171.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (19) (5.0, 8.0, 170.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (18) (5.0, 8.0, 171.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (12) (8.0, 8.0, 171.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (10) (7.0, 8.0, 171.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (2) (5.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (29) (5.0, 8.0, 176.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (28) (5.0, 8.0, 177.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (1) (5.0, 8.0, 174.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (5.0, 8.0, 175.0)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (35) (4.0, 8.0, 176.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (34) (4.0, 8.0, 177.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (4) (4.0, 8.0, 174.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (5) (4.0, 8.0, 175.0)": TunicLocationData("Fortress Arena",
+                                                                                     "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (20) (3.0, 8.0, 175.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (21) (3.0, 8.0, 174.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (22) (2.0, 8.0, 175.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (23) (2.0, 8.0, 174.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (33) (6.0, 8.0, 168.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (31) (7.0, 8.0, 168.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (11) (7.0, 8.0, 170.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (30) (7.0, 8.0, 169.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (13) (8.0, 8.0, 170.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (15) (9.0, 8.0, 170.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (14) (9.0, 8.0, 171.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (37) (11.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (39) (12.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (38) (12.0, 8.0, 174.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (36) (11.0, 8.0, 174.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (68) (5.0, 8.0, 183.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (71) (5.0, 8.0, 182.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (70) (4.0, 8.0, 183.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (69) (4.0, 8.0, 182.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (66) (3.0, 8.0, 182.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (67) (2.0, 8.0, 182.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (75) (5.0, 8.0, 184.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (65) (3.0, 8.0, 183.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (64) (2.0, 8.0, 183.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (72) (5.0, 8.0, 185.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (74) (4.0, 8.0, 185.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (73) (4.0, 8.0, 184.0)": TunicLocationData("Fortress Arena",
+                                                                                      "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (78) (-3.0, 8.0, 187.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (77) (-3.0, 8.0, 186.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (85) (-4.0, 8.0, 184.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (86) (-4.0, 8.0, 185.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (83) (-3.0, 8.0, 184.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (80) (-3.0, 8.0, 185.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (79) (-2.0, 8.0, 186.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (82) (-2.0, 8.0, 185.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (81) (-2.0, 8.0, 184.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (76) (-2.0, 8.0, 187.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (84) (-5.0, 8.0, 185.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (87) (-5.0, 8.0, 184.0)": TunicLocationData("Fortress Arena",
+                                                                                       "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (50) (-14.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (48) (-13.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (40) (-12.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (44) (-12.0, 8.0, 175.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (45) (-12.0, 8.0, 174.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (47) (-11.0, 8.0, 174.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (42) (-11.0, 8.0, 173.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (46) (-11.0, 8.0, 175.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (49) (-13.0, 8.0, 172.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (51) (-14.0, 8.0, 172.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (43) (-11.0, 8.0, 172.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (41) (-12.0, 8.0, 172.0)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-12.4, 8.0, 190.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-11.4, 8.0, 190.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-11.4, 8.0, 191.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-12.4, 8.0, 191.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-12.4, 8.0, 192.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-11.4, 8.0, 192.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-12.4, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-11.4, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-14.4, 8.0, 194.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-14.4, 8.0, 192.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-14.4, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-14.4, 8.0, 195.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-13.4, 8.0, 195.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-13.4, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-13.4, 8.0, 192.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-13.4, 8.0, 194.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-2.8, 8.0, 194.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-3.8, 8.0, 194.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-2.8, 8.0, 195.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-3.8, 8.0, 195.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-2.8, 8.0, 199.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-4.8, 8.0, 200.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-3.8, 8.0, 199.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-3.8, 8.0, 200.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-2.8, 8.0, 200.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-1.8, 8.0, 200.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-1.8, 8.0, 199.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-0.8, 8.0, 199.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-3.8, 8.0, 202.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-3.8, 8.0, 201.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-4.8, 8.0, 202.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-4.8, 8.0, 201.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (-0.8, 8.0, 200.5)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (4.6, 8.0, 196.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (1.6, 8.0, 198.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (3.6, 8.0, 196.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (3.6, 8.0, 197.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (4.6, 8.0, 199.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (4.6, 8.0, 198.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (3.6, 8.0, 198.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (3.6, 8.0, 199.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (2.6, 8.0, 199.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (2.6, 8.0, 198.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (1.6, 8.0, 199.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (4.6, 8.0, 197.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (5.6, 8.0, 194.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (6.6, 8.0, 194.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (8.6, 8.0, 194.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (8.6, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (9.6, 8.0, 194.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (9.6, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (6.6, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (9.6, 8.0, 191.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (9.6, 8.0, 192.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (10.6, 8.0, 191.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (10.6, 8.0, 192.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (11.6, 8.0, 194.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (11.6, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (10.6, 8.0, 193.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (10.6, 8.0, 194.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (13.6, 8.0, 190.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (13.6, 8.0, 191.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (14.6, 8.0, 191.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (14.6, 8.0, 190.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (15.6, 8.0, 189.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (15.6, 8.0, 190.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (16.6, 8.0, 190.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (16.6, 8.0, 189.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (21.6, 8.0, 189.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (21.6, 8.0, 188.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (22.6, 8.0, 189.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (22.6, 8.0, 188.4)": TunicLocationData("Fortress Arena", "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (94) (-13.0, 8.0, 223.8)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (96) (-12.0, 8.0, 224.8)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (99) (-12.0, 8.0, 223.8)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (97) (-11.0, 8.0, 223.8)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (98) (-11.0, 8.0, 224.8)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (103) (-12.0, 8.0, 225.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (100) (-12.0, 8.0, 226.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (101) (-11.0, 8.0, 225.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (102) (-11.0, 8.0, 226.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (88) (-14.0, 8.0, 223.8)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (93) (-13.0, 8.0, 222.8)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (95) (-14.0, 8.0, 222.8)": TunicLocationData("Fortress Arena",
+                                                                                        "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (117) (-38.5, 8.0, 218.3)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (120) (-38.5, 8.0, 217.3)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (116) (-38.5, 8.0, 219.3)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (121) (-38.5, 8.0, 216.3)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (118) (-39.5, 8.0, 219.3)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (122) (-39.5, 8.0, 217.3)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (119) (-39.5, 8.0, 218.3)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (123) (-39.5, 8.0, 216.3)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (108) (-33.3, 8.0, 208.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (112) (-35.3, 8.0, 209.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (114) (-36.3, 8.0, 209.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (113) (-35.3, 8.0, 208.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (115) (-36.3, 8.0, 208.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (109) (-33.3, 8.0, 207.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (107) (-34.3, 8.0, 205.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (110) (-34.3, 8.0, 208.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (111) (-34.3, 8.0, 207.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (106) (-34.3, 8.0, 206.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (105) (-33.3, 8.0, 205.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Fortress Arena - Fortress Arena Grass (104) (-33.3, 8.0, 206.8)": TunicLocationData("Fortress Arena",
+                                                                                         "Fortress Arena"),
+    "Quarry - Quarry Back Grass (26) (-50.3, 31.8, 74.3)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (27) (-49.3, 31.8, 74.3)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (20) (-50.3, 31.8, 75.3)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (21) (-49.3, 31.8, 75.3)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (22) (-50.3, 31.8, 76.3)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (23) (-49.3, 31.8, 76.3)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (13) (-44.0, 28.0, 59.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (14) (-45.0, 28.0, 60.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (12) (-45.0, 28.0, 59.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (15) (-44.0, 28.0, 60.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (6) (-40.0, 28.0, 59.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (7) (-39.0, 28.0, 59.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (11) (-37.0, 28.0, 58.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (9) (-37.0, 28.0, 57.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (4) (-40.0, 28.0, 60.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (5) (-39.0, 28.0, 60.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (2) (-38.0, 28.0, 59.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (8) (-38.0, 28.0, 57.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (10) (-38.0, 28.0, 58.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (3) (-37.0, 28.0, 59.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (-37.0, 28.0, 60.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (1) (-38.0, 28.0, 60.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (17) (-23.3, 28.0, 55.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (16) (-24.3, 28.0, 55.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (18) (-24.3, 28.0, 56.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (19) (-23.3, 28.0, 56.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (29) (-57.5, -4.5, 16.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (38) (-56.5, -4.0, 16.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (34) (-56.5, -4.0, 16.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (28) (-57.5, -4.5, 15.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (24) (-58.5, -4.5, 15.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (25) (-58.5, -4.5, 16.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (37) (-55.5, -4.0, 16.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (41) (-55.5, -4.0, 16.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (40) (-56.5, -4.0, 15.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (36) (-56.5, -4.0, 15.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (39) (-55.5, -4.0, 15.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (35) (-55.5, -4.0, 15.0)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (32) (-57.5, -12.0, 11.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (30) (-57.5, -12.0, 10.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (33) (-56.5, -12.0, 10.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (31) (-56.5, -12.0, 11.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (44) (-51.0, -12.0, 11.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (43) (-49.5, -12.0, 11.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (47) (-49.5, -12.0, 12.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (49) (-52.0, -12.0, 12.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (48) (-51.0, -12.0, 12.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (50) (-52.0, -12.0, 13.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (46) (-48.5, -12.0, 11.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (45) (-48.5, -12.0, 12.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Quarry - Quarry Back Grass (42) (-50.3, -12.0, 13.5)": TunicLocationData("Quarry Back", "Quarry Back"),
+    "Swamp - Swamp Front Grass swamp (36) (-100.0, -0.3, -10.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (37) (-100.0, -0.5, -9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (35) (-99.0, -0.5, -9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (38) (-99.0, -0.8, -10.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (40) (-88.3, 0.3, -18.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (41) (-87.3, -0.3, -19.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (34) (-87.3, 0.5, -18.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (31) (-89.5, -0.3, -10.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (32) (-89.5, -0.5, -9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (33) (-88.5, -0.8, -10.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (30) (-88.5, -0.5, -9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (39) (-88.3, 0.5, -19.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (27) (-82.3, 0.3, -14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (28) (-82.3, 0.3, -13.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (29) (-81.3, -0.5, -14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (26) (-81.3, -0.3, -13.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (24) (-80.3, 0.3, -12.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (23) (-80.3, 0.3, -13.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (22) (-79.3, -0.3, -12.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (25) (-79.3, -0.5, -13.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (56) (-83.3, 0.3, -21.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (54) (-82.3, 0.5, -21.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (57) (-82.3, -1.0, -22.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (55) (-83.3, 0.0, -22.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (43) (-77.3, -1.3, -6.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (45) (-76.3, -1.8, -6.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (42) (-76.3, -1.5, -5.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (44) (-77.3, -1.3, -5.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (19) (-73.5, 0.3, -18.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (21) (-72.5, 0.5, -18.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (18) (-72.5, -0.3, -17.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (20) (-73.5, 0.3, -17.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (15) (-61.8, 0.3, -22.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (16) (-61.8, 0.3, -21.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (17) (-60.8, -0.5, -22.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (14) (-60.8, -0.3, -21.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (60) (-64.0, -1.0, -27.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (58) (-63.0, -1.0, -27.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (61) (-63.0, -1.3, -28.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (59) (-64.0, -1.5, -28.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (63) (-62.0, -0.5, -29.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (64) (-62.0, -0.5, -28.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (449) (-58.5, -0.8, -16.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (451) (-57.5, -0.8, -16.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (448) (-57.5, -1.0, -15.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (450) (-58.5, -0.8, -15.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (445) (-51.5, 0.0, -9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (447) (-50.5, -0.3, -9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (446) (-51.5, 0.0, -8.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (444) (-50.5, -0.5, -8.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (432) (-55.8, -0.5, -2.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (430) (-56.8, -0.5, -2.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (431) (-56.8, -0.5, -1.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (429) (-55.8, -0.8, -1.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (437) (-60.8, -0.3, -2.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (439) (-61.8, 0.0, -2.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (438) (-61.8, 0.0, -3.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (436) (-62.8, -0.3, -4.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (433) (-62.8, -0.5, -3.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (434) (-63.8, -0.3, -4.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (435) (-63.8, -0.3, -3.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (48) (-61.0, -1.0, -8.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (47) (-61.0, -1.3, -9.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (46) (-60.0, -1.3, -8.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (441) (-61.0, -0.3, 5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (443) (-60.0, -0.3, 5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (440) (-60.0, -0.5, 6.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (442) (-61.0, -0.3, 6.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (204) (-70.0, -0.3, 11.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (206) (-69.0, -0.3, 11.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (207) (-69.3, -0.3, 12.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (212) (-70.3, 0.0, 12.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (183) (-70.0, -1.3, 7.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (185) (-71.0, -1.0, 8.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (187) (-72.0, -1.0, 8.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (175) (-72.5, 0.5, 13.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (176) (-72.5, 0.5, 14.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (181) (-69.0, -1.3, 7.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (174) (-71.5, 0.5, 14.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (172) (-71.5, 0.0, 13.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (186) (-72.0, -1.3, 7.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (180) (-69.0, -1.5, 6.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (182) (-70.0, -1.5, 6.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (184) (-71.0, -1.3, 7.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (266) (-77.8, -1.3, 11.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (267) (-78.0, -1.3, 12.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (268) (-78.5, -1.3, 12.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (265) (-78.8, -1.5, 11.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (165) (-84.0, -0.5, 5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (167) (-84.0, 0.0, 4.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (166) (-83.0, -0.5, 5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (56) (-83.0, -0.5, 4.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (169) (-75.3, -0.8, 21.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (171) (-75.3, -0.3, 20.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (168) (-74.3, -0.8, 20.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (170) (-74.3, -0.8, 21.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (199) (-73.8, -0.3, 24.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (196) (-72.8, -0.8, 24.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (197) (-73.8, -0.8, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (198) (-72.8, -0.8, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (200) (-78.3, -1.0, 27.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (203) (-79.3, -0.5, 27.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (201) (-79.3, -0.8, 28.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (202) (-78.3, -0.5, 28.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (192) (-64.3, -0.5, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (194) (-64.3, -0.3, 26.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (205) (-66.3, -0.3, 26.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (211) (-65.3, -0.3, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (195) (-65.3, -0.3, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (193) (-65.3, -0.3, 26.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (209) (-66.3, -0.3, 27.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (208) (-67.3, -0.3, 27.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (210) (-67.3, -0.3, 26.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (178) (-62.3, -0.3, 13.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (179) (-62.3, -0.3, 14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (177) (-61.3, -0.3, 14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (173) (-61.3, -0.3, 13.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (191) (-59.0, -0.3, 20.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (188) (-58.0, -0.8, 20.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (190) (-58.0, -0.8, 21.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (189) (-59.0, -0.8, 21.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (52) (-58.0, 0.0, -35.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (50) (-57.0, -0.3, -35.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (51) (-58.0, -0.3, -36.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (7) (-54.3, -1.3, -38.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (53) (-57.0, -0.8, -36.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (10) (-53.5, 0.0, -30.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (13) (-52.5, -0.5, -31.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (11) (-53.5, 0.0, -29.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (9) (-52.5, -0.3, -29.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (12) (-52.5, -0.5, -30.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (5) (-53.3, -1.5, -38.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (4) (-51.0, -1.5, -37.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1) (-51.0, -1.0, -36.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (8) (-53.3, -2.0, -39.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (6) (-54.3, -1.8, -39.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (3) (-50.0, -1.8, -37.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (2) (-50.0, -1.3, -36.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (272) (-46.5, -1.0, -11.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (271) (-46.5, -1.0, -12.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (270) (-45.5, -1.0, -11.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (269) (-45.5, -1.3, -12.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (273) (-44.5, -1.5, -13.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (275) (-43.5, -1.5, -12.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (274) (-43.5, -1.5, -13.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (276) (-44.5, -1.5, -12.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (284) (-36.5, -0.8, -5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (281) (-36.5, -1.0, -7.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (283) (-35.5, -0.8, -5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (282) (-35.5, -1.0, -7.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (280) (-35.3, -1.3, -8.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (278) (-34.3, -1.3, -9.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (279) (-34.3, -1.3, -8.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (277) (-35.3, -1.3, -9.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (234) (-21.0, -0.5, -14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (236) (-21.0, -0.5, -15.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (235) (-20.0, -0.5, -14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (233) (-20.0, -0.5, -15.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (307) (-24.0, -0.5, -22.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (341) (-24.0, -0.5, -21.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (344) (-22.0, -0.5, -22.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (345) (-21.0, -0.5, -22.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (308) (-25.0, -0.5, -21.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (342) (-25.0, -0.5, -22.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (343) (-21.0, -0.5, -23.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (346) (-22.0, -0.5, -23.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (108) (-12.5, -2.0, -19.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (110) (-12.5, -1.8, -20.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (107) (-11.5, -1.8, -20.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (109) (-11.5, -2.0, -19.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (350) (-12.5, -0.5, -28.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (348) (-12.5, -0.3, -27.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (349) (-11.5, -0.3, -27.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (347) (-11.5, -0.5, -28.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (78) (-6.3, 0.0, -21.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (80) (-6.3, 0.0, -22.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (79) (-5.3, 0.0, -21.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (77) (-5.3, 0.0, -22.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (76) (-5.3, 0.0, -20.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (73) (-4.3, 0.0, -20.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (75) (-4.3, 0.0, -19.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (74) (-5.3, 0.0, -19.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (238) (-3.3, -1.0, -31.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (239) (-2.3, -1.0, -31.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (240) (-3.3, -1.3, -32.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (243) (-3.3, -1.5, -33.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (237) (-2.3, -1.3, -32.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (242) (-4.3, -1.5, -33.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (241) (-3.3, -1.8, -34.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (244) (-4.3, -1.8, -34.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (21) (4.3, -2.0, -18.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (24) (3.3, -2.0, -18.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (23) (4.3, -1.8, -17.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (22) (3.3, -1.8, -17.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (69) (2.8, -0.3, -14.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (28) (8.5, -1.8, -17.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (26) (8.5, -1.5, -16.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (25) (9.5, -1.8, -17.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (32) (9.5, -1.3, -15.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (27) (9.5, -1.5, -16.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (35) (12.5, -1.3, -15.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (33) (12.5, -1.5, -16.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (36) (11.5, -1.5, -16.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (34) (11.5, -1.3, -15.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (29) (10.5, -1.3, -15.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (31) (10.5, -1.0, -14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (30) (9.5, -1.0, -14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (112) (15.3, 0.3, -4.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (114) (15.3, 0.3, -5.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (111) (16.3, 0.3, -5.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (113) (16.3, 0.3, -4.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (118) (19.5, 0.0, -5.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (116) (19.5, 0.0, -4.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (38) (14.0, 0.0, -10.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (37) (15.0, 0.0, -11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (39) (15.0, 0.0, -10.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (40) (14.0, 0.0, -11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (115) (20.5, 0.0, -5.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (117) (20.5, 0.0, -4.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (123) (21.8, 0.0, -9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (124) (21.8, 0.0, -8.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (381) (21.8, 0.0, -17.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (379) (21.8, 0.0, -18.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (376) (19.8, 0.0, -27.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (378) (19.8, -0.3, -28.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (375) (20.8, 0.0, -28.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (377) (20.8, 0.0, -27.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (372) (16.0, -1.3, -32.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (373) (17.0, -1.3, -32.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (367) (17.0, -1.3, -33.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (374) (16.0, -1.5, -33.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (6.3, 0.0, -4.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1) (6.3, 0.0, -5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (4) (5.3, 0.0, -5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (2) (5.3, 0.0, -5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (3) (5.3, 0.0, -4.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (62) (-2.3, 0.0, -10.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (63) (-1.3, 0.0, -10.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (61) (-1.3, 0.0, -11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (64) (-2.3, 0.0, -11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (68) (-0.3, 0.0, -11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (66) (-0.3, 0.0, -10.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (67) (0.8, 0.0, -10.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (65) (0.8, 0.0, -11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (70) (1.8, 0.0, -13.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (72) (1.8, 0.0, -14.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (71) (2.8, -0.3, -13.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (59) (-4.5, 0.0, -5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (57) (-4.5, 0.0, -6.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (58) (-5.5, 0.0, -5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (60) (-5.5, 0.0, -6.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (53) (-6.5, 0.0, -5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (55) (-6.5, 0.0, -4.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (54) (-7.5, 0.0, -4.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (47) (-10.8, 0.0, 2.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (48) (-11.8, 0.0, 1.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (46) (-11.8, 0.0, 2.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (45) (-10.8, 0.0, 1.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (16) (-7.3, 0.0, 4.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (13) (-6.3, 0.0, 4.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (15) (-6.3, 0.0, 5.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (14) (-7.3, 0.0, 5.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (17) (-8.5, 0.0, 8.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (49) (-11.8, 0.0, 3.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (51) (-11.8, 0.0, 4.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (52) (-12.8, 0.0, 3.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (50) (-12.8, 0.0, 4.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (20) (-9.5, 0.0, 8.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (19) (-8.5, 0.0, 9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (18) (-9.5, 0.0, 9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (12) (-2.5, 0.0, 10.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (44) (-1.5, 0.0, 8.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (42) (-1.5, 0.0, 9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (41) (-0.5, 0.0, 8.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (43) (-0.5, 0.0, 9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (9) (-3.5, 0.0, 10.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (7) (1.5, 0.0, 10.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (5) (1.5, 0.0, 9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (6) (0.5, 0.0, 10.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (8) (0.5, 0.0, 9.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (10) (-2.5, 0.0, 11.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (11) (-3.5, 0.0, 11.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (82) (13.8, 0.0, 5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (91) (14.8, 0.0, 7.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (81) (14.8, 0.0, 4.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (84) (14.8, 0.0, 5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (83) (13.8, 0.0, 4.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (88) (16.8, 0.0, 6.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (85) (16.8, 0.0, 5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (87) (15.8, 0.0, 5.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (86) (15.8, 0.0, 6.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (92) (15.8, 0.0, 8.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (89) (15.8, 0.0, 7.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (90) (14.8, 0.0, 8.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (101) (19.5, 0.0, 5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (98) (20.5, 0.0, 5.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (99) (19.5, 0.0, 6.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (102) (20.5, 0.0, 6.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (97) (21.5, 0.0, 8.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (100) (21.5, 0.0, 9.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (93) (21.5, 0.0, 10.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (95) (20.5, 0.0, 10.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (94) (20.5, 0.0, 11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (96) (21.5, 0.0, 11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (135) (20.8, 0.0, 26.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (138) (21.8, 0.0, 26.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (136) (21.8, 0.0, 27.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (137) (20.8, 0.0, 27.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (140) (15.5, 0.0, 26.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (141) (14.5, 0.0, 26.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (142) (15.5, 0.0, 25.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (139) (14.5, 0.0, 25.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (718) (21.0, -0.5, 30.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (719) (21.0, -0.5, 31.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (721) (22.0, -0.5, 30.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (720) (22.0, -0.5, 31.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (717) (22.0, -0.5, 32.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (714) (21.0, -0.5, 32.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (716) (22.0, -0.5, 33.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (715) (21.0, -0.5, 33.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (705) (15.8, -0.5, 43.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (704) (15.8, -0.5, 44.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (702) (14.8, -0.5, 43.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (703) (14.8, -0.5, 44.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (708) (13.8, -0.5, 44.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (709) (13.8, -0.5, 43.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (707) (12.8, -0.5, 44.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (706) (12.8, -0.5, 43.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (134) (6.5, -0.5, 34.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (132) (6.5, -0.5, 35.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (133) (5.5, -0.5, 35.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (131) (5.5, -0.5, 34.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (149) (2.1, -0.9, 33.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (148) (3.1, -0.9, 33.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (150) (3.1, -1.1, 32.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (147) (2.1, -1.1, 32.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (130) (5.3, -1.0, 31.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (126) (6.3, -1.3, 30.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (129) (6.3, -1.0, 31.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (127) (5.3, -1.3, 30.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (125) (5.3, -1.8, 29.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (128) (6.3, -1.8, 29.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (151) (4.4, -0.5, 42.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (158) (2.5, -0.5, 44.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (156) (2.5, -0.5, 45.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (153) (4.4, -0.5, 43.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (152) (5.4, -0.5, 43.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (161) (-0.4, -0.5, 45.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (157) (1.5, -0.5, 45.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (155) (1.5, -0.5, 44.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (160) (0.6, -0.5, 45.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (154) (5.4, -0.5, 42.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (162) (-5.6, -0.5, 38.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (164) (-5.6, -0.5, 37.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (159) (-6.6, -0.5, 37.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (163) (-6.6, -0.5, 38.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (146) (-2.3, -1.6, 31.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (145) (-1.3, -0.9, 32.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (144) (-2.3, -1.6, 32.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (143) (-1.3, -1.6, 31.4)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (120) (1.5, -1.8, 21.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (121) (2.5, -1.8, 21.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (122) (1.5, -1.8, 20.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (119) (2.5, -1.8, 20.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (411) (-18.8, -0.8, 16.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (409) (-18.8, -0.3, 17.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (405) (-17.8, -0.3, 15.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (410) (-19.8, -0.3, 17.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (412) (-19.8, -0.5, 16.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (406) (-18.8, -0.3, 15.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (408) (-18.8, -0.5, 14.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (407) (-17.8, -0.8, 14.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (415) (-22.0, -0.8, 17.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (413) (-22.0, -0.3, 18.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (414) (-23.0, -0.3, 18.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (416) (-23.0, -0.5, 17.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (400) (-24.5, -0.5, 22.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (398) (-24.5, -0.3, 23.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (399) (-23.5, -0.8, 22.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (397) (-23.5, -0.3, 23.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (401) (-25.5, -0.8, 15.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (402) (-26.5, -0.8, 15.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (403) (-25.5, -1.3, 14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (404) (-26.5, -1.3, 14.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (393) (-31.8, -1.0, 22.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (395) (-31.8, -1.5, 21.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (396) (-32.8, -1.8, 21.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (394) (-32.8, -1.5, 22.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (389) (-30.3, -0.3, 32.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (391) (-30.3, -0.3, 31.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (452) (-31.3, -0.3, 30.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (454) (-31.3, -0.3, 29.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (390) (-31.3, -0.5, 32.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (392) (-31.3, -0.5, 31.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (453) (-32.3, -0.3, 30.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (455) (-32.3, -0.5, 29.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (458) (-34.8, -1.0, 32.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (456) (-34.8, -1.3, 33.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (457) (-35.8, -1.3, 33.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (459) (-35.8, -1.3, 32.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (461) (-44.0, -0.3, 26.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (460) (-43.0, -0.3, 26.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (463) (-44.0, -0.8, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (462) (-43.0, -0.3, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (224) (-42.5, -1.0, 42.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (221) (-42.5, -0.5, 43.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (223) (-41.5, -0.3, 43.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (222) (-41.5, -0.8, 42.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (326) (-43.5, -1.3, 47.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (327) (-43.5, -1.0, 48.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (328) (-44.5, -1.3, 47.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (325) (-44.5, -0.8, 48.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (228) (-29.3, -0.5, 44.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (226) (-28.3, -0.8, 44.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (225) (-29.3, -0.8, 45.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (227) (-28.3, -0.8, 45.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (388) (-27.8, -0.5, 37.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (387) (-27.8, -0.3, 38.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (386) (-26.8, -0.5, 38.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (385) (-26.8, -0.8, 37.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (230) (-22.5, -1.0, 41.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (231) (-22.5, -0.5, 42.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (232) (-23.5, -0.8, 41.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (229) (-23.5, -0.3, 42.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (422) (-18.3, -0.8, 45.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (421) (-18.3, -1.3, 44.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (424) (-19.3, -0.5, 44.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (423) (-19.3, 0.0, 45.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (219) (-41.0, -1.5, 14.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (217) (-42.0, -1.5, 14.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (220) (-42.0, -1.5, 13.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (218) (-41.0, -2.0, 13.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (215) (-48.5, -1.8, 18.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (213) (-49.5, -1.8, 18.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (216) (-49.5, -1.8, 17.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (214) (-48.5, -2.3, 17.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (286) (-51.0, -1.8, 24.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (292) (-51.0, -1.8, 23.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (289) (-50.0, -1.8, 24.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (287) (-50.0, -2.3, 23.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (320) (-53.0, -1.8, 24.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (318) (-52.0, -2.3, 24.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (317) (-53.0, -1.8, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (319) (-52.0, -1.8, 25.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (338) (-51.0, -0.5, 38.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (337) (-52.0, 0.3, 39.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (339) (-51.0, 0.0, 39.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (340) (-52.0, -0.5, 38.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (330) (-48.0, -0.8, 45.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (332) (-49.0, -0.8, 45.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (334) (-50.0, -0.5, 44.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (333) (-51.0, 0.0, 45.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (336) (-51.0, -0.5, 44.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (335) (-50.0, -0.3, 45.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (329) (-49.0, -0.3, 46.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (331) (-48.0, -0.5, 46.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (104) (-11.3, -1.5, -10.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (106) (-11.3, -1.8, -11.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (103) (-10.3, -1.8, -11.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (105) (-10.3, -1.5, -10.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (248) (0.3, 0.0, -44.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (245) (1.3, 0.0, -44.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (247) (1.3, -0.3, -43.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (249) (-0.8, -0.3, -45.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (251) (-0.8, 0.0, -44.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (252) (-1.8, -0.3, -45.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (250) (-1.8, 0.3, -44.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (365) (1.3, -0.5, -49.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (366) (0.3, -0.5, -50.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (364) (0.3, 0.0, -49.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (246) (0.3, 0.0, -43.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (254) (-7.3, -0.5, -49.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (253) (-6.3, -0.8, -50.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (255) (-6.3, -0.5, -49.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (256) (-7.3, -1.0, -50.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (257) (-1.5, -1.8, -60.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (258) (-1.5, -1.8, -61.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (259) (-0.5, -1.8, -60.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (260) (-0.5, -1.5, -61.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (261) (-5.0, -0.5, -66.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (262) (-5.0, -0.5, -67.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (263) (-4.0, -0.5, -66.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (264) (-4.0, -0.3, -67.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (467) (10.8, -0.5, -55.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (465) (10.8, -0.3, -54.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (359) (11.0, -1.0, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (358) (12.0, -0.5, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (357) (12.0, -0.8, -62.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (466) (11.8, -0.5, -54.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (464) (11.8, -0.5, -55.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (362) (10.0, -1.3, -62.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (361) (10.0, -1.5, -63.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (356) (11.0, -1.0, -62.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (363) (9.0, -1.8, -62.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (360) (9.0, -1.8, -63.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (368) (13.0, -1.5, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (371) (13.0, -1.5, -65.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (370) (14.0, -1.0, -65.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (369) (14.0, -1.3, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (354) (21.0, 0.0, -66.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (355) (22.0, 0.0, -65.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (353) (22.0, 0.0, -66.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (382) (21.2, -0.2, -63.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (383) (21.2, -0.5, -62.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (380) (20.2, -0.7, -63.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (384) (20.2, -0.5, -62.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (351) (21.0, 0.0, -67.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (352) (22.0, 0.0, -67.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (316) (20.8, -0.3, -72.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (313) (20.8, -0.6, -73.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (315) (21.8, -0.3, -72.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (314) (21.8, -0.6, -73.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (545) (34.8, 0.0, -92.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (546) (34.8, -0.5, -93.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (542) (35.8, -0.5, -93.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (543) (35.8, -0.3, -92.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (571) (30.8, 0.0, -88.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (572) (30.8, 0.0, -87.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (574) (29.8, 0.0, -88.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (573) (29.8, 0.3, -87.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (541) (27.5, -0.3, -88.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (544) (26.5, -0.5, -88.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (529) (25.5, -0.8, -88.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (530) (25.5, -0.8, -87.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (531) (24.5, -0.5, -87.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (532) (24.5, -0.8, -88.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (538) (27.5, -0.3, -89.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (539) (26.5, -0.3, -89.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (533) (25.5, -0.8, -90.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (534) (25.5, -0.8, -89.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (535) (24.5, -0.5, -89.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (540) (26.5, -0.5, -90.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (537) (27.5, -0.3, -90.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (536) (24.5, -0.8, -90.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (578) (33.3, 0.0, -80.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (575) (34.3, 0.0, -80.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (570) (34.3, 0.0, -82.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (569) (34.3, 0.3, -81.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (567) (35.3, 0.0, -82.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (568) (35.3, 0.0, -81.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (576) (34.3, 0.0, -79.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (577) (33.3, 0.3, -79.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (549) (27.5, 0.3, -81.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (548) (28.5, 0.0, -81.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (547) (28.5, 0.0, -82.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (550) (27.5, 0.0, -82.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (525) (25.8, 0.0, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (521) (26.8, 0.0, -77.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (524) (25.8, 0.0, -77.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (523) (25.8, 0.3, -76.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (522) (26.8, 0.0, -76.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (526) (25.8, 0.0, -78.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (527) (24.8, 0.3, -78.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (528) (24.8, 0.0, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (579) (34.0, 0.0, -74.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (580) (34.0, 0.0, -73.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (581) (33.0, 0.3, -73.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (582) (33.0, 0.0, -74.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (520) (31.0, 0.0, -70.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (517) (32.0, 0.0, -70.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (518) (32.0, 0.0, -69.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (497) (27.0, 0.0, -71.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (555) (33.5, 0.0, -67.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (556) (33.5, 0.0, -66.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (561) (34.5, 0.3, -67.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (562) (34.5, 0.0, -68.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (559) (35.5, 0.0, -68.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (560) (35.5, 0.0, -67.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (516) (30.0, 0.0, -66.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (510) (29.0, 0.0, -66.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (509) (29.0, 0.0, -67.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (558) (32.5, 0.0, -67.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (519) (31.0, 0.3, -69.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (514) (31.0, 0.0, -65.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (513) (31.0, 0.0, -66.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (505) (29.0, 0.0, -69.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (506) (29.0, 0.0, -68.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (512) (28.0, 0.0, -67.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (507) (28.0, 0.3, -68.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (508) (28.0, 0.0, -69.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (498) (27.0, 0.0, -70.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (515) (30.0, 0.3, -65.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (511) (28.0, 0.3, -66.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (502) (27.0, 0.0, -68.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (557) (32.5, 0.3, -66.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (501) (27.0, 0.0, -69.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (503) (26.0, 0.3, -68.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (504) (26.0, 0.0, -69.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (499) (26.0, 0.3, -70.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (500) (26.0, 0.0, -71.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (551) (37.8, 0.0, -65.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (552) (37.8, 0.0, -64.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (554) (36.8, 0.0, -65.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (553) (36.8, 0.3, -64.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (566) (41.5, 2.5, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (584) (40.5, 2.0, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (565) (41.5, 3.0, -60.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (564) (42.5, 3.0, -60.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (563) (42.5, 2.5, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (615) (44.3, 0.5, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (613) (45.3, 1.0, -65.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (612) (45.3, 0.5, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (614) (44.3, 1.3, -65.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (585) (47.8, 0.5, -66.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (583) (47.8, 0.3, -67.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (587) (46.8, 0.3, -67.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (586) (46.8, 0.8, -66.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (496) (43.0, -1.0, -71.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (493) (44.0, -1.0, -71.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (495) (43.0, -0.5, -70.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (490) (46.0, -1.0, -71.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (486) (46.0, -1.3, -72.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (491) (45.0, -0.8, -71.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (492) (45.0, -1.3, -72.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (494) (44.0, -0.8, -70.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (468) (46.0, -0.5, -83.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (470) (46.0, -0.8, -82.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (471) (45.0, -0.5, -83.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (469) (45.0, -0.5, -82.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (672) (49.8, 0.0, -90.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (673) (49.8, -0.3, -91.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (670) (50.8, -0.3, -90.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (671) (50.8, -0.3, -91.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (668) (51.8, 0.0, -91.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (669) (51.8, -0.3, -92.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (666) (52.8, -0.3, -91.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (667) (52.8, -0.3, -92.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (618) (54.3, -0.3, -95.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (619) (54.3, -0.5, -96.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (616) (55.3, -0.5, -96.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (617) (55.3, -0.5, -95.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (674) (46.3, -0.3, -95.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (676) (45.3, 0.0, -95.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (675) (46.3, -0.3, -96.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (677) (45.3, -0.3, -96.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (682) (58.0, -0.5, -78.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (683) (58.0, -0.5, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (680) (59.0, 0.0, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (681) (59.0, -0.3, -80.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (685) (57.0, -0.5, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (679) (60.0, -0.3, -80.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (678) (60.0, -0.3, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (684) (57.0, -0.3, -78.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (591) (57.3, -0.8, -76.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (588) (57.3, -0.8, -77.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (599) (56.3, -1.0, -77.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (598) (56.3, -0.8, -76.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (600) (56.8, -0.5, -72.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (601) (56.8, -0.5, -71.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (603) (55.8, -0.8, -72.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (602) (55.8, -0.5, -71.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (607) (60.8, -0.3, -68.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (606) (60.8, 0.3, -67.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (611) (62.8, 0.3, -67.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (605) (61.8, 0.3, -67.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (604) (61.8, -0.3, -68.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (608) (63.8, 0.3, -67.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (610) (62.8, 0.8, -66.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (609) (63.8, 0.8, -66.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (693) (66.8, 0.5, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (690) (67.8, 0.5, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (691) (67.8, 0.8, -65.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (686) (66.8, 1.0, -64.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (692) (66.8, 1.0, -65.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (687) (66.8, 1.0, -63.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (688) (65.8, 1.3, -63.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (689) (65.8, 1.0, -64.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (592) (55.3, 1.3, -65.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (597) (56.3, 1.3, -65.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (596) (57.3, 1.3, -65.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (589) (53.3, 1.5, -64.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (595) (54.3, 1.3, -65.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (594) (54.3, 1.8, -64.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (593) (55.3, 1.5, -64.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (590) (52.3, 1.8, -64.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (699) (77.0, 0.8, -71.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (701) (76.0, 0.5, -71.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (700) (76.0, 1.0, -70.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (698) (77.0, 1.0, -70.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (694) (73.0, 0.0, -68.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (695) (73.0, 0.0, -69.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (697) (72.0, 0.0, -69.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (696) (72.0, 0.3, -68.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1489) (89.0, -0.8, -73.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (664) (90.0, -1.0, -74.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (665) (90.0, -1.5, -75.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (663) (91.0, -1.3, -74.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1486) (90.0, -0.8, -73.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (660) (92.0, -1.3, -74.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1481) (93.0, -0.8, -73.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (661) (92.0, -1.0, -73.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (662) (91.0, -0.8, -73.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1380) (94.0, -0.8, -73.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1479) (93.0, -0.3, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1478) (94.0, -0.8, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1487) (90.0, -0.8, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1488) (89.0, -0.3, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (658) (96.0, -1.3, -81.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (657) (97.0, -1.5, -81.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (659) (96.0, -1.5, -82.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (656) (97.0, -1.5, -82.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (655) (109.5, -1.5, -85.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (652) (110.5, -1.5, -85.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (654) (109.5, -1.3, -84.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (653) (110.5, -1.5, -84.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (638) (116.3, -0.3, -88.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (639) (116.3, -0.5, -89.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (637) (117.3, -0.5, -88.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (636) (117.3, -0.5, -89.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (649) (111.8, -0.5, -94.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (650) (110.8, -0.3, -94.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (648) (111.8, -0.5, -95.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (651) (110.8, -0.5, -95.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (645) (107.0, -0.3, -98.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (647) (106.0, -0.5, -99.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (646) (106.0, -0.3, -98.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (644) (107.0, -0.5, -99.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (641) (105.0, -0.5, -95.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (642) (104.0, -0.3, -95.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (643) (104.0, -0.5, -96.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (640) (105.0, -0.5, -96.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (478) (117.5, 0.0, -78.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (479) (117.5, -0.3, -79.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (483) (116.5, -0.3, -77.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (476) (118.5, -0.3, -79.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (480) (117.5, -0.3, -77.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (477) (118.5, -0.3, -78.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (475) (118.5, -0.3, -77.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (482) (116.5, 0.0, -76.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (485) (115.5, -0.3, -77.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (474) (118.5, 0.0, -76.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (481) (117.5, -0.3, -76.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (484) (115.5, 0.0, -76.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (472) (119.5, -0.3, -77.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (473) (119.5, -0.3, -76.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (633) (128.0, -1.0, -85.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (632) (128.0, -1.3, -86.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (634) (127.0, -0.8, -85.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (635) (127.0, -1.3, -86.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (628) (122.5, -0.3, -82.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (629) (122.5, -0.3, -81.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (630) (121.5, 0.0, -81.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (631) (121.5, -0.3, -82.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (489) (135.8, -2.0, -90.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (488) (135.8, -1.8, -89.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (487) (136.8, -2.0, -89.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (733) (163.8, -0.8, -85.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (732) (163.8, -0.3, -84.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (730) (164.8, -0.8, -85.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (731) (164.8, -0.5, -84.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (737) (165.0, -0.3, -80.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (734) (166.0, -0.3, -80.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (729) (167.5, -0.3, -82.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (727) (168.5, -0.5, -81.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (726) (168.5, -0.5, -82.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (728) (167.5, 0.0, -81.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (735) (166.0, -0.5, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (736) (165.0, -0.3, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (725) (146.3, -1.3, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (724) (146.3, -0.8, -78.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (723) (147.3, -1.0, -78.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (722) (147.3, -1.3, -79.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1087) (131.0, 4.3, -85.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1081) (132.0, 4.0, -85.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1398) (133.0, 4.3, -84.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1395) (131.0, 4.0, -86.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1079) (132.0, 4.0, -86.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1396) (134.0, 4.0, -85.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1399) (133.0, 4.0, -85.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1397) (134.0, 4.0, -84.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1403) (138.3, 4.0, -77.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1400) (139.3, 4.0, -77.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1402) (138.3, 4.3, -76.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1401) (139.3, 4.0, -76.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1415) (132.3, 4.0, -73.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1412) (133.3, 4.0, -73.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1413) (133.3, 4.0, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1414) (132.3, 4.3, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1417) (131.3, 4.0, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1416) (131.3, 4.0, -73.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1418) (130.3, 4.3, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1419) (130.3, 4.0, -73.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1420) (129.3, 4.0, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1421) (128.3, 4.3, -72.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1408) (139.8, 4.0, -69.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1409) (139.8, 4.0, -68.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1407) (140.8, 4.0, -69.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1404) (141.8, 4.0, -69.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1515) (141.8, 4.3, -70.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1411) (138.8, 4.0, -69.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1511) (142.8, 4.0, -70.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1516) (142.8, 4.0, -71.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1517) (141.8, 4.0, -71.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1405) (141.8, 4.0, -68.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1406) (140.8, 4.3, -68.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1410) (138.8, 4.3, -68.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1425) (131.0, 7.8, -69.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1424) (132.0, 7.8, -68.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1423) (132.0, 7.8, -69.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1422) (131.0, 7.8, -68.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1518) (127.3, 7.8, -62.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1520) (127.3, 7.8, -61.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1519) (126.3, 7.8, -61.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1521) (126.3, 7.8, -62.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1432) (116.8, 7.8, -64.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1427) (114.8, 7.8, -65.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1428) (114.8, 7.8, -64.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1431) (115.8, 7.8, -64.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1426) (113.8, 7.8, -64.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1429) (113.8, 7.8, -65.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1430) (112.8, 7.8, -64.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1438) (105.3, 7.8, -62.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1439) (105.3, 7.8, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1436) (106.3, 7.8, -62.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1437) (104.3, 7.8, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1435) (107.3, 7.8, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1434) (107.3, 7.8, -62.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1433) (106.3, 7.8, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1441) (94.1, 7.8, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1440) (93.1, 7.8, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1456) (86.5, 7.8, -60.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1455) (86.5, 7.8, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1457) (85.5, 7.8, -61.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1454) (85.5, 7.8, -60.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1444) (88.0, 7.8, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1442) (87.0, 7.8, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1445) (87.0, 7.8, -67.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1524) (89.0, 7.8, -67.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1443) (88.0, 7.8, -67.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1522) (93.1, 7.8, -66.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1525) (93.1, 7.8, -67.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1523) (94.1, 7.8, -67.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1451) (73.5, 4.0, -61.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1452) (73.5, 4.0, -60.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1450) (72.5, 4.0, -60.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1453) (72.5, 4.0, -61.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1449) (82.3, 4.0, -65.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1447) (83.3, 4.0, -65.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1446) (82.3, 4.0, -64.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1448) (83.3, 4.0, -64.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1480) (96.0, 4.0, -68.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1485) (97.0, 4.0, -69.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1482) (97.0, 4.0, -68.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1484) (98.0, 4.0, -68.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1483) (98.0, 4.0, -69.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1319) (123.5, 12.0, -46.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1321) (122.5, 12.0, -46.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1322) (122.5, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1320) (121.5, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1317) (124.5, 12.0, -46.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1316) (123.5, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1323) (121.5, 12.0, -46.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1318) (124.5, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1512) (114.9, 12.0, -48.7)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1513) (114.9, 12.0, -47.7)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1514) (113.9, 12.0, -48.7)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1295) (136.8, 12.0, -53.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1296) (136.8, 12.0, -52.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1297) (135.8, 12.0, -53.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1298) (137.8, 12.0, -52.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1294) (135.8, 12.0, -52.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1299) (138.8, 12.0, -52.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1300) (140.0, 12.0, -58.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1302) (141.0, 12.0, -58.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1303) (140.0, 12.0, -59.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1301) (141.0, 12.0, -59.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1307) (146.3, 12.0, -53.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1304) (146.3, 12.0, -52.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1306) (147.3, 12.0, -52.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1305) (147.3, 12.0, -53.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1309) (144.8, 12.0, -62.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1310) (144.8, 12.0, -61.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1308) (143.8, 12.0, -61.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1311) (143.8, 12.0, -62.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1312) (133.3, 12.0, -65.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1315) (133.3, 12.0, -66.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1313) (134.3, 12.0, -66.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1314) (134.3, 12.0, -65.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1327) (96.8, 12.0, -46.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1326) (97.8, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1325) (97.8, 12.0, -46.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1329) (99.8, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1328) (98.8, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1324) (96.8, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1331) (104.8, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1330) (103.8, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1335) (84.0, 12.0, -46.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1332) (84.0, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1333) (85.0, 12.0, -46.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1334) (85.0, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1369) (68.5, 12.0, -58.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1372) (68.5, 12.0, -59.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1371) (69.5, 12.0, -58.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1370) (69.5, 12.0, -59.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1375) (65.0, 12.0, -60.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1373) (64.0, 12.0, -60.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1374) (65.0, 12.0, -61.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1376) (64.0, 12.0, -61.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1348) (60.0, 12.0, -50.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1345) (60.0, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1346) (61.0, 12.0, -50.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1347) (61.0, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1343) (53.3, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1344) (54.3, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1341) (51.3, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1342) (52.3, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1340) (50.3, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1337) (49.3, 12.0, -50.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1338) (49.3, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1336) (48.3, 12.0, -49.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1339) (48.3, 12.0, -50.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1367) (51.5, 12.0, -62.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1368) (50.5, 12.0, -63.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1365) (50.5, 12.0, -62.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1366) (51.5, 12.0, -63.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1363) (37.3, 12.0, -58.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1361) (36.3, 12.0, -58.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1364) (36.3, 12.0, -59.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1362) (37.3, 12.0, -59.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1356) (33.3, 12.0, -54.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1353) (33.3, 12.0, -53.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1354) (34.3, 12.0, -54.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1355) (34.3, 12.0, -53.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1351) (33.3, 12.0, -51.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1350) (33.3, 12.0, -52.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1349) (32.3, 12.0, -51.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1352) (32.3, 12.0, -52.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1359) (31.0, 12.0, -44.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1358) (31.0, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1357) (30.0, 12.0, -44.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1360) (30.0, 12.0, -45.5)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1390) (42.3, 12.0, -34.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1387) (42.3, 12.0, -33.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1388) (43.3, 12.0, -34.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1389) (43.3, 12.0, -33.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1392) (40.0, 12.0, -26.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1394) (39.0, 12.0, -26.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1393) (40.0, 12.0, -25.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1391) (39.0, 12.0, -25.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1385) (31.8, 7.5, -29.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1383) (31.8, 7.5, -26.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1382) (31.8, 7.5, -27.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1384) (30.8, 7.5, -27.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1381) (30.8, 7.5, -26.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (1386) (31.8, 7.5, -28.3)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (425) (-85.0, -0.3, -11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (428) (-85.0, -0.5, -12.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (427) (-86.0, 0.0, -11.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (426) (-86.0, 0.0, -12.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (623) (70.5, -0.5, -92.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (620) (71.5, -0.5, -92.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (622) (70.5, -0.3, -91.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (621) (71.5, -0.3, -91.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (741) (76.8, -0.8, -98.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (742) (77.8, -0.5, -98.0)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (627) (67.0, -1.0, -83.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (624) (68.0, -1.0, -83.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (625) (68.0, -1.5, -82.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Front Grass swamp (626) (67.0, -1.0, -82.8)": TunicLocationData("Swamp Front", "Swamp Front"),
+    "Swamp - Swamp Mid Grass swamp (925) (34.5, 0.0, -7.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (922) (35.5, 0.0, -7.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (924) (34.5, 0.3, -6.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (923) (35.5, 0.3, -6.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (920) (42.3, -0.3, -7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (921) (42.3, -0.8, -8.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (918) (43.3, -1.0, -8.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (919) (43.3, -0.8, -7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (914) (45.3, -1.3, -7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (916) (44.3, -0.5, -6.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (917) (44.3, -1.0, -7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (915) (45.3, -1.0, -6.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (908) (47.8, -0.8, 6.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (909) (47.8, -1.0, 5.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (906) (48.8, -1.3, 5.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (907) (48.8, -1.3, 6.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (905) (51.5, -1.8, 13.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (902) (51.5, -0.5, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (903) (51.5, -1.0, 14.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (900) (52.5, -1.0, 14.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (904) (52.5, -1.8, 13.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (897) (54.5, -0.5, 16.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (896) (54.5, -0.8, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (898) (53.5, -0.3, 16.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (901) (52.5, -0.8, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (899) (53.5, -0.8, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (926) (39.0, 0.0, 10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (927) (39.0, 0.3, 11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (931) (38.0, 0.0, 13.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (930) (38.0, 0.0, 12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (928) (38.0, 0.3, 11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (932) (37.0, 0.3, 13.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (933) (37.0, 0.0, 12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (929) (38.0, 0.0, 10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (935) (39.8, 0.0, 25.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (934) (39.8, 0.0, 24.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (936) (38.8, 0.3, 25.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (937) (38.8, 0.0, 24.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (893) (63.5, 0.0, 12.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (895) (62.5, 0.0, 11.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (894) (62.5, 0.3, 12.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (889) (61.5, 0.0, 11.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (890) (60.5, 0.3, 11.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (891) (60.5, 0.0, 10.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (892) (63.5, 0.0, 11.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (888) (61.5, 0.0, 10.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (881) (60.5, 0.0, -4.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (880) (60.5, 0.0, -5.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (884) (61.5, 0.0, -3.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (887) (60.5, 0.0, -3.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (886) (60.5, 0.3, -2.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (885) (61.5, 0.0, -2.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (883) (59.5, -0.3, -5.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (882) (59.5, 0.0, -4.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (877) (67.0, 0.0, -12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (874) (68.0, 0.3, -11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (875) (68.0, 0.0, -12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (873) (69.0, 0.0, -11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (872) (69.0, 0.0, -12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (878) (66.0, 0.3, -12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (879) (66.0, -0.3, -13.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (876) (67.0, -0.3, -13.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (743) (82.5, 0.0, -3.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (738) (83.5, 0.0, -3.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (740) (82.5, 0.3, -2.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (739) (83.5, 0.0, -2.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (910) (77.5, 0.0, 1.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (911) (77.5, 0.0, 2.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (913) (76.5, 0.0, 1.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (912) (76.5, 0.3, 2.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (756) (76.0, -1.3, 6.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (754) (77.0, -1.0, 8.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (755) (77.0, -1.3, 7.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (757) (76.0, -1.3, 7.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (759) (75.0, -1.3, 6.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (758) (75.0, -1.3, 7.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (752) (78.0, -1.0, 7.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (753) (78.0, -1.3, 8.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (786) (95.8, 0.3, 15.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (785) (96.8, 0.0, 15.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (784) (96.8, 0.0, 14.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (787) (95.8, 0.0, 14.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (776) (100.8, 0.0, 14.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (777) (100.8, 0.0, 15.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (779) (99.8, 0.0, 14.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (778) (99.8, 0.3, 15.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (788) (97.3, 0.0, 19.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (789) (97.3, 0.0, 20.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (791) (96.3, 0.0, 19.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (790) (96.3, 0.3, 20.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (792) (98.3, 0.0, 22.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (796) (103.0, 0.0, 22.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (795) (103.0, 0.0, 21.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (798) (102.0, 0.0, 21.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (793) (98.3, 0.0, 23.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (794) (97.3, 0.3, 23.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (782) (101.8, 0.3, 16.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (781) (102.8, 0.0, 16.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (783) (101.8, 0.0, 15.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (780) (102.8, 0.0, 15.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (833) (108.5, 0.0, 20.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (830) (109.5, 0.0, 20.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (831) (109.5, 0.0, 21.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (832) (108.5, 0.3, 21.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (945) (112.3, 0.3, 12.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (946) (112.3, 0.0, 11.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (944) (113.3, 0.0, 12.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (943) (113.3, 0.0, 11.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (772) (114.3, 0.0, 9.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (771) (112.3, 0.0, 7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (770) (112.3, 0.3, 8.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (774) (113.3, 0.3, 10.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (775) (113.3, 0.0, 9.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (768) (113.3, 0.0, 7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (769) (113.3, 0.0, 8.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (773) (114.3, 0.0, 10.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (767) (104.5, 0.0, 3.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (766) (104.5, 0.3, 4.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (765) (105.5, 0.0, 4.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (764) (105.5, 0.0, 3.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (761) (103.5, 0.0, 3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (762) (102.5, 0.3, 3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (763) (102.5, 0.0, 2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (760) (103.5, 0.0, 2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (971) (104.8, 0.3, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (970) (105.8, 0.0, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (967) (106.8, 0.3, -9.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (963) (106.8, 0.3, -11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (968) (106.8, 0.0, -10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (961) (107.8, 0.0, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (964) (106.8, 0.0, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (969) (105.8, 0.0, -13.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (972) (104.8, 0.0, -13.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (965) (107.8, 0.0, -10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (962) (107.8, 0.0, -11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (966) (107.8, 0.0, -9.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (747) (88.3, 0.0, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (744) (89.3, 0.0, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (745) (89.3, 0.0, -11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (746) (88.3, 0.3, -11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (751) (94.5, 0.0, -10.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (748) (95.5, 0.0, -10.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (749) (95.5, 0.0, -9.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (750) (94.5, 0.3, -9.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (975) (118.5, 0.3, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (976) (118.5, 0.0, -13.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (974) (119.5, 0.0, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (973) (119.5, 0.0, -13.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (856) (120.8, -1.5, -1.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (857) (120.8, -1.5, -0.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (859) (119.8, -1.0, -1.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (858) (119.8, -0.8, -0.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (871) (126.0, -1.8, 0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (868) (127.0, -1.8, 0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (869) (127.0, -1.8, 1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (870) (126.0, -1.5, 1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (951) (132.3, -0.3, 11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (952) (132.3, -0.3, 12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (947) (130.3, -0.5, 11.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (953) (131.3, -0.3, 12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (954) (131.3, -0.5, 11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (852) (128.5, -1.0, 8.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (948) (130.3, -0.5, 12.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (949) (129.3, -0.5, 12.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (950) (129.3, -0.8, 11.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (853) (127.5, -1.0, 8.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (851) (128.5, -1.0, 7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (854) (127.5, -1.3, 7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (855) (126.5, -1.3, 7.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (988) (140.0, -1.3, 6.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (985) (141.0, -1.3, 6.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (986) (140.0, -1.0, 7.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (987) (141.0, -1.0, 7.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (862) (134.3, -1.0, -4.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (861) (135.3, -0.8, -4.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (865) (133.3, -1.5, -3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (864) (133.3, -1.5, -4.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (867) (132.3, -1.8, -4.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (866) (132.3, -1.8, -3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (860) (135.3, -0.8, -5.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (863) (134.3, -1.0, -5.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (982) (139.3, 0.3, -10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (984) (139.3, 0.0, -11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (983) (140.3, 0.0, -10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (979) (139.3, 0.0, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (980) (138.3, 0.0, -13.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (978) (138.3, 0.3, -12.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (981) (140.3, 0.0, -11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (977) (139.3, 0.0, -13.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (960) (151.0, 0.0, -3.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (956) (152.0, 0.5, -3.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (955) (151.0, 0.0, -1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (959) (151.0, 0.3, -2.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (958) (150.0, 0.0, -1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (957) (150.0, 0.3, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1238) (160.3, 1.8, -12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1244) (159.3, 0.3, -14.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1245) (160.3, 0.3, -14.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1243) (160.3, 0.8, -13.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1237) (161.3, 2.3, -11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1236) (160.3, 2.5, -11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1235) (162.0, 3.8, -5.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1239) (162.0, 3.8, -4.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1201) (162.0, 3.8, -0.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1222) (162.0, 3.8, 0.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1223) (161.0, 3.8, -0.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1221) (161.0, 4.0, 0.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1227) (156.5, 3.8, 2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1224) (157.5, 3.8, 2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1228) (158.5, 3.8, 3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1226) (157.5, 3.8, 3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1225) (156.5, 4.0, 3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1232) (148.8, 3.8, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1233) (148.8, 3.8, 14.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1231) (149.8, 3.8, 14.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1229) (149.8, 3.8, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1230) (148.8, 4.0, 16.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (837) (145.0, 0.0, 17.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (836) (145.0, 0.3, 18.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (844) (145.0, 0.0, 20.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (843) (145.0, 0.0, 19.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (845) (144.0, 0.3, 20.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (846) (144.0, 0.0, 19.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1234) (145.3, 0.0, 15.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (847) (145.3, 0.0, 13.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (848) (145.3, 0.0, 14.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (849) (144.3, 0.3, 14.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (850) (144.3, 0.0, 13.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (834) (146.0, 0.0, 17.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (835) (146.0, 0.0, 18.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (842) (142.3, 1.0, 23.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (841) (141.3, 1.0, 24.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (838) (142.3, 1.3, 24.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (839) (142.3, 1.8, 25.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (840) (141.3, 1.8, 25.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (828) (132.5, 1.5, 35.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (829) (132.5, 1.0, 34.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (826) (133.5, 1.3, 34.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (827) (133.5, 1.3, 35.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (822) (131.5, -0.3, 44.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (818) (131.5, 0.0, 43.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (823) (130.5, 0.3, 44.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (824) (130.5, 0.0, 43.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (825) (129.5, 0.3, 44.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (819) (126.3, 0.0, 41.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (821) (126.3, 0.0, 42.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (815) (124.3, 0.0, 41.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (820) (125.3, 0.3, 41.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (814) (124.3, 0.0, 40.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (817) (123.3, -0.3, 40.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (816) (123.3, 0.0, 41.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (812) (120.5, -0.3, 33.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (810) (121.5, -0.3, 32.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (811) (121.5, -0.3, 33.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (808) (119.5, 0.0, 31.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (813) (120.5, -0.5, 32.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (807) (120.5, 0.0, 31.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (806) (120.5, 0.0, 30.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (809) (119.5, -0.3, 30.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (804) (120.8, 0.3, 26.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (805) (120.8, 0.0, 25.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (802) (121.8, 0.0, 25.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (803) (121.8, 0.0, 26.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (800) (122.8, 0.3, 25.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (801) (122.8, 0.0, 24.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (797) (123.8, 0.0, 24.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (799) (123.8, 0.0, 25.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1379) (88.3, -0.5, 43.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1458) (88.3, -0.8, 44.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1377) (89.3, -0.8, 42.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1378) (89.3, -0.8, 43.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1459) (88.3, -0.8, 45.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1462) (90.8, 0.0, 55.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1463) (90.8, -0.3, 54.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1460) (91.8, -0.3, 54.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1461) (91.8, -0.3, 55.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1466) (88.3, -0.5, 71.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1467) (88.3, -0.8, 70.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1465) (89.3, -0.5, 71.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1464) (89.3, -0.5, 70.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1468) (88.3, -0.3, 82.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1471) (87.3, -0.3, 82.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1469) (88.3, -0.3, 83.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1470) (87.3, 0.0, 83.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1476) (86.5, -0.3, 88.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1477) (86.5, -0.3, 89.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1472) (86.5, -0.3, 90.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1474) (85.5, 0.0, 91.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1475) (85.5, -0.3, 90.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1261) (156.8, 4.0, -60.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1264) (156.8, 4.0, -61.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1262) (157.8, 4.0, -61.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1208) (160.8, 7.5, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1207) (160.8, 7.5, 16.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1216) (158.8, 7.5, 18.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1203) (163.8, 7.5, 14.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1202) (162.8, 7.5, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1204) (162.8, 7.5, 14.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1206) (161.8, 7.5, 15.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1205) (161.8, 7.5, 16.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1210) (161.8, 7.5, 17.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1209) (161.8, 7.5, 18.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1212) (160.8, 7.5, 17.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1211) (160.8, 7.5, 18.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1214) (159.8, 7.5, 18.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1213) (159.8, 7.5, 19.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1215) (158.8, 7.5, 19.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1200) (163.0, 7.5, 9.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1198) (163.0, 7.5, 10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1199) (164.0, 7.5, 9.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1197) (164.0, 7.5, 10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1219) (155.3, 7.5, 11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1217) (156.3, 7.5, 11.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1218) (156.3, 7.5, 10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1220) (155.3, 7.5, 10.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1240) (165.8, 7.5, 2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1241) (165.8, 7.5, 1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1270) (157.0, 15.8, -43.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1272) (157.0, 15.8, -42.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1273) (158.0, 15.8, -42.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1269) (157.0, 15.8, -44.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1268) (156.0, 15.8, -43.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1271) (156.0, 15.8, -44.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1248) (168.5, 15.8, -40.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1246) (169.5, 15.8, -40.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1247) (169.5, 15.8, -39.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1242) (168.5, 15.8, -39.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1249) (168.5, 15.8, -50.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1252) (168.5, 15.8, -51.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1251) (169.5, 15.8, -50.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1250) (169.5, 15.8, -51.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1255) (172.3, 15.8, -54.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1253) (171.3, 15.8, -54.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1256) (171.3, 15.8, -55.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1254) (172.3, 15.8, -55.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1257) (166.8, 15.8, -58.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1260) (166.8, 15.8, -59.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1259) (167.8, 15.8, -58.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1258) (167.8, 15.8, -59.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1266) (158.5, 15.8, -57.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1265) (158.5, 15.8, -58.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1263) (157.5, 15.8, -57.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1267) (157.5, 15.8, -58.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1285) (140.5, 15.8, -45.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1282) (140.5, 15.8, -44.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1283) (141.5, 15.8, -45.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1284) (141.5, 15.8, -44.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1288) (132.5, 15.8, -48.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1293) (129.5, 15.8, -48.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1290) (129.5, 15.8, -47.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1289) (131.5, 15.8, -49.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1286) (131.5, 15.8, -48.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1291) (130.5, 15.8, -48.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1292) (130.5, 15.8, -47.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1287) (132.5, 15.8, -49.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1281) (169.5, 15.8, -28.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1275) (168.3, 15.8, -26.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1279) (170.5, 15.8, -28.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1280) (170.5, 15.8, -27.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1278) (169.5, 15.8, -27.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1276) (168.3, 15.8, -25.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1277) (167.3, 15.8, -26.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1274) (167.3, 15.8, -25.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1167) (170.0, 15.8, -18.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1169) (170.0, 15.8, -19.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1166) (171.0, 15.8, -18.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1168) (171.0, 15.8, -19.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1163) (171.0, 15.8, -20.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1165) (171.0, 15.8, -21.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1164) (172.0, 15.8, -21.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1162) (172.0, 15.8, -20.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1148) (183.8, 15.8, -18.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1161) (180.0, 15.8, -14.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1157) (181.0, 15.8, -13.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1160) (181.0, 15.8, -14.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1159) (180.0, 15.8, -13.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1146) (183.8, 15.8, -17.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1152) (184.8, 15.8, -20.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1150) (184.8, 15.8, -19.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1145) (184.8, 15.8, -17.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1147) (184.8, 15.8, -18.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1151) (185.8, 15.8, -20.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1149) (185.8, 15.8, -19.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1156) (187.8, 15.8, -24.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1154) (188.8, 15.8, -24.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1158) (187.8, 15.8, -25.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1155) (192.8, 15.8, -15.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1153) (192.8, 15.8, -14.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1093) (192.0, 15.8, -9.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1098) (193.0, 15.8, -8.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1099) (193.0, 15.8, -9.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1094) (193.0, 15.8, -9.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1102) (193.0, 15.8, -5.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1101) (193.0, 15.8, -4.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1096) (192.0, 15.8, -10.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1095) (193.0, 15.8, -10.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1097) (193.0, 15.8, -2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1018) (193.0, 15.8, -1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1100) (193.0, 15.8, -3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1019) (192.0, 15.8, -1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1017) (193.0, 15.8, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1022) (193.0, 15.8, 0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1027) (192.0, 15.8, 2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1023) (192.0, 15.8, 0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1020) (192.0, 15.8, 1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1016) (192.0, 15.8, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1026) (193.0, 15.8, 2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1021) (193.0, 15.8, 1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1133) (190.0, 15.8, 1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1135) (190.0, 15.8, 0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1136) (189.0, 15.8, 0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1134) (189.0, 15.8, 1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1137) (185.3, 15.8, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1139) (185.3, 15.8, -1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1028) (191.0, 15.8, 3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1029) (191.0, 15.8, 2.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1025) (193.0, 15.8, 3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1024) (192.0, 15.8, 3.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1031) (193.0, 15.8, 5.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1032) (193.0, 15.8, 4.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1138) (184.3, 15.8, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1140) (184.3, 15.8, -1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1131) (173.0, 15.8, -1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1127) (171.0, 15.8, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1130) (172.0, 15.8, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1132) (172.0, 15.8, -1.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1129) (173.0, 15.8, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1142) (176.8, 15.8, -7.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1141) (177.8, 15.8, -7.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1143) (177.8, 15.8, -8.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1144) (176.8, 15.8, -8.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1128) (170.0, 15.8, -0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1125) (171.0, 15.8, 0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1126) (170.0, 15.8, 0.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1121) (177.8, 15.8, 5.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1123) (177.8, 15.8, 4.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1122) (176.8, 15.8, 5.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1124) (176.8, 15.8, 4.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1010) (173.8, 15.8, 9.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1011) (172.8, 15.8, 9.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1013) (175.8, 15.8, 11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1014) (175.8, 15.8, 10.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1012) (174.8, 15.8, 11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1015) (174.8, 15.8, 10.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1008) (172.8, 15.8, 10.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1009) (173.8, 15.8, 10.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1001) (168.3, 15.8, 15.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1003) (169.3, 15.8, 15.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1006) (168.3, 15.8, 14.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (999) (168.3, 15.8, 17.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1000) (168.3, 15.8, 16.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1004) (169.3, 15.8, 16.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1005) (169.3, 15.8, 17.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1007) (167.3, 15.8, 14.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1002) (167.3, 15.8, 15.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1188) (164.3, 15.8, 21.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1186) (163.3, 15.8, 22.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1189) (163.3, 15.8, 21.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1110) (180.8, 15.8, 13.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1109) (180.8, 15.8, 14.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1107) (181.8, 15.8, 14.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1108) (181.8, 15.8, 13.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1105) (181.3, 15.8, 11.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1103) (182.3, 15.8, 11.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1112) (182.8, 15.8, 15.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1111) (182.8, 15.8, 16.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1114) (181.8, 15.8, 15.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1113) (181.8, 15.8, 16.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1106) (181.3, 15.8, 10.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1104) (182.3, 15.8, 10.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1115) (182.3, 15.8, 9.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1116) (181.3, 15.8, 9.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1117) (187.8, 15.8, 10.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1118) (186.8, 15.8, 10.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1120) (186.8, 15.8, 9.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1119) (187.8, 15.8, 9.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1036) (192.0, 15.8, 13.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1039) (192.0, 15.8, 12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1042) (189.3, 15.8, 16.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1043) (188.3, 15.8, 16.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1040) (193.0, 15.8, 11.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1038) (193.0, 15.8, 12.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1037) (193.0, 15.8, 13.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1034) (193.0, 15.8, 14.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1033) (193.0, 15.8, 15.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1030) (192.0, 15.8, 15.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1035) (192.0, 15.8, 14.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1047) (187.0, 15.8, 18.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1048) (186.0, 15.8, 18.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1041) (188.3, 15.8, 17.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1045) (187.0, 15.8, 19.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1046) (186.0, 15.8, 19.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1044) (186.0, 15.8, 20.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Bush (1) (182.3, 16.0, 33.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Bush (184.3, 16.0, 33.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1173) (184.8, 15.8, 30.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1170) (184.8, 15.8, 31.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1171) (185.8, 15.8, 31.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1172) (185.8, 15.8, 30.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1088) (188.8, 15.8, 33.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1078) (187.8, 15.8, 32.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1077) (186.8, 15.8, 32.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1075) (186.8, 15.8, 33.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1074) (186.8, 15.8, 34.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1080) (186.8, 15.8, 31.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1076) (185.8, 15.8, 33.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1073) (185.8, 15.8, 34.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1072) (185.8, 15.8, 35.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1069) (185.8, 15.8, 36.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1059) (184.8, 15.8, 37.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1051) (184.8, 15.8, 35.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1050) (184.8, 15.8, 36.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1057) (183.8, 15.8, 38.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1052) (183.8, 15.8, 35.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1060) (183.8, 15.8, 37.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1049) (183.8, 15.8, 36.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1055) (182.8, 15.8, 35.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1054) (182.8, 15.8, 36.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1053) (181.8, 15.8, 36.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1056) (181.8, 15.8, 35.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1176) (179.5, 15.8, 36.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1071) (186.8, 15.8, 35.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1070) (186.8, 15.8, 36.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1092) (187.8, 15.8, 35.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1085) (188.8, 15.8, 34.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1086) (189.8, 15.8, 34.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1090) (188.8, 15.8, 36.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1091) (188.8, 15.8, 35.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1089) (187.8, 15.8, 36.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1067) (186.8, 15.8, 39.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1066) (186.8, 15.8, 40.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1068) (185.8, 15.8, 39.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1062) (184.8, 15.8, 40.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1058) (184.8, 15.8, 38.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1063) (184.8, 15.8, 39.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1064) (183.8, 15.8, 39.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1061) (183.8, 15.8, 40.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1065) (185.8, 15.8, 40.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1175) (179.5, 15.8, 37.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1177) (178.5, 15.8, 36.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1174) (178.5, 15.8, 37.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Bush (2) (178.3, 16.0, 39.0)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1179) (176.8, 15.8, 40.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1180) (176.8, 15.8, 39.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1178) (175.8, 15.8, 40.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1181) (175.8, 15.8, 39.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1192) (169.0, 15.8, 38.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1191) (170.0, 15.8, 38.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1190) (170.0, 15.8, 39.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1187) (169.0, 15.8, 39.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1183) (165.3, 15.8, 33.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1182) (164.3, 15.8, 33.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1185) (164.3, 15.8, 32.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1184) (165.3, 15.8, 32.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1510) (165.0, 16.5, 42.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1509) (166.0, 16.0, 42.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1508) (166.0, 16.0, 43.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1507) (165.0, 16.5, 43.5)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1196) (153.8, 15.8, 40.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1195) (154.8, 15.8, 40.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1194) (154.8, 15.8, 41.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1193) (153.8, 15.8, 41.8)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1505) (148.0, 15.8, 31.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1504) (148.0, 15.8, 30.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1503) (147.0, 15.8, 31.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Swamp Mid Grass swamp (1506) (147.0, 15.8, 30.3)": TunicLocationData("Swamp Mid", "Swamp Mid"),
+    "Swamp - Back of Swamp Grass swamp (1494) (83.8, -0.3, 129.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Grass swamp (1495) (83.8, -0.3, 130.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Grass swamp (1496) (82.8, 0.0, 130.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Grass swamp (1497) (82.8, -0.3, 129.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Grass swamp (1501) (82.8, -0.3, 131.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Grass swamp (1498) (83.8, -0.3, 131.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Grass swamp (1499) (83.8, -0.3, 132.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Grass swamp (1500) (83.0, -1.0, 141.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Grass swamp (1502) (83.0, -1.0, 142.5)": TunicLocationData("Back of Swamp", "Back of Swamp"),
+    "Swamp - Back of Swamp Laurels Area Grass swamp (991) (34.5, 8.3, 31.8)": TunicLocationData(
+        "Back of Swamp Laurels Area", "Back of Swamp Laurels Area"),
+    "Swamp - Back of Swamp Laurels Area Grass swamp (992) (34.5, 8.0, 30.8)": TunicLocationData(
+        "Back of Swamp Laurels Area", "Back of Swamp Laurels Area"),
+    "Swamp - Back of Swamp Laurels Area Grass swamp (989) (35.5, 8.0, 30.8)": TunicLocationData(
+        "Back of Swamp Laurels Area", "Back of Swamp Laurels Area"),
+    "Swamp - Back of Swamp Laurels Area Grass swamp (990) (35.5, 8.0, 31.8)": TunicLocationData(
+        "Back of Swamp Laurels Area", "Back of Swamp Laurels Area"),
+    "Swamp - Back of Swamp Laurels Area Grass swamp (995) (32.5, 8.3, 31.8)": TunicLocationData(
+        "Back of Swamp Laurels Area", "Back of Swamp Laurels Area"),
+    "Swamp - Back of Swamp Laurels Area Grass swamp (994) (33.5, 8.0, 31.8)": TunicLocationData(
+        "Back of Swamp Laurels Area", "Back of Swamp Laurels Area"),
+}
+
+excluded_grass_locations = {
+    "Overworld - Overworld Bush (7) (-39.0, 40.0, -41.0)",
+    "Overworld - Overworld Bush (2) (-41.0, 40.0, -41.0)",
+    "Overworld - Overworld Bush (16) (53.0, 12.0, -151.0)",
+    "Overworld - Overworld Bush (9) (-19.0, 28.0, -103.0)",
+    "Overworld - Overworld Bush (23) (-19.0, 28.0, -105.0)",
+    "Overworld - Overworld Bush (26) (-19.0, 28.0, -107.0)",
+    "Overworld - Overworld Bush (47) (91.0, 12.0, -155.0)",
+    "Overworld - Overworld Bush (42) (91.0, 12.0, -157.0)",
+    "Overworld - East Overworld Bush (58) (58.0, 44.0, -109.0)",
+    "Overworld - East Overworld Bush (62) (66.5, 44.0, -111.0)",
+    "Overworld - East Overworld Bush (64) (56.0, 44.0, -107.0)",
+}
+
+grass_location_name_to_id: Dict[str, int] = {name: location_base_id + 302 + index for index, name in enumerate(grass_location_table)}
+
+grass_location_name_groups: Dict[str, Set[str]] = {}
+for loc_name, loc_data in grass_location_table.items():
+    loc_group_name = loc_name.split(" - ", 1)[0] + " Grass"
+    grass_location_name_groups.setdefault(loc_group_name, set()).add(loc_name)
+
+
+def can_break_grass(state: CollectionState, world: "TunicWorld") -> bool:
+    player = world.player
+    # no gun or wand because they're extremely tedious
+    return (has_sword(state, player)
+            or (has_melee(state, player) and state.has("Glass Cannon", player)))
+
+
+def set_grass_location_rules(world: "TunicWorld") -> None:
+    player = world.player
+
+    if not world.options.start_with_sword:
+        for location in grass_location_table.keys():
+            set_rule(world.get_location(location),
+                     lambda state: can_break_grass(state, world))
+
+    set_rule(world.get_location("Fortress Courtyard - Fortress Courtyard Upper Grass (1) (72.0, 8.0, -29.0)"),
+             lambda state: state.has("Magic Wand", player))
+    
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (325) (-111.8, 1.3, 2.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (323) (-111.8, 1.3, 1.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (316) (-110.5, 1.3, 3.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (319) (-111.5, 1.3, 4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (317) (-111.5, 1.3, 3.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (318) (-110.5, 1.3, 4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (321) (-112.3, 1.3, 4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (320) (-112.3, 1.3, 3.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (326) (-112.8, 1.3, 2.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (327) (-113.5, 1.3, 2.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (324) (-112.8, 1.3, 1.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (322) (-113.5, 1.3, 1.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (328) (-112.0, 0.8, -2.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (329) (-112.0, 0.5, -3.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (333) (-111.3, 0.8, -2.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (331) (-111.3, 0.5, -3.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (330) (-110.3, 0.5, -3.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (332) (-110.3, 0.8, -2.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (334) (-111.0, 0.3, -4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (337) (-110.3, 0.3, -4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (354) (-113.0, 0.3, -4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (353) (-112.0, 0.3, -4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (336) (-109.3, 0.3, -4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (338) (-109.3, -0.3, -5.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (339) (-110.3, -0.3, -5.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (335) (-111.0, -0.3, -5.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (350) (-112.0, -0.3, -5.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (349) (-113.8, 0.3, -4.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (351) (-113.0, -0.3, -5.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (352) (-113.8, -0.3, -5.0)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (314) (-112.3, 0.8, 6.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (315) (-112.3, 0.8, 7.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (313) (-111.5, 0.8, 6.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (311) (-111.5, 0.8, 7.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (310) (-110.5, 0.8, 7.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (306) (-110.5, 0.8, 8.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (312) (-110.5, 0.8, 6.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (307) (-109.5, 0.8, 8.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (308) (-111.5, 0.8, 8.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (300) (-107.5, 0.0, 10.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (301) (-107.5, 0.3, 9.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (304) (-108.3, 0.0, 10.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (299) (-108.5, 0.0, 10.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (303) (-110.5, 0.3, 9.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (302) (-109.5, 0.3, 9.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (305) (-109.5, 0.0, 10.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (298) (-108.5, 0.3, 9.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (341) (-113.5, 0.8, 10.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (344) (-113.5, 0.5, 11.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (346) (-113.5, 0.8, 9.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (309) (-111.5, 0.5, 9.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (345) (-112.5, 0.8, 9.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (342) (-112.5, 0.8, 8.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (340) (-112.5, 0.8, 10.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (347) (-114.3, 0.8, 8.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (348) (-114.3, 0.8, 9.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (343) (-113.5, 0.8, 8.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (297) (-99.0, 0.8, 7.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass beach (296) (-98.0, 0.8, 7.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (191) (-89.5, 6.5, 53.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (190) (-89.5, 6.5, 54.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (189) (-88.5, 6.5, 54.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (188) (-88.5, 6.5, 53.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (197) (-87.0, 13.0, 75.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (194) (-87.0, 13.0, 74.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (184) (-86.0, 13.0, 73.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (183) (-86.0, 13.0, 74.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (181) (-86.0, 13.0, 75.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (185) (-84.7, 13.0, 73.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (182) (-83.0, 13.0, 72.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (199) (-83.0, 13.0, 70.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (201) (-84.0, 13.0, 70.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (135) (-83.5, 13.0, 58.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (128) (-82.5, 13.0, 57.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (130) (-82.5, 13.0, 58.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (147) (-86.0, 13.0, 54.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (132) (-82.5, 13.0, 60.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (134) (-83.5, 13.0, 59.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (131) (-82.5, 13.0, 59.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (136) (-78.5, 13.0, 56.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (139) (-79.5, 13.0, 55.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (133) (-79.5, 13.0, 56.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (138) (-80.5, 13.0, 55.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (137) (-80.5, 13.0, 56.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (143) (-85.0, 13.0, 53.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (142) (-86.0, 13.0, 53.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (145) (-87.0, 13.0, 53.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (146) (-87.0, 13.0, 54.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (140) (-85.0, 13.0, 52.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (141) (-86.0, 13.0, 52.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (144) (-84.0, 13.0, 52.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (192) (-70.5, 13.0, 56.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (186) (-69.5, 13.0, 56.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (187) (-69.5, 13.0, 55.8)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (123) (-82.5, 13.0, 44.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (126) (-82.5, 13.0, 45.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (121) (-83.5, 13.0, 45.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (124) (-83.5, 13.0, 44.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (125) (-83.5, 13.0, 43.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (151) (-82.5, 13.0, 27.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (152) (-82.5, 13.0, 26.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (150) (-81.5, 13.0, 27.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (148) (-81.5, 13.0, 25.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (149) (-81.5, 13.0, 26.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (154) (-79.0, 13.0, 23.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (153) (-78.0, 13.0, 23.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (161) (-68.0, 13.0, 26.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (162) (-68.0, 13.0, 27.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (165) (-69.0, 13.0, 27.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (164) (-69.0, 13.0, 28.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (163) (-68.0, 13.0, 28.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (166) (-68.0, 13.0, 29.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (167) (-63.0, 13.0, 24.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (168) (-62.0, 13.0, 24.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (170) (-61.0, 13.0, 25.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (169) (-62.0, 13.0, 25.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (172) (-62.0, 13.0, 26.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (178) (-61.0, 13.0, 43.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (175) (-60.0, 13.0, 43.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (177) (-61.0, 13.0, 44.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (174) (-59.0, 13.0, 42.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (173) (-59.0, 13.0, 43.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (171) (-59.0, 13.0, 44.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (176) (-60.0, 13.0, 44.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (159) (-83.5, 8.0, 23.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (160) (-83.5, 8.0, 24.5)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (158) (-83.5, 8.0, 22.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (155) (-82.5, 8.0, 24.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (157) (-82.5, 8.0, 22.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Ruined Atoll - Ruined Atoll Grass (156) (-82.5, 8.0, 23.0)"), lambda state: state.has_any(("Hero's Laurels", "Magic Orb"), player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (9) (179.8, 61.9, -67.1)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (8) (178.6, 61.9, -67.1)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (7) (204.4, 58.1, -94.1)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (5) (205.5, 58.1, -94.1)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (6) (205.5, 58.1, -93.0)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (2) (205.5, 54.0, -77.0)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (205.5, 54.0, -76.0)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (1) (204.5, 54.0, -76.0)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (4) (201.4, 54.3, -71.3)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("Frog Stairway - Frog Stairs Lower Grass (3) (200.4, 54.3, -71.3)"), lambda state: state.has("Magic Orb", player))
+    add_rule(world.get_location("West Garden - West Garden Grass (207) (-310.8, 1.3, 164.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("West Garden - West Garden Grass (210) (-310.8, 1.3, 165.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("West Garden - West Garden Grass (209) (-312.0, 1.3, 165.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("West Garden - West Garden Grass (208) (-312.0, 1.3, 164.5)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("West Garden - West Garden Grass (174) (-243.9, 0.5, 52.1)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("West Garden - West Garden Grass (262) (-244.8, 0.5, 51.3)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("West Garden - West Garden Grass (263) (-244.8, 0.5, 52.3)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Swamp - Back of Swamp Laurels Area Grass swamp (991) (34.5, 8.3, 31.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Swamp - Back of Swamp Laurels Area Grass swamp (992) (34.5, 8.0, 30.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Swamp - Back of Swamp Laurels Area Grass swamp (989) (35.5, 8.0, 30.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Swamp - Back of Swamp Laurels Area Grass swamp (990) (35.5, 8.0, 31.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Swamp - Back of Swamp Laurels Area Grass swamp (995) (32.5, 8.3, 31.8)"), lambda state: state.has("Hero's Laurels", player))
+    add_rule(world.get_location("Swamp - Back of Swamp Laurels Area Grass swamp (994) (33.5, 8.0, 31.8)"), lambda state: state.has("Hero's Laurels", player))
diff --git a/worlds/tunic/items.py b/worlds/tunic/items.py
index f30c1d5d248a..729bfd441172 100644
--- a/worlds/tunic/items.py
+++ b/worlds/tunic/items.py
@@ -166,6 +166,7 @@ class TunicItemData(NamedTuple):
     "Ladders in Library": TunicItemData(IC.progression, 0, 148, "Ladders"),
     "Ladders in Lower Quarry": TunicItemData(IC.progression, 0, 149, "Ladders"),
     "Ladders in Swamp": TunicItemData(IC.progression, 0, 150, "Ladders"),
+    "Grass": TunicItemData(IC.filler, 0, 151),
 }
 
 # items to be replaced by fool traps
@@ -214,7 +215,7 @@ class TunicItemData(NamedTuple):
 
 item_name_to_id: Dict[str, int] = {name: item_base_id + data.item_id_offset for name, data in item_table.items()}
 
-filler_items: List[str] = [name for name, data in item_table.items() if data.classification == IC.filler]
+filler_items: List[str] = [name for name, data in item_table.items() if data.classification == IC.filler and name != "Grass"]
 
 
 def get_item_group(item_name: str) -> str:
diff --git a/worlds/tunic/locations.py b/worlds/tunic/locations.py
index c44852e8aab8..d0c4f860e47f 100644
--- a/worlds/tunic/locations.py
+++ b/worlds/tunic/locations.py
@@ -1,4 +1,5 @@
-from typing import Dict, NamedTuple, Set, Optional
+from typing import Dict, NamedTuple, Set, Optional, List
+from .grass import grass_location_table
 
 
 class TunicLocationData(NamedTuple):
@@ -320,7 +321,27 @@ class TunicLocationData(NamedTuple):
     "Blue Questagon": "Rooted Ziggurat Lower - Hexagon Blue",
 }
 
-location_name_to_id: Dict[str, int] = {name: location_base_id + index for index, name in enumerate(location_table)}
+sphere_one: List[str] = [
+    "Overworld - [Central] Chest Across From Well",
+    "Overworld - [Northwest] Chest Near Quarry Gate",
+    "Overworld - [Northwest] Shadowy Corner Chest",
+    "Overworld - [Southwest] Chest Guarded By Turret",
+    "Overworld - [Southwest] South Chest Near Guard",
+    "Overworld - [Southwest] Obscured in Tunnel to Beach",
+    "Overworld - [Northwest] Chest Near Turret",
+    "Overworld - [Northwest] Page By Well",
+    "Overworld - [West] Chest Behind Moss Wall",
+    "Overworld - [Southwest] Key Pickup",
+    "Overworld - [West] Key Pickup",
+    "Overworld - [West] Obscured Behind Windmill",
+    "Overworld - [West] Obscured Near Well",
+    "Overworld - [West] Page On Teleporter"
+]
+
+standard_location_name_to_id: Dict[str, int] = {name: location_base_id + index for index, name in enumerate(location_table)}
+
+all_locations = location_table.copy()
+all_locations.update(grass_location_table)
 
 location_name_groups: Dict[str, Set[str]] = {}
 for loc_name, loc_data in location_table.items():
diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index 24247a6cfdcf..9a04a137b044 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Dict, Any
 from Options import (DefaultOnToggle, Toggle, StartInventoryPool, Choice, Range, TextChoice, PlandoConnections,
-                     PerGameCommonOptions, OptionGroup, Visibility)
+                     PerGameCommonOptions, OptionGroup, Visibility, NamedRange)
 from .er_data import portal_mapping
 
 
@@ -154,6 +154,33 @@ class ShuffleLadders(Toggle):
     display_name = "Shuffle Ladders"
 
 
+class GrassRandomizer(Toggle):
+    """
+    Turns over 6,000 blades of grass and bushes in the game into checks.
+    """
+    internal_name = "grass_randomizer"
+    display_name = "Grass Randomizer"
+
+
+class LocalFill(NamedRange):
+    """
+    Choose the percentage of your filler/trap items that will be kept local or distributed to other TUNIC players with this option enabled.
+    If you have Grass Randomizer enabled, this option must be set to 95% or higher to avoid flooding the item pool. The host can remove this restriction by turning off the limit_grass_rando setting in host.yaml.
+    This option defaults to 95% if you have Grass Randomizer enabled, and to 0% otherwise.
+    This option ignores items placed in your local_items or non_local_items.
+    This option does nothing in single player games.
+    """
+    internal_name = "local_fill"
+    display_name = "Local Fill Percent"
+    range_start = 0
+    range_end = 100
+    special_range_names = {
+        "default": -1
+    }
+    default = -1
+    visibility = Visibility.template | Visibility.complex_ui | Visibility.spoiler
+
+
 class TunicPlandoConnections(PlandoConnections):
     """
     Generic connection plando. Format is:
@@ -278,12 +305,13 @@ class TunicOptions(PerGameCommonOptions):
     combat_logic: CombatLogic
     lanternless: Lanternless
     maskless: Maskless
+    grass_randomizer: GrassRandomizer
+    local_fill: LocalFill
     laurels_zips: LaurelsZips
     ice_grappling: IceGrappling
     ladder_storage: LadderStorage
     ladder_storage_without_items: LadderStorageWithoutItems
     plando_connections: TunicPlandoConnections
-
     logic_rules: LogicRules
       
 

From b7621a0923c78dc3062da25c859a7f70cea56064 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Wed, 15 Jan 2025 18:52:12 -0500
Subject: [PATCH 263/381] TLoZ: Fix typo in setup guide (#4486)

---
 worlds/tloz/docs/multiworld_en.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/tloz/docs/multiworld_en.md b/worlds/tloz/docs/multiworld_en.md
index 366531e2e43a..e09d188ba4af 100644
--- a/worlds/tloz/docs/multiworld_en.md
+++ b/worlds/tloz/docs/multiworld_en.md
@@ -40,7 +40,7 @@ guide: [Basic Multiworld Setup Guide](/tutorial/Archipelago/setup/en)
 ### Where do I get a config file?
 
 The Player Options page on the website allows you to configure your personal options and export a config file from
-them. Player options page: [The Legend of Zelda Player Sptions Page](/games/The%20Legend%20of%20Zelda/player-options)
+them. Player options page: [The Legend of Zelda Player Options Page](/games/The%20Legend%20of%20Zelda/player-options)
 
 ### Verifying your config file
 

From 902d03d447344f06397633255f2cf3f50d484203 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Wed, 15 Jan 2025 21:42:19 -0500
Subject: [PATCH 264/381] LADX: Stabilize Item Pool Option (#3935)

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/ladx/LADXR/itempool.py |  6 ++++--
 worlds/ladx/Options.py        |  9 +++++++++
 worlds/ladx/__init__.py       | 13 ++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/worlds/ladx/LADXR/itempool.py b/worlds/ladx/LADXR/itempool.py
index 50314883378a..68f3e54ecba9 100644
--- a/worlds/ladx/LADXR/itempool.py
+++ b/worlds/ladx/LADXR/itempool.py
@@ -68,10 +68,12 @@
 
 
 class ItemPool:
-    def __init__(self, logic, settings, rnd):
+    def __init__(self, logic, settings, rnd, stabilize_item_pool: bool):
         self.__pool = {}
         self.__setup(logic, settings)
-        self.__randomizeRupees(settings, rnd)
+
+        if not stabilize_item_pool:
+            self.__randomizeRupees(settings, rnd)
 
     def add(self, item, count=1):
         self.__pool[item] = self.__pool.get(item, 0) + count
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index d92bd931867d..a35bb870fd91 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -527,6 +527,13 @@ class InGameHints(DefaultOnToggle):
     display_name = "In-game Hints"
 
 
+class StabilizeItemPool(DefaultOffToggle):
+    """
+    By default, rupees in the item pool may be randomly swapped with bombs, arrows, powders, or capacity upgrades. This option disables that swapping, which is useful for plando.
+    """
+    display_name = "Stabilize Item Pool"
+
+
 class ForeignItemIcons(Choice):
     """
     Choose how to display foreign items.
@@ -562,6 +569,7 @@ class ForeignItemIcons(Choice):
         TrendyGame,
         InGameHints,
         NagMessages,
+        StabilizeItemPool,
         Quickswap,
         HardMode,
         BootsControls
@@ -631,6 +639,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     no_flash: NoFlash
     in_game_hints: InGameHints
     overworld: Overworld
+    stabilize_item_pool: StabilizeItemPool
 
     warp_improvements: Removed
     additional_warp_points: Removed
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 09a25eb1cd09..f20b7f8018aa 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -138,7 +138,8 @@ def convert_ap_options_to_ladxr_logic(self):
         world_setup = LADXRWorldSetup()
         world_setup.randomize(self.ladxr_settings, self.random)
         self.ladxr_logic = LADXRLogic(configuration_options=self.ladxr_settings, world_setup=world_setup)
-        self.ladxr_itempool = LADXRItemPool(self.ladxr_logic, self.ladxr_settings, self.random).toDict()
+        self.ladxr_itempool = LADXRItemPool(self.ladxr_logic, self.ladxr_settings, self.random, bool(self.options.stabilize_item_pool)).toDict()
+
 
     def generate_early(self) -> None:
         self.dungeon_item_types = {
@@ -225,7 +226,7 @@ def create_items(self) -> None:
             for _ in range(count):
                 if item_name in exclude:
                     exclude.remove(item_name)  # this is destructive. create unique list above
-                    self.multiworld.itempool.append(self.create_item("Nothing"))
+                    self.multiworld.itempool.append(self.create_item(self.get_filler_item_name()))
                 else:
                     item = self.create_item(item_name)
 
@@ -499,8 +500,14 @@ def remove(self, state, item: Item) -> bool:
             state.prog_items[self.player]["RUPEES"] -= self.rupees[item.name]
         return change
 
+    # Same fill choices and weights used in LADXR.itempool.__randomizeRupees
+    filler_choices = ("Bomb", "Single Arrow", "10 Arrows", "Magic Powder", "Medicine")
+    filler_weights = ( 10,     5,              10,          10,             1)
+
     def get_filler_item_name(self) -> str:
-        return "Nothing"
+        if self.options.stabilize_item_pool:
+            return "Nothing"
+        return self.random.choices(self.filler_choices, self.filler_weights)[0]
 
     def fill_slot_data(self):
         slot_data = {}

From c7810823e89af0275bb6a091b3961cca00347324 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Thu, 16 Jan 2025 18:35:07 +0100
Subject: [PATCH 265/381] Core: Fix crash when trying to log an exception
 (#4313)

* Fix crash when trying to log an exception

In https://github.com/ArchipelagoMW/Archipelago/pull/3028, we added a new logging filter which checked `record.msg`.

However, you can pass whatever you want into a logging call. In this case, what we missed was https://github.com/ArchipelagoMW/Archipelago/blob/ecc3094c70b3ee1f3e18d9299c03198564ec261a/MultiServer.py#L530C1-L530C37, where we pass an Exception object as the message. This currently causes a crash with the new filter.

The logging module supports this. It has no typing and can handle passing objects as messages just fine.

What you're supposed to use, as far as I understand it, is `record.getMessage()` instead of `record.msg`.

* Update Utils.py

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 Utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Utils.py b/Utils.py
index 8f5ba1a0f84f..0aa81af1502e 100644
--- a/Utils.py
+++ b/Utils.py
@@ -521,8 +521,8 @@ def __init__(self, filter_name: str, condition: typing.Callable[[logging.LogReco
         def filter(self, record: logging.LogRecord) -> bool:
             return self.condition(record)
 
-    file_handler.addFilter(Filter("NoStream", lambda record: not getattr(record,  "NoFile", False)))
-    file_handler.addFilter(Filter("NoCarriageReturn", lambda record: '\r' not in record.msg))
+    file_handler.addFilter(Filter("NoStream", lambda record: not getattr(record, "NoFile", False)))
+    file_handler.addFilter(Filter("NoCarriageReturn", lambda record: '\r' not in record.getMessage()))
     root_logger.addHandler(file_handler)
     if sys.stdout:
         formatter = logging.Formatter(fmt='[%(asctime)s] %(message)s', datefmt='%Y-%m-%d %H:%M:%S')

From 5c56dc03578c24ecb443fa314824d200b3d38911 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 17 Jan 2025 01:27:36 +0100
Subject: [PATCH 266/381] SoE: fix logic for drain cave with OoB (#4496)

Also adds py3.13 compat and missing hash for sdist
---
 worlds/soe/requirements.txt | 73 +++++++++++++++++++------------------
 worlds/soe/test/test_oob.py | 45 +++++++++++++++++++----
 2 files changed, 75 insertions(+), 43 deletions(-)

diff --git a/worlds/soe/requirements.txt b/worlds/soe/requirements.txt
index 4bcacb33c33c..7d1bae0d6a7b 100644
--- a/worlds/soe/requirements.txt
+++ b/worlds/soe/requirements.txt
@@ -1,36 +1,37 @@
-pyevermizer==0.48.0 \
-  --hash=sha256:069ce348e480e04fd6208cfd0f789c600b18d7c34b5272375b95823be191ed57 \
-  --hash=sha256:58164dddaba2f340b0a8b4f39605e9dac46d8b0ffb16120e2e57bef2bfc1d683 \
-  --hash=sha256:115dd09d38a10f11d4629b340dfd75e2ba4089a1ff9e9748a11619829e02c876 \
-  --hash=sha256:b5e79cfe721e75cd7dec306b5eecd6385ce059e31ef7523ba7f677e22161ec6f \
-  --hash=sha256:382882fa9d641b9969a6c3ed89449a814bdabcb6b17b558872d95008a6cc908b \
-  --hash=sha256:92f67700e9132064a90858d391dd0b8fb111aff6dfd472befed57772d89ae567 \
-  --hash=sha256:fe4c453b7dbd5aa834b81f9a7aedb949a605455650b938b8b304d8e5a7edcbf7 \
-  --hash=sha256:c6bdbc45daf73818f763ed59ad079f16494593395d806f772dd62605c722b3e9 \
-  --hash=sha256:bb09f45448fdfd28566ae6fcc38c35a6632f4c31a9de2483848f6ce17b2359b5 \
-  --hash=sha256:00a8b9014744bd1528d0d39c33ede7c0d1713ad797a331cebb33d377a5bc1064 \
-  --hash=sha256:64ee69edc0a7d3b3caded78f2e46975f9beaff1ff8feaf29b87da44c45f38d7d \
-  --hash=sha256:9211bdb1313e9f4869ed5bdc61f3831d39679bd08bb4087f1c1e5475d9e3018b \
-  --hash=sha256:4a57821e422a1d75fe3307931a78db7a65e76955f8e401c4b347db6570390d09 \
-  --hash=sha256:04670cee0a0b913f24d2b9a1e771781560e2485bda31e6cd372a08421cf85cfa \
-  --hash=sha256:971fe77d0a20a1db984020ad253b613d0983f5e23ff22cba60ee5ac00d8128de \
-  --hash=sha256:127265fdb49f718f54706bf15604af1cec23590afd00d423089dea4331dcfc61 \
-  --hash=sha256:d47576360337c1a23f424cd49944a8d68fc4f3338e00719c9f89972c84604bef \
-  --hash=sha256:879659603e51130a0de8d9885d815a2fa1df8bd6cebe6d520d1c6002302adfdb \
-  --hash=sha256:6a91bfc53dd130db6424adf8ac97a1133e97b4157ed00f889d8cbd26a2a4b340 \
-  --hash=sha256:f3bf35fc5eef4cda49d2de77339fc201dd3206660a3dc15db005625b15bb806c \
-  --hash=sha256:e7c8d5bf59a3c16db20411bc5d8e9c9087a30b6b4edf1b5ed9f4c013291427e4 \
-  --hash=sha256:054a4d84ffe75448d41e88e1e0642ef719eb6111be5fe608e71e27a558c59069 \
-  --hash=sha256:e6f141ca367469c69ba7fbf65836c479ec6672c598cfcb6b39e8098c60d346bc \
-  --hash=sha256:6e65eb88f0c1ff4acde1c13b24ce649b0fe3d1d3916d02d96836c781a5022571 \
-  --hash=sha256:e61e8f476b6da809cf38912755ed8bb009665f589e913eb8df877e9fa763024b \
-  --hash=sha256:7e7c5484c0a2e3da6064de3f73d8d988d6703db58ab0be4730cbbf1a82319237 \
-  --hash=sha256:9033b954e5f4878fd94af6d2056c78e3316115521fb1c24a4416d5cbf2ad66ad \
-  --hash=sha256:824c623fff8ae4da176306c458ad63ad16a06a495a16db700665eca3c115924f \
-  --hash=sha256:8e31031409a8386c6a63b79d480393481badb3ba29f32ff7a0db2b4abed20ac8 \
-  --hash=sha256:7dbb7bb13e1e94f69f7ccdbcf4d35776424555fce5af1ca29d0256f91fdf087a \
-  --hash=sha256:3a24e331b259407b6912d6e0738aa8a675831db3b7493fcf54dc17cb0cb80d37 \
-  --hash=sha256:fdda06662a994271e96633cba100dd92b2fcd524acef8b2f664d1aaa14503cbd \
-  --hash=sha256:0f0fc81bef3dbb78ba6a7622dd4296f23c59825968a0bb0448beb16eb3397cc2 \
-  --hash=sha256:e07cbef776a7468669211546887357cc88e9afcf1578b23a4a4f2480517b15d9 \
-  --hash=sha256:e442212695bdf60e455673b7b9dd83a5d4b830d714376477093d2c9054d92832
+pyevermizer==0.48.1 \
+  --hash=sha256:db85cb4760abfde9d4b566d4613f2eddb8c2ff6f1c202ca0c2c5800bd62c9507 \
+  --hash=sha256:1c67d0dff0a42b9a037cdb138c0c7b2c776d8d7425830e7fd32f7ebf8f35ac00 \
+  --hash=sha256:d417f5b0407b063496aca43a65389e3308b6d0933c1d7907f7ecc8a00057903b \
+  --hash=sha256:abf6560204128783239c8f0fb15059a7c2ff453812f85fb8567766706b7839cc \
+  --hash=sha256:39e0cba1de1bc108c5b770ebe0fcbf3f6cb05575daf6bebe78c831c74848d101 \
+  --hash=sha256:a16054ce0d904749ef27ede375c0ca8f420831e28c4e84c67361e8181207f00d \
+  --hash=sha256:e6de509e4943bcde3e207a3640cad8efe3d8183740b63dc3cdbf5013db0f618b \
+  --hash=sha256:e9269cf1290ab2967eaac0bc24e658336fb0e1f6612efce8d7ef0e76c1c26200 \
+  --hash=sha256:f69e244229a110183d36b6a43ca557e716016d17e11265dca4070b8857afdb8d \
+  --hash=sha256:118d059b8ccd246dafb0a51d0aa8e4543c172f9665378983b9f43c680487732e \
+  --hash=sha256:185210c68b16351b3add4896ecfc26fe3867dadee9022f6a256e13093cca4a3b \
+  --hash=sha256:10e281612c38bbec11d35f5c09f5a5174fb884cc60e6f16b6790d854e4346678 \
+  --hash=sha256:9fc7d7e986243a96e96c1c05a386eb5d2ae4faef1ba810ab7e9e63dd83e86c2b \
+  --hash=sha256:c26eafc2230dca9e91aaf925a346532586d0f448456437ea4ce5054e15653fd8 \
+  --hash=sha256:8f96ffc5cfbe17b5c08818052be6f96906a1c9d3911e7bc4fbefee9b9ffa8f15 \
+  --hash=sha256:e40948cbcaab27aa4febb58054752f83357e81f4a6f088da22a71c4ec9aa7ef2 \
+  --hash=sha256:d59369cafa5df0fd2ce5cd5656c926e2fc0226a5a67a003d95497d56a0728dd3 \
+  --hash=sha256:345a25675d92aada5d94bc3f3d3e2946efd940a7228628bf8c05d2853ddda86d \
+  --hash=sha256:c0aa5054178c5e9900bfcf393c2bffdc69921d165521a3e9e5271528b01ef442 \
+  --hash=sha256:719d417fc21778d5036c9d25b7ce55582ab6f49da63ab93ec17d75ea6042364c \
+  --hash=sha256:28e220939850cfd8da16743365b28fa36d5bfc1dc58564789ae415e014ebc354 \
+  --hash=sha256:770e582000abf64dc7f0c62672e4a1f64729bb20695664c59e29d238398cb865 \
+  --hash=sha256:61d451b6f7d76fd435a5e9d2df111533e6e43da397a457f310151917318bd175 \
+  --hash=sha256:1c8b596e246bb8437c7fc6c9bb8d9c2c70bd9942f09b06ada02d2fabe596fa0b \
+  --hash=sha256:617f3eb0938e71a07b16477529f97fdf64487875462eb2edba6c9820b9686c0a \
+  --hash=sha256:98d655a256040a3ae6305145a9692a5483ddcfb9b9bbdb78d43f5e93e002a3ae \
+  --hash=sha256:d565bde7b1eb873badeedc2c9f327b4e226702b571aab2019778d46aa4509572 \
+  --hash=sha256:e04b89d6edf6ffdbf5c725b0cbf7375c87003378da80e6666818a2b6d59d3fc9 \
+  --hash=sha256:cc35e72f2a9e438786451f54532ce663ca63aedc3b4a43532f4ee97b45a71ed1 \
+  --hash=sha256:2e4640a975bf324e75f15edd6450e63db8228e2046b893bbdc47d896d5aec890 \
+  --hash=sha256:752716024255f13f96e40877b932694a517100a382a13f76c0bed3116b77f6d6 \
+  --hash=sha256:d36518349132cf2f3f4e5a6b0294db0b40f395daa620b0938227c2c8f5b1213e \
+  --hash=sha256:b5bca6e7fe5dcccd1e8757db4fb20d4bd998ed2b0f4b9ed26f7407c0a9b48d9f \
+  --hash=sha256:4663b727d2637ce7713e3db7b68828ca7dc6f03482f4763a055156f3fd16e026 \
+  --hash=sha256:7732bec7ffb29337418e62f15dc924e229faf09c55b079ad3f46f47eedc10c0d \
+  --hash=sha256:b83a7a4df24800f82844f6acc6d43cd4673de0c24c9041ab56e57f518defa5a1 \
diff --git a/worlds/soe/test/test_oob.py b/worlds/soe/test/test_oob.py
index 3c1a2829de8e..0878fd56e376 100644
--- a/worlds/soe/test/test_oob.py
+++ b/worlds/soe/test/test_oob.py
@@ -12,13 +12,13 @@ def test_oob_access(self) -> None:
         # some locations that just need a weapon + OoB
         oob_reachable = [
             "Aquagoth", "Sons of Sth.", "Mad Monk", "Magmar",  # OoB can use volcano shop to skip rock skip
-            "Levitate", "Fireball", "Drain", "Speed",
+            "Levitate", "Fireball", "Speed",
             "E. Crustacia #107", "Energy Core #285", "Vanilla Gauge #57",
         ]
         # some locations that should still be unreachable
         oob_unreachable = [
             "Tiny", "Rimsala",
-            "Barrier", "Call Up", "Reflect", "Force Field", "Stop",  # Stop guy doesn't spawn for the other entrances
+            "Barrier", "Drain", "Call Up", "Reflect", "Force Field", "Stop",  # Stop guy only spawns from one entrance
             "Pyramid bottom #118", "Tiny's hideout #160", "Tiny's hideout #161", "Greenhouse #275",
         ]
         # OoB + Diamond Eyes
@@ -31,11 +31,42 @@ def test_oob_access(self) -> None:
             "Tiny's hideout #161",
         ]
 
-        self.assertLocationReachability(reachable=oob_reachable, unreachable=oob_unreachable, satisfied=False)
-        self.collect_by_name("Gladiator Sword")
-        self.assertLocationReachability(reachable=oob_reachable, unreachable=oob_unreachable, satisfied=in_logic)
-        self.collect_by_name("Diamond Eye")
-        self.assertLocationReachability(reachable=de_reachable, unreachable=de_unreachable, satisfied=in_logic)
+        with self.subTest("No items", oob_logic=in_logic):
+            self.assertLocationReachability(reachable=oob_reachable, unreachable=oob_unreachable, satisfied=False)
+        with self.subTest("Cutting Weapon", oob_logic=in_logic):
+            self.collect_by_name("Gladiator Sword")
+            self.assertLocationReachability(reachable=oob_reachable, unreachable=oob_unreachable, satisfied=in_logic)
+        with self.subTest("Cutting Weapon + DEs", oob_logic=in_logic):
+            self.collect_by_name("Diamond Eye")
+            self.assertLocationReachability(reachable=de_reachable, unreachable=de_unreachable, satisfied=in_logic)
+
+    def test_real_axe(self) -> None:
+        in_logic = self.options["out_of_bounds"] == "logic"
+
+        # needs real Bronze Axe+, regardless of OoB
+        real_axe_required = [
+            "Drain",
+            "Drain Cave #180",
+            "Drain Cave #181",
+        ]
+        also_des_required = [
+            "Double Drain",
+        ]
+
+        with self.subTest("No Axe", oob_logic=in_logic):
+            self.collect_by_name("Gladiator Sword")
+            self.assertLocationReachability(reachable=real_axe_required, satisfied=False)
+        with self.subTest("Bronze Axe", oob_logic=in_logic):
+            self.collect_by_name("Bronze Axe")
+            self.assertLocationReachability(reachable=real_axe_required, satisfied=True)
+        with self.subTest("Knight Basher", oob_logic=in_logic):
+            self.remove_by_name("Bronze Axe")
+            self.collect_by_name("Knight Basher")
+            self.assertLocationReachability(reachable=real_axe_required, satisfied=True)
+            self.assertLocationReachability(reachable=also_des_required, satisfied=False)
+        with self.subTest("Knight Basher + DEs", oob_logic=in_logic):
+            self.collect_by_name("Diamond Eye")
+            self.assertLocationReachability(reachable=also_des_required, satisfied=True)
 
     def test_oob_goal(self) -> None:
         # still need Energy Core with OoB if sequence breaks are not in logic

From 9d4bd6eebd6e45331cd19c16e6114f1a4cd777fd Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 17 Jan 2025 01:53:50 +0100
Subject: [PATCH 267/381] pytest: only check tests/ and worlds/ (#4500)

This allows having failing tests in CI in worlds_disabled
and allows moving worlds there to disable tests.
---
 pytest.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 33e0bab8a98f..f16ab34ec0e2 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,3 +2,6 @@
 python_files = test_*.py Test*.py  # TODO: remove Test* once all worlds have been ported
 python_classes = Test
 python_functions = test
+testpaths =
+    tests
+    worlds

From 78904151b0f81f3ce77cc94b78cb23c5fefba77c Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 17 Jan 2025 02:10:48 +0100
Subject: [PATCH 268/381] Test: fix typo in pytest.ini (#4502)

The typo disabled a bunch of tests :S
---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index f16ab34ec0e2..cd8fd8dfce37 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,5 +3,5 @@ python_files = test_*.py Test*.py  # TODO: remove Test* once all worlds have bee
 python_classes = Test
 python_functions = test
 testpaths =
-    tests
+    test
     worlds

From 90f80ce1c18b2577b2ce6a6e4b21f00cb4c46d99 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Fri, 17 Jan 2025 02:10:41 +0000
Subject: [PATCH 269/381] AHiT: Various logic fixes (#4492)

* Fix Director boss photo logic

The rules were being added to for the "Director" boss in
`set_enemy_rules()`, which didn't exist because the boss created was
called "Conductor" instead.

The name of the boss has been changed to "Director", to match, because
it is more accurate due to DJ Grooves possibly being the boss instead of
The Conductor.

The missing logic was the `Hookshot Badge` requirement, however, the
boss events are only used as part of the `Camera Tourist - All Clear`
location, which requires every boss event to be reachable, and the
Toxic Flower boss also has a `Hookshot Badge` requirement, so the
missing `Hookshot Badge` for the Director boss had no effect on logic.

The boss event locations are hidden from spoiler output, so to get a
spoiler showing the Director boss event accessed before having
`Hookshot Badge`, spoiler output had to be modified to also show the
hidden locations. Example sphere from playthrough that should not be
possible because it gets the `Hookshot Badge` and the `Conductor` event
(now renamed to `Director`) in the same sphere:

```
5: {
  Act Completion (Time Rift - Dead Bird Studio): Relic (Crayon Box)
  Conductor - Dead Bird Studio Basement: Conductor
  Dead Bird Studio (Rift) - Page: Behind Cardboard Planet: Time Piece
  Dead Bird Studio (Rift) - Page: Near Time Rift Gate: Hookshot Badge
  Picture Perfect - Hats Buy Building: Metro Ticket - Blue
  Snatcher - Your Contract has Expired: Snatcher
}
```

* Add missing Hookshot + Painting logic for Toilet boss picture

Includes the Hard logic of crossing the gap with a cherry bridge instead
of hookshot and the expert logic of being able to skip the boss firewall
with a cherry hover.

* Fix Alpine Skyline - Goat Outpost Horn region

`Alpine Skyline - Goat Outpost Horn` is accessible from The Illness has
Spread, but was being added to the region that is only accessible from
Alpine Free Roam. `Alpine Skyline - Goat Outpost Horn` has been moved to
the region that is accessible from both The Illness has Spread and
Alpine Free Roam.

* Add missing HitType.umbrella logic for Top of HQ Coin in Beat the Heat

Like Heating up Mafia Town, the cannon to the Mafia HQ area only opens
once all the faucets have been turned off by hitting them. This requires
the Umbrella when umbrella logic is enabled, but the Snatcher Coin on
top of Mafia HQ was missing this requirement when accessed from Beat the
Heat.

* Add missing Main Objective requirement for auto-completed Bonus Stamps

When a Main Objective is not excluded, but the bonuses are excluded, the
bonuses auto-complete once the Main Objective is completed. The
requirement to complete the Main Objective was missing, so the logic was
incorrectly awarding bonus stamps as soon as a Contract was unlocked,
even when it was not possible to complete the Main Objective of that
Contract.

* Add missing Hookshot requirement for The Arctic Cruise - Toilet from Bon Voyage!

`The Arctic Cruise - Toilet` is accessed from the `Cruise Ship` region,
but it is only present in the Ship Shape and Bon Voyage! acts.

Ship Shape and Rock the Boat can access `Cruise Ship` without any items,
but Bon Voyage! requires the Hookshot Badge to reach `Cruise Ship`.

With how the logic was set up, it was incorrectly giving access to
`The Arctic Cruise - Toilet` if the player had access to Bon Voyage!
but only had access to `Cruise Ship` through Rock the Boat.

* Fix Expert logic Rush Hour-only ticket skips

The code was checking `if not world.options.NoTicketSkips:`, but that
would only be `True` for `False`. For "rush_hour" (for Rush Hour-only
ticket skips), it would be `False`, causing Rush Hour-only ticket skips
to act as if ticket skips were disabled.

* Remove Mystifying Time Mesa: Zipline gaining Hookshot requirement in moderate logic

Alpine Skyline - Mystifying Time Mesa: Zipline does not normally
require Hookshot Badge because it is an implied requirement due to only
being accessible from Alpine Free Roam which does require Hookshot
Badge. In normal logic difficulty, the location does not have an
explicit Hookshot Badge requirement, but moderate logic was adding a
Hookshot Badge requirement. This extraneous Hookshot Badge requirement
has been removed.

* Fix Act Completion (Queen Vanessa's Manor) not being accessible with Dweller Mask/Brewing Hat

It was logically requiring the Umbrella hit type only, whereas all the
other locations in Queen Vanessa's Manor require the Dweller Bell hit
type which additionally allows Dweller Mask or Brewing Hat.

* Remove Dweller Mask requirement for Subcon Forest - Tall Tree Hookshot Swing

The Dweller Mask is not used in the intended vanilla route to get this
item, so this requirement seems to have been a mistake.

* Remove unused SDJ option for Subcon Forest - Long Tree Climb Chest

Hard logic can already reach this location with nothing (other than
paintings), so the "or" logic of being able to perform an SDJ was
unused.

* Require any non-HUMT Mafia Town act for Hot Air Balloon with nothing

Two buckets/beach balls are required to bucket/ball hover, but there is
only a single beach ball accessible in Heating Up Mafia Town, and
no accessible buckets.

There is an alternative strategy for Top of Lighthouse that only
requires a single beach ball, so that location can still be reached with
nothing from Heating Up Mafia Town.

* Use `get_difficulty()` helper in `set_enemy_rules`

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/ahit/DeathWishRules.py | 18 +++++++++++++++---
 worlds/ahit/Locations.py      |  7 +++----
 worlds/ahit/Rules.py          | 14 +++++++-------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/worlds/ahit/DeathWishRules.py b/worlds/ahit/DeathWishRules.py
index 1432ef5c0d75..76723d393199 100644
--- a/worlds/ahit/DeathWishRules.py
+++ b/worlds/ahit/DeathWishRules.py
@@ -141,9 +141,12 @@ def set_dw_rules(world: "HatInTimeWorld"):
         add_dw_rules(world, all_clear)
         add_rule(main_stamp, main_objective.access_rule)
         add_rule(all_clear, main_objective.access_rule)
-        # Only set bonus stamp rules if we don't auto complete bonuses
+        # Only set bonus stamp rules to require All Clear if we don't auto complete bonuses
         if not world.options.DWAutoCompleteBonuses and not world.is_bonus_excluded(all_clear.name):
             add_rule(bonus_stamps, all_clear.access_rule)
+        else:
+            # As soon as the Main Objective is completed, the bonuses auto-complete.
+            add_rule(bonus_stamps, main_objective.access_rule)
 
     if world.options.DWShuffle:
         for i in range(len(world.dw_shuffle)-1):
@@ -343,6 +346,7 @@ def create_enemy_events(world: "HatInTimeWorld"):
 
 def set_enemy_rules(world: "HatInTimeWorld"):
     no_tourist = "Camera Tourist" in world.excluded_dws or "Camera Tourist" in world.excluded_bonuses
+    difficulty = get_difficulty(world)
 
     for enemy, regions in hit_list.items():
         if no_tourist and enemy in bosses:
@@ -372,6 +376,14 @@ def set_enemy_rules(world: "HatInTimeWorld"):
                              or state.has("Zipline Unlock - The Lava Cake Path", world.player)
                              or state.has("Zipline Unlock - The Windmill Path", world.player))
 
+            elif enemy == "Toilet":
+                if area == "Toilet of Doom":
+                    # The boss firewall is in the way and can only be skipped on Expert logic using a cherry hover.
+                    add_rule(event, lambda state: has_paintings(state, world, 1, allow_skip=difficulty == Difficulty.EXPERT))
+                    if difficulty < Difficulty.HARD:
+                        # Hard logic and above can cross the boss arena gap with a cherry bridge.
+                        add_rule(event, lambda state: can_use_hookshot(state, world))
+
             elif enemy == "Director":
                 if area == "Dead Bird Studio Basement":
                     add_rule(event, lambda state: can_use_hookshot(state, world))
@@ -430,7 +442,7 @@ def set_enemy_rules(world: "HatInTimeWorld"):
     # Bosses
     "Mafia Boss":       ["Down with the Mafia!", "Encore! Encore!", "Boss Rush"],
 
-    "Conductor":        ["Dead Bird Studio Basement", "Killing Two Birds", "Boss Rush"],
+    "Director":        ["Dead Bird Studio Basement", "Killing Two Birds", "Boss Rush"],
     "Toilet":           ["Toilet of Doom", "Boss Rush"],
 
     "Snatcher":         ["Your Contract has Expired", "Breaching the Contract", "Boss Rush",
@@ -454,7 +466,7 @@ def set_enemy_rules(world: "HatInTimeWorld"):
 
 bosses = [
     "Mafia Boss",
-    "Conductor",
+    "Director",
     "Toilet",
     "Snatcher",
     "Toxic Flower",
diff --git a/worlds/ahit/Locations.py b/worlds/ahit/Locations.py
index 9954514e8f3b..b34e6bb4a759 100644
--- a/worlds/ahit/Locations.py
+++ b/worlds/ahit/Locations.py
@@ -264,7 +264,6 @@ def get_location_names() -> Dict[str, int]:
                                              required_hats=[HatType.DWELLER], paintings=3),
 
     "Subcon Forest - Tall Tree Hookshot Swing": LocData(2000324766, "Subcon Forest Area",
-                                                        required_hats=[HatType.DWELLER],
                                                         hookshot=True,
                                                         paintings=3),
 
@@ -323,7 +322,7 @@ def get_location_names() -> Dict[str, int]:
     "Alpine Skyline - The Twilight Path": LocData(2000334434, "Alpine Skyline Area", required_hats=[HatType.DWELLER]),
     "Alpine Skyline - The Twilight Bell: Wide Purple Platform": LocData(2000336478, "The Twilight Bell"),
     "Alpine Skyline - The Twilight Bell: Ice Platform": LocData(2000335826, "The Twilight Bell"),
-    "Alpine Skyline - Goat Outpost Horn": LocData(2000334760, "Alpine Skyline Area"),
+    "Alpine Skyline - Goat Outpost Horn": LocData(2000334760, "Alpine Skyline Area (TIHS)", hookshot=True),
     "Alpine Skyline - Windy Passage": LocData(2000334776, "Alpine Skyline Area (TIHS)", hookshot=True),
     "Alpine Skyline - The Windmill: Inside Pon Cluster": LocData(2000336395, "The Windmill"),
     "Alpine Skyline - The Windmill: Entrance": LocData(2000335783, "The Windmill"),
@@ -407,7 +406,7 @@ def get_location_names() -> Dict[str, int]:
                                                hit_type=HitType.umbrella_or_brewing, hookshot=True, paintings=1),
 
     "Act Completion (Queen Vanessa's Manor)": LocData(2000312017, "Queen Vanessa's Manor",
-                                                      hit_type=HitType.umbrella, paintings=1),
+                                                      hit_type=HitType.dweller_bell, paintings=1),
 
     "Act Completion (Mail Delivery Service)": LocData(2000312032, "Mail Delivery Service",
                                                       required_hats=[HatType.SPRINT]),
@@ -878,7 +877,7 @@ def get_location_names() -> Dict[str, int]:
                                                dlc_flags=HatDLC.death_wish),
 
     "Snatcher Coin - Top of HQ (DW: BTH)": LocData(0, "Beat the Heat", snatcher_coin="Snatcher Coin - Top of HQ",
-                                                   dlc_flags=HatDLC.death_wish),
+                                                   hit_type=HitType.umbrella, dlc_flags=HatDLC.death_wish),
 
     "Snatcher Coin - Top of Tower": LocData(0, "Mafia Town Area (HUMT)", snatcher_coin="Snatcher Coin - Top of Tower",
                                             dlc_flags=HatDLC.death_wish),
diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py
index 183248a0e6d7..6753b8eb8147 100644
--- a/worlds/ahit/Rules.py
+++ b/worlds/ahit/Rules.py
@@ -414,7 +414,7 @@ def set_moderate_rules(world: "HatInTimeWorld"):
 
     # Moderate: Mystifying Time Mesa time trial without hats
     set_rule(world.multiworld.get_location("Alpine Skyline - Mystifying Time Mesa: Zipline", world.player),
-             lambda state: can_use_hookshot(state, world))
+             lambda state: True)
 
     # Moderate: Goat Refinery from TIHS with Sprint only
     add_rule(world.multiworld.get_location("Alpine Skyline - Goat Refinery", world.player),
@@ -493,9 +493,6 @@ def set_hard_rules(world: "HatInTimeWorld"):
              lambda state: has_paintings(state, world, 3, True))
 
     # SDJ
-    add_rule(world.multiworld.get_location("Subcon Forest - Long Tree Climb Chest", world.player),
-             lambda state: can_use_hat(state, world, HatType.SPRINT) and has_paintings(state, world, 2), "or")
-
     add_rule(world.multiworld.get_location("Act Completion (Time Rift - Curly Tail Trail)", world.player),
              lambda state: can_use_hat(state, world, HatType.SPRINT), "or")
 
@@ -533,7 +530,10 @@ def set_expert_rules(world: "HatInTimeWorld"):
     # Expert: Mafia Town - Above Boats, Top of Lighthouse, and Hot Air Balloon with nothing
     set_rule(world.multiworld.get_location("Mafia Town - Above Boats", world.player), lambda state: True)
     set_rule(world.multiworld.get_location("Mafia Town - Top of Lighthouse", world.player), lambda state: True)
-    set_rule(world.multiworld.get_location("Mafia Town - Hot Air Balloon", world.player), lambda state: True)
+    # There are not enough buckets/beach balls to bucket/ball hover in Heating Up Mafia Town, so any other Mafia Town
+    # act is required.
+    add_rule(world.multiworld.get_location("Mafia Town - Hot Air Balloon", world.player),
+             lambda state: state.can_reach_region("Mafia Town Area", world.player), "or")
 
     # Expert: Clear Dead Bird Studio with nothing
     for loc in world.multiworld.get_region("Dead Bird Studio - Post Elevator Area", world.player).locations:
@@ -590,7 +590,7 @@ def set_expert_rules(world: "HatInTimeWorld"):
 
     if world.is_dlc2():
         # Expert: clear Rush Hour with nothing
-        if not world.options.NoTicketSkips:
+        if world.options.NoTicketSkips != NoTicketSkips.option_true:
             set_rule(world.multiworld.get_location("Act Completion (Rush Hour)", world.player), lambda state: True)
         else:
             set_rule(world.multiworld.get_location("Act Completion (Rush Hour)", world.player),
@@ -739,7 +739,7 @@ def set_dlc1_rules(world: "HatInTimeWorld"):
 
     # This particular item isn't present in Act 3 for some reason, yes in vanilla too
     add_rule(world.multiworld.get_location("The Arctic Cruise - Toilet", world.player),
-             lambda state: state.can_reach("Bon Voyage!", "Region", world.player)
+             lambda state: (state.can_reach("Bon Voyage!", "Region", world.player) and can_use_hookshot(state, world))
              or state.can_reach("Ship Shape", "Region", world.player))
 
 

From 2e4f5a64b3b40cbfb75b5af34cc4db32004ade09 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Thu, 16 Jan 2025 21:13:37 -0500
Subject: [PATCH 270/381] TUNIC: Make the local_fill option load in a specific
 number of locations (#4488)

* Make it load in a specific number of locations

* TunicLocation -> Location

* Actually shuffle the list
---
 worlds/tunic/__init__.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 09279dd1bd86..388a44113a82 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -95,7 +95,7 @@ class TunicWorld(World):
 
     # for the local_fill option
     fill_items: List[TunicItem]
-    fill_locations: List[TunicLocation]
+    fill_locations: List[Location]
     amount_to_local_fill: int
 
     # so we only loop the multiworld locations once
@@ -394,8 +394,6 @@ def remove_filler(amount: int) -> None:
         self.multiworld.itempool += tunic_items
 
     def pre_fill(self) -> None:
-        self.fill_locations = []
-
         if self.options.local_fill > 0 and self.multiworld.players > 1:
             # we need to reserve a couple locations so that we don't fill up every sphere 1 location
             reserved_locations: Set[str] = set(self.random.sample(sphere_one, 2))
@@ -406,8 +404,8 @@ def pre_fill(self) -> None:
             if len(viable_locations) < self.amount_to_local_fill:
                 raise OptionError(f"TUNIC: Not enough locations for local_fill option for {self.player_name}. "
                                   f"This is likely due to excess plando or priority locations.")
-
-            self.fill_locations += viable_locations
+            self.random.shuffle(viable_locations)
+            self.fill_locations = viable_locations[:self.amount_to_local_fill]
 
     @classmethod
     def stage_pre_fill(cls, multiworld: MultiWorld) -> None:

From 1485882642cad9a542561015d35c675dabee8c9a Mon Sep 17 00:00:00 2001
From: JaredWeakStrike <96694163+JaredWeakStrike@users.noreply.github.com>
Date: Thu, 16 Jan 2025 21:57:41 -0500
Subject: [PATCH 271/381] KH2: Fixes abilities overflowing into items and
 crashing the game (#4384)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/kh2/Client.py | 51 +++++---------------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/worlds/kh2/Client.py b/worlds/kh2/Client.py
index e2d2338b7651..d8bdf6a9e368 100644
--- a/worlds/kh2/Client.py
+++ b/worlds/kh2/Client.py
@@ -345,33 +345,12 @@ def on_package(self, cmd: str, args: dict):
             self.lookup_id_to_item = {v: k for k, v in self.kh2_item_name_to_id.items()}
             self.ability_code_list = [self.kh2_item_name_to_id[item] for item in exclusion_item_table["Ability"]]
 
-            if "keyblade_abilities" in self.kh2slotdata.keys():
-                sora_ability_dict = self.kh2slotdata["KeybladeAbilities"]
+            if "KeybladeAbilities" in self.kh2slotdata.keys():
                 # sora ability to slot
+                self.AbilityQuantityDict.update(self.kh2slotdata["KeybladeAbilities"])
                 # itemid:[slots that are available for that item]
-                for k, v in sora_ability_dict.items():
-                    if v >= 1:
-                        if k not in self.sora_ability_to_slot.keys():
-                            self.sora_ability_to_slot[k] = []
-                        for _ in range(sora_ability_dict[k]):
-                            self.sora_ability_to_slot[k].append(self.kh2_seed_save_cache["SoraInvo"][0])
-                            self.kh2_seed_save_cache["SoraInvo"][0] -= 2
-                donald_ability_dict = self.kh2slotdata["StaffAbilities"]
-                for k, v in donald_ability_dict.items():
-                    if v >= 1:
-                        if k not in self.donald_ability_to_slot.keys():
-                            self.donald_ability_to_slot[k] = []
-                        for _ in range(donald_ability_dict[k]):
-                            self.donald_ability_to_slot[k].append(self.kh2_seed_save_cache["DonaldInvo"][0])
-                            self.kh2_seed_save_cache["DonaldInvo"][0] -= 2
-                goofy_ability_dict = self.kh2slotdata["ShieldAbilities"]
-                for k, v in goofy_ability_dict.items():
-                    if v >= 1:
-                        if k not in self.goofy_ability_to_slot.keys():
-                            self.goofy_ability_to_slot[k] = []
-                        for _ in range(goofy_ability_dict[k]):
-                            self.goofy_ability_to_slot[k].append(self.kh2_seed_save_cache["GoofyInvo"][0])
-                            self.kh2_seed_save_cache["GoofyInvo"][0] -= 2
+                self.AbilityQuantityDict.update(self.kh2slotdata["StaffAbilities"])
+                self.AbilityQuantityDict.update(self.kh2slotdata["ShieldAbilities"])
 
             all_weapon_location_id = []
             for weapon_location in all_weapon_slot:
@@ -525,27 +504,7 @@ async def give_item(self, item, location):
                 if itemname not in self.kh2_seed_save_cache["AmountInvo"]["Ability"]:
                     self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname] = []
                     #  appending the slot that the ability should be in
-                # for non beta. remove after 4.3
-                if "PoptrackerVersion" in self.kh2slotdata:
-                    if self.kh2slotdata["PoptrackerVersionCheck"] < 4.3:
-                        if (itemname in self.sora_ability_set
-                            and len(self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname]) < self.item_name_to_data[itemname].quantity) \
-                                and self.kh2_seed_save_cache["SoraInvo"][1] > 0x254C:
-                            ability_slot = self.kh2_seed_save_cache["SoraInvo"][1]
-                            self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
-                            self.kh2_seed_save_cache["SoraInvo"][1] -= 2
-                        elif itemname in self.donald_ability_set:
-                            ability_slot = self.kh2_seed_save_cache["DonaldInvo"][1]
-                            self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
-                            self.kh2_seed_save_cache["DonaldInvo"][1] -= 2
-                        else:
-                            ability_slot = self.kh2_seed_save_cache["GoofyInvo"][1]
-                            self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
-                            self.kh2_seed_save_cache["GoofyInvo"][1] -= 2
-                        if ability_slot in self.front_ability_slots:
-                            self.front_ability_slots.remove(ability_slot)
-
-                elif len(self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname]) < \
+                if len(self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname]) < \
                         self.AbilityQuantityDict[itemname]:
                     if itemname in self.sora_ability_set:
                         ability_slot = self.kh2_seed_save_cache["SoraInvo"][0]

From 3a5a4b89ee860d4b9c762119c27df4abb74c3ba7 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 16 Jan 2025 21:58:49 -0500
Subject: [PATCH 272/381] LADX: improved warps across unexplored tiles (#4111)

---
 worlds/ladx/LADXR/generator.py    |  1 +
 worlds/ladx/LADXR/patches/core.py | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index ff6cc06c39a9..413bf89c063c 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -103,6 +103,7 @@ def generateRom(args, world: "LinksAwakeningWorld"):
     assembler.const("wGoldenLeaves", 0xDB42)  # New memory location where to store the golden leaf counter
     assembler.const("wCollectedTunics", 0xDB6D)  # Memory location where to store which tunic options are available (and boots)
     assembler.const("wCustomMessage", 0xC0A0)
+    assembler.const("wOverworldRoomStatus", 0xD800)
 
     # We store the link info in unused color dungeon flags, so it gets preserved in the savegame.
     assembler.const("wLinkSyncSequenceNumber", 0xDDF6)
diff --git a/worlds/ladx/LADXR/patches/core.py b/worlds/ladx/LADXR/patches/core.py
index f4752c82e3da..d9fcd62e3060 100644
--- a/worlds/ladx/LADXR/patches/core.py
+++ b/worlds/ladx/LADXR/patches/core.py
@@ -716,9 +716,7 @@ def addWarpImprovements(rom, extra_warps):
 
     # Allow cursor to move over black squares
     # This allows warping to undiscovered areas - a fine cheat, but needs a check for wOverworldRoomStatus in the warp code
-    CHEAT_WARP_ANYWHERE = False
-    if CHEAT_WARP_ANYWHERE:
-        rom.patch(0x01, 0x1AE8, None, ASM("jp $5AF5"))
+    rom.patch(0x01, 0x1AE8, None, ASM("jp $5AF5"))
 
     # This disables the arrows around the selection bubble
     #rom.patch(0x01, 0x1B6F, None, ASM("ret"), fill_nop=True)
@@ -797,8 +795,14 @@ def addWarpImprovements(rom, extra_warps):
 TeleportHandler:
 
     ld  a, [$DBB4] ; Load the current selected tile
-    ; TODO: check if actually revealed so we can have free movement
-    ; Check cursor against different tiles to see if we are selecting a warp
+    ld   hl, wOverworldRoomStatus
+    ld   e, a                                     ; $5D38: $5F
+    ld   d, $00                                   ; $5D39: $16 $00
+    add  hl, de                                   ; $5D3B: $19
+    ld   a, [hl]
+    and  $80
+    jr z, exit
+    ld  a, [$DBB4] ; Load the current selected tile
     {warp_jump}
     jr exit
 

From 4b8f990960f405e9a1d42b25f0ea4699f029b8f1 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Thu, 16 Jan 2025 21:59:19 -0500
Subject: [PATCH 273/381] LADX: Swap out invalid characters in item names
 (#4495)

---
 worlds/ladx/LADXR/locations/itemInfo.py | 9 +++++++++
 worlds/ladx/__init__.py                 | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/worlds/ladx/LADXR/locations/itemInfo.py b/worlds/ladx/LADXR/locations/itemInfo.py
index dcd4205f4cd9..cd0f35514972 100644
--- a/worlds/ladx/LADXR/locations/itemInfo.py
+++ b/worlds/ladx/LADXR/locations/itemInfo.py
@@ -2,6 +2,10 @@
 from ..checkMetadata import checkMetadataTable
 from .constants import *
 
+custom_name_replacements = {
+    '"':"'",
+    '_':' ',
+}
 
 class ItemInfo:
     MULTIWORLD = True
@@ -23,6 +27,11 @@ def location(self):
     def setLocation(self, location):
         self._location = location
 
+    def setCustomItemName(self, name):
+        for key, val in custom_name_replacements.items():
+            name = name.replace(key, val)
+        self.custom_item_name = name
+
     def getOptions(self):
         return self.OPTIONS
 
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index f20b7f8018aa..7b1a35666ae7 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -439,7 +439,7 @@ def generate_output(self, output_directory: str):
                     # Otherwise, use a cute letter as the icon
                     elif self.options.foreign_item_icons == 'guess_by_name':
                         loc.ladxr_item.item = self.guess_icon_for_other_world(loc.item)
-                        loc.ladxr_item.custom_item_name = loc.item.name
+                        loc.ladxr_item.setCustomItemName(loc.item.name)
 
                     else:
                         if loc.item.advancement:

From 8f307c226bde17a0e1a1caf4ad98dfccc7bb0c34 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Fri, 17 Jan 2025 02:59:38 +0000
Subject: [PATCH 274/381] Core: Fix the distribution of
 Options.Range.triangular() (#4283)

---
 Options.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Options.py b/Options.py
index 135a1dcb5398..d9122d444c97 100644
--- a/Options.py
+++ b/Options.py
@@ -689,9 +689,9 @@ def from_text(cls, text: str) -> Range:
     @classmethod
     def weighted_range(cls, text) -> Range:
         if text == "random-low":
-            return cls(cls.triangular(cls.range_start, cls.range_end, cls.range_start))
+            return cls(cls.triangular(cls.range_start, cls.range_end, 0.0))
         elif text == "random-high":
-            return cls(cls.triangular(cls.range_start, cls.range_end, cls.range_end))
+            return cls(cls.triangular(cls.range_start, cls.range_end, 1.0))
         elif text == "random-middle":
             return cls(cls.triangular(cls.range_start, cls.range_end))
         elif text.startswith("random-range-"):
@@ -717,11 +717,11 @@ def custom_range(cls, text) -> Range:
                 f"{random_range[0]}-{random_range[1]} is outside allowed range "
                 f"{cls.range_start}-{cls.range_end} for option {cls.__name__}")
         if text.startswith("random-range-low"):
-            return cls(cls.triangular(random_range[0], random_range[1], random_range[0]))
+            return cls(cls.triangular(random_range[0], random_range[1], 0.0))
         elif text.startswith("random-range-middle"):
             return cls(cls.triangular(random_range[0], random_range[1]))
         elif text.startswith("random-range-high"):
-            return cls(cls.triangular(random_range[0], random_range[1], random_range[1]))
+            return cls(cls.triangular(random_range[0], random_range[1], 1.0))
         else:
             return cls(random.randint(random_range[0], random_range[1]))
 
@@ -739,8 +739,16 @@ def __str__(self) -> str:
         return str(self.value)
 
     @staticmethod
-    def triangular(lower: int, end: int, tri: typing.Optional[int] = None) -> int:
-        return int(round(random.triangular(lower, end, tri), 0))
+    def triangular(lower: int, end: int, tri: float = 0.5) -> int:
+        """
+        Integer triangular distribution for `lower` inclusive to `end` inclusive.
+
+        Expects `lower <= end` and `0.0 <= tri <= 1.0`. The result of other inputs is undefined.
+        """
+        # Use the continuous range [lower, end + 1) to produce an integer result in [lower, end].
+        # random.triangular is actually [a, b] and not [a, b), so there is a very small chance of getting exactly b even
+        # when a != b, so ensure the result is never more than `end`.
+        return min(end, math.floor(random.triangular(0.0, 1.0, tri) * (end - lower + 1) + lower))
 
 
 class NamedRange(Range):

From a9435dc6bb7b237f97f5cd4cd6f0f65e7d9c17d7 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Fri, 17 Jan 2025 03:00:29 +0000
Subject: [PATCH 275/381] KH2: Reduce unnecessary packets sent/requested by the
 client (#4035)

---
 worlds/kh2/Client.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/worlds/kh2/Client.py b/worlds/kh2/Client.py
index d8bdf6a9e368..3ea47e40ebba 100644
--- a/worlds/kh2/Client.py
+++ b/worlds/kh2/Client.py
@@ -110,6 +110,7 @@ def __init__(self, server_address, password):
             18: TWTNW_Checks,
             #  255: {},  # starting screen
         }
+        self.last_world_int = -1
         # 0x2A09C00+0x40 is the sve anchor. +1 is the last saved room
         # self.sveroom = 0x2A09C00 + 0x41
         # 0 not in battle 1 in yellow battle 2 red battle #short
@@ -387,13 +388,15 @@ def on_package(self, cmd: str, args: dict):
     async def checkWorldLocations(self):
         try:
             currentworldint = self.kh2_read_byte(self.Now)
-            await self.send_msgs([{
-                "cmd":     "Set", "key": "Slot: " + str(self.slot) + " :CurrentWorld",
-                "default": 0, "want_reply": True, "operations": [{
-                    "operation": "replace",
-                    "value":     currentworldint
-                }]
-            }])
+            if self.last_world_int != currentworldint:
+                self.last_world_int = currentworldint
+                await self.send_msgs([{
+                    "cmd":     "Set", "key": "Slot: " + str(self.slot) + " :CurrentWorld",
+                    "default": 0, "want_reply": False, "operations": [{
+                        "operation": "replace",
+                        "value":     currentworldint
+                    }]
+                }])
             if currentworldint in self.worldid_to_locations:
                 curworldid = self.worldid_to_locations[currentworldint]
                 for location, data in curworldid.items():
@@ -804,7 +807,7 @@ async def verifyItems(self):
             logger.info("line 840")
 
 
-def finishedGame(ctx: KH2Context, message):
+def finishedGame(ctx: KH2Context):
     if ctx.kh2slotdata['FinalXemnas'] == 1:
         if not ctx.final_xemnas and ctx.kh2_read_byte(ctx.Save + all_world_locations[LocationName.FinalXemnas].addrObtained) \
                 & 0x1 << all_world_locations[LocationName.FinalXemnas].bitIndex > 0:
@@ -836,8 +839,9 @@ def finishedGame(ctx: KH2Context, message):
     elif ctx.kh2slotdata['Goal'] == 2:
         # for backwards compat
         if "hitlist" in ctx.kh2slotdata:
+            locations = ctx.sending
             for boss in ctx.kh2slotdata["hitlist"]:
-                if boss in message[0]["locations"]:
+                if boss in locations:
                     ctx.hitlist_bounties += 1
         if ctx.hitlist_bounties >= ctx.kh2slotdata["BountyRequired"] or ctx.kh2_seed_save_cache["AmountInvo"]["Amount"]["Bounty"] >= ctx.kh2slotdata["BountyRequired"]:
             if ctx.kh2_read_byte(ctx.Save + 0x36B3) < 1:
@@ -878,11 +882,12 @@ async def kh2_watcher(ctx: KH2Context):
                 await asyncio.create_task(ctx.verifyChests())
                 await asyncio.create_task(ctx.verifyItems())
                 await asyncio.create_task(ctx.verifyLevel())
-                message = [{"cmd": 'LocationChecks', "locations": ctx.sending}]
-                if finishedGame(ctx, message) and not ctx.kh2_finished_game:
+                if finishedGame(ctx) and not ctx.kh2_finished_game:
                     await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
                     ctx.kh2_finished_game = True
-                await ctx.send_msgs(message)
+                if ctx.sending:
+                    message = [{"cmd": 'LocationChecks', "locations": ctx.sending}]
+                    await ctx.send_msgs(message)
             elif not ctx.kh2connected and ctx.serverconneced:
                 logger.info("Game Connection lost. waiting 15 seconds until trying to reconnect.")
                 ctx.kh2 = None

From 3d5c277c310684969d8cebfd67a495fafb94e024 Mon Sep 17 00:00:00 2001
From: Aaron Wagener <mmmcheese158@gmail.com>
Date: Fri, 17 Jan 2025 07:39:41 -0600
Subject: [PATCH 276/381] Core: don't log warnings for plando_items and missing
 lttp options (#3606)

* Core: don't log a warning for the "options" that are valid in a game section but not on the options system

* don't rebuild a set every loop
---
 Generate.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Generate.py b/Generate.py
index 8a2e72d1ce6a..d6611b0f8a31 100644
--- a/Generate.py
+++ b/Generate.py
@@ -438,7 +438,7 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
     if "linked_options" in weights:
         weights = roll_linked_options(weights)
 
-    valid_keys = set()
+    valid_keys = {"triggers"}
     if "triggers" in weights:
         weights = roll_triggers(weights, weights["triggers"], valid_keys)
 
@@ -497,16 +497,23 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
     for option_key, option in world_type.options_dataclass.type_hints.items():
         handle_option(ret, game_weights, option_key, option, plando_options)
         valid_keys.add(option_key)
-    for option_key in game_weights:
-        if option_key in {"triggers", *valid_keys}:
-            continue
-        logging.warning(f"{option_key} is not a valid option name for {ret.game} and is not present in triggers "
-                        f"for player {ret.name}.")
+
+    # TODO remove plando_items after moving it to the options system
+    valid_keys.add("plando_items")
     if PlandoOptions.items in plando_options:
         ret.plando_items = copy.deepcopy(game_weights.get("plando_items", []))
     if ret.game == "A Link to the Past":
+        # TODO there are still more LTTP options not on the options system
+        valid_keys |= {"sprite_pool", "sprite", "random_sprite_on_event"}
         roll_alttp_settings(ret, game_weights)
 
+    # log a warning for options within a game section that aren't determined as valid
+    for option_key in game_weights:
+        if option_key in valid_keys:
+            continue
+        logging.warning(f"{option_key} is not a valid option name for {ret.game} and is not present in triggers "
+                        f"for player {ret.name}.")
+
     return ret
 
 

From d218dec82699876cea22c41bdaa63b9bae849922 Mon Sep 17 00:00:00 2001
From: digiholic <digikun@gmail.com>
Date: Fri, 17 Jan 2025 06:41:12 -0700
Subject: [PATCH 277/381] MMBN3: Logic and Bug Fixes, New Checks (#3646)

* PMDs now check to make sure you have enough unlockers for all of them before any are in logic, to avoid softlocks

* Adds Humor and BlckMnd to the pool and sets logic for Villain and Comedian. Patch not yet updated to remove starting inventory

* Adds Serenade as a check

* Fixes hide and seek completion to use proper Yoka Zoo map. Updates bsdiff patch to 1.2

* Adds option for excluding Secret Area, and item/location groups for further customization

* Update worlds/mmbn3/Locations.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update worlds/mmbn3/Regions.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update worlds/mmbn3/__init__.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update worlds/mmbn3/__init__.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update worlds/mmbn3/__init__.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Replaces can_reach generic with can_reach_region or can_reach_location, where applciable

* Unlocker is now a progression item, Excluded Locations is now a Set

* Missed a merge marker

* Excluded locations is no longer a set since you can't append to a set with +=

* Excluded locations is now a set again since you apparent can append to a set with |=

* Replaces more lists with sets. Fixes wording in option descriptions

* Update worlds/mmbn3/__init__.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/mmbn3/Items.py                 |  29 ++++-
 worlds/mmbn3/Locations.py             |  37 +++---
 worlds/mmbn3/Names/ItemName.py        |   2 +
 worlds/mmbn3/Names/LocationName.py    |   2 +
 worlds/mmbn3/Options.py               |  12 +-
 worlds/mmbn3/Regions.py               |   4 +-
 worlds/mmbn3/__init__.py              | 178 +++++++++++++++-----------
 worlds/mmbn3/data/bn3-ap-patch.bsdiff | Bin 59914 -> 61276 bytes
 8 files changed, 165 insertions(+), 99 deletions(-)

diff --git a/worlds/mmbn3/Items.py b/worlds/mmbn3/Items.py
index 30ec311ecbe2..7e3458c913f4 100644
--- a/worlds/mmbn3/Items.py
+++ b/worlds/mmbn3/Items.py
@@ -85,7 +85,7 @@ class MMBN3Item(Item):
 ]
 
 subChipList: typing.List[ItemData] = [
-    ItemData(0xB31018, ItemName.Unlocker, ItemClassification.useful, ItemType.SubChip,  117),
+    ItemData(0xB31018, ItemName.Unlocker, ItemClassification.progression, ItemType.SubChip,  117),
     ItemData(0xB31019, ItemName.Untrap,   ItemClassification.filler, ItemType.SubChip,  115),
     ItemData(0xB3101A, ItemName.LockEnmy, ItemClassification.filler, ItemType.SubChip,  116),
     ItemData(0xB3101B, ItemName.MiniEnrg, ItemClassification.filler, ItemType.SubChip,  112),
@@ -290,7 +290,9 @@ class MMBN3Item(Item):
     ItemData(0xB31099, ItemName.WpnLV_plus_Yellow, ItemClassification.filler, ItemType.Program, 35, ProgramColor.Yellow),
     ItemData(0xB3109A, ItemName.Press,             ItemClassification.progression, ItemType.Program, 20, ProgramColor.White),
 
-    ItemData(0xB310B7, ItemName.UnderSht,          ItemClassification.useful, ItemType.Program, 30, ProgramColor.White)
+    ItemData(0xB310B7, ItemName.UnderSht,          ItemClassification.useful, ItemType.Program, 30, ProgramColor.White),
+    ItemData(0xB310E0, ItemName.Humor,             ItemClassification.progression, ItemType.Program, 45, ProgramColor.Pink),
+    ItemData(0xB310E1, ItemName.BlckMnd,           ItemClassification.progression, ItemType.Program, 46, ProgramColor.White)
 ]
 
 zennyList: typing.List[ItemData] = [
@@ -338,8 +340,29 @@ class MMBN3Item(Item):
     ItemName.zenny_800z: 2,
     ItemName.zenny_1000z: 2,
     ItemName.zenny_1200z: 2,
-    ItemName.bugfrag_01: 5,
+    ItemName.bugfrag_01: 10,
+    ItemName.bugfrag_10: 5
 }
+
+item_groups: typing.Dict[str, typing.Set[str]] = {
+    "Key Items": {loc.itemName for loc in keyItemList},
+    "Subchips": {loc.itemName for loc in subChipList},
+    "Programs": {loc.itemName for loc in programList},
+    "BattleChips": {loc.itemName for loc in chipList},
+    "Zenny": {loc.itemName for loc in zennyList},
+    "BugFrags": {loc.itemName for loc in bugFragList},
+    "Navi Chips": {
+        ItemName.Roll_R, ItemName.RollV2_R, ItemName.RollV3_R, ItemName.GutsMan_G, ItemName.GutsManV2_G,
+        ItemName.GutsManV3_G, ItemName.ProtoMan_B, ItemName.ProtoManV2_B, ItemName.ProtoManV3_B, ItemName.FlashMan_F,
+        ItemName.FlashManV2_F, ItemName.FlashManV3_F, ItemName.BeastMan_B, ItemName.BeastManV2_B, ItemName.BeastManV3_B,
+        ItemName.BubblMan_B, ItemName.BubblManV2_B, ItemName.BubblManV3_B, ItemName.DesertMan_D, ItemName.DesertManV2_D,
+        ItemName.DesertManV3_D, ItemName.PlantMan_P, ItemName.PlantManV2_P, ItemName.PlantManV3_P, ItemName.FlamMan_F,
+        ItemName.FlamManV2_F, ItemName.FlamManV3_F, ItemName.DrillMan_D, ItemName.DrillManV2_D, ItemName.DrillManV3_D,
+        ItemName.MetalMan_M, ItemName.MetalManV2_M, ItemName.MetalManV3_M, ItemName.KingMan_K, ItemName.KingManV2_K,
+        ItemName.KingManV3_K, ItemName.BowlMan_B, ItemName.BowlManV2_B, ItemName.BowlManV3_B
+    }
+}
+
 all_items: typing.List[ItemData] = keyItemList + subChipList + chipList + programList + zennyList + bugFragList
 item_table: typing.Dict[str, ItemData] = {item.itemName: item for item in all_items}
 items_by_id: typing.Dict[int, ItemData] = {item.code: item for item in all_items}
diff --git a/worlds/mmbn3/Locations.py b/worlds/mmbn3/Locations.py
index 0e2a1c51d11b..bc16c99a5823 100644
--- a/worlds/mmbn3/Locations.py
+++ b/worlds/mmbn3/Locations.py
@@ -221,7 +221,8 @@ class MMBN3Location(Location):
     LocationData(LocationName.Hades_Boat_Dock,                    0xb310ab, 0x200024c, 0x10, 0x7519B0, 223, [3]),
     LocationData(LocationName.WWW_Control_Room_1_Screen,          0xb310ac, 0x200024d, 0x40, 0x7596C4, 222, [3, 4]),
     LocationData(LocationName.WWW_Wilys_Desk,                     0xb310ad, 0x200024d, 0x2, 0x759384, 229, [3]),
-    LocationData(LocationName.Undernet_4_Pillar_Prog,             0xb310ae, 0x2000161, 0x1, 0x7746C8, 191, [0, 1])
+    LocationData(LocationName.Undernet_4_Pillar_Prog,             0xb310ae, 0x2000161, 0x1, 0x7746C8, 191, [0, 1]),
+    LocationData(LocationName.Serenade,                           0xb3110f, 0x2000178, 0x40, 0x7B3C74, 1, [0])
 ]
 
 jobs = [
@@ -240,7 +241,8 @@ class MMBN3Location(Location):
     # LocationData(LocationName.Gathering_Data,             0xb310bb, 0x2000300, 0x10, 0x739580, 193, [0]),
     LocationData(LocationName.Somebody_please_help,       0xb310bc, 0x2000301, 0x4, 0x73A14C, 193, [0]),
     LocationData(LocationName.Looking_for_condor,         0xb310bd, 0x2000301, 0x2, 0x749444, 203, [0]),
-    LocationData(LocationName.Help_with_rehab,            0xb310be, 0x2000301, 0x1, 0x762CF0, 192, [3]),
+    LocationData(LocationName.Help_with_rehab,            0xb310be, 0x2000301, 0x1, 0x762CF0, 192, [0]),
+    LocationData(LocationName.Help_with_rehab_bonus,      0xb3110e, 0x2000301, 0x1, 0x762CF0, 192, [3]),
     LocationData(LocationName.Old_Master,                 0xb310bf, 0x2000302, 0x80, 0x760E80, 193, [0]),
     LocationData(LocationName.Catching_gang_members,      0xb310c0, 0x2000302, 0x40, 0x76EAE4, 193, [0]),
     LocationData(LocationName.Please_adopt_a_virus,       0xb310c1, 0x2000302, 0x20, 0x76A4F4, 193, [0]),
@@ -250,7 +252,7 @@ class MMBN3Location(Location):
     LocationData(LocationName.Hide_and_seek_Second_Child, 0xb310c5, 0x2000188, 0x2, 0x75ADA8, 191, [0]),
     LocationData(LocationName.Hide_and_seek_Third_Child,  0xb310c6, 0x2000188, 0x1, 0x75B5EC, 191, [0]),
     LocationData(LocationName.Hide_and_seek_Fourth_Child, 0xb310c7, 0x2000189, 0x80, 0x75BEB0, 191, [0]),
-    LocationData(LocationName.Hide_and_seek_Completion,   0xb310c8, 0x2000302, 0x8, 0x7406A0, 193, [0]),
+    LocationData(LocationName.Hide_and_seek_Completion,   0xb310c8, 0x2000302, 0x8, 0x742D40, 193, [0]),
     LocationData(LocationName.Finding_the_blue_Navi,      0xb310c9, 0x2000302, 0x4, 0x773700, 192, [0]),
     LocationData(LocationName.Give_your_support,          0xb310ca, 0x2000302, 0x2, 0x752D80, 192, [0]),
     LocationData(LocationName.Stamp_collecting,           0xb310cb, 0x2000302, 0x1, 0x756074, 193, [0]),
@@ -329,10 +331,7 @@ class MMBN3Location(Location):
     LocationData(LocationName.Chocolate_Shop_32, 0xb3110d, 0x20001c3, 0x01, 0x73F8FC, 181, [0]),
 ]
 
-always_excluded_locations = [
-    LocationName.Undernet_7_PMD,
-    LocationName.Undernet_7_Northeast_BMD,
-    LocationName.Undernet_7_Northwest_BMD,
+secret_locations = {
     LocationName.Secret_1_Northwest_BMD,
     LocationName.Secret_1_Northeast_BMD,
     LocationName.Secret_1_South_BMD,
@@ -341,19 +340,23 @@ class MMBN3Location(Location):
     LocationName.Secret_2_Island_BMD,
     LocationName.Secret_3_Island_BMD,
     LocationName.Secret_3_BugFrag_BMD,
-    LocationName.Secret_3_South_BMD
-]
+    LocationName.Secret_3_South_BMD,
+    LocationName.Serenade
+}
 
+location_groups: typing.Dict[str, typing.Set[str]] = {
+    "BMDs": {loc.name for loc in bmds},
+    "PMDs": {loc.name for loc in pmds},
+    "Jobs": {loc.name for loc in jobs},
+    "Number Trader": {loc.name for loc in number_traders},
+    "Bugfrag Trader": {loc.name for loc in chocolate_shop},
+    "Secret Area": {LocationName.Secret_1_Northwest_BMD, LocationName.Secret_1_Northeast_BMD,
+                    LocationName.Secret_1_South_BMD, LocationName.Secret_2_Upper_BMD, LocationName.Secret_2_Lower_BMD,
+                    LocationName.Secret_2_Island_BMD, LocationName.Secret_3_Island_BMD,
+                    LocationName.Secret_3_BugFrag_BMD, LocationName.Secret_3_South_BMD, LocationName.Serenade},
+}
 
 all_locations: typing.List[LocationData] = bmds + pmds + overworlds + jobs + number_traders + chocolate_shop
 scoutable_locations: typing.List[LocationData] = [loc for loc in all_locations if loc.hint_flag is not None]
 location_table: typing.Dict[str, int] = {locData.name: locData.id for locData in all_locations}
 location_data_table: typing.Dict[str, LocationData] = {locData.name: locData for locData in all_locations}
-
-
-"""
-def setup_locations(world, player: int):
-    # If we later include options to change what gets added to the random pool,
-    # this is where they would be changed
-    return {locData.name: locData.id for locData in all_locations}
-"""
diff --git a/worlds/mmbn3/Names/ItemName.py b/worlds/mmbn3/Names/ItemName.py
index 677eff22b353..af645db90c21 100644
--- a/worlds/mmbn3/Names/ItemName.py
+++ b/worlds/mmbn3/Names/ItemName.py
@@ -173,6 +173,8 @@ class ItemName():
     WpnLV_plus_White = "WpnLV+1 (White)"
     Press = "Press"
     UnderSht = "UnderSht"
+    Humor = "Humor"
+    BlckMnd = "BlckMnd"
 
     ## Currency
     zenny_200z = "200z"
diff --git a/worlds/mmbn3/Names/LocationName.py b/worlds/mmbn3/Names/LocationName.py
index 36060b12ec39..61c64faa9dab 100644
--- a/worlds/mmbn3/Names/LocationName.py
+++ b/worlds/mmbn3/Names/LocationName.py
@@ -210,6 +210,7 @@ class LocationName():
     WWW_Control_Room_1_Screen = "WWW Control Room 1 Screen"
     WWW_Wilys_Desk = "WWW Wily's Desk"
     Undernet_4_Pillar_Prog = "Undernet 4 Pillar Prog"
+    Serenade = "Serenade"
 
     ## Numberman Codes
     Numberman_Code_01 = "Numberman Code 01"
@@ -261,6 +262,7 @@ class LocationName():
     Somebody_please_help = "Job: Somebody, please help!"
     Looking_for_condor = "Job: Looking for condor"
     Help_with_rehab = "Job: Help with rehab"
+    Help_with_rehab_bonus = "Job: Help with rehab bonus"
     Old_Master = "Job: Old Master"
     Catching_gang_members = "Job: Catching gang members"
     Please_adopt_a_virus = "Job: Please adopt a virus!"
diff --git a/worlds/mmbn3/Options.py b/worlds/mmbn3/Options.py
index 4ed64e3d9dbf..a127d25dda3e 100644
--- a/worlds/mmbn3/Options.py
+++ b/worlds/mmbn3/Options.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from Options import Choice, Range, DefaultOnToggle, PerGameCommonOptions
+from Options import Choice, Range, DefaultOnToggle, Toggle, PerGameCommonOptions
 
 
 class ExtraRanks(Range):
@@ -17,10 +17,17 @@ class ExtraRanks(Range):
 
 class IncludeJobs(DefaultOnToggle):
     """
-    Whether Jobs can be included in logic.
+    Whether Jobs can contain progression or useful items.
     """
     display_name = "Include Jobs"
 
+
+class IncludeSecretArea(Toggle):
+    """
+    Whether the Secret Area (including Serenade) can contain progression or useful items.
+    """
+    display_name = "Include Secret Area"
+
 # Possible logic options:
 # - Include Number Trader
 # - Include Secret Area
@@ -46,5 +53,6 @@ class TradeQuestHinting(Choice):
 class MMBN3Options(PerGameCommonOptions):
     extra_ranks: ExtraRanks
     include_jobs: IncludeJobs
+    include_secret: IncludeSecretArea
     trade_quest_hinting: TradeQuestHinting
     
\ No newline at end of file
diff --git a/worlds/mmbn3/Regions.py b/worlds/mmbn3/Regions.py
index 1dc58600cbc4..286e95a1c263 100644
--- a/worlds/mmbn3/Regions.py
+++ b/worlds/mmbn3/Regions.py
@@ -135,6 +135,7 @@ def __init__(self, name, connections, locations):
                     LocationName.Somebody_please_help,
                     LocationName.Looking_for_condor,
                     LocationName.Help_with_rehab,
+                    LocationName.Help_with_rehab_bonus,
                     LocationName.Old_Master,
                     LocationName.Catching_gang_members,
                     LocationName.Please_adopt_a_virus,
@@ -349,6 +350,7 @@ def __init__(self, name, connections, locations):
                     LocationName.Secret_2_Upper_BMD,
                     LocationName.Secret_3_Island_BMD,
                     LocationName.Secret_3_South_BMD,
-                    LocationName.Secret_3_BugFrag_BMD
+                    LocationName.Secret_3_BugFrag_BMD,
+                    LocationName.Serenade
                 ])
 ]
diff --git a/worlds/mmbn3/__init__.py b/worlds/mmbn3/__init__.py
index 6d28b101c377..08165a7df6e2 100644
--- a/worlds/mmbn3/__init__.py
+++ b/worlds/mmbn3/__init__.py
@@ -9,14 +9,14 @@
 from worlds.AutoWorld import WebWorld, World
 
 from .Rom import MMBN3DeltaPatch, LocalRom, get_base_rom_path
-from .Items import MMBN3Item, ItemData, item_table, all_items, item_frequencies, items_by_id, ItemType
+from .Items import MMBN3Item, ItemData, item_table, all_items, item_frequencies, items_by_id, ItemType, item_groups
 from .Locations import Location, MMBN3Location, all_locations, location_table, location_data_table, \
-    always_excluded_locations, jobs
+    secret_locations, jobs, location_groups
 from .Options import MMBN3Options
 from .Regions import regions, RegionName
 from .Names.ItemName import ItemName
 from .Names.LocationName import LocationName
-from worlds.generic.Rules import add_item_rule
+from worlds.generic.Rules import add_item_rule, add_rule
 
 
 class MMBN3Settings(settings.Group):
@@ -57,12 +57,16 @@ class MMBN3World(World):
     settings: typing.ClassVar[MMBN3Settings]
     topology_present = False
 
+
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {loc_data.name: loc_data.id for loc_data in all_locations}
     
-    excluded_locations: typing.List[str]
+    excluded_locations: typing.Set[str]
     item_frequencies: typing.Dict[str, int]
 
+    location_name_groups = location_groups
+    item_name_groups = item_groups
+
     web = MMBN3Web()
 
     def generate_early(self) -> None:
@@ -74,10 +78,11 @@ def generate_early(self) -> None:
         if self.options.extra_ranks > 0:
             self.item_frequencies[ItemName.Progressive_Undernet_Rank] = 8 + self.options.extra_ranks
 
+        self.excluded_locations = set()
+        if not self.options.include_secret:
+            self.excluded_locations |= secret_locations
         if not self.options.include_jobs:
-            self.excluded_locations = always_excluded_locations + [job.name for job in jobs]
-        else:
-            self.excluded_locations = always_excluded_locations
+            self.excluded_locations |= {job.name for job in jobs}
 
     def create_regions(self) -> None:
         """
@@ -140,19 +145,19 @@ def register_explore_score_indirect_conditions(entrance):
                 if connection == RegionName.SciLab_Cyberworld:
                     entrance.access_rule = lambda state: \
                         state.has(ItemName.CSciPas, self.player) or \
-                        state.can_reach(RegionName.SciLab_Overworld, "Region", self.player)
+                        state.can_reach_region(RegionName.SciLab_Overworld, self.player)
                     self.multiworld.register_indirect_condition(self.get_region(RegionName.SciLab_Overworld), entrance)
                 if connection == RegionName.Yoka_Cyberworld:
                     entrance.access_rule = lambda state: \
                         state.has(ItemName.CYokaPas, self.player) or \
                         (
-                            state.can_reach(RegionName.SciLab_Overworld, "Region", self.player) and
+                            state.can_reach_region(RegionName.SciLab_Overworld, self.player) and
                             state.has(ItemName.Press, self.player)
                         )
                     self.multiworld.register_indirect_condition(self.get_region(RegionName.SciLab_Overworld), entrance)
                 if connection == RegionName.Beach_Cyberworld:
                     entrance.access_rule = lambda state: state.has(ItemName.CBeacPas, self.player) and\
-                        state.can_reach(RegionName.Yoka_Overworld, "Region", self.player)
+                        state.can_reach_region(RegionName.Yoka_Overworld, self.player)
                     self.multiworld.register_indirect_condition(self.get_region(RegionName.Yoka_Overworld), entrance)
                 if connection == RegionName.Undernet:
                     entrance.access_rule = lambda state: self.explore_score(state) > 8 and\
@@ -198,122 +203,138 @@ def set_rules(self) -> None:
 
         # Set WWW ID requirements
         def has_www_id(state): return state.has(ItemName.WWW_ID, self.player)
-        self.multiworld.get_location(LocationName.ACDC_1_PMD, self.player).access_rule = has_www_id
-        self.multiworld.get_location(LocationName.SciLab_1_WWW_BMD, self.player).access_rule = has_www_id
-        self.multiworld.get_location(LocationName.Yoka_1_WWW_BMD, self.player).access_rule = has_www_id
-        self.multiworld.get_location(LocationName.Undernet_1_WWW_BMD, self.player).access_rule = has_www_id
+        add_rule(self.multiworld.get_location(LocationName.ACDC_1_PMD, self.player), has_www_id)
+        add_rule(self.multiworld.get_location(LocationName.SciLab_1_WWW_BMD, self.player), has_www_id)
+        add_rule(self.multiworld.get_location(LocationName.Yoka_1_WWW_BMD, self.player), has_www_id)
+        add_rule(self.multiworld.get_location(LocationName.Undernet_1_WWW_BMD, self.player), has_www_id)
 
         # Set Press Program requirements
         def has_press(state): return state.has(ItemName.Press, self.player)
-        self.multiworld.get_location(LocationName.Yoka_1_PMD, self.player).access_rule = has_press
-        self.multiworld.get_location(LocationName.Yoka_2_Upper_BMD, self.player).access_rule = has_press
-        self.multiworld.get_location(LocationName.Beach_2_East_BMD, self.player).access_rule = has_press
-        self.multiworld.get_location(LocationName.Hades_South_BMD, self.player).access_rule = has_press
-        self.multiworld.get_location(LocationName.Secret_3_BugFrag_BMD, self.player).access_rule = has_press
-        self.multiworld.get_location(LocationName.Secret_3_Island_BMD, self.player).access_rule = has_press
+        add_rule(self.multiworld.get_location(LocationName.Yoka_1_PMD, self.player), has_press)
+        add_rule(self.multiworld.get_location(LocationName.Yoka_2_Upper_BMD, self.player), has_press)
+        add_rule(self.multiworld.get_location(LocationName.Beach_2_East_BMD, self.player), has_press)
+        add_rule(self.multiworld.get_location(LocationName.Hades_South_BMD, self.player), has_press)
+        add_rule(self.multiworld.get_location(LocationName.Secret_3_BugFrag_BMD, self.player), has_press)
+        add_rule(self.multiworld.get_location(LocationName.Secret_3_Island_BMD, self.player), has_press)
+
+        # Set Purple Mystery Data Unlocker access
+        def can_unlock(state): return state.can_reach_region(RegionName.SciLab_Overworld, self.player) or \
+            state.can_reach_region(RegionName.SciLab_Cyberworld, self.player) or \
+            state.can_reach_region(RegionName.Yoka_Cyberworld, self.player) or \
+            state.has(ItemName.Unlocker, self.player, 8) # There are 8 PMDs that aren't in one of the above areas
+        add_rule(self.multiworld.get_location(LocationName.ACDC_1_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.Yoka_1_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.Beach_1_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.Undernet_7_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.Mayls_HP_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.SciLab_Dads_Computer_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.Zoo_Panda_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.Beach_DNN_Security_Panel_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.Beach_DNN_Main_Console_PMD, self.player), can_unlock)
+        add_rule(self.multiworld.get_location(LocationName.Tamakos_HP_PMD, self.player), can_unlock)
 
         # Set Job additional area access
         self.multiworld.get_location(LocationName.Please_deliver_this, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.ACDC_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.ACDC_Cyberworld, "Region", self.player)
+                state.can_reach_region(RegionName.ACDC_Overworld, self.player) and \
+                state.can_reach_region(RegionName.ACDC_Cyberworld, self.player)
         self.multiworld.get_location(LocationName.My_Navi_is_sick, self.player).access_rule =\
             lambda state: \
                 state.has(ItemName.Recov30_star, self.player)
         self.multiworld.get_location(LocationName.Help_me_with_my_son, self.player).access_rule =\
             lambda state:\
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.ACDC_Cyberworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player) and \
+                state.can_reach_region(RegionName.ACDC_Cyberworld, self.player)
         self.multiworld.get_location(LocationName.Transmission_error, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player)
         self.multiworld.get_location(LocationName.Chip_Prices, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.ACDC_Cyberworld, "Region", self.player) and \
-                state.can_reach(RegionName.SciLab_Cyberworld, "Region", self.player)
+                state.can_reach_region(RegionName.ACDC_Cyberworld, self.player) and \
+                state.can_reach_region(RegionName.SciLab_Cyberworld, self.player)
         self.multiworld.get_location(LocationName.Im_broke, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.Yoka_Cyberworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player) and \
+                state.can_reach_region(RegionName.Yoka_Cyberworld, self.player)
         self.multiworld.get_location(LocationName.Rare_chips_for_cheap, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.ACDC_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.ACDC_Overworld, self.player)
         self.multiworld.get_location(LocationName.Be_my_boyfriend, self.player).access_rule =\
             lambda state: \
-                state.can_reach(RegionName.Beach_Cyberworld, "Region", self.player)
+                state.can_reach_region(RegionName.Beach_Cyberworld, self.player)
         self.multiworld.get_location(LocationName.Will_you_deliver, self.player).access_rule=\
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.Beach_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.ACDC_Cyberworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player) and \
+                state.can_reach_region(RegionName.Beach_Overworld, self.player) and \
+                state.can_reach_region(RegionName.ACDC_Cyberworld, self.player)
         self.multiworld.get_location(LocationName.Somebody_please_help, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.ACDC_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.ACDC_Overworld, self.player)
         self.multiworld.get_location(LocationName.Looking_for_condor, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.Beach_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.ACDC_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player) and \
+                state.can_reach_region(RegionName.Beach_Overworld, self.player) and \
+                state.can_reach_region(RegionName.ACDC_Overworld, self.player)
         self.multiworld.get_location(LocationName.Help_with_rehab, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Beach_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Beach_Overworld, self.player)
         self.multiworld.get_location(LocationName.Old_Master, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.ACDC_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.Beach_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.ACDC_Overworld, self.player) and \
+                state.can_reach_region(RegionName.Beach_Overworld, self.player)
         self.multiworld.get_location(LocationName.Catching_gang_members, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Cyberworld, "Region", self.player) and \
+                state.can_reach_region(RegionName.Yoka_Cyberworld, self.player) and \
                 state.has(ItemName.Press, self.player)
         self.multiworld.get_location(LocationName.Please_adopt_a_virus, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.SciLab_Cyberworld, "Region", self.player)
+                state.can_reach_region(RegionName.SciLab_Cyberworld, self.player)
         self.multiworld.get_location(LocationName.Legendary_Tomes, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Beach_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.Undernet, "Region", self.player) and \
-                state.can_reach(RegionName.Deep_Undernet, "Region", self.player) and \
+                state.can_reach_region(RegionName.Beach_Overworld, self.player) and \
+                state.can_reach_region(RegionName.Undernet, self.player) and \
+                state.can_reach_region(RegionName.Deep_Undernet, self.player) and \
                 state.has_all({ItemName.Press, ItemName.Magnum1_A}, self.player)
         self.multiworld.get_location(LocationName.Legendary_Tomes_Treasure, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.ACDC_Overworld, "Region", self.player) and \
-                state.can_reach(LocationName.Legendary_Tomes, "Location", self.player)
+                state.can_reach_region(RegionName.ACDC_Overworld, self.player) and \
+                state.can_reach_location(LocationName.Legendary_Tomes, self.player)
         self.multiworld.get_location(LocationName.Hide_and_seek_First_Child, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player)
         self.multiworld.get_location(LocationName.Hide_and_seek_Second_Child, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player)
         self.multiworld.get_location(LocationName.Hide_and_seek_Third_Child, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player)
         self.multiworld.get_location(LocationName.Hide_and_seek_Fourth_Child, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player)
         self.multiworld.get_location(LocationName.Hide_and_seek_Completion, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player)
         self.multiworld.get_location(LocationName.Finding_the_blue_Navi, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Undernet, "Region", self.player)
+                state.can_reach_region(RegionName.Undernet, self.player)
         self.multiworld.get_location(LocationName.Give_your_support, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Beach_Overworld, "Region", self.player)
+                state.can_reach_region(RegionName.Beach_Overworld, self.player)
         self.multiworld.get_location(LocationName.Stamp_collecting, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.Beach_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.ACDC_Cyberworld, "Region", self.player) and \
-                state.can_reach(RegionName.SciLab_Cyberworld, "Region", self.player) and \
-                state.can_reach(RegionName.Yoka_Cyberworld, "Region", self.player) and \
-                state.can_reach(RegionName.Beach_Cyberworld, "Region", self.player)
+                state.can_reach_region(RegionName.Beach_Overworld, self.player) and \
+                state.can_reach_region(RegionName.ACDC_Cyberworld, self.player) and \
+                state.can_reach_region(RegionName.SciLab_Cyberworld, self.player) and \
+                state.can_reach_region(RegionName.Yoka_Cyberworld, self.player) and \
+                state.can_reach_region(RegionName.Beach_Cyberworld, self.player)
         self.multiworld.get_location(LocationName.Help_with_a_will, self.player).access_rule = \
             lambda state: \
-                state.can_reach(RegionName.ACDC_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.ACDC_Cyberworld, "Region", self.player) and \
-                state.can_reach(RegionName.Yoka_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.Yoka_Cyberworld, "Region", self.player) and \
-                state.can_reach(RegionName.Beach_Overworld, "Region", self.player) and \
-                state.can_reach(RegionName.Undernet, "Region", self.player)
+                state.can_reach_region(RegionName.ACDC_Overworld, self.player) and \
+                state.can_reach_region(RegionName.ACDC_Cyberworld, self.player) and \
+                state.can_reach_region(RegionName.Yoka_Overworld, self.player) and \
+                state.can_reach_region(RegionName.Yoka_Cyberworld, self.player) and \
+                state.can_reach_region(RegionName.Beach_Overworld, self.player) and \
+                state.can_reach_region(RegionName.Undernet, self.player)
 
         # Set Trade quests
         self.multiworld.get_location(LocationName.ACDC_SonicWav_W_Trade, self.player).access_rule =\
@@ -390,6 +411,11 @@ def has_press(state): return state.has(ItemName.Press, self.player)
         self.multiworld.get_location(LocationName.Numberman_Code_31, self.player).access_rule =\
             lambda state: self.explore_score(state) > 10
 
+        #miscellaneous locations with extra requirements
+        add_rule(self.multiworld.get_location(LocationName.Comedian, self.player),
+                 lambda state: state.has(ItemName.Humor, self.player))
+        add_rule(self.multiworld.get_location(LocationName.Villain, self.player),
+                 lambda state: state.has(ItemName.BlckMnd, self.player))
         def not_undernet(item): return item.code != item_table[ItemName.Progressive_Undernet_Rank].code or item.player != self.player
         self.multiworld.get_location(LocationName.WWW_1_Central_BMD, self.player).item_rule = not_undernet
         self.multiworld.get_location(LocationName.WWW_1_East_BMD, self.player).item_rule = not_undernet
@@ -500,24 +526,24 @@ def explore_score(self, state):
         Determine roughly how much of the game you can explore to make certain checks not restrict much movement
         """
         score = 0
-        if state.can_reach(RegionName.WWW_Island, "Region", self.player):
+        if state.can_reach_region(RegionName.WWW_Island, self.player):
             return 999
-        if state.can_reach(RegionName.SciLab_Overworld, "Region", self.player):
+        if state.can_reach_region(RegionName.SciLab_Overworld, self.player):
             score += 3
-        if state.can_reach(RegionName.SciLab_Cyberworld, "Region", self.player):
+        if state.can_reach_region(RegionName.SciLab_Cyberworld, self.player):
             score += 1
-        if state.can_reach(RegionName.Yoka_Overworld, "Region", self.player):
+        if state.can_reach_region(RegionName.Yoka_Overworld, self.player):
             score += 2
-        if state.can_reach(RegionName.Yoka_Cyberworld, "Region", self.player):
+        if state.can_reach_region(RegionName.Yoka_Cyberworld, self.player):
             score += 1
-        if state.can_reach(RegionName.Beach_Overworld, "Region", self.player):
+        if state.can_reach_region(RegionName.Beach_Overworld, self.player):
             score += 3
-        if state.can_reach(RegionName.Beach_Cyberworld, "Region", self.player):
+        if state.can_reach_region(RegionName.Beach_Cyberworld, self.player):
             score += 1
-        if state.can_reach(RegionName.Undernet, "Region", self.player):
+        if state.can_reach_region(RegionName.Undernet, self.player):
             score += 2
-        if state.can_reach(RegionName.Deep_Undernet, "Region", self.player):
+        if state.can_reach_region(RegionName.Deep_Undernet, self.player):
             score += 1
-        if state.can_reach(RegionName.Secret_Area, "Region", self.player):
+        if state.can_reach_region(RegionName.Secret_Area, self.player):
             score += 1
         return score
diff --git a/worlds/mmbn3/data/bn3-ap-patch.bsdiff b/worlds/mmbn3/data/bn3-ap-patch.bsdiff
index d3548b4c949a459da53701090d5f6fa5f565b7f8..d55fecad80641b372bc7752600f335d6961f9185 100644
GIT binary patch
literal 61276
zcmaHyV{9f)*zTViTif>5ed>0%wrxJO?cKIp+qP}nwr$(S`M>Y^aK4=@narJ;+{u;6
zOa}Rlkg|xRm>7^57aH)tN+<unwaKOL{{})@=G-iTnpDb~@S=pd0NC{J|Iz1v<?nyx
z`up?m_4T*-WA}f-_xtCT_h0pI1xVgP=QB_7T$RHRrR+jn=(H4bS)2vWXp!LpON#)*
zg4rBa7Q{T<f|)+xXbc;<#K>&X0-g~L33DVfEHff?QC4XYIy+zh7e*{7T3IX-tmuEN
zm?Hv!|5Y;pn1cT`1^_@u0svq!U^&bo=pq*RBw2ARCG!ijhltQ=$P}hIhyc$tpl2k%
znD3phxu@?80DuTR2SEHU7i5tGfDl`NRPLiqm>-K)JSEBjK>M1{d@76iB0~GlK#&*#
zpwj@L8H*4+upEFn05C8D0SlM`0`V+J(jr2D=KpC14-Wtw`5!|ghyX+c-~YS;|FbwR
z@L$G%DL~*nDVKmE2GUCzfLRnw%v2=8RT4OsgTW<1ONhgqYA6+#VlD=yU>C+R*vlS`
z&l^Gw%Ov|^j#UFD0ePbaEnvEbMJfQ9he}e#iGt>`nB_NSOTfqjUZ*rqt0-%#A%v3N
zT$0M{w>LKl`;2mFW_u71>2Es-=$Ql<8X7Df&Vk=QJ@14?CM0UxjB(lL7yo8VC@+aL
zu5eXyA-4@;T?-ckL!*K5!;ml{H#7z;h!LswH{JijDxRpKf?c!7cU3s#8e+ydGOP)5
z1;_1k_(>MTrMiR)zqZFBoyG#m#cIYk_-?v7xrnm^3Hvy6X@S*)gf)gEj4jjSbhNO)
z=qu>H9q56DLO#z7W=xrbq`T1fU7IVAIuZ#rlL)x#WG_=QCA+#}eH0z_CB>+lMr59e
zLSHhsZY4Nm<_`5LORqF9Uo=mP5#Vun4ilZ?A#2j*KI5sMBz5CcFXC$|V;ySd@p#e(
zgKMS8W-)4I*AlLT9?x05Xo$vg&%eJM;Ek$GX@J9s83AWwNtgkXHu!!Ma;iwOVt#dL
zZ7M<xdt}fbV-rEpLt6Gu0r+BzW5pKv78o1L2>44xxMfTz3m}Gj06JB*>6BbVL?8u3
z{wCsgT=NvRn{;!f3!BP{Ljp+Pbx<BJKM}AzXsToRZe$AoXpMBy59)93g%ryxN5u-j
z!8-v^AV;=*0V0m<h@+JaPN-=0p56oe1Q*VrjO8NUYzDLX>w@a$uomoIv=FZUrgcSv
z2<+=e79nT<c-M$r-Pa^{57hW)7bg~m#Q|bgQPP{ne4!9*059Gi289S22>?YDHUzfM
zXF*S~y+b$LkPtcLI-;;do2rU#MDO9Vcla5+)0_U!tyKgc3M_D>aO_L_aI_mazf_Jd
z2<9@@1}z|0A;%1>RjrqU(@f<NQ?FbyI{*+vOsfH37zPJzUmGCn=Ma4bmn=L8aXctU
zPba8`%me!_00v<KE*};!KItnxptf=X01D{jJ;UZekEGJ<Gu|Lg_Qm0v`7rHVT6xk7
zZ6)}rP;!`3^@Mc#`u;SR03--0paE9y5_|SiX#<TbI}dCke;VYR;1c(>$mb3kP)b3u
z2Dt}CZxw#I6eQ}VH{OkbM@dNNmsaxLDBxVksCB=r`<^7}SqS$SFM@Ki4FNX43P~lv
z11iW0EJo892>=7(Q`M-2{&E@G=(Sd9E~RKS_7l)bV-wt=kH527KQae5Q&`gS=>~<e
z)4T$*LjtuwaP|i(%RB=i9QD0&P}y{Cm53;{e7RH8JGz)*-ObT`Ym+t1!JVtXS$$nG
zkD-tnT^wlW=)n=^YD$Cw!bZvHB#CH-_7mCTIrUxa_sk;_XoIJi=C+tBi9>M#K9Koo
zX7Xfcuz94A;DP{vLavZB9K4?diLV5tZ`d9T%2nd`qBfa-LJ94$^;#J52DAu<b#&?y
zTc-GrWG-z63`Pu%T~QtR6JKYWpYS~eW;p%@pIg*2Q{1Sk9HdgOA{Nk)I4&7ziQ>o5
z%3~6e`p4&E#=ZxrAsC+CK74PO`%po!We2`mw;5xzktAID<3B-hibav4k(d?0p)f-K
z>Sy}5*rFQ>`nzC+Y^XnlIO00aTg;fhno(f%W`o_j=OhiG6yup<1}L<ZOR8Vm<7oQ=
ze3fV}VgKL85K7~41pt5lpZ(zfuN{2A%0d~S+86902Y>;9Qi|WUg;z+lnSC7o)#<w8
zx|lCr0c<p&iFI8TR@LIrpfq_pMo1Ad$jZlf0J3Ju#PFrbqW7><=aZHOC;nFQL?)4y
zr=nN|W{DM-9>{VO%`ngLgQt@Qu!6Eu(1Ga^{IsY1=)HNMk<o;C&j@rOFJ<MqKXI7y
zq%7!`o?_^-IH9HWg7RX@^N7j|ck&o_)?w~*(X>sz%EroyJ1OEh#qqQ39L4c84>MUp
z7L7#t?0BA8IX0xHM9Q<JrwI?e>_q;!p+xZuL^Pwt1+c|=fHZk@0dOM-!Be`w`6~AU
z6c01NMGg?{n`IWonz=llJe_B7L$SZSyp*T-S=K*G&*Fqnc`57sM|m;wg@s$$Fk_PW
zN13A0Mge}|1rPB?;f49NNb-eS@iTcEQGRd$RlH1^MUI$XyevXQ8tqXeE;<kqcH*A^
zIXWOq$gnhj&V(a>65NwDm7N1F!~md-gN~Yyu58Frq&((coKL%#m6k<;XF>+Y4;+=Z
zOjkVRkd@_^S6(oUJ%bQ7^7XXz{P!r!&yEMZFfXq>3-k;wJ%w1nLsl%ZB+8keV+G4u
zlc!+?vU-r7fshsE7l>jw6h>z7Jku3`aO|{#K;;K{Nk4fiS-dQ`c#1WPB3UYB>r~cs
zN`8LWiQ;_8v+UB7)G|B8I=uY(x$L~`qO_uU8S_Qr0#9Yr(oWf;(z8FsrDqnW?EG*I
zKpWbl(oWb%dC9ZiDtFn1{P>c@rKM-4$_p=rD&tZA?DKL)J?$Qjn|)^;f%=9?*11ji
z-Zo?GxAcrMvdf;zte>AOl+W3Z*=AR-!u!b~CWF_YCZAyY$=c}1k&V~mnPJJ2%M4c1
z0Y&<9^UIY>L{Ewa181z`FYFru_r%1zt5BEJpDSKm|Lz1K{up6(oo_wXuj?rBkO6lp
zY@Za_Rm9e`TBWNTHv8AJb~m;Iy?BlH?TY>mGf3@O;tpVw|A@wdBo5nX^?zaV+cS;1
zeCxwNF^yJ!sN`EdoVdEyaN56U_ZOVjeL=PiR+tp5GAp-AD4t&!I23KxsVt3^C#`+<
zPB}q4W?Ik?q9|?4Z||AWobIUT=<Yj=DxRnM;ty1-3vQRZmRs=9$YA6oG>F*AK4wR<
zo*6^tS@G*Ap)ucgh6d0d>=qBxJwa%Cckc4ZWfEi98yxbFNLA>`qB!cB5AL-wAbJ)D
zGD&(pqwy?Yta-~%68aR_{v23bvxZ%D-?odSR#9Qwvvtc;k-zxXd4`?pV<j709Cu<$
zsKRVOF|u7|e%sW{5uuMa{>B?hbZmsFBXieh=+gT+rfY><Rt~p^0C%ceWbetTC{<Go
zBHk^nlJm?;A?c3HG)#Fq1AdX0b__EfR+^DIC2oMfM{hf&&1d(VP$bOHSYF3WA5~vJ
zB-nU_4t<kAPF$Jy^p%BfKCZ`ftIm+G!pXqsyL9#NEx`FN9s}M^#R>z;rJ7iRoM+)3
z-mpWK1SGu5Ch%Xc>bII!rq3J&pOq{g_CGp)PH8;fKPh6Qz!x~Ft%4OfsT#W-Hk(E5
zYqx+qxnX47R%iJyeW6dypABsP1w~yPI%vlRD^57+tFM!|4%cLg-Lp_tb7m()GCtHd
z5dIoir5BK}_c0x0x8A?B(w=iXDN>ob_}jsLz-)E1*HgPJz~W4k!Gy@qxcDyvGv{sw
zj_w1SO=AelJ?e&gdNG48s(W^0fV#lM@aEECF{(%LS!cPXVB}hLO3Ll#AUfLNkkxY0
zE%Wbu^%FN8b<4*_@CI3`=qhO0=Vv}Q8$axMk?i5C2iV}fr~;4QS9ZS(x1^A<2DVG5
zCtu#$m?PaEd)Fjhqp5bcNe=BR?)KqyiBx-(+N=J!k7E77#6(m2iQ>e3O)ph}^|Lz8
zt!5u{IDDR&2ut^MB1|%#S=mBPWZiuwW%}qzVwIvIfZRXk+i83^vr3;#$P@cZ2G+rH
z?Vnt&+nR3&RhI-g&0DijiFUVDXYy)SRT-Thpbi4n^f^jNgOy<Kx#GNwENHpOo`oN>
zE`uUOjZ$1&@BH5Pxtj^@@O16+ZcD{~U|vb}<~hrWA=DWMsZM!^k!g{5=YIThFJhQB
zAKmf_*@E2*r?r6PntF9+;%e$`MpP7K&LWHZtDZry=}kuNw&2C2|0+%q#=2SpdzJ7{
ztg9eB$x$T~?yTl!pr*a0FOx}nR#y}uqWu>U8q*o&RZ}$>Dw+YYU%hH-M{41Tpf%jw
zPAbyn5)J3*8TP_91to($y8RM8r)zMj+;xgVkkeD<4>jFm5w6SR1a4XDtPo!+UOyK~
z{|~_Tx?$k}9?$@mp4Di$Oqu03-TL?et3G#FE@ZRJ%hrYAtC>UY6r}oOnw)2d{TS`C
z#e(-o-yi4N=`Q|5P^>tZf9dH^!9R}s#cZ<q_Fp}If3<72_a&zlJ+MJ7HcT;;%VZfi
z%*cPu-C}D+RS1sfhaE_uMUOGK-rjG9=wL>Ml<^kseHE8lA@#r(bNM!?ShAvy=AkUc
zGctAT%dn<bgqg?DyvI0P!5mCb@%MaGYL&>y;PZ~GbV0l_fkO0wx#5ykrheI}fRQHF
z9~89U60-Xg;5Ms(!8#Obr4fOcQw2D1tci?w0QI?qgk-xR1x1?y8USt4SCYg*CQb;Y
zHU<t>9*QDP0Klug0pK&mqmrFwf3Aq<EG)sfLWI1*F}i$jr|OM)QhulbT&xK290{Do
z#47~$dDuM`kD8LkFBtlaudl`%nCLgfw;D24KmdL1aDmnV>=u-l0clTA^+-N|9%|vP
zH#JEru$vfWTFOs;Xd##(5c33FqTyx1F^)GdK2<`_W|BEzjg%23>4I@Y;2|CmlXd|3
z5`)Rid!&aoOnpibb_^K#wP(HRZ;0&w)?)e4o`%f+MP)w&wB7)PaZY`+D>Qi@iv`b_
zc9L?y?NL$QC>bgd3;KmhBEdt=LqOD&aE)>dKv(cM`3k&+JWpn;m#uZk8Pu!dIe`RP
zxV53EI^F&n6&YT+E|L~Gp8ClbKi+ddoA4td;)<lp{#s9-IpdBZY+UbmqTQl6*EcRK
zv6x>o)fN|-_i)A<F+#V>d92tpvD%bl`H{a*DD!4n_ggu<OXBesMYQipz@B=(K-O6c
z!0<!IpSn(};jx^_;;x&r06+qOn&w?!JvM7E=ib^+tO?*+pn42ygow0$>L{mRAo#~D
z^RWHeR^^bQ2I6p`s-?pIr++oAdra_$sMD4BXmp&12`O~O>SsWD0p%m}X^=}Pk|07o
z6(;Gc<Aad!h&*jjX25Qp6C+sACUSjqX_#S+;Y{a0z-0=tOR$39dJQ{LBE{tjt_or`
zwnF^o!5Jh{A)*oFM`(0&{#!ha-z=+hM37{hd{>Y~0FMe43sWepTPPnDnsktGwvfdf
zNCSPBBB(ZiTc23cKthKiTQ&yS5W$Hyd!}c(1A9UE_|F@~TCvs4az{_#CxYXjrPY&n
zg3mao<S~{BzZ2b)cINdup+#iP6fEJtlS^>lgtCxaGC^BQMTLjN4k>)Ue~x|p(0{+B
zLBcnJF5gv&zpO`Z%NeJjrWo}QBF6O#5cr_6Ph~o>dEjtcig}m7TE`2HZnz8wEV4Sv
zWb)D*E^vt%&U3w1q#m6jl_s3xSaD&%982a&-riw4Pt~(2S!ozmKOXQ&KibY0?6Ya(
z%RaTc82(rf5VFz?lrNi*9@#xJs^ie?lFNQF_+yK-Fx&c}>Rvhy`f2^Lv4~DSt#V2r
z9CcYjn|X%UC3bIsf6;l>vr&%K1VcMbJ00mwkUxbG%4cC2N00mth6YEOGF!1)@4=Q_
z_MxH>H5T@9df$Q-2M_=tUMGtUQFONb;_;X4HXs&_;aif=zNMiO<f2WGFxNYcpY2jX
zET>{f28|og$!H04#oVtV<O!#n75RFrq%Wal{G;&O>jIb6!frBCri$TDNK3+72o~tu
zB#kvgr58Y&+yMqK!I5B%Qn1KyT0oHXY*G!z$<B9O(8ToDp~1kV6$vkakWc^O{kJj%
zzF@i}@RtNW5s*_xFKYZE4IE_V*@_Ig5D?Y@2tO$n^-40&{wz>!_vA?@{egxewI3}3
zy|-BgoW);}&gSUh;0GTSZo?^A|L2jd;#kwMzt6yIzEJX)681n3TjiNK++vrM(*#_g
z*N}Z2Siq<XTf`zMLy94>G?e&=DK3&A+{fvg2BEl*7;em@E50_{$R7}w_2IT)a9!{l
zpSJVpTl{v-wmU&%wua$ZD_zcwZW`7#P4J9-sFgA&j`K9cz_2EtHIz*MO2LDs%dE=V
zX{Tu+vV3Zum-Y4L4~#w1a2KCRJP_~uQuxi9yde`(>i0s|yR$WJi$HJv799km`N;a2
z?WPt|&DjWgY&>)BdAu_ug0;mm*sGKlcY4=ex%tSSCfT3Cvj-LNd2){@?{rTcQb@aq
z_y=DVmFb`*ZG~f1;i3)v=xSlEgYOkzIobq_$@96r4DerNLesx?uJ3+RgI3uZRu(wj
z&Qcy2v&kpdR)5G%m7bmyVxl2_HC`qu9&74T22x%2YKpPYc=H#cfCB(JJX77>2)mjd
z8@yByC=^MU3E?_gJ3~ON$Uufjn+U?L@uyW4^N7l#W^tN<Mj=~;YlhR0Mz};_<13dX
z$v?JNM-!i!UI=$~=y2B#$=)s%9M&A8SLfzKZRcsc>zyumGUh&ZME8-+RI0bFbUasI
zMaZuTsSG)Mt=?s2(TA5<R20+npQM=XQ=^k@C=vrJ;!Eml-Z#05FDKMR=UKR^AXXx!
zMlw`9e^xULt*q54oKx8G8J;hZ`yzx}a|&=WTzgC4h&kRLYk}cBgb))b0Tgy{+(j(N
z*`cdi>je3cqDnHeLFYGW3E*-aR1A9Ik}VPrwYR&nj}0o-KsvYP47=}Tl8RBD<du6U
zXpUqJe64=Ld#s86=fO?xO3v!E33QYYCmUSQ(v`9o6Lg&ODHGgM4TEE1X20TKzLOfq
z#-Fo_fPIDFn*It2E#`C)2IXzGXVy>8);eggG*b)v1^o9+pKPe~ChVo#=e|m|26G&l
zHoMzI`)Auo4*7S=74+@;{#CW47n=%rY0xh%LTw*U@tnFyZ6=>0&(RNSD)t+1t<j83
z$pXnnVU%t31MXvvPmBXz?aO4#%EYJF(T{e8mkNgYGU++6ibq@LrfWY~KVMtfSo48j
zBCV7S1?-R`efCz-u?9)DF_#g!V8UaqCEhSZ)6q7CZS#+>;o3gx)zx*vo^d+b3U~+a
z6TC-SdL?ZFuitgP-xSNa-<y%rZL(Wqp`RsYxJao6tegsjHuPzNqga-8v?1=%<Vfk^
zK*nyj>wtd<9^Xw|Hd~2zLx%AJ<B<C?8<ZimO!V9r*VxN{c$HSe^y9h4gISI=L8R+V
zPkPorOy>n-Ye;t~_`c4SK`%au=vU0+l$#X49ia|cCw`6L1X<#5HWvCFQMNgJYERno
zcF$&is2gx11dhpig~}KSbM$;5r}PX{^pOtV19fB5YZx{SOZPhV<`1A(CySVhKze~9
zCjllB%*v*b2fEFfP#?V(LcF6o3)OM@RHYB=qmj8n?$<$J#&FCKxeRvIaR0ofWaE^X
z5Dv<@CqSIP-nNrQH>=gdH5uZtLVxASk>L-cgxA%eBOr4&XL<41M{U{B?BYydVTk+~
z4WKtJ!Y{=ta${iMUX$a_h}<jkOFnYUkP3!LDR)k3GF;^h@!)9mc4o*J6yWk#&j}5W
z{)gu6l2&P;CE^RfB!?6_BTdqT+C!WWWceH*iw%o(SEgOwni=@9%Y^fAT5l3u;2g}~
zRT9%~2~+jMsY?sR+3R1+52^EfL7iFdEgRFDrGOqE06A8ZZS`+Vi01-Fm4Q(*GFZ6O
zA%-zXV(NYw2AO!KpUEze`@4%NbRQAu#4<swLWSf@@6`_9G7HFagFiO>r?b>sl?C>t
zST^Z*5jMOUw+GDar^K*QB6lKbgR$3!`JiO!z|#vAq(y1`h2>-IcCB<xlo~~INA?J&
z`g0e$GBhvh9Ksuxd)|)rLb>E13+<2lkxj&lcr7wmf+j>hxX^<MN?5WQd`eHyFarrr
z^8VRl4Lm1LxeG9~#5$Y2l%Q-)lqUnC=3|rM9&OS>w9T?Q?MDejph7a$a80g@l3_W8
z*2s@j*><H@B48_{i~01V>R4gRFWA6xUhL!3`epCZ*6>_z!}dTmA(&D61GXrB3p+YZ
zFvtuap;oq~`y5kDGP1ushh1%$J!heQa?r<a^FProb_>bDgC267M$ASw^&iwS&fM#>
z>=GNIDLabvIWk2+Ub-o)mkdJAilIrtD|=^A7Kh1Qwkfs-@v<A=P$vPL>`Ld+Gf~Kj
zXZZbj9y=dRo*q!zaFc`eG`-Em+odhn85@&ZG546<72^ZV364)!j=Dw@)pa`4NP7gz
zf;M&w511Eq+)Xj5&aeQOjgB9qMm#9EalN94@<As{D3Ix=odbWPki1L5GF~#GNFh{c
z*jBq~KeZMGI^wVDtfop1gX%cJBO6jAgKKqGZamInszox^bWj_BZ*#n}#0*iuUH3y=
z@ESb7w3Fi;;K7O@G>Rs1xC$5fKfYWTUpMd<BCmU4-j#<JpQb}hD3Rhcotr@duT!W2
zoZm$cWpwEDlYspnLY#jX#haBIN4um6*H<b<hdSeh%G6L_hT>nIW%jd07sk!uM3~<+
z`DHWPpYl3h`kK}?2Bbp-z(u3idz2CsnOeB_0^o9F&K9*acvbp(5U=u7swt{&Fxn0T
zSh-kWD|zJf0{O#igX1`k01usa3X1(Sjw?><oTO+_dJq0bI=}Y{Z8<&*rqC(c5`ngF
ziM&lKhpU?7FiggR71;$p5F(VoL%k$KXZu4e2>%d}`L`tDs-)~f<RB@jTuWi7Q(eQe
z``JO=(!*NR$>2~qxY+MaRTRgeHWhyZ2iC?s;z|DX-?B{41gK%Omi@LfK7ouAQOz$-
z%3gQTe%WKY!%AoWv4bpjlhj-xsMHdq5Y8>>zn!Twia}@@PmV@y93WOE4Akzanz)<F
zfY@Eg>$zv*chop%kh4hBmYa(4e1q7%u=9o=0{|fgqu`hoNEd9hZ$<#hwHy~Fbmlp4
z#+ZeDKPNC6IE}^IU*%`QE54Kvos5$nYiaB3H@AA;Uw$sq?KGU@K(4zF>={-hvh;!y
zne1vEFPLm4qZk@9|ET<a-p8<4)C*ZFDL{d4=WW=!dWe92R2ypHMtJ;_FmnAB3&$01
zb(l}%HHzjX1M%s>w@y=Y(V9%JPOxe$sDOAkGvm4OAoqs$#I0x8TcjxMYJG^jVkb8;
zqgk?B-j+G%wP0Cy^|k5-^}-kb8`HH)gr)}-_5uHq5Tzmj+d?KX(6uO7O_tt3qxrmT
z4~)Iv@*F!G5|w9P%#$I0BFA5rlOa$?rL|Km;DbVr@FO9W)zvB=zBpt|$_5b!Hq^Ln
zGnM&GBv-k;cDTkDSFy*?y^Zq05_Qp&lD;i9Y^#kbfCT;_Ei1c}M(N-);(WAM?-#Ux
zXN({cWc--{=4fU&WktDDwx0^vF8bApdd{uH$ql-L$?&zYV3=I>vXRB<ZHMQO(aaT4
z1`6pW)&f`UwB6vvKEcMce_i5OwOTr+qkG1d_{vS(I|XQYHSE%Ghc4=uS!FPlX`ok9
zfVz*LZ$y2;XE#`=9@Jr18Zb{nWLn*{0c7Z}Xcm%M8^7!$_wyuwER?8?d`^vFc-l+<
zxIlz6PcZ6|Z`6HO70o#%!DHD}P4LrNdW^HIrTr|O!m~~FrM;`)>L?pGzD8~PTl1KJ
zBa;Jo<wYpwM4l^H5Vy%dXU6FJck#-kiq6mib7B;b3Ssi+!P`tu&2?J(1k}^cH`g{|
zCzm01SBW2wi;YMI3p+T==+~f#hr952)5t}a0ahvBp!;t$tfhN_edoNPc8mK8+AmwK
z*m-Pq&RfYh3F)LO?X-W}bK|L(b{Eb8GD86b>;75nJ0CN>GtIt{>-fu|!MYU@$|M_6
zp0BtPoM+*eR?8w$BayVfZ(p>=NX&lY(2g`AqHATN+t9t#q1|Pt2DhDR-Oet1Ce!e!
z+?-r8UDxvDl^Yw*)Y4a?1iF9zwQp?#>KTslmF~3(0cgG!9T|4eATm^lH%|Y?!WF)(
z#5U_i)f#Is`&FLaAo&A9-^;yKW|_R5{xP>>>rbOigX}->6Fll^{A&Cc{Q-xIEes+M
z>%NRyy4vP!@*zF8@DOw-uX|71Vv?{rC47}?%pCZIga%|7R``MJS$Yu_w*CHyW8asy
zcdaPDdNdejaD3WT<yf<iog|rrVW7L-S5p-k>>K9-qkF6JZNzf2zCx)G!Sd0g@-;oA
z;v0$~ceKxPj&9nN;r<-u2;&R%CLszHSZEBJ#l6L>Yq~^PaNA45Y<DBZ5J-DZ%a=LX
z@ydv&Xix6Qn+O4V{n{)aWG{wo9mn<M6FcO|N5hm&9i<+4VRcq{hop)M)4c>FT}lwt
zAfYY7B2oV)JH#dNAq7YsUcFN#sS4)bFn+A4-ssA?#my|5&QaHBNRnVP)DPxZ{JhO2
z)}>?z@mPObcrJAccQWO<o1ydaZtZNS2?!49MCdsaBn!!2RHO<6SilA;Dw9H@Rqm8*
zGu3{eiH>+gr#;n&6}f&p`WNfaI%p#D0}C@HOZF(Z=~fupzs0$q`ddY)V#49Z4<+KP
za!^!GBU?J8ig{UuNVe6gumeUpE1S?}+6#4e&fISYORCFvtDSUs)v;7|cNU!*5k2)q
zHi!@|A!Ql)m&KgKG--oNRN(4+6A+oAQ{?JOIey-jV-#>C43LaoNm%Z0^^@WUGRaD%
zZORY3jIVj9KPQD3=K23TbJF4a)A03$6ve>mKbiDN>Q`5+4;!8xYm#haETikB=_(s<
zsn7v+23i|fXBZRj+%?bO4%Bv*kwWpcbGRxmMh8cw4DcHA9*E+#I52cht&O1_z~^HP
zgo1P@*AUPe$uyKSoc`j4=t}xn^Ea*RT4<cCQ3T|<h3;uz#QYE+g(~c&9cGh0a76X<
z-_=MHdM+Qeot*Eo8iAj#PRdPN<|l=`ln6nMCB^FLB4f?ER+g&kVF&%N;>vZC{S_{M
z_i%*c9p!jSME%81j#;wfS?-*fH=v;W2&yC1M#rto^6P~mQ<nJh8NYcR`a3xvQzv6M
z!qjTBzENYGJR)+d(pw7co5%)B@ANLh;PL(vG)*AqSb&=Mt07P|TSF2zUOn3l)S<#-
zdL||BCkxK7%t^RVs^l{5I6AD69#RmSOO@Lc`H9ZFZu6xc#@D)La4fstZAmdh+cSAF
zeuu0qHu+atV!1usempH`Yv3vBeQH-h<#pD-%R6!p-O&B5DJv9n_yq3+L&_ZUP34&>
zuMD#U!-U*)m3l(_-RDNmYASsq`42<);vflrc|=_zUY=et&V7DU;DGcgEr>3x4;hDM
zI)6N8dRU5@C+!PYqaw8JO@2NFB)&D8yV@hHYKK5Ya<TFxANNs#>Nj(HfrA`#lL1q3
zol;L8VRNa@`R`nJT0ChB_~mo|BU|-aoRfulXD%&h&rljv_+#o<d?ffHO+NoRi2#B{
zPG&$f=X5+!YkrkXAYGzU(Zi1G2Pt=cC}!D@U#pFki4`ZbaCYP46;tN1rwW(SPbAUW
zle{;-nVz_XWMtkksgYYKGSh@UBfCJes{U08RX3|V(En&8CFwA3=!@g89<+h0@9^qe
zWckx6om=_`(<<cLeqh}<rkVZR4R21KCyMisVR+@&hrd4wT-dR63(703kv1H1QhM&M
z=o0Qko8ND$&_>LL+x6}v)GKAqtJEbF%Jz+zHvhv-Br1Na(%4eD&8aRnhrOmWBwO2c
z{EEv#I_;Y{;YTU5*$P^N%S-iwWHdhm%`%XA#+lyOIHdR#wKav^vV0yR-~{UExQWj4
z&6KK?ONC{wp1kt*GFDS!XqwL0sj<OHIw-=+J<~E&>xuS5!N#&%VPIdpj)tLAF7E1$
z8~#2wUCtabJKB9QxehtC3bCtywqMQ~7p%mRlO-ZpHd}vQ(JQE=W(ob6Dw_f^m@^#;
zSUEIQ^EJsNn7!km(&aIhyq<;oIQR0jmxUnA?&$GV$`i`IjZan%%V&=@IzDT<7$L-J
z?`+Ut6HZ-v>Fw8HHe>E_c1Ux(>u6--Ny+I)2L13hnQ_<)pDf7m$Sj0_@Ta6nF6rR!
z2f2gRw{Z|zaXQ_sY@N!MA^6?(<OuewVFp`^vafOt3YJ{!<!E20K0f2#Jx*DXn^eu2
z4TOeV{&bth<LrAN@)xdDz=ycp>ATC5aIy<SVXCdHSK7DAh|rWDR)`xy)GyBZoQRVN
z<t7E}4j5-o*>^G0B_#hrtM8tU^S7mLJ!AyLMx&IUzKLg#nDy<XD?hy5c+Tkt28g7G
z6W;qv+-AFQfus>gY9yi)o&gD!w5z7URt~8qm~=dPvQTr6$zci<XA$My3?41-dMBN&
zE&z)xw1$2VtDPA)F`|78R4RmG^=U_pM2zqpgN#gmRv=QbTbZ=J!uSJQ5FGW6e5xwr
z+XV+)m325j7B&$+47?zeVwy~mKo^~2=PBfIleyASAM_O{JWDqoFJ1)SD+}Hca`KA2
z;x<UjQ%SeG3Kec3pS(7otu<RQD+(BQf@CFgSce}EMb@b$nrmcOV%G4$D|%KMdL!nD
zwfXkCf>_4BRN_-u&1DnklNkB|?^Ev)ztU(MHMqh?JAZ%R$rJaW0**7}l}KNcei4YK
zH1TUMx|<F>gpMM1tQi+tQ4|3Tp5XTaRnNba`q_Xajoeab0TE^|&pioYUif5Mb&ig2
z)*j<f{UdJl2V@>7ZWht}CT|f+8xArk^le$tF;pe8ndme;Oe{Mt{*`DaP$>T@I_|$&
zfV7fCBphbbNbHB{aY%_$KvYt8MJ&`Tztk@CGj4S{h6Dz^Tks{_rvHZd*ryGfN#S><
zF^fCHtB!l#r_*P`S}Ocr#;P$?1TI9fngC5BT<UMin<k>>R2w@`Br9<eA9d9%=D~cd
zon`xu_@LeK?9=?-_R*o{R7<*;`AYhZwlZhAF`09{sIJT)#oBI$ZS=ozO_$LU+wl}?
zJPWbfw{5ltSWt!OuT$a1_E0M+Hkw`P39B03Q8T{RQc8MxKMrd-!_{ug$3MO7fc;n$
zoOHyM@vV6}{2R9jq#QpKQp2E+vKo<i@Ys*DPKE-14_?=JuaYx^4d@|1a}~*fZvSGL
zz@@+abDphA#1MNJMNOQ!W1#(WlP%>xrK9<1v#Rl01>xNSJJGnS3I@Th&PpZx!gqCK
zHfG(kmqSA|Ojpc8+3n|RCob}H0iEgzHQ*IrcR>j<tV10^G$ckwaYld>U$6jJr9=|=
zI1~z0NBI*5DR##Ldw1YpvG81{uqso$l10;R0$kw|H)T=SiZ=Gy0tOMa)JFR^vaTxw
z(g6)HB13SR;7MZpJsd39>mk4{ICBP93`uwtygL>$MT&cOGo;3Qx;m6XV0JGfoDBM3
zWQPpDp^RsT^aK9-E^FO3VA^*ZCpI)>n~EJ|J=L;I*1nWYiH<XUrd*85xVAAHS8K%&
z|55X;xqFUPlSzm<f>Iil{m#y-vyFx8d6-v7RvfrQaA<odzjgFA8h|s!5q-<VBKBG!
zz1(gPB2sN&J}@HXX-EdUT62pdT!j=?4opD+SC1JQha+6HVFMO!sRVkR@!b`w(hkll
ztguZpE25Z7A7yQ-G2-UvxM>c%9GmSpipv)Op!kpY0}~T{Y9&Bu-0r7--B>baupCO6
zr)b2E3FXGoZ?tqWij%C6zBwz}>7Lm|fk)PslWImIQ_Gbk$w!MC<|#FFf3j9SqIcsD
zV+U6HLq(=z3sXpQ$$6S?7W@6mz1tDX(7&)vC>Hj@9(K5W>>~6Ljvd%&KDsfZZn&I=
zPq(QwtapI*SPnOHD>+)*c*Z!Lj2S$E6a60Ch?T>jAd@2S^8J5kj^Nk@E5JPS@Bg36
z`LA~;fSAYPL7)BEYwOyl?IF6^ZGGFdaogK%{`@R+%g1KTbIaCeb*}Jy1NfsNx0-Y6
zxn8BK&DPGaYq(f_y?x%72HUViDpyr1TIRWPy4rg#PE}P!z8*5u<Z0$@(e-puuhGYi
zUAK9DvydbQMqY>hnRZ?4oY%%}J==wnaNEu0nfrVL|GK!dUNNJe^vSKg@p+wNy=rR;
zs;RT~!LH+?y=l{>$=A)z)p$$uS>K+R{(ar|2Y;2``?=S(T3i44ddqyrd#1CA$JGhp
zeS0PTwpYg};Wm@^W~%n)bLZBxXS>(d<0@xuqvyNFRpE2j`_+BN<wnMp?&H>d*XzyI
zd$t#o*|wdU=X<vI<~gU0a%)$8w00|ddb6vl>C)NiQi)|m)8uL!mbpfdQc5kubDNhJ
z7M}RjRh&rfWwo(-W7V_A_;r`f({sPE&*oOwJdEy>m)UUFwp%mHa_6>9al7r=yI<mO
z5&&eMMLapVz<-eF|40^S-V=ciZUkZhvRV`g^vL2Fq*=tn4p<Zwv4TeaYnidgVFdt%
zX-{(ikOPJ+%xSnRKp=zw6#&&g>wn2ua&&M5K#DAc0CZ3qTtimKqznL%W-RH4Be{ow
zhN<$&f@cor3!oy0i$~>4p+e0q`X_^0<eP>ES7(k3#03IV3;H<xO4G!Oi_j&1qf^{v
z$pk4c{$8*&n5T+J{g2DJQ28is1mek-*{~xN`}+Pzyh01i!1=L4NBF||qJx|FrHcv7
zfWX)&dQ#Hxj4X>!Zt>*dVis<S%d!uEpwS$-S|F7CqdXAa3lnCq#Dot3K+P8b2hF3*
z<^ZVx<}xXe1Lo!yMZ(J9pa+1A7`eO<GdWO3EUok<E0Stn7MO+ckQL@>DrKD_FRV;e
z94Ui`s6v+I4-Nn~AV>Lc1i@L2fB@hOJH8-r)EAI~PKAzcE*1$5Zc!9^U=dHomx>6q
zh%NggOhp1MFallb`&N4R#X1F723vh2%DX+v0}iVm2FA!E2nb+crij4m1A7h;!pg(S
z1I&+9XQXq{-P}IFIFqjD_aqf*Jew0&zWuon+KFrb&g@^-$EeCrq$$yUcZ^n5gmmp{
zuS_Jdq~orc38&%ikI|mQi4mUG%jJreq@W_9fW&`TL~@^1anf7pUX-;-n-E$U&_j&~
zH$)3D#g`r;2RD&-nA~s{cIQFoOr7k9UhaGlOGa4KK}+5`MJIpn1zXvyj`t=y?kiK_
zw3@4UAq(7SbgV*CNXI7Rl$bKP!WH_2JpFg1V9J*sLy$d_7H6AFxENoLpNTQ{<qGq;
zPF+LvgI0_kU2tx*zgLruNnfd5$+)<#LN$A5TRG}+WJiry%sB)ssj=jE$H)NfiWwYY
z_Vsr<+9G;zgtci_!m9$D9~_tvvoN5GxrF=_O~A(iFbvG=kYKFoN&R`h<oPjX2(<~H
zy~K*UUr>5(v%+!{m%)QW)}+1V@meN-69S$nRPYsY%Li0uKg~Y2VDZ@0hgtBea_TU|
z+B?ke_zbitvXL!__8A(Nt4v?D_h3OWnstqa9Kd#k#8qstnr{$mcME@1P4i+OQao6V
zYisCO)QCAb?Gm;wYSbDfX#ok;HIWlPsg<GwMezH3k`IVM*7Hwl$vJkZGQbV^kxEz2
zb=dA))>uc`f`{faxs%qfelZf<Ip2!mSbag*DKJkTB>TS|TVZIsWxd=JbvXuc1Bk!0
zgZv#kb#aypUYs>o_l}=B;_^#+MSFccO2mmWlZ3{4Suk5StbeVV%`g>+K(*r&H~p}w
z3H=WY3ae%z3XUBjHhbCjxQmu<Qm8B;HEK~<B@r;^=bI~B!h=ykClb1EDj9)_8~Jm9
z%p1h-u*bJebIEd|G$wMZx!`a-FC;y4ADQ$!Va&JnV58Ug-?nyHh)$?9MRP{KQ`VG<
z3QhC-gKH~3^e?-uz#$Iy4@EY{YjT(aUZ^1N8|fU=dMJ;709TB<s>q3>*ND}EnjAD&
z+0j%zWO_VDe3@ODBW76NAq_j^EPLT9X)m3X!!t;f^+BDx8N*1hFD!F}3$|Lc<HYdu
zy6V%T8Now{B`<n~{7`Wi{jM#{=HYJJTOpg_k9sEUrbkDaU#@;E<V!r+yVBN-=3waN
zD>(+-%8snY`D#8B=Pnk8w!C*3y?3_{A^+VSd+@Q8cOk4b$jK;w)VEksz_$Nz_<6^$
z2=dj}ff@H{^odJUYhXj{CSHECj2D8pU^kC~S~>@Y<)CsloQXjY;x%DMpi~B-ZBr|j
zX-FPxGJx@xrT1c|X>~+LVLjCdo{<)?0#-p>_Q?W=XxbPHihQ@=;)Zso*a)jlA)QS7
z?TQR2Lg#LJ;Y$D_0A34)F$h!m1WVe+3W=D~!U#2Wu`(fC6EUq3e?+f*SmP^os3YXF
zhPv72E5^Y@GC+k`*<P=Sv=aU{Po#pHpW?U4yiu~V)Z9PM<`^t0F_Ht{Wxs_qD%bM9
z29^F3p?wPT>%<0w4m59!G<6K-9smi`^DdnFVW3$p1uq19klBPP`Wpm~-WsvlrQyJL
zh$vH$<l2SuVxAJ)cH@_x=DKZ}<$T!Mv14CjYWu_FBvSHcsLMq}iFjeE5s4V^eoj;h
zR|9UK{t?Y}797=tx$HqESRg!H%*N(A<ru3@RDqmihkFW@$o9MFh26Hf4AK>g)#u*|
zWVyQK%_Mb@xw&H&6P5>doN9yE`vE=&Mt*tCWExpH<<g)f%=BTz-w2FS0n>G61^h-+
zbJL4n*%!s`i4y$Z$xTInEI=bzt^$^=-4e+X1HQO{2v}#?2U!*u5l~HwbM8i|9+{5E
zA;{CcjK|E;lvcRYiWtg^W7F?v4WA%GHI6gpiP4`wJqy#zrz$!rDP1EoA-KJMl2c6A
zosQ7K0PMxc`&hmbl|VB$Ze|<>5yOzXO2IFUaOwP5;P=ISw$^g>`sI4AOrgeC=BWdd
zf{GPnWd;apw3ROd1pUAHxgly3muf`c;!_L3iknRHpN5)rDkqeE?bU&7?7mstI2$Is
zmj#5hFa8D;9444{$XEy(zj_W6H&}&Pz@3-fZFtqZ`<)~jW9^q^hN4_$xV~Z;8U-N{
zZkTsL0pj|~8$>llL56Y-YtDt5a<VXW+|l9Z85|Ho-AQ!^ekGI@J+}F*lY`t-?z+?{
zL#nez4)ZdMrbBSJ$1II5cMWf0fHCCddl>Gsnl6R1AgZsVE*~Zf3g?UHpBCz!b*U}V
zqO4^RRv!;51u$7Csaq^r#&%yUpMR}HKyquP23HpsGBnABooY?7)=mcykxS@qt%rG5
z1D2X)rv-$r>WX=|C?Q!)Jne;ghxcA$s@ZX0>buTG-n!an(-ex+FXs>4qM2ZLdN6bb
z*l*DpS?V*pZvzqinrMj%ve{(d@`N~!T25h{aydrgky&EHH!DfACy@T4{pBsjL*RU7
zE+DRhpE#`xiJF2yVK@Q?t>w`QoBF`8o&A{X`w@TvrXuvCEg}c6j>HsQ0QFQATXN2#
z;_{JupbZ0`#ifW%>RZ6!q-L{h0M42dG%lo{c!ORew%vjI4@a=DPf7@G0!K#&*PQLp
zG*=6sI1fr)A<44#+HL9c=ByYTr`G;0b$C;dqG_C|P6RCAEcI{?4cmFii=~AROMjw|
zKf3w091~-an>^P#I9JP(^|$L)-icukFkA5SyDZ(+Xrx&B<JW{rkHz6|5`^%-z>DmA
zG0t51QQMs<Un}gcfBddW33UGDJ{soYFbL!U-)!6*>d*-h#-O$lnCLtacNxmzWb~&X
zwp{u5nTp;Vw)XTyLc%jY>#e#V{2}wCHUsIsV=k9+z@JiTG&WcFB60W%E*rJZ$<L{m
zKOa<x%N>%2arSnuzCL~pQp_{mO#1wu)Enapq}^~B<;Cf#-%ENv%mG>Ge$=(kumdn;
zfnmj&gN90*#TUVX8#!CZR^Sq_@4REq0x;KkYto;Qy1r}ZLq}G~F`ej{Cp_ENT_UFD
zjFnBF#M?=7lbnBR;zofDlRIuU_PxRYzc<$zu0)@xBZ=2V6hJScE-pDsQ6Y77ka>y8
z#&=~*pQBz=2X(b`is|5!spwV2?M5HT0x_GNyZ2qEReK}>`|Tg@O!zA|S#0mMF8CQ0
zXbesc8o%fv<k1DKDjDTbd@QZ^E-bjMfChcCn`nc4Sy#Vk$AgPo0lyM{e|?#jbK;Em
zP2@;C^D04?^8m2cWJ%K%YsPBCwgUw!vRBV4-w6qDY%i=1^Vg{5P>4vZYoOFP-1*%Y
z<>mSVH@W>$yc+&fyuw~90Kh+|cplXbT4_m;mR<+53HsMyj?MK?Jwv5K!yqht*i085
z!iq@%$KA#o0k@Vsj%iyw6MGl<4y^tOU4aAMT$?UFk99UsF!yUYUuFVIRsuaKD*Q_G
zHPIxCv1QxpJDh9H@X}vFc1=Dpty34)4T(s6CsBgscastdRsi>nQVVt3iG^i}=M=~a
z{u8dJI^W?3+Atlg-GAq9jw)Wq-xy?C5I`C~>B?N|Ei=!9SoO;8i>1dkmfZ3xbR&$p
z@#hKhw(b59PfVfnjp@5-l;0lX3kkvXX#~2T<0b-xvIQ&6U*TEn-*s_44zw%2nF*lr
zR&jkYd^I&cg*?>!ZV6-t)aUSqDwYq1N4c1fC4YETQIb<Rs**{eUMJqaGk2<eD@8m!
z=kV*@Kk3NZ<f~Cu$7aj*Kc`Av8;|HM%1S-Xo3fy~M8&%hyIfhKL{{nG=BPa$j3-F^
zzDD`<2<|%17vbvq7+t<dRp#@=BBHMB$Q5oH%n)g;=SppUvgUSNXJ6!;WZ-Ht&Rk~E
zLMyF(-L(8!=i_YQ<bPTo$<><H2aj2lYxQy}!Jz{|RPJYG%bWSzAJIX{QKF}NG_fM|
zm5|_n+VNgB(<UV{v<i*tzx;*J>TQlrUvx5%_10oUNIx4C=x<<|%n~tKt~DI^jckJT
zGvS0rQA8Np%FF#aFoD=yz{UgC7@`6pI5nl4f4cfg&Q@o3T>rlGon%LIh+_@7VSq6o
z`Be6G1|-h$=hVW#b?oXIsQJZ&OQ^Vs!T!!&p8)CLZWAPP+$XJ+rlOEL7(YHen6t6!
zg~YZ3?tt|vs5HuBtwD5sPx?N>y{3N{4w!Qkf$9g{RV+W|AtM5*eSRRUh7NgQj0E?6
zCG%-{ui4z*AJWGymt2k6TXd)j+vFrOUL;MkMm$TRdN0;#fV`l~nX1usGmY#IL_hCE
z=S8x`<iO3;m36F~?N!j3f=9oUW%N!H2VrOmQ}pySTrNZPLu`nY0CFXoy623Yw_9d!
z*?uEFn1-KkAO78mFP^g0^jrW#@D#uy%R-eb{#V;Y_=TJQG_zH<^3O?47w?FhXt$*n
zZ{_+(j8ooKDw_(}Vjj!1qFBb9?d%^R=eWKVPltB?lsUew8O^-KWTFhci;)X(?KaC{
zkJ!*>#Vaex&&R1a?;%uEb6@VpOvUWwb@<feZNPBF!{q_iUZxgwmpu^{vqHn8ugsNc
z8;Mc<_++KkJ9bC`5D!)n%JQh%i)9e@gEFk;3C+4!eFiH{d+|m&Q}j<yxM@2nL1XX4
zk!eg)4#uR6RT-%#loPLh?Juk~29v~Y^FI2`@N<su><{TaLVha(JIyWl)wU=CU5#c_
zH`(vfc;}wOmsV}3FS9p4ej&jk-}IwU9fNNv_NaVL^K)&KCHpdJJNxw4#$MI*vdc+a
zhc`u<QiI?+wPaTlnGJJsx`#ho2=Yx&W0p{lzrB&+Lc#T`OlgANIwDYz01+|;pVEXC
zV_x%Ra#D2mG=nc2WUG90!s(rubblh}*4xt56zgGk+C~7RL%k@}gM5SjAJwWT$hxj4
z-t*Q_s?8EbY|GA>7U^#-#0V-<Dj{F*!slYT#8=!7dx-R*?D?-;)M<?VmI{-Xv1Bs>
zMq*%r`8dCXUuSX871QXxYrlqwE%5;Rp@zOI>K{AT{Sgn$56r{1^i~TSG8&}erc?*h
zH3l1Vqtf3&yC7>h(w5sY2MOKKFcy9|Edi)y@np)q+n|`zvR5CD;PySDAeQE7Xd{SE
zOrfo}J60CsYv=3dG`hQbz8qANkcr`$FDI6bGQDgUaxG~H=%nYLCLVZ&Mjnc}w&R;B
zQ83(p8QH}|$g9|gx<hus4AGbzmj3;&#OOg6w->L2>Wa~XSL2{OTK0bU%X;{%&3bYt
za%K9YX{|)B`yX@|#9MPnq>9hm5nz3%btmPRU+_)8WukHCAv2UGMdS(~q9xhbxeM69
zav2R(mkL_U(#d}%Qs|d|?Sld6-)i1{DSs?f;!hmm?-^Fcy<pN&-?^qF*v7e?S{fUP
zMm)_i3|v!iE-%NB5cH$K?e>HHWbLgu1jIX+hf+Z5ZnM8b5<JVt;*gDSCj4f>;$*5;
z`Whu;sjcEB&YOlPVpbx0r|<(apj?B$ghj<`(zCcpNcK6T5n}iwxp6{VGMGgYs;G~Q
zmA88t#&3I89QY+5bG}6O_u$`v(by(`d);G(nD4wzdyfS9v)X>Wd#J6ca}mDtu*s*{
zFQ%xX<;=Jf+F1M4i(l#!{bwO}OG9WH3tS$fvTY8V3vKtSVMr(aDl9&7cGK~*2YUFD
z@99I0;wS_D&#sKD|1vIO;`qCZU@XuFn}9<Irq6pW{RtE>zV7s*Q`8HoEvQm;?q{bj
z9KCyf5H4qDH2ZG>cZovbl>)NG#1*dI&+d51^hDLH;LjePOyHSru!_7F{Ua@Z0f;dR
zxe0G^%w%zkC{7+Tt`sBE-Ix}Sd+KJePN19+od!tcawdQ1jlSaFGk#;)C0VCWNe{D0
z3L-NDOf5Lj2d{o$rV*;r>}-no6EnF5D(**l(<}gq;u8N5nw_}R;$}?thbb<j5e${4
z(MwizJIHReNPV1&Nn+~X)!z>8#_uV0iMb40apYjIAb=B5>>i2cw6^3QHa#y3s-I)6
z-4UM7lyj`<I#^RC@%y*oIB$mz54`%*A*3&3b4-HyTL)A1d(JB>r{L>#kFA5N<Ny5>
zBjsP8(BkPW@?CaoXG-9$P82-}*Eqh+d895&6cY!6VGwqqiS4km(<5Bh`u>F+`F9Z7
z8w{@gYi`=6bL_W!m+{NMRJqMtKZgfpsSSTZA0yF*3Eod5fT<KU*&<I$)vbEF($73m
zH+|26JH0OlQIKa$IH|CkTitnwGk0d3EVcX42M!S_a%k(TjZc*z5WSG!mtz)MR@n8&
z^p7`3q{RGczK3TKrp+ha&RdGx2G2eh?fHyeCBr!1$MJ77O-(hnm%C^@_RECIC85@D
zjAGX`>gG*+QSLXpNhZ-faGg7I6byEFDW^_Ezjx78+4XRavajx8$JP59{x(Zfj6;-d
zum=9RK4iu8O!3tjwAH1R67l*5B`%Zp-voKfQaN@EB-Z!=SiHe<xm<&VcsaEfLF>(f
zg(ek4mVtyml|vtP)1On^#IBq}GV30sxL5T*5zrivQu|M;=X)Wyr@OH-kWs4s=1TZ~
zA(P*zPP_3^_yL@=Bi9?CCk7IQBtx1U81arho%La8uqm=0|K*R@!{_yFGq99IvsR(4
z@T!Qm86fWLuul=)H&?)aQ8V^H#G`V)s|p8zva~p_pCJv^p$NQXR{ZGkt~5MQFXkz9
zlva$f7zqD+^{aj0BmT92{eJ){K-RyENk2EYPl1ferx?NhI|OvQx)FPBD?q|8P#W8N
zu9u<u4Dk2G{n$Rs0at&~$b~<4+Bz)=c1my7F|;2S3Vu70r(w_B+lC6^mL8D(Rc@|C
zUH$ahuDrDpuQYmO3cROg*5JD$gIz$ZyY`K%!BSEKr@A-bXvv!nFq9&4H)wzHrwdE3
zVnQQ}2=-UQl@$rPoZQ)MNRs(&X#M-nIX)Kwu4ko|pQqk~H3-#<Bws(Z<UK0y3B83R
z&vj^Lre|Bh?r56nxbr1&yn_}HC6;mJ^A^u$kAz?f08L95`!Wa<F{uLd-J>jIPRgOw
z-+e_Nj*|LcjL(U<k?(XRse{HpBL)F5%pj23BRh5h2b&|{OI`3*E{~s_nMqd|i?NtN
zgmn&aa6J;O1PuYpy9%u{a);v_rADDd)JNf^_4O6}Z+7k&YhyWg!V0!c6MR-!;pSfO
zJ#M2AtL)K2$|~t_IIUP*-i_X&<0Pi;2csy2c5G(8KA>-@3G8Ppf^E%7B;A)ji?d`(
z_1{glxpdr!YP!U2=^DelCPB^B(?@Mdz_GY`G^9WW1=?ofx%AL^BGZlHt4Qq6b1BA4
zG^7TvhoD;Yt&VT!(r+CY*%&zScIAVFxd7l}T}&vpW?epfPgw_x(@}f&gL+k1+#e^y
zT6N)3(Kcz?#nrhbb*)r?+lPb{jo4Cqt1B-EU;ymzDA+Gv-tb`d>RTO0zZfh>05RuK
zQKt5P$WwiuFAiOnm)AoETp1aG=j~p&9^Iq-8Ft<ur_V8=3|cYu_wH3&WBn0VHIhR;
z|0U}Re{g6~t;d*Vt#2{D!UwvRiZQ4d|6Myw%|DB4sL3h$SyVP}9z~6TlJlj#{z}BQ
za0uao=-FvqjkrFnOB+ofFqJ1hqDE9lJ#TSmI`%mCK<-OvSMXu3<g_$ieV9WwhSv5^
zcem?LykW|{mq)j*$wt^{j0gqI+@EU*?Oq>^U}edM!soBamzGR1X@|pYu;wCnWO11j
zP1fQJk0^l$&eV;bA!TYkEt_wOhl3@H&#cz8oBV5h=8~e$#jmWDHnhfAAQ%8X9g7ZK
zL@y73U1r<8c3W-nQyhOM9qHbF9Xv(c$O%Reim<?v{r<t<46po3hkuwX>NxZ3F|8g=
zl}7l-uWM|oGI5#ZyYt5c2B`Hn4|Xu7vYYi}+AwYprswv-)4j#9IF)!0MXA(7@}5No
zT+exj6oy4YLh__%vPD%BQQTo*!%&&RBFA_+T%PXY?7t*HN?OK1C(s(sc2>KnxKxWg
zYePS8`m!r-DghukAYyB^@PXWT;*kt?$ZAw13})dD$nfnr={tD?@r$S-2$DK_*sXZs
z@%qM*Y|~ZnFIt8OLv$fe`#j&IbR8+mfBsVcmdS+ccM=xy-xC<Ws<=<(C#$Tj|0iBH
zj~60rL@m^KVDdW4`gbB+MdKegF`jV8AS94};p_Y?;&JhcIix82TLeh4yUZ1i26Us#
zR+HN#UW^el4gjz4qRF=Q;IR$%M1X{VS{p`E{8e!_ga&f?{vS6fRfJRj@!gjkkN`0N
z2hJpch$e#_uH-E__;t?(P=0<{W}S*(?S~^zzaI}oy_)79fYO+|E(mdgX6C9TvcvF`
zfz%u3u$wAYX13yI-7-UhyetUAHv$K+yL#0FYe*_9gM0hPU(%0;C5}lO3futBS(9_V
zwdJNo(KT)L+9k0q0|5D((%RZw3DOli0PSh)r5BC~D^Ng#54&ka9cb8y?SJ0Pmg>3S
zFGtz)mkB5L(HyV?o`l8E9GI7d&Tj#rG;AQJl27lc>dUI)em$AZ8K`9~tUHf-(HZgn
z%pxn|PNRcTEZ+vz51n?^chiZA=IchUB-i`}vOEHNW$j)1-^w;c++lAyYKON&wNG%N
zx^Ylmhh7cEZeKQdv*c`RtucEOo4qHExn#@mdR84KGK^q^X2?+F^WBw@1L8+iad!+j
zvbXdr*H77L;!g9>-XRmHiRP#Fc^ekVe5`}`GT#vH)0t_SzaiRN?rpJ!t-L?BOM802
z6Ea}(kd?P#QJ^AwUEG8*(m~Okp>N7>o+uk(KwWVb<(|L_CoHnCt+}<`im2!<VXl+g
z+gUHUz+d+{>S?WkB>i7}I<9O4dKeWgCb@%-u7eQ}_29bFv4ed3es6uPQ=3PBx3zLR
zOo9rjJdaLR;e&<fFnVuob1nY6%3b)afm!obVJwwE(Q&%MV}Cym`B?->)Q*uGm`_<%
zf9XIO%5}sV!T4NNsFK4g1&?Q#N5Re(#kYF-8Vbl(zAIi=lr7)%qp6q9()SuTHzO-A
z216|#@(F*6wKZ?U<JQ7dV&~td;4U39(f|W~o_a=G>rwbl^8HWW37LV_AZ=%h-57#;
z@bxWSG{GO?v8QRbTX5)9dO;f<IH*Kg?TLy1Mm>P5a4>zEY9ch7T1tYF!DQ@u02!$E
z#s|!D3e9+M<%7lOmNLRKa@_F~I4O!U5bs*AQ~gnCthHC`2@nBR4#hrGdw9mopZ3!D
zj`YP=WG7=8WdmY&uUmLzs`Tf_=;?1pK$>??7W1X8w81Z!z<rEpF`DL&&Tztwf?mK`
z)v_G_t6fM#kY}Bb2tdeC8!Ud3)1A()?}IJt_0+X{Hhtu#=9GV<Sgxd#8u{?^TPp$?
z{i93UbM-R@hS!S0Zc)tQn=`%~=>Ta<P#NfckypK9=>yOcq*ysac4qFkisd?jXO8Bc
zwN9SMqdNmSUrc{qdwaqUw}4yd{)9tuI!aa~%vE#hlqYTEZF)&qBl`V(jkTk~rTBWZ
zQSa00$KaVTC{T&=@-fu<mC*W>6iD#+elLBm`Fv*bIrL-$=aL4WLN9i@rzH8%>K}>5
z6{u$fc1rhqRoGdRd`NqJs+f3YhitLD<{&Tn3V$}!PgV$jtGJ!qg!G*HY=!y$+4Woe
zfc)n4{<Q&2@>tvM0VZJpy~ojxWk5W%m-GUGwzw`XDDd6rd)?4;M1ts$^g0L8L$FEL
z{Ni&6_?N8r1>Wwflr&%UV3?`d(eF+7dI#1SWte)R-<y|9DrFwDS)9FyW;7vu)ae7f
zk|{@cikvSWU+{dKtO&;iLt4#zqhUJVzj=cWC~<reW<lhBWbd~u#+80W)$O(TH;(4z
zs%GZd?p4oSW-aY@T{hb~OWL~CD5%dqD)j?_;0lIW4T}Ws``fbQpYr{!Wu;#+rFq&e
z-j<~9zO%ip<@_z2>9*G=U!o#!c!j2&22>TwXDHfBKd>*N{bZCJw|@H+>5cb_`_}ZC
z8Y<h_mk&SRtMBP}*!TW_D3~XRg4|cH6%ojKdF@W-N`lAz>fc{|>#oT%MD<*tH6Hi-
zS2lwC*KfuH`$${{ym-!D7Gv&L`KKOFF0QWSPm8SRBG)@7rK@eW{U2Q=7HIY+-rL0P
zB^t4XSqEnm|2rxD=tpP{e_+*pkNd8bd)n1wDbUU80MOUOZewk?(pKwrf0E>CiQUeN
z1NgJhc)!_I1+)(qUQQg2XBavd8{UtO`hVrXnusE91k~aC3fYF^kp?@Kk0K#b!e|{2
zrm`g}F9i^>_8INQ(op+d*M*bUTU(O`F2ckJtbBnGmOH3kO}*!(`v1h&Eyf+uuN>cf
z`L7oGm$KIvLQ#>1P+DtZ)6jQ%Wku?L4kZa5d+Vs|g*>Y~)vG5XQ!980s!)JNY;0#>
zVOadjEOtr~Z>0_V8wrG!PHB);V^mvbL+M+bAO<$T`d!|}C~*n3>Fq!ZTc0-G;bF8n
z^L@9?7IY9Oo^YTe6}=&%2H*0<{J4_AZFy&%px$>zIB~y(@mr8)T0=bkY`D)pEA3-E
zcR4gtPB^ejQv`#3G!65r9Z<av{Yy|xzt}4GLIHIL5h=eliav4P^8kn4ukw2f=e0L3
zQ(#dBl^g%VmK7i`5lfR&6P2X<Bxv9@Ru@#-q5?<dbu^FpHK~F4tKM+NH^GK1G5MJr
z3CzlLdMxOMO;}UDD{J*MyO!kEdmwyu@kj`7Y{S|x-DX!(DP<0Pzj}9ERulZW!0<{j
z{#bBo;@DQdUnj)*5M-<FriP<0(E1gqkM~8MS^jo<6*!YlCjV8>bOttAtT{im$YWVA
z-I7}hO@_$aO8<&_S(9hRB)I<(({A~_URRzE#DKB#IUvvPI=!^=YuxcsPz?jmMqHKV
z|BrfZW|a(2=%$@odBqgOb6b_8kP6C!1EZx#dX*eIE|A`@c(Ckr(Tf00_lAZu=)y|%
zjblk1<ghYo^-Q2l-`*d_nsjkK6<DCGW7HVI6$k3+24JlS01`b3Sc+4EF$Je*o-^yT
zn=$AhQD5=*Ny_d7qDKE;>sL?TLs%3-rx04-=xNJf``BpxquV-G>3as~AUjE{FdY3?
zff+BD?teEUo&%Pz_u+|R{UuV9dd|@oEC78U1Gi&0f6$4cu5Cg-4k~ZxZ5WA>5!;L@
znfcHH%4B?qv0dzwGAHNT+A9{R@TccVuCLw1zd`j~RKTbPUC1v1`)^qpFibIw#3FSe
z9X8nxoUxdQJqU?R2Cihb*pymlE^(X2+|qkT17@_k?y7uJGkw|9JVOba+Rb((7y7XS
zK8<dfGX8(>t9vV!ay3Fe_j#f}bYAm<U}))2?<q}IOI%4g{QJw#Ahov^J$<Lm1RQay
zEItvGTUJiR#w^I$oqElD*W{ZgT#k~>))L$2S>x@_7a_8y62$%rbTu%Z5smP^{GdbC
zCo~hK8Ro@3e?=E1^UcrtX!zwQe3tW{NKMC3<5pi3<?n#QeCvZ71sn5u9uvc^mtc&?
z3s3J&f~19g)0384o7oo4iKk&PBy`_=Esd6w0~{}=PZ==ANpRc{P%UV<w5tsRQn|b3
zQ@LWq17YkNo*U%<e@snAFy^vH+RjPCNY+On-OCk#-r}TRKF(CGaA2*Mx}Pko;d}XU
zfOe)HZKmPG;Y9rEUl&BoK|Y(U=~`(xv|x@h^quXd+)tuE#LxA&JG?0`rU5JrRM1z_
zr`auOAE1YU+xodE(f^X^6&BJ->c}i#q}CqnU|~wEtO@6E&aL_o64%91i?PAd$+Xew
z^mYqmC*B>H|4qzH2#fY^a$By>+dE_+F@<E6;4PkEW|XA3079W_=IOtGx^eq7|JMHF
zYi}wV?-$_OLVr2LT9Gq^mS9dZM%y1mQQ3U0iPH3UCePa&FTQjOApY>rQhZe6q1NhI
z(mZFo_EY<@r9U&vmipa<<Jqh=<F+x;I0sD)i2t5jG8E!|&SsJ>6HM2yttn`TpdruR
zv((Xl6~T0H&}k4y_V`~lL<<DS%xeWZ=?<o0%N|U*S7p=H>-!(XQO}Edi~{ISujiET
z_(lo$QdMTNnUw|j-;6%X*|Xu}XP373z1=$Jl;)8;o>|i=qfFc6J#5D?(70>A5GCjm
zxU8BkR58%<msYYnz<P2Mt~>Vzg%SwANnC{e*}hGT|A!l^$lP~3>!dH{k)Hd0tbYvS
zUa2mm!TIT}3swIrkLs)7;e^<;{F-0WVEFUy+;}3FxM#}$A<J{sHam4e8YP>#?~l)C
zQ5W|+q$S~@8MXJn)VIoWof%DB=zgJ5LtOhcak$--ZMf`^ncQX2Y_v`CEf3jo&5}=x
z9&eGm0|Cj%Os0dymsz1eSENAgFcMkBfP5w3<m1m@XAd`HRs6J@I$u54qfKBKYY{+A
z&W7Q9n}SQJfY*eA?liYJZ9#^Z#gunP)@e9jZ~qc^CteAMrt;p#Y2~k)uM%iVNZj1W
zB+xk}Zl9r@b}~cY#_Ag~y4aW`yt+njr?<@3vEl}5A(B6q3?L6MSOy(+p{pL`xf=|H
z8J(H3+K1gW>I?xN?9g$&R_jJRJ~-cs*-s;3d8+kwTA@&R=?Un@R*>AI-Q06u?E7D6
ze=G~A`9nxP+MXo`WQT8M0r9k}8Ix+g5}Mz^*F?GfRTSw(DCmfBz)H%pRPs%^Q0!<9
zgvRD~w!QnV{xoA<tN+qDAHSx19?^BaOEP#~yIsk-et$p<n|=LyJ_j!y_{OR~M*A$(
zU6k_fwv5yCej{x3fkwUM8WoAFmzf{!#~Fry8lLVFC2r4~Bdw(jaz0WyH{(36;=!{+
ze89&Cwe8=kiJV&FyF{Azjc1qZT|xN`iNz1L<l54}+y68x&;WU>+ooZyH_^;Ce&BZ8
zO}4tluNjXXnV_Y^GMVgOB!9{LVZYNvRp-MD2%KkIMv$!ms)XY6kw-3bm`h({v9mV2
z42`nWXkvR_w5oQih)~R?kt|JBE8kAhb2v#p+yHkk`B&7!Dnw-XutR72nH-QJR@RTH
z(|JM%Uh+$xtG`&XI@4c<EO<S3ra_7#LAGiP@8YCZ<cSTTCvYQzH*yJsp=l4VJ-|@F
z_oZPeUIMfrMo52kBW#Cbh)E)@IeU*hPo=5NG^dfg3w?Yoxk!1T2fw&@9;HZm+OC@q
zRJ?Qq6k|V_A3tbE*-tb}HJ0tvIZMdH%#h3yA@6_0Q?-Jq9;87+vi7UP{g^HcX-v5A
zy!d~K=`KIt;;3oP6+V6wDCv&yQ)@E_IiSod<$e&6CYuXxxb98*<hLbXY;mGJ7z%DN
ziZ~((Bq=pheu6@Sw<FPnx%)*g6f2>&oMV0=XuVf(tpp&U0{z1qCeg!lwa#OQk{;j4
zhk9z^-IT7Ecan|}&YVx$tCHap&Bec3LrzUhu7|d*y(s2pM|Mzd`02G{VHFVDUgvdn
zIT<Nw{D!}_xnD(=N+LQ$9nG|H+Zu%TP;<v&D_A#~*qXgT{!e+TNo>WoFT-5|Vp5Cr
z$&j{LTC~@)w$*|Jw0Xy-e8LY^{2IhnUM^d1$E1xZkX-|dApP5q=EJm4ym#?vjleS0
z1!9X6WA;y^W}W|Ki&a`Hw1VXSOG>i2n};cttBib}PFJ?-7Ho;Cm@1h+SHyo))M`#^
zMAs?U{kZ1b50;qv3X9(z!&g?^<I3N=0uT8jr%IAyF^NZDH`#M+%}dND3e5Xni$Ufx
zgDLGMBZ$%B&%MsxvTg^Ubnf^V^8SwXxd*B&Sw9Z$I^2zO1x!FKvkjTSKNUWwx}UIg
zzeF2OqH&iSro06)rW{4;Gu+@l{eiWm>`pnzNXmI85rJ{%&#0JDu9m2~ikfB<SxSiy
z;?jwtRm|`6n-vdD3m@n&09BLpFUHJaQnS$!oUf$DKh@CRb5KA30_e~9r+;H=L!LH}
zZ+G2YN-MEyfv2#DZZnS0$2Jag)MN4Zbq;AbIan~?`M*Ew#XYr^L=LkXBoF}P_=VIC
z<3C&%w0Lre3}%;yPL4cA^%U3f3bqP+#-;U}_~=oAGrS-~#GlHnq2*6min=Knfai7^
zuyp_6fM^x0)?!7@>{os@AuPsqvCn{jmD@tdTXa8`3phG;4{Wv`YTg8$-)UFai>qE9
z27bEo>DQSaLAN<2aThzx0;{XWB18+POo7sVML20wccgiO=ox*uK@q`c@|lS*gg-TQ
zub-A6T0_ov-eqh6E;&nje>@M(Cjmq2TUW%6HQLzqT-c-<(~$uV>E=?JNaa4MCg#9S
zT*hli-S&AjEHkXS)DA-Iqz7E?-S2UB`@8XMcMdi?^CmB}AR;9V+|NW{O5dC*{(&Jo
zrJi{IH+8?y3!O2H+$RMXYIcbb)x=_=*;elL%^jhh=K==65GYZ7Vb<<7Oc8<s^ZaQO
zvoJ><vVJhN+7K@S2Na!fU|Hv=QS~xSy*b&(@iqNzeN8)AujRc~@hH=n+VfvR<Tt;Y
z-3aR}3L8Ea`Wa}Rcl+fB@&l_Vxop;$pnDx~b=gH-ZJwo*Qh<?e1QqN=lx)RQ9@yGP
z2}HF$epNrvv4GU8DkIW7f0_5YUX%#}EO%I7R<kp@qHOuvm($w)l9gty*E^WdwLuvv
zsax)J@1qltOx|~Fc5VBBH+wga+ES9l;Iy=~af0QU3i(NEiwevgZby}|YHq?~F)Lz=
zq%Wksz+F;hg`M7hQnXSm**@rP`uLpJ+T72!yX6QlseuU&z3$W%{?5Ol8jt-bqM>#}
zkIhxL7Np|Rb(^gZ$(xRAs0eG(q%8!U0WiuhYmAH;7!A5|foXrDip*Rh^w|WaBp3gC
z*bYZ^#yrGM3S&>~KWr6-9^(_835Y){?ch%>jdKvrV!5?1?qj`?IEIa##p)nosaR)|
z2*iPplh8h<ek*B)A7chnNa?=8KK@WBPc;pVsF;x(>x0Qyc!oA80@{)UckvvWiXByJ
z-qH?a-<ss8jH;UWPj7wA#aX9p;HDy8GSsw}Z5K+fR5t9t9c4gp{L#tyu=|fn3l4z5
zlz%*f*MdJL9;HR_-j960+(w05@3z{Hxgit3Vnhq!^_4V>&lm=MvA;;#1|}`rBi8|r
z$wOxla}@Y8!${7gCX?5FOtq`#34pWSJ2gd!QMPAl+c~_!+=(S>WsEk3ICQJNc#tTB
zq)ylhm|6=K$Y#5c)H_OSDau;Wly?wh?(ihVn17I3bpl;#fg&6tizD?^gg8XAFsI$W
zXj+o9e$L;7NaMl140z`mR}V{4!{6#UNBinN6fgib{rid}Vhw&$;e4QJ^HSIhNWX_6
zHJ;wTQ6N)c+mKlvC+fT6GiwM{2?o$|iV32>g%VAd@pF8WGUCHZCn3o<_o3j<4<$5{
z_xLMMntNyH4Ew1%!~x5H^p2-aiB*W6@~1;@e`PpcV$^12I?Lqd2J2>`>@QuQjMgTs
zc$bB3_y&7lVCn~}(`exwyE0OYcV*6qevg$0Gn3rgIE%lEBkqHifGx&QNBPD}s)K1k
z`cHDQL*jW#dQuc4=(%L7$+L%3^Rsw(Mwhd%TwC*0xLpn$v)ie{&z@l%ZsjZAjTWMI
zmmr^Wr0dm8GHecH{}ALQjF7w*?1jc(e*iqfQ;@C&V0>P5V%`{ydyvquf#E7_3h5jJ
zgIm|BMn;NVhqFsrg>8{wSlBio&0c2kgTMW0f=&t`cTmff{UAgOVGbDOlQ)8puSesM
zIo}4}C!Tbj=YorsU}q{*{%4Vux#R;pOJ%Zjk=dJ#&?8vVa;J0oL!>Sl`jBDmu2|xl
z*<_uc1{;DzcHN)*=^iStbX=>L8M*k{sU(^0-lmN^b-$lZV}*#C(D-Cx;VzPk(2jaO
z6xeYu)la}#lpZAk2cW}xpxAiogEw%6WBvj!o6ZT~+_!zbFTZl?<5|KNCDv{o;A{II
zv>vsk#>IVIsn4nltr<|2_D+U|6|WJlY95n7XNswtWbO6R#j(NPUvu$vJ{KhWzN<c?
z6#fP!r}|rBgSEo+TCFqHu4D%u6PC2&o^N&E2GQ_4#&Un?BUV#J@rib{Gj?bOfuG`v
zzZ$~b-oNcJ>bP^F*(EO#!A}XiFEVW)vDFp&63)teFbwhNz>@@q>xA$5%<nG|{-t1p
zGOC{;WeMG_@8BhPX*nF7)DmCU4(`&G5T5@_XqUFxe6j}7Bv+C$84!Sr@F2iwXt#ZQ
zv75YXqUTd|D)uKX*gW#)2a4DgVw1zE=_%VdeYQ0Do!@Q)#@w=PRS$pCQCL+JFahyM
zan%HT!Eyu+%s5iLvEB0Zm3qA~6M@BR5Wi}Z=wEduShCBTrS){eo=C%Z$Ea!ePFGIL
z91f^f%A7e?jyG^yI;DLW$gG~P@xM9Ecdvicb8{#8yKn%?`cqzU<4f^XkxCksyR0OV
zG*C>6%hPy^hEKbteLoJ{GsFa*UQ6lou3C+_HdXqC-C2>%zwnSO?!Hk4F|Rxzxk}gw
z_e*kwH4>{s;&q$l_BJ2KBE~;r+xfnm0?mAUH(~&{JlXYfq#<a&vDrDZ?`#>sU80}+
ziChZEUDVd3Y5k8&v)|5e<VpEj7pw95Z~%DuB`spEWJ}H6zbQlPGb;-#fbei<Qg!DB
z{k)~pd;nhr0uwE$9~JJ!@sQUt`l4)-Q_`lEn8OmkOUvK;Y#8^Fu@?{Y{+3fn>1p4(
z*;p#(o~;?bvp?K@r|wBz4JvyS^s29m0;PfjgZCHgGuJiYEvU0a%e&a|{YZfF7>>fL
z5L6$v80$65<aQQa&N{}%{p`kC=iH|fUHqLno~fLObCr(~$5{5_V^%S6KO7*0F(Ied
zL<idQUp7}EEh)@&!|F&N@b;N6cs7>+b|-vPEU=!QP_zeb+%Iqg4Y=#H*Vh#a&iTrz
z*KPx_dha@GzGyMBz88!kOdH1=EO>a4%MX_Gx=%TqFxk4~y`goQn<4VwY%-Hm91D8q
z^{Y>=VxKwQRD~?XPetY|M!IuI{;?r%y%8<4xR&MZkvdT5BA^?~S@PwLxqU6}ocNO}
z2`2IEA#Wc$RgF%oU!aiUj1}uem4`RX?PQ+TnOHwzStk|8CR-IINb(-v)mY>wE$v)9
zg3*Q^o$+FF12E#$XE$wLk5`*jCI$h$Y{y_iqJr$aSB>gQeDBnY!I)FGQ28;L*fIgP
z1DlYTnR!phI_6{pZ5$4dJ)^x8HJ*F6Th%eBXCS2!i@nW-Cn4-*grvQw89;!|&ISkI
z8PTt#)jd?|yPW`H3u>uO`T;~vC3L@f*_om8pWn=BxRq<Bkt?Dj*@A-MuE|0Gnuz-X
z%Id)yYyf*kD(FEQM?ym-8XMfnr7D?h4M}XxHt5gF;i}f)8#fbi-YLLVeA*07cD`XF
zp<RULuTUJ2qo~dQoF>r(Cy-Cs!rhM*(iGT<Rz>iM@M#%LZr-IfU&an6J#!pqA?s3?
zt3=(*mHMNj)1es8Q`^G4qiWyO?7dw)JhUA(J4B^}Q1DI_N%T()8T_AMrtCo5hGFCt
z1QA)XtqM0c{&@rnRQUSh5XbI11Te(+9O%<Y4RuC1tl^?B=QmspiUJS2FXS6(P2{60
zkYLlAf*b2FwVXl}z`H2pcqW95s0XI1RcX%Z=&<`!VddFdxr0eo@S3HF85Q5ynGt_w
z%ss}h|0b>@aZAL3%b1?(+|+jU*tQSAC&b*!mJ^wTbyP5a;TJac$jR1@ywzQNv=WQT
zI#Mj-tOXbXS`EgTql#Dp?4bebe0oeLI{jmJ@LQr^)IAR))tT{IKV>`d@n9*6Z6P+;
zk^R&myF06l=B!&!>Y25hKLDEv9-aMfKecrN_0QS*7ivnX#i*aemZ!xpad#F1Gueiv
zYA|YwA-U0V_cJao8!o|v@zK(I^u5NIM%GG&S@SmSlK4kY$rH6UAP$Qz5ic8`v{`YF
z-Hc^j7B#Ps-shhB$WruNOLhu;a;bKm*4I1w_v9CUr}f@Lh}56n%_nx23fk}melsTy
z{?vKcyX6zu=;nJgJjT4A`?s9yv%p~8lf&OkW^|#;<+3ZX&RbIoGr@A@LL!RR<VLHa
zAG^{DTpXI9zM?rkPmqk_2*7oE9P1auvk{dLKBdw1O<g_6p7+DmXGu*)G!x?<LkElU
zE%`og4auA-Tv(h=PtQn6Gt4N$$KQV4vX&*{q~(FcqqA*!hnlsgrA-qErMyz7Vc#yI
z8Yv@^l9=Ipkza-G?<m);9QP+&BULB^f1JHe-%$)G2^ry7vitiznCN<VL?`#_YWRc;
z@xA3B*d}A@oVUhigZ9Mauy#IZ<FYE|LUR8vAs=|XIk-j<-D{}m1=XXyXx~*i1Qj!`
zw)gCiCH^gVyVVAc$WuF6t+B)&KA-3%0I5A;%#Ue~p*1W@*N=2gJFbG?cnn|q$Azzy
z+OVz<{Titcw5j|0H#?2Br)IOX$UdgSGohFzl1cwJ>|%EoEVJO?iP-Q!x$r=3L?_Yo
zFdivRw2guYBGIxdltK`*DX723hF)WWUx^I1y4%Uj8Gl5X!1mg(4PJn|X?iR=<+J|^
z`2!K}w<&e^O?SGY*xV4^^1-=d#we{tb|irwN9=el>`H^+F)S(I_+^zfI^;Xb8KjeA
z-H_P8bGHRsC!+EWA(g6I#2ux8b#}J__!4O3MnDemKlDqhr(Yun>N2&Mfxq5<*LsT!
zBK8ed-W_O<RfD=Cz8*ke8htxF*NYs<Fc%BZ8yCV#Ixkoyt-$1w4f-^%;z=u)X@g&V
z@?D_hSGy%x16P^I?`Ozz7>^eL(I(HgioiQC3t)o(nOl|E55C<%cnGPl#>;8`X{Xd&
zekT_^>gryB^P6^Gp-Yu_ti6IY2v?4mE`N>Fau%QR`4aEOe0J{x@9SGVRR_N`UUp$1
zpwZ)N8?*rE@j47VE%apKZgv(Hy?Cyl=S6a|o06(x%iE?;4XpI!ANjJ?I}3Ht%BazG
zb=<BZYhGK*WSlaxA+1;gbYgC68&a3>=qpykqz$DQ65Ud@D}@R~D}X~2OZn}YrZ!gJ
z?3QK!B%RB{Yj`C{*898Ify5XGGtL_S2FEWYre@NxFwFUP3t|g|ldrReAK?yr!9X?8
zr^%Vip<YvOH~MMTu;y0QcrLatX=u40*qw;d&C!hEfcm=yZdiwCD0jb);cUK!GxpW;
zik#sPb>k}jze!otuiB5GZ<joDIJA*}>HwLG3M*i!?mid|@v<QQ&4q9M&`GY3dygAR
zow(`gZI80iR?5t5R)JZG-9i2t{#7RoeS>r13|<WHam*@D<0rECs&TEeLCe86`oCvX
zV`H!HK2)y+o?lY_Ebg?yZG)=%e#SfXT+v@mqE7v`WI6bsNNcy6E|#||NM{|^LVNia
zS4Hb$=aKb6ZF6|5zIPbqwYsD68}_jZGoOs@z@%X0XN&^c10oqfi!LN}ZDKbuV~x^2
z`(fepI{x%0+IM-H!JQGnGHtd*@u~8vzFah0>tA79EariYev&80JVPZioe7n-r63J%
z1o8Kptcl(CM<o_#jLdc|myZ-X&mRVa(OT<1AH;qAAL^}?Yr*3-L7nTdeZh2p1t#D{
zK5Ik2@B1qQv&-_74arz22MyEzf^)5+NLFMYtL9X_`(}l6PCE-*u*m-0DUTAJ^Zt-*
zXzG8oS~^3>9xnxt|7T~*7SebNG6gxA{7qH02H#_cfWE{re^<!c<na5l`FoiU^vCT=
zq9Sqz^qY`oSCd_3#O}WuKKCUqxz${MCO+2*DJ{<rT^ARzx3HQ}+VyNOY^-*Pdxe%-
zj;v<Hd_?rK>>ZU7zq{qup4{>{j0{g~)q#9PuW9*+=@Iw>iqOnVjR8?l`lpF3F+6;t
zfKOviDR!<KWoQLJf9Is*9wdMTJn;C^WDh}c)g<MrPLjUMV5Nhl`xUdOdZ=YGVC-7_
z^Wv`=MTvAy1Xp;)uS9o;Z9CM1K-kg2e#88n)&Xp-tLc!WGvn(hv@clzd~wTDvOsDw
z`<PtLg#gYDKhpKyt-rr^`k6MJqMan|`Nq|W6S=@EV~x<l*AKG%uf##p9C!*wpYU50
zdRXRPcZ?Q@j%P-rQlmc-9IC(Ke;(^M$L(d!{Y!eG46guP%yAz@r*NH*LBD4sM>z`N
zuUSQhgZ{gk<69clu>j(C8_K7U;g)Zcth9CQFE^4HuLKg-GTUDLRlI$tXb=iv2I2jJ
zrw|k#?WJP<Al^e^KM(nAiPHq<@IGRPboxnRN(itEe{Ewj*kyu_oM17KUbdsaXHc`O
z9G<uG*D4vUX)eF28Qg}i+DluthRQbgHsSi8MV-NK`mvNRV^&2|K9?WW4Lz>9>N}Jv
zhi>PyZ?9aLO}LuW>a~{#_bs1`#_hE#-BBwq%RuWNh49%RTh2z)FW1*u=)&lwKrq#H
zLkpk`jHC3Vg2}gh<ph2kDP{Xv<>@AU)YW0)60<i0k_7MaHE^AE{0Hl!Zc6vROb@2x
z+3cn+x17$e2NSX!dwf@0lQV7XvvuoT=ly5ar7E1reZ$8QAjI`}>C?;QL3>*$W*nnt
znth_1E+lYpH&T3Ts3`P59B${#oyY62Ev*m%ok%m;Fca|hx*dk0)t}M)bTuM{2Rn>=
zgw4`F)TC~i4-duDw5$!A>P+K$y!E4UFq9IYK}p?)0VpN*n+1kcbp=+7_qkA<pqT|9
zE@_U2U&>0;Z4CGw`Rr&-K$F|1>H1j~wNl^yJCW&trI|=WmM5eRs8z8xC?T`wMb13v
zG+5if1(KX_e$6G1)nCw;jeK1;vFn{}x8vobXdQ!>V3n~@9e8O22<|6V-|t0DMq`_l
zf)%SgwFc{bn<>Jj-$!-stl2Un*W<C(1lzCWCLy89g~VGOirKD#F@qAz-9+2D*(QKm
zM~WAxtTxM>ep<*^qRtm1RVmynbL5Xtd%t$NisG%TsjgG5Kfw>T6-@XLn8-rev00?G
zuf4{W%BaW~vo4%|Z(%Y7k9oV#Ejiu#;N3i!V2CU+6=&Z~RqUY@n1NBr3q%|F+*4H6
z!NjuheF90dqyVXr<pRLR?u1eUYe=uk#18^i@X+R_vlM(ExR=QFM-}fnXxj#23)2r_
z#Hb17P!wQP6Y_{{mnlAvBGAbJ(xE>bV-?M@onh{d&Y26PPHVG9Q<=SPuv9oIlv(gd
zgAddk`j7nDs%hthJo9Guhy6r#)49jV;72uIr6r!ng0AQr=XKv@v9SCS2jh>;^J4sx
z657<>exbx%=_L;+jtxyVOUt7NZR6|rp4j&*A?~$+0IJ{d&-D?(efmN&b3Z-<9;~^$
z+6xV0MgUr68^mnnEAs==I)7VzPsgn2=E$GIVUHf;;<C$6%r>*vE}Vg_Uz!2rf9^9v
zOU6I+Heb5hZr|{ywee3yN639;w$Pk-JXRmY&!@3*F{kj_{R^axmht9!AEAWa^;Ibr
zyA2IXPCxP9yIQ4v0zOQ2+*Uu51F|*6Fw+V&Vf3#Y0K}~q=~3duZk~n@zo_{h?WB8U
zO7q(5!s@1HnM)^d7z`FtYW$jEo_D$ZsRE+&+#%v0c=!h{>0LR$FEe7S1Kioicb@PF
z(31WtRJe!-SF8E1Y#lwnw%mD6*T%e(;dt?j85W&mdxD_GJY*%ax?}^_#G0UDgKL?>
zk~01Mz4j>(?bedMOwuPS3Kzl$0a?Nk;sUg-15YvW>)RNNhfXGBYMOd>Sl;m*UnH;3
zip8-C3Y~J8oq0{Zw6+!$g5B2XBn53bbtC=3R9dU0B)+#7n}skNCivD-DxR@eNuIdN
z9s+`nF&~$M<}LPJ`Fo&HeYB*JNe(ZTIbySX_)@v?8CDnjEDs9Oq~Fs)q`Sw1qZj+c
z!=Ry*cDzf~m)~3MvI()Shna8T&ABEb<Hm?CXfz9DUDdfW5<l`1>!w-qZdiR(J!2mN
zvJ*$X5WE^`p-$bEjWTyklsK5&l>LAk2<IuNtW}ERp8dYT3)^uHMA&?<o`<)8wA`d{
zhk$&L&u|to>h4?!9XVmej^0)b0^BaF?nV9QACn$NA2A3X&&Wp-sC<HhGkEMH4N4u4
z+<`bR`Y7pV*lxnlx4*L4L0{w9OX&vS5GsKcsuPb9Fauy8S$p@9*Fg>@x$k{OC*Em&
z$L717zv1brAGvbk^!%8pOBza03Ulz3*3PVCA6k)S@QFRKy6CMgU2(<nU2j!QzEtX~
ze8``dHV%T}^qV-tgkdP=vBo$j1b1*6@x>hwy522ZC!J_bK6BpJ|6k|7MWpT7aI|NJ
zmb9Q-BxgXuzuaXcv*e|>Oj=TdXcM$1IW1eET~w}%eyUDjWsT1k!69B%oATJxTFk5R
z{M)XoQG82(yy?Gx!2ujNSGBs1?_!orU-d!O5|o1<5<w(QJ!hso8s~ZLerHTwN1e9v
z_E$2rrlhrm{oCdKi-MT`{#j>8c8be0l9TUSxMag~!R<Hk<z=kLu5NO;40(2lmqwCw
z8CJUC*3gy?FgCcY`uuq`b@S(%M8V@F>)_P3TtAP7-rvrP^HA71>E)cCfr$JnS~O_e
zp~ID5jrQ>6NqHH;8lO8`eA%J+Kf8I{H6(TwGYrAqfUWD*)ken?*^E8SR&|ARc3z0d
zXV%mDS$ggI&6S;&W!8kGy&cevK}rFgE?D>>`?7fP!^{WjOVe0oHNDc2fRo1V)*Y7z
zH3!nN(AYl7o-xQC6Z*iCqQGrZx&sDidMZ(7g}D!9;zHk(7B4^C>EC)=Q|i3*yYy{8
zG5BE3MbT1VS#<_w=aI35UTGgjD`5OO$5sMrz<6e`VPFsrggZ!-{UI{79RWF8zEWwY
zn1Nt+bb<LInGBduHUDy1-hPX9wTqF|P*IHp6HzOK54axW=G;M-sP%?ou7=DxItB(h
zkcS)2-FF!H4X^#X%<a!|5MHvH#=(mIjW^YtjOUwWM^BC(rCoR)ZLrkXO6*OlQ+4FB
z{^j{j5T-YyZNpZeTi9Kyhi0mp!Nv6b?qE%oiM63!qa}H)cT;P$$#=wwT&pf?0$&6?
z75)d6U(WSOi;i9=<kBO-p5$}9e+KJ=I8e?!2D_Z37Aas3CKcHTM)Q3MC1jdlgGdXd
zg>S?Be0Ff6Kyb(v<W@iDbxebAQy@6Lhn{FAh>SRy$%f~n!W5nR69EsXU2ew--)iww
zGo)VXsi)o-tvcgaZxs_$is*uA2P1Ued<T>lww~0U1C>iI{e|0kP~9B0>ATc2RJfC6
zv;CaY)SMfphh&i;BpNS21a}p!C2bh0TB_dlV3*dXJ5DNlBfb4}6xDo3Ty76IXEJZ>
z9NNy&a=5xx8`<OjA%A`#xO=n+N-yRTzfa_2C2q7=@Ukgd%EPX8-{$@_J~ik7E~{tW
zq0$nj17kAN=5&kt82p^@SGH)j`+4A<`O=U6d}QbP@zBVp-IPZI>W0dz3Why%v#*nf
z7FjXO`{gzLN+Ipu+8J*A`rWk?STK@!tUQclGJxug?0|Bd{TeGvEwFxB2s>b7NTEuz
zWF@HmXjjtZ+TGa-t{X22ixxU5@bEc?Ypzcrv+io+)a<!($>}u>bW*O+aA)((0ZvSc
zQXkwGtp*)wc->!EY%%nzwVwg+m>)uOy)ZyF<LVrA{$pMZsb)rQOxk=S{5~_v^P;yH
z?K*+%$zLavXSECKw?SPmWT824b1c+0#vnJ*{bBstpT!~Mg+PyCQsvywJ2b?EhHHT$
zIxTDeOc-B#_4j0Mw?iQFUfVe#SWWicH3gmW)y#LyP>nY(oNnKU(SwaS|2DqSmu9tN
zi%+4Q@UkEQkNa+)DYWsBl9zamTtQG>>Q9U(r1Q13xdsnd_N)w8;UEr}jPn8lpLM9T
zrP$pM20^XX&A)cqKNzf`ab}mhVDIhr)N?dGyARJ6bq#IgpC#6KRiF%_fY?#zFw#bO
zpXT}`b8unOo2J?(XMN>6)p_`OFlL<Z>^<&KX%};1CN%F^>O31&e+cVU?6`K+pk74=
z7Q^$NTRf*bex&56U5JifV$J4y$vi0=NO;c-W5JU5+`mF1+`o{C8k<dOzUtZJ!BLM2
z+O8$>O-2)Yiz8U3$Z2!cQ?q12o&jc%<}PnfT5Rvx7~+_IhJ5+_h4`*2)tW~kRwFe)
zFpaAyS%jSMNJ1%qx|}?0usfN^iljme7zn}fE;0PQ=#`Po*5`3kL>3?)4rZFHRzrW9
zucKAJ9v|By6=JcivVQecL*N7Dw$JFieLfa;Q35hpC%}N`3Z?oOyWdi;VH9>rUYvH5
zUGk>Sohx%X_AH^F{F!y7Kuo?5I0zOT!UxsKB_HxN#UgAbo^H`k_3pDc$#>R1PnX0r
zKcUzYu5w)5v6cw=>>tGHLh(J;@!arxvB*B;+t!DS2rezK{Fe?3Fbn~oz6S>fX@lHK
zIJJ=86VP{YA)|dQP$BYuNLkhSC{W!JdQ0!m2^3q>6S>Wt+Ls8Wpxne#)QH&E5k=g&
z5ot4#iSM^_DfVDmEu%f@Fy7w@Q2dCEZH{S)6;UvkQ`%CcnADOTCW@k8k(i6>thlRy
zqFV(t#KBgC5J784)a}0QDePuP00s5NdLLg~nDB62=w(B^s#tzZQ=*A7FJ(@fnu$Ja
z%C>QfuvI0guCq7NlO{tKC9te;h@gdWWo>2CPF18lQp<wGBs}|Xikw)aC&V||eiPIb
z2G~p&|472ho1t_`7R?4F_*5Ce4*(9UMYo2AZXjRv4-<P=Dt1Z~fM<0<90}mrf<XY;
z%c2_NE1OtePDJ!bG_o|6wGYRp2}YSxfKbuaI8A{9jg2pG?qdP%Spxj&_6LLRM)GW+
z_y6064B0;-cFnzKzy!RaxyTq_jPRw@Go9pEV2~`*s~+)=E&PcZIYuTLT({w7$<GP>
ziJm2+6qo_ywKy9YHquv-901usFwvM&6RYS18o0Yfe@WF;1hRk*hMfN!QnX^Zxdu)V
z%N4W}`4L!c-_F*&fFdJyq)ryHt^1I-?6<sXPplVG*_e`wUjZ$s&lLbq&h9Oe7)SUs
zZo;)6t{G&_B_so7S=Tl>MHKiwY3TK3MS5KI$Pt+U3BgK|a<R7Jc^wM<^mShfy{^Pg
zbgShkt=VO<&v$frW&ScxPt=D74a)C(=|9suFe+(PIdf6q$!JI3ZA;OHbGF*veN`SM
zuE~^e9fpTxweg{UI|@%G{-(wtb3L`~|7wKbaX(HovBv7B2;{m0MMh2Q82<_UgO+A)
zbG)>9Y-?uFNahD!js28G%JSD@&E{sm%#D+q39h$6iys}a35DmN6p2OnV=-&$50nPz
z{WQBVK~}h*AF0@X5^bya5%bTrt1`}W#)zZ~_gYJ0jZV6kAsc1Z&*&AWUzT5>XvBjt
z!6|y^@0DWgOy+o9F>+u7y!AwsZ>t9JOm(639SL$i@Z_#8U|DJ%d+7~Q0&f&aZow7h
z;I<16kMQ#bS9{hI>CQ4HGGNU{EIrJ?mjT?;ikTzInQY31kWf=xvA<EAKdTP$V3FiY
z6ROKdVn{+qS`2Bgtzy(un9YRw&zNxf9|xA%+b_~P=xG7gd~b(FteBrbB~d0H492gN
ztMhEfis{G)1PQ%<s^@x*{)UEdKvfyG;|mpA^uAoVG?^Kp=ZdgLvepd8iqJkMND_HZ
zYC5$RnMtUer?B9ef*X;$;AHylWN;9-6*k&V6BbJD-?M*3p|0#xDLX|$dFLIL9OzQ%
zQj6^REUs3P02@+y-se8Miw9W?4`b!6?+ekKm`XFZhVpMA&}Ys?J!e()<Dcsmd)th-
zFwYMKLDKmLuq3Jf26<5tV09UC5{BgCLsNK2KjoOP%{rZ|98Ro1?;^4pIRDedxWlcp
z)zf6mLn}zB7-!PY4kLVhecVx(2Z)jYPaKp9vCDIvN=^^xH@D}7;Z3<CS-3H}f`NSR
zQ;3ICnQBBJ{kQ02^YI%$hC9?3d!L|MxwlS})<E&ogN7f25^Z;HsNdoh_zk}q)0gwL
ziSR*y=vI~hz8eC|E#5<LGib-OTMtFEM$AP!pC&jp0U^w{_9=PyHvAoQLALSm0jTZr
ziO8&U->@oejV$EF=80(v=?-E+$H5FDBPb;x2rsl_<Nqk^tNvJ^xedpZs`%G<3=Il0
z6Vv}?9$g$2Jiuxu5L%vID^dr`d47!xZL~YL9n$z3DYeDt>P_v+c&`+L3=qoYT(JKj
zroEvV{3JH=HTda=bvOXbLO{sGWJUob#J^8urCCG(zF~=*XDEkvL`>Qz9LXVN#d{&h
zKhgFdFNe`jeBr(0{d@HG>Qs#$sDk8!JmMA=q;#iSY5k{IyfxzDJ8n~XN1zxqwNVv;
zHTfoEWQZQ-S_l_I<`FGS8V&)pD9V6Wx~a)(siFX}xAj5~!wfC@qBcF#XhfRZ%HZK?
z6&hKox99H;%^Yhvts4ElMSJII{lMR^qxL@et21_djaM%IFJp@Y!%SG!R%N(x2d+th
z=W8gus;^>JFU<qK%9)ZMsS`_zl}5FKZR0d;Uw0*?v(QSHN1A=La09UH%dQllOgzgp
z;nPUHdI0la|AYY}93u4E6$1C{xGkrw4?qOMYui7`1%zZ(N4RD!=Zj-HKD&%pId-j$
zVbTb9qpNSavslT&v%jBY^8Mav8}>6%{Nau7ED$oDHZwcTyvMeu*)LhlG!B{fxEh)>
zOxb!5;hD+j5<!e;qa$F65f;FcMO+$R(ae&x!V)jdx(&Xh^*GZG7+TcGQ#5To*Pwu+
zO%D-hABPX$&AGy1Diq;I5f<2A4v$xLDKo0J^kuWhC2O}vWLs|J7S_MGkfZIX9&hX9
zr<Wj6{Zg=mtr~2Lf^#P+zJvo~Iz&A64(@fc|7X*!C)@0sLAHBk1Y6PLiNck)lNNNB
z9ZeB?oRb33oJ^PmI=LT!Id&2yc1iI<A~q+sb;H_HLSEY92qZ_)pk~m%6S=hs=3S(4
zk9t8M8^ut;?+19*Z^=zaj~)0n*xbe5k~H7b8YFbdzl$2UhPgovu!b;9nHGzojWLIy
zY~FF$bWxCQ!Bc81q<o*1DQps8#{8EiUK-9^x<80T$z7G<*52g)Dm=tn{FaGc-`q0-
z2hLJgCw+sb^^WPHR~Nz#isw#giD8-K(dnSGVoJ%4n7dp}VReZd6XoW!no}UBT1$^r
zbxC@Id(W-C&09svdOSJRd+?4+7%aXkpvDd00Q4}52|_a58e)PhQ7#2r_au%M^kj)T
zb*0$-=BZktEE^UbCTajowZ^w1?LeqdDt==-(}bSbokaCbV-CIhLxQ_#<X<fWaZRwM
zqr+0lP-4pX0~xe)cWgP!=Q@v5Aa%f-V-+wR?15xhiTBd)TA{Y!cPyXrt#F`zmeWVH
zP9QFq5v!4Q4EZBY#E;9sXleY3^9}%Sc4N;F0?PAv94)pBXkL)$v@*`j(b={gkS|ln
z05HOV34XbcSC2_Nw~R600oj^4`hl@ASHFIkW<)7dZhU!&L5Q&sfMKSePbtEsOcHn^
zv^twE0;P?mf-@Cc?Ze0e-tDZ}E&;1s7>??E)~aem6q0YWAv0?xj~N`ago_EWh@@da
z62LcNiX>MKq$Vt`MSw3_Ch?Xg2^cS~&o3(oqlsShP+cN{&<#<H)H)rN9U1GKTWEV2
zCT3)<AhH4pz^67JxaM=vVc>m@E#4fzSy&a!CdFTvYLXU#%y6n<bpdhL1cLIjPrCgm
z434A8+DRiW#EOLm1T8okvTFYQHqSGcb-k%08Ky;)lskL}uz|Ocf8CSjfkWw<Ig`8R
zazx1yqbT5c6Jz(F(s;3Bf^O0r<P(n&1(yx}BQoHSDMR@F-#2oNtAZ**r9Jo|=cW*O
z1d1@LIZ^qBGGaV%89pM>T_F293WyG>L0Yx|>9rXw-2p@alI$gEUqDf*gTf(<4#*Dx
zz}4gP0*5KDDM;68`>6Si2-+-jX$FWSjk_@5({<8Z&|${7s&WK=5|(XDm2&OJP7JkK
z)Y{|Zet%)a49zVQ2lQCclTd&Ivc222%)rXQ%1x5(QU2-aP7+kT+G-Q5>TS`$Z?6Gs
zsZS%V)YUsx7$b(UCE1_b{if*1@{N-!-Jyw$lyhlsBY;hdK>5o|7QQM1O-1?3gI{Pu
zO?n#mGqvpr0RI3Y?wRJ6QKA4e(X37h^-cZWZ3J@czMh5j?Wup$1kF5~wHbkB-%>6$
z^hFY9@eIW?oPhF$5nxRMOzuQ*;HE$(8cC+$$|8V46kwxT-M=Eep2bQDTJ+btAfzaL
zte@53V0GtyJim)g5u1-Yg}CwVs_#Er=M{|>hwv|T4nHPK%O<#+9f*(0jSo4-vN=3o
ztRGeY7{--vIy8QvpA)0>G99nwxU}BW7AZ%5&AGK#HCx^}8%KJQ{B7ZJ;>s(o0=nf`
z9Td`J$iaYPKi;l6ZS?kyFAG_UZL*^VaanTxc@twMnoK!}yzb40hD}1kU&|1(nhcMH
zV0TBoQ9!^MgWUNt3eXV907pQ$zhEXq7YrRYf9bd{%RM6PZl$F2<AV^W*UNXSusf;1
zFoKx=R6Jc3ai0L)1LAm+>$##&Ttu;H$?d^8`h#+=EYd(hA)Nr}D3w|AkDU|)<znv1
zJ2y;Kb`w@#XF$}@e1GfxYjQfoIRNQBYz%#*)G`<I0sT^T`ln;Pt$fS_iQfZ}5GgLx
zP)dW47q4}*5tMes8FL^GC0U63Rxk1^zBD_k4d(gnDuDx-p5+JDE4j4}%zgE~7N&Em
zjyyq@41_{tSVG)YeiVtNvm3ymUjLclWY{~NyJVzZm^Auk6J7p~Fqt|92&vu*CQU;G
z(r*GAG_Y~I8!y0Ecxz&(-p!0(hcM^r-%TmPWAbr=)m7<Fbid#TaICfzql-1?Q!l6j
z{o>iYllJyG#s}e0ey2H&VsQu6ceQ<O0S+Rvx2Upd{_!&!l&*KVu_619-zQzu*&k21
zV-eUh<#>V;Hvs6<`FX4E#L_r&O=qljx2d~h8Uc`OKtfZRPL>OuBe9l5c^b%<f11pl
z?bpZVY5N^Y-WRy>pEAFF2AT>f4?!#Bd%HJxPglq2)^X2wm9*R@0W@AV<}%1^vdna)
zhI;>qU7$+eY5iSE6;%dq9yRiI`9@q{nkb^(Kln79RJ}f9PQRTIW%=?UoJIAG_kju!
z5ESq@x5DlO;wQs~Fd_PD5KsZ%-CAGr$36y$J*m%FVDdN<rXC-LU3ArPQ2`K)f?p!U
z<-o<gMce$%k9e*yW=;-#TXp{6H`ozBgazu!1lR~1z!a0xH$98OCX52UDR~B$c;KF`
zxjFlOe+Gw9$Ct6Me~%Dl_>!KY5COsT)BK3>f5HN@Xnh6!sq)#r9(%lg?{TY82*_1I
z^eVpPj}}Vg()8m#4z`$%Wk$pOM$W@Qu%94HIX^h>6#)5^dLFLKqo?K8bzViXN3GHF
zK$wps{|%3Xb2HRv+g8$JONXKtaM0JBu%&2&`wld6j;{@6TEQ`T12Yx*{&31GH2yCP
z>>P|1JpcKytJ1$8^dPk_JeS`(MXv)oAsrdSCB_J1YPiK0+hUQtrSTES>L2DD`&MaU
zvMkBFs)xyS9d}!W%5G~i9D%3}>hhd0m?x#c17q!Of7h1EPefk*J#T$03DpQHHd&xe
zEhX9qn;?VR*S=AS+1^M^@?1%xICL?8xv4=_Sc-!H5c$$fQh|NN&$jfEh1r<2U22N=
zM1!P8@V!)sl4SwOcI=EB1ZAuGDg=C<Q_xkboz74~syT|`7b*~<0UN=ej`-yN<dsYJ
zD})2?CTZmsO_@&7K?a;MUk*f3-xs5%R5R0*5_i6qNq2o?=ap>y<D)i)BnGcY9`b;f
z7{TD-)8}Sf+Ds;>0Jg@!W`Eyu+ul+lK=STT4t*gnF4FM--$C-@ghZ}Jk<8uU=q4cu
zP$ZayXoktJj|3TP9^~q|6wu+aQ>wj>t>W7%?+U2{fc_7CT&FGtgqr`7&>|IzDMIha
z-!UHA-1+yQw`MT*d+p~6Lu#q62^Wi;vAS^<qx*)6h0Q_DS-o})hn=0NWah75w)eA9
zpdVG$o{zT*`*R0bZOeb`I(6CqWXIuqf^3Z@b7I|qh1E|7n<_?GA~_V_g^hoQUYqOY
z?;5L1Ur?lg50Ewl1A80M29J;)>9N&#OWnkgdJ1;-bFJy>Tyo@ae|xj;s_0f-plsDZ
z)Mz@%;Lkaw4$DODt(QOBkmy5N1-BJb`__!d-@)m>yA{}Co~XYVX+ZP?&${e}TgeO$
z6w9VG2^cOhOtL9N`m?8Y=bkX2uK1lxO)#2)IT;`>KN<y>?<i5rdOnIk6(XR;$uBOb
zr`@q1S=OKI;F~;uPs`;jSQR*6geVU~wQ1v77;+t#6M}FPhJ0JsjGHn>5uE<&V~o9y
z?pqP{ljrx|WaAd2UVxznX*K>{k_uouFoQv7Krqx!+KvIm39%n?_u(3$F#ulUoc&Nc
z+oai|{Zd2u+amSX&tR<Mc%a=2sYL-$2rOKcYZ{g22HjV1v32a@P5%~Tnc@*RfWn;w
z3x)l>npTr6(@qN%e~S;J7Do@<CfTa#1Q;oHp0X~&I?t){Z=G@zUJG>L1cSzkH@EUg
z+)f$a?(JNQ5D71y`-)<eX9$UT)8Se0^68r^m?FVttKNz4&H3X2@Bc<SpqS}Hsx=l8
za|Da?tYZx=#2`I_?^Ho1UnAsZ*#uV%E14vCq`FqDPGC~zVU2&}Nkz#A*F{xCyY4jQ
zS0(N0YBcT6E1jZUodtLobNqfUo26>_j4vSH?O#M7<=p<DwoU3eMuL*}EicH^8HOZ*
zEUT96ciP2~`=pCAB1MI|K|CS!O3_ZiJ`|0L6iTp2pD7>vu0&#3{+(?CpE%H4k{cGM
z&9G!Ww{eGozQc(T&nz$H%gR~WBgh}5_?xTNchy)of0EwkhQ@-ct4pYq(1;Sb=og48
z4P5@GjpEa6aLX%_NaTlX4!Zo-dp$%qj;RY%ygtiWH=G8&(1Tl6yDAH*`UxVA1<#3#
zlW)i}U5nl%UE<mp*2mh9c8v7Ht$Z`fCON`V!HEeDy|gIRY73Zay%l2#uxt&npTYx=
zCOgb{=M0LDWA*OAUY73$`-fX$J#*`_@Z+b+>+%l^5<qVPiqblgs&-w34_Ec;L=HY$
zTaK*P&Mm^{3yUap2TFd5K8Nf{L+k)${zL%Kn#BJBeJWqLvMo@>R?eNP=}RhwAkVC#
zehrrR&DXIf;o)ZTzd~iKMSRrSw!x>G6@F7bZ4BoNQ+L)a*~88ocK7yfJ9HA;@l0?X
z>Oc9#GRbXZMK_<dX`8vpWau?{Z4N^7Rk!a@J+;R4vc9t<r{DMZB3UA8iz74A4EUm$
zh=3+i7c>a5GUW<q19fK3M_9k2c`IbD!L#Lc^z}WXo8s}%O9`p<Sxs<aX%$co!)zQ*
z7?A4{qlru)m(`|ZSn)NPWt4b+@A~^guEX)Cdcz=~xg?4G0U<01Vu6g-=qr)tfx|wb
z6Z%~d^l<p824+LNlYBDf3Ay%j3DQp;8y8W5#Z7rg1j=XI_8m?zHCw+-JLHZ;f`Pmi
zd5)87&ZShUw&hQR5FxnRvk{lyv&U-4qWS#R(=>w0HHYo=(TiuxfK2NZQ*ebVWF1py
z-=k~bMTK`#_c<X->Ybft6`~CR7jQ_0-TrdE3~f5L(cm@%@qGm{A|7<O#k94&km_%a
zNPSh}c#GSYMns0m&c^xOXjQ5$(^rp6Mvv@>zjI((_G&0B+$8KzE&$Yo?<k+s^}A3l
zlJ5qr&r`OCWM{Q$iE<q6*TOC8;R5&*q(s3iT7Lz#5tJVSw)j*GH_b<(;i=M9F-lU#
z;`!gke$nfL6~~S1Jia*L;K(6AeZDgwiO`-Ry)r|vdW)RsHL$jVzu>rmKH1ul*3lpR
zoLkhLAK&~Mg4YThIHui@GU_|6vC5p~OIA$o{~iAMJy9_*p=5^Co{j!S?Li0I&Det=
zoDaS=@_|@IR7R_VUvD|yZ{2>H1n8(*-m`1MRqdo-tnqj%S6D^5({a>9d4CF;YT-ui
zk@YNp4ddNL_3(5*@`FBMem**6jtVAAw=B-y6?RR-4Q$Oz&KoVHHE#GJr0V2X#)u+*
z{7f%EXfYeb^J`vd@k#-iz-7zQVL=ze1resKxq;n+94gj%*D8p3gED?4N+$(r*M!lU
zy28yaO_m~bxj698F*gLCsI&DXx?Js#R6oXixc3gCuLd3GWC5tz%ix)=fVVqN^Cb3u
zIX_fc&vytCI&S|s$#5(oM41+qt(V>}wn;XSgzZWU0=J%e&`?5bsEH^DuqhZ%Qht{}
zsCcWKoi+ph`dzf8UQo15{zbO!&40Aj2L@^2VDOKn@KL;p8XLpsON54g7zThD?Jo5#
z7;8I>oJj=xcB%=lm!`cW`7PHg?S7pIlTpDVXA({o#1APT#fd^(ik6aLWvEDd2?UJ^
zEAy9cBQM@eq4)SdGx>3*rJwW78=&3O+?pG&GkidsJ^m*;1VoLMjHnX>NMzR#o4S8d
zeA+c*BcT#X=SEc%wgvt0lmWfvx}SI9x6gdI*~Z(lLVGw->Et>H{Fe>#Yj>B&iI$x&
z<;VK2xn@5wyPnUE?|DuZoO^QM?)(G3s{Q3@gwX@aeyD%I>ytwc(%-R7xRLTuDh4E4
zb1QQ%7wI$5w_>iQhW#w%57~S>ZH_8#6&iSpeIB-1w=uT~@wObH5#FL)&21+vPgM<Y
zBwBNL;Fw)3sh}KiL(a^?2f`pb(K%!^z+_!F_RhLQ9@oN7@bcr>a&4*cH35-isA|bG
z|Ak`Dl`o1@@PvM^*8ipS|K<5PJke<TGHdUDxfzCkOd<8gHfDnYS_ro~OnywleKiQh
z?w+Z(&7DLBbQvv~8P<P}_g(4sm-aTKO4l!~fnIlGcm6bM`F#^V50xk?(iRe+G)CYp
ztej#dkpj$p)FdHLw?ZuD$d4SH?7*eBWVLWR1ysG)dMP}Gf92(Zw*;H5XKG`(&+YSx
zcYH&FE3KQ7p5y<1=X}dGAgE6@O33>EW?i?}nO3chSIkb6z0<hVxnr@r?LZ+Jj+(dO
zG`Dfbiyz0_`YvGJ7Og{gEQ-o11O&+#Mbw!8ITZcHBTBnLt?ZemM4C%A>*m+I2wT(k
zAwo%U!`mKFdhOS5h0VlF@m$M^lT?9x^rj5$9iQVoShRXs7{f+d@F|+H>Nx&0OhBdl
z^;@GrtbQ?pTijQ2#fr0cdQ~aAGCN`}{{78AcRFHUO|G3LBOx_BaHgj3-GHEZPHHI3
z2L;g(3T*pkbes7A|8YtGS&I#GSLl5<C1<^Rx8&CAxN&H=89c#r6La$e9J#eklw+)4
z*ZZLF8|(WmYR1I`=Iokwmdwm^R2a34z>Xi=HuID-=CI|t%W}UQcuaN4B{FQU>ev&@
z_BR?#myp<g7rXDKHEB9YzFMKx44$6Q__h8C6xpsllc}ko9Y(2`v#FPV_~l;LE(w=d
zPjS{^+eU>ctJe^Nz9H2EO#TNfg-7PL9N>zU6mX3UQ|po#wzznY;hBe~dJN0+Lu>kD
zn7q6a!rPO+Feo3sChKf?4ny4<el9N#WZq=i)rUJlh!78OfXep+FRJ+9XJ9l(&z;Y*
zck2toWOeBE+x1`$wyFqmg)<igkAY+-AzIxtRuHkDX{4|E)q`z1$=2dshB5aDbl*(Z
zm($ret9Y22O|+fzIf30j^xCa;vn=49HCBs(EMcuNEqeP7Hzj5D-}z7eH6`J&d&+W3
zEn3gBZxpJ&*h5jP8WgNuzOnlvz}JFbCU*uW+C)oBd7VXuOkG})mU$$u+B|Fg(v2LI
z)g*<WePzrnbj(m{Ae#+>PCH0~XE_)qG1%&(CUP#APCwr!f%MF>gy1Z+zkOlmeJ7IJ
zs?=AXGRy;{UGUclsM-B}V?{6l05anT49Mc_M0>pz^G4Drs3<+5CRBvPXzt7x3d{-@
zM$*)L?zcw^;|i6*`VL9=KI&7lj4vF4v|P_3i;KI^tb-NB2a1i4)tW8h)Rl{N%G|4f
zwaxggL7dyd=OpMB&>bTQ1Uyn`XgOOJYTzZm-kwFtwvNgeM`c)mfe93kg&rZ%j(di^
z9j114j`K4F47SfEq%01Ndu@8UY&nMVNm87&`7&W%^O<g3s8G3UI}vCokWWXYInF2(
zz$N!ANhDPj;uulV5dtc^i@r?FJ+9SU{4_)Bo5?WP*4d;EFg7yJox-D(`1VbF#)^k|
z9nnPvw<Rb{r&gE(=!%4Yn~6eD&VM`Kz&G18*PEouP|Znzfu0fXZmq#@An&WMXV7Qh
z+!H+`OD|kr#V|mydINB*WSqyzn&4iG4P&r+8Hrozv3NEwKA9W{|2O8U`-7fgh;0``
zOrk;{-;7Y?Mb0k{y9kAea#d0JSzlkHG@?ZXy=xhQAom6OJ+a%H%`#48SZNW?A5ehc
z12{A+j~Z7TqBUQim{F4rwEtGw$CPVhw*1QOi5GY;!{jxFs%Py3rtpWHhx%kcP66yL
zOj{fo{ng@PL-hm4+Ac@pb!=*eWkgNbqzd@_f4+IHD6FjL<Cm;6XO+WepL~??bI|rq
zcv4W`>{_~c@tyGawR(rv7ACIe_h)wY1orkcRcf8HV$<kZMM5l-i^^aPxk-(XuxAu_
z>_O<SRBr8$$+qC>ipd&%52Gg0-{Lb;ftTNETq;=M9PABWf(2+fJ0`>+s*;@ms3EAB
z>%NX5X9Y1qZ1RdZY&WqF2&u(%biD*aIAAA&_iikig~i7yPUBj}Uu!&S>?Fn_PjJqW
zDH5uK#qY`lEV3?BqHljL5V6nv1p1gO-U&1_pbQCSKcT)NgBv=02ZIW5ISKS?|72vM
zX3~wu!y^E>>qfRs6~L0%fsHsvq@a`vEtw4g32V>BeTlZ58@yHP*b%a_<NigTMKqNs
zO{1nkg`4xh8aXNeq5)Iy8MLzn`IL_L?PD8ay|!FjOHPSsy$ZHw1~(Uy82L5g?Byoy
z$P**~#g|2;Mu9MTAu#>rVt~|ImeI6hVI+0*+y)KPz_K*Gpp>F7uhwo-HH2if3Zz6?
z02ea;Af`FAnRYlG_k5auSP$aD*8|{3qE<l$cM(D3tk|OD0s)0ad5l(z6967GCy~i5
z;)RSEnTC57)t7mBA#k!Ysy>Y{7EBq?t{Mik6+=Yz5a{F@P_V(}#m)_4E+BE=J6nGR
ztnm?9D`#Z%-$&RW4@1F4sBS7_+<~03e76sAJdj9IwjkHSEo52d2*YljNeG;p*bG|q
zR60Xy$cdPi3KNCQQr1u{Et~Y8dS!k*9o~<jessplv9==`?X`;<{j4X{$6%8cVtK%x
zC{uxe`>V~jgQ6QD?1DyrFIJXsw6`UWd*`=#)<n7+oeJroq1*cEx6|XC^lVcdx^q85
z`M4a7^)=f%VD(itq1_mAuVdZ9q*Q4|TQN^ByZ*|!T~FGRb*KZfjrfDwvUfGVpajE{
z@rMB|Fo0YLWqbjEfHxXWXO?JwOa*;NFLz8@T<9(t0&6{X-1tG1P;o9PAWfmYl6M}^
zAWN{vSf$(=jm6}N5_99Fv58CDnv36BcTA(AuR(d1n}@j^>OzaIPwK-_o=3tOQ8Pe`
zDlUp2@HV)OPYk7AFESLz#=-kDlH0PLWbAwA_4JdZ7%bgdzeOiTblFFIRD4q931WVU
zpT1(NS=Ap54d^u7N%3P?7y|6LiHHkso79>`PPMwGNcr7KjGZZJo+;<DJ8~v7C<EdZ
zx;0n!42%ehOQS;gD&Z8_MtTQQG%0@4UuRpRsOWR{ImBNI?E8%qhte!FZ$2fA5{-bC
z=)w_-KK$Aq--hp$j6mMAMVYeoM6kDO3UWt~JMMrAKo%erS1iBu8d(~~Q##F^z~7Bi
z@n+qGZ5wlB>_}s&1TQxYaE5E99s;t)d~xk5K6HvJSC{*G2Av$2D2%trM0%Y?8UxR1
z#PK-w!j__%S-WA}iadg!f?UjTNK#yjq#gtt@jjJA@Xz<X>iaOz`*@y5lk0^l$V{|K
zRAep5&vo?N4qTq`Vp~$625>E*pm^=LwUbE?<89iJX4TE0Gx8%??ZHr(QNRb}``?o!
zijkUUVzjaE-1Qvs+jaM6w!#k#Nl6fG?c_<CS8W(@k$-Ba8>8-V9Zj)QszT?IL_rOT
zvG=`3GYf8n;+xMYet5?K{&;{;Mf_F--?97XEWb%dyY97fimguH5$IZ2@!#*P=Php7
z2HNwY7$6am5Fr38B2KkDuRmMm&VEAxSQK+NC`U(3h=39$a=}fAU2t83O<xNI9U}vg
z^?xvu(zMMZ<$4DH_T_9kZ82%|1$Xxd(9;KWMN4lZ5*tmM%Ah;ym|-uhLTD@#7M&i}
zPCoGVw&b8@s&7qkbc{9c6I<IL0--;If*gO~yA@DE<M(@&ES!;FIYaNPJfP8u7<j7J
zA4%&jAcOw03jzH*cm%Eoo5&O2<E5)d-^ks>gv|e?Hb4_I*c%}i4NgLapM<p<?tN@q
zNlkP)zcq>WO+KQSeKDS<04J8LYKx{Po?I&#WyF^JP6U+&eNvU0ixwLlxMY<O%bOq|
z;s+Ax4>*=Lb)lZ6ffB~TE8h=%Ho%L}D;jMf?xf0W0;(xld&;{AeJ>x>_1i|rtbsGc
zOHa(caLT9jG&q`YLNB^67&FdW2m65azCw1%PclOw3reiWA{>9-gsw@r{IgIG<q0Is
z8!mPY;Z~JIUi<EE;tFYIqCG*j?uZOfXoQh6Q1Io=ifMs38|9Vq&K{atr60p-0b5$%
zIJA4Kh>m5+DoGI2YcFN`tB4H3dAJ4yOSx~j5XWlVT8J<gmr~Pu)(qof*Z=8><DXk4
zAPvq3E)1Hvvm{_2EQP`m0PuK;WjZo`T)D&feM*ZHk^w!3QVkHGlCRv&%DDuZGa7_Q
zD6vy`)9FrojKXb(eVUB%InF<|o_LD3N^Z_eF+~v$uf|t@PW+*VpYsM8rQ+c4gu&b5
zc-OO%7{7g@R*MtK0DD!&t_uJrc^O_B2$aqFVXup}sjsul`Vw;1axFw-%_KfRE+0}V
z{sEsLHk35b1k%O|2AC~?L*~NqM}%;=T|-Y%N@M45{h6Qrim2~fuch(Uh}X12l#Qqg
zN2c$xNSP#jF~Q~gXO3b(bW+N!SFDTS;=)v~VBEMb9ux&lHjLy|JK?h6(yQ;hu%lwO
zz~_4H#|MclD<>f_>cr;xOx%OWj?XfxBm7IT$bFO2VQE3BjIQSNe)eL3iSvq(37~b<
z4L2;*&DBaRvedAYjXR%d#HBk}ds&viLI&JI#GT3GLPHLOGEtz-iROC~S}`6(tSSX|
zY#`co>+vdSSSFhCkCbC5CUh}=ti&_9{!<Mu1y=em1xI)`)7<ZVpJ^DUmj8OL=wv;-
zW$SG{VC&6OC!S}}nyiG%vg{yGrMI(o!Z0*MRwkAJH%kRmM#KQ<_;fV8arm})t+Nfk
zGsJ@ZgPcsMJQY3bFDK4b*2$hxfxVUB$ih$X{V2!P*jA;uAIw2G;aWTa*S;m75CnNe
z7h)~3Q}*QMq+HEJ5&^Lh0N}}<zE$>0#j~K<bo*q$c!>~{%!PQ&5AzcZbtvq8+H6vZ
zed>Fql^Lc)%FCt9fPOPT*A|aBK$yJj9=<{`7p2@r6Pn$&4n9gzb<mYaTWyB(Kd(g~
zRCCn&vy#Qm7p|vi6Ucqsw$z{pcNm?#lTZMz90RpMN(Uo_sXU)&ZkMI@{2E+G@R_8w
z;48LPP!!GP*TQF@ec$C$I10P3N3Z))<f7&O;DLw$USD63pl@~KX^)E<$zC{vfX$-c
z_!VHcILLWSf`V%aBfVtmT4?)9s5G9d#V-07Gba2OZVWbBmp@!gdTqyQ;pUpqL;A8l
zE?&Kn8<?KPBXw@fyPB7pfBd=r#fW^!-N<?-syla>b(QD5(~tZYu^UJEta><`>!m_Q
zEeFy(FegWXSppip>HcfeWMiBg4P=i;?4ywFXqNN;1XR@ZGQ4(_h_82);}k25?dcwB
zNJCQzNCB~kRFo8v0vM4*mq^E}n($hK7K$%1ev(B$)siwS|Lf;`C0^5WQ!!IzFZ^UM
zh;|b={O=$3ieaeM>JAdAQ2yt`Poh?S!}l<@nakkB5!&C=Mum#c>LI+F=hwY5L*Ov3
zD;Vs4*Yhk1^okO19KA+&yE+K$BJenil+IqDhIgN<XRmI2-ZCggi5J$#`c?T9kFyE4
zNoRg|&gZdu^h<MKGEgUEvBW8h7Y>S%1aSWziYkm-!S|t3;Y__C$b8L{0g*UDs<*%^
zemd)OcSYuJa)<_PbSM00%-&?z#(|Izpr>@M(ei2jYvaXM!$vhDR&65<7$`u6JB;G^
zWj(;7+Jr!C0)P*xt*S6OWAyGlHPh4zy5+1(m>7m}uo))4VdEEX(EKbJ76KnIKuJR|
zEYdGlf%2B7pF+R|fCT_X_&ZQW6WQ2)7|f<>Otjz>%hG#c3mH&>k^_@n-ha#E+mT8S
zke}(SRuBiff&M&@wD%SmK$LErNM>w0%P+AQ1~H==QmrUVP(M!`R*lFF)FNr(wMOlt
zy{L(#WpGOPDA1=ouE}m~tCQl~@@(I5(Xv&u?>|90KRg*B*F(M%!8;F&_LH35^+SIp
zrRdn3%Rnr7cY&4LQ;PuMO35yo9Z=o~vH%fjTjPfhgOp9+DeQlkz3HT?KfJ*W0$S}X
ze=Xs}zJyD1avu?ZJ3!>48i@b+FTZS(MYN8U<ST&k-QuAF7#vZWdGnev;*sck$<Gl0
zNF-m<lmnqyp-T-4CCn6#!$$9eLH(OWrK6`G7g%Dek%bSo&@^6o$Hm)UQYIj*RGsxK
z(1|cW5bxt~OnLe`52*ieg?eP5S0Y@J@;kzh0)Hm4H0c~gK7{VECloU-=j9odCEwG2
z30`>P@aScF!5XBRJ)%mzM07%52;!L@Mr6S~(pVp=6g;4klC4w)F)w_>;c^g~#MhC_
zc7FG;cdgZf`Sd^TGrqm2puLBCV8US12~yfX35-aQvILKJrdrj5q@`bRBiXGREj3Ak
zu2y$o@m68a5P<0IXvipA(6qEzg9XEcAy7%OB+#M)Fc@qGVekw!fw@BmHoZznd7fkg
zF^nQCP2+wZ71`r3a+LHZ)0-Q+84Zak@9TPfq_(MOx!+`rDCZjl@3N^-+#C<^VqF^S
zE6@lSXfP(sEGFlx%my?gi6pG>uh<7FZx2Mn`n;!m|5-|a7#&zR22TVT|K25AkOL4!
z=r87<vTR*QYvk$+s>4>WqZZ6rNbcDEpFGNGY=}&*>RC>H=EL8-w03WH&R9T1kavTC
zp&Pi#k5w3;<>nn@)j*uf>kTknl<{~T*i)dO{wzhqrnd<^+{M|>(IKa|7#J#0&R_Zv
zx~deWo#iySFu=L~@P`hH>EaAbJnO#x#b$`!K6!bo8rPW9?6)QKYc=Os_Sj-)jWv7z
z4*d$qYC#X_<yc111;dbl`&obb(b1may=*qH=v2-bfxG(C#bpNBd}<52Sq>hNnCqwb
z{jd4m;a<c5wr{ma2f%K~IQUQdhZq<p)&hom09sYFYvgkGoq}<Qk4)T!zErkT?aB?v
z9MZFlCX`Uuh_as6)@p5U8QA=aEjCVQ;#(lI*6ca8U)p0R9W~<OHeBh2^hyo3#qGpO
zZ84<_F}^U`D-Vl`#86WWE&axFF4$23X6$msdBxHbr&M_ilVbK;TJQ~lqNHB8*hoo2
z5=F=I?HyBlsm5gZ?u0|kob3HRyn(=oef$-;LUO|ciFb{C>n3YYSc2^%v3Q{;BxhIX
z@+D-|)`#9^y8y!mozVZ(iQHe>llqT{W0BXwut%6E16+PWMeBY(0HDntFAA6W`A*su
z)KPfW!kMFcpGdB?l6yZE{_V?_B@TeycU^apLBb@0LJZWF3CrPl<d9=<*?4!9S852=
z<5rS`s4x&L`Mqa5e>&MOafJuCYMv&6m7jJkHZqZTL-2FnqciJ)>~?=VfhGi>2IL+F
zXhuz*&8HDaJS*^p{wNUrwo?u@m;74Iu_YUH+}y_gLQs|yV}5c1b`OZ_01SDhPuOsp
ze?UW=O8^@k1Nc=-H#7Ltg{R(>1clUYNttK?Uwg$b!gr3e1pC?TZE_R+Ur$#<vb$?8
z+jF2zOcG{i6B9M!->_V5@Ka8JXk=i*wm2}?fer{7opwMr9tt|F$M#0IF7U34B;SR9
z-L`21?i=fFU<#`<w!h)ZbE&eVebkb&M(zKWC4VS4&snK7BDN%D75|nJifYIkabaFz
ze=D7ujnxTy=Xr2j3j5pdmw-47eQK%W1x~fh&2ZM^lGkI^sX9sY&e;8Ph1}#-maBMF
z+cED-xKr6KtrURm8Qh28U5HEkicR|7E@gKs_~1E$i$%WfFNj|5M?%ucEWT6th^R6~
zD2J^u^bxwIgnNe}!X%S)8;22D`ySWdnZ4+DqB6QoAD2rpbw@Up3uI9-fFm@Qv89Sj
z>qZ9_dw`+j?1L4PkOKe^HF%m6I~d=>e6HwA%ltH*&zWOc>a)2LnlZ$N@sxS?34V>3
z#$^b)jPUiOK?V>7oE9Kf66BQle#$mnIuBiAd*pT?QULqVe(n1lOT?3wI;AsArHQ~K
zyf1Tppd3{qqko4XAiIo`t<Q#!h-MqcHhQ_@_y&_EI3sj1P+#*}GmJ3k|9Xbiak)rK
z&9y`J-?h2LKxb0{Er{KKVQ_&7viKs_D_HNqETrR#CvR8#oR{uSH$ekS@oehI3*ovP
zIxsL5s2V@P1v{R2yI!qH*RH8PIIOpaaANH3JlHG`c6}x$9`&QXERUBDbX~#PfLyo_
z^ysm#j@vFHMGqu8`bUBgO#WLw5Q&0az%lH_ClMgJN-QBV)k*m3?fY;2hbVte086+d
zk!1_RanawlYL)(>*Bl)h)R)*&#nDKpbUfX@SB@_SX7rZgMr4YCPDgctwxTW^qg7Mj
zN-B~FGX0F5D=dl2{<WSxX6gIsnRbf6WB9dWym`6xmnOc2b1@@xMzzNx$kMXS#jXDo
zcUJWas^^^=00x^++8V%WG$1@q8ji9{3sJE(RI1A}UDau)36;ikkIy@wK5a(5tuO%v
z8quVyko8aeJpX1K3Pu?~vm%u|PH_*5HkFg9+{i#LX!?qfYjJ7ZZsSMnx&591mL!y`
zS$`edG_0lW*qt5iFxBLUhEFez?00URws5bCg5Eb$wSszY&7+}vAuC_e2C63qz+tNJ
z1`s?-lv376pb7{u)TduM)VPYJQ#oR-?d0kYU@TrSo(-6VzGkQci9g$<K$K-Z=sy)!
za&~r;Zk+mp?kNvdA4)<Px>13Uuzc=60c12Dx?Rr2PXFOdAL*UGQ&*RmezYzP{S>jm
z4)3wtzq}+?F&_MA^&YyKAFF3SadI)m7h4^FvW>m@+-fLQjaM^q;Qar6n{(~DzB!O>
zn)XhZ(k=UJ<uvhJ%<Ru5L!Qd-WPB4u5S5*Q-w@FXXJWyYU>UdK&^JQ9D<j2h?(^L_
z(Mbc7eX+)?WRNEBMucmKz{p_#nvVVuzF$@N^RR>?!WL3)dtG4&U=~tz#)qY33-lqf
zLs5Da6<+0xjiXbxmdDTJUa_Q@Y4fSytS>N4tKRNOl$#w2wT^&A%!IVQAAnXHx$J!z
zdXTpI?+T3~CIwr_pW|^eODpO6%Z(G-ozCGCd?nZxR-PU6$%>LbdwYs0+QobP=uO@1
zmeJ^_JLhS^`yoqZm2B~#6<<*p6yx`39AtfsSsRDyvUEK7Ns(;?wmG7mLckwWuj7Yb
zu_EHl18?eXZ~I@oF4%0>j8>`*Y{R2|(l1xmu?+j@r#MpiIiu0=Q^Au}kCKbvK95Xk
zSx~=9ypI+s;elTg|MA5jNW@vu?{4}{>}m;`9d-SRG(@Pt8^b9VVG8<@(4ll~@kH00
za9kJJYq3zv=KP2cKqKqP*ICNT8L&>u^u|_Fi`>1E8&$3lt<hF^RJi!HOps_1_*=|y
z)xu#(pj#P_#lKs6Zvb@H-?Og}J;12vm<C|yHY`9fIy6yU#(&{tL0qI}UU4nUdQw1p
zt1UmvhQqylO)aVo8|Qs`Y8Tj*zG<BT7ixe~@XpHbIrRS335EMK?a1jb72I}bZc}40
z0@_L**DCJc9c^I^wrFTzgha_Y6x0$MXccsx?-%)@cbQw(o&5iHFgzwd+PJXvc(?*i
zRWV>%-Em$%e%pNltSue(_w1b*AO*INPVI^_B%dbBv>9$Wuu#PmWH;rA?t=@6ZmLF;
zWV_E0jrYXm*co4kCZ7_zkB)h|pIz(9pX`brnDslHIkdobIX{Se53Itv{Nw4zRx-JX
z-Cg1(QFbbwQRI6NGa5X(3z8lj3_;b<;X7F&tEqUW1aSqmj30ktGf@(bo<kn#ju=3~
zZHG_B#}Ya6H86i(PVMv$?r0i6<-t9wbDW_8`8zw`IJ{R(v_@a90b13|>PdFBgILp7
zltV+PD$0`KDHLZpll!_ZuWW_F_nCYFTl){xDM&!Qyg`SHxshF=UZ_zPT_^jx92@~o
zBBBqc%0F}-VW}MKH{9DRO#@^NA$K1*uX&GceLEeTJL&x+Qan;)zWBZyW+#2x1X8Q@
zHY^{Y1P5B8=%@0<O_n-RC2KTmr?g@p>l142&Vs8C711?y7?z|?Jh04u@Qx$8+gbX?
z@Bu>x%xE-%<kSE-d)0}w%Cx*r>B>#CieV#LeMsI91Z7{YH(hpxX-t=!=ENIL4Rs*k
z^xWn!M4S^{X>mBCqF+`K>*BZnQqm`pVbrz|DQ{_mE7ABN@}(@}g_Io+ojG!`XNAH-
zhAXTcyxfNt@mSrSg_n46ijmV~rkg{?FXy>a?JzA;Qj9v_R{~FsIfR!8W+ccJug5i+
zSd0m0K>cNTd)#4sDS;Ukoq1YK#JruFff9p@sTXp6OKh<Y)n<Umog~pC3RFcKp@_qU
z_+-Rd4>mfdxWk+Rbabw7rWfv=2$_9&mzOVoyiC2<{T2FYG11QVBGddLw~rJ#SRx{s
z22h#4`pRwjx0}!B(@4^Kt2SphU_DYLKR6@c<}eEG?$j+BsCC&b8rHgq-Zrky^^Kve
zQa9SLLiq=YX4Z~@he%DU7)0a}fvB3lfJ*ENsf<t7l3><fkZTM}9XS;}l~RzZI&|PV
z&FUflT+ScP-4FW;b=q!l+E`d{0;8~Uz2J%guln;KY>-JF?3glo{F>WXw$lBRmy4U@
zWMA;kXy*c*Nr){dI{K?t!jb4CN|e>26|vgIN66J-8^^pmRw!S^eYrH~T)<6d{T8R-
z__p%*m7TT<tqBfte54$<e4$ctz-_7r14k2z;U1P;ySD7dj^^juiYq3*d(9NQePb!s
zbHnfPs5b-~=Mb8JCVrPPeVLORwtY40<tVx+w%rnCIJ8J1?MMJZ_gI>~5KFxMJN^E4
zu1DSzdBphEhTtNj60gV&gO9yVIf_F3qZ#3gLPT*HR7p20-zM4&Yv+?E3u@%dmAKp9
zA6%L2A-`du!tyb`WAbm^;S31uR#>~9#-U`5@2hx73K)LOFo(|VH_IC?8n}SW&X5!R
z>V<z8^&N;Y%MI5&{f(f{-=s4B5cBCIEbh)CvR%Hv#~$3mwaELL!q8l6m-Omw1qJ%r
z2Cc6?^CqKcY8PJ^Hn7BlhXP}nNRWYiRl(T;la1f4dOk2D1)mNHBEmhi02l`<Z8qGU
z=#!dwlNWTb40yV1$OG|PqKh8l<sUOWSBlHQ2lGf))vcb7g9%O2_!nvI+&(DSKN92;
zBf&SD`1S5f7{n5uH<m@S=593^;Wdt2I8LCqH9EQF7NmQ-0-5LCDkb*Jotz{G54YvI
zcp6)}ZTW3Q@$eeEA_s1E>V|+L(zk^sXegv{<C`h%rzvYC+Dd)9^IP<|xv!b*StAFT
zIofK+g)Xdea7KE=5#F(>T!5M{{2ry2+@jYZXnn=NZ?7S1iAyLI+p7EDa?nAkYxaAg
z*{@Uh-;FimK224aWFaD#!vEY!9To@`l<?K{VzN&q<X@Lo#nRN3KWcttQ+z}MSE+fC
zC#N*`T%Kbz#LzG)_&D>i^27R|+&wu3(X;=obGJCTKQ{*d`2L;g3sp+Q-_ixGCUfn%
z($J>j>({!C0b{*z;Jh}{6NwuMy`gII(3;{$3dK+XVH~|7{_zqwXLhQE_bYmhr!H!?
z$|)&q*0O@YquU?%fxLPU^niiHb*Ne3^k~&G3vGE-o5fisb8|hg$JTubYa;u_*5JIg
z<ZM7QZ?^pBci&8i7o&|c03{*JLKLFYd(SQ7eEfpRGNLx+024N}NN|YNxu_q2iNgn@
zGTxjOFt3{^a*o@^cYva!wnkP!7-}C>%eFzspM0tM&a~MLbcDqFKtq9j=}SG0Nfl)R
z{W?;hr|;8Hrp5SLu_Pgfc^Bi9-?t)QPEd7@WO?3&jSw9BNVC$hz4I+Hg#g$fhIBwA
zL=X&@B!GYvK?Y&~Q9uyG3LAk004sA$w5^`JdE#Hc3zWT>zhQgQMK+4u<f?{8`eAL$
zP``1_lV>X5rIc(Y)KQ=dRLla0d}J2Z1RF*Rzt7R$S$MPYnTD%Nsw|y}CWqk}`|{U{
zmN_wRnc;p@C$Jht-Z!m80DAlrO(FJJ{K{{@J>Lj`1;p!SXQos}J&W7_6Ey0*CX309
z+GsU&dQ?Mu^GwoLrp4{yhIckNQUw?a9Hq!EPW3Olx|@UBDQ$f>478}I4|-IlI1rzc
zzMKVRO&iP*6mmKEkqJv5%`ZMtd7Df-t#ipMvwc?)?1bPlOWbWCi~}R^{D;=eIdyW*
zU&i~*NyIXn`vr=e)N7lyvKC_psw*&1g19>y@aOzoe{9TB3ojo`7v?US_-$5GUSTYC
z=w`YRuNy~1kl^^d8=Yovl<#dc4jAkH_q)9RL4(_7XLmQYm1D1fQ0hkSYFLakdUg6|
z6TKUqxS6C7;IVB%)!x=K?}towCjE>FPml}+tJHK54t+?Wui?hxSX{_ar8n7}hJ|-i
z0}uFHnqx^nfuKAKG7<)t_IYJf!&~B?4%O;OsH!3&A`YF-;jjKve`Ctk+eD|1M&$86
zCmhoGu0lgR>-k*QkH#WXR;7`#H;o5f_FKZqBNtoY2^GK^K0B3|*ASIM=Kx<@-3%(G
z-*zgZ*_+4p7jRJO{p&a@JpUd4bHMuzSL6ASHMDwfGd;$96L<@Pju=5U0a!)f_r<7q
zZ#b@2f`%8X8+dQBi0FATqwj&wju<HN$<xb;YWVH`t@;1(5^(Wm6(-I_=HVKIn`DX6
z9jk4$bN#u}MXvA!qmtISX+0GvFW`x~FQdG-Cq}=S-Yq8ur?h>mzSIx^Fuw=oy%P?R
z7})jpi^{q$j9SQ88F|!CewxRS`w8uvdwDPb;Ki$}Ee}5thN(hefgYy&XgqI=NYyL<
zkxw^e{I6Qx7#+(<PiVgK5w&Drh8A2K@rt1j!5d@*S_BsckD`&kPFB9P<Z-a6sAG)@
ziMq;j894Y)V8WI=|5kN~-EQxGO&GkpA}-K8LVgaS&4&;?nu@+~tu)oHQqhF1P}}E+
zgPwy7JO&^&0OczIgV7#sOm+kS<sJf8PGQ*t0H<hQUIFmit(1T`k<qe$C+NJ_b?fUl
z8j3%}wOxI2)dxQ}?aUC{Y_7RQX_yeVJhG>em(Ufgu`^w?%wpp?+X&rauk5p6c%VR2
zox=^kB;q5^fXUQyq*IhcR1i?wGAQD3Ryk4{@iwaIxIuUJyTWhm50(-F=z<Ur+r;%t
z)aO~A^gPT(FM{>>7Bdo#l{H3FPY8l7)vl}C?8jp@VB=sTbmwH*4lp2gp}>H}xCN&8
z4Icp(suU<jZB-Q0<k1y7W`NT`q#16Aj{5Q1CpOVE#u(_gB7D(0tN#%AK;`Hf-6kdz
zr&4{Yk6pQ-k68)4lihrP$F4w#vsF`=(uK-%irtEIBEtB6P?XA8@WfQ92OJmF&X*2t
zSSvEBxV6;qM#b`;yYhlq5AMOphVLSsXmnc)RPwYpX#2gW4rCeLeVK;!!r7S7^hIq6
zftJh~2>ZYhyqH9#oIqNPdnlSSm_z4HEvZ^RWoMcDHqX%LC>_~of=Z4IwMUDjJ~Nu)
z;fUtmZgFLoBS)(TN;YtteB8WzIVYz%c>ZUCK9Ba)*hf&i{%1-7$8eJV<^7RGfC;ke
zW(IfP#0s|%G45RkDQ|LfC{%WHoz(-GOhc*sW6&}U3Kl~?T2NGWPC|$Qy13i9dJ3nr
z2ALT;4P{42(W6f8)?^kI5kXYKLfU1XW$}y__7w{JezF!^*c?klU}NEqZtYKWMvz7P
z@*6|ySESb~4@qaGh0tJcj}%MdYm+>MuyTr2w=K&C)6jHY5>u@{%}D0M$mJG&hAm1q
zWVo}+X`*{RU|?ngLz=7V(=dIPy<;WIv=cm*!zi%_Cm~cm;u|#V9@0FmE+B3)^;bQX
zT%48Ny$xCRXLYhY%zKl&3kN%XDk42iacgG;`HEhuVQe6KQ2-u<aIkM;&TXfBN3kdN
zNoMA9)f9@_U#M=fJEvlkeCwD_mY6Ele3zN4rU(S}^Pub-utF}h$S<BIh<c&#J~9$u
z+n&s`y+oMet;`|9OO;nQc_TV^m&gn*URiZx|5z8HhnF;SdpjdPv&;O9p!6b?%W1#$
z#hR~knvLZ4NhgNpl`epsfpzck6D5EL{W772mx$KwT@~{|M@nK8V%za}_G14-c+vb?
zOiir&LWKOP;8@&XKIC)4NvO3S$JwQ5zd7W1_}b~6o1*vwLQA}^E5MYj1cf0r9UOSj
z3SOC*DmV<E8Vxl~8nE$;J)lMMFg*;d<s-v4;&c)>jMx}5W>jQPEN}wQG0O+g`?3$|
zR4Nc#cXr<pBre>SP}mtzO+`BvWnRuNuA~?cBtd0M7L0jLEb}FweYwm5phb5Myq1=&
ziPAlDqUx#M!e$BAeLAEW37ByB$Ut<G39KlRQ-1a>e5RRK8i*IKr{ESC$EkM&nfS$d
zGa8Bf^5&LtqT2(^UO5mWz=}I<sM8UTZ5`q{)7qSc>aO$MGE&uazr{&!vj=0ntNX;O
z?rV3NAC=Z}Hljt=k|Z$1Q|_duit;*>|G}s8WtC3ER?#NLTFZh<Mtbh%mhoRTlgIFF
zRl4cyS70M|HM?-}Q9?AbhQM4W9yjSvP(I%^jm6KEnzd`uRJOy~9J^Mc>YL{=pH`@n
z8mZf;9JfkrHPi(vg6tFn1`)MtTOTkI$>Gc?Eh>{hzjEnm&FxCCqX|snYbRf}s+lx3
zQ@M}$QVj39)!igo&6f}%1`pyoV;lFj$L8kRLjh<cz%Ltqi?C3anQW8_khSe(d@$YQ
zasInbt&C+X4`Ekj@Kp2Tv}l_*x=R2E{*sq#NFL+BoVmKXi3mAx5|Nu%|07Y^uw12Y
zlXLp`D@+e2)mx)K3K^^9kU0f&1>ioQpIucD5zc3J*sF~fZmKo^DahvmJqCCGol^*0
z4LDRj!Tc-Ed|q3DyKsHIb3J9+ig9=<p#JaOJmH`drQFzBq%c4+*fR`uR3cmvDQ==a
zD90;xVpy3v!O0ZJGF6{fMT%q2eK4NdIyW|lZ94-TQ(&Z3GiHxaQKbF}`1ajlO!}EZ
zpPQQ-w|l3R$gJu_J?_q5U1Bb?g0I4<#00^?d4Zmo;*4jf8T9y<g-Z-lh6q2nq_Wg)
ztCc|vob5Uqg6GSi1@NHd4}C12m`g&5Eu-4$s|?CG*J<6<5&3SWsdhmoGR()S7!yDl
zny(4-I2ITU0J{OazQ1JC%6huR2WCBl0bjW9HY;XXq~B2l{e~l1Liya=XW2GY#+v@G
z39Z_1zTahAM}-K0J8U7P6d%Uiconuz8zVszr2XyQw>+*C6Tf+K@L4b|ZUTy8c+Dwb
zIt06J>?aTZ7MXrz6S@GMxrm?YH6}GB9TV~o1hBg-kpEPksnkQZ$xh%FL0a{XHx?0L
z>ttzuOnD_W8BoK_R+L}qoGLHIv09N}xTFGJ!<5MU!!f4#PKE$WP?xn$_GJ_>!XSiJ
z_k_4&A_uKhZg?F>IDzaUQQ6sKCKj7rs~p}dzu&J_(S375d$5U&>dkW4VlicFb0Q75
zt?nDIJ<3){Cq!HUERp3Mdnr|(SeS*#ZpdAiE1No9!r_U<CR8X@9OwvOqmuP{{H~e=
zmz^a`eMI|;gVffmwhu44@tm-44uD*^ZABg-D@OX%Z0OrRX|6(7Uc~!(<>!!NiE-Dk
z`hJp49VpOGD9AQ@c*%W5I$%;D6;Y&HzlRK(X}CyG!?3y)BY9G)s!sP2=aZ+x^9fd$
z2Q@~*<=Thn>|A=UxN0^VwEt0!fGOA7D6PRJCK&dJI?Imlrpq2-b}{U!d5q5(E4na`
zngoGvAisY(A-%!eW1|ayOS2-v`2XJJs20>0S~85#dQBd@{=swAyx3K#oP<>{bDqF0
z6>gt7nP?@ZGc6e)@Q$t_?O`angAKwHj*t#N3nxcLdLjL_Gq_5(KX2o2jj4z3!DR~f
z#(1T4wZGXY>f8ikiVVU)kA^v$y-!71sA*|5rJYJJZ2$sL1oGG8a|cTgmj#oVtV_yk
zqQo16q9%BU1Fw@pdU?FFE`MaH`CuUI01N{Gd4-ZnqZ-$ocyj_mSex2@%E^H3?ZHen
zoixpVm}E&dy)EB?yinZ!Xe_dye06~f%LJEbKx_Souw*8ml)YNuX)}ykWX7EqY96`n
zo|Og5rbA)T_AyitMas$xQ4q5D*yLq>q|8UGqd7^T&$khFLU7qwh39m>uEJpktM@eL
z-H4~=qg5=ZKWbQC=e|hG*wx58aJWoR?7?rCh2qRa4Z@!e)R9DE-Z_kH$++;0)0*+u
z=zpnG58*Qcfv5_`L6xz^D@=d#J^d@DG4h;!Aoo^uV|pbA-2tfxi6#aowy~(W1Pre$
ztkzXanRV#NS1Y~Ia%jwdU3rHA3WNv0j2R!(Zj9bOGkV}qR#435d-%7%y-&6b)JPPn
z*enldDhNy5Dt)Pf8rqZR4ICQFEzZ+Rd#kmhA0<B)bqttjhekb{ze1PDS{_*|KI2^r
z7uCG@f>!Yu)36&!{{6fCkfO1$3N4T}63mH&jC3}^`!HC#E_oQ~#O=!IJT4TWQAke3
z!sxKyP^6&^Z+pk{wXWz&19htF$G9V$hCi%tcs}atFd%RB<7v|?0WdQxkSgL2DYH%9
zS9)l2%ffA?!^cn2n<~`iFclVUYF`1*E(OkoAtnn+jud3~6P(H$F0hnLY_9p9r-Rsl
zzIXN22z;B074L;|rDz*CONlhe`k;;o^tU}>*H^u6+X4cqJe*SMRwg-lDQ^<$EqW!_
zSb|B#@fNXuV@<^o7c*!O9cN-wEe^w`o%srwTxRlOJhyTjf*wMKE8?$aPpd7QS>Ld&
zeGsTs^7^P}Cx$2D)1kxTE`IW2RA>#aGVP2hK6aNKJ$*6ML5f80v`U%^-CyDLYui6<
z^3S`8VW2y;vQHtw#Z)XkoOfaUfh>%F4TgU3Tp0sdJ{|J`U8jTPD3fL(6r~>+8LBDU
zk<D;4{l<j0CH^vY#!F%hg)=kg=s4Des_zuO=SU}-&t8B~I_+cOLEaJs&<XF<vOp^k
zfI<muoy1P||B5C^%Mj1LIs;LdPh+IC9^Rli%Gdq%8%JtUl)HnXoT7q24FFfr_R=;`
zZ7nX&^xX#QOF_YTnR0&J%}lfKIroSSN_^3K;gnIZqdukg(pcr1&pHIj>Un|;xDhoN
zKGb^iM4*~@z}-qF4{82bauT-}-c#GPZSb9f22=V}@w;nDa0KLbu#t~?1LxFoQWh$+
zEDIEeRMZO$J+<DHAWeC~j#GtV$C}kSl$=Af-AJm!MwQ22t9kvpntO^(h9MP2`$)C?
z)k2<IvY^@>Pn`!0P)|#r{^z)q7MHqLHAd-SyfDz+MH(m?A>Ual73yJp4FtA)f8ZH8
zbgEBH`6UkmEc8VdAxL^*5fw>gSGYw8s0Im9gJKJIo~RgBjrjFIU>!CuSo`swLIo!R
zsW^Ej^rx#!k>Q!gDVA!)zcc*yy<SX(s3E$7@gnwAVV8An1?*-40thmzj$U?o!$d^%
zc99P&nP_S=)=h59Z#35DFv_dc=Dh3QJVhvKVMXCvuzIszU(RVR!V<Y;|0PqYU9}Mv
zR09kR4XAHqSDY;~E<vWwOy_38-Fy^U+=}Um^+TgCE{vCq$q-AdM$j(r0Yxsl(KbCi
z(T{g8ao7w{WG>CDRr#Mwk|mf9V3jO<(qB+eTjs@d^Vm*U6q(}Q_6%|{gl-48&Lz(s
z`F51OGd62ZAzDA0h?Y`cp;nS9W>5&~IGfAnv}foIcZVgPVAIBscsZ|hn=l=*F}kn5
zWo1ysqr=R%FzFQnlh5gA7zP0C&oRuNiV}sjbU5ua4?D<k$Z9jVL+6aK3E{%jsfCoX
z=$lB&<eU;A0F714qyJ&G>a=VN!;s7*Pu>I0=V>{HDR&5L3Z73&A){dGA}R@|qdI_R
z)c2%x*cmdDBpTOT@-`E<Ico<PyLQ`rsmmx7a3b<wfg(;amY=uji%~~sCKuhJyE)J|
z`Wlu*|5=rriFNbS6EaT2seiaH>mt)z%KUyx7$(Gv0`L`M#010M_^yQ$rvZI56!GNP
z0w&7BjKj4$r`f(Ev#4KTT;EZceMM9DDXc{Bibcm!pEo~JQ?}szbr0YTBC@l&S~Th9
zHY}?Si<K2rmD2`m*Ap<or^=C1-ifBny7y+eavR{-7~l^Q*+IRUurLD#fVP;2k38;;
ze^#NEZrhJDI`cF;5n=!^W@s2swSW~61~Dvs>Y<w|7S!VBf(_mZfNdR#Ls|GRR;gZg
z^BRGet-<-e>D1YG)=9w*b{0e}5Bz3j|GVDm72ksoTz`xsJWaX#gVm*xjB|t<t9LXn
zHH%gg(9HQ8FlwSHQ6(KYNc_-1_bn8Fo{cI}%AY{4LE&CZBToDM9YHZZl;@E>!rsDo
zwrh0C+}X8q>~KNRs|j!k+qN#N^+LWDU60;am<M3In7XtZd^2Yon-K4zoBDB}-cUQJ
zZ!%=%W4u;Ji)ZVb$M>KN^ngHX1lb*r>5^t#X%bDI+8lDNnZH2Ml3_Lj_@h1CjPpSP
z?HyttPCU1~Tk{RE=w0xTwqT7D0J|DT3F%uxu=uNr4<~(Ywua3TEAZN+!{<^Y;-G)F
zFq8fh!?Uu{zF;b6uN$RXwzTQg&ekFBOk}je|K1G(tOmpcJPKWTPyU=yor^4=+|s##
z6BoF|CSw3%4}O*}y)oFoe)R0hSJM-&o2)Xd60n$ChEq~c)T7;sCRf)$;KZ?ZsXC6i
z=jd=)fD#Q#pujOoB53dRP#JogaQ>b05UQuMyK$N>ybirk(l3x%?cUt9dwE4?Nl)%v
z3)G6zi!Y<VX%7*S6Pl1_Y8|ESDz)`fACfV?F!aDHc%xzU1JP+V%ekFFlX~uL{n!?S
zFab2;a)v~PvKD{XdSmiQ3PueG`$%%MN2|PcYruH>EA|`!fiDNZmEkJ2K6<Go5%WT&
ze2|#6ybc<5RvbYga%oK+F2?V)9O1uK7{o%;?d7asGl7@m+RL1jiutOy)=ul2N`l>%
z0Lj257^K}B#alYfapC~4F!BKaeL=uez_=BwF<>?C;FN(TwA9wiw{<+^qusfQkeZ8h
zwd3>Ym0|6QnloMf!NmyOLc=sX;4*+ADKf+bgL59~wqBZdK~xIw+gQJ}szcYoZX)aQ
z-=y5yZ3&I2rfYH&^(#V#)#gchDr<xYPFfi{C3lU`*-95-Lq-k}><r)LOiS!AgoFs1
z>oq(A1N{BH2dRO_%MHM+F%j9rEJc~QB_eM6s_s-&D;Qq#oU|8t2<ioY`FKo2Yza#d
zS=huKD31416u~paSTehLZ#WthEX&DMy@lP$xrIp)jY+NT7H4)|tuxH02y>DpTU{2t
zItgzzzeIcs=Za0NY{>ZmG(l3!b7_K1G4;Ax({X_p03er5mYn8w^RpiPTPhetnjcb`
zWd9=}>MU(fxZ+CTXJah2>eeD1bED}mnocVU8gY;?Xi`($TX)UdPF++#hfSZxv7C&J
z#PkGu3^&#2jX9z>@fQP515n<nbKISJq@cthCh=W}-<hOUme(1E41{C$W5}Xbc&W{2
zyEdV}P6o>`E%IB5+>S*$6}DFpZgi&s4i;35n5a`|QJ9-gwBwW1$#1g}xm>(niB{U=
zD?<KfT@hJ{Whj_=iZdlFiV2u7VV+}Iu`fzE$+3-|MlJM&bL<weoq3#5fb+C;N*xz1
z#&|UA>qzg_W69bVuQ=+Kj!^0)N6E9#_*k`B$mSc3&IzGNkAxWfaTx*ZW?-2%2Ne=l
zEospY=HvbtFFHdqOY;nvkE+h(e3Q)*B!_5yVWt`Vd{8c?Dbg+gz2NXCrI;!3$iPAe
zk5m|3SeDJ4Yz!tqvvfp?*S#xoYUV_X#Srz5=t_!8+J<QAmbDRx8nReO@izr5Ipi2t
zXX*^uO`V>Ml#NL6Q@kqgc8ZGWg7_kbPUyoz#%PnNAyicMY!$O>2b8@C;QUV+!=Rh@
zRo1rBmYG%A5|q-W5DW5<eg@XgFIKIfsRMHQx<08>-43Hk5Ls|Hh!BzuN`_l8h1dd;
zgNq5iWt%{saZCjdTO9!+`u0rD$es~E2QXG-2U{wjd6`;6jd%<}YnzXdVISxrM=;U!
zC@@VbeaU#&xRs`H7cPCY$&f94WiLu@Jex9634%X>KAlmFCl4Qhc6iFU?aUbslh4|E
zQzP2voguPb)azBORVd_mSXVhFPWp$aJv{8j_J@{Gzx9j2v^eLn^PVfP^mq&f{<V|_
z8Zt#P1LSg`Ck)Uhnf;FM%^m*=0P9rdgD2)sot|u{lgflBJ+$zO##6I#DDB|n2BgJ*
zIsl>(^eUSeTEebp;$a$c-lPOE#0S1rLX?B&v6&m+st3xnlxnNLv!J&%M||0+9k<(b
zDwqV^ip4dC!Qe+Zb>@KcVo~9<_93-Xaq9of4kip13B3hRFG8iFLmnlEeC8^NLeK@Q
zf|~7w9|fgnx~b(975FOy88BdU$yqtkr{jOJjrvg!xBU5#mdPokVnX983R*<v2=RW|
zWlG+}K^PC0#VBOF=WlcOQ)XIe49gE-AKi!s?aZyX#}TyGCt^UJbi3uJRY~;J&aGyt
zeoZl+_b?({!=y1O-$q0@3$qRThfzc6vGeToGtfaT%AJZY@5Djcu8@}X-5tu2?5i6>
ziKUoA)Ujesg!s<0xki>O20HD*gcd&a(`WZ-YKbj3IhM6?0egB`Qe5e@NrRf2R@XM1
zM?fC&u}C8$*NvXJ{4ZQtrzy_D@Wp#hjRGU0Bs9&b3~^$#TIy$cL|GG*#s=-NmI;f0
z<XNjh9d#*&i-JlRb|h(gY_P|Qtj%r1@XtrQ?V1U~hrP$sx-!>W{)0TTdw~KeG!*It
zO(+#4-r7x@4CBhw*?<;i#P*A04FpN(iN&HULh1U>28EpV4W%-f{Vs(#jX9B<*c37$
ze3*J<?rbQi@UYFv^U#uJ45rOemUUT2RPY+ImXysE7$vs^fLaAS_Qfj(a>wR}(#S^3
zGf`!X6m%PIqSw86Rwd=Dkd_)=!!4a-_#TR+lXNvcfq&hs)|{J5ZDm<l$L?d(XHYjH
z_SbZIu=`sSkq9<&Ae4Hl72{>b1bAlR5@-&9wgoeFunNs88g<%v#3}|2^QKp8npqxF
z<&gzHi+5MVqyGH4-b>vVAmQa!OU<^we)Tp@!-_j&Mrx1s5HNQdc3(!sSa%52YAvfA
zEQ*M2sHkR;o<rHTVH{7Q(As(jNpaNDi1T_$<QJ`Fu*}N8z!t^Ohr4h+<FmsVR$|3l
zXK;g5gj6CWjxke_fM%%8{Ih5hFJp@nGD+qCqv*;ZmAR+P)t;_?c%>Vt6iF0&1AXk>
z$s5!A3g7Wn<yh5W34<}yUWC0G(Y2M&*;_xGXaLn)*&lHc0r2fC57vRun~=6|jKja2
zmzHD_Di^#F?RxZtO=#1Ib8VE2S4kLv_8^zAmWI}H&cfBXl=9K)6Ic+}o4hlohqHm!
zG{HPu1THQRXdU4;L~0<bRi7$MnX#*vBh;3ltTLB!M4djxu73GLVgDd^+9nqYRjYLN
zI$;Td^mU38BNRkOT6N6GszlV}H;#@DE2(8;{9+_Aq<!4ptVD*rOg0e?CiiKj^d~dn
zlFgYu+f~A^V9H{s=I}{aYK-*}Yf!d=gW88Ha9pK`(=(bzcaLA;l_|B_7IEKNt1_;6
zIUVb4*#KDwXq;aPWMC8jp7Rv7RkVfIug{R=2)%2(CNY@(!;nfjUD^Ybl7n<h?oI@k
z?o{ic`k_xFlbZsV%%P+N!-81g1eB2khV?6FoEVQ;jlFjGBI#`jR&MMPFvu_i?BB%H
zpj}!4WCp=`)huEqel;r)qWDlx6EpO>tX0F>@3`%L>LO2Bs$Y@=e28K@CM2O`1wLSa
z`RwM>Xh{KcbPV_K8bit?cdQH&l%{zGxG<V0Kz<a!2FzaVjwyO`=PS{@=dMww1xGw1
zEAVNMW=KHA)XL7V-oVT1M=XjKtHc_KIp)wH%<$b`CSx%N8-lvkI9Hy@GNshIXG!az
zT=$FCe#t)CBb-)vLFQok4$a{9%b_Or1w*M}>M7h>UNeJ1Jf!N3BAX~{Nf+Ed<vnkh
zlpU-??lMkg7FNvKLjc=c-56^abA+N+Af*BwETOYuE<Y);IcJL;fEM!Z*8T(o3QmJ!
z<c}?FU7H_>mMg?Wgg7txpsC@+O5~X(MrdgeX!OuSmZjFuN{hCevkkOxv1wgfT{NAc
zSXrZGy5Iqy=FSvqKc@)<5}IlwhmpbD5U|UU__@pkFigA*1%`2wU{H&A1UTyfZ8ka6
zSJUU7Ag3gUSc2F+Dp1&xTt1$^;d@K+aeE5e`Yu>-UoBk2O-C6A{Yh_B27TS`HP>15
zZz&U(#-`y8B3c(1y%E2|+5#TUn^y@QSyQ+t^QijSkfTja9Rf%|1zR$}h>h$2;r7lH
zi3*d5)PXXAlnh~lGB7|m5LOH()jzDg7}U|M9d@F~HCD^nhkm5J0kbrOyAT~E1X0@0
z?b@JB@)!nazTZ2tVfIWC<h)g{(Anh~Qa~xP3i7(eoqI%+#NZIg`j{YXVw$mZw0c(H
zW;mCGEbB$qmZClF#Y2Uw)k%DSjWmERGIWg;H_(D<5Q<@$(9flRG>)Hu*^@IF_A+Kl
zuBe~IBxdy*a8Hm)JD%R7?89s7u4iURWi@MY4GynJ`Y$DeN-dll8KzJ0b0+AV;o4Xy
zK9kyHkfY$;Px(1?bpWtP((eI5qF}|Q5^Q=y<#>?U3pGnj_krNfoOeqwT+$A=EvWaU
zi<X9&#YaF1*^vv=3jnzujzy-7h*ZcWQ4cEa3J6e^tVzvqCAS(M?#fA!2{D3l652RK
zvRJ8ShsRg}SkPrgdImxRQWujly_iT-n8<<a*an}S1hbyy^8V-Z{G?}^4^X>wT)l%8
z%eqHKoW-o#67La{0kcIzEaQ%OJU2m;!Y+X@jnQHO$9jWkoLYW1@x}8H9}dv>;j`L{
za8u}urEPopbE;<9$9;tTqpFHv%P?$gbV7i32bblTa?-tRD;is4m=I7Zh%8A~Ma$PJ
zNX28aN<069?6D_WX>=K8+7yP4LaNQYZZ2>t8lz8?7EFTesm8HA4OA!AX8N-`YNyLI
z2*koJjz*>7OqB~mk($g89QqT6by6btXQV+_5WV^%{08aboGNw~<m+^t#TzJ|&NN@M
zK!GIW5V;T{hkAgeG8<8aH}%ojVJ>~>xZ6aQhC8J~ikd@2$P?3^t(at;J{G0!g!$lC
zg0Jb?NJds&4IiPY(yGw8I>R;f^7u@v5=LhA@J!ANPcqWlH=;QXht`^iw1e@SuA_iO
zII+@`e^|;(cT=HKab$0V)0m6T+)P;py2eHNBb1lIj6^lbWi}iZ6Mg1Jm{E>WYW55Z
zF&!|n@U3O-)j**@{lv0K{XNxeRU-c0N080|A`<v(%5o!fCtsPkDM~BWTnfLjBdEtY
zj|$wg+MUr_svQeu#$rEl+NWepA!^#xwWB(=-EQo3YY7E38TlV_vG8hI&lI=8j((py
zD0B1q@aDi$JpYbYfy&fLiwN<}q*P3q64FggR*Sn%2^y4Ea^SK-mwsHcyZH7HYfEVZ
zTB4AAF_3&g7-^JEUOASuLEIK2$F4xkH~*G5CE~1uVLZ-^p3q0>Qhs+K&qWN$3hG!q
z;Fz(nY3)c(-a;9R#wO;#438*Ag{VD$($69Xh}*ZV&D@VKR`7VH$;7!ZxeBM5l|jIm
zwM^_}Brza3?z2moc`o&2b*n*owo`)A`ixa!64pjg#_Weu_h~d}z=gS%s-1Feq?l%<
zp)%pCz{Xsve20DgmU>Ehhb8-s__AbNBJ1U5n;J<Bitum3<Fw6&r79E~tiJZrLvmIW
zYL+2_KQ@c1cG(+$n<43kb4X8_^QvDw8XZnwTm=G?HjXM7>GJLOTz+J^YgC^lvTz-T
zk4%uqttn|6OyweqagF1jnxtGrhRG&?7${~d@%HJ6RUZjecPKqqJK8Ne8^gA>XdPP{
zYB#FVMJ$*f&)!!t55%0P*lzyX^Z=LdGmrwGaeRk*P3yu}`-szkoeP6z)oNy%yV^58
zgaitUzGjb!13LK%B>`@OzOwG=36_$#bQ+YeT_X+x)d5Ev^r`lpzUX^A<8DZWI8~Ca
z`_hVHjj2TS4&Vz8Z8P0|v3Ztp)?{ak>jp%uBWj}bfAxW27_Pym1tzF}%=E?JJZL-W
zVCctNs+3N>!L@Wr$;RGqW#3tO_z1+9Ve@P2W#3e^DmHQ)&3~s^;kJ}w*+aIB4c=Yj
zL^BU$C9J-Xhn!#+29L?OFtb`*z}GE|L-8*wLoO6f{#;p+NC|6E+{GE2JvYr`KJq<Y
zSk+qG8rU<+8b}XLBFQMSz#l7MHF2b&86E|oU|mxV<7f%Lo!g7FX^xnCxWiuZo&-{N
z<4$m41^Airo$e%fp=6tQ*lV9<s{}p|1XQV9QtAJY#rf7daW!jK5TOC9PHM=MqR<r>
zxTN(2R?UT^$;Q#?-8&F6Bx@*80xL3k3Yi-TcnT)D4q&{Nh(VAx-HkJ-cAMphGT2Cw
zBLYBxW{o!y<IK~(t%g@PXtF*NCA9kus}7Hf90P>9c&KPgyglwOeEep#2cluW-#MY`
zFLsAG3`@gYzNMj@6Zd$clZdXM{Qe_z3sLh>L?Q*oizZ#<qt0}0baV9K-L9b$1_9wq
zAyT@9R4Nmih+!&2#A;mKy7JAEX|5+|MveiM*URdq*_$ysoif6u@a&7t#02puKs`Q1
zvZ2x59{7g%#b&Jw+tai2CpGRUrxLB}K3=M~dbV&&UufA8RYfgs{X23ww2#-IDjUiE
z{w%eK`I?5GiAE72)-iK9N--STdTz#WA^MXFltdra>U`vL)B#I6d~&0xG_0JwI4Q9H
z4!0>|-gLId$sC(Rj8ZL&5tJe;(qi_=04(^s0Q0d>HEvo}&`g3SqPZ8(rf1IF?$}bG
zzSfS9>Ivo4IdbikZHa>3_z~&oODCnx41tJm5hBDDiNrM@-1+$;w<=r6IvMrP;)ot%
zqgSfZy;M`7)Uj`rChp??p<2s{$|Tz6=RU%_PFv_yA%8BCDfYa0Gp4@v8x6itq8V}I
zX{dgzecqBj;v8sKuH)03hnC^AVAjwpT;<IIqoixe2oBp1_h4cJP!?^ce#HrrfptxF
zn~W5FG0U$_4Xs^G6*6#2PFjUf{07O;Gj*q0w)h#vWvZEZokJrDD9xcr2~vR!LnP_T
z*2UGab_BZs817QdA5ZEfkfy5pVF9vIO5GYP7vk|jp996(Zz%Is7d5jPMB_$W&zmyr
zO9vaV=wg)XXqXI5F^-Bk_q<9L(fc5)gxhd>YKY&dc=aF=765@;5Fy6iy3OV_+cqTg
z<sS^+mdEvfyxU8tBDV6KN9+u5MPAXvizJ$kI~GqTm2tytx&x1}FK^!<_}WSLbDxA$
z#AXH$JZyJi=P%52Rb`61Hi1!oVNqX43AU9QqJ{$pFNLNy<2bp73y?g~KsDk31rPwl
z3IK<$%fj-$$|<@H2kC`o6R!ZhI0eJn1uUO|<RY{AD194!n`m>PaFIOI;+k6_a|cLh
zrvGkZbF>J-lff#XG$Sl`x{6wYI$AV+TMFiGQOttmDi`3SL2%HQh`0h(;NiM{$T%g1
zygn7gt~JRgQv3J&&?q%#de6S}l;L8~>{;h?QS6;^hT!$DY+y-T<uZf|v$4P{d&{Hm
z^iPJa5Kf;5L8Kdb&Dz4qzuLfaF-vGzh=+mak-yz-_)cBb{2qFc4T_aS<7!ysU?J9o
zJ3@1Q8<8~<IB2)lzIyI2LBl@p`LzIdbftvX06Tj~aVFZIPOZl9w{Gw9cb-RCic6(e
zH`tVtl2Rol)53A$W}=vc+R+5ysnOJk0=Q^V=dS1)Diys@PI1%bYXma%Mo7uZ$-f+b
zHL<V`2~(B5fgE?qPf;Xvn9uv4X}ZForJ^efs6xas627NMA~u&TQkE4}UNYqNXeB_X
zkP<Tg#;xQ-EKm3^-`V(qS~s1olWxH^fS)SMUfyAU3BfWsd13mgn>5N?Ff0|UG7gLq
zttL0~1sR;H#f?Vr^?=luD4O>XN39uKF2TPH)CbOY)$=t-UrW!#y0<28k3{I1>tk=1
z+GI}a6)jhW63NEzBHc{0fQ$AU4cEZ<c+rSH2?*7WF2&8tkeyzC*~8L`iE{c_@fOsd
zL@T(l;Hgah<kU9Vq0U_1kL@?!H7W~3J+#x53>Xl#vx>STwR>+$<BjdVT_mSx&ZHTC
zLOshq_(pI?0griQz;PTB)v^3TGzUII?3jQ_NhmdDNzmeemVyPT>KJ@Nnb+3PUq%^(
z_^c=*dNLVg3Ch(p7@=p}sbZI;wPxU%bY)x00&E{Q<bE7^tctg*kIF6SFo}J^ZIDk)
zdh-&74kPzLe_6^!GNP-34f#$XzipU7k)>vc|4m9x!NVpRn=fe}A+(vA`lu(CYS*8j
zCJNZY2v~BWc-PI3Sh-4=zH$*8Gs9X?^jQDHZ5ExZdG;v_M5U}_y11<lT6)i(uvr$P
zmpVaOn;H8bQi`!0hecyA9=B11v<!N>p3Sahh3sDrWm%)rS2E<+;j^{P51o9f)(7u5
ztSN|_e#*KQ$*y9w_lv<It17+SwN)!Sr5*}AILQZ&3pdD;QhLRBV?QyD$HD3w*5<^v
zTP?*L?Z(CZBMWN)oPsTh<??6k@T(y>`K8UjMq{$j0-aMj<6eSBqtvpuC=1DBQng-@
z6972KE7k2q)0P3)dCA#jBq)crLEm(g)SH?MWZgODGUr|^&s7<$5@Qc0gVdK}wR4C5
zRze@m?(r+Nt~IM$GQBw5K%PG95cM)cY;#w~;GcepHx-o`#o_>l$sd)lq~tRC{2O}I
zWKcC$`Uf^nuy#MR^YATTu!k80fzEea4a$P*K6^WxL}2l(ue(jHd#1`s2es>)L1d+M
zxtg23wMqzvW2v6(&}8IamTCaT)=kk?qCXFR%0<Tx_Q!cYtQD@)(0T?K91qq{fE`5O
z#esl<p@l{prt#IiYrAsV6r~?cve2ufdrFq;=)pVR!)!l^b9B{gCdY{^_Vq064vn<|
zZ#Wk3|I?~fRf2(fR5EH*AEP9Uhf2sG8^vOnBpTOui7O(lGi*2ZD~f%3p@IQtWec3c
z>9-9#A|M&KIsMWj165C4O+ru_J!OP{XnqYfJ07NK!hq(Wh2)NbP9QOA8qliB-pPhY
zi*^*R%*FNKTW=H$ppUGYMWR6eR8Y~;LS6<b#!_3BrKD7tG$%{2J%rrN!JtHz+Z%@J
zeR?Jt0`YuYk#M3$9n9A{W~b(;X(;ble9`F)2oe>=CrA9`6a?Sy2u;%zv_9VY*YZ@6
z&!)>@({@X9IQ7ugSU9-JlGX-TBIL&3?Jrpu=o%(65|X&E73{o`%@yO24qLd|Gbk33
z3H*;r;8|D^l@R7|l+DWzLj8z%MCIfOBm=1xHmhg63e3&EywIQ^h*N{A<z%boiOqUM
zr%vb2qV@A$gzZg;`x$Z2F*hcZ^_$tqCaP1mDcdBc-96Q2_-V>E=W?+<WWosL{^S4_
z6>FgcS8EUQ^;`6+meA<Fi5Wk8rzWy0jv`=Bg<gQ!v^FZc*!KaQ)lr{E0{+gw6`1g#
zm&%yR;n`{G_}^+jpz!fmtbwICR#?Psm)`HvUHbzMmMcjwwsPJ1MvCvtc!CA<!tNFj
zhO_NtSdc;$mRPbl*c_=W;p?Hq$Mp+whc~04OHMPK#k>pbr>BX<NH?3SELHG)M;%v?
zj%=A1rDtdcoX05>Dr{|+1gjybgfiP_Ld3Hz39Q+M+26RawWHs;Q&KiidX%0VB(Skp
zdjE?~3HRCM;<*!=oDN&xpzC*+RvLhE2nj;p6yd(|A;hfJ6xz236WGwk!rnG>K8)J=
zJ=mC8l=+@bH2cL|&H!9?&CGpF^%x(*OfnmC{*Un$jJ#BTTmSmROd0##+l*@VzUlud
zaG;%|1!i@lcU*pz(az~KxHP|NIO#yzPp71(#OvH_dBj^`Q?+60M{Ty`iwc-^g7wt%
zmRFQbb})F7Br`u;R#sKXH<;aqV}UV{?_KWK3_`Pz+WVoz^{N|Lzk@8V4?2-|qy%e5
zSx%Zr)dOKEdfAxQ6;J$jyiG<m;hDtLJrQy2^o(wX$O4D6{_6Q=F3jbo^9`nE&l?wk
ztDx!+$v!a7A;P#E7?2obA5&Ps0x*OL>R(w$IO~`{Fx*PMXT@pR%Kq3)roXI};$`Pa
z{JE9B*Zou4p>EK$yr{1Pn_H2Y;c%zmct26%iY=9L9?By?;rR$~p3FJ4e+0Qpu>pZ^
zm5d$aVXF|0Jcs@D0qt)*@&by#V@X`XOj#{p*ciD*WT<WRjaQmeGek&6inSOR&?rIU
zL#abo?i7FiTa2VY4}>{A<E>BVHFL8jc;*Pn%TBOOx&^_6#@Eb-A9YSgkvOj7eu{Mg
zv5TGG0w!(>>O&fi3hl!VfT3UjSf&_GGMhfS-7-o^VT3<@VF;cD7|mZp!njGG0?g$T
zQROw8#{2FMn=TMW&WH*fDgQS?(pJ0Ov1gh_Pm_LDbiUuTJU;FzY=El1SD5@o%00=r
z3Rpk>{6cz6h#GE#A`Q2P-bIP}or-I!4FhU{y9LPs-Z|#BKV_CITEIqs1-%fpSMbcU
zqf6%DKyv~Q1#VUhfhR`t<~OJV1%`3j>l=t;`{K*r)dajx0@b;qEDX<Q`%u!)_1dA6
z4_2kA!98Vp%C8&oXcUkq0c?K9dVPjhdjZUs?(6v3d%Lu&^&S+#06ia^mAzByR2K+@
zkm#3Q`|}`&5A!3fzm~4kS1q4TB_*_>f>1%g^F<6mfpx?}utFoO<&Fy^h)a#g=f@-8
z5$LT1mzh#hjQ#&R*m`})>4XE18cZ0<-4P*;^rZ{`*t-d24K+$Y4&aCQyWuK=gJFaq
zfO#JV&P#fE0YKQcS^BX*$xz13+#!G<GanrJf`&AKzn8KOpOyeBLDUA{GFUmA+;;q<
z^0Q8qSyDFA8IGlvY*?}P)j2EV1&dx$r&Gr53C3zEN~u~bkSeMb^%&9dhp>!i&6`M+
zz;Vg5$%!o8S**dr!VA~;2F>WKzD^*ePH{t%TMcvqP=z|eKJf%cT2z2D;QuCgP8vOR
zgDU3+r*!?qKw*$-KhXyYp{<9irV%ykos#F65W+0O7tYzw`gSJ*dXd$Z-T1dT$+{TH
z#x}LpZ$4|Y+J3^^2T!y*v!XHx&JPIZ4(Rw;(yv(S-H-!nNJbUhsWMQe6`RdD(>qzj
ze6-ph<mlJE5#u!|&L0skju>(a?uMTqZ_{Ms-8je(w$}Nz-@?UzsCgq4sw?kMG>5yc
zL>hQ1cGnj8rRi7-IC?-<%(l5-EuxC2!1o5+ntks<+>};tF~BS8LR)ZdId>U=bUmZ4
zG34!WQ{<zb{t!C`)MJD?;5D!?bNw&!ZH!m{mHe>SpwpcyORH^|Fhgsu-?zKlB#YGD
zu;3zL#{m^hyDZ8ewvcQuMqkE9`@^`lcmc8!<Fv2%Tsw6%cIKf3i)GEG*O07OgNK@e
z6|2Ldf1O}}m;+SXYZ3?4X=Q^Wdv>br%Xd=os%F%?V^dNXzOH)w3R+;ws0LcsR8S_O
z+_-00{L`9eSDC#n_r@%HGyVzS^bG9OrE3+&O3RC{$xtg=8CpBFoccuzAyZ|4)iK0L
zV%bwAlY6hj#wP=x)@Y2(HE5v7RfO0ifWTPdp}?slk3P)XF*B9g*A&7Wi<dQT3;OHd
zhTUY+3#M2V>T0Pe4E=HJ+;V#0`ov<7B#qMGIkH7@C9GN*_SF9}o4N^`1F1`V6OGn0
zfgpzeENd8Uo}EA1rzYMOH3yaL90>LEvgfN(fS=7cJF%H%H-h*!5(V}f){AV!=f24X
zu{Jugn~#pYy9G0I^tKoWndZ3Mo(Y}<*Sb>}0I*yHdI(gGv_rEt1Ox(}`Ii6Aw-E9R
z;bAA^IbS9x8GU)x{^TjX4$VcxfY%69h(G~B3I+i!msv{1od7BVf)U!}X!jfxB)@6Q
zupk&wLrKwum3NDy%FiJ9TY!Qa?B<W9MTzmW2zG@8C$a|WbuJ@TC)x-G+YJx#1Oo|S
zT!dr@o<5UDW8z)*C`O0{)mguE0N^3&RM|~l8Gv3>AbGv5*J8cw{U`r=NFlz{N7J(p
z#51<?_5W0&(b)6@z^8fC?Rhj*OK11M&qd144KsUVfg?REelR9B<?E3}1i1PE$2O}v
zSUI%TW9nxTJVeI?61L100|<N7*kbz}gm-(7TRW)p)Yr89zhZu_(Kq{vhfg21<o)Ob
zY&@9>i{2_+`S*5&|EYyAV2^*R+)_iD12e#?HTw>xe;6+sd|zzwuF_3l6RW!>v3vA$
zKn%-*P=xbgG=yUlu}upDWgyIlT%Owo3}_rk9Cz(EMl5}(7#D$eh=Grr^Y(%YJxf0i
z&2{JOF?ReOUz3sp#&>tJm20U!%-Ct?c9A%WR?o7AGd{YTs1F|8X~S@;8xaIP+1y$+
zQt=WT3b^ETwY%_~l&Q^*S=7k|UXucc_2Oun+|CXnZ|wG#0EJMO%syZUqLjW;GKwmw
zm%3VLMA{sqR*b%t+#;@b0dZjRuRvJ3wwgrbctfUEVSBii2_)!|tnq!#A0s<Wv&(%M
z=|v^z=g#)eGQF^~KgGKOxY_ejy{4pJ%RBb5h>8ELS^jLU?n`0BfsVdCkJYD7G#BZ<
z8FF3B!d9maNojMr`;T{=j2Q)V@p#|Vt*q)v&IXuC$6&)v9e^ll^bqCmRdE@Qt!-l3
z3xZ+t<aRa9349cU7mR)H&MPcE5_1dQE1aCJJe9=q_&fq~W9jMGMO^~Z`3uZQFQ`6X
ze!!9X-N*iaqJF^Y$OM8m3?Y*O>W!vcKLorxeQT}z+BR`qRr(23rB+tiArw+iW1DWU
z{(7oTwLpRpxyM%R_(o#&PXLtF!1{xPN^2fid^J1tcI%fRv}0F&ih5Qk1ZtgIo!Ng+
zSO*UQ>e8oKmqFljwtH3f1Z&;uJ|D?g*@4Xd6jOR=2f#|Jf3}Z$Vh|}S&Xb)8=?$j5
zd%@`ielu0Yw=5*#_Z)XP+mWX5$-JKqfqxezpkmRzZDE5$22Ve&#>68!?N*n{M7szq
ze_#a-F6f@FL<d<`nQnP}JjTNpk`N9?KCG4fre!q3C+N{cvmL5wPwT@`Z4Zd$!HuLE
zW(Z$0f4nnnZOwXB^0Tz4sBwl=Q!Is4aCNx$caLc$|FuQGCg6Z=@32-9g(bHWSxVdO
z8V~4ogBq&GwNMV*UVMclZp93HV^lzdHG?q-N%Tzv(PjK6{}E?484jh{UHTdgLnzC;
zDE$YmF%~ekl(8T>U+J6q+5&kLz(0nBKjx_tj~mM;-HSh(P9IT;tR}wWtL(C1YUGeh
z*vdS0x<zn|8Kl5oif|GahI_{m9Vf7qX|P+55NwLMH!Ly_BefM0VH%C6B)mE>w}=zW
zkYvyyBmx=us0rt71T?V_Tz!V3>-pK4kH3Xrk}5Nz1*<|Sbh^lQ{x*Uab<2(Yrb3><
za#Gv&D4@)O>4olFk5y6ZdC$koh;ZEcP^a$n2e-sN>*b`;#Os}}yUM}FQdIahE5Vjy
zc!6FE0S!2ST6j}FlHPheUysmRBREI1YtRl&Oyb~zkRT&5qU*jk8G#TB>lgFej2E+q
zm_iW{+zirF()LVo<B7h5vGhjhX(V+ncaEn%=jRp!Z@ebS(q(<spN;n3VLSF0=K>D>
zspHO$ga<w+3o3vj4@=U@A+D|RG`XW*ikg_&AAC+imTh%zf7%{>V-9oA>9K2W>F?@a
zn_*wNXOusiL0ka|0T9ZF0T3m5CWj|dL|I9t#;T8uPR@Jyu)cAE2F(M4+nLv%hWvmq
za$@3$3(7$JWxLchb2%)0?Lzro?JmD76+!UeC`z{^ZQ>@fp@?6kn{&}p@*zskwg;D2
zg4qpMzANcli^rRR@?fn)I+p|0K&rs(GDJOm+e5ck*MhTg#suFIgqOe%CY1gdF@|;9
zf$CC;mmOqfTZM<H8DDqwOt?ljh1!-Arzi)p#G<3l2@dwZxMRPMRHMPp0(1zzi5cwc
zwvM&#e&=At?poS8m=>!qopKPzn$zsbhGZ$XljcF|wOM8z_e<-<iDnkB^77ujRx)kX
z%uYh~&{Bt273oio45}eW6O_4?wZ0ttqd$9_7EQyEXmCMQl8#D@1sy+wHLOwLn98Th
zpk}U<i6azzJcss1NxL@7-tOV=TgZ`4;+v+yC|lLjminU1rY)e65JtH(W6%^r)pZgh
z{bE@$#>E_Ji(AlmXKUragLtdm%qItb)xN02DLV2tlt~4#CdFE4>g!!UKAk&@$h&vA
z4>C7jOMlrNUi_Ss?eG^fD!J_H)Lm1wTau&gEHZOA*@G)nVib8Z-r@({t8J9~xxPeq
zf986(jedIP8Go_SJpK(5MOJ=N`buN~CqQV3Ao&1<>OV-s)1GfH(XFAJ`2L6vaOdFA
z$`y&@`BU`ti)8l{qARob9FONdigsFLO8V;8K}?d5jdDW3rrWt2O6y?!u7db&qOV9v
z-8-Cbwu`rHcSi!m4@3xU(_AqMS5V%~j@a#4&P8wW7cF>NmQen$Vx6~=0jEzCTwJy3
zl;Vj#)?w=onDd;S_K(v^CKZ;O+OA$6w%RSq>5zxJ{q5mO*8-6AG?hy|spr@tu<`a1
zJ+b@f(kqrh4+C(3GeN6BK$!$NY|zlY8M1K&q0C{F#(OF;ek1*qG7`p-AGe(CvfEht
za&@=-^S>>oZ;j%fXx6X`)?ds@AE$a@wrvwX?Uf2S9gQNCyuW+g<>ltc&b`(H$4KKf
zj#3H<z-ERIRk39K5}QXvA8@+Nnt8n)p=7D9eNN8?EL<3`xNA=dau#95>RV$(S%lz;
zlp24MA5dfgBYyW%-nfoPGr-|ts^#^vC0MOi2%ajl-|$RPd=E;s=jc~w6s73&at}Bp
z0rpDeODeYedCQ<o$b}!MPiuFmDgnA<+PmL*^$AJsGguvdUpSHg-tINuzDCs>z*vk;
zR9(&P!6lTi2=Kpyu-x^-Tb;e({43X84XB3anTAcDw~`=ju~fvU@O50pd+W44YFzkU
zi`lKeoA7*l5{5#5@$|pPpMZb^q4vW9Ok{}=4rqO(p{0SeC3q`hN%1xifRI%ZXijV`
p!xjb+4-@5yX*KfyKL&m^ZP0)`r_<JLoFV_>?ntK!5(qh6hCn(G@4^58

literal 59914
zcmaI7V{j$R6YzWD<iy6twylkA+qP|cV;d*fm>b(0+uYc8?(=`|t$M%R{?aquJyX+F
zT|G5bzY$Rtla`QRXZ{NX_&>5l^8ae_e?k9eAfjW%!y>Frsj7_?&GHKX%MkeepL~9Q
zKmSi(e|HC7Utdc;_Wp0S@wx36X!xxJiJOdtZ#9)=G)D{q4N&HngA&cmkZB47Dia^s
z0X`9n5Q~Tq!iDU3_IO!{0H2__qCx;WLOj6A3PMpi5nx4_ov%b17q+-=<6|$iF5*L2
zd0O%KQwc93Kgt-99jpZrC!1L!iyhDEksVr2R3d0>)(Rn1XqFuhkA2MgzpW6#iqKKS
z%*spGf2oR!E?NQXh2}uPr+8pzR<nqNg@^#KLRLJy|E0(Ne{uu>X01!JF@D+nk}gU_
z1WN<}{yQcB03Gx{FCK)%|IuJ)|E*w$&IX4N`kxtK_1~)hVuYgr09*hb01PA%oQOaf
z^k0nGfA(}@_ZS`dKInMrJh#lWZtEu+VgJr48dp^Z1H^=Fi+SY5FTt<UVV@iF0-Rhh
zALo~SCGZJ2W(_lFhtlE-K&l8i8VU+{A6J^PFQwch+5<k#aGhO}IEFG@7_KmEGX2Jc
zOjUMOPdy}<pHn|N;3=}f@dy4p71{|lshAP^mUb?_FC_WyjBSZRe{===N&48DcpPq@
zwwaOwaT&)xnaFN-G|9Femv%e?yQ^%PmwoHn8rwNXR1~5In{)a)RM40LUTClQzG0%S
zO_UNU$T}vu?evt{lH8zErk+2^01YvlEQKpO?J(IcXEfn{dM(I;h5Pl5#{xYbi|CEz
z&1mLe3@sUOwVPMH94s+Ev4t!Gut$Iw9uSCj-N$6FDX(~*P?FX+cEs}C0g(pPU&D&A
zn@nd8-(&LZbBs5_DE(nR3wcyl!mc{ZOqWy?Y3`g8DM0oVloKsDqa@YQnPa@O-HtP>
z&lR6<g9c#wWp<vB)9PCbNF)8069uo4WtHHyN!qn~Njm{x06<QA?GTiEoI$EMs4QM#
zJ#f6*A=V8)Qh06vkl<jjpSFDHgxwcs{%uIek^EoMeUOmnQg0mrp2LsGE=$fMT&whD
zrl5ty`gTcu*i{P%*QOvLgHJRwAyl8@tVz`_UjnXy#S=VXkkgK1SHM9TcjLxpoxoIe
z*-#M42(y^D9WyN25juy{C%>n{Syg-O62$n?r88NNn!^ztRe`)ek8VzNP!dUFG8h`U
zP*ho5R21e@FT>IbXC?KJWJAgyZ-e1fvn`2F8uu#9E{>nbdUu4l9>Y~aB#EY#v9a%5
z(R8ps(KuFzm;<!QcOi?E3UPUUG=&(Q?BtZreP>Al$YB<%fn_mL{NN*~9pF<mD?hN4
z2)!yOnJb~RD3xS1QBj~%;r`*aM~wu@NYhnB^Ac+mpQ-`Q#*6#2T>IRRV`<sZ>UVi`
zb?3xw7E8m4Q%{45B~AcAm=#k0)u|F1VDUzM_bf}@eRRKLU{=X_>gErnOo)yM4gNk(
zfb;jU9xg??k6fcwq>0!cNuE<;x<+2Zg?MOfmv;)};84abA!mVqWHMB{)f6&WFIi2U
zdEpRVRj=;E<b15n4RD9?h+TFIFnJvmNj#Dlwh95+$#?CM>m8gxE7e^q3k#A+t6`ew
zkW52?mo!*0@#3kvRKJqGGy=M;k1<5N23QHSu|79>oX#|_dtbx@i0cvtL~$@;E9Vf!
zS!!mKf(RKP7_lDbudQ3{zg#!WiQOhRw_#PZ^=r?azoqZ!v>B)Kamb-iVTsXT0pMX6
zBw^t~r6@uaVALVcpUw}+p)Jb%*|wxJsnE?a<iuK}^JZDUDlg_M!zQIFbdH&)Dp!}#
znNdH9U6s|x8Kn{O3(Jk#`#_V)Q7yNmv3<ju5uwNz70dNXOos5)<J=yYzXx`mlF-lu
zD5-p1?Dir=XC*7l_Dr#=g{;GKHIjv#2Z=}FfvMzyYsjad2V#8@7=!{S-gs)clH`aX
zC?XIKHLk^9-q~hp$oKJI^QPSU)z+FH`r{aTB0@UkBmDojm&YiN3;@9Y{;z5O|I03J
z8JgWdNSz;m6aXs(r6#eXr&J_1Cz#Q*rC)zB*_vW(&k>`kjh5GGDG~26Y$!Q-NSm1r
zmm-&66(G;SQfw0d0zC>S(r|()TFdjx%a<q$L5nSp#DOeIR2P=mA13%g@hS2+<*5&g
z>y(4i{FLPDKJtnjtgQKSI9aUL{BrV=VK(-7W{P-OoS-6%G0JRkMG4AmE715J#=7-M
zwvmn8;+-+aPqj}pdk*%e5Tg{cU-F9bh2`O#<>3NUAvQkw<*5Rqi^j-upxFpTpicx`
z^WqfAKRh4NMIXu3M>c8!s>(An+I-3=GdwFqZ~>H|@<Zt0LeP9cQZR@7&qW(A)v>I~
zlX<%s!r6Jw=xo%Gg3?F+%D3$N{BVIYv0KFn0f}F#a~wbB__L|EOCN^D7M6aBkxj{y
zNuFRBL#llOf+WJmpp~FQF-9mu<yp{tym8ruD__bhqsGtj^HYc)<_Ie<Q5!)EA^{*9
z>t=9vvxxvuyyD{GlQM|r2*jZXw3o|VKrNvJ<*1HxmWR!y;`t<pz>c3}vs=womP{Zl
zNS|4anOQxsM#M9dad4{QWwW!ISy>nU5M!T$D;zTOVa+5dkwBR{MP#3~Vzn-6K?uUL
zG6Ar|rY3@5t@6X!zz}{(%?aSKW}4%IQszp>9y0N)*`yl*@|?khAUQ=cG@LOjGSp0Y
zGI>ybg+-LvkdHMpgjhdk)B-zP;(8WVkHR5wV0a}rhhUC`oAK{{S?|@!H}P8OUy!F6
z4_jI4$uAn5L4lme>iU|UfeEHTz44ZrBX6FFNp3EId|yl_0h}Ue?YX;8Zun@+%^K%z
z2s@jB-JE$<J2lLVbbpP}OMAY0<u3w^LX7)sDg6*61^*34_9^VAvu&nE|L(5!`*P6`
zvDL0RCSRp#K2g`JQ(Fp>{A<vZ0n0$Ah|x;u44k1h7Xj*L`@RhHFk0W;OBk^Jk)o;n
zOj;PCGB4zZn!2NQKl98=LU<NvVX5Sfx_`vBPCYzqQ5WK;`Ew%Xie}#mz3GLYRd>j6
zN$e)`JC}@;cY}{@s;hV9_ewS6JhS(EO7%hC8MeEV(Mb~GV<@o@L}rfT0HI9T=vP2w
z1(~7yPzyEFo1IRdL>4E#_@{ASO*AH5$;4>$n?}PMdP;k%wgbka-RsszFWksyZVumX
z{bAJlx?29c*9P2~hrb>_ht;^M2Hh!Qdd*645jC>W+qCcYkRcA_J(H&thZ!|IDEB)&
zp1Xop8Z~Avn+4-wFvPAq-B5XPRAY#q7d<8YYIUeSXqHdO><JfQ)+e)LdRtT}d=+<O
z?X5oZZ8rw8eNtB4P?in5&vYBfDooKgH}SKOVS}2Iyp#{PjoYqb-%+9WO>3+p3f~TI
zw}fb>mzoARKc0FcB9QkPE)hK{F`=y5pFfFW&cpcxCMB*Id0MR}W!7*I7N!X5|2f!E
zb!zbkdDi!wJodPy#Ah0}Uz)d0>tE7iTep4Y3i8+Oh7#hHkoAO6MXJ1}dHVTHbcL(F
z)Z*bMSkM!{Co>`B*d*J(7PZv3DK#c%mHG2Fe=w2CzgatEkE5z0gr8v6#^%KISDz_e
zx#=3)!Pb{;Ej=?@u*m(sYIb_fiRodWO`rH61<Crq@jSBnCv!(SQJWk8S+O<SFM7lh
zNhSITK{%M#r1tOlUuChyzS}!Tn*(_%nw)`4r=nucyW~<==%CDNSX?@NW@zZAKwE&v
zuTo1Jf`*G!Z&Q2gjM~SdcZ0~HoM(qEyQv;Qia1SfSb@)JI3Ai4TpCgQ>V)Cv>v^6u
zqj5`z3uXs9tfD*{kNrv)HC??27t)p|lY&RSZYZ~C_ZU&&%J6w1uC8{1I<L=ATU8x(
z(^JCsgRa;kS?ZK@ujk1lBLkCZ1806Eb~U~&!~Sh?CdYtbPF90sh%9jp+(D(*lHS5V
zt6WK3v#~n=_Ci~{tmblS?-l#8-A}-EWp-Lp#QDAdjFYt9K@-YB2eF3MjC;9;;5&QX
z&4ZLH7J6h{GcH6v>y%ezMcIN_<?*F}iTv`l?Ht=&m-+Fm3re|H3pealOvurejV#C8
z_B@v18siYr+Krs?G;UG;%@7$*4^=#poW^?NZ$OriA9E|Zt<md(QtdxpFUp}#hiKGg
z5C64$xwo&kNw6p0k)hMC6wiuE0?YX2v2EKnezB_;QWj}@uk&z-4au0(P4M|AT)&VQ
z?jLyVDRdua(}-+o;<z1)>YUT1cOV->nZ;E^%AfX#?Pj_wos%{^0&JUs=?roB)?qM=
zPu4jJG@7qSJ%FBErT#;U)IXsyu^{5HXfKQJ*gJe~!s$x*dnW=d={7is!~QHUfvsb;
z#Cj~wJVI>K%E}7-V<r}eoBSGP{TQ;-1GI{2Xv!xUVg$_HAbwOxXszd2VfI`CX1RDB
zA!sl-0C<mpHnbWk8jYk)kdu?${!c+nadM1OVdbmhLSCst<NYWeuVSE+lA18R5UZ1r
z{~z$!jXqSp3t<$nIuuNidrW1tZE7IdYQMS=;DpJfW>JBVi7Mfm)_@Vr^>h{j(Xg!Y
zq&WYAV-~>X4B)XM85t&&fGP-A=%7l$UW)d8)1XCn&HF1431b#TpoguFeIYKI6|ylT
z(j}Lx@hVu`Cah9(=iv;00k|WMa$-Ti5IZaObMlPBIbpoSWVvTRC2XXzM4>MZJ{EaL
z3HU(a`2*b+^=O0AKdK5qZ1qb#Gi~gX@9<gW^<D?UM6=$k3UOzia)Ia5-#%w^QpK{)
z&5RbuWQ|!DMHHkX0ZHciILF{l`<RpvGx&t6%#N*5_m3U9iZw`|*>L5*fi&}coX}}^
zC0-*$q%U8UpL><SDLRn4-ehHi<#}DA=Adh&yC=Gpk3SPl#Hhhf>UkZzl2v$q)~k+D
z!+5^3#n>mz!zDOh!jv%M3aArI4k9y-j9+)aZPrY>_+$K2C%Dgzc1=2w<YIC%&2W)q
zi#?h3H%E>pLQG?T5P-ishoYe7!13L{7h4aqx6eI^BN6`N_x{b9O7qa@^XPp3aF0mQ
z(8&oB%u;y`k%iu#^+n%``0(G>{LtRfwxEqcC<MskVjM5fB;-xQ1BSvC(Fhe8>eKE4
z#T{ifOfaaZX=r+Amx>K)dWgfBb<TATNyXU-|3Q=uaM3D5ec|o~i7<q)sdi(W(Wx{y
z=o(~BeB&fPLi;?&%8VWsv^lU(oQ=b)Rk7C3?}bbOQxlS>CU(3}`ET2~g*x5Ipof@n
z5kbxxLKtvLRf&8Fk@;#>=a2L&xO@r<{sBSm=VAjl{kBTk*rw9Z5HjO@c&frOP&4>q
z)I7!;7if6YmQ@(hL$bb7lD%2kkN{ylV#>VqdA%V1^iK)Nlt|1s^HL`p`WoP@%!Goz
z8D&)b!Yq5CutKM)ugzBh(_LI_^N#SUa<Am9<W-@L&IDnd#ZwpCC+meDMy(EK%jJ;#
z5>bh6T#^5mlQ(UxvDmuA%t_v>{yuf>B`4uPAKLCDHDsNQzP?=CKrw?Zv;~F))&W6d
zc_}$JrojR&_+zhj`0vt>AMs}h6|cuOE<u{~lcfh%;;XZh{S<B8fBTu318APj1v!q}
z6x*014FVf-Q6N~n{IYVQE?kk`H5J0F2!7@vEO*os69e#e&=R7fGX|8z?+Qr{gpb=M
z;Mzo&BREM06^fB_e2Y&>_YTYvm*2$)`?yxAvLHwLxuSfORCO^mAN!Au3`|oZ4ltjM
zj*8t-6u_a@;WB^q0t@RzIp!15mH|*vKzkO(!iXJgbwmX9B}KBFVh|QA$;BuK#)1%1
zt(TLiDhA@VdxNMh3ja$a6}B-3d}er;E6b#~{2A>Z>N+N`!jqyKA-B(Xu-0EUQ7RO<
z1{zfUBXjtF`TpQaK~+O2^H}K^SqaD?(^9_T$2r`vHz0oDV@SpYJ0s^2wT#TF{z{Oc
zHR^~F91>#Y?tp$KG=MXqgeHub5)Dg0gZc|o5cwG7jK_;3Mfse4QFTD<&GJmrp~y<v
z=a`yBj+pzyU+Qd?bz}L?sZNxs;xKPRN+w#eqmx3W&)lL@xpm1sprmWs207=)41{EJ
zL?crf%;#uzE<3p(4$VC~ZBf?`@~3Gs$B|UL3d3<`+6EiQ)HR2>PBm<2r^l^NZP)J4
z7HDX=_4{V87o6B>w8EE*`$v+Zt_4Yqr$StBry=JXi#~W>BgGY!^JTPh0fA>S;H^0s
zFYWd_+$tq#wBw@iHXuWKmyh35mXmRi_0$_n(*}%&%=pr(aDq~PbD+aXh=i4*pos)V
z*Gdq_Y=0>Q#hsr@-0N?$To9l!ceH3JUO{tcTD=4sW+6CjL}`9<sC~)%JzqDy;qLr(
z$I$Dvtkw0|?I~y_=#(tKQ^gBIvM)IQm7Rm(ex<B>L1V|}AL%nn-^YJFN8Ign*Zt;|
zX96cWXQ#rLfo9<5CFuN7*F1P+`oOVhd;=lebr6b_v`cw7ft5}yM?6Z6ogp#g^DHq@
zgBT@v+L;mhs_lY(D}1uM6BjBv!+p}4h?}!oi`2`;=0sTUC^tzG@nZ3VQu?+ep4^j!
zt~*&+@iw+EjQB&uOA`!&{1?yuiyW7J+ZtvYrnE_yrX=w-mM!GjQOO}YA-{T5Qq#~-
zeY!iNfcwZ(1*z<aMv^|eLUz5qcg<#x$!wA9$*gz&TeN35#nMsqnP+Q`T{YiVai}el
z4v8UlN(IyMVxKGy0|%|dH^$E{Bndbjh~i)atU0EPSewLNNfx4}(30xb8THmtMYMgL
zEhsv(3a5H}KaL!I`eSKYC@rlRX%d}?nrc7&JgePl*3+<t(z#Gt;`0YQ)7GQHJ7xK%
z>dUH;AK|FyM#g1V_~heqVKbtrvzzMXGHz`+wY*KeVhsp?nNan1D(!~@d@fUwW%T9c
z9GUCj7n3duFFg<TD%|opI8nW&uP3Fb`aO&7(J=`rN9lYH?$xVZzD8V%_+b&fx)B%)
zG4)RjjPQ?N3yG!)Fg*B|2wRa##Dy<*9Yf5OSk*dVXXht76>z|^OEu@jFr5~|5vxWB
zuHn`g3C~m!do*bi(D3<fh|l(<&=8yD@;`n4J-Sb#CjN<d2cLG-|5PW{Dw`5E(AaBG
z2lsGB^mE?)2Yp7#iKV2vAEYbFh7C_Bqfr&SGtkBC=eE_{{!J9Lv<96{;~6?L_1`rS
zAwjY={YBym0R{onG20mRd2)Q|@W{O>mEsQ`MP7s#ffjNSCgIka+(n>gRVfW@)GSM@
zBTa60n!jF98kp|TitAJoO-v|w#en%1HzOD&i5s$Epm*R4KfATnw-ciiJ~O%?wz0sn
z`6qx!RkC6E6tgydJ(U1YqwL5?YGUNqxR1Ye7Th!_%G|E|t**6p(5f>l*yY&pZ1je0
z8Al1i+hwyAt0wIl4<jaTB@f3+czjVC9?@sIv(fNg%i-ZXOVx&xnqAFkko?&oKT_E`
zr1r}(7QMHT%9eR`FTJ^j^+8PkXJ03axAFxF>RC4<{LJ6?BWOuH0S5M^qPqPXvJw$W
zED4KbdEg2foH>+OIKJ(}@E6?QUWtpQQC>N18{-|_{R)#m$R><nWC~{o?9WL)d@~N0
z9l7y6=lZRizyHNCS|6i|@Q|Y2s92QSX6>$(9)5ZzFX9`6$p5vbDx>wgT%|q#_BxP7
zB9<SHRo}DQYwYjx_ifJ0Pez2725&y34sI-^{(ZGi#v~FM)ds3#J&3EHc0<HlDOI^8
z`kP4>8CE$kd45(u(jAA;&sX#?g5j}{pi1_MdT12c$2d#j>Sgwa8pQ|0(Hb#xJ}GZ3
z#h);6h*=cbsGr+|PTzQ&N2SkRh9^=@PDXC4RIz6_5WY0J=XHu5yGQQ3!cHvVZ`1W(
zjak`~V6B%H&>s}uUJ%;~w>xW?cU_T!?Yhs1U%E@Gd?A5V$ek{$w0)}rA+}49lZxUT
z0#V8>>ZId-YuwqX=A%ChA>sYC<?3vCB^hd0s=4~{1i6>03YyQik`%)6?L<AIsk4^<
zj?`PB%esk$Q%C)lSu<ORROc=S<&RNc3WmWjUx|CY14I92!dSo1GB7g|Mw0T{dkC`}
z@!q<7(#(x^dTP|xg1y37@@2c+Nh2e$AEVGfc@ZKZRZ$r1qXN{1IA)CU2Xyais@YUZ
zUKhHFBJUhffH*dHFUVTyJ2=2F#4h<yVT<Q*fO~8j@jv-oE!;au&R}do(K$q1@oBg;
zYp3QF?eIS_j_8p{i4z}&s*0lhD8sPc7fM6SW-vp^7g)5-Yn32&gCmKbp-)oG^M!GZ
zkq9&}be5!oD7tR$p&UwrK(rL!;6zxvM|{NtmX;fP40Bei)KE=o$s%*xXrP?02DH!f
zW-;rVifUZO<bfyRbGl~*G-izlg0M3zz)Q#A&6c-}FyQ6AWDSm*#<-$FkjU@mCfv8U
zNObO`o6O|XI8-bt{_zvWhZk=lCFVnU2p|xUm@nqSY|3c7Mc0}u6pkWn%zk{t=}Pu2
zMMEr1J)&)F&<sIy11m^hY1&l{L}YjzOzj*gq*={|eT$|>EXn9hq-Mx6FN@AWFGS+h
zEeRLo80maEbDx0LvC9;NT+(Qi;668eb3V#xd3OW0^tr1E!zkVy?G?c;rxxiqfAk*=
ziVnEgvUCQh>cW`F%nJf89Hcp4y@tg_VZ|Dx<(-^_E|Nk~ST`D3Dv;@$MLJW?ySbr2
zmDrIjO~2_|qyF&D1lodeCc*KHY+q$Tgh`X0%0M&xzy^p2(J6AT)p~F7!U^&AAHzi`
z2U+<<$q-q??8Xa}n7h!@xVuF)m#>!OI58?_s0AG^g8;2h15ZpE6-mTQYMud`ub1{E
zh`F4U6$Do~q=2DM;=eDq;z3oSFJC)M9!>(o@ZjkMraxZC3|;HHSy9#UL%fyxgDEoq
zAO=dcxt{VA42P9Ybsz-U<tB@9CYCJxedX><i3}>!$P6C9<C?QFze|SKRd~arFP;)?
z8&rnC<{y**ZfMqHjH4v<caR-(mz9>tmu9Y-YmR!Eo!_>U!4qMzX}!;*a#e_p-}%4z
zYPPU%<SUK`ggo8$KuU9~C=x4CGpD^}<ceemwF$H+!T$?0+A^x<u16nhopL%?*u`Tn
ze=ALXa(Hh@HoXb9N|ZVjt=~=IVUgM#Q>d~@pNi`9RxIfZ)bQj@F*l5b1r`#_aTgF=
z@p(x~tTAbs#?9oUD^{9KW4_+=UCMyUYUjfW5zq#t-ySt+r(ta8+0QwqsCUqX{E(|(
zt3&E|<GN(si4&=xgcnZ&!WU1ro$0d{Y7uN?gbDU~hhOptj>k68WXEU!*(D-36KvCh
zM3$CISj~=X-p5}EA8AOKXvP0J&}4%@XATY2Mw;ljv-wfXZzRZMBs>^ri?2B&>C~C+
zX*ms)7&m*Ag)Uu&UW*>mg~E>z6bF#$I$F*CF){)y$vxTbc0LxY3Gx;aZ~bsPfTN+a
zN8?Yir@^DO{PdtOMZHj{&ag$QlpHaf2mnJT{^BvwK-qke5=IO3Mu$QRTACi^)Z{RW
zs)xJpES;?!5X)|~)TCT;iTGqrkRMv{kxup!o%RDaA*0}W4h@ferWWu_1t;hW9j(GC
z<(Dr%vz~%`^P&8@K6_%M8S>?a9?S}z)GY4~r{WawH%qAzqwFUh&^O79BxtoMY_x6R
zsTpt6t0SY{_#FwS^2jo!nPC#0;5gpj&2eM(rh~A;yCVQ}Q-zV!M(~qFU|}f;u*as6
zf5`HNz)a?*i0)^autTTNHsdKCPqRHD@X~jk$Yl0w!j^6~0y&1VpNmRL_Gpj|hbeU+
zl)?o5efyY9fS72~MMsMVUQEH8Pc<Hf{n@Q@b|DwYgClQlMCm*vv4HtOctgtUo`j%R
zu%QpRREos9(%`~vBZ1D>BKP13;<I5nZjTL1%n5a9Ywus`jVIg|pLrL?-`X>80W#Ha
zOeojXS%<h}P@I>hZAjUS(`K}{FzCQyg1O!_b6B)^sESy;7<BqdQDv3ZV*MT7#c66_
z%B>F!I*aIyTRh1vKuQdfqR)svabbwciG1HEj!9z0GOuotbc&>c#eGuA(+IMFszRc6
z-P#l5yQeo2@>lrNGa!02%S780P4oI<*U+w<Hnt!LrMf#nn33J9t<euN5Ds}V>COf=
zjjrvX*KagKO<Q~ivPPSkhO;kF2D=;%`@HGbzySM;{)#t*{(SxlpUTd&dinE|!xxHp
z#uo~T5FPCBW8LrZNm~^jb@%A&kA2VCuj~CW#h<eMSgK5UWJC2q!m3*K!&qQ!e?(9T
zNuJlMpZ6_0E_f)l12pu1@MV_G8)}^H;IpazE%#I^=ed*92>4^Q5&ee4k>=3B))Vch
ziacA7ZmFciiB@aO+bzr0&Jm-+WM+cG@--IY5oxZ(F7h3r_r&;u(Qz8*Q`Wecym)cT
zO|^eG=Uc;-D2Ia)Q$~Brx()H+scycS*~r*mwd`7Bgzhkm_}K}!I6nORFpWQ`E*oot
zK|v$*?07_{KnY1k`yC7w+ilpgWb7F?kw`c6g9ki0nVLvTNJpD9oV+Y@vXLJyz|<b7
znVnRk0Ywq=HbRssqjG99Oo_*}g5!YasHk>ui2r&A|A?9g?W7Q|o9k64cnV7u>48Ef
zBEqB!8MS^Ym?v_c&>S3XQ=#8<rOYC^ezz9#>uLyj0xOtO#RDbmMov`h>Kk8m)5tW-
ztRmDz1N=xT0b8SamSW)bk$D}J^F|bQY5}6s_n$8A*wkH>X+_4u9*R~Xh+H7$dj@WB
zh>E}jHpf)1&1a3=&%GTNI@T^<yZHcHXbaqRhOTi$M@MC?445$~?vYq(6At2SsrGrM
z()+xaveazu_$YJK856Gt>(bFry!)+`_xcfqlk1a;J&_lQt9xww>2>P6SZ*p-OAX%I
zB;lY^-zFCeUr(Jnd+i>*-5)>CP>SI-?`08vnT*}(fZo$T|IYU!**@n}VR86%wOi3F
z?ZQ_56@5&Sg!UAp+g7EK=#45K!pHZ`JHiO12DB_^fX{ZYEPwnqCA~~0Cuji2`>~vM
z8%3|4!}q0yB&oYrV`>(440iex0vpIvPO#+c>3?T6uYm4s$_`sAXo<Uf(jbLQUeZmk
z{3U9d_1>~7A0LbG9VTQ0OWSub)uzkl5lHu*eR4$mLdV%8AgJ!K*`(?G!M|MbTOR|H
zSB(q5_WXzbb9tWr*)l~eW58+Dw>30OKRXdnMYgD$#4>So>FP25M=hpy+D>>%q4Sq8
z({r|tMbg33E4`7{FZWULq_JULOW_0Q%(MyKoh&%<G38390-d$}L~0!RR&AEN@HI^r
zek<FAN2!K>c_1~+A)?^;>Z85oF3Qz2iGr^}36+-jIYE?B_uSwqEqjCBPrGOjK1~91
zY&S2Jlj%l*tF$#Y@booP<L>k(ms=iF=m_uJP?vQkOqRzpJ4w>mL!li@los-B6OmB*
za%`d_eTEo?W03#_mDneq0BiTX!o`M%#rp}72ERAo^6LXL(Oa!L_$q2*;6Iy4G?d$I
zS*k0i9#Dsh1opPx^xHg_P*Q)Bijp^c9w+Lj6n?Q#32Zyy;z-7-Oss8v)OB7M``^a-
z1oH`+3mzs=z1ZM@;Jo090y@2Fw~n)sPEE;f+Ch+*J9MDzye&bX<HAH^w^$Q#a8sj`
zl6Y(Rwzpx+)Ej9L95a3hQ^Wo?AG9x7T+s><)o2;>c;4R7ZS~J{tm1k+pJ}=|uyqcf
zqXCe~{P+BI!!@t9P0-S9aCyP98OZ{vlPg^(QE=(`1SR>HwfkOiYeZUzF-v9na)bMX
z<$mVc4Qgf5;(N+`(fEdw<fVWCC_vd@R$SH{{g*!wDif#!yo==H<CAM6fZY{0FJks1
zBElW{W{jz#uEmP<daI?w)iW}vjnO3`M`$;E(JLk0X1i&~GUS<W`u5^Bj_GXOt&{jj
ze#5!4uf&>++4CksxZk52q*=G6Y8_}QmvL|*SYoha4}VuP&%e|taW@~OVtARAx#|}6
zpnyo@Uvv}ba1xA9L&}Stvy6x#n^@=0w;84NY%55}!aBV&E*3sOTaqbxY~19ocEQ$i
zz~)wq5*2p_ItOSb|MZhVwmKcD#}M~At{Rl!3I-v&{@B?s`a3W5X2`nWIHAy1mL_6~
zdSFizcj>`XD;Xt+27cQ5M`IY6=FdSV`NB%e*5e?t6f^fg_5$zVipM>&jMCX6y<hjM
zcD?*kFRwvy(>BBNo?bez&X9Jv(urPtNd=5ju&9nzKNzTa1SM32x+?<*uo5SVmMbTb
zp+?EyF81nu$9QGpR#&4jHZi#mcYA3#_K?C*nk#Ck>HJ4DIIe|xNRw@Ygs+2;EZGn-
z;bn`%c7e86{&J0P@y!xvYQ{l7St6~g-fZw1F;A%cKn<n_JASJ3?er}2&$h%Ik_F}r
z2tw?_GdS!Bk}F^BKtYAR9~0+M`x^Fl>{V)7Fm3PQ<;>r#6;Q<=+_Ev-FOLplHVjVW
zaW?~BPx|vz#@mjz!=vxP`O_HRO3<giU{tu9g3FWhLKxEan1|q5fbXrc`?vbF%32Pm
zNh%eZ!!@|rF=%3-t16cdtjP80=AN#;pM%k;8L~Y`)g!;neA5SyPEeBwuzkkT$uiK;
zsfgNRbyc?gWPhMKS`QXevV5|n79ToV4GIxD69F{%D=63h#SJ{CH_{UZ^AdU;BpG3q
zj0R5*Hsq*T!(H1^*jYS$L4q)8cISs>o|_}__?h&1dN2~AJ@ayz@M&!!FZ)t}uh!_w
z-$UGY+PJ@jlJ}Mc+xg((;EJ&Wrc}fQzSBoa$<9aPfra%_{khBFyzMTb!+08BVhcUb
zWrcMEoGnvVi!_$O5&2MMmORPmO+uS}U(({sPq#0rap~dwHooL)LyW_&MKR)pO;Dz7
zd5|K*`kf;L!(w4t7R{|c;*f=-&Wxwpa%KYm`l>rt&UO($l<UmBelEJi%cRxW))*@4
zO0)p#G8%pLk3)-nmrGmGiNV@<^tUjtw$26`N*2B}Qq305nAAPq25vdVeq!p5xwhf1
zEzPNUCmxvlZ5YUYjjc1jd5haM^XVq8D0Ai}S`ZGvF@+?gqq#bqS+8+3PuZf~N+{t~
zShS<y)&#oll<SKFa229BHg*w=x0HdJQsh=Sp*(XtQ+qlg@lDt#BM{SknxXKGbD~R)
zaVr}i_3+`j2ND&hyxY-U|8ZQf|3O}WB-|C(DXpfNrNg1z@Mgk$?#A6nSVjK(h0brQ
z5fS20<OF_UhjEpdQ&GU24sZ_#0hY8-co;XV-8=CVXUNX)ITEyz3wH+WvB7g1hm3~L
zx7M(@!5X2%O~Huf6*++LhaAhc&p~ctYN^X`9q5!K0_XUb-1q@nQ0KE=Q4XV1E!fM*
zPwD#5a6d+NQ?WmLbzYN!zW<JGC(Wgn5~n^e2K-;BBc$f14#1-B{~zf1pLaKS$A{OS
zAeWEJeM-X6|9I+A(2~fPU?smZ^>H}Q=aS~xQ6d{5+WN7q!L{>z>zEv7c1f7QEQUz<
z{F=R@(*$*uda+D|G?lTj#PZLY*~!w~5|y^W6%4JdTA>ov+UaO}f`027c`H}9KiIX-
zjL(j*AxzKPR?pRY(?sNkU}yK^v*&1QtNL>Sk<UTJgXa!<v$(_ilFl_(LxJVy_G6#_
z<<_+q%#Q6w_mzTw?WnEszaCG)jP|L=)UIcDgS^M9_jC8|?zQfu?mI#KHuIj&jjNt(
zU;9lB+w$(qo}Q+2fsJe5{HJdJm6^8m=S~6t&2yibj_%{0`|!<+*zV5krAm#>vh8<&
znoEY}B}0#M9f;c8i>+e+v{bG(rPMlLi~H&^g>3cKc4yDtgSz+<tIoFnX7+QP!H)mn
z@Ac>Q8<C!FPyZRql^OYGI+x35fy>Lhvxxs-4*)v2)!5k3|Hl=ALuV5ANx-F0#>vGA
znf1wmn;F64fu)E-jsXLL=8aS25y3=h4grvTa;RZeV+-gg?Eixf<p2OMW&pTZU#1)x
zY9U-aC3_|yGpjNP+*CR{hqyfIKl-sKjo)nSzw(6ai)Uvy0?1`sCzZ&7=8DY)*lqZO
z7NoPy<^(9`@Ysh&K-ug@<g1`@#eP;Cd3I)?4=$@2tBH>UXpVhhSd=yZ{6AU|f--0p
z0EUS7A3K@FOeQA>2a2HJ$M{5)0L(GN4%m1}fX4r$cvy|1PtOn)$z*(qtt-!btmMel
zzG<>iQ$%TT6#<z5IeB&fYKeqI&@3gmbqW9-T`ssX3y~5+bu8POGZa`59kwvf-j8Qf
z04gswTfCQU`C<JZsKY7FPdRS~n)k`ViOUb>S0l|20|Y@DktDLi1v3N4VCM=EB!VFO
z*yjq-0dkb=l<}+x=;#s=a^)e=mEDMV><iMN=wu?+Csfge`IRB>l@vW1N7?A7QguNw
z_+TnjkixfOM67+7v(4zCH|UvB218(xN#bBHrF593!m6QPWUCWy<V!nlw8YgB-@QS}
z=aLzie~i*+ZXYn_2cbB^4Lbqxbo+&Ab5G)78w2Cv5Bcz)kGJJ>9$6u86yBOVC!@qE
zJ~55oL{kDj<KfX!f5g?XZh_Y}>pBcD_izvR+b~ibqhZ5WwqE@$&!KQ2hU{2K*=N6K
z)JJD<YDX+p!2;jXVYS-lSWF!s6ZgXww4e}~wsjssi=A*W#oe@zgf9OdCxWM0foAI{
zK2a-2{Y>q@b+`82e9SUo!2jfgh?2|*M^5S0;>&LMotyKZRz2VB&pL}R(*8oa5Dl7G
zopY;aS%vid3kbUKDHz^Q^tW?0W#32H?SmCXFAie{4r3g0hehxQ1IC*3Ykuk62D5S<
z+kN<k1;1A=Z^41IC1BK+cky|aoAXjleE)T?R3>fkgW)Na{j6kHgnf|nGaTKO+YXR#
z_8a}-!1L?Ijhf+C?O!;y9Q5v>orNiRy1aE~fy{$!y3&4TD4%@<%e6;4<jU>+ZnGmo
zIROP)qp?f63mQjq0Yt7b`-1pqDQJpl@J^sKo+zuC7e{Cy(-?n$t!#RA?iN&s&~h>d
zXavOeK&in-KL1nNlx)lKBO*+QEgVe!7j3?axcxxutDMfy?2jXrGKanDr4pwR$`giX
zIUVk^y-gj|hTPtS0Eyn`6z)73R|t_+(t^TFowp<oy1XlnUQ%@GxnL^?!@~%VMX?}p
z3)>G!=XSrM5274_{UgL}efrNoT8+O&<cK+Nwd8X*OvTEpW63;QrTdt4r|%E0UIw$;
z=hF0avwSVzRZoB3xkXDGNW#h)d%?`W)RO#8Y1Q++lK}rf*-Oim<ZP{3TJ*XuPg%=z
ziPS$bmQ^j{-X^r(*B;_p4H<$26I|n9OumtVSneTD!G9m=5{s%<?JUVn$`W{{$20lC
z@KQ?23<T&|?z|Epb&{A^H?+o!Aln;Xze+Jj^z_RI_YMfa)B86i4@1o6kW2rFrNf*G
zvJ`7w<Gsyzmku41iHpU&&Jy$H!ula~fSTmz!t}G~IQb|DRj*-ylg(IPT#naUvTRPH
z>qRXUd#@w+dNHzODFFhdG4PGeMX4{wW6^$nECeZJQHIW+UICtR@2k4nz`U472^%qx
zXr*rs)hd~l0i~~F`@a`D40=vn2Y_!V(=*>Al&y$uV=|~T+?ucvyzvS5SgdiTjf@kg
z<-V>Do7WPF%p_5~mUlGYx)?Ih-~M<qizIvp{dNl!!7OsomODBDZ~~Z3Bz5i--`5In
zSP`$$$sk9+pJi91XLH%HMbjNr`q|o76OOk)UfUaFayN>FGKW^w1Kmk<AjFp2eIqtF
z^12=%UX-)yAwpJWV2l@6(YR5#x75O@E8cX0+T2EWD^2&UK&%ddTB)mcF%$svn70^*
z#Y?)5+N4oyv|aI3rmJEoc3|2^j(2Y;QMzgYqAz_X{9YXcxAO<n#bukjdsV{JRlfN;
zdVo@850xhVUOF7uDMA?R+eK>Bf{aJnW27|6Z-uDPlL;27KgXLJoR-2twehwbfJEEE
z59h9Jn4V2!I7P-dn6_F=dE-9q5YL*VL<A$t+b*JyMD`kaK;Sx18k}F|_k$8nT8?Sk
zxpVw?(LOuafYmYDFG}&k5mBlcQoOp~mwSKzn8kXp@3#hwQ$3)PO;lN-ot2#Cd0rA@
zf7)SXu`M@^3%L)%)TF9U0||AOS%2!lQZ%L)JWES{ig?Nu^f|QRvd~+ZT67M?5tR0P
zas-JmxH~6VuDBgyK=eTcy_InpbIHX+_*tyav*DwM1Bs?KYx03tZ#^ZhmmNO@d_z~e
zDUORuEa7>;IO}DKf>>}O%21~ox5)^7VRJBNeR8LrnJs776kFldQ%6PkArhNJm0v3y
zu*ZB|^!yCawZWGXIZv9Z8JV3!*V)S~d$zBb@RM2#FRiJ|NBw*`J}~1cpekIvhnN<_
zP<U?iJ8DrWYaQ1GXsGVzGTiZLqag*XWjMczp~77Kblun1;eI<Isr!r%^XM~od!kBc
zpW~^5yadxH(D@}<`DNY+<N@-NC+8@dq2MFVqV>yC7gVUnWFRxEEEz+QRztLe2z{|t
zwbxS)G2|SSj9r!-Q@(eacP~>~%2=d`t%VE<2`Rso%zmec#?oM-Aob;)1C_yLLuvho
z-y~&B$T9SIn@Ed2VgnP@kjKAN?7x~>A`<Vbu8Bra$pameUvChllOI>E0QMG5sZ95C
z)%Y?FKo?)uRoY)SM$=NJs&!lJ=U1?@uPP=tog4`BPyH;63N}Mrh$2q4gJULdQGV|G
zHWKS76oq`)54B9p%zv5w-44XQtOwzMcL60l+;Jwf69P^r&MJ|AawSQ+7E!*fjAbuM
z*buhAnsUac1cz|W>$MjVtJsw-7hiq+0&@`}Ex2K{{E=Q;v<;i%>>gPbnlaHrdYLwN
zMR?p@P=w=J6KbDIGd`R*kv87wMhpSE!A_>Hlb2NRjrIBWrQZ0@&u4zXK<(KnGZpR?
z9oo={0XNOdWEyPE4u<ZgzGVtSn3TxZPOl{L>vu3MH0BQ8!g+>ljD?)lN&Sq@gm2xX
zGK7qOIe3;bz&%*tndHWrE$XjEtj!K9G-=syLqyGn*E4^{BNp=Bc{)FB2&@JOV)l96
zELb`)3986uqDP}R*>b#>fY-Mr`V88oRoc^s7On5R9jY3{SXV--wF2xm;YJG58gQ=Z
zR@T~~*EO$VqK{0K3<1$^^}|Ua5#l(spBZgF>6HXJVNzaaR&j>k%Kz|p?K9>A)4@G0
z?ZpxS0jJvVg<jxV01grdpH5>ZoAJ3l-n|>23Pt;y&YtqXe1#=KCQGtZOP^_@wo3*P
z?^}q+D}1jspUaErXPR8FP(1HD(^wJN-x}5t)}voG9@y(1%k2y)siE9VY%Yuskt2b(
zNH)m0ZM9xk)wbT=3kQpA8kCWqT_%WT?AwU^^x*LCo~Qt5<QV9pG{VjW?$;7ke7bel
zys?Z;1zZ?0SDf(FU;N+@Ci*l#KjidQj-BR+P85~B2ArbJk*TQ1peN1?t!LV~y+x1D
zJ0Pmn5Y?Lp2I<Ye8Q(953-m-H4mMe%;T^U=a0b2EIOGiG<r${!?2sNjEwN3tY9yuC
z!Sp?GN2n1ke#BLdv@07!Q!_v$-(cAK2=xn_^fGahyVBQQF`x9JW@M%D;BWwXQoCcK
zm>dd41by)g<VkL5PW!T(op$7?o(og;X6PE)-=##=<5Qp#O{2Gq{cFmoCw)9wyN5`k
zpJn;Ma6}WppmRMG)5hwLIC~jBQ`)+1f2fDX@!kG8sP4;ZCi#sMSt=<j0<UinyhAo~
zy^#}-ZGW{AcrR*YOE)wIPu~mn5Y@%qkSJEkc=di|8AYVLIH$SK?#{kJ!|6c`i&N8O
z^)<=)ovae%ZoLY~OXkRNOX%RIgT{jbkCH;V`RQ$yx#fQ`HP?lBDJd4<B7$f`GV8j6
z6P&Hfn>Fv4^%SP-WfTPBuCV8YA318f#-!f68Bq7mHf)(AE#BEJXt%rxi1eF44z%g|
zH^P;|p`?&jwxLLBob<gfz5H^0ahp&m55hGYc@Fn)LW^P42;U}i<-O^NLCG*jnVGy7
zh}T6qAOs&Au!OIz@(keAOe$vB;eT%}?9pQ&I-5vH>Fw+m$eur}G!5=Ikiv>)#_Y^$
ziargis={49)Q1T*MQ)>#yglDMRp6{xDg6ZPe)81h`t<_eUz!!pmzk0sDtFC9k_M&h
zQlMf#iz2>$bpHlhpo`d)XJ^}-xlT|t5OXK5#@=!=`FXTIzV+(cdfUBCkv73U>p-8!
zvB7qKJ$^d!Dr<HG5P(SRnB9@hJhUtD^M!b{>Y%psXo5+FwC_Po*ZLqY12chJ_!Hvo
z>bt(J<7d~Wk0yAdqCuV!x3m55i_`1?+^{5W3k<V7WWU;WRA@a@cnc)?BTL;+#me3S
zE7g?h%BXi3%bD^Ow=rE>chk|F8bgpZxP5jKJ3yApJHq!+s(XFvhnV1?Dt5?kB{>wX
zq>lh&>Qs_$dk<Onk6gbnaUFr{4rSlmGpk+4C~e@a<A~;5WB^>~D|C>SHlon<&*Nyt
z#4FoGic3fMhkQ$h=NNb@DlbeN)WS3XjxBpR^FQeo&-p3X+rSXX469sK8ms!lXWT-b
zg_FB7a~zTp%RgcZN~j7LE$$59#K8l+=rN~lYF<ulLr51<8c(@`^6sv$M{4t>(6QwN
z?OXX8<y#NZezB|Q7qQ|l@6WT*!jL@(bNu+VV`=rFv5b+Xf%^93|Kx%FCG&qjItWbo
znn|qx`<Wv{mjohsrWlJC@~D-mn^dE&tI8CP4XSPRGJgp}c~RuPyPmFki&mUL4;o$6
zAYoPV`%^`$YWAicN0Mj}=lHVzsxwjbl^#Lcg#L{mu=|ZREBR|f62JZvLbtjk99xB9
z3hnZ^GS->Z<3q1zkTU0~T2U=gHOOQwO4sOHnj^l5Yuf#Hlr6V1d|RIc_-umNlvx>2
zX-7`x7ZB2wKu7gA$>mG}hsyKi#xnEy(Z!^^v-UF-&;rzdwWgI-Cp$j}9>lGa@HTZV
z=}J!A(nq`K*pu++aNH$znuAs%xv(K|U1_B)AzKuBjt}sB=})8*r;D9<t*ZebiEPX<
zj;X5p_>ggViBIRX{eURNn2Qqo>EHf#n<n}er}eT|lt|eXC<zHe!bEYz)g+VxiIl#H
zU`V*>dG(;#xNns6@blThz0?RoWdS_6v1U1>4}nQKv>=XCqNhc=uiM4->LDeBzOpP@
ztFkxgk2g=G(v~+yTN9QMI7?Mr88i5Ki+HrvD|q6g`ggBD(f6!q-@v&QxX~-HMCa*>
zl|^^Q?|C$U_Ny&o0FpbtRgvsv!|abbzrawuj2aF`CaxCR6|<$hu)~VMq^=eYzE~IK
z?Tt>dVJXp`6Fr<eV$T!TT9;7R7(nKNCnUo%q|imB!gBt(_~3w0l!%z4o7xa~VUy)d
z9?uMbfB>MsNr*k*YZ+$E)?h}UD>k4x1bi21@fReUbUcJl00={fyOS7|M<TDu@Q|X@
zyYtp%%mgcer|rcBU_a}S?{B)ke;uSOp5cG6=$7_2hVWduvc{6<@iws3?~nLa=Cpj5
zu=FeogM&@h1D1d&Xict)G&Ny4-5OS20TJ*9nXUzJ^WcN4;SbQqBp2H5XNGI!;;kH`
zjBoX~;;=t+M+wQH@NRL3M0-c34d+PPu4L_SI<BWSb3X}jk6>|oWw%ePp4eEI8`|*{
zEdR;-ABtGZF2EF|@7__$aP1l5fTuyV@J0o`nuoOK{c}1eys<=RzTPNY!3OI(q!c-%
z8(^|`{Xu8G*CP5xM+W=*eVV{U)nSLPBi+E4srM$9O`v7u*w*C@zc#wb(A7WId^PrT
zb?oba6zuroVe|KPJ;#|!sO7{rUGYBzC;$&JRi$U9dIL5V7CI2&Q*}NP5=nApHDl>b
zVz(3c9X3UPY+IGZ?a7W8NiSHI3-$2*&<qT}AmKo6LZ<!q0U#Zrhy^{5^+n68{hV$I
zts@uIekqYR@Y29tHIHQ$S}~apppH47ckjqR6d1hhdQ`#?@=r0N<0poPJr4=y0a40x
zdBW}>rxM!S>HaQkaRR`QJm8|W?sC(fNz4XLn*z;3x;f5cr$Ysqvxm1`V%kTJl=MD!
zJr2CMtq^{F7Kt`R!WRPuc$Y+k1`b)f)MMrQ)ucn7K(^aiiB+65*g_jLp}cR`@o^YG
zn^Fkcg15A^aY9$uadO<=;!+3ZNxT};U#jXEPSTFi65scq8D>a1g%l4SE2d{xg~Q`8
zZIKqf-7i8f|C#|LzUx|9|G+SvM7rq#GJ>4Q%YbX((6;C6?+qzi2U}2g->sBx={vcm
zmhv17)QuUULz}UMBHYN(x8MntgA=un=uzXZungZ+s|INGTw`gYWXL+?X4ewx4i(>_
zjp9YDrP~fjL7vUu*xtX}M#%%L@-q=rNmOU`LvCe1d7uU@&*i(im117}GkEc!+X)2=
z<2C-l5UXW+Dt?U{UM$ej_5@OSugu-GDz|Axcf96?d3Hp_++3;Z7=6@vp)|DESqa6r
z4a#Is2K0?P)zMfStq(R`Z&7_$D>}><VC*5ZjP$d16tb6XU7fR`h}4C&kOIHJ>*xG1
zKG1BjH;vP!MTs|dJLO;e%)y_UWkMoZa_o!fsAw#h)W|)M7gApK^51iv`Oh4a^Kg$s
zExT@(u}LwWv5UJE!BIO4!e{^-czCi>EqkVc14~+7JYlE(e7|la8~$))J|^U}dvKPI
zv_+mg@BfYQEoqFW6c7c{3S?Uj@oYx%1x+zO)AVscL@f32ednYNeJx@W^^Zkve<c&2
z;!vb^ynmHpDfbiER_;Zj^nbXV9*(lfqBzSN$7!~>4>Kz#JacK%JWmj3lqhaUu9~aH
z8GTa<Q(}1v(K)Kj(uXcWm&PB#l)WLG91p+F`Y-MK5Y1JH^_sD}>7a;L_G(F7e=%Zg
zW{@!s8rCpo@)VzU3wKm?>*cj#A-z)Fsf1H;ySM?HGhEgWn@B73Ukr)BEa)*!6mT^_
zkF$4Ad*O+0Y9tbQRmL6xzYYt9{v*X0?%RbK(;L!LTEQWo_p*FC^Syf9V@4M0(5kmI
zpx5e)MGb!Zvi8amPg0ocN;Qs^n67reQ?01k85uWzji4o#Wj^>l(z9X_8)O6o$V;cc
zHNc`XAV9rNx;is=GU!Inz^h}Y{{mNyjujW)d_TQ`I322iW=I^Va^j5I23ZN8OMA}L
zTrV>s<!(>@(7=jp$rK2)dkQuZP?0D58*DxcH>Qv(d>^k`Brdcl`tR)RUB>_TP><JE
z<f1+_)h?6#t*TBwD{%0cH&&>|Ab6d^wA(wReE8yUuC3W+e53u}5LNtf@9l0GwC}=#
zO{N!l2F9ZCn)Zgc;}nU_9a&tbTRPH`_o96t+d>byz|_*h6t1|WzRQETlo#?OGZE0s
ziR`U-P5z7K<Vfpjm5f$@5_(N~qiVqp|2@y!8N7YGm(=l!7N5eoZbUFTB*)G5;kvAS
ztV_o$>+9vkqYR@u>}E;WNPkPf$J5mte%iIop2$W^P4ic7wl4u_p$`MVmkXqXKW^)y
z7MMs?{CGZwirR(xq)uA!eYZmY{1QNh`t{pzJdz$E?$5#UwORpu&JQxBmY*4xd`rzN
zY4!DY*yi?!KpsbwUcPZI3DJ6JbMWr?B(1ZzcxOXrR5eX(|Eb%yYJ1%;jC<Zt_ac0(
zjQkzqLO84(y1NGr%BCRE3iuN98b?z%Z?%NLc53QyDt@y%NJ#-(cT3JEk4H9|=8_lY
zEyT@p#FPqH2!*b0$nm8C15VNA2dscjH}C%kH$ce0$9~`j$P9(&@L>~QZOpAQ%55?o
zpK@6c#iAb_uG8H>_e5`<6J4sY21A}ef9LB)^@vqQd(KK$YW?axoY>N>fiAZjiAM-k
zYUHz=2%-QF01o9Ft_yo+pTIo*N3KMDM|H6&n!jS;*Ao&HRh$Qigak-q0LXa!0je5n
z9mlh7Jd>vN2MxpxVb~i2DwRZ$10zamCSZt=P804^prJ^)4Om%3;d7wjCw})E)d{C!
z0?Tt$1GaCHSRh#iTy}YWaHB&K5`%6Kp|Tj>FO8VMztcr8(jd=#HCUAG*Fd*0I7KaE
z01~|z&Y2}!jJ8mNJYz%8qsYuVz~&hQP#Vl#bZ}}oA*mee8GA9HYiUAst5>7otLkGB
z)|q5VI=Q)ALiy!Z!suj@e~-^sJZppy-;F1E-=c}<I!~Va`=b8sQVF*1Brx&4HZc3D
zS^o&U9O)1AGf%(Sqc$EE@;oSM9cBGHu?`};2aU_<oG;1<Xdl38-3D<TuE94nq<;p$
z@+@xh@x^AzytR6s**4x-B1PN*U!)@0kpt8<+z<ir!91HrM5={R7K6puUFd0Y)ffc7
ze%+ZnL_pa903WB3<=l{$&ha|Q9(QJED4pB(M9bD8{B3bGyl_t&otfSf#oCmMXuX+}
zLqDF`=K4n1LLbFWznh<E(&u%;x%{qI*UqFF7d#`@pS||t7xv0TmLFGBsNJPQBugZd
zEY)@pP8(_2`Erv&sM78AyrP)4;Q;f#&9>GE=ZT$tU2W~97mf)Va6n!j&DEB95xl>S
z(1mtX5L#adY}o2gkBD<n555|m<}ooaDsI;WHyS1cj65nO^lS#>@^igh<khzs7(ES}
zM1*^sB6OosG?ui)32!nzJ=@LS2F`!G;mOk;*nWaIjtSbolQ))<4O_=SPixg!9J#ww
zjOV*#Jvn<>F6bq>o(RINkMHc8q^YBpora4NsN$)*_};@Qr?a6EXee|2H^*uKg4}hb
z8RiEjZ|<UEWeujLMF&kLaUh=3SNQ*9`OHWI(J+nx#cPITjOHU#>kaJN_2<j4tzQ3m
zE32zuBQ;IZPbopQlfw@k_0M%L=E;qboQ0b79i|>ooG!g|dFR%FMDoh12G^t6ri^~l
zHCZjyt%BJM76*BuqL|qdOO4D1i;oi`nk@>`ykZEQ#tKXBwwsZmjRVQaf77pR_W!Mw
zLLAastM(JVn_Vr-T|{on!fCah%ldujt%*t#R>7Mk84_LYaSOjPJXVl!AJ8AIfc6t>
z`4RyMF2I8rf83N2h0J%e%$huN-9AW&l%Cm=q~O*^eIs+|1WJ3&Xh+gX`I%D=U3(y{
zaw^QViS-lU=6t?=OjSlJyagN;w8Ii005j{QM9Y6}IoFMc`lV%GnJO-?L*W>oH_%Pt
z@%WO&KW2s;;!MbfK8pAuvAg9m0+#E`&S`clgxmpzr|w1{|28xf1k(M3sn_skBbwLR
z$1E7};mQZ)FqfE#+_pKwP6}X&UURQi4e+A<Ra>a`20{R8vDmC^JIm7N(|M|JP}L26
zbZvy2xF5`aj~bZU$pzY#G6GEuc|>D5t}3W0X|#BQfmm{7H0B6XvCDX>KaA1O+O?b!
z{F`3P7~<g{;=4EN4p&;UlyY9rXBns6v&=Ty(7E|D)^s9ys_GXuCb)iwbjs|B>WO0`
zD@5Wpqwv(5F+erV{K}S?GjP}C9=?T=haV+Gu5x<x#qDKFjM4dSOOlGsGK(TPm<f{J
z(cO8j1t@73^{$8HJTDskO1zPJtGc99R}vQ2>3Czh{d}Fhqr#>LWf<4lw1;3=@VDp0
zdHG$XEM9CjobNGnrB9>qw*M~+o{fAK{`aKgC5roO%_++~m>DB!C*qQ4!5hnqWuIo^
z*k8L)cGaDoP{#KF0+%6Iwy<8^{Kgv#muTZgGhb;8hmg72?$BS!Ns7gRv8Ns?>;$R;
z0SKJFVI!bwG)pW80bhU;%d9&x7W;f8$q=0Z`c5Idh&D#Qn;knM8Y{LkC7v$p5qTdq
zAN`cf>%0Sg8^g-%vTQw3PmRlkRXgWx7B|<>)Qbx|wn2>e#<0%nCfnrw--Dy|ISngf
zE&ggaErPK0t~#NVgL&XjR2~Q8=<4XzRQaVU+y5y#F2<y)H?s`aN~yg3wVkw9BW0Bp
z_a3nvTMD;@@W_xp;ToHhQKSTYZWI0S8Vnie7kpI*!R?-n>!|mCjP@Q<B|YyJ7;?!p
z$&LB;jv{}40_gWJ(WY%Mn#<LDm>DeW4zgi>2af~V@|_qa-%q~_H=R?R>GLsBX?g@e
zyTg^JdGXL3hT=_o``IX!`(Dll2imgqizH7`$^YK<MYeNjEk5n|!hUH9!)xruSYuc=
z^8WfzM5^VbxGMgS0~mZ8-d|G1vgg9~x=~**wL0>&PU2BEFsnf5gs1gU4C9Q8ZTCdb
zd)o=a&Eozo7PY>R9UbtS7+UTB@~2Ow`jsJ4O7dt>AEj=4wggp3O`vV8GqC#%0LktY
zo!>nycjE7C?m*jth{ih#*>#5@40mna#6Yt^anA?+Rl>6)@X-q&VPUn$a1oKWrKG`+
zkqR^xAQylT)QEy?l}x8{;a&6fx&y}z#0JbWo<>S&XE=Tn*;|XT3#1{DEVZ$FG+o}A
zQ2L+42tY@D6$Cp$H&bodRkU7et+R-QEPxZzxwa9~D0_!vFU=O&Jqi8+K<I6z0urhU
zLX<b-A~^U6WC6?cdTGNqq>uctKnmWVa#=NI**H_Z*RE0(=$-JN;}kp~qz31mi_XuM
z4YcMSbAfl=7~w|pXbNnBn`jBwqHh^@O0L~LTYt5>D6?#7=jU*i*E?o7E3^^G(|=S1
zeQvc6d=e~$ji9Y5h&Fk4#>j+rKbzQFJu=5t7Az<_G_T*#RG_-UIy2IelcoAHq|QrN
zRYInx=>PKaX&>%tA^-bRyWosj01;7-Y-r{uHk!6xQY2$0tSO#UwCSlbmBp8E^Y30y
z4z`^QJ+rj1myt)_8ufng>a>tY=Hml5cE$H#!K&IYEPg&uT9N?nt9kPS7fW7i6ynE!
z+f%C_p4H_?N@2v_$2ISMUN6GKk@{PPGm!n-BeJ5|MVpFW(VM7pnZ_ipGE<KE{KMrR
z4X%vY=)a-xcA#P1vNG56nXLwa<<=J^!Mn%dacgfSzC`sgpRo<pjfS!_7gF-g1d-t-
zX{so%Z)(5U(@3s^wvj-`>5>}1)74|=CWUgdF<NXh(y)Z*^w)cEY=;xT#uOH93pfH}
z{QMxzxnTeST_b$9ivb+5X#3~PY3^&w`G_#8{r<+XyTK6<!2SJs6#1v?0z@g)3R&0~
za@;ipEPmDLnJ#H}51tSX;(G?-?@`=7OW$eB=;CuY<-7I>QaxR1G_?M!tUcQR8qZ;y
zvKzZlY2j||!X5{#pRh8BJivI}&NXeNkO6g^qGa}qIz-Hg{&Xf&mBsI~cd3>)aAl(7
z`LIcV!v?8%UDi$KoQ*Ih7YybRJXvlG>ODGxGLilnOU^UK;-++z+6}dXr;YL5kHyBB
zRI(ANkW$lqiz7IO5M1T{*pK0AL<`nybjg<g-_KnHpU~t2s)mk=C@W;DThikO#C@vO
z<++NFM5FKNX?-G>=%;e*KPk?TCU-SG0|+clW>InG226hIKY5SFtX*<&7B4zWPn~Ct
zdtp)$bix>)!BB>#5yUS-D>_IZ<w>6+gp)q_OV{v8Vn0mH9d9q1N`KFDGpz}_#yHjB
zsyTn2UA}F>jlS+J^o|597MDbgW(T9;gU3pZx(8#}E4k^5bmn?9YblQ#?u9G0(r;ZO
z=cni(G1V>>loRVdR~D5~fP3p(wJK#;x`1r7#%P6p!Qv4`7?-QBWx8+DFOkYKbi-UT
zy|uftl26YH65V$f=aqmfg(@r#<g>-T_83MqPx_(lXhgIN;kwKFO(yniF{U0|{rpYL
z;uG9$4`XYyx{~^E5@5y51i+F!$!$dY0yqxtyOKT+`8J7BXwfZ5^?VamXL}e}(n|{B
zEosvhy(h^3I>`35_<f#S|4+S<R=)`x(8^oKX!PVBnD1>54>HT4S{xyDk}EXp_*dGt
z=`O$mv6H^1%Srz6$L{_dOO3_76k`AP&~);jA<T-gFxxylCQC!MoDtc42Pp5c>V^@6
zB9mNr58=K6UU!u$1p_S9GbMRW=Gac}#uM0_TDaBhC>_gSts4;=6NH##WIt))uOUt+
zUC7E+%6W>_^_4FmdExhT4D~!8+ORH;9yXBVKTl<{(Scl@8P~2;z>mf7oUrCfly+P@
zT)z?bi#hUdM*z4H_5A9eONd;TfYM2f^)WtI;?J_SY~3!tf>p=C@1E<RPSAnP0<L*X
z{?~`der&fm$f$0Hh$Xk_bu6AoDd^~VE6aHq@Npz2+;~n62*;t=OXVo<&GP4C{M>&2
zC8mChJS8^WK{xy5Ev?Zrrwx^~Jsr2kpxNw7Ys+gdR8Z1?H&-83%opAbuU6r%r73^z
zd5zNxY_kBmrXlXD<;p~`*Lp#f0p$Dg^-%LWXwFOA`1T<bA#Q!zoO}$!>l~9#m$(eh
zX5?1k6kBT`5<<1Cv~d&|!EnXpBUg{})=T0?wCJw)G8Vj6AyCKY<#`z`hp4l?9mnS+
z?dxx9i{H%X2%*fy-b9>V1leQkt9IpsdlpxuHlV^-rF55!iux_M8}4yCv(CiB)Be}-
zo?N+Us_`a-vqtA_U>X<f3SK@!Ic7-@fg1YPvFzgE66hGepWYw0ju0*K4VCnuLICrI
z!7jSgDyNAaHpd~WY1^DC`1R<ENL&aXjw1g>CsHxx?ZW^}RLbK6#ZRlI(+GdjLQBaR
zRz6X7cH+(Y$G5Ky`+#&EPH7jz)!=7>Ed}VcWE$7lt!dyB{(fU~i0`><=;@j#q@+gy
zPfoiNA&LIhQqb^DE6;S+|Jh$RU&irI^C6My^iSj4I$Y$jwLx|oZjMWIx?o*g?`xTJ
zxtQ-}B4fE%`9`9w<5~OtEwgkDLu}l6Ho58)3iB5aG9TN1I}GMO6Q6AqwPntc`hVzS
zk@8W=|0%_177d~d_Vv;8ojw~-ndavG+BS?19kyTob)x4DhsF=K<XqFQy8Y<p5CDBQ
zxAid6(erT&KX5k8MGp>jQ;^5lrf4T}%%*p%<&XKli#Pdb+4O!rAR@ZXwyhy8LF2+z
zTOp2HwqYxQ*kfjGb{89C>}X<pUbW-9av~9UDWpo0NSFUpv|Y@RQMmvaSN`?|FnW;r
z8W>@GUiL>L=v8%N>V1zWG4Hp0^qe(&6vmqFkfFfiwK5AvARC6DuKFA$USNQ_JIkQ-
zqa{HwcrPgZn;r8%8`g7_mpm0hI)Sd<sCoEgO5;zh$g(5D)Z7_Mp>7q=;4ST-f2cxF
zCl`bGGfm2{`mTGH^J2!aQTPh{dO>+PAtS@wxhv_|qB|nxQg5%yNrLfILb<i2qUaZW
zt?VYC?xB7ud!9$%;)tt+8hqRreG*n^NraN8Y{8XO@BR-ECDyoDb0YUdQyD+_G|3Om
z?w^QWk@SNsZ7ekAp&>!lBjvx{{b40V3eek57kD9WD5Jhofq0<;{bMHUmPhWshk7CD
z2fk#;LObiY3^|oBbaSE|SxNeux{tD(j&~7KJQ8V&c)eK9rw;9Md;>S9O{p0Ipnlr_
zgV(yr*fU*e8Th7@_*!fc5$KR}IFpK<D4zNbnCvwzgLeH2%=7={7mA}zeQR>m>tIW7
zD1R(@3q@6H4C&TeFhCWKIP%Tm9`jpCR)(ua#kL~-buExq{l$=U>yE{DaF$|c;?Z@$
zD$D&^HYUg1pIE<k4{eK8Rxh}I==J`UcQu-ydCZ!BY>h}$Igl;fDVaw(NPm8~?5}y4
zeZNf4QIz!v)vABb{v9DFOX%RK_vlVEuffy7{^V5nW{d6^k?e+huC3X)c4VPhpKDO~
z-ggt(PiCSx%^Erv+4KyXp~u}k8O(kEtG@S?n<;3;%J1YiWZq3FU;(<=EwA3m5kjNB
z)!IB;^9JLr)H3gM(}bclz^B~z2mUruw$iqT93&)VJkuz^yVK99nQFY2slJGugA-d$
zjSo30HhEVQ-^O%AF0Kz%s9F4@7lgMHZ8cP{QX7J+s9b-iLwnFb{r`p1vUw-;jwlX%
z<1pU;?_W+UwQ_+kX&Bsg{M~qcQomy#mrF|Khl_6k@16Dj+^Gv&3RnGhHU|I)xvVa%
zce*ODvO|v$;fvI9?crfh;m2+M4$JOw-}zm%@53W>2HN0x0`UKta%rm#R!bQwJ0Lrm
zihOM^@K6y6oSdqDjjhL(2(`##oxgE$iL-Wup~%(RtzPL$H5!`sZ*L*#GnN0O7}V-`
zxBNO<Ha^4%_RkTeq&DC91dfjVM5qTmQR#%d>Tt4Sti*5enFitc%EOb!7_n1xlp7J-
zKkY2802d0{*c%iSN&5V{ifyrO)F(-~axs}b{t3g*hEXe$@^`@bakKh6)p)NoZ4|QC
zSAozp24eL?7nKcXqqjv;yIe$u@<0ILmR~1?fbU#TXW$5Ph|Tgu=KGN6En|ESEg?`6
zd~-=RgPBHp+uq+x8xfrsFhfuwO3&ym?`5KZaD81w3E7n+e_htRTJ1;`f(ME&p14ac
zhv-I?yjodIK}+bRWS}Uo`RLW!rJ3T4tTXj2K7V5S#~WRRzp$j>LadU{|9s%SV0AZ(
zcFk$Xj`mi@-V;fyv(v9?L?Bau^=jb_on<ktjid3Al;-79>k~=~!dFBz?!?p19rO6+
z8?0bCjEt^oA4jttnlFkL(cX-q_sL^Yfe=k;N+TJ2ppa7BWf=X!iSRLQP_rC$7+{E1
z4z61uvrGlUXHkhD<Q+{G!cp1ll3xF0%bqJeW$R-@jD3y2$ls8ygBRHSwm(YE?ytkI
z{AE05b+87rToy`TA8mLz(rmwT%j;}GF0hm8L%5|Vi*(1P>dr$H&;g*?!S2G_2?W)D
zTwq|xpmmKT!*o7Epylq7`Yi(}h6Zo>c>%!ow8xx@(M8&r?gFpF+v0R!aR+QaMADeL
z$V3IJ6temY_p#?0D3CV0LJTt}1nOhhBn*C6Z0fXg)pr;*W0^d3!+l~|nIND#(lc>S
zEg&=31>IM7g*GGtzUcB4Q2eTW|IJsU(M7hd@^4BA{P6Q5{XPd4^+ufd0j43HvXmt(
z*e;n=NZZofMRftg{v(>WaJzj(79Amp{oG^s!uhj4g(a~b5C5MWR&_lerq+|UArHM^
zMhnuqnpuOuP&KXbn`B^M-5GehD>|yJd^cqt44A?bMNbm_zMZw>=ZJu^pLS~72SaYv
z80PZ_blOJP!w_8>V99s6!a&vuEn~A4GXx6;$Y!^Wn0H2WH1$1j%3G)cce?2@W*=l5
zk042IoJfY)f~>xYP@_Y|9TMATnkihQXTv+nAZln&VQxvoY~zs1?R9<0gf;S;36}sK
z4viM&KslUvpudMHJG3)G(y(F2?{pj2_|fF{UD)-3!ZnvPOj|+}Ks~e^qGC8WFro=E
z{jRVLOSrJnh{$qJ*zxCQhTY5>*GV>E>6@M_T^po07BAXEX^=#!L(Tb+LeK0IrSp}c
zF(1@kB`h;j!hgdS&4{38rf6`6b%n}v8K1z)qn14guTD{zC%GGz!y-GS=}yPR&a!V8
zgAPa80V@1gh@6kN86->sR3D`OFJK=RNrzCG4Lh?{TMJlKA1ha9WNh86cU65AE~4nM
zC0<~Tm5K5Q$Ld~0c#?V<e7Pk0oH#CG117-R+2Ng#&7~K{eEik9`maOPoL(yTC_g)O
z7~R4U-Y_g6e)S2%Yf--~Oz-Gw$mO$TdipjvR~Z%t%UOdrd!4`z`~PnOssmgM)H2;}
z5Fy1dggDEaL{Fjc$QJE~aT9iMk4H9#ms(pZdD>=>lDXuAHbyEb&O)^<{}hC}Gm@O_
zcXbq?jk}>~we@33&qS#Ie3c7|Dij%?@6-sHYeb@qS6v=E<SLGXZ>^)-Zndk4Elbl+
zXnQa%Y>Fp<*DI8h0fatOz5!xN_(AdSK}K}}uJY9dZod_g$`OFH=%2prXVcL49_w6d
zf+5u<mf_KTe``tx*(-gV#a+SQnhVZUsAXNV!9ofB#D2`f_{C_|GQ~Rmbh@?pd<+Y|
zuaDz&OTp{1#bKPn>Dqs!;uHIHo||QcYNf8|VZm4@jxgQ$nQ7<R!!z^}YlSmAwo9rb
zn~Qf^oG=UTJJm4Fr3*Iu`LomDu}Je!r956U1o{{1hU{4EEYA%@8f|a}axQ?T1cinC
zC&#neZ6owK#s;yenulp2*vt9xPIvC|ajjg?`Kl=A_h<xY<kz9jR^lzWPpG~6U)|6L
z3YF$`0TL<}*2&1qMQzV=OCuh%<s$}^v2nt7MHsi8I-CVNhYz$(K3|9a!+6}4Pvg($
zddaGZ;KK&TAIek@tP7AJcOk+_<PFX(S;*DJ4>A}}(0&tE^7jWCO^d)--5;|QB;r?1
z<F&?V`ApW$${Y-+QpTJyMvhKUrgci{A$vaeRl7aOZyyI0$;gl5^}GV>#@e&fOfN;%
z#i7%znZ`6ih6RlzS}!4Bns;>1OpuDExL}jZ*gY~HZ+zQ>X<qp0*P0yJ^%4cG=gJj_
z8v8^S2}=PU>0V$<%3r7Jxw`o}8xHpi3U0-x%?SV)cJpL(BAEHmC8M<^S$qA=#@%_a
zJjD+<tahN+f_1mjVm$qq3opm-qusf>cNtULeKS>np;2Y<#`z8M`4T)cN~ne%PR`aO
z8v|cD;d=gbqdCA}1OWMV#P_vZ(Oh%&jGnlf^GXSG3k*R>;HLNJz4fe9(opvg+)q;>
zmChFt_p6nLtYzn%%l?=Cc6Ohg(y|U3ixk|FO&l&W1N|r1SGdMGpAlU(iW>{aj2$!p
zd5lKk)sz$Tq#bJOFCnqC?{O8it^1}j-Cp)B<iAaamTRtOCKj>UIO%P(Bx<${?rs=R
z`y}};6Ub{0!)0v{Rs423jHpEKHffq(eE$RtxZga9r(btWQR9?r)U@FSaC|7{Ysv<;
zz;LT_+koaCzfEQDJQ&$s7i=+8OGg|ke0Y({*$U~dpm8{1uXV_ILghI+L*>27*tBZS
zhTb^*>l&{ZC{Fkkp-D4UpzjtU@_V4kX3STNjF#C{I?0B(euOFrhxMgxxst~mKkKX4
z9vs?oO&_mr4*l!7TA9hY@&OJo!C(0vRxIy7xv@WPWkV)zT|CA~QygR2go=58yCgHV
za;QPPqc+=zzc5ztcNZqN0}cOc@$7!5rp&2mZ;}%V3S0Y*v)1l)GwMO$#42UvK2GC5
z5<o8KYjOhf4=On+j%ENh(Mi$gv}SC^GtOic)7m$m9<G4BC9Kx(6|7v;L|p(CV1ReH
z3zo1(HBR!Jbh9Hram2fwio(6qimTOD`Y%F+>L$$}-PCikx_A36(&Y=_-5auZt9oc|
zkoW`gdo?QG08!pO1z5ak)I?mJ8ve#<O{i=~%|2uj>$fUpZ2(;C1~!oGvLgjd-f}ME
z#TN#Q7YHi=(Lls8&j0L1LI_YGp|*p*9xJLTIyD;%5fmWP8!`7g%5433di@7N@tlWv
zl%0x2oe5u?EiaagW3Dgf%Fnxayv3LE@;QBkT!h=BiVaCeKVvgpLbv{#A3&$hU}{%E
z<QhZ~Q?<+rd$-bt1Pj(`4UqU_*H@$ZVltfQlgNy9T^dqk$p`b3RFNmgzQz8a+ez>@
zjH*FG%;|?+m#Cb;A2tl9y&moW#AyNdAYDga+n}-&%3LMd*quUAV{;v65Go(J!&ENg
zSJW2w*c^+VJnu-pv*?}d3IDTic7=cdMFdY~febAu*%8e2LQmB~jb5^hNq;tu)avM&
z2xrgnM=k`M6NeF=q^Jd%0s-rLc}^uX`(e=dtx(nJorjU?%y{k}yYBp~cNrpf4z_hr
zS_$EIH+Os_*w-HYTVo#&2%OZ9TU}kD-MwD%p_{1d5>ZYyO%A?VqZqdPgEj)zKGCX-
zK0Y%FJntI+TcWjQ%eV3UzC9?9JVg10uOzM0#P;|uTtOU<B(&kN0C1f7M6_T%Ld%PO
z?Di6QSk``HGPJO4M6Ye4o3RvQk``&2+xWkaesNe{@2>(JKfZQ@dZFD{DQ`$8@0T)}
z`A2P!LX7Wec4N6e&TH>>@;pwvOg0VqE}aa%UIaOB10u65&BZX26s}cpn>}7#-3qc8
zeW7>azOP(g?iaDw{X*&zr2;*12>Cru&@OGM9bH|5=1P)-)9Z52y?*R!;wywj7eJS8
z|8aF<oI1HuX<EwT*w8Fn0d`=Pb$_ifhDD$(E+`(Q6`NzkKK9<8jXXpmmjOzhhJ|qm
z!6{tBNzNDfHQg_UYC7eUp9Kr0)P%rq(k)ZYZ+8*|BygTQRowM>*NHb&^Ve(g_yf|g
zzJ%R2h|72maCrw^K5tyjt106r8BlMH5|z~Rkob!CZ($fmbH4fr)ryaEr}Xv25n|ZE
zZ+Naz#r@Aejl(;)Oe)#R>C>pRc^@Fj!BBq3p{h$AMrJ6F0}qBu2Q4~=;1}<~YK}}r
zj@Nt}T+FCz30zE`6{Vj8He)!@>Wcik+_4OsxBSnki!a7(tVrOA=HG#x-i@3P&3C}#
zLf)Qt8>$E*v-E22gd=oJLkSrEnTViKhlbo{#Sjf=EG%#`(liaW#5}097zLG+(lQW%
zH_M5>`eS!KQWTwe;&Z|9RNo;QV;{x6H`Mu@2j<#LIs#H{4yWD1MQtSkU2vsNi&5T^
z2RD#|DC)dp2wK?#U7w>deXQd!45Z+Mk^}4y_8vAhlgeF~v8aU!GV%U;s^}O&*9{jw
zOJN?X2P9{_oN$26)34{V&e=l%%qtXQ??DLH*})2n$00}Es3C6<MP?~U&Muqs&x*oR
zLKa*FKVu4JZjsnBJWM6b*}d#(knCVLKnD98SgOE&4(<QOMMZu-VqfD1&7uF?bzhmS
zFYG?PjnC>%?OE%=vRy?A@quMI$;EOMqp7GzJ8|>mybi+VwtG0ob~irLq5)3oVNNb%
z0h57|HRM}LP9IyBV{_Sv>vX9#s`Y%OGd8~OF+5h2^Uy!$&MC}X7mKfl<AQ>!R*~hk
zv##Y}Wk`pV;2XOWotE}-yO(X4*c`Ci(SbH&KHC(KeF#!XZA+8W8#|wrj@w<zCwA(v
zwh2NL8lGyP!OMeX?FmiAoaXZpZD-}e3%`n7pdQK~m35pb?EuGf_v0Li>M}T9*AtQ6
z{#pK&-0I4_`^a~c)I6{3L^#5&(Tw3h*K`STJSUJB8BeC9GLqxNLeuNu<2zRU@-J*N
zb)Q9#s7Ef>By7;hFeL7u18*{-&{Ml?ehp4j&K1gnUxDAqr>m8F_dZj&8#g5rr)ZMG
z$Y#&TQdVc)J3?=nMNT@oyKwqL9+GFo#us<+<>t1m#-vxpV)E`h&%7LLiI36hs$ddX
zeS8SBw&luYIZRY`@*gWF3VLoCd%t&TO;op>Hv$^#hy3g`hGW4|S^Vbl?zJ3qi0SI5
zJ9_n=XZi-l%w|bT$B_*dALo9QQz$zO@qlX|_7I80TJYnmt5g_;4NKj&{N5fcGWCwB
zTG>tt$QS{eI^sNuIbX_3*dB?c$q6IRa_iY_#}kY-DTdbIza0YJanO=`O9wp9#_Xid
z{Sc%n83i{6mHO}KO%$!P;d{s6QRt~QHPHE+Fr2?`^X(6>(|)>`d77~)Iez>x8Qo<)
zCw~lZBYBejR{s7f@~vie`wX1Rg#fGQ{ie-V{M>z{*C>sD-xK+c>bTNfz&3Tt;3j{0
zN+L!(QbqIBx|SBNaiP4Q#NV}SIj`;KZ1Z@&9s3D5@Av5yJT~?JqD8<f8@Z06$_}?4
zH>0GPSmuy-DmK>@EiuO%_@hzRkgb<PwdvO3SJ!OQWL4QI`g?eB(9=>+a5ek|Z-?hI
zan8fO*_Yf_tbs__MJ0D+MoAy2Dig+DVB?C3aeQgW;|Rj#lL9uXF=3l}GIo3pC~x1a
z<0no$0(w>bec<!3e59MnN|eGl9rhYHN<XnnE;HX5n89?-y8PqnPD(Z<!5ml367(4Z
zeD+b<PN~YsuN$gy*p|SdSyTP;)xtJ5n-rea%h%-<lr-Ys&CjUo_hd!V_I|g{{D%D7
z*VO5i4=RT7+heb*6e3#)rH5Yk8~7S8VSXYHhH>B~=Zp9&)*PBOm$P~jT{jmU)_BaD
z0{dgf(WY)DL!st|9r_;X1SI6}jCH})I6$T{he<Atm1~o1n>S@WkB{wtImNm)WB?84
zvOMZJ4Z9<pt2>7-?7_^Sif{odX)U(!)!k~YJD`BWiWYysEpULN?OoJyOB?Dv6YzbT
z2%a!b(+^lk+*}0F1jE<_;oR8FHW*-{rxp(43)<8i={9kuV3g^#X~qFDOcRm%U|f%-
z>k7fxBPNC&u)+T{6v+6y@LEHDz>E|g<MPvyvid859h51)jeNuA&9boub#JS7@LV6%
zo{m2wA*E9Cg(CEv2hj8;g^Bf_65~X#U-+@ngz}}ouvK+Jir<A@Ci}dPST^nAM7yD3
zCckesy}D<an5#NIN?zz{P>vQ(tm_tcxWmoIAa|=?Z$2*H#+pG#6<OAEhvOM4+g9IN
zRYO_XOBHT1-rLFKD%)4Q+w4M}kbmj8=4^gQ-U=JvF|^C2-T>%ywtlvz+8+w7&IvzX
zk>dRlqVrZ2pAG?sz+<_NGqCplPRmf*&*<(_3Xvj1CUy?-8L$syaGxtf$?N?atgzj^
zG#MIxY{9)wQ#r`sSgk?<ASJe$YRsqWimn&^I8mLVn+2DhI9^6C)<=P6?${Z*tYB3#
zT;zFLW|!3Wl=$|e(Sf|%4(kW+0{S9^j>*hidBIzToMbkaPvN#LBZK!Ttv-r=WW2Kx
zdb>A{p0blCu(8y4AF-NpRh)Ktq)p?oIlJGD)(zQ>&wTtVPKjCRsvOBKB^?ZRUh>V8
zCOv*Tl&}?RlhsB)8>;J6zX8Wq;kg&%JsZ$KwQF3B#e9YcT|WrT|8Vq9{7<@h+m`z&
z;wi%P!6f2cveCWZugpsCmH20`Lvw`5HU$v=>Q{deza?(>-%8h47``mZ?l(ua(1Drf
zw{iOGk6tSq=<3M?K|_g0U1fGWyn<H{S~|W^xKnuMX|4kZWvcZEB+irqrca;>^8cyv
zC(W#(!YL3q2|ME>TAItzQvJj}N2)llX(x=YW*)sR_83AT6?4Sc6$ENTHp@<~<l2}V
zGE5`!#xXXQ6Kp;azA1p16y`gWMETSW)#{2uXvH1`gg!9W)!*}KLoYl*r&}l||J)SE
zOs-dYk~ymhEi~_H3byp!w_WyAvD43xJsf*|X}0soN_{D`v5q0O-J<jdrKzUxJi0Js
zJZt^uB66!C?>>M4QET?+`G}=``oc1EwlmB7JR9rz>i?k<;4hd^Xn@>1H*Hg4bibSz
z&3_9U5u~1S<+)T^>wEn#V9Ae+T0!P!{f;dozu|b$-eKR7lHL~6cRz(azm9WfA0e+P
z841dR$6@?k`ujIko{wzj_Faf=PLFHJ7bGW#&1u%E=({{Bf9W3QytM4?mh5OaGar|d
zH>NfH0jCA4L+M{Q0o3M-^`okYntC0D#?(8ImH$bT=e5@a>ZfRzO(k>`3`SB)+{$5k
zPjkC*<ppTCL&QGvu+DTS-7Pgg^J1h1`7PPwGzGKdKWcR@0m0Sk>{hjnoZ;MVy$36!
zUI_6#-GZhCAh5s0Lc};+9mBG7`_Ighm{MaaS%PlNKL2m@)Q9AANZ_Y>NlC$k`9NW+
zx4}EV^GZ)NbDrLR=*7|ayE$=+YAPN9nWQoN@><nQQ2`)n*6E2?6OsB!^tw^&SCb}y
zRrgA%9?BC#s<=;euXTO7QvtJk$+3!5_KE2ydv_KTXp!~^YG>;TeU*M*y(T*1OLk5|
zr_mg*SwQ$swefVL3;m8Bg36}*>*Q%H@t@J#e!87G?sSv2@@}lP4a{aqCN;p*54ct9
z&?L#95M0n`=d6FfdQ8P1Nf~v9U3bm;cHGkb)*2eq{@Dxc3eiwqFF`H(>uz5^V2l75
zC*SL3`N`aK4*MwBJ5djWb`|0J|JRGxc{NmD0C)sN|KK*1Eo<+iy%i@~z4g4bz<rGm
zuj=jh0<Y9U2Ro`pvO(1lU~Q+uS^(_+<hu*Lq8fR%_u*gp+__aIkEwD=J`7kORRSke
zBYzn12F|NI{78Qj;Y4#@XgDH1CRZEvmb_g(3{@l7ZZ%lGd~^j&rJ@PG{3W!qs+jhv
z6>SJb>Alm+vbTB46;$bdklWoxs;;pE(x!p(EwNe0&aXq6*#6x~LGlKD4Yx2+(u=Oi
zu8jY&8Lz~LqwB)aco;X`a&+hgrCx9@6DPGEQuPZfCi%R$#T0D|XcJS#`E64odZ~RD
z{Zm<CRi!Fxl9gncb{iUN8nreSl&C&r|Jp~fKBKtKtt+j%8JoCaUugdbgagvBAkVwW
zOX<Lay=0B<*kuZn_N&p-L|9A{hbv)0c<+JCSl1ij$}2Yr&sl1APJ!EX1kg8y-CM+z
zwH*+xzUU*)oWU+F1n71b8qwD<HVx1B9Hp4~5-97Z=)^$dGj_15Q{6ufgx+A!3)7;o
zar0%IpkEEjsY%PER|*`Y#y8i=Bcy~8iMTem?Ocvi;_XF|1a>tO2g9xcv$a)K85&Py
zF!w=8>6+NiSh+}hM4hg8ju(agHz~_UXVG=D;det=GOOQhrU##w<mE`42Zw#>Y<aJ%
zaY@U|@%i}3p~Jq1!LrfjAnd3Qa|iRGR|KIhb;V(j&1jR?SeE=-fc$U#k<T_vpHr#U
z@^=VUZ<FxSwC|6|2Q4E@O@U|E8J7Kq(ksj4-n@XnEo-|GHGn=nTrjYh1EdbtJx{PC
zI$ltI4o3v@4z|a`t9ACm6AUmH8?7VBITZN#FrSu#Amq)C#TUYd4de}sTNFW;c;>?}
z_k(5|+(HI6l!xJ{vi2$D8-KR%Yu%sYAig$hT@COuvZ&-&OxqGVd~o#@z-jG<B-bdi
zVrx&W(zE!=^438Y-VM15v5{|S&L$B3OxC*>)5UKBY@{{43!N~kJ68wkDqouwtBbmP
zSxxi>m|2xCa~qY+nsFGc3N2-aCP7TSoKJ^Sk79&rDz=rIK3a7m7ZZrY<^>OJaO(*=
zjx2hR4DkYPLu>js?!o|G<cZQ*9s1$!)2yW72Bl*AcEM3`o?|85&WBEO>O=-lP`cc_
zH$2x`nZAiz%BFwlH?cFBtVc?j$>kJ*nZe1hdt`-0!rXe;wDC1gF=^`bdYCN#4d>=;
zv5}{X^*ftHdR^0+qk#Zi-e(HM56aE;TcDD&O|a)aCq9~4v^s1FZ)F2d70%I$>dy>Q
z3*5W&3@RoLg}kxqw1z$5|CXYjDHD^)#dXNjr2oaqYa4}n)x;`SSb4^~{NF~0$G-pv
zTBKXVJn<?Y_ETwpWzl~!U(<%&D`J*voUJx~av}Zx@ais<qt*2~;s_sgBC@N(rIlLX
z)5L=$%^W<h6o!-M#3K*$!@lWztv&4|0AV+sRvunD2_SVv_JBD|dZ`VqjAfAcJAh+I
zAWO4kBkq2+9f1uY1{nK-PiY7hI(D$uJWLpAvkX!?Hqi_3`_aQHY!zza=*?~#=u-gt
zFiGIIAgN^%DDryFru0o1s`Gam9l~1`-pAnJVhXfP)9#J<;U^d+Dn+Jf34PoJ5kv$w
zi!T1iHbhlh98`|D9SD;zFf^x*kH3mp3baL~dQajPMr-JBxxv6C@SK=n|18q-5*dyJ
z2l-l;zPOOT2kai;&0E}*)~L@CQb8CynAH0`6^pp<ppgFO99Z4WLp~>BXSUe+L|K;I
zi)^DmH=xFR3BRuOn^!fWLYl4?eOfFs@bvite+X&K)^IWZ!yoS*HaJKFreieJd#**K
zEM0N%kXzf%zIU1b7>uEDW~LnQ^RBk^vvhv@9+ouv8tE=mg#dO?0}W#gmCknJ8Fe2Y
zSR-!I;MP&Mh;dd|RVyuzQiY|0!T+gz6=@bDktb@;VrX4e?vh(g{HSKbK)eYGDT7*V
zX)zqu5+@ZR%p^P=n>UHO6#$YJu+f?kj^+}$oo{jiy>G~PNlE$U?FIPMVRs{f+||Rp
zsHnqQ-o(-=t`b=NRQ%x(XTbc1uylDJ&2is?!KC?rv#;rA)NPo>Q?@OV(<jkbFe|4b
z`UN;smVnVf@iSttv-euXVF)0x2?IX^NwEe)VbXH>l#N1b%!rg`E1rh_xLW6?3wUfi
z7Yo*5s6=2kiE=W0o$PdKB0{$W6ci#On$!s4^D!G}76h3m2tb6S{*hB%B`4+N69|WV
z%8hU+0qhXdAc0@b9(k0CS?@bkS{AZOChb(eKMOOAeGakWR#gT^UiL(P4oaJoFuxnP
z<723mdC(W#2SNbs5-XG~99JwF0o=vg)W9}i#^8g8hqS`)vW_ceH-hdR%t%q5mWS~B
zAN2|)8dOMc2|FbIxM7jSyCFToi|DL}e+N~3%iEv3xn4J`sy|Dv++BPPoJsxoCW`4#
zu}C;JM5KB|2Bx<<#EK@6N~i3nK#&>$xYN422iaO?-2>$lXcOxoqADm=ZvqG{VEFrQ
z4w(|DV}JtfX<Xj_x6h75V{=gpYj|{z3T1@JrUm4o={cp7=*%g4i^5Y9ny&P3wWB6O
z4==Q-Z~y?rvzQoYh&{q2z$}70n{o0~3mA(2DW1e2pPraE0%;+31{NWm+s1@kHyNaX
zC~_uZ0q(qY<Ste71plnIURCBJ3n@zRyXeTkSdI8nNN>{&%I&^A(YRJDS+2Ub71eSG
zQG`a8<p8_TRJciU1p|66@$O>5<v{}g>Fy7U?#6qT5Ha7=hYZ<1B37-r4?qcGg3ds~
z_-6$lpw4{=alnWw(x1e3#}@iTjU1s14J=S($Bg#1O_lk(Cc(INxY)yZb*!u4c-JV-
zVYEmXi3FF6KU&|xJl(LWpcaayjn;`&^U&CvHb#&f`BKaIk7lZ3-w24-P$dIk@xXSP
z*6U5M7ZEeDk}2OoA0%=G087vBE0-7N^s~-Fp$^<(XAL1B16@z{8zP!%^tlsIl#><F
z_|^h5AOSe2&)uopZ)T9vFT#zc<5e}f6VFCYcMQijk$1qJw_9Y3v;K(Fr*`XkzggT<
zlEP*c5G{M%OcjE9w5fM4%$afY($#{fw~1vM2W6qzX?$Q$-(^YU-@Mqw4kz}#?~0K)
zUx$l|=5=LDY;sOW(NU9jMfr341Gc7a_+ENE!tK`xBzD2wasDLGb#-295A8|(Unv-1
z3Fh?G6+RIGAjl+X8s@>N%30!z*#XEd-2)072UJ4uGCWNc@r@q7hc@$It1S1%H*%0L
z9eEw16x$jcoi&GFMWa%YeA@apj7T#4QkU#QgrO5cCUin#irxSZ1KAW!zm5&^nA=0g
z?`4R5LlL>Ufo0;l=Or~r2);%~eh8mMD`2qfyuC1$V0J|McqT-~Oqr?S!s}*4wvOnq
zsbbX>GS`&{Af1NsTG!qX{=_S_i!->E2qiAzi6aSaU^C{u`D&&h1_5Yy`VJq(?S^}@
z+W)I~l2k*s`5xXDIWa%5B@!TF8!GO4-us4GFCBnTfjP0(T=3IE($P-{3eq!PfU;LY
zQL&|;r^mn^S=LFm+Tp!K0QXgt3PBwAl_MeD#(df1fXtNR16gwq`a!sJ#ihOPy#r2X
zkjf0t>}q~#BtnT<*bx=LxoJA#+GTRlU>`UD0j>*;?R(RGBRpm|6#uyYwhG{2z8!Dd
zZ^7EupwFF$hv3!qqhBi<Kc!|?%;$%Hq3VC3><KA-!k<z^SRG?|DFWo<LDTsNKINFO
z&P2t4tzR}rddjhZ4zFWts`K#l8H{Ur4AoI77YXayf&YI$aVX<gwZwqRp`J0Jn^dmr
zU7onB-^*^AZyZClQ6584l_Xu;Q(Nt-$bdrLv>JQH;Vm>cjAb(+$IA}u7{`+Fl00<q
z;f#<XPCEB`%YRW^p|~SDvigl8d~hHxDNg=d5@@QsmvFcF)T7z%2c(%@W+0(=yc!pN
zL~AY$dTxc)#UJqqUCev{UJb@kDHVK2>@GFAm5iORc8tDy31mh4@xciQf>Hp2_qI1*
z!W&x8q8Kc9pSe+Z$gCC)?u3No@83aig&eSI<&IL0Rue)8(R+G?^IgnsXEDm}rWGf}
ztv5bPU5L~`jsvaj+_3)OB)dX0=@8ra$HS=|?9c--2?HSskr)J%68*iRl_P+hLX$ks
zA>IEJndA=~=^)$-c0-eWrtH05JLF4(;k|$UdG`Kv(TaUy3nCg95N#Sp#OrQ9q^eih
zi-_MarrjSrFes_vDE{sGBx7aB9Sqz6E|bk7I@lB5k+g_P09HDt%lOoAfh8^s{`QyC
z8nl_tF-T)=afA=~ZpljO7ySFgF4b2x+gs1yz|_t7DWfj%b^k^!SS>-b^L$L3*gdX1
zv4t#Ji!Zr#E$y@@JuP)7m08b;AFU5lfL);d7`ohqYPN2g<vmIKZmn9EdbkkbT{G0L
z0g%b8tHPiZB^0Gwnx|I`!)z;dR9S%8U}p@A>B;tywyY>r0|L=@5aEK>LJEDQWM6Kq
zr~B?hPIC;nElz+#za2ZB?W(2E4W;}(1B&VTWMxB~ljjVB^;QrrcbnC=`*=Ns{s<KO
z^Z<2{X7jl82nyKqPI^}dl8K*DT1n}m=tboMjlS%+A7=Y8z~&&ATS8q<v$b2XRW`gA
zB)Qeo^sI;)sKY{4|NG<o8Rs^3bgA*9NP>5}Ivuw9B-e#~%g7QfO6v%Cciops+5P~8
z7&&bqnfdV2!XQ!oQgH;#jXFip$)Y8)nt(n(@)nPdNBQbfdo?YFc01%3U^2rd5hN+d
zPb#B(PAu^(l*tR{bxaFJyxlk=K11LKv&7J)yKQ(a&C!><GN@Js8v`g*NPnryxe7XU
zt4{GHUttU1PKXP_I%_>Tzf7kgj(aMyzr0;lWe3Tab$I0{h0I_4p_XLVG$G}VJWP=l
zhop=#hcq_#d}s{e2#XLH8i~;zUzAF$2%reQiR>#N8ez+$_=H=Ni@r>4%ALnu%R|HO
zG*o_n5Y6bKa*k|uoPAI3gOZV~UI28N+Lg{K9U+Y|ssad*PbxA291a1z0YU&5(z(y-
z403&WE^R*EhWP@^M6U+s)*fq#$D30e5xDf3boSwo8t?<)5D<ZPSBpkaL5VPGU<JRT
zq|uU<Tk$tOkqj#9e9Te+mTQq}MYUp?K&g4Guaii-t`(sk8cT{}D2h%{tP<cHB(F<9
zh?Sf%iYMX>W@wDxDb8)(e)q``J76R$86X~b0IpDpYGS@*{l5$SSwZAmVnY0F<F`s+
z7mNtYv3vI3Xw$S*T+B8MJCi`O07IvC^$ZHB=<dADhDq$Fu8T{G#qSq5IRrvtj0i$a
zPQTQ_==znk&iJS=*)q3ZPhd7SrNn5>Mt0qG?@k`I0B4(`AQ-J_m8pi=w90*%_r^88
z0ke2jf`nvWnYEUgM-{Wd#=i(~@KB<ueB`yF2}w5G5Sis1^3S)Bkzq10l8Yz;I40~6
zK#F10g3*>dSOV($40F%Oy46}0mxMT#or%jx9C^Xx7|jFZ?Iz^S@oi&npP7-L-k-7p
z3E)%BZQYvTuax`Q;iAtkY^#;T7NvunYKhmN=r~az+rL=#f`xLkOT76P?2k>{-3*bI
z#0q6#Lec@MZrBIOHqWQ*$d)N<(u<VZOX3tIIj45DQUPqaM1vzyuuqU3kP`TLF<X|Q
z`By$>;87e_4OWsE0<DjMr(CFH3P}79bJN`+Y~+fnbD)AQB+2h(NTdq4mqX~5x}(s5
zyYekmLsxgGk8?%|(yk6#-N|0$3Lp$t!c&#w<l2}r#4&-<0xS#-V&0iE%4^ax6&jxM
z9&182g&5jBp~#_X%s8|^Vk<Nl=*JYUNcbe{nwc7vx4%0VlEou`g5$l@Qf88NLK5U)
z0_cE%03Gdhx@{qvCOEKyq@VpZ6T*Pzd;Lm~Dz2QE2FffH+e!I7f1_CGL?4Z%X)g@F
z59uc+L!NB0dy7Y7B;4NZWH2c)XdQA{5T(gF8!)-#z{K1Ou=OloP*8*ct(c-U3~rRU
zIsh5zGfRW@rtNsM6{OhrIr-`9Qo0&K-$zMsEOU#Ce-RVb`36w~9DwqK@nA*;q>Rwv
z=h7e&%rMM0b`oI(FmQn}45F8@YYI2CFJU(rENLemtZ%NqZ?3oXl*4wlmt^1U_1O{7
zlHTc+4+;r^at}|j-?J+~C~oN~11zCpU)<in4robo7re9txWiR_cIz+Vp%%Fg@9yN9
ze|5w0VT9@L4YaRm;pFe&@k``f7aU!Mt*{ku`C-ymAgvfM4uoe7Tm2<`lA2NyA_~G}
zi5~IqLyKU{@o5Vs6>q29v(aWLnvdmVAT}Rc*=invPXtgM0eFbsElD_smJK!-xS;E`
z|E<wpS;&=dcQXe}I5A0)fVXosqx@2aSp=)uqvPtlg?;jVH$!gqi<yEB-9<5bw{jqy
z*n@JdD$+bT5qF`DAxO{PJeVc&v2ra#Gu$Q8JuuhHtW=VT598jhvC=W%jmI}3z1Gdj
zr5D2=;iPOj%}1484lEcaxf>G@?$nuP47y%L7mj}A?vQa#K~^_ATD<CB+fPN(y&>27
zH8Jw1s&!4W*EelupwHk{x3s02>mlL@GQx?|3?T1mzbX{c@&>#>xbB8$Fv2Qwvo9j>
z!Khwi8>P5tmRYJ*enIBKwOHA_fP~E%S>M)s!?j-6l>1GH8-Ase*OaWL%*U5<6`So@
zCmna*A#G-`Q&$peQLb6=3U+!G!Y#Kj3+_KzGt!+B%V`6iSJ9gA;|E_8S8{`yF^RK#
zLdC@AyoT{M|5+`mN9q1)oc6*4PC4-A!iG!R`*a%QGZVbWTxva4#<{X?0jU7#K8ZeT
zC&M9i5dr6HBb+?Wp+DA{_52@Kk*@!`mQT3baCxBcfgt9Idr>s#ehEP?&#vKYMEpbL
zIZy?%)YL3APU=|ASm4Btd;;@=H!8c6WG(UNez_U!+!-b=C;W~auUqUClsvUY*)B&;
z7T2Z9vAd=5JO4sk(1gFI>+Dk1p|zB{v2cB6J8Fm-_TK|;V_@$7NsUmLd0v#!hmWN%
zk1<qK07fbKe5%vSf`wxX%=()jT~y)DV+*57uaTB7cu@W0TkY7Aq(gAf%vz_To<z}r
zTSYBJrQA9vo4qGzz2DzkU2@vr-p|j10Y7L?ZioN?KnIl{q8?ZFKvHDx!F#lsy!RhN
z;Xl9LYSaQQ4LN<A$LQ&a=U~@X<p^c2sY{PnsO-*9rzU(qlp{z9PNJ|T8}N0f(AJG2
z;-u0TA}>^2?iZ3c#Q`3W+6f2)JeO(AyS{}`Izc`6usW1Ww(2~S$B<k5YFV=O(>0mU
z<4b#$Dt^r;d-I@w%E4j8@@Zq=y&vKht)6iIJRzfTG=gfAT+zqnkt>0_FHxA>otwvl
zpLP5#P{>@O?<$`m``vy_h5v2KT!$cIhV`^AAWBi|aKP{XhU@0?*Mq7n$4h6ai7zGU
zZWeA6duf*8=*S@FHV_k3-7o72&8HG@k19-mc*JFtQYj!B03d%c$OLyb+4<D@gS+e4
z6=o@Fgy(35a??nW6p90v{OimcG$n8SM8ZB#HNsJ=o$hEto;8Rp<uVjNBRI3Mzbv1v
zO!dN|0r-;Ue=x=2?9&iu$0hjkAcq9KO-g~GnVyoe`LgR{YrOIRML@d0tD>27X3?TR
zYVd*YrjIPambUnFu5WV4rT{InFWH~_?^}E6!bBb3N&)fE62;OwU;V;(vEd0Eg#(-2
zd%#FS0D&aLAc$?6?O+2fqs+xWI*vLyl6_<dx*J<^R%VF^58zuH>M}aUQ@TO%RyGX~
z!<&8*jWcxj0^_d$|IoBrzE>yFJ76?C$V}XN_4wu)oqK_pOAc6?ZXuNrFbMn?qlQh%
zGoS9wt!O0spy1_#6s{s`TP%~kW=y+(Srgn(bWa&6a&u9g2!)ft^Q8@HINe%Lw%X78
z?2G<>my-pf3p!&$0Z@`yjy6!1xnXh>ES3V$Lkr#`?BC6&M@pt#E6?t*yo!0^i`b@<
zKsLJ`sTX3$@4)M#M*8%)JAxgEV{o?usCRPJu=!HCaC3sa3{#XB<qa5qczSoA2xUIZ
zwK!7l)uBYNTHv3i9sl+31zlc{F5MT?T4FS3Gi{*)*Xo@lzcWxaub0al0Hzei9$j+a
z8QJdEx#?v3dpNhR`yH;+R--R;B}cbMo_y=cy0q!t-XXGxN~!Lh&KjoJJ$1c}$YRTV
zGmQey1T6O|c~(Zh0Wu5LZ9KhXvOqm7g8^+sFx78aL>MS-N;^lN5Yvf>0`ny2?tkIm
zq|FD)5<BZ`gU4T8YLiXjgK*o#OcVfs#mQB!rd+_=tp^ua$}rxtj9(uJi9!Yxha6i@
z?&gW4!!%$qKfznr#gW732{vl9fz6Y=PFNRd8+z<@cuu*=E(-kcLP6U^@cWl7#PHC6
zSBkV4fG+FT+mtjld3BUuKH_fX(Av}y0YVi@4`?1;HZagRejz)egyd7m9@(kE76sHp
z89d()ItSLR>xd%Ds`Uw$P~0%9WQp*}w^E=_Fei|gV_EtVBFKksex7}A#M4y%<ICmR
zF!tw+QRMO`s{p(22mE^78|%_9Vhz6q=foU3oz<4Xy)Qh_5nann0u*Lpi6Ba-<+~mh
z!BjsPBFsn;QErG%2zDhW=HMS_M#TyB7!DV7_j6j1VikYCZxKJzGouI%Qv^{|tRBnn
zQ>pTF51$*77ds~6!!VQ0AF9}kXk&3ad`^bJUxUMAK}E%t#42b5h+Fjv>Is8ZJ@4~7
z+Qu9(%H(KjQ??&ne|w_O#)i?xMw!wVXJ<RY$Xr3CHRe<YU&JJfD)%458)J3IGFgNA
z5-$C^jy0|Br}ySj%(+-XJF#S)B`gskA?6zcMygI&!%hIJNG!Inwp2KPaiqs-pF5sK
zKSA>YEm!6DVc_T2SkO-K$=f1r3y;i}5&>iG5NKCBtZN{DiT(Lefy=2+%Nnc532-N5
zCIbQ72INO|a`*I2fq)MNz|a~K*q`7qWXokN3REx0+EcZCXwQ`|?IfXzV?ti@OwY?f
zm(cqM;8u&)Qfb?Tn`czim;c^R6Meb78wTGH<A&XSJ<F_({GSL*6aH@pw&0y&w6GqV
zOS<bZkIQA}wbuGS68BH$cxRqpG9NZ;kjWX>*xVk~0@BzSm`(~v2!J9|7aAwZ;zkG^
znT-y=s5eo*?k$Eu7>w?{bLX7>j_i{?3F0rZcHx877AgmP{QWj~km}Mh!^ob;`;x~b
zvKKq1vcFxQhhxk5@xIl)Mbh$(n8S(NEMrk4GC9w3<}G?4cxaO%UueCJ9dZGkknp0}
zMUijpXAz&9Jqp(jgOrvaqylENP5Uwv&KGZK$SxtH25BfZr_Z^#@wt@^)Vx1ZfP@mj
z*u|PF_114*#VD^klKN_#`(pgR1adK(s@8WXdaJYy$>3_!@%fiNG+39_Pczb#>zYuu
zVq75Ph`xYEF8ie`<LG)Z-iLtl54tE65|VaB#x@^p>W57d{*O;)ClR))0m!q>heufk
zs8`&Q#p6dy$9MHcTfdf90&*NS{}HKy-L|MRq?=c#>3p1974{urp1*kx%+Ge?U#$*$
z_xp=@yFo6<upuG9P8rgSu~HhFA{<e&)$sJRzcyVVMkRJK{f>+7$E+BxY-C-Nem2U^
z3;l-;#hh&g)W>0f+%B`Dg$=9~u&=Og7-y?XayGPVf3tGNv!nk`Qc%}ohYn$*Tp4Em
zaONj@F70=FxygROP*Xg3nL@3GdKftqs8jylj>Hi30Q`3kd-Q?oVf9Ofdv)Jr|Idp8
zmz|~tfT+5uuhc7Ck|xr%-s}2g3=dbbM!tv<sYe%Pi^0gb(ekK|*LY0yZ!Y)S=Ivs;
zzE2)EH<FB)et2E`oNkFZ?twBnL6Uy9_djweuD1g_<byqd$TB%rHMmUx5eFyb>8!yA
zqX7Y<#$+G&;0LW#&pzcr4Oq+{$fiK>QjvSHn!2>REXxr$myZnr$9chhz@g2R_&vSf
z^X(y*1**^t0N&srFH63Qc7bk6_Wwf~hVKXcK%Y6;2nbqyc72MVsD<4kD-x<#fW4|I
zQb7~im4H=zN7Vvi6D2@NJVik`vU-!Ub|it}mZ+o}4{y%;$CqM#5(V+ExeC?#=}I*b
z99zueF>c;-q0iT{v0#KF;K4Ki(CR$|biuD;-b5!GG)PTlV$<bI+HA6%-`C@gn2ZSv
z2<a#fcPIuVpgatK<h>-A!3xx1%o@Q$rHbr04h7{}aQ`(L`7rpxF~|M$x8gEa!{men
z0dLXW7xBoOH5WuC29d<rkelirD)R_ZjE;;+6FxGC9@rPfi9j3JH&5^Xt7d$Ab+oQ<
zMB|HLLC}rM5uFrv0MGd@$yyzNZ=%ah{_Jug!(X%cC;1J5CB(jsO^sYf(@~DRc*j6@
ztmVUfMI0Gw?D_IRzM|2!Oc;qu{@qPf&+KDAdf~Fbk^fY6hs%339$%8a;c9Z#aJjv6
zYsT-HqbxasBYh;f_SC%5J#;mokxReh0%6isOE@_Ihn~jR8)mw{c0)#^f=6_365kX!
zKF>&=5%0&a_bn+Y11QBkaV7n+QgDd$<o_rK^}7uGKR@m}Q7f(vgRd)R_z!~Hu@Nnq
zZW|ueqj47JKp&Gdmqju=&&cHrw{Y@c7T{Pe#m^h~WZQ8(=RX_5B`am?ALY+xUjK~v
z{O+Nj@BO9)Q!!B~!iC%h&60~olt8l@sv;0bRzR!h$PXOUdSFv^=_>{KN@=_flyX@r
zzsudqrq*rMmv&>mi`}Rt(diBluFiJFs_Xgnp3_$n3UPIgM8sip8q0br#=H`D(F?%E
zxne>q@&^(7BmfWxC35xBG_QHbjUUY4aU8&}R;celSrwEshzSxcY9ABM=p`7U+AW7@
z%`&9ZUY2JvyRd`7KeGl3D;^y2_Y3wnTY@fekhCRpEG9`p1^d&NG*TOX`8Zhm4MdDt
zkJj$p7%9~^{dwg8piA+e^~Z`r&}e}!pI^cWvK@8B1yKp8`v9cc_HetoaVmLA?8{Rk
zwcrV0TRPSQI~r=~gE6=8DF96CI_ky6q7U&D&F`$){S9#u`SVIy>RQF2eBeooNlVn*
zi>$A-tQfy>jP-UqHZi-f4a4rwrt+NFpr9bop1s>pJV%OA*$Cq#>)#;m-ZxK4$c3Z(
zHBpV&Cz{CTpU-CBrOn>sWIv8?(|N@0&R4g_i_%&;(UnzOA{NKLM_-TP;N=cD9Y!ad
zy;Dm*|CaA6)^lg>xz0Lf%%wGAqz(~JPz^8n9$5Nc)mvl11nXzu8Z=Vu5;R+5BGCM^
zvAUOlPo_1e?UG>byp^`T-w42%e)yfgmLU0nGy#0xV(z2R%@r<;x2!O5Kry)iJyn#&
zr%~E{*+I@zJtI=>n2plX?qgwgkAM!wzWhdrbf(BI?n(H(D!qRAA{usf3}y0X@bYBy
z_k7UW{oxgl>Mip1`Yq-C1j)+6E5AWxGV$)Fjaz*|Dsj;2^IJKh32COE(#75HRbSrz
zi8~qsaaX$EHV#a6T~8Lsx8EQ`QmG<dBz?zw337ni1Ln`^BK?EKxsQ)woVnR+7SkZw
z^}FVML}W>5?Ye0y|F&G>r=((oQAvi;7aha_BhMoQhBqZnWRD`q!}tlKc`qoDJtY*C
z#@6}2Y4Sc|jRkY_tiU?FBUOo~+4jpEQ-}eZ7uKv#7eXEWn$qUeCZHxg!6s;gw$j!x
zSXE$9+Z#_u^ts<27EBcn*mBPPEwq<u4%XCxxK)-_2KA1?^mA+exccw9<h9q*Q>*!v
zu~q`qw&gSia}j0F$j&Nc3M3HM6Gu1Cx@4XPPyc-RM+V$FC}CX{QUSyyaUKdBlhBNJ
zYkEDVe$<g!$x;Qsk(W*m2THqbnwpF;hV)2<JhWMIVP1SJx6V^2W7^Fq{PGF0dUMY_
zP9{v3>vBk;BrAwnj+loLMY&ugjMLffQ_jaAA9T)Hh1E@hAmasFh^gwdR$tLvsn|s(
z%?WHxRIRBw0|^#UfRuosQ{9@G0%kA!n%9YW=2bcUqh!oV7XmasvgK|P(hin2=(#Ak
z7evp<(@R$tvuF$q%fK6zLnP*Z)E7eemQF#arX?Z+%f}Hn=V!qW@qcKix;h3H-XuCC
zkP!ylvWGeq%E9(899ZmmR72@wetOPnt3?Uqyqju(KWM){xI2SAGT=uRT@pFN^A8*V
zXGV!*$d=<0Mo;0&B)O*=|D$Z{$}z#ad<Q<bs6E0Uw&{wcijm<3YNHaqtFX_p%_3d^
zahot$s-X&oRm2NtOmwgDBpAlF`nrv9NW!Bi<MDd0FcOK7+%nOQnWo&S%~6^rG3`I5
z!*J}i)}31yKT)sGy@#K9GB~9YjDq;FqcL?&@JLrRw5jc~x2zEqSt#ofc*k;jOrqPJ
zGTK1a9DN~-XUl(?R;7~cX#HsSk-g*|s52f`g|dhdc+k=6g1Bt&uTo;#OWAKj8k$3~
z>~c#qDGAEx6HZmI*$8Gzls8AC!$Uk^CRyg}Su+e~GoGJ$txGS#o<(apd_<n{oeDA~
zQ0HsDC=jx!IZA!L1h!?3eUwY+!dYPwJJA4OOVIwN>6MM@lLeN8G#uo*l^xV1p=Xhd
z$j1?YWIFMUl0jfaTtLPi2qYv3@odOvhWqj3{`8wo4dxo`1+sF({llF>swxxbXz7qz
zOz!|1Iw`=J!A<X(w5tX4sGjriV;Nk#Yk_eqHYK0o)H5(K##oTY<`)>F%0~b>PxM(+
z+0tl|2V*SuE}<}JEem>U6x2x>emA7Sx>zPgmAwf{BJ%%W<r7|F<tLOP0>}Wl$I-%&
z+@i~~>0>d8CAtsz!uf*9$D&q20&3cJ>9GaK1NH)&JB&_~5d0mqCzI3;qB<rpAEe!<
znM(P{Do>3Nh75!NH$WtiP%+a-mJF5S0r24^kcQVt4XG;@5FWEDmCAIKfr=jWaJj6(
zt&{<{8ex*+(?L`L6+M!@9xQ?3Nd-E$WvPca!3gH*QxJ(stAWKXf@h*P#zaWOtxTM5
zf_KP)d$e!!J>r${`g{E^y>7ADs)X<`*H1EaUjf@RVwyR`zw&`NP^W_e2eawi%Xec_
zdjOH9!L3I{*IRRW`B<s?N{@9nGJLs12{sX;D{dJzLTZYA)g^i>ls?{UVct-~8HH6m
zW#LB3blr_5Ok+qFsbkzpWqrua_r2h$+vmcCS>6Jed0G~JY|vS@m$Fb1xiCnDYTdGc
zKyP%N4+=tglr1{*C3z0uU*g@p0VaQG5T%0$9j!sWHf~WZ#WHw_+X?)gC-2(Gktaer
zTNsqTMC@Mr<G^JdC4vk2Wvy6(h`S9P09V&USlk`*QltP>(mJ6()J?e=970rl#t>1y
zR<N5Ij^TO*=-hsNuk3y^LKxRZ>|=XcMi8Xlzx0zp?-%2TSNWr!jhKKz*bZxtlSxc#
zfY&xYUHZHB^v01-uZK{`pP<&5$x#-a+Iz-Fw<1F@a6KVgp-+Ke$iRXtMg{m(vrlao
z!#y~_qWlSen{I}$<oNEh=sgv*O?%d?!#7~x-6%jJCIDH{or}FMa>LJm`S_l@@k!}I
z*|46p?cXMC4sm8P_E!gb44@Mj^Lw7c(|1ZC=j`6jvD<ANSrI}hDN>;LjvjZQg}l=_
z5v8?hws$n+k8Mx!Cs$s@@7uv8;Z(Cru=o&^>vghbWrI|CTmBgEZzyN_;#4Hdg4@zi
zs|h8#E(S|J(>#H`hi!wi=X@MaICmS`pYc5Xz@<GCIa4)oS42GcalF2TkIsO7!9W3m
z4KYAI5f=``&KTv@EQnTFVTJ~FL}MMuD5cTigQ)wRydsB$%`p<Pukn?}bL}?&H|}u7
za?y3gZEI#Sz8#NKIubm5+}`-;n9}kdFS9}?>Ty0HLbr|4s~O$zK1%pe=cI*Lk&;aW
zlMl4uMJ&BpM@?lzmmm4GyH5_fCgs`7rkil;w({Qp#ta+?5CH`kfd~Ox3T>hCn+?>@
z=z4)kGlOG7%Q(ounXATds#lY$lFqzLi!9rBjQL%lk=8MxLx;^X>)kDhRj)E(V)%G0
zFH{~N&gQ<UV7B{e8t^DOM@wCMp&$-P*WCY)>&oD@@3bWbjc%<THm$FG`6a)J0240?
zT=V?C*;XnZea~tBbf%U>{N#_px8b1{K=IV-9Z%~pAcXz)$AL{*J5D|kFM1++{Kjk;
z{=FUreN<I^N1*|n#L3$T;Pog`DSXDuoOJ7Jt2Yecage_8()~e*4=@<AfB+&5Jbm;<
zw}dRI={)}efD}Me*CQm=ENq?8Q-Vf<RPjZw$-3nuxa>=^_pnGV3jNKuNovrd2-Krq
zIP2R{>WX6Tth3%n!u>msp0qgym?U!3{}Y(hcn?*HjtEZvv3&s0Ic^_>2ghoZ!A#d^
zS-vjQqA+%Ssj~jGto<Zum6RR6g(Fm_)0Z=u8c(l3uC5gq`1W;)NT4E0r3jKHMmr2!
zkx3vY6N0Lnqxh)nQ+*uK`kZ>7JhS`!TqiQblq861b{Eq9)kFqiINSpSUGshDhDToF
z_#nVt?d4{6ELp}wtoG&S4?kliAPvt0%Y-JrWXPL#CBl&4%JNan^(6Ol$A|Fti3TT;
z`8kfH8XY|)S-zQ+atO3$G^h|zVxOSX?Mic&!exeqnr!pj-)BJ<eR@0t62MPbL#^_a
z*W2inF!P;qjMDJmT#40hd73MG<(xn50$ZlLBEWjnjcgVGPLx#o<Wi_LrAEXn`;f%h
zI(Vt7HuO&9Xbl#Kj8@2$q*w-gfbOlZBMF}vC>#Ko0v}u#hJYib!sMEUmrOp#i|MQ9
z;%R(1W$3Pzgx9!2m9+5)@cd?310sitI85K>d}|UqDP<Ka#zpaQL~f_FW(Y5u0asC~
zF!apoS@5$7`|oUNTC21*=Fe}!;zbpAK`ZRcdVDs{f%7z<60rsHl;rE|Gaagj$~(M<
zQLB>gukgvGLc(HjIP?c$Gu3CcnWm0)O^aQk`!?RR15wTBvRVVcG~1F5#eV7$=#--a
zt$v^%;nj|eLA%L#bc$@(zqIMt;?+T3jJND7*#r^5hcpW|rCKotf6-uEj4f+OEYxvT
zoqn^PLlDfv+o8PhQhrmAnM)syW{jq>VeToYfXbq<K%qm1u!><89w`)ssD2I6!P3vM
z06h&X^$zTMdwfpihVP-Qfcb-*M4>XN`}O`;oTII?Jjs29fs-L8_J7S5_NvXPabx<3
zB^oNnfLL`9rVu~SB(o7%g+Kefn3Z)g4nzjTBf|r`JAji;OKQ%3D;FS;4-qMB$QO)%
zB2Wxu2B#wv4G;F0yjX)U#F?p7dJm7~GY=fI`Qik%j?vr0qL6l7?c|*n?Xa=(Q5M^Y
zQ-kI0Jq-@c1VKU2QfrSTbDK}GKH>++el2J~4C*NyG>bqA^g(?IBuiaeGDKcIFK+`=
zMq74?A+m;HK}$_6qzO^@PN@y<lxpG%5COglufeF@!zqdS3=}W{cpm4Tu-yrmb+M)f
zx?><gz<m9mrMQ?H<UJRmPBhY|7imhReHQ08IbG(=trwd<{I}yOm|H>O^${r-Kx_Px
zYAiKD$y=Z7@$S(d#&6H2N^z{qp{aSt?#_p`S{*i5LLQ0Ap7s7MZGrtc=iURzjidDD
zO)NeQ>X9wOeIvpI@bE)3gdOncjTlnGQ5ZHF!49Y2K_T4IE4=)WPh0d`^IA}#yjE+L
zP^&ak!aLTGhNBXY0_qV_Oi@4xVnY&b(2r8*EYujZO>-CRBs2c(xsYe=J&NNg3a66Q
zX6wmgE}3M~dJ}0p?g#viS%_wF%@VOd|I7iXP$yAi+AOC1)_5@ldbj3^A;3fWgeQ+{
z*yM;fIs`OfqGyG{`-3tt;ehFKp<;e902g-K&*>i{QCwhca<#2CPEjAzrHo5)d08J5
z9mU7o1rOM7*`~WEd(+Rx68NwmE+@z^aGpGu3MfE>f$#UQ2sKAu)4DrTE{J_i5dn}i
z3Vc2ZJOS$A`{%`Hx5xlzmVWn^@tj^=cmQLAuv6VBxOkFZs_>L-Gvi7%2Gg+90z?Qn
z{#KTB{9vKnf<SC10Q$QcV>)BJ;;T0}(Oj}Z(YU}plSeKp=BnOP{8k(rCv}390$i}P
zFkdYTs#QKRfGhwf0)Nffl0e?xo4a)CW~poMmZPpbD)^U8$R`DFh99NBzakz(KL&}c
zkS_)w&$}ja|6!387tR_@Z7;m%($k<9xw*B}Zqj(g1OL`Mt;8FoL{YZZ8}mVCf+mMA
zbWR}C<VYuYSG8o+To%8(>2K(vW}`4Ux@qzMU^0WSexOSftUgcq7JGZ_hYMvX*LNRy
zNF|!W0HZYd$j62k0G<_4&LEMX4ryBChQ#lYcnLMy))PKl*9Y$|Kgd(~(#NShabor<
zT>p%)9ngErg49m`f_?G`6}OS}^kG}a70oCR5TN6W_h`)dW5lfSdkNW*07xWa&Lj?r
zuH5)gLR=Y~hK=5Z0rgZdB`rYss?!yGd^k<FAkk_D@7LwUTp@gEWro=1amV3=`c0Rn
zW9MimzT^K946;O?Qz~4#<chQ&B<^8SYLPraBi@|bj@Eu@dDw^sIeib>2|Urq@~Gl_
zK^UAAI_(L+Ky(6Q5YksTjR|6O({RT|d2r^Ei1o0wHJ3p9Oq>?5wq$bMpTEp_-AEs=
z$?aqDwn=F0gTu6IE@(r^v2p~?2q7mZ6cztLR%Wa`yFQ#03VAUaitebH&D#W^2TTwg
ztSVF?0(Ktm()Ota1BVAeo|9xtu%H4j*lh+~=nQh8+@Xb;T{;--??L&P#gJq|ZhRUl
zRmlJvDXbyyDUhAK3Vz7{q4p2J)%HKThAfnB(PkbGBJ@xN?B^AUN-LZXu+tCbOe`j6
zD+~rS6U35Nt4GWOpEGSf!}+mF%l|Tz05CeOa15P@GxoiThad(Zi@;x^e`wgcVA;vi
zm&U_YP%&)9l#c<A)h>z~QWG`4luNU>e(J%nnh&7@)F2{Adttzyr0P&Ki)MfQM&|Pn
zB68CWR$0jTXx#v;K|}LTH6)r4*6^Ehzt>cjdelHLQyy8JyMxb4nH>i8oykSy&US$^
zXeRyBx@=3g9lbiN(TvIzr8Q8FTLlU6$ka03mub;Wc|uWBpXy(>j4Kcy``PiZ`mlFV
zCXA|%^(k>D<SVqUja@kI3H1CA?v_IG*9>^HSGkJ!Psq>z6uUoUE_ZNO@jxlG4T<6K
zoUR<4NMExBioIyE%HWGcu9<loiyfp{<MWrCr_#3Cb-6*Y1EN-OWYh`UF&0ys9vjP?
z%8ZMHO^cfBQ)Cv3)qSTQ`%GZ_r}J$Q7i})Sg%fSTYmo9=Uc`}BH^v)PQQK?Gqn!t&
z{V+1Ab3o;iEYb$M)7J&up%m;y;r$8n{&<#>XHXyh;Tk!hgxd?PSh1HNQN7)=cw$#8
z`X279n2;5S?G(({2D}OdlqFP8OsMmnF+*P&3?NDtK%nmLx0ez<xjZbDTL^~SeWVHA
zSGgniA8f-ZvwnX-P6l}|5*$-*ZUCUk4p$m~`1((3<9zfM$yLyzri+*w+h|+=4%Ky4
zI50inci(#5!GLNoPJ##+u<jLP78ME9Wu|UA!3DKMYVE5@G1V9d72O`cndjk9_g9_w
zO-ISmF|O~!qQ+1z5xGqVs?7Redp*sLP=ewPgLVxbU_%DhGbw}74he)1SK@UC+9FZL
zuL`EGYDFE&er8*LDJ(;Q!N2r)oTsK*paMRXN7QhdZ$M$q<v<G|1Mq5vdztNiNm=)V
z;gGov*cq08700Ho_!spagPqkjn*Pm?N6qnSb=a79i%qS&it;#)S;TqY-<bvaw_+VA
z5R*Wpv?yV%!W<AaI=Nw~*d*0ndx<J8+7s+7OmJ7fos#z+5xeFT0)-Ivx4dUPIxCaf
zycs>&yN}&@O@s6gS%#;?#E_C!{np7Ts-JDgg?WY8TkccMPnN8AmIbh<#lHb~2Y|=d
zr<^cTY+TG$jaEq<l60m==QC3nD-2DO9d7ujwO_*#x_r{>kVFq`%N`%@s@Wgz5jZON
z*~PuT2Mx>g8Y}qnb!G46G;J%<&E|X%lm<vc5aY`{6gt4MG$&(@e-CcP3g1_+_g>rO
zey^2Urb+VYVA{{dOFY#gLX?6s_!YD;h-+Y^(vEZ##pRG<uIvE71PzX$uYY;lN0s>m
z+AqgV_Vtx9e4gsSmKy2h-oO)dH`>{ThcZQJ&yLs-<ClIcpfLilmLyMyw?NCQJ;*Aq
zga|?RUw#}W7SU*>D0+o6JjH3?5*dH<!b}ep2%z92Valz^MMme^!;Uiz`x_4$?ylu@
z;i4#d*ypkMEja5+9Vcp~#boCw`I!u#|2Qn&W1cg~pqA6QY8YG~LU6})Eozmob_EiZ
z5TbT6dq$($X}k50Fs;p{VF7%1V~0uxjY^TE{4&X1bA|A7>dn4+PyFMry*Da9fotZ=
zH96_j`ixEkcf4But|suWgxqjlx)1UFs@O?!gd=p#Ovu!KeCSWT`(8kbLNknepC!I3
zadD{dgs`nu=q|VKLgu?k-{S;lm^pTlzblSrMBlY9=+pln4z*P`yi$$(48)o}#V1?G
zH^!NVK0>sDLVFIwbJiT(nKyiBkeSm&gw_5Nh#wpzx1Z3n*w$;Fyt24vqynB<>^2T{
zzuMGy@UnJDT9+@RGbX<}%PA&DUESrhMX}hoE&u{3N%n~_M`wUGIx1e08I#1*Xke)&
zLbssLJ}H&HS9!!WmN<QHw*fE#7J*E})<aIy+vWH;akZ`*u%**@SINXE+~ruK+sA>Q
zb;wPsRWy$us_X9_dIl^f^v>gm5){3u?o!qi_!qQcFj7=bX?%6&ikBOBz&i)T@I+n5
z@=(yc!7E=81yW6Zbi_xDAp^v<qm;9KCLFp}ylK?VgcK;5$`x~SBda}v*(`;5@)tWu
zfDW?!wWxt6ZIN*5m3!4g=*_WrB$v)gCa8^eD55DxX4jtEI4~ax%b0a650xlyu73d<
ztfZ^&IIuVr5=mj*pEnjCcsRUr8NOl2@zl_3wcYM+oDlVUDptvE(&d-h-BuAQuls(#
z%0<(wIexkrSv5W#kt&97ER0&8RNQ}ssQVQP+^C*w2uMm#uilX5hMUZqH!=+C;Z^s7
zn<Iwd<a1{_we3VjHy?YZSD8mE4ANte5w$;VkNNITWqXu==1{DP4Dw9w7SB~yq!py3
zjE+KU$Ue0`lq8J3qEP+<lP71J?exW~dQTU7#m%cNEJ>%}>_w216#7d47(&JZQraH)
zq>oqA5;HuqsF*ngg{5Ot=(Bj=jNWSe{`#S!dUieQ@^J*Z7&2Ns<3lX2K3S3bO?<J<
z)>jnsD@%&R)?g904WWj6Eo@ePrdZf@7GDw*(55t*tM1{rM+BkfvJqUPB>Uw+Jg>>a
z+18L>I_1Ilt~dR#o);_ji^ch>gBtpDPu`N;j<tYS-&Hxncq$DZuacf7@g#olZAkbz
zIi+0|5?%CocY@-8igTFN1VIOMBIP7H>#!~2$&5uW0&LK3fEeJa3JnNO-!=$W8rM`0
zqD6BWMs?P~7Ky~^6(-RiTNe^!3gOlV6kCa=(;AnNC#pJ>ncApN@X}t*suEQQ{EG|c
zz+uR-w#8&|Fjn82*AAQG=GTZGvCwm~^BJCQfDWLL%IokSvP=e(CY~mFrp^6AVGBm9
zUjLrs!)%>K0h7o1FJh*S9$vfATbwN6;$bOHMo%A@_0@A8JE4NI?>#&G!QA8%ykMrO
z&;1x+-zWa<oRsUUt8{}h>kyL=NA2JhO?Ya5eols6XIg9P{8VVuBl|$^;U`fv84H@C
znD~Tax%-%YYeS$ia@BrQj{*QYs{%9**CQT)ySM~w5563SxM(?Pkn#dOU8ZQ)he7pM
zG^6<>d*o_&dAE4A)SOew^>?1ljR$a0_H)oFsFoN5wV$XPY2y}hDve6!n8%($mZ@q|
z=B0!&T9GT_0if4kxN@1Jfv6pf#*ymCjbBg3G$TkUnE~spChB6~RM)Hd7U`@!M;Ns{
zdmzk&T;`PjR{Vt&d85Fmu(K~Z!?;`k!|xJT@*drZR!I;89nm9lE##jS1pY9>*LYM)
zd?p57x6+Hip8cQtXDUZlbOHP>ALV?7=wD9lqlGgj&G*tbP>4}}-a$eDJV5PItIb$%
zB-&!tY`v}xm7ZavI6ZfF7A|%+xAYRIV&BnUQH}S94|((Qtyh}i(ld*UvDGGaGy}Vh
zp%j*#fmP*CFv}|Kje+%yNA+=gS)Jl)aM!@0ShP#RNByv6-oTf|$<FcqqIRIP%+Hb<
zadIla96lQLI+ePPU)EJV>QzXSnXckz<HQ+n*{AForC^Bp;ke8KCjoqM5(gEBX*d}O
zY8Ys=C%VKZfiEpFprRbT1Cr2CU|Cy&m+N(0Z=%ut;IIuf{+}X}Ecm!6Fp61@-fn}7
zcCA^%LT`9<ih<LlryB#tOmy5THkel|)Z{RXmveE^!QHpdjHrr{SbUK$m7dPOWDk6v
zM+bT?)(DFU!f8-Nqz3j0!XX<NCpbhsx9Fiq%QHY^O_6Akg(x10(7xc|ZYd!4qm7NJ
z?=a_pp&cie>xKKm9>Km$=HKudlry~LTz;AD0e792)qQ}LxNI^F*d^jpK?d{qLmOm5
zhuQyr;g^yx1iY3uL9X~BXXa;#+VE0to$daMw@(UrD<LN!pEBNq6}kQ+g=Do6?d6S(
zk}883VH1(549eqsLQdNOPGW+zl2W{bID!jm$S3YK$iTGqwO}~SJ;CVhbN}sP50nin
zl-%M-C_oR<*f>(|L;yGCe6IYPps7@g9XlED+NTKj&LH__G_`g!o3ZtdK{}SD5WE|x
zO;bQf@r;@@K51l56}B<(Vcn3x$r6$fzYT=tm1USx8=K-}d+6u-)jJB_!ejXrgB-iF
zlj9=Tij$55ZBRHEZF<<|X=1Khvi@7Uzj7#jg?#>;Jh=L{BdAXg!N#H75Lr5$Wx$c`
z)r@i8K6&I+t$VRDFRMK=B(Nk;JMag9K9*?~_0U5sbd!BIL#qj_6?EdKB7EFjVZ0&2
z;A5}QCF735B*L04TtIq;G(=lfa8s>CwDZXlgST;HOWercElc)LEz4+e*IzH@dyTXr
z0VQ&YjhEwPm>zTNUWNiSzt#}!rlZ<st(BOt*qIg&{;v<e$&$=-8nSL-pZaX|{n~+s
z;HOj|=V;C!oMpPE<e6LAORyecS}Nm(!EQ*cJR~ogcrPnZ#$Ijj8C_QT#GN{uXxTTN
zOh(8P`1ArS4&KZ7N0`Kb%}qqSWH+{ufCBVFiD>!6sYD#osf(j<N~+RLJR1dV<f3K`
zS<>;6)kd#D?Wh#sDW}L@x^BDQBFz~WPiU*3Nb-l$8_fKBWQrH+2vHegJ+D~Q;^EO1
zZZz<C!km=&^GMoPXDf-vGj-Sz!^_boI1|*oGddX>+*+;~nEJ&)M-*TvXZMc?rxHne
za<4TL_PonPisrwS|4um?pNDq0T7GJ``eXcQOfk7`y$RUGEK!rk8K@YI!sNT)5R3Z<
z{2ceJDza4%mI>04>f~&|FB?m~_-(-s1iw#OJ(ASE9O#F;#|I{yFkBP!Hr?D=TxG{p
z5cG|FRA-D<>+|JSD)DM+udyyvV>c&+r|-S7Y0=j|*`=S+Dqt9OJT5H!oDuy{Zm84D
zP^7QlYF=*>-PqgK{l5>|C7BFg4`}iYz{1{Hy2Xe0muXyK-Pu=b27yXdOWSip_%8Jf
zY%;cMqyQ^HRRR93qw5^s6btrh#sv{`wKeg?ps-fG^8%0NkM|$9jUqIn8^krnk&1I+
zdtwUyLGEtA(L-w$dP54d)G27$-5mWqjwkN90DcDFr9Hm+<iAIqOE3d;9Y#UiM_tPL
zHnDKCF!O0e<D>v=2;&GE9W>+8w+$n1eY@zd0e@LHhg_0ZDHE`0h~1HuZ{`yZsyDVl
z#-Mts`cEaa8oCP?>i-G`2c;zbH7rKbIxfYB35Wjk;U=K{?%rz?=k(a`t23;ukGsN<
z<X-Z0c3Ogan1ey6N(H}()OAsA(BpvZ0Dwsez!{HlfB;cA8HfQy;5!Z>y%T@}uH}}Y
zv)7LGm><iC`x=+t-;BkcIa=8-jLQK`DZOeN?lrb#=OO-89em0)?Nab4vxPy%K?7>R
z(Ad)d4IT*|DKIH0X$vJ@NrCu=cLJ@2GaSgbx#ND4=Y;yZE=2Li)!|v{58Gt!QhEXJ
zW{3b>SC0O%K*21;jz#gSjXjDeKq>s2Oa~2MkUs4d4liQK9bQJqw?ZisL}kZavO8m}
zKiRUd)lQ|G^Y5Iml3TI)($?R{{EvC~$=ZB*{BRmNyZ&UE#UDEkW72u3>M2X54vcg?
zX=*ExIImReL!)^%(0@0$b2X*lXJ1xq<8Kr98a3mEjHxm%?^dR@7(9}2i4ar7Dz*Ba
zYi|JQkwZq=%LM!fmWdHJ4?Z}=`7O6ub`>>{kdlCRecXxY%jP<QU|NhzrstDM%S`7e
z)?XT`N(n2t(&t-T*R+cl5c-!Lxu5Zy+zFgP3JV6*8!QUcTjA3^9Hu?VPdJdUF(1v0
z1Ab`gk%P6G3|ZNAeJrhHcT^~?e@Wob`VQ<`go><Kv{;@fy82!^y*a?{SjaUM1VltZ
z)Kt~319ab+y4Tucs;H9MF*nr%lCLHS8D(QQ*LDN)2$k6<W@KIaaoB-_;#wiI@dJ$H
z4PTh)R<_KhtkkF)8|?7HuM6hXuP*d;j@<s~hTo+ctnR{d%kWV|#i#2$!GhQIn|0tR
z2`gh5P9cH`paX#?o%jfWP&$y~%}c{>@*gaAi9!Ld9+zyvs1z6yu?9@Ox6!ISuCjc7
z<%v3ctkqG&v3vYOP*bL!x`SrcxC~yd<S|-KD1``V_8!wwLSnwC7ay{2B1N+)VS0zY
z&MaJ*S!41w002;bSERiXjn9<R^!-J|TjLR&3+svl?!VPzn7u@ntv(L};3>*aZ#y%@
z(=X7ZS||xi>hMOx=v1ma?bboZzuMI*r6e`MOWT`%m{9h@=0gQ849JnLVXnm80NA*h
zz+HId$#*Sd)hTi}&VcF2)+Y&J!6JDtSfRCNAMzbV=XtpVS^s->U0|Nph^x5U^4)KS
zb9L*Q+Fs|Nk77?hLyEz%)W>T0=DlR^L|EVp$m^Yi8IxVMX?$i2&PlwaN%^9ws3=Ob
zxC5DJiWyOj-6K%Z@7HnY^QFA?@alXdt0q?(N@w?a)S$gyqW9q=4R~3_EowQJx+1GH
zDC_qZ+ujVF;E|fL{!MZep9BMNwgJZUQ>{}t1KR`QmP*6mJQ|Z~b8bi>rD$5v_(<P3
zK<Z&-jCPGOKs&obcyr+CXKz#6QzIjlflkDzE&kdvnLz3k)$LmTLI}fLWp?v$J1n)6
ztbrV=L1-|bf!>V@5v~AuquV722{o}|#c7;g3+-064JFy+z6wi7Xw~*z4*gP}wXJK$
zLCF**3GA`knDRlwqGs_SF&;dF*Q)j0m<aXK?qwhCE5jc&c@gI;C%jowrFq2fg*IHE
zx}K;>=WMuwC{1~$g#V4TNG}#sGHJd6_HML9)q;Wh0ER%#E}R)ImF<#8sH|RBtBr1<
zp`7E`bWHBg7mGl6#SMM2_{hNh#syNwSQec+w&|n+9jQ-hbZPZu=aROlY)^5o`j+|>
zwV1HnPR$BLf&A3w$)PwSYSLo?ZET@pso&=}q63dzl^oY8H)DxlZD#*t{5b{WufD2e
zq^o?FWB{k@hP$ul&LF4(O%~d(EA4q-N2u50xE)1I*|}omH?8#djmv8hG5g9jVIkIL
zx!KE+?RY!~wB+O3ZEo}$Y9%VxGk6;Qp#%{3IJ+I-SWUvKij3-8U9!Na)Njs)?g=Mj
zEZo490%kx+$dfu@nZXtG$ZHL!T4$Q5ILj{%55~OOAcx4uF3AhH)Q0Ldue@!}k<omU
zYw%^74lroGw^6cEz?DSImNN3LsY|f2Aijd}Hwn~Uf;ILN%1Dt<tnOz9THqfCA++~Z
z3#DDr)Jd^4K<BWl^gk5GH|mGf#;{f@o%OGwm3*URXD4~)tsC0cptz1lK-o;4TnHZA
zKnIjKSUI>+{AnA8uctN%Z{g=C=u~DuQp7D>kfIPWRS)1Yt>h);^HI&}j1vjt{-W)i
zu|h7m$S+^3JS|xFe<=wtZjbG)uo1K!Q@VmWN!3ky%_z>b{t5#QvjtsiU%Mc@3_j}5
z(e7-_{?6~xGK0{HQ7z_v?Fe@Pz0}SpNTV4XlIBwtoMz%BZcM-ezC{ok+EgpaAcb<M
zAk7HXyCvJtf@oeLKT^G#>TD-=R&f4^RdJGY%D7y>i&{s6?dG`@Az!iA&pqTB3Wyf)
zpPFUplRSVZQ4>&5LmAOW)H4MK1(@a0Q%}k&l)t(#yq-^Hitx`STgN+!+fPTy{~4Du
z8CUPNp?^g_SU)|D*q=kRp#_IoH@FH8WjsclRYx*!kAA859{<>K7$9gtlw4AhZ*ZLL
zI&i9hE(OOi6q6U*8*b7~*IB(=j9iWpryQEIyrgUP`?J6r4C!n**Qoq?8b8>(D$?<V
zY_t0^LKO9{UyeCkM|)*P55I6-R_;xxAHg|8KtY2fdrwqLBm?bbIXKQ@$E1}F9S=lQ
zavp!`yoZj?_bv-eJQtGVDxa?7Jr7|MMN<I&7&;C~*T`2Wga&-2-l!y=f-;t9bn{hP
zhO9?UGH`P0cubtVe?3cnPMvNF2L-kC?o*H(23VLYM9HuJG_=I;a5x;SGLl?D_1QMG
z^M`wxY%a0R9-a+)x$xG|T|@MqEV9^4Ic!J3o-kn)!tl-@CiKIQyuyo;3x!rHZ<9<*
zw!u-gjg428Pc$RqNW+8D91ioYnPlr~FCU}<pj&(5o&}eEJ{B}(??6`QhX?n(B#gmF
z0vTysQU$JIQ{8&bw`t$6<;kWqSWw(b-?AUZ<q8uA)n7~i7qB4uum*bl#DvU8iC%Yp
z`4H6#e3j1Z*R4#iA6xwQBorTEJxg-GIpWvoUw@K5VK>hyD3;a60#Td2R;_7rZBy5I
z`{u*UfRU*e>4~^802VD5EX;5BT_=nc@toj(d1gE;?eb!{%MOr#@=d{z5+SvkpivwO
zW@$wAx?!hZOwMWDU?-mN_D_#K%y=TS29bl9s??FcjavuhO0Fg0mz^<-Ug2=&mqrk3
zZc6$g%;R^%i?gE+MRfSDG_Lvj_1huLzA_nU4jMRCq#9}K?J1#JnI_}&lhlM!rx&5-
zY6~!er!xS1LXU$<9?j-pHjt|qtu<3t16n8^fjZl^n*lG%Zz&NcT?S4pvaBC9hhB+=
z>iiSp(U9H-U;qJ(5kV?Ot}c0$31AYw_B2MQfrW-Nf|>+i4)BiuYQmb;KN5^6M%`_s
zD}<STDk?D`|H_lZ{fYTptr}*)NCW^CoCq55a>cT}&`qjRoM`QPWv|fdv+XG6DEd&$
zdg!a52{xy`kk>@3VY~UL<^9j^I1kL`1vjXSi|Z|6T>;fQ!EOPWdPxUBO$%toZDJY0
zB635f94%ZTL*!TId7B#rbQ6UxGR0XPlVy+S$4YA@o1-v=_{{zP1{#Jl=6X;<!3*?F
zPsggmCcsG3jj)?*fp^c|w%CL8SKt>wG9C?`G-an)WnCUa-q-Q0{m?Gx&UzC`4=q?J
zt}?6J-Pg-pdfg*7hdV~h^r;G`67`8n9!oEpzi<|aIv}*hmxiIU(8y_I(6DN&eM)tc
z7g)-2<}Ni2jPb2}wL8kB6&A(ppI-WsT`_SQgj;ahiad79#_p@zQJn>*y(50jk|z`l
zP@~j|o9x;4yF<T{#}VTms>JHJFI>{n4g|$wvP!po*4GeQIja^^S?9%H8pg(^okw|g
z5sI_hR_l~t-_e_J`CKH{PQ2JWm3uAnuHo&FDwx`<%iy<>pdQz-VO%(`My7jZJ(roz
zSiE4fGyx)r3E^zr9CUh<EYSY+F-5$YvOQUHi?w#h7Zg{TqD#~IE#JQO!u6EC+E%BB
zE=@pl-0)kd<u6sSN29GT20|g}P0bLhDB{VNvPxE+IZ=*x*>>&1Y%9f!OJw}#cOHIK
z>YiFssjIkX2SQ~(^I&#(0)`lz%p?f(V_C&(J*M+=tuuEDu&6+<03?B~Cm4qr7MV{<
zPAUxEV%Db$sgT`Ur#_SfUD>jqpMQyq^}a@sF(F}~0tPiNJ*+%LB_eu{mBz6^>B%qs
zc4QQPX63;w++XT`k}J`>{#)<G%#hvp(b{A|_p;#&(gpG`8u8d!G84q-7__iy@Xcw8
z-QZaYeI*tZQCn6C#@@r{=1!wWYK8rfC6n|M;OYBMVi@!xk&B$ot_3Cu!HO(J>v;cf
zJlG>-@-T{46IaltV!(ybaR086Gjfj7S$o3u4d=TS*guy3c<+k{7sfUUJO}3q)2zY?
zO(I_XmM=u4R1;o+VdzC=)x@>l6-KM?Q_ilob>UAwqup*gT@i|80Q@R-*1?F)_f!-|
zAJyvV?5!}h_3W%Ze_A?(b=*UdMFdq~DgAX>e@Aw?Hw%9fun09UsQo`@66?cL&<8CV
z6*A*jhqe_QRxXzGd{}|7t3**H4P}?<>M0;=Cc+OC=I!BYF>+iQ**oRs`z9n>tWmbb
ztgz<#ULi&OB}36g*<JmbNSYAK%!<mZ5#-7IOF^z^m}?2JD!eLz2`NSX(KTKlkt$4b
z60&r{4R|zYrb9RV!@XUT+A=`b*!7&FMe<4Hdj|Le?zORjfx*Wct7udMKr?Jh)k7aq
zXwl%lGBsW4B}GHWP|}|)xwzp>cS@@nfyH9d*7(Y?7@5Ep*yQ&dI1@R5!cQ|L!`gp4
z=80YSFu^FYe8w;ZcCmmPXr?zMonp|65(C$M;O1Dsa^nUX+5UEk?PB#MUCm+3x|3p*
z%dBB3H9e_@?z8&tIEXu)Jb>%H`CJ)`9JI6qC|Ob*!4dV#u<OWuFEA_uZ|2UeDYSY2
zsGX$y?@Oe#8F7dDG1l+==ycL^i?v2n>L`^~|CH7jLu*!=;fgYRq3YkL(SE&6D!Mv;
zljc<x_BX`$Gful+Ndy%8{RIflz_d-uUZ>661$O9c)`7H66%w<Ui&EYQMqrbtL6J#O
zcsY)SqPy<ORIbb$lIF37KBckL(s>r;DEA<*w=5=_zgBoqI}N9^@i<NLzyPZSV>Dv2
z2n2w=X8J;?7&#(j480`CC;)6Rvh_*xgWuSPCcYPUO5N&oq_F7N=BAjC!#ox>U4%@P
z8(o<2bEac&b<|!%?Gv-N4(T7923BnuGhnr21Z8xF(jr+0w)A(T=-vWC8meIiFcB=X
z-5J{wTcgWAH2q<8%<B47?u{-BlzXpax0p(l4LeGsjr!=8F9FMiZA=Gn1sxls3_(63
zRv{vHQ$o1($6I7*5#BCIBLyvyN~~n0!8eV`w|~26+CKUJEAgFIGQGy|R+>%2lh>S@
zAl}kaf$ADbb_U!a7|f#jP3|cy^O@Gsj6jIwqcasQ&%MnLd1Ra?NW$&227AMwD2WN8
zOl?Q$U_JDPHA!ZQl<1-HsnJ+Vr#}dY0t!x0z#(3ws{;<ruJWh{LDFcu2%!xAFe&`1
z)j{MU)FH2XEApo19M1mD?~UpFe6Dn+2;;nn{W}(PfwHxoO3eL^Kv<v(zfedb+3-~j
z3B6*VnCDA^+$a=#ag*rGU0;=bz50-LWnzwzEY{rXb6_voJ@|=HvyDpM?>ebjdyx`W
z!#u>1yhk>NZ-uF4%_Qe!YXR~m>#{9xBWz^0GU|+fq);xbCRpnFc9mzF>S18~0g47(
zEgP@7Mn0i0KuaW|+Mvh%1O=_oO`L4ek^%pkON)bCHnbXG9P8<(FEz~6K;#visLAIe
z|B7((6E5n|$RvD==MV0{X=P-gHTn)oK{A(#9_)7=bm4&QZ3im2(@N@wHxCaqvS+AJ
z3SB=!A%JU#O!M4H^3brAu%X9GK<=&(BsBaU0QuuA0(ekbwGdKPUzx^ZZVf<@3<D~i
zV&~q|NB866y=*(xQ`SW5EQ^k7FSAXaEQy9(C78|vuBuz~Wm1muqV5p716@Al6lt4l
zX6V^iCQAF`_tIocl?iYPw@lzKNU*d=&*fb7=?=^n@2ig@gc*u=wjr7mO7_yy^Yar@
zE@P>_3;p=^-ac>o)iH+>1?Vb9w1$}eUKG%xao<Z*KhGX#!4Wn+>KQMIB3-rc-91X%
z85G&;cXaW3$)lfeH44*64j7?|L+)yFxhuz_WMjwc)(GsG>1rgP7iT4JvSl#MyCPni
z*WpgJhpbD6eVpMv8BTQeN4TTN%_~2)Tm}eWlDicM(jzHi|HWIZeg}UuJ&r-Sr9kql
zm#Uz7B1%A6!l?Nzio8N=SSvn4#$=lYvM@6%kJPzl^4Pq}mNQ}3!Sw1d6*athDy9{I
zBe+Q~!Li#+&-Z9#z$&yPdEt<5_{44y*S#-JS0FXE?&zQEm@jXYfBLvJvbiTnnt-Z!
zM1&8`Y_J7XiWEIMg&OHbi!)l|V;j~!wOn$$isxBtKXl(6d1unH;{p!3V4JB53{217
ztSXEtU!2B(5_56|)vEWk$&<uPB8>J2Ykw~e1e!>8wymn9?%pXup{<FR>HH%#hC=^$
z{IX7Op+hM7TaukDWPgH54Pv(g?xREVNqwY+beg#*8gh~LP2or@eO%8G9g38al!e;T
zx=UK)S!42Mi4QrRxm&xnK#L4kQET(37I{yhS#-N;V%pj2;58K^n32$~+uLQ)$fifx
zgO}5b_;BY`DH{|J^RqR?o&B{#GZp%83i_u&7KZO2gjnZ-mGHZu+>-8Gxk@dj&|4Vc
zonkhCS!&%}hJRE>>VJMHk$9@(sk%<<H>CGVq^<`n0Kn;B3j-l)ri1L}ra1oTukh~~
zJ3QWt(x|#Ka0fp8c{nk?6pE&yRc7u}=sf9xeC-gs!qs87nA9$O_DC~zPf_<2TRm8>
zRzaJ=>Ht#tHv{a4s@LwE`o7T3d2uhY=I<OP0Naz4151{zYn$IQ6S!rotGEIBwD51q
z*ZC%;0*U1}RLB5|TnEaD$Z^wu+PeY>I6|PjLO3ZKJ-S5mHvq!k!7gZ<3*WS2!yd#@
z1Y@4mQAt{TZNB2cnKJRC&Q`#)dzx_&7c1e6ls1S*X?SNHZ7XI6iUOXA!~#A!pj5-U
z6_&!oXJ0HzG7vAvsDNWBCX$JnucgF=Y_8noR7w=~MNE<>)#ImPx^j<Rl$QBm01C*q
zr%4QLD)FVnIt;~F6~ESvciNu4)4^KFI$W2DLWFseDBaRkJ#P%_7D$xWAa?>`<RvpO
z(^RJU$^HbXRy1^=;vCextqExTMUaSrG>3feiV;07rZ(#*nSw_a#OTfpm0%T?v^w<{
z^>?!5o>ad%zHH1bgaP6x9oHjARQ?%pz>=&SUodK-m_loddl(|bY&x*)<rXyK3OYPO
zx*C=r_Q@*;%#Fh&j=bx+#588;wCl@dok5*!$tl9MG+3Wp?hW(xhu64fh_ITYtY_of
zXPd_#U#OrzI0(2Q1Y}pLio}BW_qANkiZgOY)tf^5dxFfqcMp=i+CZK+LuK_=mklEl
zhHh0kKrSjl4zFfHTdiHQ#;q1!M0*yK4}omny>xe!E3tL-7Hd+;k?kM?2bTmnM#=c(
zHB97V$eX6v3;7g1F)O#M^U;dA`rO8LWw82uK8sT%yLnGW;45POtvrba9V(q}|0kU?
z1Xxs~Y$TpXnLtrOO}<GQs~EdsB9(bv>y-;&v9LaJis72%W~_(~_K<^@$pnazBcWxN
z+P%~cGMzZ$B}7d*m3KgS3#y7kQ_4GJ1H9Go(`v&RWQQZ1rzTF|wSm_pl(L7BsbnUK
zhelH0&wrqtW4aqn0srX<)!DbDsI7YWP3De_Lna7zEf-%&GwclYPoQS5Kb779`3PF4
zPafG4@=ej~q=9uzvlzf0@P~&kl=0J55C~xOw80*-8TS^_qOX8?b{RtW59sO_@+*Y(
z!hf%DQ!Qzvy}Ct2!Ig?-{=)kH^H3ngVs{SA<U+HQ8e?3DZ9y{(o+@{Kwnl-|nSzH)
zIEn%Uatt&oqLk<XVHJ4uSfm^ub^A#3BK22SxW|}k+Xcl+`Ie#qhY0_irewNdhvKFj
zNY>O_Hq%<omco2m$-JY`f(?q#cLNKv1w71{&TrZ^3Jyu&qwD8Uw-@+YG(jp@iNGA8
zR-O)_+Hmik(4j!k7sAz~4e7T%u?(hUTYBQ`koM__Yb`SsM0RKhH(L@VC6|(cDWVP?
z%~)I;u>X;tJ!$MGPvHQ9Sqr7Zo;ggrU)@VNZK8IL%*LtOIbrC3cNNki9@4|>lStay
zExLwq=s1XF+ozH7d#Xy=Y&^Fj^s3;Ze(`OzxCyACDh!ZNwE14(5`)iH2V$=LHvOzQ
z_X``KSRujgXT(}I+0??bgD?$J8!t{+q79y@gw3m}t8cjy;?QnotgjFcRHi1cCkuY@
zHx-Z_hSk+N4)3Vi{(kktU_MA2q-#wH$#u%>kAudXD(7|s{h`Q4{gy$tS#QexA@cBI
z8mEA@{%|UJsV8Jvf1<Hf%@$x<*lKQ#iTK-BbymNlh{rm-F_eY}vfX^YVyh?m9Dju&
z6Q2L^jKX~8vyH;ZS`{jFM+p6n<$Yrhc0h)YZ;EirJx9<w7cof2JxbqZAJ2*g{oLKy
z#U^X8RLHS6)VHh<EuZ5opkUE!9Ey>i-bhIrTc5?fHS^rtm9fmF^AITA(lfz`)wm`E
zasu7=PUhH}BIrq|=Ak2<0nl5gMo}lnS27dm!8R+~X61Eqfsj6Qc^#ix>BKDJiq_9m
z`i!;a78grVHhtEoOw=$X7=enYkqzy<Oh=~SLz#E}@7-FZE6&8-3jU=E6bC>_gp8{U
zabvey@*et8^U>&v4Vh(DCKmUBV4`+(%7e{J2|!`lm#Fy}=tq*ciu;H`p`E+=2?^4;
zA2b>d+VsnR0MG4UV8fE$WrDF3%>`q7ScKj`uTy#g{Q#X8tfQilE<%xEG6j`iHF(y!
zZSey`jkK!H90gCr-E_5sONHgVz&O5KD1L3}2YAJn4yA&%S*lV<C<z|-Rj8>nIutQX
zmkJguFq??bg<y@CbE5J2NEuwjos23`-B-}9*G?8hoN_pm&*!`8@F3lt?vR~Cv3&s_
zqNW=0ie)X}hr^khh<q}%LzI?5bwf4L#}|aEK!Qr~VYoeZcnbPzfuDn<c*VOndoZmN
zqp35*oi$j&z;@2)#<plyI%ZxZDLKmST_>68P;;PZxuqdmwkr$P?GmdjI3utqW$60i
z1`gvHU)8V`<(f&liyC7NmNHjR>CGWpg1n0ZZUN}om`KsGEs9}{{gJKSxT2W4=EKjy
z3T;3pzUQAAmI5C1>$kC}Dg$=7tB9r;&}gUtdfBEOSx2Vn=B9f^W^1qU8ii@-Tin))
z$lGY>PFLhZqfW2U8|Y~Id~P?&cNZmg($2RCO!YIy-nB37U^crk37%>cR-g@A!<F-w
zJ`dr!xH`}de2O+?ew}>u)XKpgkvsSH4XMYR)uR;Fd<y)BXcma}K$YLj%r~C3vA2j_
zOw5|3mIN)gCwR)my#u7ShF;@B@_u(T?vlgFH&<V<jOi24V47N2_Q_)F)q~}leyhld
zPoY{E{eXO(YrN|0F)uYl)JQXvL$_I~LWqfv{l=7ev|tq-`@)A6<tf^)d_?E5p#0o5
z=~7s%j%<RI^=fH-Y3&$o+B9#{Y+$TSXH2$q{&~9cX%Nx9V3EV5ZD`F`!!<4{`|I?Q
zIW>MUE_Rs*(4p_BR<fz2dFG|y9s>GX`&pfI(g4@;>O^~CV^YFOODs+)q@mFGu`Hr}
ziV^CIZXGtMz?Oj@vG_c>pm+K!xFE~1Z-xW83(O(}XH6Bu2^m5f2K^g{-b7dJhTy$`
z5m}36CvQO?6moz%))ZWmimf;*VYH9El7=ED%AIlaokP;b(DoizDCPcZ{F}7i#YOXF
z3gLtM5}GwRX%$i>0>&RwE_I{C(kCY`7v;#jmBX}Q%^5WtRL4o!6ptFvvB|~&$k+RG
zNn)hw`vfolV+5FJRI~ywpa!7!%>o8KOiA{<7<gGDltmjXMH+oHlH59n<ubZViuPv%
z_qez)98WZYkefLAi;Atpu2;b=>6^NlJIC6v@1|i+rtv;BD+rZCO*v{Gi&W~`?W9SP
z)*x4ebA@fG<o_gD_zrJohnbLx)<IiGr)|%tARF8a@en9SE($CNEFeS7)QyT0ld56C
zwV7`a0J5-im~(SvE?_q?9C!@bTC(?BvSK1sfy6tc3V#{$TT(L023~;kstr4!-^|uY
zb}rgAfMw4Gs+h{k*?fsg#fX9bU;r@sbH@`q#*B_3&3swV@%bCl*O2UdoIDhf2!0p~
z$kV66q89Ev>hN4e9RWAgC|{$hZd=SzY@i)9Y+3hEW#@T47C9O(d2^p7*}RA>3^!9r
zIFJ3$xvc|6`twh9*n;CemE00y#vDZyPPAUY-h2s#z>0lzWY!B`L`8_3v3?Zb9Jo>t
z31xY}zPrg_KO45jj*cnC-W%h1!&Ec~5i|%AW<CrV$hn*DEd>r6KdiKk3~oV?*lCi=
zR}fb2F%WQSmo^GK<AQjY#{zSs>OXz|fO#lm1viMxp42U+0Xbk3>_WuL+di{^z2Oug
zeVw;T;aeA2;?;JZFb|0n5G#7ob;u+s=2tA$?Dkgls|{Cd1T)kce!7;Z8LIJ|5f*Y~
znq(NP;>VbZcAh1^a^lV|@ME=&oB;SG&GY;vy~=1D6Q0|S(vGqyiAiUqpRMM(e;;i_
zY?0*$iF}$ojec&>#Y_C>i^`-9g750|sVaeLiG^PRdvt-1P$cN|=S1SnE-dC^q5lhO
zK54mm@~01ZyKzgwC|ntYjV4LpPtAx{xL9RZ`Wd$RvL)&dMyg{0?6K$3l%!ei_!69r
zG1^{Ha1mBm)8=(@?H5>?m&Zw10ac>F8Tb^?*&&D}*ft3IlGh-62BD?rOB8GTEH0O+
z_t)v0k5t2y9lw^2?d?0m4ON-b=AR)12MyE=qfIsS0NnN85qJqlymR6K$$*b=s9LW>
zgzEW_5JzkD?e`*F9U!^8pY@wqt|K|v7*JX}tEmm)<Kt?QiUJ5*9f{{nELYSUQJO0T
z8a1)Sk2cZeF2QPcOWwCR2mBurQ%r3gdD=vp6**&~df;3zsH%)Q7_bN`-!L_a$K=F+
zXlJV*ZB+ec;TDiZQP*T{30*+HWn@di=TRgmjby1mT)9yfNPERfi^_7UNk>pd{?9yx
zN2wXe=xOBqx<qN`q6N)|Bs;`sER^DqD81TC93vq4F1J!CL7jNCMKYSGM5d_)eK8IE
zOf6guDkLD7+v42Up%Q5QU!Rk$QOQs%i`rOCX;-dA3A^|KE@)c`w)YY}0myhh%)|w!
zACPL~?tv7g?-n2KjIrzL%_72=$@d9&9Sy}Y=$VT->;h@;gcXEx(@i*VSjERqJuEQR
z8n8%_h>i_~4(`exsQX9-Xx7y$SNeR&6Q3`&^0I10)iPG8Xcz*xsi&oF$UzCqEu4O`
z8j9mQ2IO*dKB=t~^yAMoT2?d4eylb_g#{jtEgQ2+?Un1tpi~&5!wy&Wl#jxZM#P1-
z6r+_lVGN?8%M4Hf2~=JAea6bqqa+KK){;-MWF7Hh(gN3{0#<<ioY(A*+&v~q$Db-=
z`2??qD@y==AcuKkiZjR~u^v{Apk>3+AHa46>z~1u!`%}2mQvbMH}3?Bp+A1)IdVfF
zwbh2d<Q}uKYtfXc%%qgaDTht00!HW*Bn*cixPCwylz*Oz>S%1@DGi||lru+x7}1NC
z1rmdxsXrz$VTb{b=Cvn2-UC%hHHJEBuH%Nj>VZST7*yO8V!_kq@)8ORP22ie2B6G0
z4FWyccTBzvW(ldL#`e~J(JXgmbe!?vk#vL3vt*U0uUwt3fG;t=j5PBH(QmK#cG8@;
zUU4-N4;SBRWoGLicdC9n+_E$$yo$IFhK*NmuL6Zx7OrZI$G36g`W~HKU%t7}VX6dB
z@+;FLl~T)%&Yrn!(8XjODO}~n95m$s26&5njoViZq~a*1AtqAv9&yH8<VfDX6C%BB
z=$=W~2ZVrfJEi6m;Ws_p<NokOz*F`&00D2{k4be-RFU=j+ejcn2akOk1BtDkvXK2P
zI?oNIipQBxq@`W6pm*WxZ+hCchFieM55q@}XNxm(ptN2B4GZkHfQ!rsUr<Zz*_V-s
zS$JpHWWFR^5dl7%zrdp3Agj3(vEz(Eh6PfBw4ZANfG}R_!exmc{~nmW2Z;fJP8}HS
zVu?1Hb*h~qj?Sv+cF}%k92yu?sWGK){-v4h=+%>{)xhx|uaBiNe6byAf*A4mtz+nQ
zf#Ouui$}Ns;53?Bg9`177#iW33iwOT&TkGIeJm`<qy(**ZsE+%ADrkHWOp8`ENYu<
zD%cb0(vTk1BGI|zz%fgyCV^XU)f5J_AZMH(=z3#q@ObC7u5Tu6cXx8#(~j<qRG4u>
z`iR1Nyq^Ejc4yxlHOD=x6rYddAv>CUf4nuFrSDwjt*c|4AT_Fqvu>bS!eSqSM_5HI
z8rsJ+%1wL6q6S81WhC$;wrS=lT#QB`rjrCamVGl6g5mAG{e2B>_X+yh?UQEA0NfA{
zq;ciRlcJ*OT*$*j#yIm3D)zgHZhzBVPMH42?RmpyP4*o|jx-5~WN0C9-O+W}zDc15
zMsS{&Uet^fS6HIA#9da3hY`u<3BQUt1;fqhc67PPs9ovZ>F8>M)tN*jJQO0mEo$nu
zv`W<zAo7IhOVzv1JlG#@OKe{7ja>sbv76RX-IPTtty{vZ^Dd?_XTdfK02@x?^|0w-
z8}1F$74ry9XUwOqleM0og3Jm?ZtFNLTM3)<Qj96JrCiV#6l?|54iyv}>+h>|Xwi2+
zQ2*{e=AxRdQL%_f^xF=5(VYl(L1e=~AI|Q8)G=s6it+)f4w%s(%*;z9*S2lJD;)dS
z+Z`xsP0=kl`L#w&i0|4*{=@(lm|dWHNavWhEgJb^<%H(2Mg$4E6L(wIwCAzmQquh)
zG_`vI#W{GGCR~D+Y@_6LIsu*-@sE<95LHM|Fdwn>@<lM0`}8kSRUHUG?crfy=M@?V
zn<!@zS`M<YxP)phx@AMdDDJ8;$bJdZ=8Xu4YW|R-&E+%E|AFjX-q2A9clx&RVXhy4
zjXk}QJ0A7?^;uFg9EPU0%!Qi6x}sWuy_0Z&{_1|Z(vgiMqb>F7pEgJ@Dsz}}0;AU&
z!xb|O*H%(gr7TKQG-?OlI7*4L&4ShVAkQf?TE8bOxdKYIZb{-*o<gCtHhVhYs?}bB
zG}HxmXz0$V{b<uvS#_sC+ph(kd4DyaTcJ;Y@%5KMCamqXbVU^#w&@h`;#-3)e!Msh
zs2KXDz|7zY@|b+j{6Jdc#0kdMjd>OavD<ltC4g@_0W*j|ZgJT)QO#>GP^9HO5)3-&
z54$f7_6YPmya}J&89qwg!<RORwSIxDpG#Sa8O6eL-V34DEfCn!-p>5;5SMx|dZ9Dl
zGVkQ3qd7*=?G^oMDyirCbLkrf2MH->KyBuEW*9zT`@(Q+ga8UB9c&;6a#?0KJ-F~9
z<Nfx@0ED;z`(_85sRD7%e}FOa+_d-Y{Dkcx0eCqV@{j4QMY~WIiJ$xEH8n_p41Jjt
zsNfZ0u+P7SHvQTTbh#8QkWGHrRV&aS9hQW0lF2||q%n!;4+cy)EOJdzc(H=WJa;9w
z04^Gf`6R=cT)N=Q+`J+D@f&`uq*8|ytmVuSJ3!n5I?N`|wmA@{)`BBd3e6}ZnTt%d
zF|?*wQ*1Pe(m<e;eDPe$noeqQ_TLvhDH!+Cjd9DDIC}jbh2ZP&vJDSSPsK=P(X&=?
zvY4&>{yP8%XE69n@9b;dzKqcn)fQXSEZN=K=6r=I7Nn(%+HeM0Gud`*$m2b{f>Jn(
z#1oFMOI9EYV<b(9aYE5(t}6m{r&W1eArHi6nYP1Ud^r1$Z1@EUS+U_mogNB=G-=)`
zBe_D?d4n>djO-q{Ytl$j2B|oSn%uTf^eWozDT=L8&4*VgB**)h?H^Yn?cSYX;{}*9
zMMHBGB~%I$Z1!$rHrl#rU(3NCqLGt}%?1UEmBq_<V3Tbd#*9gQ)owhBSH~;|cvPxo
z){sZ28Ae~UgZe{o*xmJ9I#hR1B)+z@A}&oE#`GDZ@L1bwXtj%2F3^O&dCU1XRMxQ4
z{iA4JdoV|woGlO~rd&9=4(?V2^6&F04AZ1s!KEHU3dBi8eI|Ay#W1c(j^hAwu5SnD
zx!<-rBT_rcXQmoyY#chSqfuSB;9PnA2u3%0grvfm_0Zrw?1a-uI1c`%GojB)z<&tr
zW|Zaor&X#0LQza=>qmkBj-nm8$&_?cmetfw-9;Hp;Hqa|b1GI#BIcEN#EUp;dgQ$2
zbo*i;J2A*5I^_JP2M)D1ZD8DzUsB7oft1ZMTH~8Wl`L@~I}7*8u3n~riNJ8+%FjoI
zpg$)a@+W1kpGdL~Ha_!lJC5Rhn`K)K3jJ#oQyau#Bw-JR>`m3tXqBIHNeh&X@oRJn
z+@eUU{26St{d4cBIek)g@(t+ZH#KStUUI=^*&M0z3CXgdvh=Adkf!IXUGw)TwV8*+
zt*iKL^eu1W?WWY6ITbW6%!C_jZ4mlc3N2!CbmLAyS2Hc&v4dJ;#o>`ve!cy*RWjE}
zycBqoXotiFv*a2Qmc>pO&<j^-`ZCP+e^kA)*c?&K+wCDzwYI7V&_%37f0H7|JxcM9
z^?-uyBp-<2AJ{XLulpibX#H$Qq5oWc9C$rMDnOBK2E#O6IZzzOot>0WLWp}>`~S^F
zLB;^Dl9?if_0>VjXd#e+-;jN^dso=37MdO**u(C=zE)#e>srCXJmF463H%@aE&^f$
zEei(7v#74p5ou3HfVuDp_31uh#Ufm-wCrN`7zM|R%CvKmKZ^OdGl3Mb19OQdF+;sc
zgy*bkT}?+oP+1YW-`cv}O?I_BPmj(%j?rX0aw{{Nio|jVomnsFkBZ>1;Ft?4C{kvO
z54nHqjHjJmi_DF+1pO>lKJb8<%lsX3!2V~O7iL~N8UW2Mc|L7^^@|6NXgZ7)JgTYo
zlpi<h&ms6U1&_G9yk%@h2MHDR`Z`{H#St%jdze4b-eEN5PAgk8oKC3iTS6&)i!gw4
z40TcjgBkI0qF2@=U5^IIfljbcFhD5W=~LLf2O*_qL_N8%uMiX(yG+t`NW*T`W_=gV
zKMIO!uC4nN;NQ9kWJ>V?kyO@V%#S8iX2LJoQ^6ufoeO}ZULy|UYGvX=^(MwkHYtE;
zie)Lo#P$$Usa!^zUWrUtR%ifv`)#0-wo-}$HCwE@mv3SY>TlGKRo1Cu8_x9Uvy&h|
zkZ}c6zTB7~PJfU>hSm!q{G2P!!(`>Wm%a=B1R7zMF)ha8(@EYsGb@M)h{1b28l>cT
zB?b#(9T&TIM}O^zC_gwL(aWLg37TdS4K=rkge}HRqrkl$Gq<;4_i&XD5vCP*fB^Eo
zuH9`nd0nBo+87iw&<c2U9juL9LNEEmCYo<9f7HM9Bve}yw6(BS?KO<mHu9UyOHgDZ
z{lU%jl=fdx9&bMxL|ES1FhOkhS^xn;klYYZSyT4?<=klqpkMUeX}e5V55bT`x@Dj7
z1@Qs}tWV?UCyXVchET;OQf-E1NNrz}rYTK{J3k+H_aNt+A0=|9+0!Iuh&I)BbKFCF
zv=DwtYMdv|+YwBx#C6L5fQ9=r-YgLfhi#EzKnOM&vdH9L`*K<H>f@n!pXj*DV{tY^
z_yEo2m5Xf?n}dZ3Og(Z))R$-J&3vZcnNKv|5smrwcnz9tze(#WpLd?((4vdV)}w{Q
z3yHUmq0>$yrIll32jZvvv&tgknalaw`G}xsn2P95nxH)=-J}j*T-f-4>Wc|m5B)lS
zzLaq(vB@r<2NS!Zi-qJCY~o1Et-NtCuTyillv9lq8yo}k#knp8L-Zl`(Q8e&E9U-D
z)tZin=b!tP6S|?k-n!mcGt)b&RJ^gepjK^}8}fDd=A@gJ-}abSwIp<5$REC=&u*07
zdtnp1rSXjO-eq|qKXoJ>uq-P$srDlYRv;T$0vVt96;z1io`yqbap_BByf=!>TM(${
zHos``9co6_51>k^$Iqf(2>}X`l~3XvYG4xtF#cU@$5n8*?D2LR%hK@DOymXQT58q1
z8kiIPkG8XzTMdm`cL~JXX(2WFc5Av~w}h6A!#l>ll>x$rB?{mGosDC>(<K2vovQsy
z^D(ym#ZYVbyTLU7PspbEp8Nl-O&n?V`}H%=HD*d}Fit^Gua$GP+R;Ak|0Cpt6zbF8
zX<#<p@q1TRMjc(pprQ^1h0ezqJFvqxL5#Zx^*#r;z0;2rQSTZ?>IP!Xwq-eH6(p`~
znlFDTnWB(c53L|2K%3C4dTyKi3}@>XdiYQ#AnE@#?r9k6v$v|cDp1?p=Wh<=0~Ye{
zjpsuLyQd?OT-N)<NnnWB#eJUgM?2+(oLV^B*AEbpKmbsmC@1P^etN6}Mv4p}|9cSZ
zOp_}PXKp~uz%1KOOeuhvjNEpy4jQl#YUsgm<GakCc`v!yEkl}#NcPTWL!LBG?S|~o
zD(@!U{UYp;^LN2fgY|tOKW#k=8!3|m?jv{7;rI|pC$0?%)gyRI5d$#iqS*C*P@zi3
zKIMHdbvN*glOv0GaUZOL27tFI0z8YGabol5!i2>*>vy~Ii-nyit_@gBMaQ;sV2cAc
z@OxBwiXY&~_krwFwlpW}-tw#l`<sO*37}h@v)~`H%<vpZcii|cx*OzcHCmZ+9mD#G
zRrQ~&Ok1E5Bc!s%l;gc`%#%B>Ek7e&E1^mi4Xi^1K?dXR3D|)G>_~M;geW=c>?T<N
zmK=cSM=OmZ!Bzn*We5|P9RJwt{ov{Z1D6DtQHi!9BL|5lUal^-P~%KckOTG*{?_;k
zn4H*P2pk?yM{gs*K0Hn~EtZO$PwG-Jus5nN#3jB-!i4l;1BEJBT@V=-<a4Jul<P4%
z-Q)h>WqLR67ElK#cRQ#&c&>Ku<BWju=%;Pm`u$<OdJ<F7x|LiDcI39CLWb!Z3AMWz
z=83fk92@Qs((l{NVwfK&PH)16y^mYZGIP7q!*i31VnNdTLABh7k61-G8UTG2cqT1q
zZUdt*Civ~ldJDtI5_<^DP>)#i#F!#w)egu(!w5)oMl5r+t{h6B2^L&kMm`*D<#U?S
zi%2g*zm&7T`!kq~0U7H%@d80-60Ch=&;7?Skt*t*yiou=l0h)7?a7kvkW}zBN2GgM
zq&IRruJ%bvo@&Y8;T>cVFOm@C7(G8P7je{L;@&sN54pti-g?!l@duJIPM*U70#Ntc
zB!R5L*FC?!%r?ouLvVpvF4*IMvZEJIh5rSVF!`4Sc1<I3YBHX)<##mk%bj)sB(exV
zS)qNJD{xOu+dSPRxW<TW&}(7oH2n^tmQmq<y#&bF0Mwfiqsxy38DP@f|Js$e!;IX8
z&Ge8k<baAK-IjF#S57y=^3DBQH?@lZ+X;0KINW<j6;_GOk>10ZTdR2#eCj2~Op^;L
zxw%?%3PGih*-qWQWgcJS71}~~XA)AvRjNkT#WAF$3|G~mzXEl01`hxX+>JQEG`3>r
z9lOq)a&|jRO6^F+g+lL%GYW>uGAcUCe05gdZ-qD!*_Bp3!mcC)s-Z)s{vnw@inAjP
z6szqnCNSsRPKz`JVxTWd=>An`vm&Vwua3MUE(3g|f{<?|dJE$MMYQWL-<y+KgCI_N
zd#eMoAV53Rm8WaH=>gOQdHiv{bpRC;qFdNe$)%!cQ_W3zNo9&@5igZvRa7sl#rv5e
z_`-5?$vWw=?Tq6z{am_xD#c{h5)lA9`c^%-jB*<QyLwviwv^R@TCg+nAkiYbe&>sK
zT67HcGl-JU;1|l~CKbT{jk<X71w$AR!0J)h2zF*bhX7I8X8pHY*xZ`%Ftd?-{;ne*
zes}o)G4x$7)g~@Ld_f8^2jC!d>j0IwRXT-T04OIN8?i!vd&N3SyEU6Q0?<y=^&q2F
zuG3r29Q0d&oE$9vo93Uy`1&)uf(K4y&Gda3$i+$c909q*M}NbBFtxR3MZbl$)9I_V
zmz$%b1nsp!zjJ`_A6A;e?Ox0Q5f3-HzU<YzoS^?+m>t5>D|A#0a4;vbh1*_1J=g$w
z&X9F{8w!U<Z*~HzDCe~r(#}QoRqY8)V4^7WMM|+}zsq`PuUX<MIOk4StVT`5O48t`
z7(?HvvoAB8hW~l%=k;ECdnTW!bf5Le!hV+wr<(8jo$vr+%R&%WT!67rJhR5ir8v`4
z@im*uXutt`#;hmp9bCOAU!ttPuE9^Owv;I!eM)8f)nEv3*)5TlV+ni=L$Rp_?#=Wa
zTuna8y+Gqu`4ydt6S+13Q_+RdAO|MxJ?T33w7q>a9p7V>AO_IS+R;gza|gCq3H7R@
z_yXEj2`7TBf-iXe+ssy&Jmn7Y#18Gu;!vcNgoxl2$RXoea6;`8lQ=n-Qv?-0Rs|2^
zQ=)5=q!m4<Z;C(w6FLv7KHLNKgfnT9)Kx{z-$C*S%*(YX4Rl;WBHLCga{qgL0VFLT
zXv`aqNo^51oy*>~&FEUg?^_-Ds^WQ6F>uScexDBshr(Lh-C3Odpcu<cRU6z&i}ynJ
zWWYs_=<XxOtK2kU@lVe~oo2ok=A;OvTrkw13ZYP<0Oy8XUt=?&)e{0iO-w#l^C^6q
zMJz~a2bjTzqBjIk)aaw7uayv)j~>>!v<C#XxFk^3v?cga5L{#IyyCL9)WV;?do}r+
zetu(xqn;lbmSt^@#(f?j_y?@OpY(de-4*}ur<2(Jh}Q>FKq7o>7(sI4s*N7Geh9iY
zhTB*5wQH$zRlG~1D6X>y2xT|0X}Y`j>!~>J90)?}AfE36F*p040NcIy_75PHcS59m
zmbxy2$7@A2;+`gA8L5N`^w{h81@yUqKKEGj3LbM<5Btl(!eoj+cGqdu)Ho(!P|rKk
z+XZBRE^jvtbhx(AOGJ=KN)ZPT<vV#p;)@(+SQg}<l9>BleY}m>)3~iKs6(P-b!n(o
zyPVB&V@v}FPqXoHh@eDV?5SqC0D}Cz05F<a<73$*1Dw@@*=F1xv4ip0gaY#(_br}-
zqGSYFF49Xn9`)ZV<Jx*RDMH`BuD%k>2v;>H<S@evV*ZtkySOLmafD7oBzZibIy=ie
zyQmX?@^WA8s1J-f+7W7W^CiIg6-#?VX?x_8Cy`ptMIkBH{Tc%+la_Hfd?7-{%TwnB
z{l8S<_T#@-UX*;^(<$@bRP;{K>e)N3Wg(;FOh>ydjT|@*m-P+&ZUHQ^Kpp`H!Z=vk
z0a8jm>RNN9;(ZJYVYK*MXKm2{(!g3Cra{Ynar<-tT_XW$^<Y=67;nEB1P!7g6aoGS
zgnXMKwOmqFq&ut+PJVq+={0StLL0TbarqL=0H;H7GYYe+ruI`+lELa(7<#s|<KR$9
zCE4Ku)5v}t<X4(5!}vQTZ@Lad{UYhAZyaU=ISauTRQO+yvbyBi7@!b2>au9#Q%4r^
z>4){wIvY8-Sb~}390}QYbqD}QrsU;=TnZ3C*oX!1GcoC_yhD}p@YTxA5#-9?9_2LB
z&=CWKW&B^U>9EWQa9`NIoZjI*i)nM9knQN*k(`#WW8w}b{t-jO9k|fQ>s<N{roR`*
zivh#>1lu}DuX@w5pZxDLeul+JAU^2JLh%4VWk}@hCIng<T}0B`Yhb2PfKQULvU4Bk
zk<D1qwzc2%NtJzr&6n=T%B#Snz^8z1X!+AT(f)MxSOgP<K;b&xu$N)XQxOJIX!7af
z;?ja!@_&_Np95M<h*%@~?g<3}KOP>$I4GU*O#PhSn<4h}4`$^yFBcMuii)CVFfi27
zw$Y!?rHoIGk6Xq}<}nJ-z4z^+!f1N0<O$@zUoY#9@IN@Q1`n`pEW;5)7qYxi!rJEC
zB@4gEq8|J8Y`_iFQkSBe4Pn@6w2BR&Xj>oFAtw1n&x-v<;7?}0$f%z*pdQj{4=rUo
z1aF!_%+~p!^CAQGRe6ooi+!!(6uC%?n}2H8dfkkE5r(etU}(WMJEUN6o;0-&_GNrq
z3QJIN{6A)jLqo;yF6lXLV9H<}HB6KK&8>WKL*^FFWZSolRd$$4P`T8yBLP6L!?U+1
zc^@^#gzt)_MOIPzlo2-$uS2`fL_B-U!J*S<Shdbzz@%VD-HJjM)t_rV`c&C@=QIP^
z(W^B993^8RK?jZK%}~d&$^`fQC1G^7?TbEaT=|nA=4eepQKT|@{p_fC#%RN3+)cx@
zs%SE0-d)37rg=qvFL^JxtS(|pqDg0%(X+&<bv#o*gWe-L>-f8=x|xxOj8ij_FsI5*
zSB^sU-K}pW6y9ch1`mdJ0b8Ss@ESoa%9Ip90W<@5AiFppw}qvX^yb@2^y+7(eea5z
z@2Hlin!q0>;mk!;lN#nbrmZV$l^~zZQrK37t!eMHaY9=8T)W_`&+dD<eM8NhBeIys
zaV3g&<Sg21{Lfl3<SP}$fv^F&DTyQ@T4)ZzLxw^We*z!)aEO;qG6f$U&m;gff@OnC
zv5-xn@X-2m!wcyYXcQVP*kegPkG6Tpp8j&1qBI~#)Aw|hW%I(jXsazViSZH5s7qUI
zs<-$G<yoPhg-}o&b3!>@xDYSF5jQL<zV392fo?B#=lBw=tI+w9{AzHcg~Y^or@Tq=
zHCRzs6}*D|St;H3si{h+FcPxX$DR#^fMK$A8ZS0f80K3_WeGW-%gput{>;uplmC*L
zzH=pp0s*vV9}le7u7;6C!sHR+>wT}Nsw9XWKR1Wq+(N?H!qV^|xHdR(lh+SznjtJR
z$TD@G_v?BIIu~@*dLB!}J>k+1E0+`C=X<%i{uH$|0;?IBvlL$w(v5yC8tme9m)G6X
zt_eVErPfNSw&~lhfxSk@d=nnqgcoE5sUMSr=Yp9TKPNqd+FWQ6I2+cDXMZb7g?LvC
zEp$Eom1-)dS`p!aiVgo<JbeYWX2-5~Fc2+15YQz1d!T@GV%b77?rA?GHm&F>#O0@R
z&Mep1_;c!lfgZi`z5XTqK>z>@|B%7R7z5xBz?0N3ypmOdb)=jVVMvHm5@1g?o-K<5
j2!^xij=fBMKhMRYPy#B8Q{}Zg|Ha&qP81{{t54Q|)AB3|


From 0d6db291de4d2427b6fa0c8624a7001dfd449d93 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Fri, 17 Jan 2025 12:30:00 -0500
Subject: [PATCH 278/381] TUNIC: Reorder options (#4491)

* Reorder options

* Also make ability shuffling on by default
---
 worlds/tunic/options.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index 9a04a137b044..14bf5d8a18a4 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -29,7 +29,7 @@ class KeysBehindBosses(Toggle):
     display_name = "Keys Behind Bosses"
 
 
-class AbilityShuffling(Toggle):
+class AbilityShuffling(DefaultOnToggle):
     """
     Locks the usage of Prayer, Holy Cross*, and the Icebolt combo until the relevant pages of the manual have been found.
     If playing Hexagon Quest, abilities are instead randomly unlocked after obtaining 25%, 50%, and 75% of the required Hexagon goal amount.
@@ -290,30 +290,37 @@ class LogicRules(Choice):
 @dataclass
 class TunicOptions(PerGameCommonOptions):
     start_inventory_from_pool: StartInventoryPool
+
     sword_progression: SwordProgression
     start_with_sword: StartWithSword
     keys_behind_bosses: KeysBehindBosses
     ability_shuffling: AbilityShuffling
-    shuffle_ladders: ShuffleLadders
-    entrance_rando: EntranceRando
-    fixed_shop: FixedShop
     fool_traps: FoolTraps
+    laurels_location: LaurelsLocation
+
     hexagon_quest: HexagonQuest
     hexagon_goal: HexagonGoal
     extra_hexagon_percentage: ExtraHexagonPercentage
-    laurels_location: LaurelsLocation
+
+    shuffle_ladders: ShuffleLadders
+    grass_randomizer: GrassRandomizer
+    local_fill: LocalFill
+
+    entrance_rando: EntranceRando
+    fixed_shop: FixedShop
+
     combat_logic: CombatLogic
     lanternless: Lanternless
     maskless: Maskless
-    grass_randomizer: GrassRandomizer
-    local_fill: LocalFill
     laurels_zips: LaurelsZips
     ice_grappling: IceGrappling
     ladder_storage: LadderStorage
     ladder_storage_without_items: LadderStorageWithoutItems
+
     plando_connections: TunicPlandoConnections
+
     logic_rules: LogicRules
-      
+
 
 tunic_option_groups = [
     OptionGroup("Logic Options", [

From 9507300939415f49f1463223c3c0812e16fadbf2 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 17 Jan 2025 18:53:29 +0100
Subject: [PATCH 279/381] SoE: update to v050 (#4497)

* Cuts some cutscenes
* Adds meta data for tracker to detect settings
---
 worlds/soe/options.py       |  2 +-
 worlds/soe/requirements.txt | 74 ++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/worlds/soe/options.py b/worlds/soe/options.py
index 5ecd0f9e6666..9e0798e1a6b6 100644
--- a/worlds/soe/options.py
+++ b/worlds/soe/options.py
@@ -309,7 +309,7 @@ def trap_chances(self) -> Iterator[TrapChance]:
 
     @property
     def flags(self) -> str:
-        flags = ''
+        flags = 'AGBo'  # configures auto-tracker to AP's fill
         for field in fields(self):
             option = getattr(self, field.name)
             if isinstance(option, (EvermizerFlag, EvermizerFlags)):
diff --git a/worlds/soe/requirements.txt b/worlds/soe/requirements.txt
index 7d1bae0d6a7b..6a569e83a142 100644
--- a/worlds/soe/requirements.txt
+++ b/worlds/soe/requirements.txt
@@ -1,37 +1,37 @@
-pyevermizer==0.48.1 \
-  --hash=sha256:db85cb4760abfde9d4b566d4613f2eddb8c2ff6f1c202ca0c2c5800bd62c9507 \
-  --hash=sha256:1c67d0dff0a42b9a037cdb138c0c7b2c776d8d7425830e7fd32f7ebf8f35ac00 \
-  --hash=sha256:d417f5b0407b063496aca43a65389e3308b6d0933c1d7907f7ecc8a00057903b \
-  --hash=sha256:abf6560204128783239c8f0fb15059a7c2ff453812f85fb8567766706b7839cc \
-  --hash=sha256:39e0cba1de1bc108c5b770ebe0fcbf3f6cb05575daf6bebe78c831c74848d101 \
-  --hash=sha256:a16054ce0d904749ef27ede375c0ca8f420831e28c4e84c67361e8181207f00d \
-  --hash=sha256:e6de509e4943bcde3e207a3640cad8efe3d8183740b63dc3cdbf5013db0f618b \
-  --hash=sha256:e9269cf1290ab2967eaac0bc24e658336fb0e1f6612efce8d7ef0e76c1c26200 \
-  --hash=sha256:f69e244229a110183d36b6a43ca557e716016d17e11265dca4070b8857afdb8d \
-  --hash=sha256:118d059b8ccd246dafb0a51d0aa8e4543c172f9665378983b9f43c680487732e \
-  --hash=sha256:185210c68b16351b3add4896ecfc26fe3867dadee9022f6a256e13093cca4a3b \
-  --hash=sha256:10e281612c38bbec11d35f5c09f5a5174fb884cc60e6f16b6790d854e4346678 \
-  --hash=sha256:9fc7d7e986243a96e96c1c05a386eb5d2ae4faef1ba810ab7e9e63dd83e86c2b \
-  --hash=sha256:c26eafc2230dca9e91aaf925a346532586d0f448456437ea4ce5054e15653fd8 \
-  --hash=sha256:8f96ffc5cfbe17b5c08818052be6f96906a1c9d3911e7bc4fbefee9b9ffa8f15 \
-  --hash=sha256:e40948cbcaab27aa4febb58054752f83357e81f4a6f088da22a71c4ec9aa7ef2 \
-  --hash=sha256:d59369cafa5df0fd2ce5cd5656c926e2fc0226a5a67a003d95497d56a0728dd3 \
-  --hash=sha256:345a25675d92aada5d94bc3f3d3e2946efd940a7228628bf8c05d2853ddda86d \
-  --hash=sha256:c0aa5054178c5e9900bfcf393c2bffdc69921d165521a3e9e5271528b01ef442 \
-  --hash=sha256:719d417fc21778d5036c9d25b7ce55582ab6f49da63ab93ec17d75ea6042364c \
-  --hash=sha256:28e220939850cfd8da16743365b28fa36d5bfc1dc58564789ae415e014ebc354 \
-  --hash=sha256:770e582000abf64dc7f0c62672e4a1f64729bb20695664c59e29d238398cb865 \
-  --hash=sha256:61d451b6f7d76fd435a5e9d2df111533e6e43da397a457f310151917318bd175 \
-  --hash=sha256:1c8b596e246bb8437c7fc6c9bb8d9c2c70bd9942f09b06ada02d2fabe596fa0b \
-  --hash=sha256:617f3eb0938e71a07b16477529f97fdf64487875462eb2edba6c9820b9686c0a \
-  --hash=sha256:98d655a256040a3ae6305145a9692a5483ddcfb9b9bbdb78d43f5e93e002a3ae \
-  --hash=sha256:d565bde7b1eb873badeedc2c9f327b4e226702b571aab2019778d46aa4509572 \
-  --hash=sha256:e04b89d6edf6ffdbf5c725b0cbf7375c87003378da80e6666818a2b6d59d3fc9 \
-  --hash=sha256:cc35e72f2a9e438786451f54532ce663ca63aedc3b4a43532f4ee97b45a71ed1 \
-  --hash=sha256:2e4640a975bf324e75f15edd6450e63db8228e2046b893bbdc47d896d5aec890 \
-  --hash=sha256:752716024255f13f96e40877b932694a517100a382a13f76c0bed3116b77f6d6 \
-  --hash=sha256:d36518349132cf2f3f4e5a6b0294db0b40f395daa620b0938227c2c8f5b1213e \
-  --hash=sha256:b5bca6e7fe5dcccd1e8757db4fb20d4bd998ed2b0f4b9ed26f7407c0a9b48d9f \
-  --hash=sha256:4663b727d2637ce7713e3db7b68828ca7dc6f03482f4763a055156f3fd16e026 \
-  --hash=sha256:7732bec7ffb29337418e62f15dc924e229faf09c55b079ad3f46f47eedc10c0d \
-  --hash=sha256:b83a7a4df24800f82844f6acc6d43cd4673de0c24c9041ab56e57f518defa5a1 \
+pyevermizer==0.50.1 \
+  --hash=sha256:4d1f43d5f8016e7bfcb5cd80b447a4f278b60b1b250a6153e66150230bf280e8 \
+  --hash=sha256:06af4f66ae1f21932a936bf741a0547bbb8ff92eea8fb8efece6bc1760a8a999 \
+  --hash=sha256:1ddbc36860704385a767d24364eac6504acc74f185c98b50cf52219c6e0148c6 \
+  --hash=sha256:61f0adc4f615867e51bfcd7d7c90f19779a61391a995c721e7393005e8413950 \
+  --hash=sha256:d84761ee03ebdaf011befe01638db1fff128b1c37405088868f0025e064977f3 \
+  --hash=sha256:0433507dd8ad96375f3b64534faefdf9d325b69a19e108db1414fc75d6e72160 \
+  --hash=sha256:e8857f719da9eaaa54f564886ff1b36cb89b8ccf08aa6ccca2d5d3c41da0b067 \
+  --hash=sha256:40e76a30968b1fce3d727b47b2693d4151a9ad29b053a33bf06cde8fa63c3d15 \
+  --hash=sha256:09ced5349a183656c1f8dcb85e41bdd496d1c5f2bb8f712d12a055d6efa7b917 \
+  --hash=sha256:162806e7b0156e25612e60d25af68772cf553b3352a5cf31866d838295ccb591 \
+  --hash=sha256:79750965bc63ffa351c167672b51c32f2a8d3242e07e769f925d1f306564a18d \
+  --hash=sha256:b1875eb79c8800352f30180db296036d8b512082d6609e2368aa7032c1cf7e27 \
+  --hash=sha256:7989e6f06c1ea38687a6b14416b179f459282ea81edbb86086d426fe0d63bf7a \
+  --hash=sha256:8a4c5c62997e7378457624a88c12b27b52d345b365c3cfae7fee77ee46eb7cd0 \
+  --hash=sha256:a22557f56ada1ace61b781e731e06466c22b6cc605c1aa9dec10e3697b10f5e6 \
+  --hash=sha256:d1057e70be839e9c3a91f0f173bc795fc0014cf560767d699cc26eba5f5cfc6f \
+  --hash=sha256:8540bd8e8ec49422b494beece1f6bf4cca61aa452a4c0f85c3a8b77283b24753 \
+  --hash=sha256:569b98352fc6e1fae85a8c2ee3f2e61276762bc158ac5b7e07a476ee0f9e2617 \
+  --hash=sha256:1b21eed21eb9338a6e7024b015d0107eaecf78c61f8ece8e6553d77f7f0ba726 \
+  --hash=sha256:51ff863e92c7b608d464da10c775b5df5ad3651a05c2d316c1d60a46572fdef9 \
+  --hash=sha256:0f920d745df15e3171412cbda05fc21c9354323d0e8dfc066ed6051fa7df9879 \
+  --hash=sha256:d78970415fb03c1dd22aef8da7526e5b33eaf4c9848f5cbad843ad159254f526 \
+  --hash=sha256:50536924bbf702d310b92d307d7c5060f6a4307bf99b61f79571ba2675ebb1ff \
+  --hash=sha256:1123f8f87ce6415183126842eca1fff98362ff545204adfd4c7b6cf1c396b738 \
+  --hash=sha256:1b248af5aa7321e46ae05675b15a5993e28311dfabc68cee2e398ce571f28eb2 \
+  --hash=sha256:a76e9d17ec3af9317b3a9d5e9f9f04aea80a5902c33f6fe82d02381f2fd2cb69 \
+  --hash=sha256:081ed52f8e1693ca48262cb5a9687ee62c4f9a50c667a487192c72be4c1b7fac \
+  --hash=sha256:2978aa13826337d59799f41dda41fa4cecd9f59fae8843613230cf298b06fa6e \
+  --hash=sha256:d377c2fd68c3d529d89ba40a762b6424c3b04c0d58593c02f06adbdf236f72ad \
+  --hash=sha256:800d6c30eab6ca3ee39a6c297d08cb74cfa5a4bce498aa3f05a612596f8c513b \
+  --hash=sha256:0cf40413f4b7ae5d561e47706f446b91440a1b74abe33b8fabc995d92c3325ca \
+  --hash=sha256:97791b8695aa215ef407824d1e6c0582a2a2f89f3a0f254f5d791a5a84a0ad00 \
+  --hash=sha256:2174db5e4550f94cb63e17584973c9f9afdc23e5230cb556de8bf87bd72145ff \
+  --hash=sha256:f3a4cd6a9b292e7385722d8200e834a936886136ddaef2069035f7ec5eb50d34 \
+  --hash=sha256:7646efdf7e091c75dac9aebb6c9faf215de4f6b8567c049944790e43cbe63d51 \
+  --hash=sha256:cd56cca26ed9675790154dd70402ad28a381fc3c9031bd02eb9b1dad8c317398 \

From 3a46c9fd3e3ff153d956e267c10f1486cff8dcae Mon Sep 17 00:00:00 2001
From: Ishigh1 <bonjour940@yahoo.fr>
Date: Fri, 17 Jan 2025 20:05:02 +0100
Subject: [PATCH 280/381] LADX: Closing the client window closes the window
 (#4350)

---
 LinksAwakeningClient.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/LinksAwakeningClient.py b/LinksAwakeningClient.py
index aede742b82a0..e2e16922fa95 100644
--- a/LinksAwakeningClient.py
+++ b/LinksAwakeningClient.py
@@ -560,6 +560,10 @@ async def server_auth(self, password_requested: bool = False):
 
         while self.client.auth == None:
             await asyncio.sleep(0.1)
+
+            # Just return if we're closing
+            if self.exit_event.is_set():
+                return
         self.auth = self.client.auth
         await self.send_connect()
 

From 698d27aada253d11c8df0db1e7d5a7e9d99a6fe7 Mon Sep 17 00:00:00 2001
From: Pierre-Alain BESSERO <pierrealain.bessero@gmail.com>
Date: Fri, 17 Jan 2025 20:06:20 +0100
Subject: [PATCH 281/381]  OoT: Allow Crowd Control support for Ocarina of Time
 (Bizhawk) #4501

Changed the name of the default "receive" function in order to work with Crowd Control
---
 data/lua/connector_oot.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/lua/connector_oot.lua b/data/lua/connector_oot.lua
index 7bec37244b07..9df9bdc4c94f 100644
--- a/data/lua/connector_oot.lua
+++ b/data/lua/connector_oot.lua
@@ -1816,7 +1816,7 @@ end
 
 -- Main control handling: main loop and socket receive
 
-function receive()
+function APreceive()
     l, e = ootSocket:receive()
     -- Handle incoming message
     if e == 'closed' then
@@ -1874,7 +1874,7 @@ function main()
         end
         if (curstate == STATE_OK) or (curstate == STATE_INITIAL_CONNECTION_MADE) or (curstate == STATE_TENTATIVELY_CONNECTED) then
             if (frame % 30 == 0) then
-                receive()
+                APreceive()
             end
         elseif (curstate == STATE_UNINITIALIZED) then
             if  (frame % 60 == 0) then

From 23ea3c0efc4cd5a9f78436a26e4225aaac527801 Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Fri, 17 Jan 2025 11:14:21 -0800
Subject: [PATCH 282/381] Core: some low-hanging fruit on the strict type check
 (#3416)

* Core: some low-hanging fruit on the strict type check

* bump pyright version

* bump pyright version

* bump pyright and remove file that's no longer easy
---
 .github/pyright-config.json             | 16 ++++++++++++++--
 .github/workflows/strict-type-check.yml |  2 +-
 test/general/test_helpers.py            | 11 +++++++----
 test/general/test_memory.py             |  2 +-
 test/general/test_names.py              |  4 ++--
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.github/pyright-config.json b/.github/pyright-config.json
index 7d981778905f..de7758a71566 100644
--- a/.github/pyright-config.json
+++ b/.github/pyright-config.json
@@ -1,8 +1,20 @@
 {
   "include": [
-    "type_check.py",
+    "../BizHawkClient.py",
+    "../Patch.py",
+    "../test/general/test_groups.py",
+    "../test/general/test_helpers.py",
+    "../test/general/test_memory.py",
+    "../test/general/test_names.py",
+    "../test/multiworld/__init__.py",
+    "../test/multiworld/test_multiworlds.py",
+    "../test/netutils/__init__.py",
+    "../test/programs/__init__.py",
+    "../test/programs/test_multi_server.py",
+    "../test/utils/__init__.py",
+    "../test/webhost/test_descriptions.py",
     "../worlds/AutoSNIClient.py",
-    "../Patch.py"
+    "type_check.py"
   ],
 
   "exclude": [
diff --git a/.github/workflows/strict-type-check.yml b/.github/workflows/strict-type-check.yml
index bafd572a26ae..91f4aed92a2d 100644
--- a/.github/workflows/strict-type-check.yml
+++ b/.github/workflows/strict-type-check.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          python -m pip install --upgrade pip pyright==1.1.358
+          python -m pip install --upgrade pip pyright==1.1.377
           python ModuleUpdate.py --append "WebHostLib/requirements.txt" --force --yes
 
       - name: "pyright: strict check on specific files"
diff --git a/test/general/test_helpers.py b/test/general/test_helpers.py
index be8473975638..7e850f9744c5 100644
--- a/test/general/test_helpers.py
+++ b/test/general/test_helpers.py
@@ -1,6 +1,8 @@
 import unittest
 from typing import Callable, Dict, Optional
 
+from typing_extensions import override
+
 from BaseClasses import CollectionState, MultiWorld, Region
 
 
@@ -8,6 +10,7 @@ class TestHelpers(unittest.TestCase):
     multiworld: MultiWorld
     player: int = 1
 
+    @override
     def setUp(self) -> None:
         self.multiworld = MultiWorld(self.player)
         self.multiworld.game[self.player] = "helper_test_game"
@@ -38,15 +41,15 @@ def test_region_helpers(self) -> None:
             "TestRegion1": {"TestRegion2": "connection"},
             "TestRegion2": {"TestRegion1": None},
         }
-        
+
         reg_exit_set: Dict[str, set[str]] = {
             "TestRegion1": {"TestRegion3"}
         }
-        
+
         exit_rules: Dict[str, Callable[[CollectionState], bool]] = {
             "TestRegion1": lambda state: state.has("test_item", self.player)
         }
-        
+
         self.multiworld.regions += [Region(region, self.player, self.multiworld, regions[region]) for region in regions]
 
         with self.subTest("Test Location Creation Helper"):
@@ -73,7 +76,7 @@ def test_region_helpers(self) -> None:
                         entrance_name = exit_name if exit_name else f"{parent} -> {exit_reg}"
                         self.assertEqual(exit_rules[exit_reg],
                                          self.multiworld.get_entrance(entrance_name, self.player).access_rule)
-            
+
             for region in reg_exit_set:
                 current_region = self.multiworld.get_region(region, self.player)
                 current_region.add_exits(reg_exit_set[region])
diff --git a/test/general/test_memory.py b/test/general/test_memory.py
index e352b9e8751a..987d19acf35f 100644
--- a/test/general/test_memory.py
+++ b/test/general/test_memory.py
@@ -5,7 +5,7 @@
 
 
 class TestWorldMemory(unittest.TestCase):
-    def test_leak(self):
+    def test_leak(self) -> None:
         """Tests that worlds don't leak references to MultiWorld or themselves with default options."""
         import gc
         import weakref
diff --git a/test/general/test_names.py b/test/general/test_names.py
index 7be76eed4ba9..8ad74a33544d 100644
--- a/test/general/test_names.py
+++ b/test/general/test_names.py
@@ -3,7 +3,7 @@
 
 
 class TestNames(unittest.TestCase):
-    def test_item_names_format(self):
+    def test_item_names_format(self) -> None:
         """Item names must not be all numeric in order to differentiate between ID and name in !hint"""
         for gamename, world_type in AutoWorldRegister.world_types.items():
             with self.subTest(game=gamename):
@@ -11,7 +11,7 @@ def test_item_names_format(self):
                     self.assertFalse(item_name.isnumeric(),
                                      f"Item name \"{item_name}\" is invalid. It must not be numeric.")
 
-    def test_location_name_format(self):
+    def test_location_name_format(self) -> None:
         """Location names must not be all numeric in order to differentiate between ID and name in !hint_location"""
         for gamename, world_type in AutoWorldRegister.world_types.items():
             with self.subTest(game=gamename):

From 2b9fa890509df1d53a68be0758119a767faf8aa8 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Fri, 17 Jan 2025 15:22:36 -0500
Subject: [PATCH 283/381] Bizhawk: adds typing to bizhawk component launch
 (#4505)

---
 worlds/_bizhawk/context.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/_bizhawk/context.py b/worlds/_bizhawk/context.py
index 8d029f92ec71..e20b6551cb26 100644
--- a/worlds/_bizhawk/context.py
+++ b/worlds/_bizhawk/context.py
@@ -241,7 +241,7 @@ def _patch_and_run_game(patch_file: str):
         return {}
 
 
-def launch(*launch_args) -> None:
+def launch(*launch_args: str) -> None:
     async def main():
         parser = get_base_parser()
         parser.add_argument("patch_file", default="", type=str, nargs="?", help="Path to an Archipelago patch file")

From 1ac8349bd427e7ba2980c4083e28ceaeafa923e8 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 17 Jan 2025 21:30:18 +0100
Subject: [PATCH 284/381] CI: update pyright (#4506)

---
 .github/workflows/strict-type-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/strict-type-check.yml b/.github/workflows/strict-type-check.yml
index 91f4aed92a2d..2ccdad8d11af 100644
--- a/.github/workflows/strict-type-check.yml
+++ b/.github/workflows/strict-type-check.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          python -m pip install --upgrade pip pyright==1.1.377
+          python -m pip install --upgrade pip pyright==1.1.392.post0
           python ModuleUpdate.py --append "WebHostLib/requirements.txt" --force --yes
 
       - name: "pyright: strict check on specific files"

From 8732974857f620fb05d98f53aee6802a31eb77e5 Mon Sep 17 00:00:00 2001
From: CarlosBor <48533334+CarlosBor@users.noreply.github.com>
Date: Sat, 18 Jan 2025 03:38:59 +0100
Subject: [PATCH 285/381] ALttP: update Spanish Setup Docs (#2670)

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
---
 worlds/alttp/docs/multiworld_es.md | 251 +++++++++--------------------
 1 file changed, 75 insertions(+), 176 deletions(-)

diff --git a/worlds/alttp/docs/multiworld_es.md b/worlds/alttp/docs/multiworld_es.md
index a8ed11cd3202..eade0372ec6e 100644
--- a/worlds/alttp/docs/multiworld_es.md
+++ b/worlds/alttp/docs/multiworld_es.md
@@ -1,224 +1,123 @@
 # Guía de instalación para A Link to the Past Randomizer Multiworld
 
-<div id="tutorial-video-container">
-    <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/mJKEHaiyR_Y" frameborder="0"
-      allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen>
-    </iframe>
-</div>
-
 ## Software requerido
 
-- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
-- [QUsb2Snes](https://github.com/Skarsnik/QUsb2snes/releases) (Incluido en Multiworld Utilities)
-- Hardware o software capaz de cargar y ejecutar archivos de ROM de SNES
-    - Un emulador capaz de ejecutar scripts Lua
-      ([snes9x rr](https://github.com/gocha/snes9x-rr/releases),
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases).
+- [SNI](https://github.com/alttpo/sni/releases). Esto está incluido automáticamente en la instalación de Archipelago.
+- SNI no es compatible con (Q)Usb2Snes.
+- Hardware o software capaz de cargar y ejecutar archivos de ROM de SNES, por ejemplo:
+    - Un emulador capaz de conectarse a SNI
+      ([snes9x-nwa](https://github.com/Skarsnik/snes9x-emunwa/releases), [snes9x-rr](https://github.com/gocha/snes9x-rr/releases),
+       [BSNES-plus](https://github.com/black-sliver/bsnes-plus),
        [BizHawk](https://tasvideos.org/BizHawk), o
-       [RetroArch](https://retroarch.com?page=platforms) 1.10.1 o más nuevo). O,
-    - Un flashcart SD2SNES, [FXPak Pro](https://krikzz.com/store/home/54-fxpak-pro.html), o otro hardware compatible
+       [RetroArch](https://retroarch.com?page=platforms) 1.10.1 o más nuevo).
+    - Un SD2SNES, [FXPak Pro](https://krikzz.com/store/home/54-fxpak-pro.html), u otro hardware compatible. **nota:
+Las SNES minis modificadas no tienen soporte de SNI. Algunos usuarios dicen haber tenido éxito con Qusb2Snes para esta consola,
+pero no tiene soporte.**
 - Tu archivo ROM japones v1.0, probablemente se llame `Zelda no Densetsu - Kamigami no Triforce (Japan).sfc`
 
 ## Procedimiento de instalación
 
-### Instalación en Windows
-
-1. Descarga e instala MultiWorld Utilities desde el enlace anterior, asegurando que instalamos la versión más reciente.
-   **El archivo esta localizado en la sección "assets" en la parte inferior de la información de versión**. Si tu
-   intención es jugar la versión normal de multiworld, necesitarás el archivo `Setup.Archipelago.exe`
-    - Si estas interesado en jugar la variante que aleatoriza las puertas internas de las mazmorras, necesitaras bajar '
-      Setup.BerserkerMultiWorld.Doors.exe'
-    - Durante el proceso de instalación, se te pedirá donde esta situado tu archivo ROM japonés v1.0. Si ya habías
-      instalado este software con anterioridad y simplemente estas actualizando, no se te pedirá la localización del
-      archivo una segunda vez.
-    - Puede ser que el programa pida la instalación de Microsoft Visual C++. Si ya lo tienes en tu ordenador (
-      posiblemente por que un juego de Steam ya lo haya instalado), el instalador no te pedirá su instalación.
-
-2. Si estas usando un emulador, deberías asignar la versión capaz de ejecutar scripts Lua como programa por defecto para
-   lanzar ficheros de ROM de SNES.
-    1. Extrae tu emulador al escritorio, o cualquier sitio que después recuerdes.
-    2. Haz click derecho en un fichero de ROM (ha de tener la extensión sfc) y selecciona **Abrir con...**
-    3. Marca la opción **Usar siempre esta aplicación para abrir los archivos .sfc**
-    4. Baja hasta el final de la lista y haz click en la opción **Buscar otra aplicación en el equipo** (Si usas Windows
-       10 es posible que debas hacer click en **Más aplicaciones**)
-    5. Busca el archivo .exe de tu emulador y haz click en **Abrir**. Este archivo debe estar en el directorio donde
-       extrajiste en el paso 1.
-
-### Instalación en Macintosh
-
-- ¡Necesitamos voluntarios para rellenar esta seccion! Contactad con **Farrak Kilhn** (en inglés) en Discord si queréis
-  ayudar.
-
-## Configurar tu archivo YAML
-
-### Que es un archivo YAML y por qué necesito uno?
-
-Tu archivo YAML contiene un conjunto de opciones de configuración que proveen al generador con información sobre como
-debe generar tu juego. Cada jugador en una partida de multiworld proveerá su propio fichero YAML. Esta configuración
-permite que cada jugador disfrute de una experiencia personalizada a su gusto, y cada jugador dentro de la misma partida
-de multiworld puede tener diferentes opciones.
-
-### Donde puedo obtener un fichero YAML?
-
-La página "[Generate Game](/games/A%20Link%20to%20the%20Past/player-options)" en el sitio web te permite configurar tu
-configuración personal y descargar un fichero "YAML".
-
-### Configuración YAML avanzada
-
-Una version mas avanzada del fichero Yaml puede ser creada usando la pagina
-["Weighted settings"](/games/A Link to the Past/weighted-options),
-la cual te permite tener almacenadas hasta 3 preajustes. La pagina "Weighted Settings" tiene muchas opciones
-representadas con controles deslizantes. Esto permite elegir cuan probable los valores de una categoría pueden ser
-elegidos sobre otros de la misma.
-
-Por ejemplo, imagina que el generador crea un cubo llamado "map_shuffle", y pone trozos de papel doblado en él por cada
-sub-opción. Ademas imaginemos que tu valor elegido para "on" es 20 y el elegido para "off" es 40.
-
-Por tanto, en este ejemplo, habrán 60 trozos de papel. 20 para "on" y 40 para "off". Cuando el generador esta decidiendo
-si activar o no "map shuffle" para tu partida, meterá la mano en el cubo y sacara un trozo de papel al azar. En este
-ejemplo, es mucho mas probable (2 de cada 3 veces (40/60)) que "map shuffle" esté desactivado.
-
-Si quieres que una opción no pueda ser escogida, simplemente asigna el valor 0 a dicha opción. Recuerda que cada opción
-debe tener al menos un valor mayor que cero, si no la generación fallará.
-
-### Verificando tu archivo YAML
-
-Si quieres validar que tu fichero YAML para asegurarte que funciona correctamente, puedes hacerlo en la pagina
-[YAML Validator](/check).
-
-## Generar una partida para un jugador
-
-1. Navega a [la pagina Generate game](/games/A%20Link%20to%20the%20Past/player-options), configura tus opciones, haz
-   click en el boton "Generate game".
-2. Se te redigirá a una pagina "Seed Info", donde puedes descargar tu archivo de parche.
-3. Haz doble click en tu fichero de parche, y el emulador debería ejecutar tu juego automáticamente. Como el Cliente no
-   es necesario para partidas de un jugador, puedes cerrarlo junto a la pagina web (que tiene como titulo "Multiworld
-   WebUI") que se ha abierto automáticamente.
-
-## Unirse a una partida MultiWorld
+1. Descarga e instala [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest).
+   **El archivo del instalador se encuentra en la sección de assets al final de la información de version**.
+2. La primera vez que realices una generación local o parchees tu juego, se te pedirá que ubiques tu archivo ROM base.
+   Este es tu archivo ROM de Link to the Past japonés. Esto sólo debe hacerse una vez.
+   
+4. Si estás usando un emulador, deberías de asignar tu emulador con compatibilidad con Lua como el programa por defecto para abrir archivos 
+   ROM.
+    1. Extrae la carpeta de tu emulador al Escritorio, o algún otro sitio que vayas a recordar.
+    2. Haz click derecho en un archivo ROM y selecciona **Abrir con...**
+    3. Marca la casilla junto a **Usar siempre este programa para abrir archivos .sfc**
+    4. Baja al final de la lista y haz click en el texto gris **Buscar otro programa en este PC**
+    5. Busca el archivo `.exe` de tu emulador y haz click en **Abrir**. Este archivo debería de encontrarse dentro de la carpeta que
+      extrajiste en el paso uno. 
 
 ### Obtener el fichero de parche y crea tu ROM
 
-Cuando te unes a una partida multiworld, debes proveer tu fichero YAML a quien sea el creador de la partida. Una vez
+Cuando te unas a una partida multiworld, se te pedirá enviarle tu archivo de configuración a quien quiera que esté creando. Una vez eso
 este hecho, el creador te devolverá un enlace para descargar el parche o un fichero zip conteniendo todos los ficheros
-de parche de la partida Tu fichero de parche debe tener la extensión `.aplttp`.
+de parche de la partida. Tu fichero de parche debe de tener la extensión `.aplttp`.
 
-Pon tu fichero de parche en el escritorio o en algún sitio conveniente, y haz doble click. Esto debería ejecutar
-automáticamente el cliente, y ademas creara la rom en el mismo directorio donde este el fichero de parche.
+Pon tu fichero de parche en el escritorio o en algún sitio conveniente, y hazle doble click. Esto debería ejecutar
+automáticamente el cliente, y además creará la rom en el mismo directorio donde este el fichero de parche.
 
 ### Conectar al cliente
 
 #### Con emulador
 
-Cuando el cliente se lance automáticamente, QUsb2Snes debería haberse ejecutado también. Si es la primera vez que lo
-ejecutas, puedes ser que el firewall de Windows te pregunte si le permites la comunicación.
+Cuando el cliente se lance automáticamente, SNI debería de ejecutarse en segundo plano. Si es la 
+primera vez que se ejecuta, tal vez se te pida permitir que se comunique a través del firewall de Windows
+
+#### snes9x-nwa
+
+1. Haz click en el menu Network y marca 'Enable Emu Network Control
+2. Carga tu archivo ROM si no lo habías hecho antes
 
 ##### snes9x-rr
 
-1. Carga tu fichero de ROM, si no lo has hecho ya
+1. Carga tu fichero ROM, si no lo has hecho ya
 2. Abre el menu "File" y situa el raton en **Lua Scripting**
 3. Haz click en **New Lua Script Window...**
 4. En la nueva ventana, haz click en **Browse...**
-5. Navega hacia el directorio donde este situado snes9x-rr, entra en el directorio `lua`, y
-   escoge `multibridge.lua`
-6. Observa que se ha asignado un nombre al dispositivo, y el cliente muestra "SNES Device: Connected", con el mismo
-   nombre en la esquina superior izquierda.
+5. Selecciona el archivo lua conector incluido con tu cliente
+      - Busca en la carpeta de Archipelago `/SNI/lua/`.
+6. Si ves un error mientras carga el script que dice `socket.dll missing` o algo similar, ve a la carpeta de
+el lua que estas usando en tu gestor de archivos y copia el `socket.dll` a la raíz de tu instalación de snes9x.
+
+##### BNES-Plus
+
+1. Cargue su archivo ROM si aún no se ha cargado.
+2. El emulador debería conectarse automáticamente mientras SNI se está ejecutando.
 
 ##### BizHawk
 
-1. Asegurate que se ha cargado el nucleo BSNES. Debes hacer esto en el menu Tools y siguiento estas opciones:
-   `Config --> Cores --> SNES --> BSNES`  
-   Una vez cambiado el nucleo cargado, BizHawk ha de ser reiniciado.
+1. Asegurate que se ha cargado el núcleo BSNES. Se hace en la barra de menú principal, bajo:
+    - (≤ 2.8) `Config` 〉 `Cores` 〉 `SNES` 〉 `BSNES`
+    - (≥ 2.9) `Config` 〉 `Preferred Cores` 〉 `SNES` 〉 `BSNESv115+`
 2. Carga tu fichero de ROM, si no lo has hecho ya.
-3. Haz click en el menu Tools y en la opción **Lua Console**
-4. Haz click en el botón para abrir un nuevo script Lua.
-5. Navega al directorio de instalación de MultiWorld Utilities, y en los siguiente directorios:  
-   `QUsb2Snes/Qusb2Snes/LuaBridge`
-6. Selecciona `luabridge.lua` y haz click en Abrir.
-7. Observa que se ha asignado un nombre al dispositivo, y el cliente muestra "SNES Device: Connected", con el mismo
-   nombre en la esquina superior izquierda.
+   Si has cambiado tu preferencia de núcleo tras haber cargado la ROM, no te olvides de volverlo a cargar (atajo por defecto: Ctrl+R).
+3. Arrastra el archivo `Connector.lua` que has descargado a la ventana principal de EmuHawk.
+   - Busca en la carpeta de Archipelago `/SNI/lua/`.
+   - También podrías abrir la consola de Lua manualmente, hacer click en `Script` 〉 `Open Script`, e ir a `Connector.lua`
+      con el selector de archivos.
 
 ##### RetroArch 1.10.1 o más nuevo
 
-Sólo hay que segiur estos pasos una vez.
+Sólo hay que seguir estos pasos una vez.
 
 1. Comienza en la pantalla del menú principal de RetroArch.
 2. Ve a Ajustes --> Interfaz de usario. Configura "Mostrar ajustes avanzados" en ON.
-3. Ve a Ajustes --> Red. Configura "Comandos de red" en ON. (Se encuentra bajo Request Device 16.) Deja en 55355 (el
-   default) el Puerto de comandos de red.
+3. Ve a Ajustes --> Red. Pon "Comandos de red" en ON. (Se encuentra bajo Request Device 16.) Deja en 55355 el valor por defecto,
+ el Puerto de comandos de red.
 
 ![Captura de pantalla del ajuste Comandos de red](/static/generated/docs/A%20Link%20to%20the%20Past/retroarch-network-commands-en.png)
 4. Ve a Menú principal --> Actualizador en línea --> Descargador de núcleos. Desplázate y selecciona "Nintendo - SNES /
    SFC (bsnes-mercury Performance)".
 
-Cuando cargas un ROM, asegúrate de seleccionar un núcleo **bsnes-mercury**. Estos son los sólos núcleos que permiten
+Cuando cargas un ROM, asegúrate de seleccionar un núcleo **bsnes-mercury**. Estos son los únicos núcleos que permiten
 que herramientas externas lean datos del ROM.
 
 #### Con Hardware
 
-Esta guía asume que ya has descargado el firmware correcto para tu dispositivo. Si no lo has hecho ya, hazlo ahora. Los
+Esta guía asume que ya has descargado el firmware correcto para tu dispositivo. Si no lo has hecho ya, por favor hazlo ahora. Los
 usuarios de SD2SNES y FXPak Pro pueden descargar el firmware apropiado
-[aqui](https://github.com/RedGuyyyy/sd2snes/releases). Los usuarios de otros dispositivos pueden encontrar información
+[aqui](https://github.com/RedGuyyyy/sd2snes/releases). Puede que los usuarios de otros dispositivos encuentren informacion útil
 [en esta página](http://usb2snes.com/#supported-platforms).
 
 1. Cierra tu emulador, el cual debe haberse autoejecutado.
-2. Cierra QUsb2Snes, el cual fue ejecutado junto al cliente.
-3. Ejecuta la version correcta de QUsb2Snes (v0.7.16).
-4. Enciende tu dispositivo y carga la ROM.
-5. Observa en el cliente que ahora muestra "SNES Device: Connected", y aparece el nombre del dispositivo.
-
-### Conecta al MultiServer
-
-El fichero de parche que ha lanzado el cliente debe haberte conectado automaticamente al MultiServer. Hay algunas
-razonas por las que esto puede que no pase, incluyendo que el juego este hospedado en el sitio web pero se genero en
-algún otro sitio. Si el cliente muestra "Server Status: Not Connected", preguntale al creador de la partida la dirección
-del servidor, copiala en el campo "Server" y presiona Enter.
-
-El cliente intentara conectarse a esta nueva dirección, y debería mostrar "Server Status: Connected" en algún momento.
-Si el cliente no se conecta al cabo de un rato, puede ser que necesites refrescar la pagina web.
-
-### Jugando
-
-Cuando ambos SNES Device and Server aparezcan como "connected", estas listo para empezar a jugar. Felicidades por unirte
-satisfactoriamente a una partida de multiworld!
-
-## Hospedando una partida de multiworld
-
-La manera recomendad para hospedar una partida es usar el servicio proveído en
-[el sitio web](/generate). El proceso es relativamente sencillo:
-
-1. Recolecta los ficheros YAML de todos los jugadores que participen.
-2. Crea un fichero ZIP conteniendo esos ficheros.
-3. Carga el fichero zip en el sitio web enlazado anteriormente.
-4. Espera a que la seed sea generada.
-5. Cuando esto acabe, se te redigirá a una pagina titulada "Seed Info".
-6. Haz click en "Create New Room". Esto te llevara a la pagina del servidor. Pasa el enlace a esta pagina a los
-   jugadores para que puedan descargar los ficheros de parche de ahi.  
-   **Nota:** Los ficheros de parche de esta pagina permiten a los jugadores conectarse al servidor automaticamente,
-   mientras que los de la pagina "Seed info" no.
-7. Hay un enlace a un MultiWorld Tracker en la parte superior de la pagina de la sala. Deberías pasar también este
-   enlace a los jugadores para que puedan ver el progreso de la partida. A los observadores también se les puede pasar
-   este enlace.
-8. Una vez todos los jugadores se han unido, podeis empezar a jugar.
-
-## Auto-Tracking
-
-Si deseas usar auto-tracking para tu partida, varios programas ofrecen esta funcionalidad.  
-El programa recomentdado actualmente es:
-[OpenTracker](https://github.com/trippsc2/OpenTracker/releases).
-
-### Instalación
-
-1. Descarga el fichero de instalacion apropiado para tu ordenador (Usuarios de windows quieren el fichero ".msi").
-2. Durante el proceso de insatalación, puede que se te pida instalar Microsoft Visual Studio Build Tools. Un enlace este
-   programa se muestra durante la proceso, y debe ser ejecutado manualmente.
-
-### Activar auto-tracking
-
-1. Con OpenTracker ejecutado, haz click en el menu Tracking en la parte superior de la ventana, y elige **
-   AutoTracker...**
-2. Click the **Get Devices** button
-3. Selecciona tu "SNES device" de la lista
-4. Si quieres que las llaves y los objetos de mazmorra tambien sean marcados, activa la caja con nombre **Race Illegal
-   Tracking**
-5. Haz click en el boton **Start Autotracking**
-6. Cierra la ventana AutoTracker, ya que deja de ser necesaria
+2. Enciende tu dispositivo y carga la ROM.
+
+### Conecta al Servidor Archipelago
+
+El fichero de parche que ha lanzado el cliente debería de haberte conectado automaticamente al MultiServer. Sin embargo hay algunas
+razones por las que puede que esto no suceda, como que la partida este hospedada en la página web pero generada en otra parte. Si la
+ventana del cliente muestra "Server Status: Not Connected", simplemente preguntale al creador de la partida la dirección
+del servidor, cópiala en el campo "Server" y presiona Enter.
+
+El cliente intentará conectarse a esta nueva dirección, y debería mostrar "Server Status: Connected" momentáneamente.
+
+### Jugar al juego
+
+Cuando el cliente muestre tanto el dispositivo SNES como el servidor como conectados, estas listo para empezar a jugar. Felicidades por
+haberte unido a una partida multiworld con exito! Puedes ejecutar varios comandos en tu cliente. Para mas informacion
+acerca de estos comando puedes usar `/help` para comandos locales del cliente y `!help` para comandos de servidor.

From 005a143e3e1add0e781cbb87c696bdb2413e8ee1 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sat, 18 Jan 2025 19:59:26 +0100
Subject: [PATCH 286/381] MultiServer: Add slot to SetReply packets (#3747)

* Add slot to datastorage set response

* update docs as well
---
 MultiServer.py           | 1 +
 docs/network protocol.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/MultiServer.py b/MultiServer.py
index 81426cb132d8..653c2ecaabb1 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -1992,6 +1992,7 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
             args["cmd"] = "SetReply"
             value = ctx.stored_data.get(args["key"], args.get("default", 0))
             args["original_value"] = copy.copy(value)
+            args["slot"] = client.slot
             for operation in args["operations"]:
                 func = modify_functions[operation["operation"]]
                 value = func(value, operation["value"])
diff --git a/docs/network protocol.md b/docs/network protocol.md
index 160f83031c9b..e32c266ffb67 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -261,6 +261,7 @@ Sent to clients in response to a [Set](#Set) package if want_reply was set to tr
 | key            | str  | The key that was updated.                                                                  |
 | value          | any  | The new value for the key.                                                                 |
 | original_value | any  | The value the key had before it was updated. Not present on "_read" prefixed special keys. |
+| slot           | int  | The slot that originally sent the Set package causing this change.                         |
 
 Additional arguments added to the [Set](#Set) package that triggered this [SetReply](#SetReply) will also be passed along.
 

From 1c9409cac9e4612b8287d9499124b9e71872e197 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun, 19 Jan 2025 00:26:42 +0100
Subject: [PATCH 287/381] CommonClient: implement check_locations to send
 missing locations only (#4484)

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---
 CommonClient.py           | 7 +++++++
 worlds/alttp/Client.py    | 2 +-
 worlds/factorio/Client.py | 5 ++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CommonClient.py b/CommonClient.py
index fc6ae6d9a5fa..b43bf57d1985 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -459,6 +459,13 @@ async def send_connect(self, **kwargs: typing.Any) -> None:
         await self.send_msgs([payload])
         await self.send_msgs([{"cmd": "Get", "keys": ["_read_race_mode"]}])
 
+    async def check_locations(self, locations: typing.Collection[int]) -> set[int]:
+        """Send new location checks to the server. Returns the set of actually new locations that were sent."""
+        locations = set(locations) & self.missing_locations
+        if locations:
+            await self.send_msgs([{"cmd": 'LocationChecks', "locations": tuple(locations)}])
+        return locations
+
     async def console_input(self) -> str:
         if self.ui:
             self.ui.focus_textinput()
diff --git a/worlds/alttp/Client.py b/worlds/alttp/Client.py
index a0b28829f4bb..78745f438b73 100644
--- a/worlds/alttp/Client.py
+++ b/worlds/alttp/Client.py
@@ -464,7 +464,7 @@ def new_check(location_id):
             snes_logger.info(f"Discarding recent {len(new_locations)} checks as ROM Status has changed.")
             return False
         else:
-            await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": new_locations}])
+            await ctx.check_locations(new_locations)
     await snes_flush_writes(ctx)
     return True
 
diff --git a/worlds/factorio/Client.py b/worlds/factorio/Client.py
index 3c35c4cb0986..ac58339c5e14 100644
--- a/worlds/factorio/Client.py
+++ b/worlds/factorio/Client.py
@@ -234,8 +234,7 @@ async def game_watcher(ctx: FactorioContext):
                         f"Connected Multiworld is not the expected one {data['seed_name']} != {ctx.seed_name}")
                 else:
                     data = data["info"]
-                    research_data = data["research_done"]
-                    research_data = {int(tech_name.split("-")[1]) for tech_name in research_data}
+                    research_data: set[int] = {int(tech_name.split("-")[1]) for tech_name in data["research_done"]}
                     victory = data["victory"]
                     await ctx.update_death_link(data["death_link"])
                     ctx.multiplayer = data.get("multiplayer", False)
@@ -249,7 +248,7 @@ async def game_watcher(ctx: FactorioContext):
                             f"New researches done: "
                             f"{[ctx.location_names.lookup_in_game(rid) for rid in research_data - ctx.locations_checked]}")
                         ctx.locations_checked = research_data
-                        await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": tuple(research_data)}])
+                        await ctx.check_locations(research_data)
                     death_link_tick = data.get("death_link_tick", 0)
                     if death_link_tick != ctx.death_link_tick:
                         ctx.death_link_tick = death_link_tick

From 992f1925296f7fe2e60b4c5358e810b640dadc3d Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Sat, 18 Jan 2025 20:36:01 -0500
Subject: [PATCH 288/381] Stardew Valley: Improve generation performance by
 around 11% by moving calculating from rule evaluation to collect (#4231)

---
 worlds/stardew_valley/__init__.py             | 40 +++++++++++------
 worlds/stardew_valley/stardew_rule/state.py   | 45 +++----------------
 .../strings/ap_names/event_names.py           |  2 +
 .../stardew_valley/test/rules/TestShipping.py | 11 +++--
 4 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 9da650520f05..ef842263ad2c 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -1,6 +1,6 @@
 import logging
 from random import Random
-from typing import Dict, Any, Iterable, Optional, Union, List, TextIO
+from typing import Dict, Any, Iterable, Optional, List, TextIO
 
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
 from Options import PerGameCommonOptions
@@ -88,7 +88,6 @@ class StardewValleyWorld(World):
     randomized_entrances: Dict[str, str]
 
     total_progression_items: int
-    excluded_from_total_progression_items: List[str] = [Event.received_walnuts]
 
     def __init__(self, multiworld: MultiWorld, player: int):
         super().__init__(multiworld, player)
@@ -176,7 +175,7 @@ def precollect_starting_season(self):
 
         if self.options.season_randomization == SeasonRandomization.option_disabled:
             for season in season_pool:
-                self.multiworld.push_precollected(self.create_starting_item(season))
+                self.multiworld.push_precollected(self.create_item(season))
             return
 
         if [item for item in self.multiworld.precollected_items[self.player]
@@ -186,12 +185,12 @@ def precollect_starting_season(self):
         if self.options.season_randomization == SeasonRandomization.option_randomized_not_winter:
             season_pool = [season for season in season_pool if season.name != "Winter"]
 
-        starting_season = self.create_starting_item(self.random.choice(season_pool))
+        starting_season = self.create_item(self.random.choice(season_pool))
         self.multiworld.push_precollected(starting_season)
 
     def precollect_farm_type_items(self):
         if self.options.farm_type == FarmType.option_meadowlands and self.options.building_progression & BuildingProgression.option_progressive:
-            self.multiworld.push_precollected(self.create_starting_item("Progressive Coop"))
+            self.multiworld.push_precollected(self.create_item("Progressive Coop"))
 
     def setup_logic_events(self):
         def register_event(name: str, region: str, rule: StardewRule):
@@ -271,7 +270,7 @@ def setup_victory(self):
     def get_all_location_names(self) -> List[str]:
         return list(location.name for location in self.multiworld.get_locations(self.player))
 
-    def create_item(self, item: Union[str, ItemData], override_classification: ItemClassification = None) -> StardewItem:
+    def create_item(self, item: str | ItemData, override_classification: ItemClassification = None) -> StardewItem:
         if isinstance(item, str):
             item = item_table[item]
 
@@ -280,12 +279,6 @@ def create_item(self, item: Union[str, ItemData], override_classification: ItemC
 
         return StardewItem(item.name, override_classification, item.code, self.player)
 
-    def create_starting_item(self, item: Union[str, ItemData]) -> StardewItem:
-        if isinstance(item, str):
-            item = item_table[item]
-
-        return StardewItem(item.name, item.classification, item.code, self.player)
-
     def create_event_location(self, location_data: LocationData, rule: StardewRule = None, item: Optional[str] = None):
         if rule is None:
             rule = True_()
@@ -393,9 +386,19 @@ def collect(self, state: CollectionState, item: StardewItem) -> bool:
         if not change:
             return False
 
+        player_state = state.prog_items[self.player]
+
+        received_progression_count = player_state[Event.received_progression_item]
+        received_progression_count += 1
+        if self.total_progression_items:
+            # Total progression items is not set until all items are created, but collect will be called during the item creation when an item is precollected.
+            # We can't update the percentage if we don't know the total progression items, can't divide by 0.
+            player_state[Event.received_progression_percent] = received_progression_count * 100 // self.total_progression_items
+        player_state[Event.received_progression_item] = received_progression_count
+
         walnut_amount = self.get_walnut_amount(item.name)
         if walnut_amount:
-            state.prog_items[self.player][Event.received_walnuts] += walnut_amount
+            player_state[Event.received_walnuts] += walnut_amount
 
         return True
 
@@ -404,9 +407,18 @@ def remove(self, state: CollectionState, item: StardewItem) -> bool:
         if not change:
             return False
 
+        player_state = state.prog_items[self.player]
+
+        received_progression_count = player_state[Event.received_progression_item]
+        received_progression_count -= 1
+        if self.total_progression_items:
+            # We can't update the percentage if we don't know the total progression items, can't divide by 0.
+            player_state[Event.received_progression_percent] = received_progression_count * 100 // self.total_progression_items
+        player_state[Event.received_progression_item] = received_progression_count
+
         walnut_amount = self.get_walnut_amount(item.name)
         if walnut_amount:
-            state.prog_items[self.player][Event.received_walnuts] -= walnut_amount
+            player_state[Event.received_walnuts] -= walnut_amount
 
         return True
 
diff --git a/worlds/stardew_valley/stardew_rule/state.py b/worlds/stardew_valley/stardew_rule/state.py
index 6fc349a6274d..d60f08ac4c94 100644
--- a/worlds/stardew_valley/stardew_rule/state.py
+++ b/worlds/stardew_valley/stardew_rule/state.py
@@ -4,6 +4,7 @@
 from BaseClasses import CollectionState
 from .base import BaseStardewRule, CombinableStardewRule
 from .protocol import StardewRule
+from ..strings.ap_names.event_names import Event
 
 if TYPE_CHECKING:
     from .. import StardewValleyWorld
@@ -87,45 +88,13 @@ def __repr__(self):
         return f"Reach {self.resolution_hint} {self.spot}"
 
 
-@dataclass(frozen=True)
-class HasProgressionPercent(CombinableStardewRule):
-    player: int
-    percent: int
+class HasProgressionPercent(Received):
+    def __init__(self, player: int, percent: int):
+        super().__init__(Event.received_progression_percent, player, percent, event=True)
 
     def __post_init__(self):
-        assert self.percent > 0, "HasProgressionPercent rule must be above 0%"
-        assert self.percent <= 100, "HasProgressionPercent rule can't require more than 100% of items"
-
-    @property
-    def combination_key(self) -> Hashable:
-        return HasProgressionPercent.__name__
-
-    @property
-    def value(self):
-        return self.percent
-
-    def __call__(self, state: CollectionState) -> bool:
-        stardew_world: "StardewValleyWorld" = state.multiworld.worlds[self.player]
-        total_count = stardew_world.total_progression_items
-        needed_count = (total_count * self.percent) // 100
-        player_state = state.prog_items[self.player]
-
-        if needed_count <= len(player_state) - len(stardew_world.excluded_from_total_progression_items):
-            return True
-
-        total_count = 0
-        for item, item_count in player_state.items():
-            if item in stardew_world.excluded_from_total_progression_items:
-                continue
-
-            total_count += item_count
-            if total_count >= needed_count:
-                return True
-
-        return False
-
-    def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]:
-        return self, self(state)
+        assert self.count > 0, "HasProgressionPercent rule must be above 0%"
+        assert self.count <= 100, "HasProgressionPercent rule can't require more than 100% of items"
 
     def __repr__(self):
-        return f"Received {self.percent}% progression items"
+        return f"Received {self.count}% progression items"
diff --git a/worlds/stardew_valley/strings/ap_names/event_names.py b/worlds/stardew_valley/strings/ap_names/event_names.py
index b7881b3bfd79..68f000bdc316 100644
--- a/worlds/stardew_valley/strings/ap_names/event_names.py
+++ b/worlds/stardew_valley/strings/ap_names/event_names.py
@@ -10,3 +10,5 @@ class Event:
     victory = event("Victory")
 
     received_walnuts = event("Received Walnuts")
+    received_progression_item = event("Received Progression Item")
+    received_progression_percent = event("Received Progression Percent")
diff --git a/worlds/stardew_valley/test/rules/TestShipping.py b/worlds/stardew_valley/test/rules/TestShipping.py
index b26d1e94ee2c..125b7f31d0d9 100644
--- a/worlds/stardew_valley/test/rules/TestShipping.py
+++ b/worlds/stardew_valley/test/rules/TestShipping.py
@@ -69,14 +69,17 @@ class TestShipsanityEverything(SVTestBase):
     def test_all_shipsanity_locations_require_shipping_bin(self):
         bin_name = "Shipping Bin"
         self.collect_all_except(bin_name)
-        shipsanity_locations = [location for location in self.get_real_locations() if
-                                LocationTags.SHIPSANITY in location_table[location.name].tags]
+        shipsanity_locations = [location
+                                for location in self.get_real_locations()
+                                if LocationTags.SHIPSANITY in location_table[location.name].tags]
         bin_item = self.create_item(bin_name)
+
         for location in shipsanity_locations:
             with self.subTest(location.name):
-                self.remove(bin_item)
                 self.assertFalse(self.world.logic.region.can_reach_location(location.name)(self.multiworld.state))
-                self.multiworld.state.collect(bin_item)
+
+                self.collect(bin_item)
                 shipsanity_rule = self.world.logic.region.can_reach_location(location.name)
                 self.assert_rule_true(shipsanity_rule, self.multiworld.state)
+
                 self.remove(bin_item)

From 0bb657d2c867ae3edc6a3145843ffe235de2ae4a Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Sun, 19 Jan 2025 01:21:54 -0800
Subject: [PATCH 289/381] Pokemon Emerald: Use new check_locations helper
 (#4518)

---
 worlds/pokemon_emerald/client.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/worlds/pokemon_emerald/client.py b/worlds/pokemon_emerald/client.py
index 5add7b3fca40..411fdd1a33be 100644
--- a/worlds/pokemon_emerald/client.py
+++ b/worlds/pokemon_emerald/client.py
@@ -287,7 +287,7 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
                     pokedex_caught_bytes = read_result[0]
 
             game_clear = False
-            local_checked_locations = set()
+            local_checked_locations: set[int] = set()
             local_set_events = {flag_name: False for flag_name in TRACKER_EVENT_FLAGS}
             local_found_key_items = {location_name: False for location_name in KEY_LOCATION_FLAGS}
             defeated_legendaries = {legendary_name: False for legendary_name in LEGENDARY_NAMES.values()}
@@ -350,10 +350,7 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
                 self.local_checked_locations = local_checked_locations
 
                 if local_checked_locations is not None:
-                    await ctx.send_msgs([{
-                        "cmd": "LocationChecks",
-                        "locations": list(local_checked_locations),
-                    }])
+                    await ctx.check_locations(local_checked_locations)
 
             # Send game clear
             if not ctx.finished_game and game_clear:

From 9183e8f9c9fcc124cf5b8a4b1cc9fc58056dc3fa Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Sun, 19 Jan 2025 01:23:06 -0800
Subject: [PATCH 290/381] BizHawkClient: Use built-ins for typing (#4508)

---
 worlds/_bizhawk/__init__.py | 26 +++++++++++++-------------
 worlds/_bizhawk/client.py   | 12 ++++++------
 worlds/_bizhawk/context.py  | 10 +++++-----
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/worlds/_bizhawk/__init__.py b/worlds/_bizhawk/__init__.py
index e7b8edc0b6d7..b10e33d3965f 100644
--- a/worlds/_bizhawk/__init__.py
+++ b/worlds/_bizhawk/__init__.py
@@ -10,7 +10,7 @@
 import enum
 import json
 import sys
-import typing
+from typing import Any, Sequence
 
 
 BIZHAWK_SOCKET_PORT_RANGE_START = 43055
@@ -44,10 +44,10 @@ class SyncError(Exception):
 
 
 class BizHawkContext:
-    streams: typing.Optional[typing.Tuple[asyncio.StreamReader, asyncio.StreamWriter]]
+    streams: tuple[asyncio.StreamReader, asyncio.StreamWriter] | None
     connection_status: ConnectionStatus
     _lock: asyncio.Lock
-    _port: typing.Optional[int]
+    _port: int | None
 
     def __init__(self) -> None:
         self.streams = None
@@ -122,12 +122,12 @@ async def get_script_version(ctx: BizHawkContext) -> int:
     return int(await ctx._send_message("VERSION"))
 
 
-async def send_requests(ctx: BizHawkContext, req_list: typing.List[typing.Dict[str, typing.Any]]) -> typing.List[typing.Dict[str, typing.Any]]:
+async def send_requests(ctx: BizHawkContext, req_list: list[dict[str, Any]]) -> list[dict[str, Any]]:
     """Sends a list of requests to the BizHawk connector and returns their responses.
 
     It's likely you want to use the wrapper functions instead of this."""
     responses = json.loads(await ctx._send_message(json.dumps(req_list)))
-    errors: typing.List[ConnectorError] = []
+    errors: list[ConnectorError] = []
 
     for response in responses:
         if response["type"] == "ERROR":
@@ -180,7 +180,7 @@ async def get_system(ctx: BizHawkContext) -> str:
     return res["value"]
 
 
-async def get_cores(ctx: BizHawkContext) -> typing.Dict[str, str]:
+async def get_cores(ctx: BizHawkContext) -> dict[str, str]:
     """Gets the preferred cores for systems with multiple cores. Only systems with multiple available cores have
     entries."""
     res = (await send_requests(ctx, [{"type": "PREFERRED_CORES"}]))[0]
@@ -233,8 +233,8 @@ async def set_message_interval(ctx: BizHawkContext, value: float) -> None:
         raise SyncError(f"Expected response of type SET_MESSAGE_INTERVAL_RESPONSE but got {res['type']}")
 
 
-async def guarded_read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tuple[int, int, str]],
-                       guard_list: typing.Sequence[typing.Tuple[int, typing.Sequence[int], str]]) -> typing.Optional[typing.List[bytes]]:
+async def guarded_read(ctx: BizHawkContext, read_list: Sequence[tuple[int, int, str]],
+                       guard_list: Sequence[tuple[int, Sequence[int], str]]) -> list[bytes] | None:
     """Reads an array of bytes at 1 or more addresses if and only if every byte in guard_list matches its expected
     value.
 
@@ -262,7 +262,7 @@ async def guarded_read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tu
         "domain": domain
     } for address, size, domain in read_list])
 
-    ret: typing.List[bytes] = []
+    ret: list[bytes] = []
     for item in res:
         if item["type"] == "GUARD_RESPONSE":
             if not item["value"]:
@@ -276,7 +276,7 @@ async def guarded_read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tu
     return ret
 
 
-async def read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tuple[int, int, str]]) -> typing.List[bytes]:
+async def read(ctx: BizHawkContext, read_list: Sequence[tuple[int, int, str]]) -> list[bytes]:
     """Reads data at 1 or more addresses.
 
     Items in `read_list` should be organized `(address, size, domain)` where
@@ -288,8 +288,8 @@ async def read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tuple[int,
     return await guarded_read(ctx, read_list, [])
 
 
-async def guarded_write(ctx: BizHawkContext, write_list: typing.Sequence[typing.Tuple[int, typing.Sequence[int], str]],
-                        guard_list: typing.Sequence[typing.Tuple[int, typing.Sequence[int], str]]) -> bool:
+async def guarded_write(ctx: BizHawkContext, write_list: Sequence[tuple[int, Sequence[int], str]],
+                        guard_list: Sequence[tuple[int, Sequence[int], str]]) -> bool:
     """Writes data to 1 or more addresses if and only if every byte in guard_list matches its expected value.
 
     Items in `write_list` should be organized `(address, value, domain)` where
@@ -326,7 +326,7 @@ async def guarded_write(ctx: BizHawkContext, write_list: typing.Sequence[typing.
     return True
 
 
-async def write(ctx: BizHawkContext, write_list: typing.Sequence[typing.Tuple[int, typing.Sequence[int], str]]) -> None:
+async def write(ctx: BizHawkContext, write_list: Sequence[tuple[int, Sequence[int], str]]) -> None:
     """Writes data to 1 or more addresses.
 
     Items in write_list should be organized `(address, value, domain)` where
diff --git a/worlds/_bizhawk/client.py b/worlds/_bizhawk/client.py
index 415b663e60af..ce75b864b88c 100644
--- a/worlds/_bizhawk/client.py
+++ b/worlds/_bizhawk/client.py
@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 import abc
-from typing import TYPE_CHECKING, Any, ClassVar, Dict, Optional, Tuple, Union
+from typing import TYPE_CHECKING, Any, ClassVar
 
 from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, launch_subprocess
 
@@ -24,9 +24,9 @@ def launch_client(*args) -> None:
 
 
 class AutoBizHawkClientRegister(abc.ABCMeta):
-    game_handlers: ClassVar[Dict[Tuple[str, ...], Dict[str, BizHawkClient]]] = {}
+    game_handlers: ClassVar[dict[tuple[str, ...], dict[str, BizHawkClient]]] = {}
 
-    def __new__(cls, name: str, bases: Tuple[type, ...], namespace: Dict[str, Any]) -> AutoBizHawkClientRegister:
+    def __new__(cls, name: str, bases: tuple[type, ...], namespace: dict[str, Any]) -> AutoBizHawkClientRegister:
         new_class = super().__new__(cls, name, bases, namespace)
 
         # Register handler
@@ -54,7 +54,7 @@ def __new__(cls, name: str, bases: Tuple[type, ...], namespace: Dict[str, Any])
         return new_class
 
     @staticmethod
-    async def get_handler(ctx: "BizHawkClientContext", system: str) -> Optional[BizHawkClient]:
+    async def get_handler(ctx: "BizHawkClientContext", system: str) -> BizHawkClient | None:
         for systems, handlers in AutoBizHawkClientRegister.game_handlers.items():
             if system in systems:
                 for handler in handlers.values():
@@ -65,13 +65,13 @@ async def get_handler(ctx: "BizHawkClientContext", system: str) -> Optional[BizH
 
 
 class BizHawkClient(abc.ABC, metaclass=AutoBizHawkClientRegister):
-    system: ClassVar[Union[str, Tuple[str, ...]]]
+    system: ClassVar[str | tuple[str, ...]]
     """The system(s) that the game this client is for runs on"""
 
     game: ClassVar[str]
     """The game this client is for"""
 
-    patch_suffix: ClassVar[Optional[Union[str, Tuple[str, ...]]]]
+    patch_suffix: ClassVar[str | tuple[str, ...] | None]
     """The file extension(s) this client is meant to open and patch (e.g. ".apz3")"""
 
     @abc.abstractmethod
diff --git a/worlds/_bizhawk/context.py b/worlds/_bizhawk/context.py
index e20b6551cb26..cb59050b84f6 100644
--- a/worlds/_bizhawk/context.py
+++ b/worlds/_bizhawk/context.py
@@ -6,7 +6,7 @@
 import asyncio
 import enum
 import subprocess
-from typing import Any, Dict, Optional
+from typing import Any
 
 from CommonClient import CommonContext, ClientCommandProcessor, get_base_parser, server_loop, logger, gui_enabled
 import Patch
@@ -43,15 +43,15 @@ class BizHawkClientContext(CommonContext):
     command_processor = BizHawkClientCommandProcessor
     auth_status: AuthStatus
     password_requested: bool
-    client_handler: Optional[BizHawkClient]
-    slot_data: Optional[Dict[str, Any]] = None
-    rom_hash: Optional[str] = None
+    client_handler: BizHawkClient | None
+    slot_data: dict[str, Any] | None = None
+    rom_hash: str | None = None
     bizhawk_ctx: BizHawkContext
 
     watcher_timeout: float
     """The maximum amount of time the game watcher loop will wait for an update from the server before executing"""
 
-    def __init__(self, server_address: Optional[str], password: Optional[str]):
+    def __init__(self, server_address: str | None, password: str | None):
         super().__init__(server_address, password)
         self.auth_status = AuthStatus.NOT_AUTHENTICATED
         self.password_requested = False

From 9e353ebb8e2661bcdc95b11ff6520bcb6379368f Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sun, 19 Jan 2025 06:17:12 -0600
Subject: [PATCH 291/381] =?UTF-8?q?SMZ3:=20Fix=20Itemlinks=20with=20link?=
 =?UTF-8?q?=5Freplacement=C2=A0#4099?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worlds/smz3/__init__.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index 5998db8e6579..7ebec7d4e4be 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -87,6 +87,21 @@ def __init__(self, world: MultiWorld, player: int):
         self.rom_name_available_event = threading.Event()
         self.locations: Dict[str, Location] = {}
         self.unreachable = []
+        self.junkItemsNames = [item.name for item in [
+            ItemType.Arrow,
+            ItemType.OneHundredRupees,
+            ItemType.TenArrows,
+            ItemType.ThreeBombs,
+            ItemType.OneRupee,
+            ItemType.FiveRupees,
+            ItemType.TwentyRupees,
+            ItemType.FiftyRupees,
+            ItemType.ThreeHundredRupees,
+            ItemType.ETank,
+            ItemType.Missile,
+            ItemType.Super,
+            ItemType.PowerBomb
+        ]]
         super().__init__(world, player)
 
     @classmethod

From cbf4bbbca8633592c93e3352b0d3d5027f1002f4 Mon Sep 17 00:00:00 2001
From: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Date: Sun, 19 Jan 2025 18:17:31 -0500
Subject: [PATCH 292/381] OoT Adjuster: Remove per_slot_randoms (#4264)

---
 OoTAdjuster.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OoTAdjuster.py b/OoTAdjuster.py
index 9519b191e704..1581d6539825 100644
--- a/OoTAdjuster.py
+++ b/OoTAdjuster.py
@@ -1,7 +1,6 @@
 import tkinter as tk
 import argparse
 import logging
-import random
 import os
 import zipfile
 from itertools import chain
@@ -197,7 +196,6 @@ def set_icon(window):
 def adjust(args):
     # Create a fake multiworld and OOTWorld to use as a base
     multiworld = MultiWorld(1)
-    multiworld.per_slot_randoms = {1: random}
     ootworld = OOTWorld(multiworld, 1)
     # Set options in the fake OOTWorld
     for name, option in chain(cosmetic_options.items(), sfx_options.items()):

From 94438618495c0f9b051caea21ddb5d69c8c38c56 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Sun, 19 Jan 2025 23:20:45 +0000
Subject: [PATCH 293/381] Zillion: Finalize item locations in either
 generate_output or fill_slot_data (#4121)

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 test/general/test_implemented.py |  2 +-
 worlds/zillion/__init__.py       | 36 +++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/test/general/test_implemented.py b/test/general/test_implemented.py
index 7abf9959936a..1082a02912a8 100644
--- a/test/general/test_implemented.py
+++ b/test/general/test_implemented.py
@@ -39,7 +39,7 @@ def test_slot_data(self):
         """Tests that if a world creates slot data, it's json serializable."""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             # has an await for generate_output which isn't being called
-            if game_name in {"Ocarina of Time", "Zillion"}:
+            if game_name in {"Ocarina of Time"}:
                 continue
             multiworld = setup_solo_multiworld(world_type)
             with self.subTest(game=game_name, seed=multiworld.seed):
diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index 5a4e2bb48f18..6fa5f86d0795 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -119,8 +119,13 @@ def flush(self) -> None:
     """
     my_locations: list[ZillionLocation] = []
     """ This is kind of a cache to avoid iterating through all the multiworld locations in logic. """
-    slot_data_ready: threading.Event
-    """ This event is set in `generate_output` when the data is ready for `fill_slot_data` """
+    finalized_gen_data: GenData | None
+    """ Finalized generation data needed by `generate_output` and by `fill_slot_data`. """
+    item_locations_finalization_lock: threading.Lock
+    """
+    This lock is used in `generate_output` and `fill_slot_data` to ensure synchronized access to `finalized_gen_data`,
+    so that whichever is run first can finalize the item locations while the other waits.
+    """
     logic_cache: ZillionLogicCache | None = None
 
     def __init__(self, world: MultiWorld, player: int) -> None:
@@ -128,7 +133,8 @@ def __init__(self, world: MultiWorld, player: int) -> None:
         self.logger = logging.getLogger("Zillion")
         self.lsi = ZillionWorld.LogStreamInterface(self.logger)
         self.zz_system = System()
-        self.slot_data_ready = threading.Event()
+        self.finalized_gen_data = None
+        self.item_locations_finalization_lock = threading.Lock()
 
     def _make_item_maps(self, start_char: Chars) -> None:
         _id_to_name, _id_to_zz_id, id_to_zz_item = make_id_to_others(start_char)
@@ -305,6 +311,19 @@ def post_fill(self) -> None:
 
         self.zz_system.post_fill()
 
+    def finalize_item_locations_thread_safe(self) -> GenData:
+        """
+        Call self.finalize_item_locations() and cache the result in a thread-safe manner so that either
+        `generate_output` or `fill_slot_data` can finalize item locations without concern for which of the two functions
+        is called first.
+        """
+        # The lock is acquired when entering the context manager and released when exiting the context manager.
+        with self.item_locations_finalization_lock:
+            # If generation data has yet to be finalized, finalize it.
+            if self.finalized_gen_data is None:
+                self.finalized_gen_data = self.finalize_item_locations()
+        return self.finalized_gen_data
+
     def finalize_item_locations(self) -> GenData:
         """
         sync zilliandomizer item locations with AP item locations
@@ -363,12 +382,7 @@ def finalize_item_locations(self) -> GenData:
     def generate_output(self, output_directory: str) -> None:
         """This method gets called from a threadpool, do not use multiworld.random here.
         If you need any last-second randomization, use self.random instead."""
-        try:
-            gen_data = self.finalize_item_locations()
-        except BaseException:
-            raise
-        finally:
-            self.slot_data_ready.set()
+        gen_data = self.finalize_item_locations_thread_safe()
 
         out_file_base = self.multiworld.get_out_file_name_base(self.player)
 
@@ -392,9 +406,7 @@ def fill_slot_data(self) -> ZillionSlotInfo:  # json of WebHostLib.models.Slot
         # TODO: tell client which canisters are keywords
         # so it can open and get those when restoring doors
 
-        self.slot_data_ready.wait()
-        assert self.zz_system.randomizer, "didn't get randomizer from generate_early"
-        game = self.zz_system.get_game()
+        game = self.finalize_item_locations_thread_safe().zz_game
         return get_slot_info(game.regions, game.char_order[0], game.loc_name_2_pretty)
 
     # end of ordered Main.py calls

From 563794ab832b813c1ff7bc51bf1b8c5a7243b17c Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:29:13 -0800
Subject: [PATCH 294/381] Zillion: Use Useful Item Classification (#4179)

---
 worlds/zillion/__init__.py | 11 +++--------
 worlds/zillion/item.py     | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index 6fa5f86d0795..58f513ba6fb5 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -9,8 +9,7 @@
 
 from typing_extensions import override
 
-from BaseClasses import ItemClassification, LocationProgressType, \
-    MultiWorld, Item, CollectionState, Entrance, Tutorial
+from BaseClasses import LocationProgressType, MultiWorld, Item, CollectionState, Entrance, Tutorial
 
 from .gen_data import GenData
 from .logic import ZillionLogicCache
@@ -19,7 +18,7 @@
 from .id_maps import ZillionSlotInfo, get_slot_info, item_name_to_id as _item_name_to_id, \
     loc_name_to_id as _loc_name_to_id, make_id_to_others, \
     zz_reg_name_to_reg_name, base_id
-from .item import ZillionItem
+from .item import ZillionItem, get_classification
 from .patch import ZillionPatch
 
 from zilliandomizer.system import System
@@ -422,12 +421,8 @@ def create_item(self, name: str) -> Item:
             self.logger.warning("warning: called `create_item` without calling `generate_early` first")
         assert self.id_to_zz_item, "failed to get item maps"
 
-        classification = ItemClassification.filler
         zz_item = self.id_to_zz_item[item_id]
-        if zz_item.required:
-            classification = ItemClassification.progression
-            if not zz_item.is_progression:
-                classification = ItemClassification.progression_skip_balancing
+        classification = get_classification(name, zz_item, self._item_counts)
 
         z_item = ZillionItem(name, classification, item_id, self.player, zz_item)
         return z_item
diff --git a/worlds/zillion/item.py b/worlds/zillion/item.py
index fdf0fa8ba247..5fa481ac36d2 100644
--- a/worlds/zillion/item.py
+++ b/worlds/zillion/item.py
@@ -1,6 +1,34 @@
+from typing import Counter
 from BaseClasses import Item, ItemClassification as IC
 from zilliandomizer.logic_components.items import Item as ZzItem
 
+_useful_thresholds = {
+    "Apple": 9999,
+    "Champ": 9999,
+    "JJ": 9999,
+    "Win": 9999,
+    "Empty": 0,
+    "ID Card": 10,
+    "Red ID Card": 2,
+    "Floppy Disk": 7,
+    "Bread": 0,
+    "Opa-Opa": 20,
+    "Zillion": 8,
+    "Scope": 8,
+}
+""" make the item useful if the number in the item pool is below this number """
+
+
+def get_classification(name: str, zz_item: ZzItem, item_counts: Counter[str]) -> IC:
+    classification = IC.filler
+    if zz_item.required:
+        classification = IC.progression
+        if not zz_item.is_progression:
+            classification = IC.progression_skip_balancing
+    if item_counts[name] < _useful_thresholds.get(name, 0):
+        classification |= IC.useful
+    return classification
+
 
 class ZillionItem(Item):
     game = "Zillion"

From ca8ffe583d019c9a82928757263e5daee4cafbd3 Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:31:09 -0800
Subject: [PATCH 295/381] Zillion: Priority Dead Ends Feature (#4220)

---
 worlds/zillion/__init__.py         | 14 ++++++++++++++
 worlds/zillion/options.py          | 15 +++++++++++++++
 worlds/zillion/requirements.txt    |  2 +-
 worlds/zillion/test/TestOptions.py | 17 ++++++++++++++++-
 4 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index 58f513ba6fb5..d0064b9cb1b4 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -24,6 +24,7 @@
 from zilliandomizer.system import System
 from zilliandomizer.logic_components.items import RESCUE, items as zz_items, Item as ZzItem
 from zilliandomizer.logic_components.locations import Location as ZzLocation, Req
+from zilliandomizer.map_gen.region_maker import DEAD_END_SUFFIX
 from zilliandomizer.options import Chars
 
 from worlds.AutoWorld import World, WebWorld
@@ -172,6 +173,7 @@ def create_regions(self) -> None:
         self.logic_cache = logic_cache
         w = self.multiworld
         self.my_locations = []
+        dead_end_locations: list[ZillionLocation] = []
 
         self.zz_system.randomizer.place_canister_gun_reqs()
         # low probability that place_canister_gun_reqs() results in empty 1st sphere
@@ -224,6 +226,16 @@ def access_rule_wrapped(zz_loc_local: ZzLocation,
                     here.locations.append(loc)
                     self.my_locations.append(loc)
 
+                    if ((
+                        zz_here.name.endswith(DEAD_END_SUFFIX)
+                    ) or (
+                        (self.options.map_gen.value != self.options.map_gen.option_full) and
+                        (loc.name in self.options.priority_dead_ends.vanilla_dead_ends)
+                    ) or (
+                        loc.name in self.options.priority_dead_ends.always_dead_ends
+                    )):
+                        dead_end_locations.append(loc)
+
             for zz_dest in zz_here.connections.keys():
                 dest_name = "Menu" if zz_dest.name == "start" else zz_reg_name_to_reg_name(zz_dest.name)
                 dest = all_regions[dest_name]
@@ -233,6 +245,8 @@ def access_rule_wrapped(zz_loc_local: ZzLocation,
 
                 queue.append(zz_dest)
             done.add(here.name)
+        if self.options.priority_dead_ends.value:
+            self.options.priority_locations.value |= {loc.name for loc in dead_end_locations}
 
     @override
     def create_items(self) -> None:
diff --git a/worlds/zillion/options.py b/worlds/zillion/options.py
index 22a698472265..13f3d43ab07f 100644
--- a/worlds/zillion/options.py
+++ b/worlds/zillion/options.py
@@ -272,6 +272,20 @@ def zz_value(self) -> Literal["none", "rooms", "full"]:
         return "full"
 
 
+class ZillionPriorityDeadEnds(DefaultOnToggle):
+    """
+    Single locations that are in a dead end behind a door
+    (example: vanilla Apple location)
+    are prioritized for progression items.
+    """
+    display_name = "priority dead ends"
+
+    vanilla_dead_ends: ClassVar = frozenset(("E-5 top far right", "J-4 top left"))
+    """ dead ends when not generating these rooms """
+    always_dead_ends: ClassVar = frozenset(("A-6 top right",))
+    """ dead ends in rooms that never get generated """
+
+
 @dataclass
 class ZillionOptions(PerGameCommonOptions):
     continues: ZillionContinues
@@ -293,6 +307,7 @@ class ZillionOptions(PerGameCommonOptions):
     skill: ZillionSkill
     starting_cards: ZillionStartingCards
     map_gen: ZillionMapGen
+    priority_dead_ends: ZillionPriorityDeadEnds
 
     room_gen: Removed
 
diff --git a/worlds/zillion/requirements.txt b/worlds/zillion/requirements.txt
index d6b01ac107ae..4f79626c9a50 100644
--- a/worlds/zillion/requirements.txt
+++ b/worlds/zillion/requirements.txt
@@ -1,2 +1,2 @@
-zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@33045067f626266850f91c8045b9d3a9f52d02b0#0.9.0
+zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@96d9a20f8278cee64bb4db859fbd874e0f332d36#0.9.1
 typing-extensions>=4.7, <5
diff --git a/worlds/zillion/test/TestOptions.py b/worlds/zillion/test/TestOptions.py
index 3820c32dd016..904063fd3cd8 100644
--- a/worlds/zillion/test/TestOptions.py
+++ b/worlds/zillion/test/TestOptions.py
@@ -1,6 +1,7 @@
 from . import ZillionTestBase
 
-from ..options import ZillionJumpLevels, ZillionGunLevels, ZillionOptions, validate
+from .. import ZillionWorld
+from ..options import ZillionJumpLevels, ZillionGunLevels, ZillionOptions, ZillionPriorityDeadEnds, validate
 from zilliandomizer.options import VBLR_CHOICES
 
 
@@ -28,3 +29,17 @@ def test_vblr_ap_to_zz(self) -> None:
                 assert getattr(zz_options, option_name) in VBLR_CHOICES
 
     # TODO: test validate with invalid combinations of options
+
+
+class DeadEndsTest(ZillionTestBase):
+    def test_vanilla_dead_end_names(self) -> None:
+        z_world = self.multiworld.worlds[1]
+        assert isinstance(z_world, ZillionWorld)
+        for loc_name in ZillionPriorityDeadEnds.vanilla_dead_ends:
+            assert any(loc.name == loc_name for loc in z_world.my_locations), f"{loc_name=} {z_world.my_locations=}"
+
+    def test_always_dead_end_names(self) -> None:
+        z_world = self.multiworld.worlds[1]
+        assert isinstance(z_world, ZillionWorld)
+        for loc_name in ZillionPriorityDeadEnds.always_dead_ends:
+            assert any(loc.name == loc_name for loc in z_world.my_locations), f"{loc_name=} {z_world.my_locations=}"

From 130232b45707be8d9b8d7570344a8c3700d0f87b Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Mon, 20 Jan 2025 01:56:37 +0100
Subject: [PATCH 296/381] Core: Make log time an optional arg & setting for
 Generate.py as well #4312

---
 Generate.py | 6 ++++--
 settings.py | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Generate.py b/Generate.py
index d6611b0f8a31..b057db25a311 100644
--- a/Generate.py
+++ b/Generate.py
@@ -42,7 +42,9 @@ def mystery_argparse():
                         help="Path to output folder. Absolute or relative to cwd.")  # absolute or relative to cwd
     parser.add_argument('--race', action='store_true', default=defaults.race)
     parser.add_argument('--meta_file_path', default=defaults.meta_file_path)
-    parser.add_argument('--log_level', default='info', help='Sets log level')
+    parser.add_argument('--log_level', default=defaults.loglevel, help='Sets log level')
+    parser.add_argument('--log_time', help="Add timestamps to STDOUT",
+                        default=defaults.logtime, action='store_true')
     parser.add_argument("--csv_output", action="store_true",
                         help="Output rolled player options to csv (made for async multiworld).")
     parser.add_argument("--plando", default=defaults.plando_options,
@@ -75,7 +77,7 @@ def main(args=None) -> Tuple[argparse.Namespace, int]:
 
     seed = get_seed(args.seed)
 
-    Utils.init_logging(f"Generate_{seed}", loglevel=args.log_level)
+    Utils.init_logging(f"Generate_{seed}", loglevel=args.log_level, add_timestamp=args.log_time)
     random.seed(seed)
     seed_name = get_seed_name(random)
 
diff --git a/settings.py b/settings.py
index 04d8760c3cd3..12dace632c8a 100644
--- a/settings.py
+++ b/settings.py
@@ -678,6 +678,8 @@ class PanicMethod(str):
     race: Race = Race(0)
     plando_options: PlandoOptions = PlandoOptions("bosses, connections, texts")
     panic_method: PanicMethod = PanicMethod("swap")
+    loglevel: str = "info"
+    logtime: bool = False
 
 
 class SNIOptions(Group):

From 39847c55027117e43d44bd034585e21b79d4ed20 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Mon, 20 Jan 2025 02:05:07 +0100
Subject: [PATCH 297/381] WebHost: sort slots by player_id in api blueprint
 (#4354)

---
 WebHostLib/api/__init__.py | 4 ++--
 WebHostLib/api/user.py     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebHostLib/api/__init__.py b/WebHostLib/api/__init__.py
index cf05e87374ab..d0b9d05c16b8 100644
--- a/WebHostLib/api/__init__.py
+++ b/WebHostLib/api/__init__.py
@@ -3,13 +3,13 @@
 
 from flask import Blueprint
 
-from ..models import Seed
+from ..models import Seed, Slot
 
 api_endpoints = Blueprint('api', __name__, url_prefix="/api")
 
 
 def get_players(seed: Seed) -> List[Tuple[str, str]]:
-    return [(slot.player_name, slot.game) for slot in seed.slots]
+    return [(slot.player_name, slot.game) for slot in seed.slots.order_by(Slot.player_id)]
 
 
 from . import datapackage, generate, room, user  # trigger registration
diff --git a/WebHostLib/api/user.py b/WebHostLib/api/user.py
index 116d3afa2288..0ddb6fe83ed8 100644
--- a/WebHostLib/api/user.py
+++ b/WebHostLib/api/user.py
@@ -30,4 +30,4 @@ def get_seeds():
             "creation_time": seed.creation_time,
             "players": get_players(seed.slots),
         })
-    return jsonify(response)
\ No newline at end of file
+    return jsonify(response)

From eb3c3d6bf2fb9b161723c7e7ae2990ab0ab7b6bd Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Sun, 19 Jan 2025 20:12:44 -0500
Subject: [PATCH 298/381] FFMQ: Adds Items Accessibility (#4322)

---
 worlds/ffmq/Options.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/worlds/ffmq/Options.py b/worlds/ffmq/Options.py
index 41c397315f87..4dcf1467d6d7 100644
--- a/worlds/ffmq/Options.py
+++ b/worlds/ffmq/Options.py
@@ -1,4 +1,4 @@
-from Options import Choice, FreeText, Toggle, Range, PerGameCommonOptions
+from Options import Choice, FreeText, ItemsAccessibility, Toggle, Range, PerGameCommonOptions
 from dataclasses import dataclass
 
 
@@ -324,6 +324,7 @@ class KaelisMomFightsMinotaur(Toggle):
 
 @dataclass
 class FFMQOptions(PerGameCommonOptions):
+    accessibility: ItemsAccessibility
     logic: Logic
     brown_boxes: BrownBoxes
     sky_coin_mode: SkyCoinMode

From 992841a951d71bbee05e28655e587567ab9555ca Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sun, 19 Jan 2025 20:18:36 -0500
Subject: [PATCH 299/381] CommonClient: abstract url handling so it's
 importable  (#4068)

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
Co-authored-by: Jouramie <16137441+Jouramie@users.noreply.github.com>
---
 CommonClient.py | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/CommonClient.py b/CommonClient.py
index b43bf57d1985..f6b2623f8c02 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -31,6 +31,7 @@
 
 if typing.TYPE_CHECKING:
     import kvui
+    import argparse
 
 logger = logging.getLogger("Client")
 
@@ -1048,6 +1049,32 @@ def get_base_parser(description: typing.Optional[str] = None):
     return parser
 
 
+def handle_url_arg(args: "argparse.Namespace",
+                   parser: "typing.Optional[argparse.ArgumentParser]" = None) -> "argparse.Namespace":
+    """
+    Parse the url arg "archipelago://name:pass@host:port" from launcher into correct launch args for CommonClient
+    If alternate data is required the urlparse response is saved back to args.url if valid
+    """
+    if not args.url:
+        return args
+        
+    url = urllib.parse.urlparse(args.url)
+    if url.scheme != "archipelago":
+        if not parser:
+            parser = get_base_parser()
+        parser.error(f"bad url, found {args.url}, expected url in form of archipelago://archipelago.gg:38281")
+        return args
+
+    args.url = url
+    args.connect = url.netloc
+    if url.username:
+        args.name = urllib.parse.unquote(url.username)
+    if url.password:
+        args.password = urllib.parse.unquote(url.password)
+
+    return args
+
+
 def run_as_textclient(*args):
     class TextContext(CommonContext):
         # Text Mode to use !hint and such with games that have no text entry
@@ -1089,17 +1116,7 @@ async def main(args):
     parser.add_argument("url", nargs="?", help="Archipelago connection url")
     args = parser.parse_args(args)
 
-    # handle if text client is launched using the "archipelago://name:pass@host:port" url from webhost
-    if args.url:
-        url = urllib.parse.urlparse(args.url)
-        if url.scheme == "archipelago":
-            args.connect = url.netloc
-            if url.username:
-                args.name = urllib.parse.unquote(url.username)
-            if url.password:
-                args.password = urllib.parse.unquote(url.password)
-        else:
-            parser.error(f"bad url, found {args.url}, expected url in form of archipelago://archipelago.gg:38281")
+    args = handle_url_arg(args, parser=parser)
 
     # use colorama to display colored text highlighting on windows
     colorama.init()

From 4fa8c432666039ec7cd82e88ba2fd29a62bacbd9 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Sun, 19 Jan 2025 23:06:09 -0500
Subject: [PATCH 300/381] FFMQ: Fix collect_item (#4433)

* Fix FFMQ collect_item
---
 worlds/ffmq/__init__.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/worlds/ffmq/__init__.py b/worlds/ffmq/__init__.py
index 3c58487265a6..58dc4bf13ebd 100644
--- a/worlds/ffmq/__init__.py
+++ b/worlds/ffmq/__init__.py
@@ -152,14 +152,23 @@ def create_item(self, name: str):
         return FFMQItem(name, self.player)
 
     def collect_item(self, state, item, remove=False):
+        if not item.advancement:
+            return None
         if "Progressive" in item.name:
             i = item.code - 256
+            if remove:
+                if state.has(self.item_id_to_name[i+1], self.player):
+                    if state.has(self.item_id_to_name[i+2], self.player):
+                        return self.item_id_to_name[i+2]
+                    return self.item_id_to_name[i+1]
+                return self.item_id_to_name[i]
+
             if state.has(self.item_id_to_name[i], self.player):
                 if state.has(self.item_id_to_name[i+1], self.player):
                     return self.item_id_to_name[i+2]
                 return self.item_id_to_name[i+1]
             return self.item_id_to_name[i]
-        return item.name if item.advancement else None
+        return item.name
 
     def modify_multidata(self, multidata):
         # wait for self.rom_name to be available.

From a2fbf856ff1f6d274468b879521c72f78762aa3a Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Sun, 19 Jan 2025 23:07:01 -0500
Subject: [PATCH 301/381] SMZ3: Change locality options earlier (#4424)

---
 worlds/smz3/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index 7ebec7d4e4be..dca105b16283 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -217,6 +217,10 @@ def generate_early(self):
         SMZ3World.location_names = frozenset(self.smz3World.locationLookup.keys())
 
         self.multiworld.state.smz3state[self.player] = TotalSMZ3Item.Progression([])
+
+        if not self.smz3World.Config.Keysanity:
+            # Dungeons items here are not in the itempool and will be prefilled locally so they must stay local
+            self.options.non_local_items.value -= frozenset(item_name for item_name in self.item_names if TotalSMZ3Item.Item.IsNameDungeonItem(item_name))
     
     def create_items(self):
         self.dungeon = TotalSMZ3Item.Item.CreateDungeonPool(self.smz3World)
@@ -233,8 +237,6 @@ def create_items(self):
             progressionItems = self.progression + self.dungeon + self.keyCardsItems + self.SmMapsItems
         else:
             progressionItems = self.progression
-            # Dungeons items here are not in the itempool and will be prefilled locally so they must stay local
-            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))
 

From d5cd95c7fba516480d303df3a842bffd98d70ff4 Mon Sep 17 00:00:00 2001
From: massimilianodelliubaldini
 <8584296+massimilianodelliubaldini@users.noreply.github.com>
Date: Mon, 20 Jan 2025 03:01:45 -0500
Subject: [PATCH 302/381] Docs: Clarify usage of slot data for trackers in
 World API doc (#3986)

* Clarify usage of slot data for trackers in world API.

* Typo.

* Update docs/world api.md

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

* Update docs/world api.md

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

* Update docs/world api.md

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>

* Update docs/world api.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Keep to 120 char lines.

---------

Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 docs/world api.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/world api.md b/docs/world api.md
index 487c5b4a360c..762189a90842 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -835,14 +835,16 @@ def generate_output(self, output_directory: str) -> None:
 
 ### Slot Data
 
-If the game client needs to know information about the generated seed, a preferred method of transferring the data
-is through the slot data. This is filled with the `fill_slot_data` method of your world by returning
-a `dict` with `str` keys that can be serialized with json.
-But, to not waste resources, it should be limited to data that is absolutely necessary. Slot data is sent to your client
-once it has successfully [connected](network%20protocol.md#connected).
+If a client or tracker needs to know information about the generated seed, a preferred method of transferring the data 
+is through the slot data. This is filled with the `fill_slot_data` method of your world by returning a `dict` with 
+`str` keys that can be serialized with json. However, to not waste resources, it should be limited to data that is 
+absolutely necessary. Slot data is sent to your client once it has successfully 
+[connected](network%20protocol.md#connected).
+
 If you need to know information about locations in your world, instead of propagating the slot data, it is preferable
-to use [LocationScouts](network%20protocol.md#locationscouts), since that data already exists on the server. The most
-common usage of slot data is sending option results that the client needs to be aware of.
+to use [LocationScouts](network%20protocol.md#locationscouts), since that data already exists on the server. Adding 
+item/location pairs is unnecessary since the AP server already retains and freely gives that information to clients 
+that request it. The most common usage of slot data is sending option results that the client needs to be aware of.
 
 ```python
 def fill_slot_data(self) -> Dict[str, Any]:

From 4f77abac4f567048d909a049004d03aa303c043c Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Mon, 20 Jan 2025 09:53:30 -0500
Subject: [PATCH 303/381] TUNIC: Fix failure in 1-player grass (#4520)

* Fix failure in 1-player grass

* Update worlds/tunic/__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/tunic/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 388a44113a82..1394c11c9036 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -411,7 +411,7 @@ def pre_fill(self) -> None:
     def stage_pre_fill(cls, multiworld: MultiWorld) -> None:
         tunic_fill_worlds: List[TunicWorld] = [world for world in multiworld.get_game_worlds("TUNIC")
                                                if world.options.local_fill.value > 0]
-        if tunic_fill_worlds:
+        if tunic_fill_worlds and multiworld.players > 1:
             grass_fill: List[TunicItem] = []
             non_grass_fill: List[TunicItem] = []
             grass_fill_locations: List[Location] = []

From 96f469c73792199f84fe3128244c0dfa73331df4 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Mon, 20 Jan 2025 10:04:39 -0500
Subject: [PATCH 304/381] TUNIC: Fix hero relics not being prog if hex quest is
 on in combat logic #4509

---
 worlds/tunic/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 1394c11c9036..96d3c10b82d1 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -331,10 +331,11 @@ def remove_filler(amount: int) -> None:
 
             remove_filler(items_to_create[gold_hexagon])
 
-            # Sort for deterministic order
-            for hero_relic in sorted(item_name_groups["Hero Relics"]):
-                tunic_items.append(self.create_item(hero_relic, ItemClassification.useful))
-                items_to_create[hero_relic] = 0
+            if not self.options.combat_logic:
+                # Sort for deterministic order
+                for hero_relic in sorted(item_name_groups["Hero Relics"]):
+                    tunic_items.append(self.create_item(hero_relic, ItemClassification.useful))
+                    items_to_create[hero_relic] = 0
 
         if not self.options.ability_shuffling:
             # Sort for deterministic order

From 436c0a41048f6f10084387e61f73995381808eed Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:07:15 +0100
Subject: [PATCH 305/381] Core: Add connect_entrances world step/stage (#4420)

* Add connect_entrances

* update ER docs

* fix that test, but also ew

* Add a test that asserts the new finalization

* Rewrite test a bit

* rewrite some more

* blank line

* rewrite rewrite rewrite

* rewrite rewrite rewrite

* RE. WRITE.

* oops

* Bruh

* I guess, while we're at it

* giga oops

* It's been a long day

* Switch KH1 over to this design with permission of GICU

* Revert

* Oops

* Bc I like it

* Update locations.py
---
 Main.py                           |  3 ++-
 docs/entrance randomization.md    | 20 ++++++-----------
 docs/world api.md                 |  3 +++
 test/benchmark/locations.py       | 10 ++++++++-
 test/general/__init__.py          | 10 ++++++++-
 test/general/test_entrances.py    | 36 +++++++++++++++++++++++++++++++
 test/general/test_items.py        |  4 ++--
 test/general/test_locations.py    |  6 ++++++
 test/general/test_reachability.py |  4 ++--
 worlds/AutoWorld.py               |  4 ++++
 worlds/kh1/Regions.py             |  3 +++
 worlds/kh1/__init__.py            |  5 ++++-
 12 files changed, 87 insertions(+), 21 deletions(-)
 create mode 100644 test/general/test_entrances.py

diff --git a/Main.py b/Main.py
index d105bd4ad0e5..d0e7a7f8793d 100644
--- a/Main.py
+++ b/Main.py
@@ -148,7 +148,8 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
     else:
         multiworld.worlds[1].options.non_local_items.value = set()
         multiworld.worlds[1].options.local_items.value = set()
-    
+
+    AutoWorld.call_all(multiworld, "connect_entrances")
     AutoWorld.call_all(multiworld, "generate_basic")
 
     # remove starting inventory from pool items.
diff --git a/docs/entrance randomization.md b/docs/entrance randomization.md
index 9e3e281bcc31..0f9d76471635 100644
--- a/docs/entrance randomization.md	
+++ b/docs/entrance randomization.md	
@@ -370,19 +370,13 @@ target_group_lookup = bake_target_group_lookup(world, get_target_groups)
 
 #### When to call `randomize_entrances`
 
-The short answer is that you will almost always want to do ER in `pre_fill`. For more information why, continue reading.
-
-ER begins by collecting the entire item pool and then uses your access rules to try and prevent some kinds of failures. 
-This means 2 things about when you can call ER:
-1. You must supply your item pool before calling ER, or call ER before setting any rules which require items.
-2. If you have rules dependent on anything other than items (e.g. `Entrance`s or events), you must set your rules
-   and create your events before you call ER if you want to guarantee a correct output.
-
-If the conditions above are met, you could theoretically do ER as early as `create_regions`. However, plando is also 
-a consideration. Since item plando happens between `set_rules` and `pre_fill` and modifies the item pool, doing ER 
-in `pre_fill` is the only way to account for placements made by item plando, otherwise you risk impossible seeds or 
-generation failures. Obviously, if your world implements entrance plando, you will likely want to do that before ER as
-well.
+The correct step for this is `World.connect_entrances`.
+
+Currently, you could theoretically do it as early as `World.create_regions` or as late as `pre_fill`.
+However, there are upcoming changes to Item Plando and Generic Entrance Randomizer to make the two features work better
+together.
+These changes necessitate that entrance randomization is done exactly in `World.connect_entrances`.
+It is fine for your Entrances to be connected differently or not at all before this step.
 
 #### Informing your client about randomized entrances
 
diff --git a/docs/world api.md b/docs/world api.md
index 762189a90842..90fe446d6176 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -490,6 +490,9 @@ In addition, the following methods can be implemented and are called in this ord
   after this step. Locations cannot be moved to different regions after this step.
 * `set_rules(self)`
   called to set access and item rules on locations and entrances.
+* `connect_entrances(self)`
+  by the end of this step, all entrances must exist and be connected to their source and target regions.
+  Entrance randomization should be done here.
 * `generate_basic(self)`
   player-specific randomization that does not affect logic can be done here.
 * `pre_fill(self)`, `fill_hook(self)` and `post_fill(self)`
diff --git a/test/benchmark/locations.py b/test/benchmark/locations.py
index f2209eb689e1..857e1882368b 100644
--- a/test/benchmark/locations.py
+++ b/test/benchmark/locations.py
@@ -18,7 +18,15 @@ def run_locations_benchmark():
 
     class BenchmarkRunner:
         gen_steps: typing.Tuple[str, ...] = (
-            "generate_early", "create_regions", "create_items", "set_rules", "generate_basic", "pre_fill")
+            "generate_early",
+            "create_regions",
+            "create_items",
+            "set_rules",
+            "connect_entrances",
+            "generate_basic",
+            "pre_fill",
+        )
+
         rule_iterations: int = 100_000
 
         if sys.version_info >= (3, 9):
diff --git a/test/general/__init__.py b/test/general/__init__.py
index 8afd84976540..6c4d5092cf13 100644
--- a/test/general/__init__.py
+++ b/test/general/__init__.py
@@ -5,7 +5,15 @@
 from worlds import network_data_package
 from worlds.AutoWorld import World, call_all
 
-gen_steps = ("generate_early", "create_regions", "create_items", "set_rules", "generate_basic", "pre_fill")
+gen_steps = (
+    "generate_early",
+    "create_regions",
+    "create_items",
+    "set_rules",
+    "connect_entrances",
+    "generate_basic",
+    "pre_fill",
+)
 
 
 def setup_solo_multiworld(
diff --git a/test/general/test_entrances.py b/test/general/test_entrances.py
new file mode 100644
index 000000000000..72161dfbdebc
--- /dev/null
+++ b/test/general/test_entrances.py
@@ -0,0 +1,36 @@
+import unittest
+from worlds.AutoWorld import AutoWorldRegister, call_all, World
+from . import setup_solo_multiworld
+
+
+class TestBase(unittest.TestCase):
+    def test_entrance_connection_steps(self):
+        """Tests that Entrances are connected and not changed after connect_entrances."""
+        def get_entrance_name_to_source_and_target_dict(world: World):
+            return [
+                (entrance.name, entrance.parent_region, entrance.connected_region)
+                for entrance in world.get_entrances()
+            ]
+
+        gen_steps = ("generate_early", "create_regions", "create_items", "set_rules", "connect_entrances")
+        additional_steps = ("generate_basic", "pre_fill")
+
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest("Game", game_name=game_name):
+                multiworld = setup_solo_multiworld(world_type, gen_steps)
+
+                original_entrances = get_entrance_name_to_source_and_target_dict(multiworld.worlds[1])
+
+                self.assertTrue(
+                    all(entrance[1] is not None and entrance[2] is not None for entrance in original_entrances),
+                    f"{game_name} had unconnected entrances after connect_entrances"
+                )
+
+                for step in additional_steps:
+                    with self.subTest("Step", step=step):
+                        call_all(multiworld, step)
+                        step_entrances = get_entrance_name_to_source_and_target_dict(multiworld.worlds[1])
+
+                        self.assertEqual(
+                            original_entrances, step_entrances, f"{game_name} modified entrances during {step}"
+                        )
diff --git a/test/general/test_items.py b/test/general/test_items.py
index 64ce1b6997b7..91d334e9687a 100644
--- a/test/general/test_items.py
+++ b/test/general/test_items.py
@@ -67,7 +67,7 @@ def test_items_in_datapackage(self):
     def test_itempool_not_modified(self):
         """Test that worlds don't modify the itempool after `create_items`"""
         gen_steps = ("generate_early", "create_regions", "create_items")
-        additional_steps = ("set_rules", "generate_basic", "pre_fill")
+        additional_steps = ("set_rules", "connect_entrances", "generate_basic", "pre_fill")
         excluded_games = ("Links Awakening DX", "Ocarina of Time", "SMZ3")
         worlds_to_test = {game: world
                           for game, world in AutoWorldRegister.world_types.items() if game not in excluded_games}
@@ -84,7 +84,7 @@ def test_itempool_not_modified(self):
     def test_locality_not_modified(self):
         """Test that worlds don't modify the locality of items after duplicates are resolved"""
         gen_steps = ("generate_early", "create_regions", "create_items")
-        additional_steps = ("set_rules", "generate_basic", "pre_fill")
+        additional_steps = ("set_rules", "connect_entrances", "generate_basic", "pre_fill")
         worlds_to_test = {game: world for game, world in AutoWorldRegister.world_types.items()}
         for game_name, world_type in worlds_to_test.items():
             with self.subTest("Game", game=game_name):
diff --git a/test/general/test_locations.py b/test/general/test_locations.py
index 4b95ebd22c90..37ae94e00328 100644
--- a/test/general/test_locations.py
+++ b/test/general/test_locations.py
@@ -45,6 +45,12 @@ def test_location_creation_steps(self):
                 self.assertEqual(location_count, len(multiworld.get_locations()),
                                  f"{game_name} modified locations count during rule creation")
 
+                call_all(multiworld, "connect_entrances")
+                self.assertEqual(region_count, len(multiworld.get_regions()),
+                                 f"{game_name} modified region count during rule creation")
+                self.assertEqual(location_count, len(multiworld.get_locations()),
+                                 f"{game_name} modified locations count during rule creation")
+
                 call_all(multiworld, "generate_basic")
                 self.assertEqual(region_count, len(multiworld.get_regions()),
                                  f"{game_name} modified region count during generate_basic")
diff --git a/test/general/test_reachability.py b/test/general/test_reachability.py
index fafa7023893c..b45a2bdfc0ef 100644
--- a/test/general/test_reachability.py
+++ b/test/general/test_reachability.py
@@ -2,11 +2,11 @@
 
 from BaseClasses import CollectionState
 from worlds.AutoWorld import AutoWorldRegister
-from . import setup_solo_multiworld
+from . import setup_solo_multiworld, gen_steps
 
 
 class TestBase(unittest.TestCase):
-    gen_steps = ["generate_early", "create_regions", "create_items", "set_rules", "generate_basic", "pre_fill"]
+    gen_steps = gen_steps
 
     default_settings_unreachable_regions = {
         "A Link to the Past": {
diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py
index a51071792079..0fcacc8ab317 100644
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -378,6 +378,10 @@ def set_rules(self) -> None:
         """Method for setting the rules on the World's regions and locations."""
         pass
 
+    def connect_entrances(self) -> None:
+        """Method to finalize the source and target regions of the World's entrances"""
+        pass
+
     def generate_basic(self) -> None:
         """
         Useful for randomizing things that don't affect logic but are better to be determined before the output stage.
diff --git a/worlds/kh1/Regions.py b/worlds/kh1/Regions.py
index a6f85fe617cb..6189adf2072c 100644
--- a/worlds/kh1/Regions.py
+++ b/worlds/kh1/Regions.py
@@ -483,6 +483,8 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     for name, data in regions.items():
         multiworld.regions.append(create_region(multiworld, player, name, data))
 
+
+def connect_entrances(multiworld: MultiWorld, player: int):
     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))
@@ -500,6 +502,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     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:
diff --git a/worlds/kh1/__init__.py b/worlds/kh1/__init__.py
index 63b457556894..3b498acf4670 100644
--- a/worlds/kh1/__init__.py
+++ b/worlds/kh1/__init__.py
@@ -6,7 +6,7 @@
 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 .Regions import connect_entrances, create_regions
 from .Rules import set_rules
 from .Presets import kh1_option_presets
 from worlds.LauncherComponents import Component, components, Type, launch_subprocess
@@ -242,6 +242,9 @@ def set_rules(self):
 
     def create_regions(self):
         create_regions(self.multiworld, self.player, self.options)
+
+    def connect_entrances(self):
+        connect_entrances(self.multiworld, self.player)
     
     def generate_early(self):
         value_names = ["Reports to Open End of the World", "Reports to Open Final Rest Door", "Reports in Pool"]

From 05d1b2129a9bdef4709f5a5b892324faa5c6b3bd Mon Sep 17 00:00:00 2001
From: "Chris J." <greatnessof42@gmail.com>
Date: Mon, 20 Jan 2025 11:18:09 -0500
Subject: [PATCH 306/381] Docs: Update ID Overlapping Docs (#4447)

---
 docs/world api.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/world api.md b/docs/world api.md
index 90fe446d6176..da74be70fb91 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -222,8 +222,8 @@ could also be progress in a research tree, or even something more abstract like
 
 Each location has a `name` and an `address` (hereafter referred to as an `id`), is placed in a Region, has access rules,
 and has a classification. The name needs to be unique within each game and must not be numeric (must contain least 1
-letter or symbol). The ID needs to be unique across all games, and is best kept in the same range as the item IDs.
-Locations and items can share IDs, so typically a game's locations and items start at the same ID.
+letter or symbol). The ID needs to be unique across all locations within the game. 
+Locations and items can share IDs, and locations can share IDs with other games' locations.
 
 World-specific IDs must be in the range 1 to 2<sup>53</sup>-1; IDs ≤ 0 are global and reserved.
 
@@ -243,7 +243,9 @@ progression. Progression items will be assigned to locations with higher priorit
 and satisfy progression balancing.
 
 The name needs to be unique within each game, meaning if you need to create multiple items with the same name, they
-will all have the same ID. Name must not be numeric (must contain at least 1 letter or symbol).
+will all have the same ID. Name must not be numeric (must contain at least 1 letter or symbol). 
+The ID thus also needs to be unique across all items with different names within the game. 
+Items and locations can share IDs, and items can share IDs with other games' items.
 
 Other classifications include:
 

From 823b17c386f1dce27e537e1c0263b0bc8670c377 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Mon, 20 Jan 2025 11:44:39 -0500
Subject: [PATCH 307/381] TUNIC: Make grass go in the regular location name
 group too (#4504)

* Make grass go in the normal loc group too

* Make it not overwrite old groups
---
 worlds/tunic/__init__.py | 3 ++-
 worlds/tunic/grass.py    | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 96d3c10b82d1..087e17c3e473 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -78,7 +78,8 @@ class TunicWorld(World):
     settings: ClassVar[TunicSettings]
     item_name_groups = item_name_groups
     location_name_groups = location_name_groups
-    location_name_groups.update(grass_location_name_groups)
+    for group_name, members in grass_location_name_groups.items():
+        location_name_groups.setdefault(group_name, set()).update(members)
 
     item_name_to_id = item_name_to_id
     location_name_to_id = standard_location_name_to_id.copy()
diff --git a/worlds/tunic/grass.py b/worlds/tunic/grass.py
index 592b2938b118..eb688199dcef 100644
--- a/worlds/tunic/grass.py
+++ b/worlds/tunic/grass.py
@@ -7767,8 +7767,10 @@ class TunicLocationData(NamedTuple):
 
 grass_location_name_groups: Dict[str, Set[str]] = {}
 for loc_name, loc_data in grass_location_table.items():
-    loc_group_name = loc_name.split(" - ", 1)[0] + " Grass"
-    grass_location_name_groups.setdefault(loc_group_name, set()).add(loc_name)
+    area_name = loc_name.split(" - ", 1)[0]
+    # adding it to the normal location group and a grass-only one
+    grass_location_name_groups.setdefault(area_name, set()).add(loc_name)
+    grass_location_name_groups.setdefault(area_name + " Grass", set()).add(loc_name)
 
 
 def can_break_grass(state: CollectionState, world: "TunicWorld") -> bool:

From e2b942139a5ed1908725812edd52aa479a5d835b Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 20 Jan 2025 13:10:29 -0500
Subject: [PATCH 308/381] HK: Save GrubHuntGoal by value (#4521)

---
 worlds/hk/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index 7e9b7442a746..daf177fb8dc9 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -209,7 +209,7 @@ def generate_early(self):
         # defaulting so completion condition isn't incorrect before pre_fill
         self.grub_count = (
             46 if options.GrubHuntGoal == GrubHuntGoal.special_range_names["all"]
-            else options.GrubHuntGoal
+            else options.GrubHuntGoal.value
             )
         self.grub_player_count = {self.player: self.grub_count}
 

From a126dee06824d3fee890eecfbf8a5d4870261e67 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 20 Jan 2025 17:42:12 -0500
Subject: [PATCH 309/381] HK: some stuff ruff and pycodestyle complained about
 (#4523)

---
 worlds/hk/Options.py              |  2 +-
 worlds/hk/__init__.py             | 52 ++++++++++++++++---------------
 worlds/hk/test/__init__.py        |  1 -
 worlds/hk/test/test_grub_count.py |  3 +-
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py
index 53dda96e2b53..e76e7eba9d16 100644
--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -333,7 +333,7 @@ def __init__(self, value):
                     continue
             try:
                 self.value[key] = CharmCost.from_any(data).value
-            except ValueError as ex:
+            except ValueError:
                 # will fail schema afterwords
                 self.value[key] = data
 
diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index daf177fb8dc9..4a0da109fa18 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -7,22 +7,22 @@
 import operator
 from collections import defaultdict, Counter
 
-logger = logging.getLogger("Hollow Knight")
-
-from .Items import item_table, lookup_type_to_names, item_name_groups
-from .Regions import create_regions
+from .Items import item_table, item_name_groups
 from .Rules import set_rules, cost_terms, _hk_can_beat_thk, _hk_siblings_ending, _hk_can_beat_radiance
 from .Options import hollow_knight_options, hollow_knight_randomize_options, Goal, WhitePalace, CostSanity, \
     shop_to_option, HKOptions, GrubHuntGoal
-from .ExtractedData import locations, starts, multi_locations, location_to_region_lookup, \
-    event_names, item_effects, connectors, one_ways, vanilla_shop_costs, vanilla_location_costs
+from .ExtractedData import locations, starts, multi_locations, event_names, item_effects, connectors, \
+    vanilla_shop_costs, vanilla_location_costs
 from .Charms import names as charm_names
 
-from BaseClasses import Region, Location, MultiWorld, Item, LocationProgressType, Tutorial, ItemClassification, CollectionState
+from BaseClasses import Region, Location, MultiWorld, Item, LocationProgressType, Tutorial, ItemClassification, \
+    CollectionState
 from worlds.AutoWorld import World, LogicMixin, WebWorld
 
 from settings import Group, Bool
 
+logger = logging.getLogger("Hollow Knight")
+
 
 class HollowKnightSettings(Group):
     class DisableMapModSpoilers(Bool):
@@ -160,7 +160,7 @@ class HKWeb(WebWorld):
 
 
 class HKWorld(World):
-    """Beneath the fading town of Dirtmouth sleeps a vast, ancient kingdom. Many are drawn beneath the surface, 
+    """Beneath the fading town of Dirtmouth sleeps a vast, ancient kingdom. Many are drawn beneath the surface,
     searching for riches, or glory, or answers to old secrets.
 
     As the enigmatic Knight, you’ll traverse the depths, unravel its mysteries and conquer its evils.
@@ -231,7 +231,6 @@ def white_palace_exclusions(self):
     def create_regions(self):
         menu_region: Region = create_region(self.multiworld, self.player, 'Menu')
         self.multiworld.regions.append(menu_region)
-        # wp_exclusions = self.white_palace_exclusions()
 
         # check for any goal that godhome events are relevant to
         all_event_names = event_names.copy()
@@ -241,21 +240,17 @@ def create_regions(self):
 
         # Link regions
         for event_name in sorted(all_event_names):
-            #if event_name in wp_exclusions:
-            #    continue
             loc = HKLocation(self.player, event_name, None, menu_region)
             loc.place_locked_item(HKItem(event_name,
-                                         True, #event_name not in wp_exclusions,
+                                         True,
                                          None, "Event", self.player))
             menu_region.locations.append(loc)
         for entry_transition, exit_transition in connectors.items():
-            #if entry_transition in wp_exclusions:
-            #    continue
             if exit_transition:
                 # if door logic fulfilled -> award vanilla target as event
                 loc = HKLocation(self.player, entry_transition, None, menu_region)
                 loc.place_locked_item(HKItem(exit_transition,
-                                             True, #exit_transition not in wp_exclusions,
+                                             True,
                                              None, "Event", self.player))
                 menu_region.locations.append(loc)
 
@@ -292,7 +287,10 @@ def _add(item_name: str, location_name: str, randomized: bool):
             if item_name in junk_replace:
                 item_name = self.get_filler_item_name()
 
-            item = self.create_item(item_name) if not vanilla or location_name == "Start" or self.options.AddUnshuffledLocations else self.create_event(item_name)
+            item = (self.create_item(item_name)
+                    if not vanilla or location_name == "Start" or self.options.AddUnshuffledLocations
+                    else self.create_event(item_name)
+                    )
 
             if location_name == "Start":
                 if item_name in randomized_starting_items:
@@ -347,8 +345,8 @@ def _add(item_name: str, location_name: str, randomized: bool):
             randomized = True
             _add("Elevator_Pass", "Elevator_Pass", randomized)
 
-        for shop, locations in self.created_multi_locations.items():
-            for _ in range(len(locations), getattr(self.options, shop_to_option[shop]).value):
+        for shop, shop_locations in self.created_multi_locations.items():
+            for _ in range(len(shop_locations), getattr(self.options, shop_to_option[shop]).value):
                 self.create_location(shop)
                 unfilled_locations += 1
 
@@ -358,7 +356,7 @@ def _add(item_name: str, location_name: str, randomized: bool):
 
         # Add additional shop items, as needed.
         if additional_shop_items > 0:
-            shops = list(shop for shop, locations in self.created_multi_locations.items() if len(locations) < 16)
+            shops = [shop for shop, shop_locations in self.created_multi_locations.items() if len(shop_locations) < 16]
             if not self.options.EggShopSlots:  # No eggshop, so don't place items there
                 shops.remove('Egg_Shop')
 
@@ -380,8 +378,8 @@ def _add(item_name: str, location_name: str, randomized: bool):
         self.sort_shops_by_cost()
 
     def sort_shops_by_cost(self):
-        for shop, locations in self.created_multi_locations.items():
-            randomized_locations = list(loc for loc in locations if not loc.vanilla)
+        for shop, shop_locations in self.created_multi_locations.items():
+            randomized_locations = [loc for loc in shop_locations if not loc.vanilla]
             prices = sorted(
                 (loc.costs for loc in randomized_locations),
                 key=lambda costs: (len(costs),) + tuple(costs.values())
@@ -405,7 +403,7 @@ def _compute_weights(weights: dict, desc: str) -> typing.Dict[str, int]:
             return {k: v for k, v in weights.items() if v}
 
         random = self.random
-        hybrid_chance = getattr(self.options, f"CostSanityHybridChance").value
+        hybrid_chance = getattr(self.options, "CostSanityHybridChance").value
         weights = {
             data.term: getattr(self.options, f"CostSanity{data.option}Weight").value
             for data in cost_terms.values()
@@ -493,7 +491,11 @@ def stage_pre_fill(cls, multiworld: "MultiWorld"):
         worlds = [world for world in multiworld.get_game_worlds(cls.game) if world.options.Goal in ["any", "grub_hunt"]]
         if worlds:
             grubs = [item for item in multiworld.get_items() if item.name == "Grub"]
-        all_grub_players = [world.player for world in worlds if world.options.GrubHuntGoal == GrubHuntGoal.special_range_names["all"]]
+        all_grub_players = [
+            world.player
+            for world in worlds
+            if world.options.GrubHuntGoal == GrubHuntGoal.special_range_names["all"]
+            ]
 
         if all_grub_players:
             group_lookup = defaultdict(set)
@@ -668,8 +670,8 @@ def stage_write_spoiler(cls, multiworld: MultiWorld, spoiler_handle):
                 ):
                     spoiler_handle.write(f"\n{loc}: {loc.item} costing {loc.cost_text()}")
             else:
-                for shop_name, locations in hk_world.created_multi_locations.items():
-                    for loc in locations:
+                for shop_name, shop_locations in hk_world.created_multi_locations.items():
+                    for loc in shop_locations:
                         spoiler_handle.write(f"\n{loc}: {loc.item} costing {loc.cost_text()}")
 
     def get_multi_location_name(self, base: str, i: typing.Optional[int]) -> str:
diff --git a/worlds/hk/test/__init__.py b/worlds/hk/test/__init__.py
index c41d20127fcc..67591001a7e5 100644
--- a/worlds/hk/test/__init__.py
+++ b/worlds/hk/test/__init__.py
@@ -2,7 +2,6 @@
 from argparse import Namespace
 from BaseClasses import CollectionState, MultiWorld
 from Options import ItemLinks
-from test.bases import WorldTestBase
 from worlds.AutoWorld import AutoWorldRegister, call_all
 from .. import HKWorld
 
diff --git a/worlds/hk/test/test_grub_count.py b/worlds/hk/test/test_grub_count.py
index dba15b614dd9..a58293c078ed 100644
--- a/worlds/hk/test/test_grub_count.py
+++ b/worlds/hk/test/test_grub_count.py
@@ -1,5 +1,6 @@
-from . import linkedTestHK, WorldTestBase
+from test.bases import WorldTestBase
 from Options import ItemLinks
+from . import linkedTestHK
 
 
 class test_grubcount_limited(linkedTestHK, WorldTestBase):

From 33fd9de281f0d4bbbda5f6134eaa7759a3978cb4 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 20 Jan 2025 18:56:20 -0500
Subject: [PATCH 310/381] Core: Add Retry to Priority Fill (#4477)

* adds a retry to priority fill in case the one item per player optimization would cause the priority fill to fail to find valid placements

* Update Fill.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>
---
 Fill.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Fill.py b/Fill.py
index 0da2d5def978..d1773c82139b 100644
--- a/Fill.py
+++ b/Fill.py
@@ -502,7 +502,13 @@ def mark_for_locking(location: Location):
         # "priority fill"
         fill_restrictive(multiworld, multiworld.state, prioritylocations, progitempool,
                          single_player_placement=single_player, swap=False, on_place=mark_for_locking,
-                         name="Priority", one_item_per_player=False)
+                         name="Priority", one_item_per_player=True, allow_partial=True)
+
+        if prioritylocations:
+            # retry with one_item_per_player off because some priority fills can fail to fill with that optimization
+            fill_restrictive(multiworld, multiworld.state, prioritylocations, progitempool,
+                            single_player_placement=single_player, swap=False, on_place=mark_for_locking,
+                            name="Priority Retry", one_item_per_player=False)
         accessibility_corrections(multiworld, multiworld.state, prioritylocations, progitempool)
         defaultlocations = prioritylocations + defaultlocations
 

From edacb17171478be7b512b61deac520c394e34b3f Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Tue, 21 Jan 2025 16:12:53 +0100
Subject: [PATCH 311/381] Factorio: remove debug print (#4533)

---
 worlds/factorio/__init__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index 8f8abeb292f1..a2bc518ae3fd 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -280,9 +280,6 @@ def set_rules(self):
         self.get_location("Rocket Launch").access_rule = lambda state: all(state.has(technology, player)
                                                                            for technology in
                                                                            victory_tech_names)
-        for tech_name in victory_tech_names:
-            if not self.multiworld.get_all_state(True).has(tech_name, player):
-                print(tech_name)
         self.multiworld.completion_condition[player] = lambda state: state.has('Victory', player)
 
     def get_recipe(self, name: str) -> Recipe:

From 1a1b7e9cf4c14729f6d3cc0a06f69260610e50e0 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Tue, 21 Jan 2025 12:39:08 -0500
Subject: [PATCH 312/381] TUNIC: Reduce range end for local_fill option #4534

---
 worlds/tunic/options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index 14bf5d8a18a4..d2ea82803704 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -173,7 +173,7 @@ class LocalFill(NamedRange):
     internal_name = "local_fill"
     display_name = "Local Fill Percent"
     range_start = 0
-    range_end = 100
+    range_end = 98
     special_range_names = {
         "default": -1
     }

From 949527f9cb45ac7248d6aa7a73ec2ff980a64fcd Mon Sep 17 00:00:00 2001
From: JaredWeakStrike <96694163+JaredWeakStrike@users.noreply.github.com>
Date: Tue, 21 Jan 2025 17:28:33 -0500
Subject: [PATCH 313/381] KH2: Bug fixes and game update future proofing
 (#4075)

Co-authored-by: qwint <qwint.42@gmail.com>
---
 worlds/kh2/Client.py        | 136 ++++++++++++++++++++++--------------
 worlds/kh2/Regions.py       |   2 +-
 worlds/kh2/Rules.py         |   6 +-
 worlds/kh2/docs/setup_en.md |   2 +-
 4 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/worlds/kh2/Client.py b/worlds/kh2/Client.py
index 3ea47e40ebba..0254d46e934e 100644
--- a/worlds/kh2/Client.py
+++ b/worlds/kh2/Client.py
@@ -5,8 +5,10 @@
 import os
 import asyncio
 import json
+import requests
 from pymem import pymem
-from . import item_dictionary_table, exclusion_item_table, CheckDupingItems, all_locations, exclusion_table, SupportAbility_Table, ActionAbility_Table, all_weapon_slot
+from . import item_dictionary_table, exclusion_item_table, CheckDupingItems, all_locations, exclusion_table, \
+    SupportAbility_Table, ActionAbility_Table, all_weapon_slot
 from .Names import ItemName
 from .WorldLocations import *
 
@@ -82,6 +84,7 @@ def __init__(self, server_address, password):
         }
         self.kh2seedname = None
         self.kh2slotdata = None
+        self.mem_json = None
         self.itemamount = {}
         if "localappdata" in os.environ:
             self.game_communication_path = os.path.expandvars(r"%localappdata%\KH2AP")
@@ -178,7 +181,8 @@ def __init__(self, server_address, password):
         self.base_accessory_slots = 1
         self.base_armor_slots = 1
         self.base_item_slots = 3
-        self.front_ability_slots = [0x2546, 0x2658, 0x276C, 0x2548, 0x254A, 0x254C, 0x265A, 0x265C, 0x265E, 0x276E, 0x2770, 0x2772]
+        self.front_ability_slots = [0x2546, 0x2658, 0x276C, 0x2548, 0x254A, 0x254C, 0x265A, 0x265C, 0x265E, 0x276E,
+                                    0x2770, 0x2772]
 
     async def server_auth(self, password_requested: bool = False):
         if password_requested and not self.password:
@@ -340,12 +344,8 @@ def on_package(self, cmd: str, args: dict):
                 self.locations_checked |= new_locations
 
         if cmd in {"DataPackage"}:
-            self.kh2_loc_name_to_id = args["data"]["games"]["Kingdom Hearts 2"]["location_name_to_id"]
-            self.lookup_id_to_location = {v: k for k, v in self.kh2_loc_name_to_id.items()}
-            self.kh2_item_name_to_id = args["data"]["games"]["Kingdom Hearts 2"]["item_name_to_id"]
-            self.lookup_id_to_item = {v: k for k, v in self.kh2_item_name_to_id.items()}
-            self.ability_code_list = [self.kh2_item_name_to_id[item] for item in exclusion_item_table["Ability"]]
-
+            if "Kingdom Hearts 2" in args["data"]["games"]:
+                self.data_package_kh2_cache(args)
             if "KeybladeAbilities" in self.kh2slotdata.keys():
                 # sora ability to slot
                 self.AbilityQuantityDict.update(self.kh2slotdata["KeybladeAbilities"])
@@ -359,24 +359,9 @@ def on_package(self, cmd: str, args: dict):
             self.all_weapon_location_id = set(all_weapon_location_id)
 
             try:
-                self.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
-                if self.kh2_game_version is None:
-                    if self.kh2_read_string(0x09A9830, 4) == "KH2J":
-                        self.kh2_game_version = "STEAM"
-                        self.Now = 0x0717008
-                        self.Save = 0x09A9830
-                        self.Slot1 = 0x2A23518
-                        self.Journal = 0x7434E0
-                        self.Shop = 0x7435D0
-
-                    elif self.kh2_read_string(0x09A92F0, 4) == "KH2J":
-                        self.kh2_game_version = "EGS"
-                    else:
-                        self.kh2_game_version = None
-                        logger.info("Your game version is out of date. Please update your game via The Epic Games Store or Steam.")
-                if self.kh2_game_version is not None:
-                    logger.info(f"You are now auto-tracking. {self.kh2_game_version}")
-                    self.kh2connected = True
+                if not self.kh2:
+                    self.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
+                    self.get_addresses()
 
             except Exception as e:
                 if self.kh2connected:
@@ -385,6 +370,13 @@ def on_package(self, cmd: str, args: dict):
             self.serverconneced = True
             asyncio.create_task(self.send_msgs([{'cmd': 'Sync'}]))
 
+    def data_package_kh2_cache(self, args):
+        self.kh2_loc_name_to_id = args["data"]["games"]["Kingdom Hearts 2"]["location_name_to_id"]
+        self.lookup_id_to_location = {v: k for k, v in self.kh2_loc_name_to_id.items()}
+        self.kh2_item_name_to_id = args["data"]["games"]["Kingdom Hearts 2"]["item_name_to_id"]
+        self.lookup_id_to_item = {v: k for k, v in self.kh2_item_name_to_id.items()}
+        self.ability_code_list = [self.kh2_item_name_to_id[item] for item in exclusion_item_table["Ability"]]
+
     async def checkWorldLocations(self):
         try:
             currentworldint = self.kh2_read_byte(self.Now)
@@ -425,7 +417,6 @@ async def checkLevels(self):
                 0: ["ValorLevel", ValorLevels], 1: ["WisdomLevel", WisdomLevels], 2: ["LimitLevel", LimitLevels],
                 3: ["MasterLevel", MasterLevels], 4: ["FinalLevel", FinalLevels], 5: ["SummonLevel", SummonLevels]
             }
-            # TODO: remove formDict[i][0] in self.kh2_seed_save_cache["Levels"].keys() after 4.3
             for i in range(6):
                 for location, data in formDict[i][1].items():
                     formlevel = self.kh2_read_byte(self.Save + data.addrObtained)
@@ -469,9 +460,11 @@ async def verifyChests(self):
                 if locationName in self.chest_set:
                     if locationName in self.location_name_to_worlddata.keys():
                         locationData = self.location_name_to_worlddata[locationName]
-                        if self.kh2_read_byte(self.Save + locationData.addrObtained) & 0x1 << locationData.bitIndex == 0:
+                        if self.kh2_read_byte(
+                                self.Save + locationData.addrObtained) & 0x1 << locationData.bitIndex == 0:
                             roomData = self.kh2_read_byte(self.Save + locationData.addrObtained)
-                            self.kh2_write_byte(self.Save + locationData.addrObtained, roomData | 0x01 << locationData.bitIndex)
+                            self.kh2_write_byte(self.Save + locationData.addrObtained,
+                                                roomData | 0x01 << locationData.bitIndex)
 
         except Exception as e:
             if self.kh2connected:
@@ -494,6 +487,9 @@ async def verifyLevel(self):
     async def give_item(self, item, location):
         try:
             # todo: ripout all the itemtype stuff and just have one dictionary. the only thing that needs to be tracked from the server/local is abilites
+            #sleep so we can get the datapackage and not miss any items that were sent to us while we didnt have our item id dicts
+            while not self.lookup_id_to_item:
+                await asyncio.sleep(0.5)
             itemname = self.lookup_id_to_item[item]
             itemdata = self.item_name_to_data[itemname]
             # itemcode = self.kh2_item_name_to_id[itemname]
@@ -637,7 +633,8 @@ async def verifyItems(self):
                 item_data = self.item_name_to_data[item_name]
                 # if the inventory slot for that keyblade is less than the amount they should have,
                 # and they are not in stt
-                if self.kh2_read_byte(self.Save + item_data.memaddr) != 1 and self.kh2_read_byte(self.Save + 0x1CFF) != 13:
+                if self.kh2_read_byte(self.Save + item_data.memaddr) != 1 and self.kh2_read_byte(
+                        self.Save + 0x1CFF) != 13:
                     # Checking form anchors for the keyblade to remove extra keyblades
                     if self.kh2_read_short(self.Save + 0x24F0) == item_data.kh2id \
                             or self.kh2_read_short(self.Save + 0x32F4) == item_data.kh2id \
@@ -738,7 +735,8 @@ async def verifyItems(self):
                 item_data = self.item_name_to_data[item_name]
                 amount_of_items = 0
                 amount_of_items += self.kh2_seed_save_cache["AmountInvo"]["Magic"][item_name]
-                if self.kh2_read_byte(self.Save + item_data.memaddr) != amount_of_items and self.kh2_read_byte(self.Shop) in {10, 8}:
+                if self.kh2_read_byte(self.Save + item_data.memaddr) != amount_of_items and self.kh2_read_byte(
+                        self.Shop) in {10, 8}:
                     self.kh2_write_byte(self.Save + item_data.memaddr, amount_of_items)
 
             for item_name in master_stat:
@@ -797,7 +795,8 @@ async def verifyItems(self):
                 #    self.kh2_write_byte(self.Save + item_data.memaddr, amount_of_items)
 
             if "PoptrackerVersionCheck" in self.kh2slotdata:
-                if self.kh2slotdata["PoptrackerVersionCheck"] > 4.2 and self.kh2_read_byte(self.Save + 0x3607) != 1:  # telling the goa they are on version 4.3
+                if self.kh2slotdata["PoptrackerVersionCheck"] > 4.2 and self.kh2_read_byte(
+                        self.Save + 0x3607) != 1:  # telling the goa they are on version 4.3
                     self.kh2_write_byte(self.Save + 0x3607, 1)
 
         except Exception as e:
@@ -806,10 +805,59 @@ async def verifyItems(self):
             logger.info(e)
             logger.info("line 840")
 
+    def get_addresses(self):
+        if not self.kh2connected and self.kh2 is not None:
+            if self.kh2_game_version is None:
+
+                if self.kh2_read_string(0x09A9830, 4) == "KH2J":
+                    self.kh2_game_version = "STEAM"
+                    self.Now = 0x0717008
+                    self.Save = 0x09A9830
+                    self.Slot1 = 0x2A23518
+                    self.Journal = 0x7434E0
+                    self.Shop = 0x7435D0
+                elif self.kh2_read_string(0x09A92F0, 4) == "KH2J":
+                    self.kh2_game_version = "EGS"
+                else:
+                    if self.game_communication_path:
+                        logger.info("Checking with most up to date addresses of github. If file is not found will be downloading datafiles. This might take a moment")
+                        #if mem addresses file is found then check version and if old get new one
+                        kh2memaddresses_path = os.path.join(self.game_communication_path, f"kh2memaddresses.json")
+                        if not os.path.exists(kh2memaddresses_path):
+                            mem_resp = requests.get("https://raw.githubusercontent.com/JaredWeakStrike/KH2APMemoryValues/master/kh2memaddresses.json")
+                            if mem_resp.status_code == 200:
+                                self.mem_json = json.loads(mem_resp.content)
+                                with open(kh2memaddresses_path,
+                                        'w') as f:
+                                    f.write(json.dumps(self.mem_json, indent=4))
+                        else:
+                            with open(kh2memaddresses_path, 'r') as f:
+                                self.mem_json = json.load(f)
+                        if self.mem_json:
+                            for key in self.mem_json.keys():
+
+                                if self.kh2_read_string(eval(self.mem_json[key]["GameVersionCheck"]), 4) == "KH2J":
+                                    self.Now = eval(self.mem_json[key]["Now"])
+                                    self.Save=eval(self.mem_json[key]["Save"])
+                                    self.Slot1 = eval(self.mem_json[key]["Slot1"])
+                                    self.Journal = eval(self.mem_json[key]["Journal"])
+                                    self.Shop = eval(self.mem_json[key]["Shop"])
+                                    self.kh2_game_version = key
+
+            if self.kh2_game_version is not None:
+                logger.info(f"You are now auto-tracking {self.kh2_game_version}")
+                self.kh2connected = True
+            else:
+                logger.info("Your game version does not match what the client requires. Check in the "
+                            "kingdom-hearts-2-final-mix channel for more information on correcting the game "
+                            "version.")
+                self.kh2connected = False
+
 
 def finishedGame(ctx: KH2Context):
     if ctx.kh2slotdata['FinalXemnas'] == 1:
-        if not ctx.final_xemnas and ctx.kh2_read_byte(ctx.Save + all_world_locations[LocationName.FinalXemnas].addrObtained) \
+        if not ctx.final_xemnas and ctx.kh2_read_byte(
+                ctx.Save + all_world_locations[LocationName.FinalXemnas].addrObtained) \
                 & 0x1 << all_world_locations[LocationName.FinalXemnas].bitIndex > 0:
             ctx.final_xemnas = True
     # three proofs
@@ -843,7 +891,8 @@ def finishedGame(ctx: KH2Context):
             for boss in ctx.kh2slotdata["hitlist"]:
                 if boss in locations:
                     ctx.hitlist_bounties += 1
-        if ctx.hitlist_bounties >= ctx.kh2slotdata["BountyRequired"] or ctx.kh2_seed_save_cache["AmountInvo"]["Amount"]["Bounty"] >= ctx.kh2slotdata["BountyRequired"]:
+        if ctx.hitlist_bounties >= ctx.kh2slotdata["BountyRequired"] or ctx.kh2_seed_save_cache["AmountInvo"]["Amount"][
+            "Bounty"] >= ctx.kh2slotdata["BountyRequired"]:
             if ctx.kh2_read_byte(ctx.Save + 0x36B3) < 1:
                 ctx.kh2_write_byte(ctx.Save + 0x36B2, 1)
                 ctx.kh2_write_byte(ctx.Save + 0x36B3, 1)
@@ -894,24 +943,7 @@ async def kh2_watcher(ctx: KH2Context):
                 while not ctx.kh2connected and ctx.serverconneced:
                     await asyncio.sleep(15)
                     ctx.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
-                    if ctx.kh2 is not None:
-                        if ctx.kh2_game_version is None:
-                            if ctx.kh2_read_string(0x09A9830, 4) == "KH2J":
-                                ctx.kh2_game_version = "STEAM"
-                                ctx.Now = 0x0717008
-                                ctx.Save = 0x09A9830
-                                ctx.Slot1 = 0x2A23518
-                                ctx.Journal = 0x7434E0
-                                ctx.Shop = 0x7435D0
-
-                            elif ctx.kh2_read_string(0x09A92F0, 4) == "KH2J":
-                                ctx.kh2_game_version = "EGS"
-                            else:
-                                ctx.kh2_game_version = None
-                                logger.info("Your game version is out of date. Please update your game via The Epic Games Store or Steam.")
-                        if ctx.kh2_game_version is not None:
-                            logger.info(f"You are now auto-tracking {ctx.kh2_game_version}")
-                            ctx.kh2connected = True
+                    ctx.get_addresses()
         except Exception as e:
             if ctx.kh2connected:
                 ctx.kh2connected = False
diff --git a/worlds/kh2/Regions.py b/worlds/kh2/Regions.py
index 7fc2ad8a873f..e6e8a7b2f663 100644
--- a/worlds/kh2/Regions.py
+++ b/worlds/kh2/Regions.py
@@ -540,7 +540,7 @@
         LocationName.SephirothFenrir,
         LocationName.SephiEventLocation
     ],
-    RegionName.CoR:                [
+    RegionName.CoR:                [ #todo: make logic for getting these checks.
         LocationName.CoRDepthsAPBoost,
         LocationName.CoRDepthsPowerCrystal,
         LocationName.CoRDepthsFrostCrystal,
diff --git a/worlds/kh2/Rules.py b/worlds/kh2/Rules.py
index 0f26b56d0e54..767c5643417e 100644
--- a/worlds/kh2/Rules.py
+++ b/worlds/kh2/Rules.py
@@ -194,8 +194,8 @@ def __init__(self, kh2world: KH2World) -> None:
             RegionName.Oc:                 lambda state: self.oc_unlocked(state, 1),
             RegionName.Oc2:                lambda state: self.oc_unlocked(state, 2),
 
+            #twtnw1 is actually the roxas fight region thus roxas requires 1 way to the dawn
             RegionName.Twtnw2:             lambda state: self.twtnw_unlocked(state, 2),
-            # These will be swapped and First Visit lock for twtnw is in development.
             # RegionName.Twtnw1: lambda state: self.lod_unlocked(state, 2),
 
             RegionName.Ht:                 lambda state: self.ht_unlocked(state, 1),
@@ -919,8 +919,8 @@ def get_sephiroth_rules(self, state: CollectionState) -> bool:
         # normal:both gap closers,limit 5,reflera,guard,both 2 ground finishers,3 dodge roll,finishing plus
         # hard:1 gap closers,reflect, guard,both 1 ground finisher,2 dodge roll,finishing plus
         sephiroth_rules = {
-            "easy":   self.kh2_dict_count(easy_sephiroth_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([donald_limit], state) >= 1,
-            "normal": self.kh2_dict_count(normal_sephiroth_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([donald_limit, gap_closer], state) >= 2,
+            "easy":   self.kh2_dict_count(easy_sephiroth_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state),
+            "normal": self.kh2_dict_count(normal_sephiroth_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([gap_closer], state) >= 1,
             "hard":   self.kh2_dict_count(hard_sephiroth_tools, state) and self.kh2_list_any_sum([gap_closer, ground_finisher], state) >= 2,
         }
         return sephiroth_rules[self.fight_logic]
diff --git a/worlds/kh2/docs/setup_en.md b/worlds/kh2/docs/setup_en.md
index cb80ec609887..bee60bd36b18 100644
--- a/worlds/kh2/docs/setup_en.md
+++ b/worlds/kh2/docs/setup_en.md
@@ -52,7 +52,7 @@ After Installing the seed click "Mod Loader -> Build/Build and Run". Every slot
 
 <h2 style="text-transform:none";>What the Mod Manager Should Look Like.</h2>
 
-![image](https://i.imgur.com/Si4oZ8w.png)
+![image](https://i.imgur.com/N0WJ8Qn.png)
 
 
 <h2 style="text-transform:none";>Using the KH2 Client</h2>

From 5a42c7067553995f9f630125a1860242452df4c7 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:00:47 +0100
Subject: [PATCH 314/381] Core: Fix worlds that rely on other worlds having
 their Entrances connected before connect_entrances, add unit test (#4530)

* unit test that get all state is called with partial entrances before connect_entrances

* fix the two worlds doing it

* lol

* unused import

* Update test/general/test_entrances.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update test_entrances.py

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 test/general/test_entrances.py | 27 +++++++++++++++++++++++++++
 worlds/alttp/Rules.py          |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/test/general/test_entrances.py b/test/general/test_entrances.py
index 72161dfbdebc..88362c8fa6d4 100644
--- a/test/general/test_entrances.py
+++ b/test/general/test_entrances.py
@@ -34,3 +34,30 @@ def get_entrance_name_to_source_and_target_dict(world: World):
                         self.assertEqual(
                             original_entrances, step_entrances, f"{game_name} modified entrances during {step}"
                         )
+
+    def test_all_state_before_connect_entrances(self):
+        """Before connect_entrances, Entrance objects may be unconnected.
+        Thus, we test that get_all_state is performed with allow_partial_entrances if used before or during
+        connect_entrances."""
+
+        gen_steps = ("generate_early", "create_regions", "create_items", "set_rules", "connect_entrances")
+
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest("Game", game_name=game_name):
+                multiworld = setup_solo_multiworld(world_type, ())
+
+                original_get_all_state = multiworld.get_all_state
+
+                def patched_get_all_state(use_cache: bool, allow_partial_entrances: bool = False):
+                    self.assertTrue(allow_partial_entrances, (
+                        "Before the connect_entrances step finishes, other worlds might still have partial entrances. "
+                        "As such, any call to get_all_state must use allow_partial_entrances = True."
+                    ))
+
+                    return original_get_all_state(use_cache, allow_partial_entrances)
+
+                multiworld.get_all_state = patched_get_all_state
+
+                for step in gen_steps:
+                    with self.subTest("Step", step=step):
+                        call_all(multiworld, step)
diff --git a/worlds/alttp/Rules.py b/worlds/alttp/Rules.py
index 386e0b0e9e11..f13178c6c519 100644
--- a/worlds/alttp/Rules.py
+++ b/worlds/alttp/Rules.py
@@ -1125,7 +1125,7 @@ def set_trock_key_rules(world, player):
     for entrance in ['Turtle Rock Dark Room Staircase', 'Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock Entrance to Pokey Room', 'Turtle Rock (Pokey Room) (South)', 'Turtle Rock (Pokey Room) (North)', 'Turtle Rock Big Key Door']:
         set_rule(world.get_entrance(entrance, player), lambda state: False)
 
-    all_state = world.get_all_state(use_cache=False)
+    all_state = world.get_all_state(use_cache=False, allow_partial_entrances=True)
     all_state.reachable_regions[player] = set()  # wipe reachable regions so that the locked doors actually work
     all_state.stale[player] = True
 

From fa2816822b46a770417b745e97d0f25c42b3a9ac Mon Sep 17 00:00:00 2001
From: CookieCat <81494827+CookieCat45@users.noreply.github.com>
Date: Thu, 23 Jan 2025 16:45:11 -0500
Subject: [PATCH 315/381] AHIT: Fix broken link in setup guide (#4524)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/ahit/docs/setup_en.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/ahit/docs/setup_en.md b/worlds/ahit/docs/setup_en.md
index 23b34907071c..167c6c2faa24 100644
--- a/worlds/ahit/docs/setup_en.md
+++ b/worlds/ahit/docs/setup_en.md
@@ -21,7 +21,7 @@
 
 
 3. Click the **Betas** tab. In the **Beta Participation** dropdown, select `tcplink`.  
-   While it downloads, you can subscribe to the [Archipelago workshop mod.]((https://steamcommunity.com/sharedfiles/filedetails/?id=3026842601))
+   While it downloads, you can subscribe to the [Archipelago workshop mod](https://steamcommunity.com/sharedfiles/filedetails/?id=3026842601).
 
 
 4. Once the game finishes downloading, start it up.  
@@ -62,4 +62,4 @@ The level that the relic set unlocked will stay unlocked.
 
 ### When I start a new save file, the intro cinematic doesn't get skipped, Hat Kid's body is missing and the mod doesn't work!
 There is a bug on older versions of A Hat in Time that causes save file creation to fail to work properly 
-if you have too many save files. Delete them and it should fix the problem.
\ No newline at end of file
+if you have too many save files. Delete them and it should fix the problem.

From bb0948154da8e3436ebd1ac9bbbc29ee230cc695 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Fri, 24 Jan 2025 12:42:31 -0500
Subject: [PATCH 316/381] TUNIC: Make the standard entrances get made with
 tuples instead of sets (#4546)

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/tunic/regions.py | 46 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/worlds/tunic/regions.py b/worlds/tunic/regions.py
index 93ec5640e0c2..8f5df8896ac9 100644
--- a/worlds/tunic/regions.py
+++ b/worlds/tunic/regions.py
@@ -1,26 +1,24 @@
-from typing import Dict, Set
-
-tunic_regions: Dict[str, Set[str]] = {
-    "Menu": {"Overworld"},
-    "Overworld": {"Overworld Holy Cross", "East Forest", "Dark Tomb", "Beneath the Well", "West Garden",
+tunic_regions: dict[str, tuple[str]] = {
+    "Menu": ("Overworld",),
+    "Overworld": ("Overworld Holy Cross", "East Forest", "Dark Tomb", "Beneath the Well", "West Garden",
                   "Ruined Atoll", "Eastern Vault Fortress", "Beneath the Vault", "Quarry Back", "Quarry", "Swamp",
-                  "Spirit Arena"},
-    "Overworld Holy Cross": set(),
-    "East Forest": set(),
-    "Dark Tomb": {"West Garden"},
-    "Beneath the Well": set(),
-    "West Garden": set(),
-    "Ruined Atoll": {"Frog's Domain", "Library"},
-    "Frog's Domain": set(),
-    "Library": set(),
-    "Eastern Vault Fortress": {"Beneath the Vault"},
-    "Beneath the Vault": {"Eastern Vault Fortress"},
-    "Quarry Back": {"Quarry"},
-    "Quarry": {"Monastery", "Lower Quarry"},
-    "Monastery": set(),
-    "Lower Quarry": {"Rooted Ziggurat"},
-    "Rooted Ziggurat": set(),
-    "Swamp": {"Cathedral"},
-    "Cathedral": set(),
-    "Spirit Arena": set()
+                  "Spirit Arena"),
+    "Overworld Holy Cross": tuple(),
+    "East Forest": tuple(),
+    "Dark Tomb": ("West Garden",),
+    "Beneath the Well": tuple(),
+    "West Garden": tuple(),
+    "Ruined Atoll": ("Frog's Domain", "Library"),
+    "Frog's Domain": tuple(),
+    "Library": tuple(),
+    "Eastern Vault Fortress": ("Beneath the Vault",),
+    "Beneath the Vault": ("Eastern Vault Fortress",),
+    "Quarry Back": ("Quarry",),
+    "Quarry": ("Monastery", "Lower Quarry"),
+    "Monastery": tuple(),
+    "Lower Quarry": ("Rooted Ziggurat",),
+    "Rooted Ziggurat": tuple(),
+    "Swamp": ("Cathedral",),
+    "Cathedral": tuple(),
+    "Spirit Arena": tuple()
 }

From 7474c273729f68bc9f791626999e180cacbc6b46 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Fri, 24 Jan 2025 13:52:12 -0500
Subject: [PATCH 317/381] Core: Add launch function to call launch_subprocess
 only if multiprocessing is actually necessary (#4237)

* skips opening a subprocess if kivy (and thus the launcher gui) hasn't been loaded so stdin can function as expected on --nogui and similar

* this exists lol

* keep old function around and use new function for CC component

* fix name=None typing
---
 worlds/LauncherComponents.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index d1b274c19ae7..41c83db41995 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -87,7 +87,7 @@ def __repr__(self):
 processes = weakref.WeakSet()
 
 
-def launch_subprocess(func: Callable, name: str = None, args: Tuple[str, ...] = ()) -> None:
+def launch_subprocess(func: Callable, name: str | None = None, args: Tuple[str, ...] = ()) -> None:
     global processes
     import multiprocessing
     process = multiprocessing.Process(target=func, name=name, args=args)
@@ -95,6 +95,14 @@ def launch_subprocess(func: Callable, name: str = None, args: Tuple[str, ...] =
     processes.add(process)
 
 
+def launch(func: Callable, name: str | None = None, args: Tuple[str, ...] = ()) -> None:
+    from Utils import is_kivy_running
+    if is_kivy_running():
+        launch_subprocess(func, name, args)
+    else:
+        func(*args)
+
+
 class SuffixIdentifier:
     suffixes: Iterable[str]
 
@@ -111,7 +119,7 @@ def __call__(self, path: str) -> bool:
 
 def launch_textclient(*args):
     import CommonClient
-    launch_subprocess(CommonClient.run_as_textclient, name="TextClient", args=args)
+    launch(CommonClient.run_as_textclient, name="TextClient", args=args)
 
 
 def _install_apworld(apworld_src: str = "") -> Optional[Tuple[pathlib.Path, pathlib.Path]]:

From 3d1d6908c8081f325659377e7d0dae4487badd07 Mon Sep 17 00:00:00 2001
From: Jasper den Brok <SansSkill@users.noreply.github.com>
Date: Fri, 24 Jan 2025 22:30:21 +0100
Subject: [PATCH 318/381] Pokemon Emerald: Add Free Fly Blacklist (#4165)

Co-authored-by: Jasper den Brok <jasper.den.brok@gmail.com>
---
 worlds/pokemon_emerald/locations.py | 28 ++++++++++++++++------------
 worlds/pokemon_emerald/options.py   | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/worlds/pokemon_emerald/locations.py b/worlds/pokemon_emerald/locations.py
index 473c189166be..2bae8e00ed34 100644
--- a/worlds/pokemon_emerald/locations.py
+++ b/worlds/pokemon_emerald/locations.py
@@ -33,6 +33,18 @@
     "EVENT_VISITED_SOUTHERN_ISLAND": 17,
 }
 
+BLACKLIST_OPTION_TO_VISITED_EVENT = {
+    "Slateport City": "EVENT_VISITED_SLATEPORT_CITY",
+    "Mauville City": "EVENT_VISITED_MAUVILLE_CITY",
+    "Verdanturf Town": "EVENT_VISITED_VERDANTURF_TOWN",
+    "Fallarbor Town": "EVENT_VISITED_FALLARBOR_TOWN",
+    "Lavaridge Town": "EVENT_VISITED_LAVARIDGE_TOWN",
+    "Fortree City": "EVENT_VISITED_FORTREE_CITY",
+    "Lilycove City": "EVENT_VISITED_LILYCOVE_CITY",
+    "Mossdeep City": "EVENT_VISITED_MOSSDEEP_CITY",
+    "Sootopolis City": "EVENT_VISITED_SOOTOPOLIS_CITY",
+    "Ever Grande City": "EVENT_VISITED_EVER_GRANDE_CITY",
+}
 
 class PokemonEmeraldLocation(Location):
     game: str = "Pokemon Emerald"
@@ -129,18 +141,10 @@ def set_free_fly(world: "PokemonEmeraldWorld") -> None:
     # If not enabled, set it to Littleroot Town by default
     fly_location_name = "EVENT_VISITED_LITTLEROOT_TOWN"
     if world.options.free_fly_location:
-        fly_location_name = world.random.choice([
-            "EVENT_VISITED_SLATEPORT_CITY",
-            "EVENT_VISITED_MAUVILLE_CITY",
-            "EVENT_VISITED_VERDANTURF_TOWN",
-            "EVENT_VISITED_FALLARBOR_TOWN",
-            "EVENT_VISITED_LAVARIDGE_TOWN",
-            "EVENT_VISITED_FORTREE_CITY",
-            "EVENT_VISITED_LILYCOVE_CITY",
-            "EVENT_VISITED_MOSSDEEP_CITY",
-            "EVENT_VISITED_SOOTOPOLIS_CITY",
-            "EVENT_VISITED_EVER_GRANDE_CITY",
-        ])
+        blacklisted_locations = set(BLACKLIST_OPTION_TO_VISITED_EVENT[city] for city in world.options.free_fly_blacklist.value)
+        free_fly_locations = sorted(set(BLACKLIST_OPTION_TO_VISITED_EVENT.values()) - blacklisted_locations)
+        if free_fly_locations:
+            fly_location_name = world.random.choice(free_fly_locations)
 
     world.free_fly_location_id = VISITED_EVENT_NAME_TO_ID[fly_location_name]
 
diff --git a/worlds/pokemon_emerald/options.py b/worlds/pokemon_emerald/options.py
index 8fcc74d1c34a..cf0c692d06d8 100644
--- a/worlds/pokemon_emerald/options.py
+++ b/worlds/pokemon_emerald/options.py
@@ -725,6 +725,24 @@ class FreeFlyLocation(Toggle):
     """
     display_name = "Free Fly Location"
 
+class FreeFlyBlacklist(OptionSet):
+    """
+    Disables specific locations as valid free fly locations.
+    Has no effect if Free Fly Location is disabled.
+    """
+    display_name = "Free Fly Blacklist"
+    valid_keys = [
+        "Slateport City",
+        "Mauville City",
+        "Verdanturf Town",
+        "Fallarbor Town",
+        "Lavaridge Town",
+        "Fortree City",
+        "Lilycove City",
+        "Mossdeep City",
+        "Sootopolis City",
+        "Ever Grande City",
+    ]
 
 class HmRequirements(Choice):
     """
@@ -876,6 +894,7 @@ class PokemonEmeraldOptions(PerGameCommonOptions):
     extra_bumpy_slope: ExtraBumpySlope
     modify_118: ModifyRoute118
     free_fly_location: FreeFlyLocation
+    free_fly_blacklist: FreeFlyBlacklist
     hm_requirements: HmRequirements
 
     turbo_a: TurboA

From 3df2dbe051024df890f322280ee4373d4690c258 Mon Sep 17 00:00:00 2001
From: Silent <110704408+silent-destroyer@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:55:49 -0500
Subject: [PATCH 319/381] TUNIC: Add ability shuffle information to spoiler log
 (#4498)

---
 worlds/tunic/__init__.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 087e17c3e473..ed2923037eee 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -1,4 +1,4 @@
-from typing import Dict, List, Any, Tuple, TypedDict, ClassVar, Union, Set
+from typing import Dict, List, Any, Tuple, TypedDict, ClassVar, Union, Set, TextIO
 from logging import warning
 from BaseClasses import Region, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
 from .items import (item_name_to_id, item_table, item_name_groups, fool_tiers, filler_items, slot_data_item_names,
@@ -502,6 +502,13 @@ def remove(self, state: CollectionState, item: Item) -> bool:
             state.tunic_need_to_reset_combat_from_remove[self.player] = True
         return change
 
+    def write_spoiler_header(self, spoiler_handle: TextIO):
+        if self.options.hexagon_quest and self.options.ability_shuffling:
+            spoiler_handle.write("\nAbility Unlocks (Hexagon Quest):\n")
+            for ability in self.ability_unlocks:
+                # Remove parentheses for better readability
+                spoiler_handle.write(f'{ability[ability.find("(")+1:ability.find(")")]}: {self.ability_unlocks[ability]} Gold Questagons\n')
+
     def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]) -> None:
         if self.options.entrance_rando:
             hint_data.update({self.player: {}})

From ddf7fdccc718380e8611ab946ca5c529f897075b Mon Sep 17 00:00:00 2001
From: Silent <110704408+silent-destroyer@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:57:23 -0500
Subject: [PATCH 320/381] TUNIC: Add Torch Item (#4538)

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---
 worlds/tunic/items.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/tunic/items.py b/worlds/tunic/items.py
index 729bfd441172..846650c68fef 100644
--- a/worlds/tunic/items.py
+++ b/worlds/tunic/items.py
@@ -48,6 +48,7 @@ class TunicItemData(NamedTuple):
     "Gun": TunicItemData(IC.progression | IC.useful, 1, 30, "Weapons"),
     "Shield": TunicItemData(IC.useful, 1, 31, combat_ic=IC.progression | IC.useful),
     "Dath Stone": TunicItemData(IC.useful, 1, 32),
+    "Torch": TunicItemData(IC.useful, 0, 156),
     "Hourglass": TunicItemData(IC.useful, 1, 33),
     "Old House Key": TunicItemData(IC.progression, 1, 34, "Keys"),
     "Key": TunicItemData(IC.progression, 2, 35, "Keys"),

From 513e361764aea8a04e56010c6c47ee4bb53f5303 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Fri, 24 Jan 2025 17:10:58 -0500
Subject: [PATCH 321/381] TUNIC: Fix UT create_item classification (#4514)

Co-authored-by: Silent <110704408+silent-destroyer@users.noreply.github.com>
---
 worlds/tunic/__init__.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index ed2923037eee..e86f731381e5 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -242,10 +242,18 @@ def stage_generate_early(cls, multiworld: MultiWorld) -> None:
 
     def create_item(self, name: str, classification: ItemClassification = None) -> TunicItem:
         item_data = item_table[name]
-        # if item_data.combat_ic is None, it'll take item_data.classification instead
-        itemclass: ItemClassification = ((item_data.combat_ic if self.options.combat_logic else None)
+        # evaluate alternate classifications based on options
+        # it'll choose whichever classification isn't None first in this if else tree
+        itemclass: ItemClassification = (classification
+                                         or (item_data.combat_ic if self.options.combat_logic else None)
+                                         or (ItemClassification.progression | ItemClassification.useful
+                                             if name == "Glass Cannon" and self.options.grass_randomizer
+                                             and not self.options.start_with_sword else None)
+                                         or (ItemClassification.progression | ItemClassification.useful
+                                             if name == "Shield" and self.options.ladder_storage
+                                             and not self.options.ladder_storage_without_items else None)
                                          or item_data.classification)
-        return TunicItem(name, classification or itemclass, self.item_name_to_id[name], self.player)
+        return TunicItem(name, itemclass, self.item_name_to_id[name], self.player)
 
     def create_items(self) -> None:
         tunic_items: List[TunicItem] = []
@@ -278,8 +286,6 @@ def create_items(self) -> None:
 
         if self.options.grass_randomizer:
             items_to_create["Grass"] = len(grass_location_table)
-            tunic_items.append(self.create_item("Glass Cannon", ItemClassification.progression))
-            items_to_create["Glass Cannon"] = 0
             for grass_location in excluded_grass_locations:
                 self.get_location(grass_location).place_locked_item(self.create_item("Grass"))
             items_to_create["Grass"] -= len(excluded_grass_locations)
@@ -351,11 +357,6 @@ def remove_filler(amount: int) -> None:
                 tunic_items.append(self.create_item(page, ItemClassification.progression | ItemClassification.useful))
                 items_to_create[page] = 0
 
-        # logically relevant if you have ladder storage enabled
-        if self.options.ladder_storage and not self.options.ladder_storage_without_items:
-            tunic_items.append(self.create_item("Shield", ItemClassification.progression))
-            items_to_create["Shield"] = 0
-
         if self.options.maskless:
             tunic_items.append(self.create_item("Scavenger Mask", ItemClassification.useful))
             items_to_create["Scavenger Mask"] = 0

From cc770418f2d1d5c88ec08f30ac45c05ea704445c Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 24 Jan 2025 23:22:33 +0100
Subject: [PATCH 322/381] MultiServer: optimize PrintJSON for !release (#4545)

* MultiServer: optimize PrintJSON for !release

* MultiServer: safer comparison

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 MultiServer.py | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/MultiServer.py b/MultiServer.py
index 653c2ecaabb1..9e0868b0f4a8 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -1060,21 +1060,37 @@ def send_items_to(ctx: Context, team: int, target_slot: int, *items: NetworkItem
 
 def register_location_checks(ctx: Context, team: int, slot: int, locations: typing.Iterable[int],
                              count_activity: bool = True):
+    slot_locations = ctx.locations[slot]
     new_locations = set(locations) - ctx.location_checks[team, slot]
-    new_locations.intersection_update(ctx.locations[slot])  # ignore location IDs unknown to this multidata
+    new_locations.intersection_update(slot_locations)  # ignore location IDs unknown to this multidata
     if new_locations:
         if count_activity:
             ctx.client_activity_timers[team, slot] = datetime.datetime.now(datetime.timezone.utc)
+
+        sortable: list[tuple[int, int, int, int]] = []
         for location in new_locations:
-            item_id, target_player, flags = ctx.locations[slot][location]
+            # extract all fields to avoid runtime overhead in LocationStore
+            item_id, target_player, flags = slot_locations[location]
+            # sort/group by receiver and item
+            sortable.append((target_player, item_id, location, flags))
+
+        info_texts: list[dict[str, typing.Any]] = []
+        for target_player, item_id, location, flags in sorted(sortable):
             new_item = NetworkItem(item_id, location, slot, flags)
             send_items_to(ctx, team, target_player, new_item)
 
             ctx.logger.info('(Team #%d) %s sent %s to %s (%s)' % (
                 team + 1, ctx.player_names[(team, slot)], ctx.item_names[ctx.slot_info[target_player].game][item_id],
                 ctx.player_names[(team, target_player)], ctx.location_names[ctx.slot_info[slot].game][location]))
-            info_text = json_format_send_event(new_item, target_player)
-            ctx.broadcast_team(team, [info_text])
+            if len(info_texts) >= 140:
+                # split into chunks that are close to compression window of 64K but not too big on the wire
+                # (roughly 1300-2600 bytes after compression depending on repetitiveness)
+                ctx.broadcast_team(team, info_texts)
+                info_texts.clear()
+            info_texts.append(json_format_send_event(new_item, target_player))
+        ctx.broadcast_team(team, info_texts)
+        del info_texts
+        del sortable
 
         ctx.location_checks[team, slot] |= new_locations
         send_new_items(ctx)

From 86641223c12852d998d45638ea664317d29f8e25 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Fri, 24 Jan 2025 18:35:54 -0500
Subject: [PATCH 323/381] Shivers: Stop using get_all_state cache to fix timing
 issue #4522

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 worlds/shivers/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/shivers/__init__.py b/worlds/shivers/__init__.py
index 5c6203fd5761..85f2cf1861a7 100644
--- a/worlds/shivers/__init__.py
+++ b/worlds/shivers/__init__.py
@@ -245,7 +245,7 @@ def pre_fill(self) -> None:
 
         storage_items += [self.create_item("Empty") for _ in range(3)]
 
-        state = self.multiworld.get_all_state(True)
+        state = self.multiworld.get_all_state(False)
 
         self.random.shuffle(storage_locs)
         self.random.shuffle(storage_items)

From 1832bac1a3c0e9b046c67271ee09601b26b0fe94 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Sat, 25 Jan 2025 06:35:42 -0800
Subject: [PATCH 324/381] BizHawkClient: Update README for `get_memory_size`
 (#4511)

---
 worlds/_bizhawk/README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/worlds/_bizhawk/README.md b/worlds/_bizhawk/README.md
index ddc70c3dd748..9058fc30619c 100644
--- a/worlds/_bizhawk/README.md
+++ b/worlds/_bizhawk/README.md
@@ -55,6 +55,7 @@ async def lock(ctx) -> None
 async def unlock(ctx) -> None
 
 async def get_hash(ctx) -> str
+async def get_memory_size(ctx, domain: str) -> int
 async def get_system(ctx) -> str
 async def get_cores(ctx) -> dict[str, str]
 async def ping(ctx) -> None
@@ -168,9 +169,10 @@ select dialog and they will be associated with BizHawkClient. This does not affe
 associate the file extension with Archipelago.
 
 `validate_rom` is called to figure out whether a given ROM belongs to your client. It will only be called when a ROM is
-running on a system you specified in your `system` class variable. In most cases, that will be a single system and you
-can be sure that you're not about to try to read from nonexistent domains or out of bounds. If you decide to claim this
-ROM as yours, this is where you should do setup for things like `items_handling`.
+running on a system you specified in your `system` class variable. Take extra care here, because your code will run
+against ROMs that you have no control over. If you're reading an address deep in ROM, you might want to check the size
+of ROM before you attempt to read it using `get_memory_size`. If you decide to claim this ROM as yours, this is where
+you should do setup for things like `items_handling`.
 
 `game_watcher` is the "main loop" of your client where you should be checking memory and sending new items to the ROM.
 `BizHawkClient` will make sure that your `game_watcher` only runs when your client has validated the ROM, and will do
@@ -268,6 +270,8 @@ server connection before trying to interact with it.
 - By default, the player will be asked to provide their slot name after connecting to the server and validating, and
 that input will be used to authenticate with the `Connect` command. You can override `set_auth` in your own client to
 set it automatically based on data in the ROM or on your client instance.
+- Use `get_memory_size` inside `validate_rom` if you need to read at large addresses, in case some other game has a
+smaller ROM size.
 - You can override `on_package` in your client to watch raw packages, but don't forget you also have access to a
 subclass of `CommonContext` and its API.
 - You can import `BizHawkClientContext` for type hints using `typing.TYPE_CHECKING`. Importing it without conditions at

From 96b941ed35cb5d34a44e261be6e00a7efd38175d Mon Sep 17 00:00:00 2001
From: josephwhite <damasta21th@aol.com>
Date: Sat, 25 Jan 2025 09:36:23 -0500
Subject: [PATCH 325/381] Super Mario 64: Add Star Costs to Spoiler (#4544)

---
 worlds/sm64ex/__init__.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/worlds/sm64ex/__init__.py b/worlds/sm64ex/__init__.py
index afa67f233c69..d54e0fc64d46 100644
--- a/worlds/sm64ex/__init__.py
+++ b/worlds/sm64ex/__init__.py
@@ -48,6 +48,17 @@ class SM64World(World):
     filler_count: int
     star_costs: typing.Dict[str, int]
 
+    # Spoiler specific variable(s)
+    star_costs_spoiler_key_maxlen = len(max([
+        'First Floor Big Star Door',
+        'Basement Big Star Door',
+        'Second Floor Big Star Door',
+        'MIPS 1',
+        'MIPS 2',
+        'Endless Stairs',
+    ], key=len))
+
+
     def generate_early(self):
         max_stars = 120
         if (not self.options.enable_coin_stars):
@@ -238,3 +249,19 @@ def extend_hint_information(self, hint_data: typing.Dict[int, typing.Dict[int, s
                     for location in region.locations:
                         er_hint_data[location.address] = entrance_name
             hint_data[self.player] = er_hint_data
+
+    def write_spoiler(self, spoiler_handle: typing.TextIO) -> None:
+        # Write calculated star costs to spoiler.
+        star_cost_spoiler_header = '\n\n' + self.player_name + ' Star Costs for Super Mario 64:\n\n'
+        spoiler_handle.write(star_cost_spoiler_header)
+        # - Reformat star costs dictionary in spoiler to be a bit more readable.
+        star_costs_spoiler = {}
+        star_costs_copy = self.star_costs.copy()
+        star_costs_spoiler['First Floor Big Star Door'] = star_costs_copy['FirstBowserDoorCost']
+        star_costs_spoiler['Basement Big Star Door'] = star_costs_copy['BasementDoorCost']
+        star_costs_spoiler['Second Floor Big Star Door'] = star_costs_copy['SecondFloorDoorCost']
+        star_costs_spoiler['MIPS 1'] = star_costs_copy['MIPS1Cost']
+        star_costs_spoiler['MIPS 2'] = star_costs_copy['MIPS2Cost']
+        star_costs_spoiler['Endless Stairs'] = star_costs_copy['StarsToFinish']
+        for star, cost in star_costs_spoiler.items():
+            spoiler_handle.write(f"{star:{self.star_costs_spoiler_key_maxlen}s} = {cost}\n")

From 90417e002292b3982f8dff68fae4270bdbd9db5c Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sun, 26 Jan 2025 07:06:27 -0500
Subject: [PATCH 326/381] CommonClient: Expand on make_gui docstring (#4449)

* adds docstring to make_gui describing what things you might want to change without dealing with kivy/kvui directly (there are better places to document those)

* Update CommonClient.py

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

* Update CommonClient.py

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
---
 CommonClient.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CommonClient.py b/CommonClient.py
index f6b2623f8c02..996ba3300575 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -709,8 +709,16 @@ def handle_connection_loss(self, msg: str) -> None:
         logger.exception(msg, exc_info=exc_info, extra={'compact_gui': True})
         self._messagebox_connection_loss = self.gui_error(msg, exc_info[1])
 
-    def make_gui(self) -> typing.Type["kvui.GameManager"]:
-        """To return the Kivy App class needed for run_gui so it can be overridden before being built"""
+    def make_gui(self) -> "type[kvui.GameManager]":
+        """
+        To return the Kivy `App` class needed for `run_gui` so it can be overridden before being built
+
+        Common changes are changing `base_title` to update the window title of the client and
+        updating `logging_pairs` to automatically make new tabs that can be filled with their respective logger.
+
+        ex. `logging_pairs.append(("Foo", "Bar"))`
+        will add a "Bar" tab which follows the logger returned from `logging.getLogger("Foo")`
+        """
         from kvui import GameManager
 
         class TextManager(GameManager):

From 8622cb62040e1da2d1d3c66cb1563f76bddb57f9 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun, 26 Jan 2025 22:14:39 +0100
Subject: [PATCH 327/381] Factorio: Inventory Spill Traps (#4457)

---
 worlds/factorio/Options.py                    |  7 ++++
 worlds/factorio/__init__.py                   | 22 +++++------
 worlds/factorio/data/mod/lib.lua              | 37 +++++++++++++++++++
 worlds/factorio/data/mod_template/control.lua |  5 +++
 4 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index 0fa75e1b8bfa..4848cd992664 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -304,6 +304,11 @@ class EvolutionTrapIncrease(Range):
     range_end = 100
 
 
+class InventorySpillTrapCount(TrapCount):
+    """Trap items that when received trigger dropping your main inventory and trash inventory onto the ground."""
+    display_name = "Inventory Spill Traps"
+
+
 class FactorioWorldGen(OptionDict):
     """World Generation settings. Overview of options at https://wiki.factorio.com/Map_generator,
     with in-depth documentation at https://lua-api.factorio.com/latest/Concepts.html#MapGenSettings"""
@@ -484,6 +489,7 @@ class FactorioOptions(PerGameCommonOptions):
     artillery_traps: ArtilleryTrapCount
     atomic_rocket_traps: AtomicRocketTrapCount
     atomic_cliff_remover_traps: AtomicCliffRemoverTrapCount
+    inventory_spill_traps: InventorySpillTrapCount
     attack_traps: AttackTrapCount
     evolution_traps: EvolutionTrapCount
     evolution_trap_increase: EvolutionTrapIncrease
@@ -518,6 +524,7 @@ class FactorioOptions(PerGameCommonOptions):
             ArtilleryTrapCount,
             AtomicRocketTrapCount,
             AtomicCliffRemoverTrapCount,
+            InventorySpillTrapCount,
         ],
         start_collapsed=True
     ),
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index a2bc518ae3fd..ca9f12f1b21a 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -78,6 +78,7 @@ class FactorioItem(Item):
 all_items["Artillery Trap"] = factorio_base_id - 6
 all_items["Atomic Rocket Trap"] = factorio_base_id - 7
 all_items["Atomic Cliff Remover Trap"] = factorio_base_id - 8
+all_items["Inventory Spill Trap"] = factorio_base_id - 9
 
 
 class Factorio(World):
@@ -112,6 +113,8 @@ class Factorio(World):
     science_locations: typing.List[FactorioScienceLocation]
     removed_technologies: typing.Set[str]
     settings: typing.ClassVar[FactorioSettings]
+    trap_names: tuple[str] = ("Evolution", "Attack", "Teleport", "Grenade", "Cluster Grenade", "Artillery",
+                              "Atomic Rocket", "Atomic Cliff Remover", "Inventory Spill")
 
     def __init__(self, world, player: int):
         super(Factorio, self).__init__(world, player)
@@ -136,15 +139,11 @@ def create_regions(self):
         random = self.random
         nauvis = Region("Nauvis", player, self.multiworld)
 
-        location_count = len(base_tech_table) - len(useless_technologies) - self.skip_silo + \
-                         self.options.evolution_traps + \
-                         self.options.attack_traps + \
-                         self.options.teleport_traps + \
-                         self.options.grenade_traps + \
-                         self.options.cluster_grenade_traps + \
-                         self.options.atomic_rocket_traps + \
-                         self.options.atomic_cliff_remover_traps + \
-                         self.options.artillery_traps
+        location_count = len(base_tech_table) - len(useless_technologies) - self.skip_silo
+
+        for name in self.trap_names:
+            name = name.replace(" ", "_").lower()+"_traps"
+            location_count += getattr(self.options, name)
 
         location_pool = []
 
@@ -196,9 +195,8 @@ def sorter(loc: FactorioScienceLocation):
     def create_items(self) -> None:
         self.custom_technologies = self.set_custom_technologies()
         self.set_custom_recipes()
-        traps = ("Evolution", "Attack", "Teleport", "Grenade", "Cluster Grenade", "Artillery", "Atomic Rocket",
-                 "Atomic Cliff Remover")
-        for trap_name in traps:
+
+        for trap_name in self.trap_names:
             self.multiworld.itempool.extend(self.create_item(f"{trap_name} Trap") for _ in
                                             range(getattr(self.options,
                                                           f"{trap_name.lower().replace(' ', '_')}_traps")))
diff --git a/worlds/factorio/data/mod/lib.lua b/worlds/factorio/data/mod/lib.lua
index 517a54e3d642..edec5b7acdc0 100644
--- a/worlds/factorio/data/mod/lib.lua
+++ b/worlds/factorio/data/mod/lib.lua
@@ -48,3 +48,40 @@ function fire_entity_at_entities(entity_name, entities, speed)
             target=target, speed=speed}
     end
 end
+
+function spill_character_inventory(character)
+    if not (character and character.valid) then
+        return false
+    end
+
+    -- grab attrs once pre-loop
+    local position = character.position
+    local surface = character.surface
+
+    local inventories_to_spill = {
+        defines.inventory.character_main, -- Main inventory
+        defines.inventory.character_trash, -- Logistic trash slots
+    }
+
+    for _, inventory_type in pairs(inventories_to_spill) do
+        local inventory = character.get_inventory(inventory_type)
+        if inventory and inventory.valid then
+            -- Spill each item stack onto the ground
+            for i = 1, #inventory do
+                local stack = inventory[i]
+                if stack and stack.valid_for_read then
+                    local spilled_items = surface.spill_item_stack{
+                        position = position,
+                        stack = stack,
+                        enable_looted = false, -- do not mark for auto-pickup
+                        force = nil, -- do not mark for auto-deconstruction
+                        allow_belts = true, -- do mark for putting it onto belts
+                    }
+                    if #spilled_items > 0 then
+                        stack.clear() -- only delete if spilled successfully
+                    end
+                end
+            end
+        end
+    end
+end
diff --git a/worlds/factorio/data/mod_template/control.lua b/worlds/factorio/data/mod_template/control.lua
index 87669beaf199..07fd4c04afae 100644
--- a/worlds/factorio/data/mod_template/control.lua
+++ b/worlds/factorio/data/mod_template/control.lua
@@ -750,6 +750,11 @@ end,
         fire_entity_at_entities("atomic-rocket", {cliffs[math.random(#cliffs)]}, 0.1)
     end
 end,
+["Inventory Spill Trap"] = function ()
+    for _, player in ipairs(game.forces["player"].players) do
+        spill_character_inventory(player.character)
+    end
+end,
 }
 
 commands.add_command("ap-get-technology", "Grant a technology, used by the Archipelago Client.", function(call)

From 57a571cc110a0df310f0debc2a6fbbb9ea9304ca Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Sun, 26 Jan 2025 18:52:02 -0600
Subject: [PATCH 328/381] KDL3: Fix world access on non-strict open world
 (#4543)

* Update rules.py

* lambda capture
---
 worlds/kdl3/rules.py | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/worlds/kdl3/rules.py b/worlds/kdl3/rules.py
index a08e99257e17..828740859e9b 100644
--- a/worlds/kdl3/rules.py
+++ b/worlds/kdl3/rules.py
@@ -206,19 +206,19 @@ def set_rules(world: "KDL3World") -> None:
                  lambda state: can_reach_needle(state, 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)))
+                               (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(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)))
+                               (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(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)))
+                               (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(location_name.cloudy_park_6_u1, world.player),
                  lambda state: can_reach_cutter(state, world.player))
 
@@ -248,9 +248,9 @@ def set_rules(world: "KDL3World") -> None:
         for i in range(12, 18):
             set_rule(world.multiworld.get_location(f"Sand Canyon 5 - Star {i}", 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)))
+                                   (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)))
         for i in range(21, 23):
             set_rule(world.multiworld.get_location(f"Sand Canyon 5 - Star {i}", world.player),
                      lambda state: can_reach_chuchu(state, world.player))
@@ -307,7 +307,7 @@ def set_rules(world: "KDL3World") -> None:
              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))
+                           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",
@@ -329,6 +329,14 @@ def set_rules(world: "KDL3World") -> None:
                                                         world.options.ow_boss_requirement.value,
                                                         world.player_levels)))
 
+    if world.options.open_world:
+        for boss_flag, level in zip(["Level 1 Boss - Defeated", "Level 2 Boss - Defeated", "Level 3 Boss - Defeated",
+                                     "Level 4 Boss - Defeated", "Level 5 Boss - Defeated"],
+                                    location_name.level_names.keys()):
+            set_rule(world.get_location(boss_flag),
+                     lambda state, lvl=level: state.has(f"{lvl} - Stage Completion", world.player,
+                                                        world.options.ow_boss_requirement.value))
+
     set_rule(world.multiworld.get_entrance("To Level 6", world.player),
              lambda state: state.has("Heart Star", world.player, world.required_heart_stars))
 

From c43233120a828b4c89ee6c8ce1352c396fbe7266 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Mon, 27 Jan 2025 07:24:26 -0800
Subject: [PATCH 329/381] Pokemon Emerald: Clarify death link and start
 inventory descriptions (#4517)

---
 worlds/pokemon_emerald/__init__.py |  3 ++-
 worlds/pokemon_emerald/options.py  | 27 +++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py
index 7b62b9ef73b1..50d6279179d9 100644
--- a/worlds/pokemon_emerald/__init__.py
+++ b/worlds/pokemon_emerald/__init__.py
@@ -22,7 +22,7 @@
                         set_free_fly, set_legendary_cave_entrances)
 from .opponents import randomize_opponent_parties
 from .options import (Goal, DarkCavesRequireFlash, HmRequirements, ItemPoolType, PokemonEmeraldOptions,
-                      RandomizeWildPokemon, RandomizeBadges, RandomizeHms, NormanRequirement)
+                      RandomizeWildPokemon, RandomizeBadges, RandomizeHms, NormanRequirement, OPTION_GROUPS)
 from .pokemon import (get_random_move, get_species_id_by_label, randomize_abilities, randomize_learnsets,
                       randomize_legendary_encounters, randomize_misc_pokemon, randomize_starters,
                       randomize_tm_hm_compatibility,randomize_types, randomize_wild_encounters)
@@ -63,6 +63,7 @@ class PokemonEmeraldWebWorld(WebWorld):
     )
 
     tutorials = [setup_en, setup_es, setup_sv]
+    option_groups = OPTION_GROUPS
 
 
 class PokemonEmeraldSettings(settings.Group):
diff --git a/worlds/pokemon_emerald/options.py b/worlds/pokemon_emerald/options.py
index cf0c692d06d8..32644d52e0b6 100644
--- a/worlds/pokemon_emerald/options.py
+++ b/worlds/pokemon_emerald/options.py
@@ -4,7 +4,7 @@
 from dataclasses import dataclass
 
 from Options import (Choice, DeathLink, DefaultOnToggle, OptionSet, NamedRange, Range, Toggle, FreeText,
-                     PerGameCommonOptions)
+                     PerGameCommonOptions, OptionGroup, StartInventory)
 
 from .data import data
 
@@ -803,6 +803,10 @@ class RandomizeFanfares(Toggle):
     display_name = "Randomize Fanfares"
 
 
+class PokemonEmeraldDeathLink(DeathLink):
+    __doc__ = DeathLink.__doc__ + "\n\n    In Pokemon Emerald, whiting out sends a death and receiving a death causes you to white out."
+
+
 class WonderTrading(DefaultOnToggle):
     """
     Allows participation in wonder trading with other players in your current multiworld. Speak with the center receptionist on the second floor of any pokecenter.
@@ -828,6 +832,14 @@ class EasterEgg(FreeText):
     default = "EMERALD SECRET"
 
 
+class PokemonEmeraldStartInventory(StartInventory):
+    """
+    Start with these items.
+
+    They will be in your PC, which you can access from your home or a pokemon center.
+    """
+
+
 @dataclass
 class PokemonEmeraldOptions(PerGameCommonOptions):
     goal: Goal
@@ -904,7 +916,18 @@ class PokemonEmeraldOptions(PerGameCommonOptions):
     music: RandomizeMusic
     fanfares: RandomizeFanfares
 
-    death_link: DeathLink
+    death_link: PokemonEmeraldDeathLink
 
     enable_wonder_trading: WonderTrading
     easter_egg: EasterEgg
+
+    start_inventory: PokemonEmeraldStartInventory
+
+
+OPTION_GROUPS = [
+    OptionGroup(
+        "Item & Location Options", [
+            PokemonEmeraldStartInventory,
+        ], True,
+    ),
+]

From b570aa2ec6c811db280a835827aa3983f145a1a6 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Mon, 27 Jan 2025 07:25:31 -0800
Subject: [PATCH 330/381] Pokemon Emerald: Clean up free fly blacklist (#4552)

---
 worlds/pokemon_emerald/locations.py | 10 +++++++++-
 worlds/pokemon_emerald/options.py   | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/worlds/pokemon_emerald/locations.py b/worlds/pokemon_emerald/locations.py
index 2bae8e00ed34..49ce147041ee 100644
--- a/worlds/pokemon_emerald/locations.py
+++ b/worlds/pokemon_emerald/locations.py
@@ -34,6 +34,11 @@
 }
 
 BLACKLIST_OPTION_TO_VISITED_EVENT = {
+    "Littleroot Town": "EVENT_VISITED_LITTLEROOT_TOWN",
+    "Oldale Town": "EVENT_VISITED_OLDALE_TOWN",
+    "Petalburg City": "EVENT_VISITED_PETALBURG_CITY",
+    "Rustboro City": "EVENT_VISITED_RUSTBORO_CITY",
+    "Dewford Town": "EVENT_VISITED_DEWFORD_TOWN",
     "Slateport City": "EVENT_VISITED_SLATEPORT_CITY",
     "Mauville City": "EVENT_VISITED_MAUVILLE_CITY",
     "Verdanturf Town": "EVENT_VISITED_VERDANTURF_TOWN",
@@ -46,6 +51,9 @@
     "Ever Grande City": "EVENT_VISITED_EVER_GRANDE_CITY",
 }
 
+VISITED_EVENTS = frozenset(BLACKLIST_OPTION_TO_VISITED_EVENT.values())
+
+
 class PokemonEmeraldLocation(Location):
     game: str = "Pokemon Emerald"
     item_address: Optional[int]
@@ -142,7 +150,7 @@ def set_free_fly(world: "PokemonEmeraldWorld") -> None:
     fly_location_name = "EVENT_VISITED_LITTLEROOT_TOWN"
     if world.options.free_fly_location:
         blacklisted_locations = set(BLACKLIST_OPTION_TO_VISITED_EVENT[city] for city in world.options.free_fly_blacklist.value)
-        free_fly_locations = sorted(set(BLACKLIST_OPTION_TO_VISITED_EVENT.values()) - blacklisted_locations)
+        free_fly_locations = sorted(VISITED_EVENTS - blacklisted_locations)
         if free_fly_locations:
             fly_location_name = world.random.choice(free_fly_locations)
 
diff --git a/worlds/pokemon_emerald/options.py b/worlds/pokemon_emerald/options.py
index 32644d52e0b6..29929bd67237 100644
--- a/worlds/pokemon_emerald/options.py
+++ b/worlds/pokemon_emerald/options.py
@@ -725,13 +725,20 @@ class FreeFlyLocation(Toggle):
     """
     display_name = "Free Fly Location"
 
+
 class FreeFlyBlacklist(OptionSet):
     """
     Disables specific locations as valid free fly locations.
+
     Has no effect if Free Fly Location is disabled.
     """
     display_name = "Free Fly Blacklist"
     valid_keys = [
+        "Littleroot Town",
+        "Oldale Town",
+        "Petalburg City",
+        "Rustboro City",
+        "Dewford Town",
         "Slateport City",
         "Mauville City",
         "Verdanturf Town",
@@ -743,6 +750,14 @@ class FreeFlyBlacklist(OptionSet):
         "Sootopolis City",
         "Ever Grande City",
     ]
+    default = [
+        "Littleroot Town",
+        "Oldale Town",
+        "Petalburg City",
+        "Rustboro City",
+        "Dewford Town",
+    ]
+
 
 class HmRequirements(Choice):
     """

From 43874b1d28fa8d5a5bdc96d4408e303f57763ddd Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Mon, 27 Jan 2025 10:27:43 -0500
Subject: [PATCH 331/381] Noita: Add clarification to check option descriptions
 (#4553)

---
 worlds/noita/options.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/worlds/noita/options.py b/worlds/noita/options.py
index 0fdd62365a5a..8a973a0d7229 100644
--- a/worlds/noita/options.py
+++ b/worlds/noita/options.py
@@ -20,6 +20,8 @@ class PathOption(Choice):
 class HiddenChests(Range):
     """
     Number of hidden chest checks added to the applicable biomes.
+    Note: The number of hidden chests that spawn per run in each biome varies.
+    You are expected do multiple runs to get all of your checks.
     """
     display_name = "Hidden Chests per Biome"
     range_start = 0
@@ -30,6 +32,8 @@ class HiddenChests(Range):
 class PedestalChecks(Range):
     """
     Number of checks that will spawn on pedestals in the applicable biomes.
+    Note: The number of pedestals that spawn per run in each biome varies.
+    You are expected do multiple runs to get all of your checks.
     """
     display_name = "Pedestal Checks per Biome"
     range_start = 0

From 41055cd963c183244e262344e03d6ae6369fc52a Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Mon, 27 Jan 2025 08:01:18 -0800
Subject: [PATCH 332/381] Pokemon Emerald: Update changelog (#4551)

---
 worlds/pokemon_emerald/CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/worlds/pokemon_emerald/CHANGELOG.md b/worlds/pokemon_emerald/CHANGELOG.md
index 0dd874b25029..8d33d7090044 100644
--- a/worlds/pokemon_emerald/CHANGELOG.md
+++ b/worlds/pokemon_emerald/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 2.4.0
+
+### Features
+
+- New option `free_fly_blacklist` limits which cities can show up as a free fly location.
+- Spoiler log and hint text for maps where a species can be found now use human-friendly labels.
+- Added many item and location groups based on item type, location type, and location geography.
+
+### Fixes
+
+- Now excludes the location "Navel Rock Top - Hidden Item Sacred Ash" if your goal is Champion and you didn't randomize
+event tickets.
+
 # 2.3.0
 
 ### Features

From 8c5592e40684af4b9ac855e1a3b4b6e69622bffb Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Mon, 27 Jan 2025 11:06:10 -0500
Subject: [PATCH 333/381] KH2: Fix determinism by using tuples instead of sets
 (#4548)

---
 worlds/kh2/Regions.py | 176 +++++++++++++++++++++---------------------
 1 file changed, 88 insertions(+), 88 deletions(-)

diff --git a/worlds/kh2/Regions.py b/worlds/kh2/Regions.py
index e6e8a7b2f663..72b3c95b0947 100644
--- a/worlds/kh2/Regions.py
+++ b/worlds/kh2/Regions.py
@@ -1032,99 +1032,99 @@ def connect_regions(self):
     multiworld = self.multiworld
     player = self.player
     # connecting every first visit to the GoA
-    KH2RegionConnections: typing.Dict[str, typing.Set[str]] = {
-        "Menu":                        {RegionName.GoA},
-        RegionName.GoA:                {RegionName.Sp, RegionName.Pr, RegionName.Tt, RegionName.Oc, RegionName.Ht,
+    KH2RegionConnections: typing.Dict[str, typing.Tuple[str]] = {
+        "Menu":                        (RegionName.GoA,),
+        RegionName.GoA:                (RegionName.Sp, RegionName.Pr, RegionName.Tt, RegionName.Oc, RegionName.Ht,
                                         RegionName.LoD,
                                         RegionName.Twtnw, RegionName.Bc, RegionName.Ag, RegionName.Pl, RegionName.Hb,
                                         RegionName.Dc, RegionName.Stt,
                                         RegionName.Ha1, RegionName.Keyblade, RegionName.LevelsVS1,
                                         RegionName.Valor, RegionName.Wisdom, RegionName.Limit, RegionName.Master,
-                                        RegionName.Final, RegionName.Summon, RegionName.AtlanticaSongOne},
-        RegionName.LoD:                {RegionName.ShanYu},
-        RegionName.ShanYu:             {RegionName.LoD2},
-        RegionName.LoD2:               {RegionName.AnsemRiku},
-        RegionName.AnsemRiku:          {RegionName.StormRider},
-        RegionName.StormRider:         {RegionName.DataXigbar},
-        RegionName.Ag:                 {RegionName.TwinLords},
-        RegionName.TwinLords:          {RegionName.Ag2},
-        RegionName.Ag2:                {RegionName.GenieJafar},
-        RegionName.GenieJafar:         {RegionName.DataLexaeus},
-        RegionName.Dc:                 {RegionName.Tr},
-        RegionName.Tr:                 {RegionName.OldPete},
-        RegionName.OldPete:            {RegionName.FuturePete},
-        RegionName.FuturePete:         {RegionName.Terra, RegionName.DataMarluxia},
-        RegionName.Ha1:                {RegionName.Ha2},
-        RegionName.Ha2:                {RegionName.Ha3},
-        RegionName.Ha3:                {RegionName.Ha4},
-        RegionName.Ha4:                {RegionName.Ha5},
-        RegionName.Ha5:                {RegionName.Ha6},
-        RegionName.Pr:                 {RegionName.Barbosa},
-        RegionName.Barbosa:            {RegionName.Pr2},
-        RegionName.Pr2:                {RegionName.GrimReaper1},
-        RegionName.GrimReaper1:        {RegionName.GrimReaper2},
-        RegionName.GrimReaper2:        {RegionName.DataLuxord},
-        RegionName.Oc:                 {RegionName.Cerberus},
-        RegionName.Cerberus:           {RegionName.OlympusPete},
-        RegionName.OlympusPete:        {RegionName.Hydra},
-        RegionName.Hydra:              {RegionName.OcPainAndPanicCup, RegionName.OcCerberusCup, RegionName.Oc2},
-        RegionName.Oc2:                {RegionName.Hades},
-        RegionName.Hades:              {RegionName.Oc2TitanCup, RegionName.Oc2GofCup, RegionName.DataZexion},
-        RegionName.Oc2GofCup:          {RegionName.HadesCups},
-        RegionName.Bc:                 {RegionName.Thresholder},
-        RegionName.Thresholder:        {RegionName.Beast},
-        RegionName.Beast:              {RegionName.DarkThorn},
-        RegionName.DarkThorn:          {RegionName.Bc2},
-        RegionName.Bc2:                {RegionName.Xaldin},
-        RegionName.Xaldin:             {RegionName.DataXaldin},
-        RegionName.Sp:                 {RegionName.HostileProgram},
-        RegionName.HostileProgram:     {RegionName.Sp2},
-        RegionName.Sp2:                {RegionName.Mcp},
-        RegionName.Mcp:                {RegionName.DataLarxene},
-        RegionName.Ht:                 {RegionName.PrisonKeeper},
-        RegionName.PrisonKeeper:       {RegionName.OogieBoogie},
-        RegionName.OogieBoogie:        {RegionName.Ht2},
-        RegionName.Ht2:                {RegionName.Experiment},
-        RegionName.Experiment:         {RegionName.DataVexen},
-        RegionName.Hb:                 {RegionName.Hb2},
-        RegionName.Hb2:                {RegionName.CoR, RegionName.HBDemyx},
-        RegionName.HBDemyx:            {RegionName.ThousandHeartless},
-        RegionName.ThousandHeartless:  {RegionName.Mushroom13, RegionName.DataDemyx, RegionName.Sephi},
-        RegionName.CoR:                {RegionName.CorFirstFight},
-        RegionName.CorFirstFight:      {RegionName.CorSecondFight},
-        RegionName.CorSecondFight:     {RegionName.Transport},
-        RegionName.Pl:                 {RegionName.Scar},
-        RegionName.Scar:               {RegionName.Pl2},
-        RegionName.Pl2:                {RegionName.GroundShaker},
-        RegionName.GroundShaker:       {RegionName.DataSaix},
-        RegionName.Stt:                {RegionName.TwilightThorn},
-        RegionName.TwilightThorn:      {RegionName.Axel1},
-        RegionName.Axel1:              {RegionName.Axel2},
-        RegionName.Axel2:              {RegionName.DataRoxas},
-        RegionName.Tt:                 {RegionName.Tt2},
-        RegionName.Tt2:                {RegionName.Tt3},
-        RegionName.Tt3:                {RegionName.DataAxel},
-        RegionName.Twtnw:              {RegionName.Roxas},
-        RegionName.Roxas:              {RegionName.Xigbar},
-        RegionName.Xigbar:             {RegionName.Luxord},
-        RegionName.Luxord:             {RegionName.Saix},
-        RegionName.Saix:               {RegionName.Twtnw2},
-        RegionName.Twtnw2:             {RegionName.Xemnas},
-        RegionName.Xemnas:             {RegionName.ArmoredXemnas, RegionName.DataXemnas},
-        RegionName.ArmoredXemnas:      {RegionName.ArmoredXemnas2},
-        RegionName.ArmoredXemnas2:     {RegionName.FinalXemnas},
-        RegionName.LevelsVS1:          {RegionName.LevelsVS3},
-        RegionName.LevelsVS3:          {RegionName.LevelsVS6},
-        RegionName.LevelsVS6:          {RegionName.LevelsVS9},
-        RegionName.LevelsVS9:          {RegionName.LevelsVS12},
-        RegionName.LevelsVS12:         {RegionName.LevelsVS15},
-        RegionName.LevelsVS15:         {RegionName.LevelsVS18},
-        RegionName.LevelsVS18:         {RegionName.LevelsVS21},
-        RegionName.LevelsVS21:         {RegionName.LevelsVS24},
-        RegionName.LevelsVS24:         {RegionName.LevelsVS26},
-        RegionName.AtlanticaSongOne:   {RegionName.AtlanticaSongTwo},
-        RegionName.AtlanticaSongTwo:   {RegionName.AtlanticaSongThree},
-        RegionName.AtlanticaSongThree: {RegionName.AtlanticaSongFour},
+                                        RegionName.Final, RegionName.Summon, RegionName.AtlanticaSongOne),
+        RegionName.LoD:                (RegionName.ShanYu,),
+        RegionName.ShanYu:             (RegionName.LoD2,),
+        RegionName.LoD2:               (RegionName.AnsemRiku,),
+        RegionName.AnsemRiku:          (RegionName.StormRider,),
+        RegionName.StormRider:         (RegionName.DataXigbar,),
+        RegionName.Ag:                 (RegionName.TwinLords,),
+        RegionName.TwinLords:          (RegionName.Ag2,),
+        RegionName.Ag2:                (RegionName.GenieJafar,),
+        RegionName.GenieJafar:         (RegionName.DataLexaeus,),
+        RegionName.Dc:                 (RegionName.Tr,),
+        RegionName.Tr:                 (RegionName.OldPete,),
+        RegionName.OldPete:            (RegionName.FuturePete,),
+        RegionName.FuturePete:         (RegionName.Terra, RegionName.DataMarluxia),
+        RegionName.Ha1:                (RegionName.Ha2,),
+        RegionName.Ha2:                (RegionName.Ha3,),
+        RegionName.Ha3:                (RegionName.Ha4,),
+        RegionName.Ha4:                (RegionName.Ha5,),
+        RegionName.Ha5:                (RegionName.Ha6,),
+        RegionName.Pr:                 (RegionName.Barbosa,),
+        RegionName.Barbosa:            (RegionName.Pr2,),
+        RegionName.Pr2:                (RegionName.GrimReaper1,),
+        RegionName.GrimReaper1:        (RegionName.GrimReaper2,),
+        RegionName.GrimReaper2:        (RegionName.DataLuxord,),
+        RegionName.Oc:                 (RegionName.Cerberus,),
+        RegionName.Cerberus:           (RegionName.OlympusPete,),
+        RegionName.OlympusPete:        (RegionName.Hydra,),
+        RegionName.Hydra:              (RegionName.OcPainAndPanicCup, RegionName.OcCerberusCup, RegionName.Oc2),
+        RegionName.Oc2:                (RegionName.Hades,),
+        RegionName.Hades:              (RegionName.Oc2TitanCup, RegionName.Oc2GofCup, RegionName.DataZexion),
+        RegionName.Oc2GofCup:          (RegionName.HadesCups,),
+        RegionName.Bc:                 (RegionName.Thresholder,),
+        RegionName.Thresholder:        (RegionName.Beast,),
+        RegionName.Beast:              (RegionName.DarkThorn,),
+        RegionName.DarkThorn:          (RegionName.Bc2,),
+        RegionName.Bc2:                (RegionName.Xaldin,),
+        RegionName.Xaldin:             (RegionName.DataXaldin,),
+        RegionName.Sp:                 (RegionName.HostileProgram,),
+        RegionName.HostileProgram:     (RegionName.Sp2,),
+        RegionName.Sp2:                (RegionName.Mcp,),
+        RegionName.Mcp:                (RegionName.DataLarxene,),
+        RegionName.Ht:                 (RegionName.PrisonKeeper,),
+        RegionName.PrisonKeeper:       (RegionName.OogieBoogie,),
+        RegionName.OogieBoogie:        (RegionName.Ht2,),
+        RegionName.Ht2:                (RegionName.Experiment,),
+        RegionName.Experiment:         (RegionName.DataVexen,),
+        RegionName.Hb:                 (RegionName.Hb2,),
+        RegionName.Hb2:                (RegionName.CoR, RegionName.HBDemyx),
+        RegionName.HBDemyx:            (RegionName.ThousandHeartless,),
+        RegionName.ThousandHeartless:  (RegionName.Mushroom13, RegionName.DataDemyx, RegionName.Sephi),
+        RegionName.CoR:                (RegionName.CorFirstFight,),
+        RegionName.CorFirstFight:      (RegionName.CorSecondFight,),
+        RegionName.CorSecondFight:     (RegionName.Transport,),
+        RegionName.Pl:                 (RegionName.Scar,),
+        RegionName.Scar:               (RegionName.Pl2,),
+        RegionName.Pl2:                (RegionName.GroundShaker,),
+        RegionName.GroundShaker:       (RegionName.DataSaix,),
+        RegionName.Stt:                (RegionName.TwilightThorn,),
+        RegionName.TwilightThorn:      (RegionName.Axel1,),
+        RegionName.Axel1:              (RegionName.Axel2,),
+        RegionName.Axel2:              (RegionName.DataRoxas,),
+        RegionName.Tt:                 (RegionName.Tt2,),
+        RegionName.Tt2:                (RegionName.Tt3,),
+        RegionName.Tt3:                (RegionName.DataAxel,),
+        RegionName.Twtnw:              (RegionName.Roxas,),
+        RegionName.Roxas:              (RegionName.Xigbar,),
+        RegionName.Xigbar:             (RegionName.Luxord,),
+        RegionName.Luxord:             (RegionName.Saix,),
+        RegionName.Saix:               (RegionName.Twtnw2,),
+        RegionName.Twtnw2:             (RegionName.Xemnas,),
+        RegionName.Xemnas:             (RegionName.ArmoredXemnas, RegionName.DataXemnas),
+        RegionName.ArmoredXemnas:      (RegionName.ArmoredXemnas2,),
+        RegionName.ArmoredXemnas2:     (RegionName.FinalXemnas,),
+        RegionName.LevelsVS1:          (RegionName.LevelsVS3,),
+        RegionName.LevelsVS3:          (RegionName.LevelsVS6,),
+        RegionName.LevelsVS6:          (RegionName.LevelsVS9,),
+        RegionName.LevelsVS9:          (RegionName.LevelsVS12,),
+        RegionName.LevelsVS12:         (RegionName.LevelsVS15,),
+        RegionName.LevelsVS15:         (RegionName.LevelsVS18,),
+        RegionName.LevelsVS18:         (RegionName.LevelsVS21,),
+        RegionName.LevelsVS21:         (RegionName.LevelsVS24,),
+        RegionName.LevelsVS24:         (RegionName.LevelsVS26,),
+        RegionName.AtlanticaSongOne:   (RegionName.AtlanticaSongTwo,),
+        RegionName.AtlanticaSongTwo:   (RegionName.AtlanticaSongThree,),
+        RegionName.AtlanticaSongThree: (RegionName.AtlanticaSongFour,),
     }
 
     for source, target in KH2RegionConnections.items():

From a53bcb4697f1a077075cc603ad4588a693c3b23d Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Mon, 27 Jan 2025 23:13:10 +0100
Subject: [PATCH 334/381] KH2: Use int(..., 0) in Client #4562

---
 worlds/kh2/Client.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/worlds/kh2/Client.py b/worlds/kh2/Client.py
index 0254d46e934e..a21c8c7c5536 100644
--- a/worlds/kh2/Client.py
+++ b/worlds/kh2/Client.py
@@ -836,12 +836,12 @@ def get_addresses(self):
                         if self.mem_json:
                             for key in self.mem_json.keys():
 
-                                if self.kh2_read_string(eval(self.mem_json[key]["GameVersionCheck"]), 4) == "KH2J":
-                                    self.Now = eval(self.mem_json[key]["Now"])
-                                    self.Save=eval(self.mem_json[key]["Save"])
-                                    self.Slot1 = eval(self.mem_json[key]["Slot1"])
-                                    self.Journal = eval(self.mem_json[key]["Journal"])
-                                    self.Shop = eval(self.mem_json[key]["Shop"])
+                                if self.kh2_read_string(int(self.mem_json[key]["GameVersionCheck"], 0), 4) == "KH2J":
+                                    self.Now = int(self.mem_json[key]["Now"], 0)
+                                    self.Save = int(self.mem_json[key]["Save"], 0)
+                                    self.Slot1 = int(self.mem_json[key]["Slot1"], 0)
+                                    self.Journal = int(self.mem_json[key]["Journal"], 0)
+                                    self.Shop = int(self.mem_json[key]["Shop"], 0)
                                     self.kh2_game_version = key
 
             if self.kh2_game_version is not None:

From 9466d5274e5759d0081f02e0aad9829dd1f1dbd3 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:45:28 -0600
Subject: [PATCH 335/381] MM2: fix plando and weakness special cases (#4561)

---
 worlds/mm2/options.py |  2 +-
 worlds/mm2/rules.py   | 61 ++++++++++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/worlds/mm2/options.py b/worlds/mm2/options.py
index 2d90395cacda..f33334898223 100644
--- a/worlds/mm2/options.py
+++ b/worlds/mm2/options.py
@@ -175,7 +175,7 @@ class WeaknessPlando(OptionDict):
     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))
+            And(str, Use(str.title), lambda s: s in weapons_to_id): And(int, lambda i: i in range(-1, 15))
         }
     })
     default = {}
diff --git a/worlds/mm2/rules.py b/worlds/mm2/rules.py
index 7e2ce1f3c752..7e03edf3a23b 100644
--- a/worlds/mm2/rules.py
+++ b/worlds/mm2/rules.py
@@ -135,41 +135,47 @@ def set_rules(world: "MM2World") -> None:
                         world.weapon_damage[weapon][i] = 0
 
         for p_boss in world.options.plando_weakness:
+            boss = bosses[p_boss]
             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):
+                weapon = weapons_to_id[p_weapon]
+                if world.options.plando_weakness[p_boss][p_weapon] < minimum_weakness_requirement[weapon] \
+                        and not any(w != weapon
+                                    and world.weapon_damage[w][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]
+                    weakness = world.random.choice([key for key in world.weapon_damage if key != weapon])
+                    world.weapon_damage[weakness][boss] = minimum_weakness_requirement[weakness]
+                world.weapon_damage[weapon][boss] = world.options.plando_weakness[p_boss][p_weapon]
 
         # handle special cases
         for boss in range(14):
             for weapon in (1, 2, 3, 6, 8):
                 if (0 < world.weapon_damage[weapon][boss] < minimum_weakness_requirement[weapon] and
-                        not any(world.weapon_damage[i][boss] >= minimum_weakness_requirement[weapon]
+                        not any(world.weapon_damage[i][boss] >= minimum_weakness_requirement[i]
                                 for i in range(9) if i != weapon)):
                     # Weapon does not have enough possible ammo to kill the boss, raise the damage
-                    if boss == 9:
-                        if weapon in (1, 6):
-                            # 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]
+                    world.weapon_damage[weapon][boss] = minimum_weakness_requirement[weapon]
+
+        for weapon in (1, 6):
+            if (world.weapon_damage[weapon][9] >= minimum_weakness_requirement[weapon] and
+                    not any(world.weapon_damage[i][9] >= minimum_weakness_requirement[i]
+                            for i in range(9) if i not in (1, 6))):
+                # Atomic Fire and Crash Bomber cannot be Picopico-kun's only weakness
+                world.weapon_damage[weapon][9] = 0
+                weakness = world.random.choice((2, 3, 4, 5, 7, 8))
+                world.weapon_damage[weakness][9] = minimum_weakness_requirement[weakness]
+
+        if (world.weapon_damage[1][11] >= minimum_weakness_requirement[1] and
+                not any(world.weapon_damage[i][11] >= minimum_weakness_requirement[i]
+                        for i in range(9) if i != 1)):
+            # Atomic Fire cannot be Boobeam Trap's only weakness
+            world.weapon_damage[1][11] = 0
+            weakness = world.random.choice((2, 3, 4, 5, 6, 7, 8))
+            world.weapon_damage[weakness][11] = minimum_weakness_requirement[weakness]
 
         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]
+            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
@@ -218,9 +224,10 @@ def set_rules(world: "MM2World") -> None:
                     # 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
+                    # 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 and (weapon != 8 or boss != 12))
                     # Wily Machine cannot under any circumstances take damage from Time Stopper, prevent this
                     world.weapon_damage[wp][boss] = minimum_weakness_requirement[wp]

From 1ebc9e2ec03de4dc3c18af6b0d9e82655614ff81 Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Tue, 28 Jan 2025 17:19:20 -0500
Subject: [PATCH 336/381] Stardew Valley: Tests: Restructure the tests that
 validate Mods + ER together, improved performance (#4557)

* - Unrolled and improved the structure of the test for Mods + ER, to improve total performance and performance on individual tests for threading purposes

* Use | instead of Union[]

Co-authored-by: Jouramie <16137441+Jouramie@users.noreply.github.com>

* - Remove unused using

---------

Co-authored-by: Jouramie <16137441+Jouramie@users.noreply.github.com>
---
 worlds/stardew_valley/test/mods/TestMods.py | 65 +++++++++++++++++----
 1 file changed, 54 insertions(+), 11 deletions(-)

diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index 89f82870e4a7..02592cc3834a 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -7,7 +7,9 @@
 from ... import items, Group, ItemClassification, create_content
 from ... import options
 from ...items import items_by_group
+from ...mods.mod_data import ModNames
 from ...options import SkillProgression, Walnutsanity
+from ...options.options import all_mods
 from ...regions import RandomizationFlag, randomize_connections, create_final_connections_and_regions
 
 
@@ -20,17 +22,58 @@ def test_given_single_mods_when_generate_then_basic_checks(self):
                 self.assert_basic_checks(multi_world)
                 self.assert_stray_mod_items(mod, multi_world)
 
-    def test_given_mod_names_when_generate_paired_with_entrance_randomizer_then_basic_checks(self):
-        for option in options.EntranceRandomization.options:
-            for mod in options.Mods.valid_keys:
-                world_options = {
-                    options.EntranceRandomization: options.EntranceRandomization.options[option],
-                    options.Mods: mod,
-                    options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false
-                }
-                with self.solo_world_sub_test(f"entrance_randomization: {option}, Mod: {mod}", world_options) as (multi_world, _):
-                    self.assert_basic_checks(multi_world)
-                    self.assert_stray_mod_items(mod, multi_world)
+    # The following tests validate that ER still generates winnable and logically-sane games with given mods.
+    # Mods that do not interact with entrances are skipped
+    # Not all ER settings are tested, because 'buildings' is, essentially, a superset of all others
+    def test_deepwoods_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.deepwoods, options.EntranceRandomization.option_buildings)
+
+    def test_juna_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.juna, options.EntranceRandomization.option_buildings)
+
+    def test_jasper_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.jasper, options.EntranceRandomization.option_buildings)
+
+    def test_alec_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.alec, options.EntranceRandomization.option_buildings)
+
+    def test_yoba_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.yoba, options.EntranceRandomization.option_buildings)
+
+    def test_eugene_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.eugene, options.EntranceRandomization.option_buildings)
+
+    def test_ayeisha_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.ayeisha, options.EntranceRandomization.option_buildings)
+
+    def test_riley_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.riley, options.EntranceRandomization.option_buildings)
+
+    def test_sve_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.sve, options.EntranceRandomization.option_buildings)
+
+    def test_alecto_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.alecto, options.EntranceRandomization.option_buildings)
+
+    def test_lacey_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.lacey, options.EntranceRandomization.option_buildings)
+
+    def test_boarding_house_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(ModNames.boarding_house, options.EntranceRandomization.option_buildings)
+
+    def test_all_mods_entrance_randomization_buildings(self):
+        self.perform_basic_checks_on_mod_with_er(all_mods, options.EntranceRandomization.option_buildings)
+
+    def perform_basic_checks_on_mod_with_er(self, mods: str | set[str], er_option: int) -> None:
+        if isinstance(mods, str):
+            mods = {mods}
+        world_options = {
+            options.EntranceRandomization: er_option,
+            options.Mods: frozenset(mods),
+            options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false
+        }
+        with self.solo_world_sub_test(f"entrance_randomization: {er_option}, Mods: {mods}", world_options) as (multi_world, _):
+            self.assert_basic_checks(multi_world)
 
     def test_allsanity_all_mods_when_generate_then_basic_checks(self):
         with self.solo_world_sub_test(world_options=allsanity_mods_6_x_x()) as (multi_world, _):

From 41898ed6403fa62487c51880792a648d1f4d246b Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Wed, 29 Jan 2025 01:42:46 +0100
Subject: [PATCH 337/381] MultiServer: implement NoText and deprecate
 uncompressed Websocket connections (#4540)

* MultiServer: add NoText tag and handling

* MultiServer: deprecate and warn for uncompressed connections

* MultiServer: fix missing space in no compression warning
---
 MultiServer.py           | 51 +++++++++++++++++++++++++++++-----------
 NetUtils.py              |  5 ++--
 docs/network protocol.md |  4 ++++
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/MultiServer.py b/MultiServer.py
index 9e0868b0f4a8..51b72c93ad3d 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -28,9 +28,11 @@
 
 if typing.TYPE_CHECKING:
     import ssl
+    from NetUtils import ServerConnection
 
-import websockets
 import colorama
+import websockets
+from websockets.extensions.permessage_deflate import PerMessageDeflate
 try:
     # ponyorm is a requirement for webhost, not default server, so may not be importable
     from pony.orm.dbapiprovider import OperationalError
@@ -119,13 +121,14 @@ def get_saving_second(seed_name: str, interval: int = 60) -> int:
 
 class Client(Endpoint):
     version = Version(0, 0, 0)
-    tags: typing.List[str] = []
+    tags: typing.List[str]
     remote_items: bool
     remote_start_inventory: bool
     no_items: bool
     no_locations: bool
+    no_text: bool
 
-    def __init__(self, socket: websockets.WebSocketServerProtocol, ctx: Context):
+    def __init__(self, socket: "ServerConnection", ctx: Context) -> None:
         super().__init__(socket)
         self.auth = False
         self.team = None
@@ -175,6 +178,7 @@ class Context:
                       "compatibility": int}
     # team -> slot id -> list of clients authenticated to slot.
     clients: typing.Dict[int, typing.Dict[int, typing.List[Client]]]
+    endpoints: list[Client]
     locations: LocationStore  # typing.Dict[int, typing.Dict[int, typing.Tuple[int, int, int]]]
     location_checks: typing.Dict[typing.Tuple[int, int], typing.Set[int]]
     hints_used: typing.Dict[typing.Tuple[int, int], int]
@@ -364,18 +368,28 @@ async def broadcast_send_encoded_msgs(self, endpoints: typing.Iterable[Endpoint]
             return True
 
     def broadcast_all(self, msgs: typing.List[dict]):
-        msgs = self.dumper(msgs)
-        endpoints = (endpoint for endpoint in self.endpoints if endpoint.auth)
-        async_start(self.broadcast_send_encoded_msgs(endpoints, msgs))
+        msg_is_text = all(msg["cmd"] == "PrintJSON" for msg in msgs)
+        data = self.dumper(msgs)
+        endpoints = (
+            endpoint
+            for endpoint in self.endpoints
+            if endpoint.auth and not (msg_is_text and endpoint.no_text)
+        )
+        async_start(self.broadcast_send_encoded_msgs(endpoints, data))
 
     def broadcast_text_all(self, text: str, additional_arguments: dict = {}):
         self.logger.info("Notice (all): %s" % text)
         self.broadcast_all([{**{"cmd": "PrintJSON", "data": [{ "text": text }]}, **additional_arguments}])
 
     def broadcast_team(self, team: int, msgs: typing.List[dict]):
-        msgs = self.dumper(msgs)
-        endpoints = (endpoint for endpoint in itertools.chain.from_iterable(self.clients[team].values()))
-        async_start(self.broadcast_send_encoded_msgs(endpoints, msgs))
+        msg_is_text = all(msg["cmd"] == "PrintJSON" for msg in msgs)
+        data = self.dumper(msgs)
+        endpoints = (
+            endpoint
+            for endpoint in itertools.chain.from_iterable(self.clients[team].values())
+            if not (msg_is_text and endpoint.no_text)
+        )
+        async_start(self.broadcast_send_encoded_msgs(endpoints, data))
 
     def broadcast(self, endpoints: typing.Iterable[Client], msgs: typing.List[dict]):
         msgs = self.dumper(msgs)
@@ -389,13 +403,13 @@ async def disconnect(self, endpoint: Client):
         await on_client_disconnected(self, endpoint)
 
     def notify_client(self, client: Client, text: str, additional_arguments: dict = {}):
-        if not client.auth:
+        if not client.auth or client.no_text:
             return
         self.logger.info("Notice (Player %s in team %d): %s" % (client.name, client.team + 1, text))
         async_start(self.send_msgs(client, [{"cmd": "PrintJSON", "data": [{ "text": text }], **additional_arguments}]))
 
     def notify_client_multiple(self, client: Client, texts: typing.List[str], additional_arguments: dict = {}):
-        if not client.auth:
+        if not client.auth or client.no_text:
             return
         async_start(self.send_msgs(client,
                                    [{"cmd": "PrintJSON", "data": [{ "text": text }], **additional_arguments}
@@ -760,7 +774,7 @@ def notify_hints(self, team: int, hints: typing.List[Hint], only_new: bool = Fal
             self.on_new_hint(team, slot)
         for slot, hint_data in concerns.items():
             if recipients is None or slot in recipients:
-                clients = self.clients[team].get(slot)
+                clients = filter(lambda c: not c.no_text, self.clients[team].get(slot, []))
                 if not clients:
                     continue
                 client_hints = [datum[1] for datum in sorted(hint_data, key=lambda x: x[0].finding_player != slot)]
@@ -819,7 +833,7 @@ def update_aliases(ctx: Context, team: int):
             async_start(ctx.send_encoded_msgs(client, cmd))
 
 
-async def server(websocket, path: str = "/", ctx: Context = None):
+async def server(websocket: "ServerConnection", path: str = "/", ctx: Context = None) -> None:
     client = Client(websocket, ctx)
     ctx.endpoints.append(client)
 
@@ -910,6 +924,10 @@ async def on_client_joined(ctx: Context, client: Client):
                               "If your client supports it, "
                               "you may have additional local commands you can list with /help.",
                       {"type": "Tutorial"})
+    if not any(isinstance(extension, PerMessageDeflate) for extension in client.socket.extensions):
+        ctx.notify_client(client, "Warning: your client does not support compressed websocket connections! "
+                                  "It may stop working in the future. If you are a player, please report this to the "
+                                  "client's developer.")
     ctx.client_connection_timers[client.team, client.slot] = datetime.datetime.now(datetime.timezone.utc)
 
 
@@ -1803,7 +1821,9 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
             ctx.clients[team][slot].append(client)
             client.version = args['version']
             client.tags = args['tags']
-            client.no_locations = 'TextOnly' in client.tags or 'Tracker' in client.tags
+            client.no_locations = "TextOnly" in client.tags or "Tracker" in client.tags
+            # set NoText for old PopTracker clients that predate the tag to save traffic
+            client.no_text = "NoText" in client.tags or ("PopTracker" in client.tags and client.version < (0, 5, 1))
             connected_packet = {
                 "cmd": "Connected",
                 "team": client.team, "slot": client.slot,
@@ -1876,6 +1896,9 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
                 client.tags = args["tags"]
                 if set(old_tags) != set(client.tags):
                     client.no_locations = 'TextOnly' in client.tags or 'Tracker' in client.tags
+                    client.no_text = "NoText" in client.tags or (
+                        "PopTracker" in client.tags and client.version < (0, 5, 1)
+                    )
                     ctx.broadcast_text_all(
                         f"{ctx.get_aliased_name(client.team, client.slot)} (Team #{client.team + 1}) has changed tags "
                         f"from {old_tags} to {client.tags}.",
diff --git a/NetUtils.py b/NetUtils.py
index d58bbe81e304..5bcc583c53b6 100644
--- a/NetUtils.py
+++ b/NetUtils.py
@@ -5,7 +5,8 @@
 import warnings
 from json import JSONEncoder, JSONDecoder
 
-import websockets
+if typing.TYPE_CHECKING:
+    from websockets import WebSocketServerProtocol as ServerConnection
 
 from Utils import ByValue, Version
 
@@ -151,7 +152,7 @@ def _object_hook(o: typing.Any) -> typing.Any:
 
 
 class Endpoint:
-    socket: websockets.WebSocketServerProtocol
+    socket: "ServerConnection"
 
     def __init__(self, socket):
         self.socket = socket
diff --git a/docs/network protocol.md b/docs/network protocol.md
index e32c266ffb67..2eb3b0d6f3c2 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -47,6 +47,9 @@ Packets are simple JSON lists in which any number of ordered network commands ca
 
 An object can contain the "class" key, which will tell the content data type, such as "Version" in the following example.
 
+Websocket connections should support per-message compression. Uncompressed connections are deprecated and may stop
+working in the future.
+
 Example:
 ```javascript
 [{"cmd": "RoomInfo", "version": {"major": 0, "minor": 1, "build": 3, "class": "Version"}, "tags": ["WebHost"], ... }]
@@ -745,6 +748,7 @@ Tags are represented as a list of strings, the common client tags follow:
 | HintGame  | Indicates the client is a hint game, made to send hints instead of locations. Special join/leave message,¹ `game` is optional.²      |
 | Tracker   | Indicates the client is a tracker, made to track instead of sending locations. Special join/leave message,¹ `game` is optional.²     |
 | TextOnly  | Indicates the client is a basic client, made to chat instead of sending locations. Special join/leave message,¹ `game` is optional.² |
+| NoText    | Indicates the client does not want to receive text messages, improving performance if not needed.                                    |
 
 ¹: When connecting or disconnecting, the chat message shows e.g. "tracking".\
 ²: Allows `game` to be empty or null in [Connect](#connect). Game and version validation will then be skipped.

From 738c21c625f673caac2d10c173688a10f23c86a1 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Wed, 29 Jan 2025 01:52:01 +0100
Subject: [PATCH 338/381] Tests: massively improve the memory leak test
 performance (#4568)

* Tests: massively improve the memory leak test performance

With the growing number of worlds, GC becomes the bottleneck and slows down the test.

* Tests: fix typing in general/test_memory
---
 test/general/test_memory.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/general/test_memory.py b/test/general/test_memory.py
index 987d19acf35f..a4b2f1bd25df 100644
--- a/test/general/test_memory.py
+++ b/test/general/test_memory.py
@@ -1,5 +1,6 @@
 import unittest
 
+from BaseClasses import MultiWorld
 from worlds.AutoWorld import AutoWorldRegister
 from . import setup_solo_multiworld
 
@@ -9,8 +10,12 @@ def test_leak(self) -> None:
         """Tests that worlds don't leak references to MultiWorld or themselves with default options."""
         import gc
         import weakref
+        refs: dict[str, weakref.ReferenceType[MultiWorld]] = {}
         for game_name, world_type in AutoWorldRegister.world_types.items():
-            with self.subTest("Game", game_name=game_name):
+            with self.subTest("Game creation", game_name=game_name):
                 weak = weakref.ref(setup_solo_multiworld(world_type))
-                gc.collect()
+                refs[game_name] = weak
+        gc.collect()
+        for game_name, weak in refs.items():
+            with self.subTest("Game cleanup", game_name=game_name):
                 self.assertFalse(weak(), "World leaked a reference")

From 57afdfda6f6535bc592581d70d97a3f12977b5a1 Mon Sep 17 00:00:00 2001
From: Felix R <50271878+FelicitusNeko@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:03:37 -0400
Subject: [PATCH 339/381] meritous: move completion_condition to set_rules
 (#4567)

---
 worlds/meritous/__init__.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/worlds/meritous/__init__.py b/worlds/meritous/__init__.py
index 7a21b19ef247..2263478ff5e2 100644
--- a/worlds/meritous/__init__.py
+++ b/worlds/meritous/__init__.py
@@ -136,6 +136,12 @@ def create_items(self):
 
     def set_rules(self):
         set_rules(self.multiworld, self.player)
+        if self.goal == 0:
+            self.multiworld.completion_condition[self.player] = lambda state: state.has_any(
+                ["Victory", "Full Victory"], self.player)
+        else:
+            self.multiworld.completion_condition[self.player] = lambda state: state.has(
+                "Full Victory", self.player)
 
     def generate_basic(self):
         self.multiworld.get_location("Place of Power", self.player).place_locked_item(
@@ -166,13 +172,6 @@ def generate_basic(self):
                 self.multiworld.get_location(boss, self.player).place_locked_item(
                     self.create_item("Evolution Trap"))
 
-        if self.goal == 0:
-            self.multiworld.completion_condition[self.player] = lambda state: state.has_any(
-                ["Victory", "Full Victory"], self.player)
-        else:
-            self.multiworld.completion_condition[self.player] = lambda state: state.has(
-                "Full Victory", self.player)
-
     def fill_slot_data(self) -> dict:
         return {
             "goal": self.goal,

From b8666b25625b0cd2341b9747bc126127cd26022e Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Wed, 29 Jan 2025 13:56:50 -0500
Subject: [PATCH 340/381] Stardew Valley: Remove weird magic trap test? (#4570)

---
 worlds/stardew_valley/test/mods/TestMods.py | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index 02592cc3834a..1dd2ab4902f7 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -1,12 +1,10 @@
 import random
 
 from BaseClasses import get_seed
-from .. import SVTestBase, SVTestCase, allsanity_no_mods_6_x_x, allsanity_mods_6_x_x, solo_multiworld, \
-    fill_dataclass_with_default
+from .. import SVTestBase, SVTestCase, allsanity_mods_6_x_x, fill_dataclass_with_default
 from ..assertion import ModAssertMixin, WorldAssertMixin
 from ... import items, Group, ItemClassification, create_content
 from ... import options
-from ...items import items_by_group
 from ...mods.mod_data import ModNames
 from ...options import SkillProgression, Walnutsanity
 from ...options.options import all_mods
@@ -190,19 +188,3 @@ def test_mod_entrance_randomization(self):
 
                 self.assertEqual(len(set(randomized_connections.values())), len(randomized_connections.values()),
                                  f"Connections are duplicated in randomization.")
-
-
-class TestModTraps(SVTestCase):
-    def test_given_traps_when_generate_then_all_traps_in_pool(self):
-        for value in options.TrapItems.options:
-            if value == "no_traps":
-                continue
-
-            world_options = allsanity_no_mods_6_x_x()
-            world_options.update({options.TrapItems.internal_name: options.TrapItems.options[value], options.Mods.internal_name: "Magic"})
-            with solo_multiworld(world_options) as (multi_world, _):
-                trap_items = [item_data.name for item_data in items_by_group[Group.TRAP] if Group.DEPRECATED not in item_data.groups]
-                multiworld_items = [item.name for item in multi_world.get_items()]
-                for item in trap_items:
-                    with self.subTest(f"Option: {value}, Item: {item}"):
-                        self.assertIn(item, multiworld_items)

From 8e14e463e41945378090da40ab620698baf6d8cc Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Thu, 30 Jan 2025 03:05:51 -0500
Subject: [PATCH 341/381] Stardew Valley: Radioactive slot machine should be a
 ginger island check (#4578)

---
 worlds/stardew_valley/data/locations.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/stardew_valley/data/locations.csv b/worlds/stardew_valley/data/locations.csv
index 43883b86f8ac..66a9157b3437 100644
--- a/worlds/stardew_valley/data/locations.csv
+++ b/worlds/stardew_valley/data/locations.csv
@@ -2938,7 +2938,7 @@ id,region,name,tags,mod_name
 7440,Farm,Craft Copper Slot Machine,"CRAFTSANITY",Luck Skill
 7441,Farm,Craft Gold Slot Machine,"CRAFTSANITY",Luck Skill
 7442,Farm,Craft Iridium Slot Machine,"CRAFTSANITY",Luck Skill
-7443,Farm,Craft Radioactive Slot Machine,"CRAFTSANITY",Luck Skill
+7443,Farm,Craft Radioactive Slot Machine,"CRAFTSANITY,GINGER_ISLAND",Luck Skill
 7451,Adventurer's Guild,Magic Elixir Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Magic
 7452,Adventurer's Guild,Travel Core Recipe,CRAFTSANITY,Magic
 7453,Alesia Shop,Haste Elixir Recipe,CRAFTSANITY,Stardew Valley Expanded

From 1fe8024b438dd56bd20e6b26c8d14fe1e1fbd0b4 Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Thu, 30 Jan 2025 03:19:06 -0500
Subject: [PATCH 342/381] Stardew valley: Add Mod Recipes tests (#4580)

* `- Add Craftsanity Mod tests

* - Add the same test for cooking

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 .../stardew_valley/test/mods/TestModsFill.py  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 worlds/stardew_valley/test/mods/TestModsFill.py

diff --git a/worlds/stardew_valley/test/mods/TestModsFill.py b/worlds/stardew_valley/test/mods/TestModsFill.py
new file mode 100644
index 000000000000..a140f5abae14
--- /dev/null
+++ b/worlds/stardew_valley/test/mods/TestModsFill.py
@@ -0,0 +1,28 @@
+from .. import SVTestBase
+from ... import options
+
+
+class TestNoGingerIslandCraftingRecipesAreRequired(SVTestBase):
+    options = {
+        options.Goal.internal_name: options.Goal.option_craft_master,
+        options.Craftsanity.internal_name: options.Craftsanity.option_all,
+        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
+        options.Mods.internal_name: frozenset(options.Mods.valid_keys)
+    }
+
+    @property
+    def run_default_tests(self) -> bool:
+        return True
+
+
+class TestNoGingerIslandCookingRecipesAreRequired(SVTestBase):
+    options = {
+        options.Goal.internal_name: options.Goal.option_gourmet_chef,
+        options.Cooksanity.internal_name: options.Cooksanity.option_all,
+        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
+        options.Mods.internal_name: frozenset(options.Mods.valid_keys)
+    }
+
+    @property
+    def run_default_tests(self) -> bool:
+        return True

From 67e8877143aecf3587f7b60bdb34659de1500e0d Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Fri, 31 Jan 2025 08:38:17 +0100
Subject: [PATCH 343/381] Docs: fix lower limit of valid IDs in network
 protocol.md (#4579)

---
 docs/network protocol.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/network protocol.md b/docs/network protocol.md
index 2eb3b0d6f3c2..e5d3b7e6c26a 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -533,9 +533,9 @@ In JSON this may look like:
     {"item": 3, "location": 3, "player": 3, "flags": 0}
 ]
 ```
-`item` is the item id of the item. Item ids are only supported in the range of [-2<sup>53</sup>, 2<sup>53</sup> - 1], with anything ≤ 0 reserved for Archipelago use.
+`item` is the item id of the item. Item ids are only supported in the range of [-2<sup>53</sup> + 1, 2<sup>53</sup> - 1], with anything ≤ 0 reserved for Archipelago use.
 
-`location` is the location id of the item inside the world. Location ids are only supported in the range of [-2<sup>53</sup>, 2<sup>53</sup> - 1], with anything ≤ 0 reserved for Archipelago use.
+`location` is the location id of the item inside the world. Location ids are only supported in the range of [-2<sup>53</sup> + 1, 2<sup>53</sup> - 1], with anything ≤ 0 reserved for Archipelago use.
 
 `player` is the player slot of the world the item is located in, except when inside an [LocationInfo](#LocationInfo) Packet then it will be the slot of the player to receive the item
 

From 445c9b22d6cfb9b8ff4e76b91995d08abf154ff5 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Fri, 31 Jan 2025 20:11:04 -0500
Subject: [PATCH 344/381] Settings: Handle empty Groups (#4576)

* export empty groups as an empty dict instead of crashing

* Update settings.py

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

* check instance values from self as well

* Apply suggestions from code review

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 settings.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/settings.py b/settings.py
index 12dace632c8a..cc808c2732df 100644
--- a/settings.py
+++ b/settings.py
@@ -109,7 +109,7 @@ def changed(self) -> bool:
     def get_type_hints(cls) -> Dict[str, Any]:
         """Returns resolved type hints for the class"""
         if cls._type_cache is None:
-            if not isinstance(next(iter(cls.__annotations__.values())), str):
+            if not cls.__annotations__ or not isinstance(next(iter(cls.__annotations__.values())), str):
                 # non-str: assume already resolved
                 cls._type_cache = cls.__annotations__
             else:
@@ -270,11 +270,15 @@ def dump(self, f: TextIO, level: int = 0) -> None:
             # fetch class to avoid going through getattr
             cls = self.__class__
             type_hints = cls.get_type_hints()
+            entries = [e for e in self]
+            if not entries:
+                # write empty dict for empty Group with no instance values
+                cls._dump_value({}, f, indent="  " * level)
             # validate group
             for name in cls.__annotations__.keys():
                 assert hasattr(cls, name), f"{cls}.{name} is missing a default value"
             # dump ordered members
-            for name in self:
+            for name in entries:
                 attr = cast(object, getattr(self, name))
                 attr_cls = type_hints[name] if name in type_hints else attr.__class__
                 attr_cls_origin = typing.get_origin(attr_cls)

From d1167027f4d723856e555a8c9ca7cfe7ce8dde4f Mon Sep 17 00:00:00 2001
From: Jarno <jarnowesthof@gmail.com>
Date: Sat, 1 Feb 2025 02:26:59 +0100
Subject: [PATCH 345/381] Core: Make csv options output ignore hidden options
 (#4539)

* Core: Make csv options output ignore hidden options

* Update Options.py

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

---------

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
---
 Options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Options.py b/Options.py
index d9122d444c97..49e82069ee8d 100644
--- a/Options.py
+++ b/Options.py
@@ -1582,7 +1582,7 @@ def dump_player_options(multiworld: MultiWorld) -> None:
             }
             output.append(player_output)
             for option_key, option in world.options_dataclass.type_hints.items():
-                if issubclass(Removed, option):
+                if option.visibility == Visibility.none:
                     continue
                 display_name = getattr(option, "display_name", option_key)
                 player_output[display_name] = getattr(world.options, option_key).current_option_name

From b7b78dead3bf181545352df1b0e3229fc592b9f2 Mon Sep 17 00:00:00 2001
From: Spineraks <markvanderboor@hotmail.nl>
Date: Sat, 1 Feb 2025 22:03:49 +0100
Subject: [PATCH 346/381] LADX: Fix generation error on minimal accessibility
 (#4281)

* [LADX] Fix minimal accessibility

* allow_partial for minimal accessibility

* create the correct partial_all_state

* skip our prefills rather than removing after

* dont rebuild our prefill list

---------

Co-authored-by: threeandthreee <a.l.nordstrom@gmail.com>
---
 worlds/ladx/__init__.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 7b1a35666ae7..a887638e377a 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -9,7 +9,7 @@
 import bsdiff4
 
 import settings
-from BaseClasses import Entrance, Item, ItemClassification, Location, Tutorial, MultiWorld
+from BaseClasses import CollectionState, Entrance, Item, ItemClassification, Location, Tutorial, MultiWorld
 from Fill import fill_restrictive
 from worlds.AutoWorld import WebWorld, World
 from .Common import *
@@ -315,8 +315,6 @@ def pre_fill(self) -> None:
 
         # Set up filter rules
 
-        # The list of items we will pass to fill_restrictive, contains at first the items that go to all dungeons
-        all_dungeon_items_to_fill = list(self.prefill_own_dungeons)
         # set containing the list of all possible dungeon locations for the player
         all_dungeon_locs = set()
         
@@ -327,9 +325,6 @@ def pre_fill(self) -> None:
             for item in self.prefill_original_dungeon[dungeon_index]:
                 allowed_locations_by_item[item] = locs
 
-            # put the items for this dungeon in the list to fill
-            all_dungeon_items_to_fill.extend(self.prefill_original_dungeon[dungeon_index])
-
             # ...and gather the list of all dungeon locations
             all_dungeon_locs |= locs
             # ...also set the rules for the dungeon
@@ -369,16 +364,27 @@ def priority(item):
             if allowed_locations_by_item[item] is all_dungeon_locs:
                 i += 3
             return i
+        all_dungeon_items_to_fill = self.get_pre_fill_items()
         all_dungeon_items_to_fill.sort(key=priority)
 
         # Set up state
-        all_state = self.multiworld.get_all_state(use_cache=False)
-        # Remove dungeon items we are about to put in from the state so that we don't double count
-        for item in all_dungeon_items_to_fill:
-            all_state.remove(item)
+        partial_all_state = CollectionState(self.multiworld)
+        # Collect every item from the item pool and every pre-fill item like MultiWorld.get_all_state, except not our own pre-fill items.
+        for item in self.multiworld.itempool:
+            partial_all_state.collect(item, prevent_sweep=True)
+        for player in self.multiworld.player_ids:
+            if player == self.player:
+                # Don't collect the items we're about to place.
+                continue
+            subworld = self.multiworld.worlds[player]
+            for item in subworld.get_pre_fill_items():
+                partial_all_state.collect(item, prevent_sweep=True)
+
+        # Sweep to pick up already placed items that are reachable with everything but the dungeon items.
+        partial_all_state.sweep_for_advancements()
         
-        # Finally, fill!
-        fill_restrictive(self.multiworld, all_state, all_dungeon_locs_to_fill, all_dungeon_items_to_fill, lock=True, single_player_placement=True, allow_partial=False)
+        fill_restrictive(self.multiworld, partial_all_state, all_dungeon_locs_to_fill, all_dungeon_items_to_fill, lock=True, single_player_placement=True, allow_partial=False)
+
 
     name_cache = {}
     # Tries to associate an icon from another game with an icon we have

From 051518e72aaed0b49d43fe80c01129fd52aca729 Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Sat, 1 Feb 2025 16:07:08 -0500
Subject: [PATCH 347/381] Stardew Valley: Fix unresolved reference warning and
 unused imports (#4360)

* fix unresolved reference warning and unused imports

* revert stuff

* just a commit to rerun the tests cuz messenger fail
---
 worlds/stardew_valley/__init__.py             |   6 +-
 worlds/stardew_valley/bundles/bundle_room.py  |   2 +-
 worlds/stardew_valley/content/mods/sve.py     |  19 +-
 .../content/vanilla/qi_board.py               |   1 -
 worlds/stardew_valley/data/bundle_data.py     |   4 +-
 worlds/stardew_valley/data/craftable_data.py  |  11 +-
 worlds/stardew_valley/data/recipe_data.py     |  42 +-
 worlds/stardew_valley/data/recipe_source.py   |   2 +-
 worlds/stardew_valley/logic/ability_logic.py  |  10 +-
 worlds/stardew_valley/logic/action_logic.py   |   1 -
 worlds/stardew_valley/logic/skill_logic.py    |   8 +-
 .../stardew_valley/mods/logic/item_logic.py   |   7 +-
 .../stardew_valley/mods/logic/quests_logic.py |   5 +-
 worlds/stardew_valley/regions.py              | 623 +++++++++---------
 worlds/stardew_valley/scripts/update_data.py  |   8 +-
 worlds/stardew_valley/stardew_rule/base.py    |   4 +-
 .../test/TestMultiplePlayers.py               |   2 -
 .../stardew_valley/test/TestWalnutsanity.py   |  12 +-
 .../stardew_valley/test/rules/TestFishing.py  |   3 +-
 19 files changed, 396 insertions(+), 374 deletions(-)

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index ef842263ad2c..e2d49e64ae14 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -1,6 +1,6 @@
 import logging
 from random import Random
-from typing import Dict, Any, Iterable, Optional, List, TextIO
+from typing import Dict, Any, Iterable, Optional, List, TextIO, cast
 
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
 from Options import PerGameCommonOptions
@@ -124,7 +124,7 @@ def create_region(name: str, exits: Iterable[str]) -> Region:
                                                 self.options)
 
         def add_location(name: str, code: Optional[int], region: str):
-            region = world_regions[region]
+            region: Region = world_regions[region]
             location = StardewLocation(self.player, name, code, region)
             region.locations.append(location)
 
@@ -314,9 +314,9 @@ def get_filler_item_rules(self):
             include_traps = True
             exclude_island = False
             for player in link_group["players"]:
-                player_options = self.multiworld.worlds[player].options
                 if self.multiworld.game[player] != self.game:
                     continue
+                player_options = cast(StardewValleyOptions, self.multiworld.worlds[player].options)
                 if player_options.trap_items == TrapItems.option_no_traps:
                     include_traps = False
                 if player_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
diff --git a/worlds/stardew_valley/bundles/bundle_room.py b/worlds/stardew_valley/bundles/bundle_room.py
index 8068ff17ac83..225fb4feab1b 100644
--- a/worlds/stardew_valley/bundles/bundle_room.py
+++ b/worlds/stardew_valley/bundles/bundle_room.py
@@ -4,7 +4,7 @@
 
 from .bundle import Bundle, BundleTemplate
 from ..content import StardewContent
-from ..options import BundlePrice, StardewValleyOptions
+from ..options import StardewValleyOptions
 
 
 @dataclass
diff --git a/worlds/stardew_valley/content/mods/sve.py b/worlds/stardew_valley/content/mods/sve.py
index a68d4ae9c097..12b3e3558a67 100644
--- a/worlds/stardew_valley/content/mods/sve.py
+++ b/worlds/stardew_valley/content/mods/sve.py
@@ -10,15 +10,14 @@
 from ...mods.mod_data import ModNames
 from ...strings.craftable_names import ModEdible
 from ...strings.crop_names import Fruit, SVEVegetable, SVEFruit
-from ...strings.fish_names import WaterItem, SVEFish, SVEWaterItem
+from ...strings.fish_names import WaterItem, SVEWaterItem
 from ...strings.flower_names import Flower
 from ...strings.food_names import SVEMeal, SVEBeverage
 from ...strings.forageable_names import Mushroom, Forageable, SVEForage
 from ...strings.gift_names import SVEGift
-from ...strings.metal_names import Ore
-from ...strings.monster_drop_names import ModLoot, Loot
+from ...strings.monster_drop_names import ModLoot
 from ...strings.performance_names import Performance
-from ...strings.region_names import Region, SVERegion, LogicRegion
+from ...strings.region_names import Region, SVERegion
 from ...strings.season_names import Season
 from ...strings.seed_names import SVESeed
 from ...strings.skill_names import Skill
@@ -81,7 +80,8 @@ def harvest_source_hook(self, content: StardewContent):
         ModEdible.lightning_elixir: (ShopSource(money_price=12000, shop_region=SVERegion.galmoran_outpost),),
         ModEdible.barbarian_elixir: (ShopSource(money_price=22000, shop_region=SVERegion.galmoran_outpost),),
         ModEdible.gravity_elixir: (ShopSource(money_price=4000, shop_region=SVERegion.galmoran_outpost),),
-        SVEMeal.grampleton_orange_chicken: (ShopSource(money_price=650, shop_region=Region.saloon, other_requirements=(RelationshipRequirement(ModNPC.sophia, 6),)),),
+        SVEMeal.grampleton_orange_chicken: (
+        ShopSource(money_price=650, shop_region=Region.saloon, other_requirements=(RelationshipRequirement(ModNPC.sophia, 6),)),),
         ModEdible.hero_elixir: (ShopSource(money_price=8000, shop_region=SVERegion.isaac_shop),),
         ModEdible.aegis_elixir: (ShopSource(money_price=28000, shop_region=SVERegion.galmoran_outpost),),
         SVEBeverage.sports_drink: (ShopSource(money_price=750, shop_region=Region.hospital),),
@@ -92,7 +92,8 @@ def harvest_source_hook(self, content: StardewContent):
             ForagingSource(regions=(SVERegion.forest_west,), seasons=(Season.summer, Season.fall)), ForagingSource(regions=(SVERegion.sprite_spring_cave,), )
         ),
         Mushroom.purple: (
-            ForagingSource(regions=(SVERegion.forest_west,), seasons=(Season.fall,)), ForagingSource(regions=(SVERegion.sprite_spring_cave, SVERegion.junimo_woods), )
+            ForagingSource(regions=(SVERegion.forest_west,), seasons=(Season.fall,)),
+            ForagingSource(regions=(SVERegion.sprite_spring_cave, SVERegion.junimo_woods), )
         ),
         Mushroom.morel: (
             ForagingSource(regions=(SVERegion.forest_west,), seasons=(Season.fall,)), ForagingSource(regions=(SVERegion.sprite_spring_cave,), )
@@ -117,7 +118,8 @@ def harvest_source_hook(self, content: StardewContent):
 
         ModLoot.green_mushroom: (ForagingSource(regions=(SVERegion.highlands_pond,), seasons=Season.not_winter),),
         ModLoot.ornate_treasure_chest: (ForagingSource(regions=(SVERegion.highlands_outside,),
-                                                       other_requirements=(CombatRequirement(Performance.galaxy), ToolRequirement(Tool.axe, ToolMaterial.iron))),),
+                                                       other_requirements=(
+                                                       CombatRequirement(Performance.galaxy), ToolRequirement(Tool.axe, ToolMaterial.iron))),),
         ModLoot.swirl_stone: (ForagingSource(regions=(SVERegion.crimson_badlands,), other_requirements=(CombatRequirement(Performance.galaxy),)),),
         ModLoot.void_soul: (ForagingSource(regions=(SVERegion.crimson_badlands,), other_requirements=(CombatRequirement(Performance.good),)),),
         SVEForage.winter_star_rose: (ForagingSource(regions=(SVERegion.summit,), seasons=(Season.winter,)),),
@@ -137,7 +139,8 @@ def harvest_source_hook(self, content: StardewContent):
         SVEForage.thistle: (ForagingSource(regions=(SVERegion.summit,)),),
         ModLoot.void_pebble: (ForagingSource(regions=(SVERegion.crimson_badlands,), other_requirements=(CombatRequirement(Performance.great),)),),
         ModLoot.void_shard: (ForagingSource(regions=(SVERegion.crimson_badlands,),
-                                            other_requirements=(CombatRequirement(Performance.galaxy), SkillRequirement(Skill.combat, 10), YearRequirement(3),)),),
+                                            other_requirements=(
+                                            CombatRequirement(Performance.galaxy), SkillRequirement(Skill.combat, 10), YearRequirement(3),)),),
         SVEWaterItem.dulse_seaweed: (ForagingSource(regions=(Region.beach,), other_requirements=(FishingRequirement(Region.beach),)),),
 
         # Fable Reef
diff --git a/worlds/stardew_valley/content/vanilla/qi_board.py b/worlds/stardew_valley/content/vanilla/qi_board.py
index d859d3b16ff7..e5f67c431953 100644
--- a/worlds/stardew_valley/content/vanilla/qi_board.py
+++ b/worlds/stardew_valley/content/vanilla/qi_board.py
@@ -6,7 +6,6 @@
 from ...data.harvest import HarvestCropSource
 from ...strings.crop_names import Fruit
 from ...strings.region_names import Region
-from ...strings.season_names import Season
 from ...strings.seed_names import Seed
 
 
diff --git a/worlds/stardew_valley/data/bundle_data.py b/worlds/stardew_valley/data/bundle_data.py
index 8b2e189c796e..75f0f75a23d2 100644
--- a/worlds/stardew_valley/data/bundle_data.py
+++ b/worlds/stardew_valley/data/bundle_data.py
@@ -10,7 +10,7 @@
 from ..strings.crop_names import Fruit, Vegetable
 from ..strings.currency_names import Currency
 from ..strings.fertilizer_names import Fertilizer, RetainingSoil, SpeedGro
-from ..strings.fish_names import Fish, WaterItem, Trash, all_fish
+from ..strings.fish_names import Fish, WaterItem, Trash
 from ..strings.flower_names import Flower
 from ..strings.food_names import Beverage, Meal
 from ..strings.forageable_names import Forageable, Mushroom
@@ -832,7 +832,7 @@
                 magic_rock_candy, mega_bomb.as_amount(10), mystery_box.as_amount(10), mixed_seeds.as_amount(50),
                 strawberry_seeds.as_amount(20),
                 spicy_eel.as_amount(5), crab_cakes.as_amount(5), eggplant_parmesan.as_amount(5),
-                pumpkin_soup.as_amount(5), lucky_lunch.as_amount(5),]
+                pumpkin_soup.as_amount(5), lucky_lunch.as_amount(5)]
 calico_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.calico, calico_items, 2, 2)
 
 raccoon_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.raccoon, raccoon_foraging_items, 4, 4)
diff --git a/worlds/stardew_valley/data/craftable_data.py b/worlds/stardew_valley/data/craftable_data.py
index 1bb4b2bea73b..de371b7c3a9b 100644
--- a/worlds/stardew_valley/data/craftable_data.py
+++ b/worlds/stardew_valley/data/craftable_data.py
@@ -14,7 +14,7 @@
 from ..strings.fish_names import Fish, WaterItem, ModTrash, Trash
 from ..strings.flower_names import Flower
 from ..strings.food_names import Meal
-from ..strings.forageable_names import Forageable, SVEForage, DistantLandsForageable, Mushroom
+from ..strings.forageable_names import Forageable, DistantLandsForageable, Mushroom
 from ..strings.gift_names import Gift
 from ..strings.ingredient_names import Ingredient
 from ..strings.machine_names import Machine
@@ -318,7 +318,8 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource,
 preservation_chamber = skill_recipe(ModMachine.preservation_chamber, ModSkill.archaeology, 1,
                                     {MetalBar.copper: 1, Material.wood: 15, ArtisanGood.oak_resin: 30},
                                     ModNames.archaeology)
-restoration_table = skill_recipe(ModMachine.restoration_table, ModSkill.archaeology, 1, {Material.wood: 15, MetalBar.copper: 1, MetalBar.iron: 1}, ModNames.archaeology)
+restoration_table = skill_recipe(ModMachine.restoration_table, ModSkill.archaeology, 1, {Material.wood: 15, MetalBar.copper: 1, MetalBar.iron: 1},
+                                 ModNames.archaeology)
 preservation_chamber_h = skill_recipe(ModMachine.hardwood_preservation_chamber, ModSkill.archaeology, 6, {MetalBar.copper: 1, Material.hardwood: 15,
                                                                                                           ArtisanGood.oak_resin: 30}, ModNames.archaeology)
 grinder = skill_recipe(ModMachine.grinder, ModSkill.archaeology, 2, {Artifact.rusty_cog: 10, MetalBar.iron: 5, ArtisanGood.battery_pack: 1},
@@ -330,12 +331,14 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource,
 glass_fence = skill_recipe(ModCraftable.glass_fence, ModSkill.archaeology, 7, {Artifact.glass_shards: 5}, ModNames.archaeology)
 bone_path = skill_recipe(ModFloor.bone_path, ModSkill.archaeology, 4, {Fossil.bone_fragment: 1}, ModNames.archaeology)
 rust_path = skill_recipe(ModFloor.rusty_path, ModSkill.archaeology, 2, {ModTrash.rusty_scrap: 2}, ModNames.archaeology)
-rusty_brazier = skill_recipe(ModCraftable.rusty_brazier, ModSkill.archaeology, 3, {ModTrash.rusty_scrap: 10, Material.coal: 1, Material.fiber: 1}, ModNames.archaeology)
+rusty_brazier = skill_recipe(ModCraftable.rusty_brazier, ModSkill.archaeology, 3, {ModTrash.rusty_scrap: 10, Material.coal: 1, Material.fiber: 1},
+                             ModNames.archaeology)
 bone_fence = skill_recipe(ModCraftable.bone_fence, ModSkill.archaeology, 8, {Fossil.bone_fragment: 2}, ModNames.archaeology)
 water_shifter = skill_recipe(ModCraftable.water_shifter, ModSkill.archaeology, 4, {Material.wood: 40, MetalBar.copper: 4}, ModNames.archaeology)
 wooden_display = skill_recipe(ModCraftable.wooden_display, ModSkill.archaeology, 1, {Material.wood: 25}, ModNames.archaeology)
 hardwood_display = skill_recipe(ModCraftable.hardwood_display, ModSkill.archaeology, 7, {Material.hardwood: 10}, ModNames.archaeology)
-lucky_ring = skill_recipe(Ring.lucky_ring, ModSkill.archaeology, 8, {Artifact.elvish_jewelry: 1, AnimalProduct.rabbit_foot: 5, Mineral.tigerseye: 1}, ModNames.archaeology)
+lucky_ring = skill_recipe(Ring.lucky_ring, ModSkill.archaeology, 8, {Artifact.elvish_jewelry: 1, AnimalProduct.rabbit_foot: 5, Mineral.tigerseye: 1},
+                          ModNames.archaeology)
 volcano_totem = skill_recipe(ModConsumable.volcano_totem, ModSkill.archaeology, 9, {Material.cinder_shard: 5, Artifact.rare_disc: 1, Artifact.dwarf_gadget: 1},
                              ModNames.archaeology)
 haste_elixir = shop_recipe(ModEdible.haste_elixir, SVERegion.alesia_shop, 35000, {Loot.void_essence: 35, ModLoot.void_soul: 5, Ingredient.sugar: 1,
diff --git a/worlds/stardew_valley/data/recipe_data.py b/worlds/stardew_valley/data/recipe_data.py
index 3123bb924307..667227cb9e2b 100644
--- a/worlds/stardew_valley/data/recipe_data.py
+++ b/worlds/stardew_valley/data/recipe_data.py
@@ -1,15 +1,16 @@
 from typing import Dict, List, Optional
-from ..mods.mod_data import ModNames
+
 from .recipe_source import RecipeSource, FriendshipSource, SkillSource, QueenOfSauceSource, ShopSource, StarterSource, ShopTradeSource, ShopFriendshipSource
+from ..mods.mod_data import ModNames
 from ..strings.animal_product_names import AnimalProduct
 from ..strings.artisan_good_names import ArtisanGood
 from ..strings.craftable_names import ModEdible, Edible
 from ..strings.crop_names import Fruit, Vegetable, SVEFruit, DistantLandsCrop
 from ..strings.fish_names import Fish, SVEFish, WaterItem, DistantLandsFish, SVEWaterItem
 from ..strings.flower_names import Flower
-from ..strings.forageable_names import Forageable, SVEForage, DistantLandsForageable, Mushroom
-from ..strings.ingredient_names import Ingredient
 from ..strings.food_names import Meal, SVEMeal, Beverage, DistantLandsMeal, BoardingHouseMeal, ArchaeologyMeal, TrashyMeal
+from ..strings.forageable_names import Forageable, SVEForage, Mushroom
+from ..strings.ingredient_names import Ingredient
 from ..strings.material_names import Material
 from ..strings.metal_names import Fossil, Artifact
 from ..strings.monster_drop_names import Loot
@@ -45,7 +46,8 @@ def friendship_recipe(name: str, friend: str, hearts: int, ingredients: Dict[str
     return create_recipe(name, ingredients, source, mod_name)
 
 
-def friendship_and_shop_recipe(name: str, friend: str, hearts: int, region: str, price: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CookingRecipe:
+def friendship_and_shop_recipe(name: str, friend: str, hearts: int, region: str, price: int, ingredients: Dict[str, int],
+                               mod_name: Optional[str] = None) -> CookingRecipe:
     source = ShopFriendshipSource(friend, hearts, region, price)
     return create_recipe(name, ingredients, source, mod_name)
 
@@ -85,7 +87,8 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource,
 artichoke_dip = queen_of_sauce_recipe(Meal.artichoke_dip, 1, Season.fall, 28, {Vegetable.artichoke: 1, AnimalProduct.cow_milk: 1})
 autumn_bounty = friendship_recipe(Meal.autumn_bounty, NPC.demetrius, 7, {Vegetable.yam: 1, Vegetable.pumpkin: 1})
 baked_fish = queen_of_sauce_recipe(Meal.baked_fish, 1, Season.summer, 7, {Fish.sunfish: 1, Fish.bream: 1, Ingredient.wheat_flour: 1})
-banana_pudding = shop_trade_recipe(Meal.banana_pudding, Region.island_trader, Fossil.bone_fragment, 30, {Fruit.banana: 1, AnimalProduct.cow_milk: 1, Ingredient.sugar: 1})
+banana_pudding = shop_trade_recipe(Meal.banana_pudding, Region.island_trader, Fossil.bone_fragment, 30,
+                                   {Fruit.banana: 1, AnimalProduct.cow_milk: 1, Ingredient.sugar: 1})
 bean_hotpot = friendship_recipe(Meal.bean_hotpot, NPC.clint, 7, {Vegetable.green_bean: 2})
 blackberry_cobbler_ingredients = {Forageable.blackberry: 2, Ingredient.sugar: 1, Ingredient.wheat_flour: 1}
 blackberry_cobbler_qos = queen_of_sauce_recipe(Meal.blackberry_cobbler, 2, Season.fall, 14, blackberry_cobbler_ingredients)
@@ -181,21 +184,23 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource,
 magic_elixir = shop_recipe(ModEdible.magic_elixir, Region.adventurer_guild, 3000, {Edible.life_elixir: 1, Mushroom.purple: 1}, ModNames.magic)
 
 baked_berry_oatmeal = shop_recipe(SVEMeal.baked_berry_oatmeal, SVERegion.bear_shop, 0, {Forageable.salmonberry: 15, Forageable.blackberry: 15,
-                                                                                            Ingredient.sugar: 1, Ingredient.wheat_flour: 2}, ModNames.sve)
+                                                                                        Ingredient.sugar: 1, Ingredient.wheat_flour: 2}, ModNames.sve)
 big_bark_burger = friendship_and_shop_recipe(SVEMeal.big_bark_burger, NPC.gus, 5, Region.saloon, 5500,
                                              {SVEFish.puppyfish: 1, Meal.bread: 1, Ingredient.oil: 1}, ModNames.sve)
 flower_cookie = shop_recipe(SVEMeal.flower_cookie, SVERegion.bear_shop, 0, {SVEForage.ferngill_primrose: 1, SVEForage.goldenrod: 1,
-                                                                               SVEForage.winter_star_rose: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1,
-                                                                               AnimalProduct.large_egg: 1}, ModNames.sve)
+                                                                            SVEForage.winter_star_rose: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1,
+                                                                            AnimalProduct.large_egg: 1}, ModNames.sve)
 frog_legs = shop_recipe(SVEMeal.frog_legs, Region.adventurer_guild, 2000, {SVEFish.frog: 1, Ingredient.oil: 1, Ingredient.wheat_flour: 1}, ModNames.sve)
 glazed_butterfish = friendship_and_shop_recipe(SVEMeal.glazed_butterfish, NPC.gus, 10, Region.saloon, 4000,
                                                {SVEFish.butterfish: 1, Ingredient.wheat_flour: 1, Ingredient.oil: 1}, ModNames.sve)
 mixed_berry_pie = shop_recipe(SVEMeal.mixed_berry_pie, Region.saloon, 3500, {Fruit.strawberry: 6, SVEFruit.salal_berry: 6, Forageable.blackberry: 6,
                                                                              SVEForage.bearberry: 6, Ingredient.sugar: 1, Ingredient.wheat_flour: 1},
                               ModNames.sve)
-mushroom_berry_rice = friendship_and_shop_recipe(SVEMeal.mushroom_berry_rice, ModNPC.marlon, 6, Region.adventurer_guild, 1500, {SVEForage.poison_mushroom: 3, SVEForage.red_baneberry: 10,
-                                                                                               Ingredient.rice: 1, Ingredient.sugar: 2}, ModNames.sve)
-seaweed_salad = shop_recipe(SVEMeal.seaweed_salad, Region.fish_shop, 1250, {SVEWaterItem.dulse_seaweed: 2, WaterItem.seaweed: 2, Ingredient.oil: 1}, ModNames.sve)
+mushroom_berry_rice = friendship_and_shop_recipe(SVEMeal.mushroom_berry_rice, ModNPC.marlon, 6, Region.adventurer_guild, 1500,
+                                                 {SVEForage.poison_mushroom: 3, SVEForage.red_baneberry: 10, Ingredient.rice: 1, Ingredient.sugar: 2},
+                                                 ModNames.sve)
+seaweed_salad = shop_recipe(SVEMeal.seaweed_salad, Region.fish_shop, 1250, {SVEWaterItem.dulse_seaweed: 2, WaterItem.seaweed: 2, Ingredient.oil: 1},
+                            ModNames.sve)
 void_delight = friendship_and_shop_recipe(SVEMeal.void_delight, NPC.krobus, 10, Region.sewer, 5000,
                                           {SVEFish.void_eel: 1, Loot.void_essence: 50, Loot.solar_essence: 20}, ModNames.sve)
 void_salmon_sushi = friendship_and_shop_recipe(SVEMeal.void_salmon_sushi, NPC.krobus, 10, Region.sewer, 5000,
@@ -205,17 +210,22 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource,
                                                                                        Mushroom.red: 1, Material.wood: 1}, ModNames.distant_lands)
 void_mint_tea = friendship_recipe(DistantLandsMeal.void_mint_tea, ModNPC.goblin, 4, {DistantLandsCrop.void_mint: 1}, ModNames.distant_lands)
 crayfish_soup = friendship_recipe(DistantLandsMeal.crayfish_soup, ModNPC.goblin, 6, {Forageable.cave_carrot: 1, Fish.crayfish: 1,
-                                                                                     DistantLandsFish.purple_algae: 1, WaterItem.white_algae: 1}, ModNames.distant_lands)
+                                                                                     DistantLandsFish.purple_algae: 1, WaterItem.white_algae: 1},
+                                  ModNames.distant_lands)
 pemmican = friendship_recipe(DistantLandsMeal.pemmican, ModNPC.goblin, 8, {Loot.bug_meat: 1, Fish.any: 1, Forageable.salmonberry: 3,
                                                                            Material.stone: 2}, ModNames.distant_lands)
 
 special_pumpkin_soup = friendship_recipe(BoardingHouseMeal.special_pumpkin_soup, ModNPC.joel, 6, {Vegetable.pumpkin: 2, AnimalProduct.large_goat_milk: 1,
                                                                                                   Vegetable.garlic: 1}, ModNames.boarding_house)
-diggers_delight = skill_recipe(ArchaeologyMeal.diggers_delight, ModSkill.archaeology, 3, {Forageable.cave_carrot: 2, Ingredient.sugar: 1, AnimalProduct.milk: 1}, ModNames.archaeology)
-rocky_root = skill_recipe(ArchaeologyMeal.rocky_root, ModSkill.archaeology, 7, {Forageable.cave_carrot: 3, Seed.coffee: 1, Material.stone: 1}, ModNames.archaeology)
-ancient_jello = skill_recipe(ArchaeologyMeal.ancient_jello, ModSkill.archaeology, 9, {WaterItem.cave_jelly: 6, Ingredient.sugar: 5, AnimalProduct.egg: 1, AnimalProduct.milk: 1, Artifact.chipped_amphora: 1}, ModNames.archaeology)
+diggers_delight = skill_recipe(ArchaeologyMeal.diggers_delight, ModSkill.archaeology, 3,
+                               {Forageable.cave_carrot: 2, Ingredient.sugar: 1, AnimalProduct.milk: 1}, ModNames.archaeology)
+rocky_root = skill_recipe(ArchaeologyMeal.rocky_root, ModSkill.archaeology, 7, {Forageable.cave_carrot: 3, Seed.coffee: 1, Material.stone: 1},
+                          ModNames.archaeology)
+ancient_jello = skill_recipe(ArchaeologyMeal.ancient_jello, ModSkill.archaeology, 9,
+                             {WaterItem.cave_jelly: 6, Ingredient.sugar: 5, AnimalProduct.egg: 1, AnimalProduct.milk: 1, Artifact.chipped_amphora: 1},
+                             ModNames.archaeology)
 
 grilled_cheese = skill_recipe(TrashyMeal.grilled_cheese, ModSkill.binning, 1, {Meal.bread: 1, ArtisanGood.cheese: 1}, ModNames.binning_skill)
 fish_casserole = skill_recipe(TrashyMeal.fish_casserole, ModSkill.binning, 8, {Fish.any: 1, AnimalProduct.milk: 1, Vegetable.carrot: 1}, ModNames.binning_skill)
 
-all_cooking_recipes_by_name = {recipe.meal: recipe for recipe in all_cooking_recipes}
\ No newline at end of file
+all_cooking_recipes_by_name = {recipe.meal: recipe for recipe in all_cooking_recipes}
diff --git a/worlds/stardew_valley/data/recipe_source.py b/worlds/stardew_valley/data/recipe_source.py
index ead4d62f1650..bc8c09ee9241 100644
--- a/worlds/stardew_valley/data/recipe_source.py
+++ b/worlds/stardew_valley/data/recipe_source.py
@@ -106,7 +106,7 @@ def __init__(self, skill: str):
         self.skill = skill
 
     def __repr__(self):
-        return f"MasterySource at level {self.level} {self.skill}"
+        return f"MasterySource {self.skill}"
 
 
 class ShopSource(RecipeSource):
diff --git a/worlds/stardew_valley/logic/ability_logic.py b/worlds/stardew_valley/logic/ability_logic.py
index add99a2c2e7e..2038d995a720 100644
--- a/worlds/stardew_valley/logic/ability_logic.py
+++ b/worlds/stardew_valley/logic/ability_logic.py
@@ -1,7 +1,7 @@
+import typing
 from typing import Union
 
 from .base_logic import BaseLogicMixin, BaseLogic
-from .cooking_logic import CookingLogicMixin
 from .mine_logic import MineLogicMixin
 from .received_logic import ReceivedLogicMixin
 from .region_logic import RegionLogicMixin
@@ -13,6 +13,11 @@
 from ..strings.skill_names import Skill, ModSkill
 from ..strings.tool_names import ToolMaterial, Tool
 
+if typing.TYPE_CHECKING:
+    from ..mods.logic.mod_logic import ModLogicMixin
+else:
+    ModLogicMixin = object
+
 
 class AbilityLogicMixin(BaseLogicMixin):
     def __init__(self, *args, **kwargs):
@@ -20,7 +25,8 @@ def __init__(self, *args, **kwargs):
         self.ability = AbilityLogic(*args, **kwargs)
 
 
-class AbilityLogic(BaseLogic[Union[AbilityLogicMixin, RegionLogicMixin, ReceivedLogicMixin, ToolLogicMixin, SkillLogicMixin, MineLogicMixin, MagicLogicMixin]]):
+class AbilityLogic(BaseLogic[Union[AbilityLogicMixin, RegionLogicMixin, ReceivedLogicMixin, ToolLogicMixin, SkillLogicMixin, MineLogicMixin, MagicLogicMixin,
+ModLogicMixin]]):
     def can_mine_perfectly(self) -> StardewRule:
         return self.logic.mine.can_progress_in_the_mines_from_floor(160)
 
diff --git a/worlds/stardew_valley/logic/action_logic.py b/worlds/stardew_valley/logic/action_logic.py
index dc5deda427f3..5b117de68cf2 100644
--- a/worlds/stardew_valley/logic/action_logic.py
+++ b/worlds/stardew_valley/logic/action_logic.py
@@ -6,7 +6,6 @@
 from .received_logic import ReceivedLogicMixin
 from .region_logic import RegionLogicMixin
 from .tool_logic import ToolLogicMixin
-from ..options import ToolProgression
 from ..stardew_rule import StardewRule, True_
 from ..strings.generic_names import Generic
 from ..strings.geode_names import Geode
diff --git a/worlds/stardew_valley/logic/skill_logic.py b/worlds/stardew_valley/logic/skill_logic.py
index bc2f6cb1263d..6d0cd11baf71 100644
--- a/worlds/stardew_valley/logic/skill_logic.py
+++ b/worlds/stardew_valley/logic/skill_logic.py
@@ -1,3 +1,4 @@
+import typing
 from functools import cached_property
 from typing import Union, Tuple
 
@@ -24,6 +25,11 @@
 from ..strings.tool_names import ToolMaterial, Tool
 from ..strings.wallet_item_names import Wallet
 
+if typing.TYPE_CHECKING:
+    from ..mods.logic.mod_logic import ModLogicMixin
+else:
+    ModLogicMixin = object
+
 fishing_regions = (Region.beach, Region.town, Region.forest, Region.mountain, Region.island_south, Region.island_west)
 vanilla_skill_items = ("Farming Level", "Mining Level", "Foraging Level", "Fishing Level", "Combat Level")
 
@@ -35,7 +41,7 @@ def __init__(self, *args, **kwargs):
 
 
 class SkillLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, SeasonLogicMixin, TimeLogicMixin, ToolLogicMixin, SkillLogicMixin,
-CombatLogicMixin, MagicLogicMixin, HarvestingLogicMixin]]):
+CombatLogicMixin, MagicLogicMixin, HarvestingLogicMixin, ModLogicMixin]]):
 
     # Should be cached
     def can_earn_level(self, skill: str, level: int) -> StardewRule:
diff --git a/worlds/stardew_valley/mods/logic/item_logic.py b/worlds/stardew_valley/mods/logic/item_logic.py
index ef5eab0134d1..12e824d21295 100644
--- a/worlds/stardew_valley/mods/logic/item_logic.py
+++ b/worlds/stardew_valley/mods/logic/item_logic.py
@@ -2,7 +2,6 @@
 
 from ..mod_data import ModNames
 from ... import options
-from ...data.craftable_data import all_crafting_recipes_by_name
 from ...logic.base_logic import BaseLogicMixin, BaseLogic
 from ...logic.combat_logic import CombatLogicMixin
 from ...logic.cooking_logic import CookingLogicMixin
@@ -20,11 +19,9 @@
 from ...logic.skill_logic import SkillLogicMixin
 from ...logic.time_logic import TimeLogicMixin
 from ...logic.tool_logic import ToolLogicMixin
-from ...options import Cropsanity
-from ...stardew_rule import StardewRule, True_
+from ...stardew_rule import StardewRule
 from ...strings.artisan_good_names import ModArtisanGood
-from ...strings.craftable_names import ModCraftable, ModMachine
-from ...strings.fish_names import ModTrash
+from ...strings.craftable_names import ModCraftable
 from ...strings.ingredient_names import Ingredient
 from ...strings.material_names import Material
 from ...strings.metal_names import all_fossils, all_artifacts, Ore, ModFossil
diff --git a/worlds/stardew_valley/mods/logic/quests_logic.py b/worlds/stardew_valley/mods/logic/quests_logic.py
index 1aa71404ae51..2ff74523940e 100644
--- a/worlds/stardew_valley/mods/logic/quests_logic.py
+++ b/worlds/stardew_valley/mods/logic/quests_logic.py
@@ -3,8 +3,8 @@
 from ..mod_data import ModNames
 from ...logic.base_logic import BaseLogic, BaseLogicMixin
 from ...logic.has_logic import HasLogicMixin
-from ...logic.quest_logic import QuestLogicMixin
 from ...logic.monster_logic import MonsterLogicMixin
+from ...logic.quest_logic import QuestLogicMixin
 from ...logic.received_logic import ReceivedLogicMixin
 from ...logic.region_logic import RegionLogicMixin
 from ...logic.relationship_logic import RelationshipLogicMixin
@@ -16,7 +16,6 @@
 from ...strings.crop_names import Fruit, SVEFruit, SVEVegetable, Vegetable
 from ...strings.fertilizer_names import Fertilizer
 from ...strings.food_names import Meal, Beverage
-from ...strings.forageable_names import SVEForage
 from ...strings.material_names import Material
 from ...strings.metal_names import Ore, MetalBar
 from ...strings.monster_drop_names import Loot, ModLoot
@@ -35,7 +34,7 @@ def __init__(self, *args, **kwargs):
 
 
 class ModQuestLogic(BaseLogic[Union[HasLogicMixin, QuestLogicMixin, ReceivedLogicMixin, RegionLogicMixin,
-                                    TimeLogicMixin, SeasonLogicMixin, RelationshipLogicMixin, MonsterLogicMixin]]):
+TimeLogicMixin, SeasonLogicMixin, RelationshipLogicMixin, MonsterLogicMixin]]):
     def get_modded_quest_rules(self) -> Dict[str, StardewRule]:
         quests = dict()
         quests.update(self._get_juna_quest_rules())
diff --git a/worlds/stardew_valley/regions.py b/worlds/stardew_valley/regions.py
index d59439a4879d..7a680d5faad0 100644
--- a/worlds/stardew_valley/regions.py
+++ b/worlds/stardew_valley/regions.py
@@ -7,7 +7,7 @@
 from .options import EntranceRandomization, ExcludeGingerIsland, StardewValleyOptions
 from .region_classes import RegionData, ConnectionData, RandomizationFlag, ModificationFlag
 from .strings.entrance_names import Entrance, LogicEntrance
-from .strings.region_names import Region, LogicRegion
+from .strings.region_names import Region as RegionName, LogicRegion
 
 
 class RegionFactory(Protocol):
@@ -16,192 +16,192 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region:
 
 
 vanilla_regions = [
-    RegionData(Region.menu, [Entrance.to_stardew_valley]),
-    RegionData(Region.stardew_valley, [Entrance.to_farmhouse]),
-    RegionData(Region.farm_house,
+    RegionData(RegionName.menu, [Entrance.to_stardew_valley]),
+    RegionData(RegionName.stardew_valley, [Entrance.to_farmhouse]),
+    RegionData(RegionName.farm_house,
                [Entrance.farmhouse_to_farm, Entrance.downstairs_to_cellar, LogicEntrance.farmhouse_cooking, LogicEntrance.watch_queen_of_sauce]),
-    RegionData(Region.cellar),
-    RegionData(Region.farm,
+    RegionData(RegionName.cellar),
+    RegionData(RegionName.farm,
                [Entrance.farm_to_backwoods, Entrance.farm_to_bus_stop, Entrance.farm_to_forest, Entrance.farm_to_farmcave, Entrance.enter_greenhouse,
                 Entrance.enter_coop, Entrance.enter_barn, Entrance.enter_shed, Entrance.enter_slime_hutch, LogicEntrance.grow_spring_crops,
                 LogicEntrance.grow_summer_crops, LogicEntrance.grow_fall_crops, LogicEntrance.grow_winter_crops, LogicEntrance.shipping]),
-    RegionData(Region.backwoods, [Entrance.backwoods_to_mountain]),
-    RegionData(Region.bus_stop,
+    RegionData(RegionName.backwoods, [Entrance.backwoods_to_mountain]),
+    RegionData(RegionName.bus_stop,
                [Entrance.bus_stop_to_town, Entrance.take_bus_to_desert, Entrance.bus_stop_to_tunnel_entrance]),
-    RegionData(Region.forest,
+    RegionData(RegionName.forest,
                [Entrance.forest_to_town, Entrance.enter_secret_woods, Entrance.forest_to_wizard_tower, Entrance.forest_to_marnie_ranch,
                 Entrance.forest_to_leah_cottage, Entrance.forest_to_sewer, Entrance.forest_to_mastery_cave, LogicEntrance.buy_from_traveling_merchant,
                 LogicEntrance.complete_raccoon_requests, LogicEntrance.fish_in_waterfall, LogicEntrance.attend_flower_dance, LogicEntrance.attend_trout_derby,
                 LogicEntrance.attend_festival_of_ice]),
     RegionData(LogicRegion.forest_waterfall),
-    RegionData(Region.farm_cave),
-    RegionData(Region.greenhouse,
+    RegionData(RegionName.farm_cave),
+    RegionData(RegionName.greenhouse,
                [LogicEntrance.grow_spring_crops_in_greenhouse, LogicEntrance.grow_summer_crops_in_greenhouse, LogicEntrance.grow_fall_crops_in_greenhouse,
                 LogicEntrance.grow_winter_crops_in_greenhouse, LogicEntrance.grow_indoor_crops_in_greenhouse]),
-    RegionData(Region.mountain,
+    RegionData(RegionName.mountain,
                [Entrance.mountain_to_railroad, Entrance.mountain_to_tent, Entrance.mountain_to_carpenter_shop,
                 Entrance.mountain_to_the_mines, Entrance.enter_quarry, Entrance.mountain_to_adventurer_guild,
                 Entrance.mountain_to_town, Entrance.mountain_to_maru_room,
                 Entrance.mountain_to_leo_treehouse]),
-    RegionData(Region.leo_treehouse, is_ginger_island=True),
-    RegionData(Region.maru_room),
-    RegionData(Region.tunnel_entrance, [Entrance.tunnel_entrance_to_bus_tunnel]),
-    RegionData(Region.bus_tunnel),
-    RegionData(Region.town,
+    RegionData(RegionName.leo_treehouse, is_ginger_island=True),
+    RegionData(RegionName.maru_room),
+    RegionData(RegionName.tunnel_entrance, [Entrance.tunnel_entrance_to_bus_tunnel]),
+    RegionData(RegionName.bus_tunnel),
+    RegionData(RegionName.town,
                [Entrance.town_to_community_center, Entrance.town_to_beach, Entrance.town_to_hospital, Entrance.town_to_pierre_general_store,
                 Entrance.town_to_saloon, Entrance.town_to_alex_house, Entrance.town_to_trailer, Entrance.town_to_mayor_manor, Entrance.town_to_sam_house,
                 Entrance.town_to_haley_house, Entrance.town_to_sewer, Entrance.town_to_clint_blacksmith, Entrance.town_to_museum, Entrance.town_to_jojamart,
                 Entrance.purchase_movie_ticket, LogicEntrance.buy_experience_books, LogicEntrance.attend_egg_festival, LogicEntrance.attend_fair,
                 LogicEntrance.attend_spirit_eve, LogicEntrance.attend_winter_star]),
-    RegionData(Region.beach,
+    RegionData(RegionName.beach,
                [Entrance.beach_to_willy_fish_shop, Entrance.enter_elliott_house, Entrance.enter_tide_pools, LogicEntrance.fishing, LogicEntrance.attend_luau,
                 LogicEntrance.attend_moonlight_jellies, LogicEntrance.attend_night_market, LogicEntrance.attend_squidfest]),
-    RegionData(Region.railroad, [Entrance.enter_bathhouse_entrance, Entrance.enter_witch_warp_cave]),
-    RegionData(Region.ranch),
-    RegionData(Region.leah_house),
-    RegionData(Region.mastery_cave),
-    RegionData(Region.sewer, [Entrance.enter_mutant_bug_lair]),
-    RegionData(Region.mutant_bug_lair),
-    RegionData(Region.wizard_tower, [Entrance.enter_wizard_basement, Entrance.use_desert_obelisk, Entrance.use_island_obelisk]),
-    RegionData(Region.wizard_basement),
-    RegionData(Region.tent),
-    RegionData(Region.carpenter, [Entrance.enter_sebastian_room]),
-    RegionData(Region.sebastian_room),
-    RegionData(Region.adventurer_guild, [Entrance.adventurer_guild_to_bedroom]),
-    RegionData(Region.adventurer_guild_bedroom),
-    RegionData(Region.community_center,
+    RegionData(RegionName.railroad, [Entrance.enter_bathhouse_entrance, Entrance.enter_witch_warp_cave]),
+    RegionData(RegionName.ranch),
+    RegionData(RegionName.leah_house),
+    RegionData(RegionName.mastery_cave),
+    RegionData(RegionName.sewer, [Entrance.enter_mutant_bug_lair]),
+    RegionData(RegionName.mutant_bug_lair),
+    RegionData(RegionName.wizard_tower, [Entrance.enter_wizard_basement, Entrance.use_desert_obelisk, Entrance.use_island_obelisk]),
+    RegionData(RegionName.wizard_basement),
+    RegionData(RegionName.tent),
+    RegionData(RegionName.carpenter, [Entrance.enter_sebastian_room]),
+    RegionData(RegionName.sebastian_room),
+    RegionData(RegionName.adventurer_guild, [Entrance.adventurer_guild_to_bedroom]),
+    RegionData(RegionName.adventurer_guild_bedroom),
+    RegionData(RegionName.community_center,
                [Entrance.access_crafts_room, Entrance.access_pantry, Entrance.access_fish_tank,
                 Entrance.access_boiler_room, Entrance.access_bulletin_board, Entrance.access_vault]),
-    RegionData(Region.crafts_room),
-    RegionData(Region.pantry),
-    RegionData(Region.fish_tank),
-    RegionData(Region.boiler_room),
-    RegionData(Region.bulletin_board),
-    RegionData(Region.vault),
-    RegionData(Region.hospital, [Entrance.enter_harvey_room]),
-    RegionData(Region.harvey_room),
-    RegionData(Region.pierre_store, [Entrance.enter_sunroom]),
-    RegionData(Region.sunroom),
-    RegionData(Region.saloon, [Entrance.play_journey_of_the_prairie_king, Entrance.play_junimo_kart]),
-    RegionData(Region.jotpk_world_1, [Entrance.reach_jotpk_world_2]),
-    RegionData(Region.jotpk_world_2, [Entrance.reach_jotpk_world_3]),
-    RegionData(Region.jotpk_world_3),
-    RegionData(Region.junimo_kart_1, [Entrance.reach_junimo_kart_2]),
-    RegionData(Region.junimo_kart_2, [Entrance.reach_junimo_kart_3]),
-    RegionData(Region.junimo_kart_3, [Entrance.reach_junimo_kart_4]),
-    RegionData(Region.junimo_kart_4),
-    RegionData(Region.alex_house),
-    RegionData(Region.trailer),
-    RegionData(Region.mayor_house),
-    RegionData(Region.sam_house),
-    RegionData(Region.haley_house),
-    RegionData(Region.blacksmith, [LogicEntrance.blacksmith_copper]),
-    RegionData(Region.museum),
-    RegionData(Region.jojamart, [Entrance.enter_abandoned_jojamart]),
-    RegionData(Region.abandoned_jojamart, [Entrance.enter_movie_theater]),
-    RegionData(Region.movie_ticket_stand),
-    RegionData(Region.movie_theater),
-    RegionData(Region.fish_shop, [Entrance.fish_shop_to_boat_tunnel]),
-    RegionData(Region.boat_tunnel, [Entrance.boat_to_ginger_island], is_ginger_island=True),
-    RegionData(Region.elliott_house),
-    RegionData(Region.tide_pools),
-    RegionData(Region.bathhouse_entrance, [Entrance.enter_locker_room]),
-    RegionData(Region.locker_room, [Entrance.enter_public_bath]),
-    RegionData(Region.public_bath),
-    RegionData(Region.witch_warp_cave, [Entrance.enter_witch_swamp]),
-    RegionData(Region.witch_swamp, [Entrance.enter_witch_hut]),
-    RegionData(Region.witch_hut, [Entrance.witch_warp_to_wizard_basement]),
-    RegionData(Region.quarry, [Entrance.enter_quarry_mine_entrance]),
-    RegionData(Region.quarry_mine_entrance, [Entrance.enter_quarry_mine]),
-    RegionData(Region.quarry_mine),
-    RegionData(Region.secret_woods),
-    RegionData(Region.desert, [Entrance.enter_skull_cavern_entrance, Entrance.enter_oasis, LogicEntrance.attend_desert_festival]),
-    RegionData(Region.oasis, [Entrance.enter_casino]),
-    RegionData(Region.casino),
-    RegionData(Region.skull_cavern_entrance, [Entrance.enter_skull_cavern]),
-    RegionData(Region.skull_cavern, [Entrance.mine_to_skull_cavern_floor_25]),
-    RegionData(Region.skull_cavern_25, [Entrance.mine_to_skull_cavern_floor_50]),
-    RegionData(Region.skull_cavern_50, [Entrance.mine_to_skull_cavern_floor_75]),
-    RegionData(Region.skull_cavern_75, [Entrance.mine_to_skull_cavern_floor_100]),
-    RegionData(Region.skull_cavern_100, [Entrance.mine_to_skull_cavern_floor_125]),
-    RegionData(Region.skull_cavern_125, [Entrance.mine_to_skull_cavern_floor_150]),
-    RegionData(Region.skull_cavern_150, [Entrance.mine_to_skull_cavern_floor_175]),
-    RegionData(Region.skull_cavern_175, [Entrance.mine_to_skull_cavern_floor_200]),
-    RegionData(Region.skull_cavern_200, [Entrance.enter_dangerous_skull_cavern]),
-    RegionData(Region.dangerous_skull_cavern, is_ginger_island=True),
-    RegionData(Region.island_south,
+    RegionData(RegionName.crafts_room),
+    RegionData(RegionName.pantry),
+    RegionData(RegionName.fish_tank),
+    RegionData(RegionName.boiler_room),
+    RegionData(RegionName.bulletin_board),
+    RegionData(RegionName.vault),
+    RegionData(RegionName.hospital, [Entrance.enter_harvey_room]),
+    RegionData(RegionName.harvey_room),
+    RegionData(RegionName.pierre_store, [Entrance.enter_sunroom]),
+    RegionData(RegionName.sunroom),
+    RegionData(RegionName.saloon, [Entrance.play_journey_of_the_prairie_king, Entrance.play_junimo_kart]),
+    RegionData(RegionName.jotpk_world_1, [Entrance.reach_jotpk_world_2]),
+    RegionData(RegionName.jotpk_world_2, [Entrance.reach_jotpk_world_3]),
+    RegionData(RegionName.jotpk_world_3),
+    RegionData(RegionName.junimo_kart_1, [Entrance.reach_junimo_kart_2]),
+    RegionData(RegionName.junimo_kart_2, [Entrance.reach_junimo_kart_3]),
+    RegionData(RegionName.junimo_kart_3, [Entrance.reach_junimo_kart_4]),
+    RegionData(RegionName.junimo_kart_4),
+    RegionData(RegionName.alex_house),
+    RegionData(RegionName.trailer),
+    RegionData(RegionName.mayor_house),
+    RegionData(RegionName.sam_house),
+    RegionData(RegionName.haley_house),
+    RegionData(RegionName.blacksmith, [LogicEntrance.blacksmith_copper]),
+    RegionData(RegionName.museum),
+    RegionData(RegionName.jojamart, [Entrance.enter_abandoned_jojamart]),
+    RegionData(RegionName.abandoned_jojamart, [Entrance.enter_movie_theater]),
+    RegionData(RegionName.movie_ticket_stand),
+    RegionData(RegionName.movie_theater),
+    RegionData(RegionName.fish_shop, [Entrance.fish_shop_to_boat_tunnel]),
+    RegionData(RegionName.boat_tunnel, [Entrance.boat_to_ginger_island], is_ginger_island=True),
+    RegionData(RegionName.elliott_house),
+    RegionData(RegionName.tide_pools),
+    RegionData(RegionName.bathhouse_entrance, [Entrance.enter_locker_room]),
+    RegionData(RegionName.locker_room, [Entrance.enter_public_bath]),
+    RegionData(RegionName.public_bath),
+    RegionData(RegionName.witch_warp_cave, [Entrance.enter_witch_swamp]),
+    RegionData(RegionName.witch_swamp, [Entrance.enter_witch_hut]),
+    RegionData(RegionName.witch_hut, [Entrance.witch_warp_to_wizard_basement]),
+    RegionData(RegionName.quarry, [Entrance.enter_quarry_mine_entrance]),
+    RegionData(RegionName.quarry_mine_entrance, [Entrance.enter_quarry_mine]),
+    RegionData(RegionName.quarry_mine),
+    RegionData(RegionName.secret_woods),
+    RegionData(RegionName.desert, [Entrance.enter_skull_cavern_entrance, Entrance.enter_oasis, LogicEntrance.attend_desert_festival]),
+    RegionData(RegionName.oasis, [Entrance.enter_casino]),
+    RegionData(RegionName.casino),
+    RegionData(RegionName.skull_cavern_entrance, [Entrance.enter_skull_cavern]),
+    RegionData(RegionName.skull_cavern, [Entrance.mine_to_skull_cavern_floor_25]),
+    RegionData(RegionName.skull_cavern_25, [Entrance.mine_to_skull_cavern_floor_50]),
+    RegionData(RegionName.skull_cavern_50, [Entrance.mine_to_skull_cavern_floor_75]),
+    RegionData(RegionName.skull_cavern_75, [Entrance.mine_to_skull_cavern_floor_100]),
+    RegionData(RegionName.skull_cavern_100, [Entrance.mine_to_skull_cavern_floor_125]),
+    RegionData(RegionName.skull_cavern_125, [Entrance.mine_to_skull_cavern_floor_150]),
+    RegionData(RegionName.skull_cavern_150, [Entrance.mine_to_skull_cavern_floor_175]),
+    RegionData(RegionName.skull_cavern_175, [Entrance.mine_to_skull_cavern_floor_200]),
+    RegionData(RegionName.skull_cavern_200, [Entrance.enter_dangerous_skull_cavern]),
+    RegionData(RegionName.dangerous_skull_cavern, is_ginger_island=True),
+    RegionData(RegionName.island_south,
                [Entrance.island_south_to_west, Entrance.island_south_to_north, Entrance.island_south_to_east, Entrance.island_south_to_southeast,
                 Entrance.use_island_resort, Entrance.parrot_express_docks_to_volcano, Entrance.parrot_express_docks_to_dig_site,
                 Entrance.parrot_express_docks_to_jungle],
                is_ginger_island=True),
-    RegionData(Region.island_resort, is_ginger_island=True),
-    RegionData(Region.island_west,
+    RegionData(RegionName.island_resort, is_ginger_island=True),
+    RegionData(RegionName.island_west,
                [Entrance.island_west_to_islandfarmhouse, Entrance.island_west_to_gourmand_cave, Entrance.island_west_to_crystals_cave,
                 Entrance.island_west_to_shipwreck, Entrance.island_west_to_qi_walnut_room, Entrance.use_farm_obelisk, Entrance.parrot_express_jungle_to_docks,
                 Entrance.parrot_express_jungle_to_dig_site, Entrance.parrot_express_jungle_to_volcano, LogicEntrance.grow_spring_crops_on_island,
                 LogicEntrance.grow_summer_crops_on_island, LogicEntrance.grow_fall_crops_on_island, LogicEntrance.grow_winter_crops_on_island,
                 LogicEntrance.grow_indoor_crops_on_island],
                is_ginger_island=True),
-    RegionData(Region.island_east, [Entrance.island_east_to_leo_hut, Entrance.island_east_to_island_shrine], is_ginger_island=True),
-    RegionData(Region.island_shrine, is_ginger_island=True),
-    RegionData(Region.island_south_east, [Entrance.island_southeast_to_pirate_cove], is_ginger_island=True),
-    RegionData(Region.island_north,
+    RegionData(RegionName.island_east, [Entrance.island_east_to_leo_hut, Entrance.island_east_to_island_shrine], is_ginger_island=True),
+    RegionData(RegionName.island_shrine, is_ginger_island=True),
+    RegionData(RegionName.island_south_east, [Entrance.island_southeast_to_pirate_cove], is_ginger_island=True),
+    RegionData(RegionName.island_north,
                [Entrance.talk_to_island_trader, Entrance.island_north_to_field_office, Entrance.island_north_to_dig_site, Entrance.island_north_to_volcano,
                 Entrance.parrot_express_volcano_to_dig_site, Entrance.parrot_express_volcano_to_jungle, Entrance.parrot_express_volcano_to_docks],
                is_ginger_island=True),
-    RegionData(Region.volcano, [Entrance.climb_to_volcano_5, Entrance.volcano_to_secret_beach], is_ginger_island=True),
-    RegionData(Region.volcano_secret_beach, is_ginger_island=True),
-    RegionData(Region.volcano_floor_5, [Entrance.talk_to_volcano_dwarf, Entrance.climb_to_volcano_10], is_ginger_island=True),
-    RegionData(Region.volcano_dwarf_shop, is_ginger_island=True),
-    RegionData(Region.volcano_floor_10, is_ginger_island=True),
-    RegionData(Region.island_trader, is_ginger_island=True),
-    RegionData(Region.island_farmhouse, [LogicEntrance.island_cooking], is_ginger_island=True),
-    RegionData(Region.gourmand_frog_cave, is_ginger_island=True),
-    RegionData(Region.colored_crystals_cave, is_ginger_island=True),
-    RegionData(Region.shipwreck, is_ginger_island=True),
-    RegionData(Region.qi_walnut_room, is_ginger_island=True),
-    RegionData(Region.leo_hut, is_ginger_island=True),
-    RegionData(Region.pirate_cove, is_ginger_island=True),
-    RegionData(Region.field_office, is_ginger_island=True),
-    RegionData(Region.dig_site,
+    RegionData(RegionName.volcano, [Entrance.climb_to_volcano_5, Entrance.volcano_to_secret_beach], is_ginger_island=True),
+    RegionData(RegionName.volcano_secret_beach, is_ginger_island=True),
+    RegionData(RegionName.volcano_floor_5, [Entrance.talk_to_volcano_dwarf, Entrance.climb_to_volcano_10], is_ginger_island=True),
+    RegionData(RegionName.volcano_dwarf_shop, is_ginger_island=True),
+    RegionData(RegionName.volcano_floor_10, is_ginger_island=True),
+    RegionData(RegionName.island_trader, is_ginger_island=True),
+    RegionData(RegionName.island_farmhouse, [LogicEntrance.island_cooking], is_ginger_island=True),
+    RegionData(RegionName.gourmand_frog_cave, is_ginger_island=True),
+    RegionData(RegionName.colored_crystals_cave, is_ginger_island=True),
+    RegionData(RegionName.shipwreck, is_ginger_island=True),
+    RegionData(RegionName.qi_walnut_room, is_ginger_island=True),
+    RegionData(RegionName.leo_hut, is_ginger_island=True),
+    RegionData(RegionName.pirate_cove, is_ginger_island=True),
+    RegionData(RegionName.field_office, is_ginger_island=True),
+    RegionData(RegionName.dig_site,
                [Entrance.dig_site_to_professor_snail_cave, Entrance.parrot_express_dig_site_to_volcano,
                 Entrance.parrot_express_dig_site_to_docks, Entrance.parrot_express_dig_site_to_jungle],
                is_ginger_island=True),
-    RegionData(Region.professor_snail_cave, is_ginger_island=True),
-    RegionData(Region.coop),
-    RegionData(Region.barn),
-    RegionData(Region.shed),
-    RegionData(Region.slime_hutch),
-
-    RegionData(Region.mines, [LogicEntrance.talk_to_mines_dwarf,
-                              Entrance.dig_to_mines_floor_5]),
-    RegionData(Region.mines_floor_5, [Entrance.dig_to_mines_floor_10]),
-    RegionData(Region.mines_floor_10, [Entrance.dig_to_mines_floor_15]),
-    RegionData(Region.mines_floor_15, [Entrance.dig_to_mines_floor_20]),
-    RegionData(Region.mines_floor_20, [Entrance.dig_to_mines_floor_25]),
-    RegionData(Region.mines_floor_25, [Entrance.dig_to_mines_floor_30]),
-    RegionData(Region.mines_floor_30, [Entrance.dig_to_mines_floor_35]),
-    RegionData(Region.mines_floor_35, [Entrance.dig_to_mines_floor_40]),
-    RegionData(Region.mines_floor_40, [Entrance.dig_to_mines_floor_45]),
-    RegionData(Region.mines_floor_45, [Entrance.dig_to_mines_floor_50]),
-    RegionData(Region.mines_floor_50, [Entrance.dig_to_mines_floor_55]),
-    RegionData(Region.mines_floor_55, [Entrance.dig_to_mines_floor_60]),
-    RegionData(Region.mines_floor_60, [Entrance.dig_to_mines_floor_65]),
-    RegionData(Region.mines_floor_65, [Entrance.dig_to_mines_floor_70]),
-    RegionData(Region.mines_floor_70, [Entrance.dig_to_mines_floor_75]),
-    RegionData(Region.mines_floor_75, [Entrance.dig_to_mines_floor_80]),
-    RegionData(Region.mines_floor_80, [Entrance.dig_to_mines_floor_85]),
-    RegionData(Region.mines_floor_85, [Entrance.dig_to_mines_floor_90]),
-    RegionData(Region.mines_floor_90, [Entrance.dig_to_mines_floor_95]),
-    RegionData(Region.mines_floor_95, [Entrance.dig_to_mines_floor_100]),
-    RegionData(Region.mines_floor_100, [Entrance.dig_to_mines_floor_105]),
-    RegionData(Region.mines_floor_105, [Entrance.dig_to_mines_floor_110]),
-    RegionData(Region.mines_floor_110, [Entrance.dig_to_mines_floor_115]),
-    RegionData(Region.mines_floor_115, [Entrance.dig_to_mines_floor_120]),
-    RegionData(Region.mines_floor_120, [Entrance.dig_to_dangerous_mines_20, Entrance.dig_to_dangerous_mines_60, Entrance.dig_to_dangerous_mines_100]),
-    RegionData(Region.dangerous_mines_20, is_ginger_island=True),
-    RegionData(Region.dangerous_mines_60, is_ginger_island=True),
-    RegionData(Region.dangerous_mines_100, is_ginger_island=True),
+    RegionData(RegionName.professor_snail_cave, is_ginger_island=True),
+    RegionData(RegionName.coop),
+    RegionData(RegionName.barn),
+    RegionData(RegionName.shed),
+    RegionData(RegionName.slime_hutch),
+
+    RegionData(RegionName.mines, [LogicEntrance.talk_to_mines_dwarf,
+                                  Entrance.dig_to_mines_floor_5]),
+    RegionData(RegionName.mines_floor_5, [Entrance.dig_to_mines_floor_10]),
+    RegionData(RegionName.mines_floor_10, [Entrance.dig_to_mines_floor_15]),
+    RegionData(RegionName.mines_floor_15, [Entrance.dig_to_mines_floor_20]),
+    RegionData(RegionName.mines_floor_20, [Entrance.dig_to_mines_floor_25]),
+    RegionData(RegionName.mines_floor_25, [Entrance.dig_to_mines_floor_30]),
+    RegionData(RegionName.mines_floor_30, [Entrance.dig_to_mines_floor_35]),
+    RegionData(RegionName.mines_floor_35, [Entrance.dig_to_mines_floor_40]),
+    RegionData(RegionName.mines_floor_40, [Entrance.dig_to_mines_floor_45]),
+    RegionData(RegionName.mines_floor_45, [Entrance.dig_to_mines_floor_50]),
+    RegionData(RegionName.mines_floor_50, [Entrance.dig_to_mines_floor_55]),
+    RegionData(RegionName.mines_floor_55, [Entrance.dig_to_mines_floor_60]),
+    RegionData(RegionName.mines_floor_60, [Entrance.dig_to_mines_floor_65]),
+    RegionData(RegionName.mines_floor_65, [Entrance.dig_to_mines_floor_70]),
+    RegionData(RegionName.mines_floor_70, [Entrance.dig_to_mines_floor_75]),
+    RegionData(RegionName.mines_floor_75, [Entrance.dig_to_mines_floor_80]),
+    RegionData(RegionName.mines_floor_80, [Entrance.dig_to_mines_floor_85]),
+    RegionData(RegionName.mines_floor_85, [Entrance.dig_to_mines_floor_90]),
+    RegionData(RegionName.mines_floor_90, [Entrance.dig_to_mines_floor_95]),
+    RegionData(RegionName.mines_floor_95, [Entrance.dig_to_mines_floor_100]),
+    RegionData(RegionName.mines_floor_100, [Entrance.dig_to_mines_floor_105]),
+    RegionData(RegionName.mines_floor_105, [Entrance.dig_to_mines_floor_110]),
+    RegionData(RegionName.mines_floor_110, [Entrance.dig_to_mines_floor_115]),
+    RegionData(RegionName.mines_floor_115, [Entrance.dig_to_mines_floor_120]),
+    RegionData(RegionName.mines_floor_120, [Entrance.dig_to_dangerous_mines_20, Entrance.dig_to_dangerous_mines_60, Entrance.dig_to_dangerous_mines_100]),
+    RegionData(RegionName.dangerous_mines_20, is_ginger_island=True),
+    RegionData(RegionName.dangerous_mines_60, is_ginger_island=True),
+    RegionData(RegionName.dangerous_mines_100, is_ginger_island=True),
 
     RegionData(LogicRegion.mines_dwarf_shop),
     RegionData(LogicRegion.blacksmith_copper, [LogicEntrance.blacksmith_iron]),
@@ -256,206 +256,207 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region:
 
 # Exists and where they lead
 vanilla_connections = [
-    ConnectionData(Entrance.to_stardew_valley, Region.stardew_valley),
-    ConnectionData(Entrance.to_farmhouse, Region.farm_house),
-    ConnectionData(Entrance.farmhouse_to_farm, Region.farm),
-    ConnectionData(Entrance.downstairs_to_cellar, Region.cellar),
-    ConnectionData(Entrance.farm_to_backwoods, Region.backwoods),
-    ConnectionData(Entrance.farm_to_bus_stop, Region.bus_stop),
-    ConnectionData(Entrance.farm_to_forest, Region.forest),
-    ConnectionData(Entrance.farm_to_farmcave, Region.farm_cave, flag=RandomizationFlag.NON_PROGRESSION),
-    ConnectionData(Entrance.enter_greenhouse, Region.greenhouse),
-    ConnectionData(Entrance.enter_coop, Region.coop),
-    ConnectionData(Entrance.enter_barn, Region.barn),
-    ConnectionData(Entrance.enter_shed, Region.shed),
-    ConnectionData(Entrance.enter_slime_hutch, Region.slime_hutch),
-    ConnectionData(Entrance.use_desert_obelisk, Region.desert),
-    ConnectionData(Entrance.use_island_obelisk, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.use_farm_obelisk, Region.farm),
-    ConnectionData(Entrance.backwoods_to_mountain, Region.mountain),
-    ConnectionData(Entrance.bus_stop_to_town, Region.town),
-    ConnectionData(Entrance.bus_stop_to_tunnel_entrance, Region.tunnel_entrance),
-    ConnectionData(Entrance.tunnel_entrance_to_bus_tunnel, Region.bus_tunnel, flag=RandomizationFlag.NON_PROGRESSION),
-    ConnectionData(Entrance.take_bus_to_desert, Region.desert),
-    ConnectionData(Entrance.forest_to_town, Region.town),
-    ConnectionData(Entrance.forest_to_wizard_tower, Region.wizard_tower,
+    ConnectionData(Entrance.to_stardew_valley, RegionName.stardew_valley),
+    ConnectionData(Entrance.to_farmhouse, RegionName.farm_house),
+    ConnectionData(Entrance.farmhouse_to_farm, RegionName.farm),
+    ConnectionData(Entrance.downstairs_to_cellar, RegionName.cellar),
+    ConnectionData(Entrance.farm_to_backwoods, RegionName.backwoods),
+    ConnectionData(Entrance.farm_to_bus_stop, RegionName.bus_stop),
+    ConnectionData(Entrance.farm_to_forest, RegionName.forest),
+    ConnectionData(Entrance.farm_to_farmcave, RegionName.farm_cave, flag=RandomizationFlag.NON_PROGRESSION),
+    ConnectionData(Entrance.enter_greenhouse, RegionName.greenhouse),
+    ConnectionData(Entrance.enter_coop, RegionName.coop),
+    ConnectionData(Entrance.enter_barn, RegionName.barn),
+    ConnectionData(Entrance.enter_shed, RegionName.shed),
+    ConnectionData(Entrance.enter_slime_hutch, RegionName.slime_hutch),
+    ConnectionData(Entrance.use_desert_obelisk, RegionName.desert),
+    ConnectionData(Entrance.use_island_obelisk, RegionName.island_south, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.use_farm_obelisk, RegionName.farm),
+    ConnectionData(Entrance.backwoods_to_mountain, RegionName.mountain),
+    ConnectionData(Entrance.bus_stop_to_town, RegionName.town),
+    ConnectionData(Entrance.bus_stop_to_tunnel_entrance, RegionName.tunnel_entrance),
+    ConnectionData(Entrance.tunnel_entrance_to_bus_tunnel, RegionName.bus_tunnel, flag=RandomizationFlag.NON_PROGRESSION),
+    ConnectionData(Entrance.take_bus_to_desert, RegionName.desert),
+    ConnectionData(Entrance.forest_to_town, RegionName.town),
+    ConnectionData(Entrance.forest_to_wizard_tower, RegionName.wizard_tower,
                    flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_wizard_basement, Region.wizard_basement, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.forest_to_marnie_ranch, Region.ranch,
+    ConnectionData(Entrance.enter_wizard_basement, RegionName.wizard_basement, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.forest_to_marnie_ranch, RegionName.ranch,
                    flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.forest_to_leah_cottage, Region.leah_house,
+    ConnectionData(Entrance.forest_to_leah_cottage, RegionName.leah_house,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_secret_woods, Region.secret_woods),
-    ConnectionData(Entrance.forest_to_sewer, Region.sewer, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.forest_to_mastery_cave, Region.mastery_cave, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.MASTERIES),
-    ConnectionData(Entrance.town_to_sewer, Region.sewer, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.enter_mutant_bug_lair, Region.mutant_bug_lair, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.mountain_to_railroad, Region.railroad),
-    ConnectionData(Entrance.mountain_to_tent, Region.tent,
+    ConnectionData(Entrance.enter_secret_woods, RegionName.secret_woods),
+    ConnectionData(Entrance.forest_to_sewer, RegionName.sewer, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.forest_to_mastery_cave, RegionName.mastery_cave, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.MASTERIES),
+    ConnectionData(Entrance.town_to_sewer, RegionName.sewer, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.enter_mutant_bug_lair, RegionName.mutant_bug_lair, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.mountain_to_railroad, RegionName.railroad),
+    ConnectionData(Entrance.mountain_to_tent, RegionName.tent,
                    flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.mountain_to_leo_treehouse, Region.leo_treehouse,
+    ConnectionData(Entrance.mountain_to_leo_treehouse, RegionName.leo_treehouse,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.mountain_to_carpenter_shop, Region.carpenter,
+    ConnectionData(Entrance.mountain_to_carpenter_shop, RegionName.carpenter,
                    flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.mountain_to_maru_room, Region.maru_room,
+    ConnectionData(Entrance.mountain_to_maru_room, RegionName.maru_room,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_sebastian_room, Region.sebastian_room, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.mountain_to_adventurer_guild, Region.adventurer_guild,
+    ConnectionData(Entrance.enter_sebastian_room, RegionName.sebastian_room, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.mountain_to_adventurer_guild, RegionName.adventurer_guild,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.adventurer_guild_to_bedroom, Region.adventurer_guild_bedroom),
-    ConnectionData(Entrance.enter_quarry, Region.quarry),
-    ConnectionData(Entrance.enter_quarry_mine_entrance, Region.quarry_mine_entrance,
+    ConnectionData(Entrance.adventurer_guild_to_bedroom, RegionName.adventurer_guild_bedroom),
+    ConnectionData(Entrance.enter_quarry, RegionName.quarry),
+    ConnectionData(Entrance.enter_quarry_mine_entrance, RegionName.quarry_mine_entrance,
                    flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.enter_quarry_mine, Region.quarry_mine),
-    ConnectionData(Entrance.mountain_to_town, Region.town),
-    ConnectionData(Entrance.town_to_community_center, Region.community_center,
+    ConnectionData(Entrance.enter_quarry_mine, RegionName.quarry_mine),
+    ConnectionData(Entrance.mountain_to_town, RegionName.town),
+    ConnectionData(Entrance.town_to_community_center, RegionName.community_center,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.access_crafts_room, Region.crafts_room),
-    ConnectionData(Entrance.access_pantry, Region.pantry),
-    ConnectionData(Entrance.access_fish_tank, Region.fish_tank),
-    ConnectionData(Entrance.access_boiler_room, Region.boiler_room),
-    ConnectionData(Entrance.access_bulletin_board, Region.bulletin_board),
-    ConnectionData(Entrance.access_vault, Region.vault),
-    ConnectionData(Entrance.town_to_hospital, Region.hospital,
+    ConnectionData(Entrance.access_crafts_room, RegionName.crafts_room),
+    ConnectionData(Entrance.access_pantry, RegionName.pantry),
+    ConnectionData(Entrance.access_fish_tank, RegionName.fish_tank),
+    ConnectionData(Entrance.access_boiler_room, RegionName.boiler_room),
+    ConnectionData(Entrance.access_bulletin_board, RegionName.bulletin_board),
+    ConnectionData(Entrance.access_vault, RegionName.vault),
+    ConnectionData(Entrance.town_to_hospital, RegionName.hospital,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_harvey_room, Region.harvey_room, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.town_to_pierre_general_store, Region.pierre_store,
+    ConnectionData(Entrance.enter_harvey_room, RegionName.harvey_room, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.town_to_pierre_general_store, RegionName.pierre_store,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_sunroom, Region.sunroom, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.town_to_clint_blacksmith, Region.blacksmith,
+    ConnectionData(Entrance.enter_sunroom, RegionName.sunroom, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.town_to_clint_blacksmith, RegionName.blacksmith,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.town_to_saloon, Region.saloon,
+    ConnectionData(Entrance.town_to_saloon, RegionName.saloon,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.play_journey_of_the_prairie_king, Region.jotpk_world_1),
-    ConnectionData(Entrance.reach_jotpk_world_2, Region.jotpk_world_2),
-    ConnectionData(Entrance.reach_jotpk_world_3, Region.jotpk_world_3),
-    ConnectionData(Entrance.play_junimo_kart, Region.junimo_kart_1),
-    ConnectionData(Entrance.reach_junimo_kart_2, Region.junimo_kart_2),
-    ConnectionData(Entrance.reach_junimo_kart_3, Region.junimo_kart_3),
-    ConnectionData(Entrance.reach_junimo_kart_4, Region.junimo_kart_4),
-    ConnectionData(Entrance.town_to_sam_house, Region.sam_house,
+    ConnectionData(Entrance.play_journey_of_the_prairie_king, RegionName.jotpk_world_1),
+    ConnectionData(Entrance.reach_jotpk_world_2, RegionName.jotpk_world_2),
+    ConnectionData(Entrance.reach_jotpk_world_3, RegionName.jotpk_world_3),
+    ConnectionData(Entrance.play_junimo_kart, RegionName.junimo_kart_1),
+    ConnectionData(Entrance.reach_junimo_kart_2, RegionName.junimo_kart_2),
+    ConnectionData(Entrance.reach_junimo_kart_3, RegionName.junimo_kart_3),
+    ConnectionData(Entrance.reach_junimo_kart_4, RegionName.junimo_kart_4),
+    ConnectionData(Entrance.town_to_sam_house, RegionName.sam_house,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.town_to_haley_house, Region.haley_house,
+    ConnectionData(Entrance.town_to_haley_house, RegionName.haley_house,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.town_to_mayor_manor, Region.mayor_house,
+    ConnectionData(Entrance.town_to_mayor_manor, RegionName.mayor_house,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.town_to_alex_house, Region.alex_house,
+    ConnectionData(Entrance.town_to_alex_house, RegionName.alex_house,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.town_to_trailer, Region.trailer,
+    ConnectionData(Entrance.town_to_trailer, RegionName.trailer,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.town_to_museum, Region.museum,
+    ConnectionData(Entrance.town_to_museum, RegionName.museum,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.town_to_jojamart, Region.jojamart,
+    ConnectionData(Entrance.town_to_jojamart, RegionName.jojamart,
                    flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.purchase_movie_ticket, Region.movie_ticket_stand),
-    ConnectionData(Entrance.enter_abandoned_jojamart, Region.abandoned_jojamart),
-    ConnectionData(Entrance.enter_movie_theater, Region.movie_theater),
-    ConnectionData(Entrance.town_to_beach, Region.beach),
-    ConnectionData(Entrance.enter_elliott_house, Region.elliott_house,
+    ConnectionData(Entrance.purchase_movie_ticket, RegionName.movie_ticket_stand),
+    ConnectionData(Entrance.enter_abandoned_jojamart, RegionName.abandoned_jojamart),
+    ConnectionData(Entrance.enter_movie_theater, RegionName.movie_theater),
+    ConnectionData(Entrance.town_to_beach, RegionName.beach),
+    ConnectionData(Entrance.enter_elliott_house, RegionName.elliott_house,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.beach_to_willy_fish_shop, Region.fish_shop,
+    ConnectionData(Entrance.beach_to_willy_fish_shop, RegionName.fish_shop,
                    flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.fish_shop_to_boat_tunnel, Region.boat_tunnel,
+    ConnectionData(Entrance.fish_shop_to_boat_tunnel, RegionName.boat_tunnel,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.boat_to_ginger_island, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.enter_tide_pools, Region.tide_pools),
-    ConnectionData(Entrance.mountain_to_the_mines, Region.mines,
+    ConnectionData(Entrance.boat_to_ginger_island, RegionName.island_south, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.enter_tide_pools, RegionName.tide_pools),
+    ConnectionData(Entrance.mountain_to_the_mines, RegionName.mines,
                    flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.dig_to_mines_floor_5, Region.mines_floor_5),
-    ConnectionData(Entrance.dig_to_mines_floor_10, Region.mines_floor_10),
-    ConnectionData(Entrance.dig_to_mines_floor_15, Region.mines_floor_15),
-    ConnectionData(Entrance.dig_to_mines_floor_20, Region.mines_floor_20),
-    ConnectionData(Entrance.dig_to_mines_floor_25, Region.mines_floor_25),
-    ConnectionData(Entrance.dig_to_mines_floor_30, Region.mines_floor_30),
-    ConnectionData(Entrance.dig_to_mines_floor_35, Region.mines_floor_35),
-    ConnectionData(Entrance.dig_to_mines_floor_40, Region.mines_floor_40),
-    ConnectionData(Entrance.dig_to_mines_floor_45, Region.mines_floor_45),
-    ConnectionData(Entrance.dig_to_mines_floor_50, Region.mines_floor_50),
-    ConnectionData(Entrance.dig_to_mines_floor_55, Region.mines_floor_55),
-    ConnectionData(Entrance.dig_to_mines_floor_60, Region.mines_floor_60),
-    ConnectionData(Entrance.dig_to_mines_floor_65, Region.mines_floor_65),
-    ConnectionData(Entrance.dig_to_mines_floor_70, Region.mines_floor_70),
-    ConnectionData(Entrance.dig_to_mines_floor_75, Region.mines_floor_75),
-    ConnectionData(Entrance.dig_to_mines_floor_80, Region.mines_floor_80),
-    ConnectionData(Entrance.dig_to_mines_floor_85, Region.mines_floor_85),
-    ConnectionData(Entrance.dig_to_mines_floor_90, Region.mines_floor_90),
-    ConnectionData(Entrance.dig_to_mines_floor_95, Region.mines_floor_95),
-    ConnectionData(Entrance.dig_to_mines_floor_100, Region.mines_floor_100),
-    ConnectionData(Entrance.dig_to_mines_floor_105, Region.mines_floor_105),
-    ConnectionData(Entrance.dig_to_mines_floor_110, Region.mines_floor_110),
-    ConnectionData(Entrance.dig_to_mines_floor_115, Region.mines_floor_115),
-    ConnectionData(Entrance.dig_to_mines_floor_120, Region.mines_floor_120),
-    ConnectionData(Entrance.dig_to_dangerous_mines_20, Region.dangerous_mines_20, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.dig_to_dangerous_mines_60, Region.dangerous_mines_60, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.dig_to_dangerous_mines_100, Region.dangerous_mines_100, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.enter_skull_cavern_entrance, Region.skull_cavern_entrance,
+    ConnectionData(Entrance.dig_to_mines_floor_5, RegionName.mines_floor_5),
+    ConnectionData(Entrance.dig_to_mines_floor_10, RegionName.mines_floor_10),
+    ConnectionData(Entrance.dig_to_mines_floor_15, RegionName.mines_floor_15),
+    ConnectionData(Entrance.dig_to_mines_floor_20, RegionName.mines_floor_20),
+    ConnectionData(Entrance.dig_to_mines_floor_25, RegionName.mines_floor_25),
+    ConnectionData(Entrance.dig_to_mines_floor_30, RegionName.mines_floor_30),
+    ConnectionData(Entrance.dig_to_mines_floor_35, RegionName.mines_floor_35),
+    ConnectionData(Entrance.dig_to_mines_floor_40, RegionName.mines_floor_40),
+    ConnectionData(Entrance.dig_to_mines_floor_45, RegionName.mines_floor_45),
+    ConnectionData(Entrance.dig_to_mines_floor_50, RegionName.mines_floor_50),
+    ConnectionData(Entrance.dig_to_mines_floor_55, RegionName.mines_floor_55),
+    ConnectionData(Entrance.dig_to_mines_floor_60, RegionName.mines_floor_60),
+    ConnectionData(Entrance.dig_to_mines_floor_65, RegionName.mines_floor_65),
+    ConnectionData(Entrance.dig_to_mines_floor_70, RegionName.mines_floor_70),
+    ConnectionData(Entrance.dig_to_mines_floor_75, RegionName.mines_floor_75),
+    ConnectionData(Entrance.dig_to_mines_floor_80, RegionName.mines_floor_80),
+    ConnectionData(Entrance.dig_to_mines_floor_85, RegionName.mines_floor_85),
+    ConnectionData(Entrance.dig_to_mines_floor_90, RegionName.mines_floor_90),
+    ConnectionData(Entrance.dig_to_mines_floor_95, RegionName.mines_floor_95),
+    ConnectionData(Entrance.dig_to_mines_floor_100, RegionName.mines_floor_100),
+    ConnectionData(Entrance.dig_to_mines_floor_105, RegionName.mines_floor_105),
+    ConnectionData(Entrance.dig_to_mines_floor_110, RegionName.mines_floor_110),
+    ConnectionData(Entrance.dig_to_mines_floor_115, RegionName.mines_floor_115),
+    ConnectionData(Entrance.dig_to_mines_floor_120, RegionName.mines_floor_120),
+    ConnectionData(Entrance.dig_to_dangerous_mines_20, RegionName.dangerous_mines_20, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.dig_to_dangerous_mines_60, RegionName.dangerous_mines_60, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.dig_to_dangerous_mines_100, RegionName.dangerous_mines_100, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.enter_skull_cavern_entrance, RegionName.skull_cavern_entrance,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_oasis, Region.oasis,
+    ConnectionData(Entrance.enter_oasis, RegionName.oasis,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_casino, Region.casino, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.enter_skull_cavern, Region.skull_cavern),
-    ConnectionData(Entrance.mine_to_skull_cavern_floor_25, Region.skull_cavern_25),
-    ConnectionData(Entrance.mine_to_skull_cavern_floor_50, Region.skull_cavern_50),
-    ConnectionData(Entrance.mine_to_skull_cavern_floor_75, Region.skull_cavern_75),
-    ConnectionData(Entrance.mine_to_skull_cavern_floor_100, Region.skull_cavern_100),
-    ConnectionData(Entrance.mine_to_skull_cavern_floor_125, Region.skull_cavern_125),
-    ConnectionData(Entrance.mine_to_skull_cavern_floor_150, Region.skull_cavern_150),
-    ConnectionData(Entrance.mine_to_skull_cavern_floor_175, Region.skull_cavern_175),
-    ConnectionData(Entrance.mine_to_skull_cavern_floor_200, Region.skull_cavern_200),
-    ConnectionData(Entrance.enter_dangerous_skull_cavern, Region.dangerous_skull_cavern, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.enter_witch_warp_cave, Region.witch_warp_cave, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.enter_witch_swamp, Region.witch_swamp, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.enter_witch_hut, Region.witch_hut, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.witch_warp_to_wizard_basement, Region.wizard_basement, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.enter_bathhouse_entrance, Region.bathhouse_entrance,
+    ConnectionData(Entrance.enter_casino, RegionName.casino, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.enter_skull_cavern, RegionName.skull_cavern),
+    ConnectionData(Entrance.mine_to_skull_cavern_floor_25, RegionName.skull_cavern_25),
+    ConnectionData(Entrance.mine_to_skull_cavern_floor_50, RegionName.skull_cavern_50),
+    ConnectionData(Entrance.mine_to_skull_cavern_floor_75, RegionName.skull_cavern_75),
+    ConnectionData(Entrance.mine_to_skull_cavern_floor_100, RegionName.skull_cavern_100),
+    ConnectionData(Entrance.mine_to_skull_cavern_floor_125, RegionName.skull_cavern_125),
+    ConnectionData(Entrance.mine_to_skull_cavern_floor_150, RegionName.skull_cavern_150),
+    ConnectionData(Entrance.mine_to_skull_cavern_floor_175, RegionName.skull_cavern_175),
+    ConnectionData(Entrance.mine_to_skull_cavern_floor_200, RegionName.skull_cavern_200),
+    ConnectionData(Entrance.enter_dangerous_skull_cavern, RegionName.dangerous_skull_cavern, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.enter_witch_warp_cave, RegionName.witch_warp_cave, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.enter_witch_swamp, RegionName.witch_swamp, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.enter_witch_hut, RegionName.witch_hut, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.witch_warp_to_wizard_basement, RegionName.wizard_basement, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.enter_bathhouse_entrance, RegionName.bathhouse_entrance,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA),
-    ConnectionData(Entrance.enter_locker_room, Region.locker_room, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.enter_public_bath, Region.public_bath, flag=RandomizationFlag.BUILDINGS),
-    ConnectionData(Entrance.island_south_to_west, Region.island_west, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_south_to_north, Region.island_north, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_south_to_east, Region.island_east, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_south_to_southeast, Region.island_south_east,
+    ConnectionData(Entrance.enter_locker_room, RegionName.locker_room, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.enter_public_bath, RegionName.public_bath, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(Entrance.island_south_to_west, RegionName.island_west, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.island_south_to_north, RegionName.island_north, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.island_south_to_east, RegionName.island_east, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.island_south_to_southeast, RegionName.island_south_east,
                    flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.use_island_resort, Region.island_resort, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_west_to_islandfarmhouse, Region.island_farmhouse,
+    ConnectionData(Entrance.use_island_resort, RegionName.island_resort, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.island_west_to_islandfarmhouse, RegionName.island_farmhouse,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_west_to_gourmand_cave, Region.gourmand_frog_cave,
+    ConnectionData(Entrance.island_west_to_gourmand_cave, RegionName.gourmand_frog_cave,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_west_to_crystals_cave, Region.colored_crystals_cave,
+    ConnectionData(Entrance.island_west_to_crystals_cave, RegionName.colored_crystals_cave,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_west_to_shipwreck, Region.shipwreck,
+    ConnectionData(Entrance.island_west_to_shipwreck, RegionName.shipwreck,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_west_to_qi_walnut_room, Region.qi_walnut_room, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_east_to_leo_hut, Region.leo_hut,
+    ConnectionData(Entrance.island_west_to_qi_walnut_room, RegionName.qi_walnut_room, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.island_east_to_leo_hut, RegionName.leo_hut,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_east_to_island_shrine, Region.island_shrine,
+    ConnectionData(Entrance.island_east_to_island_shrine, RegionName.island_shrine,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_southeast_to_pirate_cove, Region.pirate_cove,
+    ConnectionData(Entrance.island_southeast_to_pirate_cove, RegionName.pirate_cove,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_north_to_field_office, Region.field_office,
+    ConnectionData(Entrance.island_north_to_field_office, RegionName.field_office,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_north_to_dig_site, Region.dig_site, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.dig_site_to_professor_snail_cave, Region.professor_snail_cave, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.island_north_to_volcano, Region.volcano,
+    ConnectionData(Entrance.island_north_to_dig_site, RegionName.dig_site, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.dig_site_to_professor_snail_cave, RegionName.professor_snail_cave,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.volcano_to_secret_beach, Region.volcano_secret_beach,
+    ConnectionData(Entrance.island_north_to_volcano, RegionName.volcano,
                    flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.talk_to_island_trader, Region.island_trader, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.climb_to_volcano_5, Region.volcano_floor_5, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.talk_to_volcano_dwarf, Region.volcano_dwarf_shop, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.climb_to_volcano_10, Region.volcano_floor_10, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_jungle_to_docks, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_dig_site_to_docks, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_volcano_to_docks, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_volcano_to_jungle, Region.island_west, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_docks_to_jungle, Region.island_west, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_dig_site_to_jungle, Region.island_west, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_docks_to_dig_site, Region.dig_site, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_volcano_to_dig_site, Region.dig_site, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_jungle_to_dig_site, Region.dig_site, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_dig_site_to_volcano, Region.island_north, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_docks_to_volcano, Region.island_north, flag=RandomizationFlag.GINGER_ISLAND),
-    ConnectionData(Entrance.parrot_express_jungle_to_volcano, Region.island_north, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.volcano_to_secret_beach, RegionName.volcano_secret_beach,
+                   flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.talk_to_island_trader, RegionName.island_trader, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.climb_to_volcano_5, RegionName.volcano_floor_5, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.talk_to_volcano_dwarf, RegionName.volcano_dwarf_shop, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.climb_to_volcano_10, RegionName.volcano_floor_10, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_jungle_to_docks, RegionName.island_south, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_dig_site_to_docks, RegionName.island_south, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_volcano_to_docks, RegionName.island_south, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_volcano_to_jungle, RegionName.island_west, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_docks_to_jungle, RegionName.island_west, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_dig_site_to_jungle, RegionName.island_west, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_docks_to_dig_site, RegionName.dig_site, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_volcano_to_dig_site, RegionName.dig_site, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_jungle_to_dig_site, RegionName.dig_site, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_dig_site_to_volcano, RegionName.island_north, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_docks_to_volcano, RegionName.island_north, flag=RandomizationFlag.GINGER_ISLAND),
+    ConnectionData(Entrance.parrot_express_jungle_to_volcano, RegionName.island_north, flag=RandomizationFlag.GINGER_ISLAND),
 
     ConnectionData(LogicEntrance.talk_to_mines_dwarf, LogicRegion.mines_dwarf_shop),
 
@@ -708,7 +709,7 @@ def swap_connections_until_valid(regions_by_name, connections_by_name: Dict[str,
 
 
 def region_should_be_reachable(region_name: str, connections_in_slot: Iterable[ConnectionData]) -> bool:
-    if region_name == Region.menu:
+    if region_name == RegionName.menu:
         return True
     for connection in connections_in_slot:
         if region_name == connection.destination:
@@ -718,11 +719,11 @@ def region_should_be_reachable(region_name: str, connections_in_slot: Iterable[C
 
 def find_reachable_regions(regions_by_name, connections_by_name,
                            randomized_connections: Dict[ConnectionData, ConnectionData]):
-    reachable_regions = {Region.menu}
+    reachable_regions = {RegionName.menu}
     unreachable_regions = {region for region in regions_by_name.keys()}
     # unreachable_regions = {region for region in regions_by_name.keys() if region_should_be_reachable(region, connections_by_name.values())}
-    unreachable_regions.remove(Region.menu)
-    exits_to_explore = list(regions_by_name[Region.menu].exits)
+    unreachable_regions.remove(RegionName.menu)
+    exits_to_explore = list(regions_by_name[RegionName.menu].exits)
     while exits_to_explore:
         exit_name = exits_to_explore.pop()
         # if exit_name not in connections_by_name:
diff --git a/worlds/stardew_valley/scripts/update_data.py b/worlds/stardew_valley/scripts/update_data.py
index ae8f7f8d5503..5c2e6a57a4db 100644
--- a/worlds/stardew_valley/scripts/update_data.py
+++ b/worlds/stardew_valley/scripts/update_data.py
@@ -12,7 +12,7 @@
 
 from worlds.stardew_valley import LocationData
 from worlds.stardew_valley.items import load_item_csv, Group, ItemData
-from worlds.stardew_valley.locations import load_location_csv, LocationTags
+from worlds.stardew_valley.locations import load_location_csv
 
 RESOURCE_PACK_CODE_OFFSET = 5000
 script_folder = Path(__file__)
@@ -56,9 +56,9 @@ def write_location_csv(locations: List[LocationData]):
                                        and item.code_without_offset is not None) + 1)
 
     resource_pack_counter = itertools.count(max(item.code_without_offset
-                                       for item in loaded_items
-                                       if Group.RESOURCE_PACK in item.groups
-                                       and item.code_without_offset is not None) + 1)
+                                                for item in loaded_items
+                                                if Group.RESOURCE_PACK in item.groups
+                                                and item.code_without_offset is not None) + 1)
     items_to_write = []
     for item in loaded_items:
         if item.code_without_offset is None:
diff --git a/worlds/stardew_valley/stardew_rule/base.py b/worlds/stardew_valley/stardew_rule/base.py
index af4c3c35330d..ff1fbba37648 100644
--- a/worlds/stardew_valley/stardew_rule/base.py
+++ b/worlds/stardew_valley/stardew_rule/base.py
@@ -6,7 +6,7 @@
 from functools import cached_property
 from itertools import chain
 from threading import Lock
-from typing import Iterable, Dict, List, Union, Sized, Hashable, Callable, Tuple, Set, Optional
+from typing import Iterable, Dict, List, Union, Sized, Hashable, Callable, Tuple, Set, Optional, cast
 
 from BaseClasses import CollectionState
 from .literal import true_, false_, LiteralStardewRule
@@ -318,6 +318,7 @@ def __or__(self, other):
             return Or(_combinable_rules=other.add_into(self.combinable_rules, self.combine), _simplification_state=self.simplification_state)
 
         if type(other) is Or:
+            other = cast(Or, other)
             return Or(_combinable_rules=self.merge(self.combinable_rules, other.combinable_rules),
                       _simplification_state=self.simplification_state.merge(other.simplification_state))
 
@@ -344,6 +345,7 @@ def __and__(self, other):
             return And(_combinable_rules=other.add_into(self.combinable_rules, self.combine), _simplification_state=self.simplification_state)
 
         if type(other) is And:
+            other = cast(And, other)
             return And(_combinable_rules=self.merge(self.combinable_rules, other.combinable_rules),
                        _simplification_state=self.simplification_state.merge(other.simplification_state))
 
diff --git a/worlds/stardew_valley/test/TestMultiplePlayers.py b/worlds/stardew_valley/test/TestMultiplePlayers.py
index 2f2092fdf7b6..d8db616f66f4 100644
--- a/worlds/stardew_valley/test/TestMultiplePlayers.py
+++ b/worlds/stardew_valley/test/TestMultiplePlayers.py
@@ -53,8 +53,6 @@ def test_different_money_settings(self):
     def test_money_rule_caching(self):
         options_festivals_limited_money = {FestivalLocations.internal_name: FestivalLocations.option_easy,
                                            StartingMoney.internal_name: 5000}
-        options_festivals_limited_money = {FestivalLocations.internal_name: FestivalLocations.option_easy,
-                                           StartingMoney.internal_name: 5000}
 
         multiplayer_options = [options_festivals_limited_money, options_festivals_limited_money]
         multiworld = setup_multiworld(multiplayer_options)
diff --git a/worlds/stardew_valley/test/TestWalnutsanity.py b/worlds/stardew_valley/test/TestWalnutsanity.py
index c1e8c2c8f095..da17d749eaed 100644
--- a/worlds/stardew_valley/test/TestWalnutsanity.py
+++ b/worlds/stardew_valley/test/TestWalnutsanity.py
@@ -25,7 +25,7 @@ def test_logic_received_walnuts(self):
         self.collect("Island Obelisk")
         self.collect("Island West Turtle")
         self.collect("Progressive House")
-        items = self.collect("5 Golden Walnuts", 10)
+        self.collect("5 Golden Walnuts", 10)
 
         self.assertFalse(self.multiworld.state.can_reach_location("Parrot Express", self.player))
         self.collect("Island North Turtle")
@@ -126,10 +126,10 @@ def test_logic_received_walnuts(self):
         # You need to receive 25, and collect 15
         self.collect("Island Obelisk")
         self.collect("Island West Turtle")
-        items = self.collect("5 Golden Walnuts", 5)
+        self.collect("5 Golden Walnuts", 5)
 
         self.assertFalse(self.multiworld.state.can_reach_location("Parrot Express", self.player))
-        items = self.collect("Island North Turtle")
+        self.collect("Island North Turtle")
         self.assertTrue(self.multiworld.state.can_reach_location("Parrot Express", self.player))
 
 
@@ -203,7 +203,7 @@ def test_logic_received_walnuts(self):
         self.assertTrue(self.multiworld.state.can_reach_location("Parrot Express", self.player))
         self.remove(items)
         self.assertFalse(self.multiworld.state.can_reach_location("Parrot Express", self.player))
-        items = self.collect("5 Golden Walnuts", 4)
-        items = self.collect("3 Golden Walnuts", 6)
-        items = self.collect("Golden Walnut", 2)
+        self.collect("5 Golden Walnuts", 4)
+        self.collect("3 Golden Walnuts", 6)
+        self.collect("Golden Walnut", 2)
         self.assertTrue(self.multiworld.state.can_reach_location("Parrot Express", self.player))
diff --git a/worlds/stardew_valley/test/rules/TestFishing.py b/worlds/stardew_valley/test/rules/TestFishing.py
index 04a1528dd8b1..513bb951e933 100644
--- a/worlds/stardew_valley/test/rules/TestFishing.py
+++ b/worlds/stardew_valley/test/rules/TestFishing.py
@@ -1,5 +1,4 @@
-from ...options import SeasonRandomization, Friendsanity, FriendsanityHeartSize, Fishsanity, ExcludeGingerIsland, SkillProgression, ToolProgression, \
-    ElevatorProgression, SpecialOrderLocations
+from ...options import SeasonRandomization, Fishsanity, ExcludeGingerIsland, SkillProgression, ToolProgression, ElevatorProgression, SpecialOrderLocations
 from ...strings.fish_names import Fish
 from ...test import SVTestBase
 

From 894732be474a63f84783de6cfad2260a047e8ad8 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun, 2 Feb 2025 02:53:16 +0100
Subject: [PATCH 348/381] kvui: set home folder to non-default (#4590)

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 kvui.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kvui.py b/kvui.py
index f47e45b93c07..6718e48bee33 100644
--- a/kvui.py
+++ b/kvui.py
@@ -26,6 +26,10 @@
 if Utils.is_frozen():
     os.environ["KIVY_DATA_DIR"] = Utils.local_path("data")
 
+import platformdirs
+os.environ["KIVY_HOME"] = os.path.join(platformdirs.user_config_dir("Archipelago", False), "kivy")
+os.makedirs(os.environ["KIVY_HOME"], exist_ok=True)
+
 from kivy.config import Config
 
 Config.set("input", "mouse", "mouse,disable_multitouch")

From f28aff6f9a86b6adff6f67253d17ee12a5c49c92 Mon Sep 17 00:00:00 2001
From: Mysteryem <Mysteryem@users.noreply.github.com>
Date: Sun, 2 Feb 2025 14:25:34 +0000
Subject: [PATCH 349/381] Core: Replace generator creation/iteration in
 CollectionState methods (#4587)

* Core: Replace generator creation/iteration in CollectionState methods

Using generators in these functions incurs overhead to create the new
generator instance, call the `any`/`all`/`sum` function and have the
`any`/`all`/`sum` function iterate the generator, which in turn iterates
the iterable.

Replacing the use of generators with for loops is faster.

Getting `self.prog_items[player]` once in advance also improves
performance of iterating longer iterables.

* Add comment on the choice of for loops instead of any()/all()/sum()
---
 BaseClasses.py | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index e19ba5f7772e..3d0004806cc5 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -869,21 +869,40 @@ def sweep_for_advancements(self, locations: Optional[Iterable[Location]] = None)
     def has(self, item: str, player: int, count: int = 1) -> bool:
         return self.prog_items[player][item] >= count
 
+    # for loops are specifically used in all/any/count methods, instead of all()/any()/sum(), to avoid the overhead of
+    # creating and iterating generator instances. In `return all(player_prog_items[item] for item in items)`, the
+    # argument to all() would be a new generator instance, for example.
     def has_all(self, items: Iterable[str], player: int) -> bool:
         """Returns True if each item name of items is in state at least once."""
-        return all(self.prog_items[player][item] for item in items)
+        player_prog_items = self.prog_items[player]
+        for item in items:
+            if not player_prog_items[item]:
+                return False
+        return True
 
     def has_any(self, items: Iterable[str], player: int) -> bool:
         """Returns True if at least one item name of items is in state at least once."""
-        return any(self.prog_items[player][item] for item in items)
+        player_prog_items = self.prog_items[player]
+        for item in items:
+            if player_prog_items[item]:
+                return True
+        return False
 
     def has_all_counts(self, item_counts: Mapping[str, int], player: int) -> bool:
         """Returns True if each item name is in the state at least as many times as specified."""
-        return all(self.prog_items[player][item] >= count for item, count in item_counts.items())
+        player_prog_items = self.prog_items[player]
+        for item, count in item_counts.items():
+            if player_prog_items[item] < count:
+                return False
+        return True
 
     def has_any_count(self, item_counts: Mapping[str, int], player: int) -> bool:
         """Returns True if at least one item name is in the state at least as many times as specified."""
-        return any(self.prog_items[player][item] >= count for item, count in item_counts.items())
+        player_prog_items = self.prog_items[player]
+        for item, count in item_counts.items():
+            if player_prog_items[item] >= count:
+                return True
+        return False
 
     def count(self, item: str, player: int) -> int:
         return self.prog_items[player][item]
@@ -911,11 +930,20 @@ 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)
+        player_prog_items = self.prog_items[player]
+        total = 0
+        for item_name in items:
+            total += player_prog_items[item_name]
+        return total
 
     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)
+        player_prog_items = self.prog_items[player]
+        total = 0
+        for item_name in items:
+            if player_prog_items[item_name] > 0:
+                total += 1
+        return total
 
     # item name group related
     def has_group(self, item_name_group: str, player: int, count: int = 1) -> bool:

From 628252896e41d5d3e10414149a7bf50eed1307e3 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Mon, 3 Feb 2025 09:53:56 -0500
Subject: [PATCH 350/381] TUNIC: Call Combat Logic experimental (#4594)

* Update options.py

* Update options.py
---
 worlds/tunic/options.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index d2ea82803704..8fe2ea5ce854 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -197,6 +197,7 @@ class TunicPlandoConnections(PlandoConnections):
 
 class CombatLogic(Choice):
     """
+    EXPERIMENTAL - may cause gen failures, especially when playthrough generation for the spoiler log is enabled, and may have slight logic issues.
     If enabled, the player will logically require a combination of stat upgrade items and equipment to get some checks or navigate to some areas, with a goal of matching the vanilla combat difficulty.
     The player may still be expected to run past enemies, reset aggro (by using a checkpoint or doing a scene transition), or find sneaky paths to checks.
     This option marks many more items as progression and may force weapons much earlier than normal.

From 19faaa4104a97cac4a7980454ba55dae42758ea7 Mon Sep 17 00:00:00 2001
From: massimilianodelliubaldini
 <8584296+massimilianodelliubaldini@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:49:07 -0500
Subject: [PATCH 351/381] Core: Fix #4595 by using first type's docstring in a
 union type (#4600)

* Fix #4595: use first type's docstring in a union type.

* Reuse existing import.
---
 settings.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings.py b/settings.py
index cc808c2732df..14d4ba30cefb 100644
--- a/settings.py
+++ b/settings.py
@@ -282,7 +282,8 @@ def dump(self, f: TextIO, level: int = 0) -> None:
                 attr = cast(object, getattr(self, name))
                 attr_cls = type_hints[name] if name in type_hints else attr.__class__
                 attr_cls_origin = typing.get_origin(attr_cls)
-                while attr_cls_origin is Union:  # resolve to first type for doc string
+                # resolve to first type for doc string
+                while attr_cls_origin is Union or attr_cls_origin is types.UnionType:
                     attr_cls = typing.get_args(attr_cls)[0]
                     attr_cls_origin = typing.get_origin(attr_cls)
                 if attr_cls.__doc__ and attr_cls.__module__ != "builtins":

From da48af60dc443526cf28a16568e6cdb9d5732f09 Mon Sep 17 00:00:00 2001
From: Jouramie <16137441+Jouramie@users.noreply.github.com>
Date: Tue, 4 Feb 2025 02:27:23 -0500
Subject: [PATCH 352/381] Stardew Valley: add assert_can_reach_region_* for
 better tests (#4556)

* add assert_reach_region_*; refactor existing assert_reach_location_* to allow string

* rename asserts
---
 worlds/stardew_valley/test/TestBooksanity.py  |  8 ++--
 .../stardew_valley/test/TestWalnutsanity.py   |  4 +-
 .../test/assertion/rule_assert.py             | 41 +++++++++++++++----
 .../test/assertion/world_assert.py            |  2 +-
 worlds/stardew_valley/test/rules/TestBooks.py |  8 ++--
 .../stardew_valley/test/rules/TestFishing.py  |  6 +--
 .../stardew_valley/test/rules/TestSkills.py   | 10 ++---
 7 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/worlds/stardew_valley/test/TestBooksanity.py b/worlds/stardew_valley/test/TestBooksanity.py
index 942f35d961a9..3c737e502c64 100644
--- a/worlds/stardew_valley/test/TestBooksanity.py
+++ b/worlds/stardew_valley/test/TestBooksanity.py
@@ -65,7 +65,7 @@ def test_can_ship_all_books(self):
             if item_to_ship not in power_books and item_to_ship not in skill_books:
                 continue
             with self.subTest(location.name):
-                self.assert_reach_location_true(location, self.multiworld.state)
+                self.assert_can_reach_location(location, self.multiworld.state)
 
 
 class TestBooksanityPowers(SVTestBase):
@@ -111,7 +111,7 @@ def test_can_ship_all_books(self):
             if item_to_ship not in power_books and item_to_ship not in skill_books:
                 continue
             with self.subTest(location.name):
-                self.assert_reach_location_true(location, self.multiworld.state)
+                self.assert_can_reach_location(location, self.multiworld.state)
 
 
 class TestBooksanityPowersAndSkills(SVTestBase):
@@ -157,7 +157,7 @@ def test_can_ship_all_books(self):
             if item_to_ship not in power_books and item_to_ship not in skill_books:
                 continue
             with self.subTest(location.name):
-                self.assert_reach_location_true(location, self.multiworld.state)
+                self.assert_can_reach_location(location, self.multiworld.state)
 
 
 class TestBooksanityAll(SVTestBase):
@@ -203,4 +203,4 @@ def test_can_ship_all_books(self):
             if item_to_ship not in power_books and item_to_ship not in skill_books:
                 continue
             with self.subTest(location.name):
-                self.assert_reach_location_true(location, self.multiworld.state)
+                self.assert_can_reach_location(location, self.multiworld.state)
diff --git a/worlds/stardew_valley/test/TestWalnutsanity.py b/worlds/stardew_valley/test/TestWalnutsanity.py
index da17d749eaed..862553dee1cb 100644
--- a/worlds/stardew_valley/test/TestWalnutsanity.py
+++ b/worlds/stardew_valley/test/TestWalnutsanity.py
@@ -81,10 +81,10 @@ def test_field_office_locations_require_professor_snail(self):
         self.collect("Combat Level", 10)
         self.collect("Mining Level", 10)
         for location in locations:
-            self.assert_reach_location_false(location, self.multiworld.state)
+            self.assert_cannot_reach_location(location, self.multiworld.state)
         self.collect("Open Professor Snail Cave")
         for location in locations:
-            self.assert_reach_location_true(location, self.multiworld.state)
+            self.assert_can_reach_location(location, self.multiworld.state)
 
 
 class TestWalnutsanityBushes(SVTestBase):
diff --git a/worlds/stardew_valley/test/assertion/rule_assert.py b/worlds/stardew_valley/test/assertion/rule_assert.py
index 1031a18e115c..02362f2d150d 100644
--- a/worlds/stardew_valley/test/assertion/rule_assert.py
+++ b/worlds/stardew_valley/test/assertion/rule_assert.py
@@ -1,7 +1,7 @@
 from typing import List
 from unittest import TestCase
 
-from BaseClasses import CollectionState, Location
+from BaseClasses import CollectionState, Location, Region
 from ...stardew_rule import StardewRule, false_, MISSING_ITEM, Reach
 from ...stardew_rule.rule_explain import explain
 
@@ -40,19 +40,42 @@ def assert_rule_can_be_resolved(self, rule: StardewRule, complete_state: Collect
             raise AssertionError(f"Error while checking rule {rule}: {e}"
                                  f"\nExplanation: {expl}")
 
-    def assert_reach_location_true(self, location: Location, state: CollectionState):
-        expl = explain(Reach(location.name, "Location", 1), state)
+    def assert_can_reach_location(self, location: Location | str, state: CollectionState) -> None:
+        location_name = location.name if isinstance(location, Location) else location
+        expl = explain(Reach(location_name, "Location", 1), state)
         try:
-            can_reach = location.can_reach(state)
+            can_reach = state.can_reach_location(location_name, 1)
             self.assertTrue(can_reach, expl)
         except KeyError as e:
-            raise AssertionError(f"Error while checking location {location.name}: {e}"
+            raise AssertionError(f"Error while checking location {location_name}: {e}"
                                  f"\nExplanation: {expl}")
 
-    def assert_reach_location_false(self, location: Location, state: CollectionState):
-        expl = explain(Reach(location.name, "Location", 1), state, expected=False)
+    def assert_cannot_reach_location(self, location: Location | str, state: CollectionState) -> None:
+        location_name = location.name if isinstance(location, Location) else location
+        expl = explain(Reach(location_name, "Location", 1), state, expected=False)
         try:
-            self.assertFalse(location.can_reach(state), expl)
+            can_reach = state.can_reach_location(location_name, 1)
+            self.assertFalse(can_reach, expl)
         except KeyError as e:
-            raise AssertionError(f"Error while checking location {location.name}: {e}"
+            raise AssertionError(f"Error while checking location {location_name}: {e}"
+                                 f"\nExplanation: {expl}")
+
+    def assert_can_reach_region(self, region: Region | str, state: CollectionState) -> None:
+        region_name = region.name if isinstance(region, Region) else region
+        expl = explain(Reach(region_name, "Region", 1), state)
+        try:
+            can_reach = state.can_reach_region(region_name, 1)
+            self.assertTrue(can_reach, expl)
+        except KeyError as e:
+            raise AssertionError(f"Error while checking region {region_name}: {e}"
+                                 f"\nExplanation: {expl}")
+
+    def assert_cannot_reach_region(self, region: Region | str, state: CollectionState) -> None:
+        region_name = region.name if isinstance(region, Region) else region
+        expl = explain(Reach(region_name, "Region", 1), state, expected=False)
+        try:
+            can_reach = state.can_reach_region(region_name, 1)
+            self.assertFalse(can_reach, expl)
+        except KeyError as e:
+            raise AssertionError(f"Error while checking region {region_name}: {e}"
                                  f"\nExplanation: {expl}")
diff --git a/worlds/stardew_valley/test/assertion/world_assert.py b/worlds/stardew_valley/test/assertion/world_assert.py
index 97172834543c..97f5376058cb 100644
--- a/worlds/stardew_valley/test/assertion/world_assert.py
+++ b/worlds/stardew_valley/test/assertion/world_assert.py
@@ -53,7 +53,7 @@ def assert_same_number_items_locations(self, multiworld: MultiWorld):
 
     def assert_can_reach_everything(self, multiworld: MultiWorld):
         for location in multiworld.get_locations():
-            self.assert_reach_location_true(location, multiworld.state)
+            self.assert_can_reach_location(location, multiworld.state)
 
     def assert_basic_checks(self, multiworld: MultiWorld):
         self.assert_same_number_items_locations(multiworld)
diff --git a/worlds/stardew_valley/test/rules/TestBooks.py b/worlds/stardew_valley/test/rules/TestBooks.py
index 6605e7e645e3..af0055d2282d 100644
--- a/worlds/stardew_valley/test/rules/TestBooks.py
+++ b/worlds/stardew_valley/test/rules/TestBooks.py
@@ -12,15 +12,13 @@ def test_need_weapon_for_mapping_cave_systems(self):
 
         location = self.multiworld.get_location("Read Mapping Cave Systems", self.player)
 
-        self.assert_reach_location_false(location, self.multiworld.state)
+        self.assert_cannot_reach_location(location, self.multiworld.state)
 
         self.collect("Progressive Mine Elevator")
         self.collect("Progressive Mine Elevator")
         self.collect("Progressive Mine Elevator")
         self.collect("Progressive Mine Elevator")
-        self.assert_reach_location_false(location, self.multiworld.state)
+        self.assert_cannot_reach_location(location, self.multiworld.state)
 
         self.collect("Progressive Weapon")
-        self.assert_reach_location_true(location, self.multiworld.state)
-
-
+        self.assert_can_reach_location(location, self.multiworld.state)
diff --git a/worlds/stardew_valley/test/rules/TestFishing.py b/worlds/stardew_valley/test/rules/TestFishing.py
index 513bb951e933..74a33f36686f 100644
--- a/worlds/stardew_valley/test/rules/TestFishing.py
+++ b/worlds/stardew_valley/test/rules/TestFishing.py
@@ -43,18 +43,18 @@ def test_catch_fish_requires_region_unlock(self):
                 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)
+                self.assert_cannot_reach_location(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)
+                    self.assert_can_reach_location(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.assert_cannot_reach_location(location, self.multiworld.state)
 
             self.multiworld.state = self.original_state.copy()
diff --git a/worlds/stardew_valley/test/rules/TestSkills.py b/worlds/stardew_valley/test/rules/TestSkills.py
index 77adade886dc..ee605bfaa161 100644
--- a/worlds/stardew_valley/test/rules/TestSkills.py
+++ b/worlds/stardew_valley/test/rules/TestSkills.py
@@ -39,10 +39,10 @@ def test_all_skill_levels_require_previous_level(self):
 
                 with self.subTest(location_name):
                     if level > 1:
-                        self.assert_reach_location_false(location, self.multiworld.state)
+                        self.assert_cannot_reach_location(location, self.multiworld.state)
                         self.collect(f"{skill} Level")
 
-                    self.assert_reach_location_true(location, self.multiworld.state)
+                    self.assert_can_reach_location(location, self.multiworld.state)
 
             self.reset_collection_state()
 
@@ -88,7 +88,7 @@ def test_given_all_levels_when_can_earn_mastery_then_can_earn_mastery(self):
         for skill in all_vanilla_skills:
             with self.subTest(skill):
                 location = self.multiworld.get_location(f"{skill} Mastery", self.player)
-                self.assert_reach_location_true(location, self.multiworld.state)
+                self.assert_can_reach_location(location, self.multiworld.state)
 
         self.reset_collection_state()
 
@@ -99,7 +99,7 @@ def test_given_one_level_missing_when_can_earn_mastery_then_cannot_earn_mastery(
                 self.remove_one_by_name(f"{skill} Level")
 
                 location = self.multiworld.get_location(f"{skill} Mastery", self.player)
-                self.assert_reach_location_false(location, self.multiworld.state)
+                self.assert_cannot_reach_location(location, self.multiworld.state)
 
                 self.reset_collection_state()
 
@@ -108,6 +108,6 @@ def test_given_one_tool_missing_when_can_earn_mastery_then_cannot_earn_mastery(s
 
         self.remove_one_by_name(f"Progressive Pickaxe")
         location = self.multiworld.get_location("Mining Mastery", self.player)
-        self.assert_reach_location_false(location, self.multiworld.state)
+        self.assert_cannot_reach_location(location, self.multiworld.state)
 
         self.reset_collection_state()

From db11c620a746b23c46216cae1e2f05a013aeb341 Mon Sep 17 00:00:00 2001
From: shananas <47014056+shananas@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:09:02 -0500
Subject: [PATCH 353/381] =?UTF-8?q?KH2=20Doc=20Update=C2=A0#4609?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mod Manager Version Number
---
 worlds/kh2/docs/setup_en.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/kh2/docs/setup_en.md b/worlds/kh2/docs/setup_en.md
index bee60bd36b18..2e1022f3efa7 100644
--- a/worlds/kh2/docs/setup_en.md
+++ b/worlds/kh2/docs/setup_en.md
@@ -10,7 +10,7 @@
 Kingdom Hearts II Final Mix from the [Epic Games Store](https://store.epicgames.com/en-US/discover/kingdom-hearts) or [Steam](https://store.steampowered.com/app/2552430/KINGDOM_HEARTS_HD_1525_ReMIX/)
 
 - Follow this Guide to set up these requirements [KH2Rando.com](https://tommadness.github.io/KH2Randomizer/setup/Panacea-ModLoader/)
-    1. Version 3.4.0 or greater OpenKH Mod Manager with Panacea
+    1. Version 25.01.26.0 or greater OpenKH Mod Manager with Panacea
     2. Lua Backend from the OpenKH Mod Manager
     3. Install the mod `KH2FM-Mods-Num/GoA-ROM-Edition` using OpenKH Mod Manager
 - Needed for Archipelago 

From f6668997e61a0e2ea53bf2e6f92a070686659f8c Mon Sep 17 00:00:00 2001
From: Martmists <mail@martmists.com>
Date: Fri, 7 Feb 2025 21:02:37 +0100
Subject: [PATCH 354/381] [AHIT] Fix small options issue (#4615)

---
 worlds/ahit/Options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/ahit/Options.py b/worlds/ahit/Options.py
index 17c4b95efc7a..b331ca524244 100644
--- a/worlds/ahit/Options.py
+++ b/worlds/ahit/Options.py
@@ -338,7 +338,7 @@ class MinExtraYarn(Range):
     There must be at least this much more yarn over the total number of yarn needed to craft all hats.
     For example, if this option's value is 10, and the total yarn needed to craft all hats is 40,
     there must be at least 50 yarn in the pool."""
-    display_name = "Max Extra Yarn"
+    display_name = "Min Extra Yarn"
     range_start = 5
     range_end = 15
     default = 10

From 768ccffe722551f6225c70003906f2b787bffdd0 Mon Sep 17 00:00:00 2001
From: Kory Dondzila <korydondzila@gmail.com>
Date: Fri, 7 Feb 2025 15:06:06 -0500
Subject: [PATCH 355/381] Shivers: Update shivers links and guides (#4592)

---
 worlds/shivers/docs/en_Shivers.md |  4 +++-
 worlds/shivers/docs/setup_en.md   | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/worlds/shivers/docs/en_Shivers.md b/worlds/shivers/docs/en_Shivers.md
index 9490b577bdd0..f36cbcce36e1 100644
--- a/worlds/shivers/docs/en_Shivers.md
+++ b/worlds/shivers/docs/en_Shivers.md
@@ -9,6 +9,7 @@ configuration file.
 
 All Ixupi pot pieces are randomized. Keys have been added to the game to lock off different rooms in the museum, 
 these are randomized. Crawling has been added and is required to use any crawl space.
+Randomization can also control if Ixupi pots are in pieces, mixed, or complete, and in which worlds they will show up in.
 
 ## What is considered a location check in Shivers?
 
@@ -27,4 +28,5 @@ Victory is achieved when the player has captured the required number Ixupi set i
 
 ## Encountered a bug?
 
-Please contact GodlFire or Cynbel_Terreus on Discord for bugs related to Shivers world generation or the Shivers Randomizer.
+Please contact GodlFire or Cynbel_Terreus on Discord for bugs related to Shivers world generation or the Shivers Randomizer. 
+You may also open issues for the Shivers Randomizer Client [here](https://github.com/Shivers-Randomizer/Shivers-Randomizer/issues).
diff --git a/worlds/shivers/docs/setup_en.md b/worlds/shivers/docs/setup_en.md
index a495c87b226a..5d73a81b2967 100644
--- a/worlds/shivers/docs/setup_en.md
+++ b/worlds/shivers/docs/setup_en.md
@@ -5,12 +5,12 @@
 
 - [Shivers (GOG version)](https://www.gog.com/en/game/shivers) or original disc
 - [ScummVM](https://www.scummvm.org/downloads/) version 2.7.0 or later
-- [Shivers Randomizer](https://github.com/GodlFire/Shivers-Randomizer-CSharp/releases/latest) Latest release version
+- [Shivers Randomizer Client](https://github.com/Shivers-Randomizer/Shivers-Randomizer/releases/latest) Latest release version
 
 ## Optional Software
 
 - [PopTracker](https://github.com/black-sliver/PopTracker/releases/)
-  - [Jax's Shivers PopTracker pack](https://github.com/blazik-barth/Shivers-Tracker/releases/)
+  - [Shivers PopTracker pack](https://github.com/Shivers-Randomizer/Shivers-AP-Tracker/releases/latest)
 
 ## Setup ScummVM for Shivers
 
@@ -59,7 +59,9 @@ validator page: [YAML Validation page](/mysterycheck)
 
 ## What is a check
 
-- Every puzzle
-- Every puzzle hint/solution
-- Every document that is considered a Flashback
+- All puzzles
+- All puzzle hints or solutions
+- All documents that are considered Flashbacks
+- All Ixupi captures (Lightning only if early)
 - Optionally information plaques
+- Optionally elevators

From f75a1ae1174fb467e5c5bd5568d7de3c806d5b1c Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sat, 8 Feb 2025 00:06:04 +0100
Subject: [PATCH 356/381] KH2: Fix lambda capture issue with weapon slot logic
 (#4604)

* KH2: Fix lambda capture issue with weapon slot logic

* Update Rules.py

* Improved by JaredWeakStrike (#4605)

* Apparently this wasn't meant to be indented

---------

Co-authored-by: JaredWeakStrike <96694163+JaredWeakStrike@users.noreply.github.com>
---
 worlds/kh2/Rules.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/worlds/kh2/Rules.py b/worlds/kh2/Rules.py
index 767c5643417e..a59fbfd8ab97 100644
--- a/worlds/kh2/Rules.py
+++ b/worlds/kh2/Rules.py
@@ -263,7 +263,10 @@ def set_kh2_rules(self) -> None:
 
         weapon_region = self.multiworld.get_region(RegionName.Keyblade, self.player)
         for location in weapon_region.locations:
-            add_rule(location, lambda state: state.has(exclusion_table["WeaponSlots"][location.name], self.player))
+            if location.name in exclusion_table["WeaponSlots"]:  # shop items and starting items are not in this list
+                exclusion_item = exclusion_table["WeaponSlots"][location.name]
+                add_rule(location, lambda state, e_item=exclusion_item: state.has(e_item, self.player))
+
             if location.name in Goofy_Checks:
                 add_item_rule(location, lambda item: item.player == self.player and item.name in GoofyAbility_Table.keys())
             elif location.name in Donald_Checks:

From f5c574c37ac6283cb360432e6c5b5cc35b2d1780 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sun, 9 Feb 2025 06:11:27 -0500
Subject: [PATCH 357/381] Settings: add format handling to yaml exception marks
 for readability (#4531)

---
 settings.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/settings.py b/settings.py
index 14d4ba30cefb..255c537fe09a 100644
--- a/settings.py
+++ b/settings.py
@@ -792,7 +792,17 @@ def __init__(self, location: Optional[str]):  # change to PathLike[str] once we
         if location:
             from Utils import parse_yaml
             with open(location, encoding="utf-8-sig") as f:
-                options = parse_yaml(f.read())
+                from yaml.error import MarkedYAMLError
+                try:
+                    options = parse_yaml(f.read())
+                except MarkedYAMLError as ex:
+                    if ex.problem_mark:
+                        f.seek(0)
+                        lines = f.readlines()
+                        problem_line = lines[ex.problem_mark.line]
+                        error_line = " " * ex.problem_mark.column + "^"
+                        raise Exception(f"{ex.context} {ex.problem}\n{problem_line}{error_line}")
+                    raise ex
                 # TODO: detect if upgrade is required
                 # TODO: once we have a cache for _world_settings_name_cache, detect if any game section is missing
                 self.update(options or {})

From 359f45d50f3872fe097b6e605faf494398c8ff8a Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sun, 9 Feb 2025 13:12:17 -0500
Subject: [PATCH 358/381] TUNIC: Combat logic fix (#4589)

* Potential fix for attack issue

* also put the lazy version of the swamp fix in for good measure

* fix extra line

* now it is good

* Add the test, roll the other PR into this one

* Make the test exception more useful

* Remove debug print

* Combat logic fixed?

* Move a few areas to before well instead of east forest

* Put in qwint's suggestions in test

* Implement qwint's suggestions in combat_logic.py

* Implement qwint's suggestions for combat_logic.py

* Fix typo

* Remove experimental from combat logic description

* Remove copy_mixin again

* Add comment about copy_mixin

* Use a more proper random

* Some optimizations from Vi's comments
---
 worlds/tunic/combat_logic.py     | 308 +++++++++++++++++--------------
 worlds/tunic/er_rules.py         |  20 +-
 worlds/tunic/options.py          |   1 -
 worlds/tunic/test/test_combat.py |  83 +++++++++
 4 files changed, 261 insertions(+), 151 deletions(-)
 create mode 100644 worlds/tunic/test/test_combat.py

diff --git a/worlds/tunic/combat_logic.py b/worlds/tunic/combat_logic.py
index 9ff363942c9e..2e490d1dad6e 100644
--- a/worlds/tunic/combat_logic.py
+++ b/worlds/tunic/combat_logic.py
@@ -8,6 +8,7 @@
 
 # the vanilla stats you are expected to have to get through an area, based on where they are in vanilla
 class AreaStats(NamedTuple):
+    """Attack, Defense, Potion, HP, SP, MP, Flasks, Equipment, is_boss"""
     att_level: int
     def_level: int
     potion_level: int  # all 3 are before your first bonfire after getting the upgrade page, third costs 1k
@@ -41,7 +42,7 @@ class AreaStats(NamedTuple):
     "Rooted Ziggurat": AreaStats(5, 5, 3, 5, 3, 3, 6, ["Sword", "Shield", "Magic"]),
     "Boss Scavenger": AreaStats(5, 5, 3, 5, 3, 3, 6, ["Sword", "Shield", "Magic"], is_boss=True),
     "Swamp": AreaStats(1, 1, 1, 1, 1, 1, 6, ["Sword", "Shield", "Magic"]),
-    "Cathedral": AreaStats(1, 1, 1, 1, 1, 1, 6, ["Sword", "Shield", "Magic"]),
+    # Cathedral has the same requirements as Swamp
     # marked as boss because the garden knights can't get hurt by stick
     "Gauntlet": AreaStats(1, 1, 1, 1, 1, 1, 6, ["Sword", "Shield", "Magic"], is_boss=True),
     "The Heir": AreaStats(5, 5, 3, 5, 3, 3, 6, ["Sword", "Shield", "Magic", "Laurels"], is_boss=True),
@@ -49,8 +50,10 @@ class AreaStats(NamedTuple):
 
 
 # these are used for caching which areas can currently be reached in state
+# Gauntlet does not have exclusively higher stat requirements, so it will be checked separately
 boss_areas: List[str] = [name for name, data in area_data.items() if data.is_boss and name != "Gauntlet"]
-non_boss_areas: List[str] = [name for name, data in area_data.items() if not data.is_boss]
+# Swamp does not have exclusively higher stat requirements, so it will be checked separately
+non_boss_areas: List[str] = [name for name, data in area_data.items() if not data.is_boss and name != "Swamp"]
 
 
 class CombatState(IntEnum):
@@ -89,6 +92,7 @@ def has_combat_reqs(area_name: str, state: CollectionState, player: int) -> bool
     elif area_name in non_boss_areas:
         area_list = non_boss_areas
     else:
+        # this is to check Swamp and Gauntlet on their own
         area_list = [area_name]
 
     if met_combat_reqs:
@@ -114,88 +118,99 @@ def check_combat_reqs(area_name: str, state: CollectionState, player: int, alt_d
     extra_att_needed = 0
     extra_def_needed = 0
     extra_mp_needed = 0
-    has_magic = state.has_any({"Magic Wand", "Gun"}, player)
-    stick_bool = False
-    sword_bool = False
+    has_magic = state.has_any(("Magic Wand", "Gun"), player)
+    sword_bool = has_sword(state, player)
+    stick_bool = sword_bool or has_melee(state, player)
+    equipment = data.equipment.copy()
     for item in data.equipment:
         if item == "Stick":
-            if not has_melee(state, player):
+            if not stick_bool:
                 if has_magic:
+                    equipment.remove("Stick")
+                    if "Magic" not in equipment:
+                        equipment.append("Magic")
                     # magic can make up for the lack of stick
                     extra_mp_needed += 2
-                    extra_att_needed -= 16
+                    extra_att_needed -= 32
                 else:
                     return False
-            else:
-                stick_bool = True
 
         elif item == "Sword":
-            if not has_sword(state, player):
+            if not sword_bool:
                 # need sword for bosses
                 if data.is_boss:
                     return False
+                equipment.remove("Sword")
                 if has_magic:
+                    if "Magic" not in equipment:
+                        equipment.append("Magic")
                     # +4 mp pretty much makes up for the lack of sword, at least in Quarry
                     extra_mp_needed += 4
-                    # stick is a backup plan, and doesn't scale well, so let's require a little less
-                    extra_att_needed -= 2
-                elif has_melee(state, player):
+                    if stick_bool:
+                        # stick is a backup plan, and doesn't scale well, so let's require a little less
+                        equipment.append("Stick")
+                        extra_att_needed -= 2
+                    else:
+                        extra_mp_needed += 2
+                        extra_att_needed -= 32
+                elif stick_bool:
+                    equipment.append("Stick")
                     # may revise this later based on feedback
                     extra_att_needed += 3
                     extra_def_needed += 2
                 else:
                     return False
-            else:
-                sword_bool = True
 
+        # just increase the stat requirement, we'll check for shield when calculating defense
         elif item == "Shield":
-            if not state.has("Shield", player):
-                extra_def_needed += 2
+            equipment.remove("Shield")
+            extra_def_needed += 2
+
         elif item == "Laurels":
             if not state.has("Hero's Laurels", player):
-                # these are entirely based on vibes
-                extra_att_needed += 2
-                extra_def_needed += 3
+                # require Laurels for the Heir
+                return False
+
         elif item == "Magic":
             if not has_magic:
+                equipment.remove("Magic")
                 extra_att_needed += 2
                 extra_def_needed += 2
-                extra_mp_needed -= 16
+                extra_mp_needed -= 32
+
     modified_stats = AreaStats(data.att_level + extra_att_needed, data.def_level + extra_def_needed, data.potion_level,
-                               data.hp_level, data.sp_level, data.mp_level + extra_mp_needed, data.potion_count)
-    if not has_required_stats(modified_stats, state, player):
+                               data.hp_level, data.sp_level, data.mp_level + extra_mp_needed, data.potion_count,
+                               equipment, data.is_boss)
+    if has_required_stats(modified_stats, state, player):
+        return True
+    else:
         # we may need to check if you would have the required stats if you were missing a weapon
-        # it's kinda janky, but these only get hit in less than once per 100 generations, so whatever
-        if sword_bool and "Sword" in data.equipment and "Magic" in data.equipment:
-            # we need to check if you would have the required stats if you didn't have melee
-            equip_list = [item for item in data.equipment if item != "Sword"]
-            more_modified_stats = AreaStats(data.att_level - 16, data.def_level, data.potion_level,
-                                            data.hp_level, data.sp_level, data.mp_level + 4, data.potion_count,
-                                            equip_list)
+        if sword_bool and "Sword" in equipment and has_magic:
+            # we need to check if you would have the required stats if you didn't have the sword
+            equip_list = [item for item in equipment if item != "Sword"]
+            if "Magic" not in equip_list:
+                equip_list.append("Magic")
+            more_modified_stats = AreaStats(modified_stats.att_level - 32, modified_stats.def_level,
+                                            modified_stats.potion_level, modified_stats.hp_level,
+                                            modified_stats.sp_level, modified_stats.mp_level + 4,
+                                            modified_stats.potion_count, equip_list, data.is_boss)
             if check_combat_reqs("none", state, player, more_modified_stats):
                 return True
 
-            # and we need to check if you would have the required stats if you didn't have magic
-            equip_list = [item for item in data.equipment if item != "Magic"]
-            more_modified_stats = AreaStats(data.att_level + 2, data.def_level + 2, data.potion_level,
-                                            data.hp_level, data.sp_level, data.mp_level - 16, data.potion_count,
-                                            equip_list)
-            if check_combat_reqs("none", state, player, more_modified_stats):
-                return True
-            return False
-
-        elif stick_bool and "Stick" in data.equipment and "Magic" in data.equipment:
+        elif stick_bool and "Stick" in equipment and has_magic:
             # we need to check if you would have the required stats if you didn't have the stick
-            equip_list = [item for item in data.equipment if item != "Stick"]
-            more_modified_stats = AreaStats(data.att_level - 16, data.def_level, data.potion_level,
-                                            data.hp_level, data.sp_level, data.mp_level + 4, data.potion_count,
-                                            equip_list)
+            equip_list = [item for item in equipment if item != "Stick"]
+            if "Magic" not in equip_list:
+                equip_list.append("Magic")
+            more_modified_stats = AreaStats(modified_stats.att_level - 32, modified_stats.def_level,
+                                            modified_stats.potion_level, modified_stats.hp_level,
+                                            modified_stats.sp_level, modified_stats.mp_level + 4,
+                                            modified_stats.potion_count, equip_list, data.is_boss)
             if check_combat_reqs("none", state, player, more_modified_stats):
                 return True
-            return False
         else:
             return False
-    return True
+        return False
 
 
 # check if you have the required stats, and the money to afford them
@@ -203,72 +218,63 @@ def check_combat_reqs(area_name: str, state: CollectionState, player: int, alt_d
 # but that's fine -- it's already pretty generous to begin with
 def has_required_stats(data: AreaStats, state: CollectionState, player: int) -> bool:
     money_required = 0
-    player_att = 0
+    att_required = data.att_level
+    player_att, att_offerings = get_att_level(state, player)
 
-    # check if we actually need the stat before checking state
-    if data.att_level > 1:
-        player_att, att_offerings = get_att_level(state, player)
-        if player_att < data.att_level:
-            return False
+    # if you have 2 more attack than needed, we can forego needing mp
+    if data.mp_level > 1:
+        if player_att < data.att_level + 2:
+            player_mp, mp_offerings = get_mp_level(state, player)
+            if player_mp < data.mp_level:
+                return False
+            else:
+                extra_mp = player_mp - data.mp_level
+                paid_mp = max(0, mp_offerings - extra_mp)
+                # mp costs 300 for the first, +50 for each additional
+                money_per_mp = 300
+                for _ in range(paid_mp):
+                    money_required += money_per_mp
+                    money_per_mp += 50
         else:
-            extra_att = player_att - data.att_level
-            paid_att = max(0, att_offerings - extra_att)
-            # attack upgrades cost 100 for the first, +50 for each additional
-            money_per_att = 100
-            for _ in range(paid_att):
-                money_required += money_per_att
-                money_per_att += 50
+            att_required += 2
+
+    if player_att < att_required:
+        return False
+    else:
+        extra_att = player_att - att_required
+        paid_att = max(0, att_offerings - extra_att)
+        # attack upgrades cost 100 for the first, +50 for each additional
+        money_per_att = 100
+        for _ in range(paid_att):
+            money_required += money_per_att
+            money_per_att += 50
 
     # adding defense and sp together since they accomplish similar things: making you take less damage
     if data.def_level + data.sp_level > 2:
         player_def, def_offerings = get_def_level(state, player)
         player_sp, sp_offerings = get_sp_level(state, player)
-        if player_def + player_sp < data.def_level + data.sp_level:
+        req_stats = data.def_level + data.sp_level
+        if player_def + player_sp < req_stats:
             return False
         else:
             free_def = player_def - def_offerings
             free_sp = player_sp - sp_offerings
-            paid_stats = data.def_level + data.sp_level - free_def - free_sp
-            sp_to_buy = 0
-
-            if paid_stats <= 0:
-                # if you don't have to pay for any stats, you don't need money for these upgrades
-                def_to_buy = 0
-            elif paid_stats <= def_offerings:
-                # get the amount needed to buy these def offerings
-                def_to_buy = paid_stats
+            if free_sp + free_def >= req_stats:
+                # you don't need to buy upgrades
+                pass
             else:
-                def_to_buy = def_offerings
-                sp_to_buy = max(0, paid_stats - def_offerings)
-
-            # if you have to buy more than 3 def, it's cheaper to buy 1 extra sp
-            if def_to_buy > 3 and sp_offerings > 0:
-                def_to_buy -= 1
-                sp_to_buy += 1
-            # def costs 100 for the first, +50 for each additional
-            money_per_def = 100
-            for _ in range(def_to_buy):
-                money_required += money_per_def
-                money_per_def += 50
-            # sp costs 200 for the first, +200 for each additional
-            money_per_sp = 200
-            for _ in range(sp_to_buy):
-                money_required += money_per_sp
-                money_per_sp += 200
-
-    # if you have 2 more attack than needed, we can forego needing mp
-    if data.mp_level > 1 and player_att < data.att_level + 2:
-        player_mp, mp_offerings = get_mp_level(state, player)
-        if player_mp < data.mp_level:
-            return False
-        else:
-            extra_mp = player_mp - data.mp_level
-            paid_mp = max(0, mp_offerings - extra_mp)
-            # mp costs 300 for the first, +50 for each additional
-            money_per_mp = 300
-            for _ in range(paid_mp):
-                money_required += money_per_mp
-                money_per_mp += 50
+                # we need to pick the cheapest option that gets us above the stats we need
+                # first number is def, second number is sp
+                upgrade_options: set[tuple[int, int]] = set()
+                stats_to_buy = req_stats - free_def - free_sp
+                for paid_def in range(0, min(def_offerings + 1, stats_to_buy + 1)):
+                    sp_required = stats_to_buy - paid_def
+                    if sp_offerings >= sp_required:
+                        if sp_required < 0:
+                            break
+                        upgrade_options.add((paid_def, stats_to_buy - paid_def))
+                costs = [calc_def_sp_cost(defense, sp) for defense, sp in upgrade_options]
+                money_required += min(costs)
 
     req_effective_hp = calc_effective_hp(data.hp_level, data.potion_level, data.potion_count)
     player_potion, potion_offerings = get_potion_level(state, player)
@@ -279,53 +285,30 @@ def has_required_stats(data: AreaStats, state: CollectionState, player: int) ->
         return False
     else:
         # need a way to determine which of potion offerings or hp offerings you can reduce
-        # your level if you didn't pay for offerings
         free_potion = player_potion - potion_offerings
         free_hp = player_hp - hp_offerings
-        paid_hp_count = 0
-        paid_potion_count = 0
         if calc_effective_hp(free_hp, free_potion, player_potion_count) >= req_effective_hp:
             # you don't need to buy upgrades
             pass
-        # if you have no potions, or no potion upgrades, you only need to check your hp upgrades
-        elif player_potion_count == 0 or potion_offerings == 0:
-            # check if you have enough hp at each paid hp offering
-            for i in range(hp_offerings):
-                paid_hp_count = i + 1
-                if calc_effective_hp(paid_hp_count, 0, player_potion_count) > req_effective_hp:
-                    break
         else:
-            for i in range(potion_offerings):
-                paid_potion_count = i + 1
-                if calc_effective_hp(free_hp, free_potion + paid_potion_count, player_potion_count) > req_effective_hp:
-                    break
-                for j in range(hp_offerings):
-                    paid_hp_count = j + 1
-                    if (calc_effective_hp(free_hp + paid_hp_count, free_potion + paid_potion_count, player_potion_count)
-                            > req_effective_hp):
+            # we need to pick the cheapest option that gets us above the amount of effective HP we need
+            # first number is hp, second number is potion
+            upgrade_options: set[tuple[int, int]] = set()
+            # filter out exclusively worse options
+            lowest_hp_added = hp_offerings + 1
+            for paid_potion in range(0, potion_offerings + 1):
+                # check quantities of hp offerings for each potion offering
+                for paid_hp in range(0, lowest_hp_added):
+                    if (calc_effective_hp(free_hp + paid_hp, free_potion + paid_potion, player_potion_count)
+                            >= req_effective_hp):
+                        upgrade_options.add((paid_hp, paid_potion))
+                        lowest_hp_added = paid_hp
                         break
-        # hp costs 200 for the first, +50 for each additional
-        money_per_hp = 200
-        for _ in range(paid_hp_count):
-            money_required += money_per_hp
-            money_per_hp += 50
-
-        # potion costs 100 for the first, 300 for the second, 1,000 for the third, and +200 for each additional
-        # currently we assume you will not buy past the second potion upgrade, but we might change our minds later
-        money_per_potion = 100
-        for _ in range(paid_potion_count):
-            money_required += money_per_potion
-            if money_per_potion == 100:
-                money_per_potion = 300
-            elif money_per_potion == 300:
-                money_per_potion = 1000
-            else:
-                money_per_potion += 200
 
-    if money_required > get_money_count(state, player):
-        return False
+            costs = [calc_hp_potion_cost(hp, potion) for hp, potion in upgrade_options]
+            money_required += min(costs)
 
-    return True
+    return get_money_count(state, player) >= money_required
 
 
 # returns a tuple of your max attack level, the number of attack offerings
@@ -336,7 +319,8 @@ def get_att_level(state: CollectionState, player: int) -> Tuple[int, int]:
     if sword_level >= 3:
         att_upgrades += min(2, sword_level - 2)
     # attack falls off, can just cap it at 8 for simplicity
-    return min(8, 1 + att_offerings + att_upgrades), att_offerings
+    return (min(8, 1 + att_offerings + att_upgrades)
+            + (1 if state.has("Hero's Laurels", player) else 0), att_offerings)
 
 
 # returns a tuple of your max defense level, the number of defense offerings
@@ -344,7 +328,9 @@ def get_def_level(state: CollectionState, player: int) -> Tuple[int, int]:
     def_offerings = state.count("DEF Offering", player)
     # defense falls off, can just cap it at 8 for simplicity
     return (min(8, 1 + def_offerings
-                + state.count_from_list({"Hero Relic - DEF", "Secret Legend", "Phonomath"}, player)),
+                + state.count_from_list({"Hero Relic - DEF", "Secret Legend", "Phonomath"}, player))
+            + (2 if state.has("Shield", player) else 0)
+            + (2 if state.has("Hero's Laurels", player) else 0),
             def_offerings)
 
 
@@ -408,6 +394,46 @@ def get_money_count(state: CollectionState, player: int) -> int:
     return money
 
 
+def calc_hp_potion_cost(hp_upgrades: int, potion_upgrades: int) -> int:
+    money = 0
+
+    # hp costs 200 for the first, +50 for each additional
+    money_per_hp = 200
+    for _ in range(hp_upgrades):
+        money += money_per_hp
+        money_per_hp += 50
+
+    # potion costs 100 for the first, 300 for the second, 1,000 for the third, and +200 for each additional
+    # currently we assume you will not buy past the second potion upgrade, but we might change our minds later
+    money_per_potion = 100
+    for _ in range(potion_upgrades):
+        money += money_per_potion
+        if money_per_potion == 100:
+            money_per_potion = 300
+        elif money_per_potion == 300:
+            money_per_potion = 1000
+        else:
+            money_per_potion += 200
+
+    return money
+
+
+def calc_def_sp_cost(def_upgrades: int, sp_upgrades: int) -> int:
+    money = 0
+
+    money_per_def = 100
+    for _ in range(def_upgrades):
+        money += money_per_def
+        money_per_def += 50
+
+    money_per_sp = 200
+    for _ in range(sp_upgrades):
+        money += money_per_sp
+        money_per_sp += 200
+
+    return money
+
+
 class TunicState(LogicMixin):
     tunic_need_to_reset_combat_from_collect: Dict[int, bool]
     tunic_need_to_reset_combat_from_remove: Dict[int, bool]
@@ -420,3 +446,5 @@ def init_mixin(self, _):
         self.tunic_need_to_reset_combat_from_remove = defaultdict(lambda: False)
         # the per-player, per-area state of combat checking -- unchecked, failed, or succeeded
         self.tunic_area_combat_state = defaultdict(lambda: defaultdict(lambda: CombatState.unchecked))
+        # a copy_mixin was intentionally excluded because the empty state from init_mixin
+        # will always be appropriate for recalculating the logic cache
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index 08b088f7e4a7..4d0a462cbb8a 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1386,9 +1386,9 @@ def ls_connect(origin_name: str, portal_sdt: str) -> None:
         # need to fight through the rudelings and turret, or just laurels from near the windmill
         set_rule(ow_to_well_entry,
                  lambda state: state.has(laurels, player)
-                 or has_combat_reqs("East Forest", state, player))
+                 or has_combat_reqs("Before Well", state, player))
         set_rule(ow_tunnel_beach,
-                 lambda state: has_combat_reqs("East Forest", state, player))
+                 lambda state: has_combat_reqs("Before Well", state, player))
 
         add_rule(atoll_statue,
                  lambda state: has_combat_reqs("Ruined Atoll", state, player))
@@ -1467,12 +1467,12 @@ def ls_connect(origin_name: str, portal_sdt: str) -> None:
         set_rule(cath_entry_to_elev,
                  lambda state: options.entrance_rando
                  or has_ice_grapple_logic(False, IceGrappling.option_medium, state, world)
-                 or (has_ability(prayer, state, world) and has_combat_reqs("Cathedral", state, player)))
+                 or (has_ability(prayer, state, world) and has_combat_reqs("Swamp", state, player)))
 
         set_rule(cath_entry_to_main,
-                 lambda state: has_combat_reqs("Cathedral", state, player))
+                 lambda state: has_combat_reqs("Swamp", state, player))
         set_rule(cath_elev_to_main,
-                 lambda state: has_combat_reqs("Cathedral", state, player))
+                 lambda state: has_combat_reqs("Swamp", state, player))
 
         # for spots where you can go into and come out of an entrance to reset enemy aggro
         if world.options.entrance_rando:
@@ -1835,10 +1835,10 @@ def combat_logic_to_loc(loc_name: str, combat_req_area: str, set_instead: bool =
         combat_logic_to_loc("Overworld - [Northeast] Chest Above Patrol Cave", "Garden Knight", dagger=True)
         combat_logic_to_loc("Overworld - [Southwest] West Beach Guarded By Turret", "Overworld", dagger=True)
         combat_logic_to_loc("Overworld - [Southwest] West Beach Guarded By Turret 2", "Overworld")
-        combat_logic_to_loc("Overworld - [Southwest] Bombable Wall Near Fountain", "East Forest", dagger=True)
-        combat_logic_to_loc("Overworld - [Southwest] Fountain Holy Cross", "East Forest", dagger=True)
-        combat_logic_to_loc("Overworld - [Southwest] South Chest Near Guard", "East Forest", dagger=True)
-        combat_logic_to_loc("Overworld - [Southwest] Tunnel Guarded By Turret", "East Forest", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] Bombable Wall Near Fountain", "Before Well", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] Fountain Holy Cross", "Before Well", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] South Chest Near Guard", "Before Well", dagger=True)
+        combat_logic_to_loc("Overworld - [Southwest] Tunnel Guarded By Turret", "Before Well", dagger=True)
         combat_logic_to_loc("Overworld - [Northwest] Chest Near Turret", "Before Well")
 
         add_rule(world.get_location("Hourglass Cave - Hourglass Chest"),
@@ -1927,4 +1927,4 @@ def combat_logic_to_loc(loc_name: str, combat_req_area: str, set_instead: bool =
 
         # zip through the rubble to sneakily grab this chest, or just fight to it
         add_rule(world.get_location("Cathedral - [1F] Near Spikes"),
-                 lambda state: laurels_zip(state, world) or has_combat_reqs("Cathedral", state, player))
+                 lambda state: laurels_zip(state, world) or has_combat_reqs("Swamp", state, player))
diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index 8fe2ea5ce854..d2ea82803704 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -197,7 +197,6 @@ class TunicPlandoConnections(PlandoConnections):
 
 class CombatLogic(Choice):
     """
-    EXPERIMENTAL - may cause gen failures, especially when playthrough generation for the spoiler log is enabled, and may have slight logic issues.
     If enabled, the player will logically require a combination of stat upgrade items and equipment to get some checks or navigate to some areas, with a goal of matching the vanilla combat difficulty.
     The player may still be expected to run past enemies, reset aggro (by using a checkpoint or doing a scene transition), or find sneaky paths to checks.
     This option marks many more items as progression and may force weapons much earlier than normal.
diff --git a/worlds/tunic/test/test_combat.py b/worlds/tunic/test/test_combat.py
new file mode 100644
index 000000000000..866dc5f81429
--- /dev/null
+++ b/worlds/tunic/test/test_combat.py
@@ -0,0 +1,83 @@
+from BaseClasses import ItemClassification
+from collections import Counter
+
+from . import TunicTestBase
+from .. import options
+from ..combat_logic import (check_combat_reqs, area_data, get_money_count, calc_effective_hp, get_potion_level,
+                            get_hp_level, get_def_level, get_sp_level)
+from ..items import item_table
+from .. import TunicWorld
+
+
+class TestCombat(TunicTestBase):
+    options = {options.CombatLogic.internal_name: options.CombatLogic.option_on}
+    player = 1
+    world: TunicWorld
+    combat_items = []
+    # these are items that are progression that do not contribute to combat logic
+    # it's listed as using skipped items instead of a list of viable items so that if we add/remove some later,
+    # that this won't require updates most likely
+    # Stick and Sword are in here because sword progression is the clear determining case here
+    skipped_items = {"Fairy", "Stick", "Sword", "Magic Dagger", "Magic Orb", "Lantern", "Old House Key", "Key",
+                     "Fortress Vault Key", "Golden Coin", "Red Questagon", "Green Questagon", "Blue Questagon",
+                     "Scavenger Mask", "Pages 24-25 (Prayer)", "Pages 42-43 (Holy Cross)", "Pages 52-53 (Icebolt)"}
+    # converts golden trophies to their hero relic stat equivalent, for easier parsing
+    converter = {
+        "Secret Legend": "Hero Relic - DEF",
+        "Phonomath": "Hero Relic - DEF",
+        "Just Some Pals": "Hero Relic - POTION",
+        "Spring Falls": "Hero Relic - POTION",
+        "Back To Work": "Hero Relic - POTION",
+        "Mr Mayor": "Hero Relic - SP",
+        "Power Up": "Hero Relic - SP",
+        "Regal Weasel": "Hero Relic - SP",
+        "Forever Friend": "Hero Relic - SP",
+        "Sacred Geometry": "Hero Relic - MP",
+        "Vintage": "Hero Relic - MP",
+        "Dusty": "Hero Relic - MP",
+    }
+    skipped_items.update({item for item in item_table.keys() if item.startswith("Ladder")})
+    for item, data in item_table.items():
+        if item in skipped_items:
+            continue
+        ic = data.combat_ic or data.classification
+        if item in converter:
+            item = converter[item]
+        if ItemClassification.progression in ic:
+            combat_items += [item] * data.quantity_in_item_pool
+
+    # we had an issue where collecting certain items brought certain areas out of logic
+    # due to the weirdness of swapping between "you have enough attack that you don't need magic"
+    # so this will make sure collecting an item doesn't bring something out of logic
+    def test_combat_doesnt_fail_backwards(self):
+        combat_items = self.combat_items.copy()
+        self.multiworld.worlds[1].random.shuffle(combat_items)
+        curr_statuses = {name: False for name in area_data.keys()}
+        prev_statuses = curr_statuses.copy()
+        area_names = list(area_data.keys())
+        current_items = Counter()
+        for current_item_name in combat_items:
+            current_items[current_item_name] += 1
+            current_item = TunicWorld.create_item(self.world, current_item_name)
+            self.collect(current_item)
+            self.multiworld.worlds[1].random.shuffle(area_names)
+            for area in area_names:
+                curr_statuses[area] = check_combat_reqs(area, self.multiworld.state, self.player)
+                if curr_statuses[area] < prev_statuses[area]:
+                    data = area_data[area]
+                    state = self.multiworld.state
+                    player = self.player
+                    req_effective_hp = calc_effective_hp(data.hp_level, data.potion_level, data.potion_count)
+                    player_potion, potion_offerings = get_potion_level(state, player)
+                    player_hp, hp_offerings = get_hp_level(state, player)
+                    player_def, def_offerings = get_def_level(state, player)
+                    player_sp, sp_offerings = get_sp_level(state, player)
+                    raise Exception(f"Status for {area} decreased after collecting {current_item_name}.\n"
+                                    f"Current items: {current_items}.\n"
+                                    f"Total money: {get_money_count(self.multiworld.state, self.player)}.\n"
+                                    f"Required Effective HP: {req_effective_hp}.\n"
+                                    f"Free HP and Offerings: {player_hp - hp_offerings}, {hp_offerings}\n"
+                                    f"Free Potion and Offerings: {player_potion - potion_offerings}, {potion_offerings}\n"
+                                    f"Free Def and Offerings: {player_def - def_offerings}, {def_offerings}\n"
+                                    f"Free SP and Offerings: {player_sp - sp_offerings}, {sp_offerings}")
+                prev_statuses[area] = curr_statuses[area]

From 18bcaa85a27890de47e623c630a65dddb3d644d4 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Mon, 10 Feb 2025 19:18:14 +0100
Subject: [PATCH 359/381] Test: ensure get_all_state() does not error in
 between steps (#4612)

---
 test/general/test_state.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 test/general/test_state.py

diff --git a/test/general/test_state.py b/test/general/test_state.py
new file mode 100644
index 000000000000..460fc3d60846
--- /dev/null
+++ b/test/general/test_state.py
@@ -0,0 +1,29 @@
+import unittest
+
+from worlds.AutoWorld import AutoWorldRegister, call_all
+from . import setup_solo_multiworld
+
+
+class TestBase(unittest.TestCase):
+    gen_steps = (
+        "generate_early",
+        "create_regions",
+    )
+
+    test_steps = (
+        "create_items",
+        "set_rules",
+        "connect_entrances",
+        "generate_basic",
+        "pre_fill",
+    )
+
+    def test_all_state_is_available(self):
+        """Ensure all_state can be created at certain steps."""
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest("Game", game=game_name):
+                multiworld = setup_solo_multiworld(world_type, self.gen_steps)
+                for step in self.test_steps:
+                    with self.subTest("Step", step=step):
+                        call_all(multiworld, step)
+                        self.assertTrue(multiworld.get_all_state(False, True))

From a298be9c41a60da209bf1eb6da15ff16f33350f1 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Mon, 10 Feb 2025 19:19:00 +0100
Subject: [PATCH 360/381] Core: change HINT_FOUND to 40 and HINT_UNSPECIFIED to
 0 (#4620)

---
 NetUtils.py              |  4 ++--
 docs/network protocol.md |  4 ++--
 kvui.py                  | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/NetUtils.py b/NetUtils.py
index 5bcc583c53b6..f2ae2a63a056 100644
--- a/NetUtils.py
+++ b/NetUtils.py
@@ -12,11 +12,11 @@
 
 
 class HintStatus(ByValue, enum.IntEnum):
-    HINT_FOUND = 0
-    HINT_UNSPECIFIED = 1
+    HINT_UNSPECIFIED = 0
     HINT_NO_PRIORITY = 10
     HINT_AVOID = 20
     HINT_PRIORITY = 30
+    HINT_FOUND = 40
 
 
 class JSONMessagePart(typing.TypedDict, total=False):
diff --git a/docs/network protocol.md b/docs/network protocol.md
index e5d3b7e6c26a..05a53344267e 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -363,11 +363,11 @@ An enumeration containing the possible hint states.
 ```python
 import enum
 class HintStatus(enum.IntEnum):
-    HINT_FOUND = 0        # The location has been collected. Status cannot be changed once found.
-    HINT_UNSPECIFIED = 1  # The receiving player has not specified any status
+    HINT_UNSPECIFIED = 0  # The receiving player has not specified any status
     HINT_NO_PRIORITY = 10 # The receiving player has specified that the item is unneeded
     HINT_AVOID = 20       # The receiving player has specified that the item is detrimental
     HINT_PRIORITY = 30    # The receiving player has specified that the item is needed
+    HINT_FOUND = 40       # The location has been collected. Status cannot be changed once found.
 ```
 - Hints for items with `ItemClassification.trap` default to `HINT_AVOID`.
 - Hints created with `LocationScouts`, `!hint_location`, or similar (hinting a location) default to `HINT_UNSPECIFIED`.
diff --git a/kvui.py b/kvui.py
index 6718e48bee33..60042b00ec5c 100644
--- a/kvui.py
+++ b/kvui.py
@@ -444,8 +444,11 @@ def on_touch_down(self, touch):
                 if child.collide_point(*touch.pos):
                     key = child.sort_key
                     if key == "status":
-                        parent.hint_sorter = lambda element: element["status"]["hint"]["status"]
-                    else: parent.hint_sorter = lambda element: remove_between_brackets.sub("", element[key]["text"]).lower()
+                        parent.hint_sorter = lambda element: status_sort_weights[element["status"]["hint"]["status"]]
+                    else:
+                        parent.hint_sorter = lambda element: (
+                            remove_between_brackets.sub("", element[key]["text"]).lower()
+                        )
                     if key == parent.sort_key:
                         # second click reverses order
                         parent.reversed = not parent.reversed
@@ -829,7 +832,13 @@ def __init__(self, *args, **kwargs):
     HintStatus.HINT_AVOID: "salmon",
     HintStatus.HINT_PRIORITY: "plum",
 }
-
+status_sort_weights: dict[HintStatus, int] = {
+    HintStatus.HINT_FOUND: 0,
+    HintStatus.HINT_UNSPECIFIED: 1,
+    HintStatus.HINT_NO_PRIORITY: 2,
+    HintStatus.HINT_AVOID: 3,
+    HintStatus.HINT_PRIORITY: 4,
+}
 
 
 class HintLog(RecycleView):

From f4e43ca9e097f8301ce71bb0f53cbd9fca504a5d Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 10 Feb 2025 13:22:06 -0500
Subject: [PATCH 361/381] LttP: mock world.random in adjuster  (#4623)

---
 LttPAdjuster.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/LttPAdjuster.py b/LttPAdjuster.py
index 7e33a3d5efe8..963557e8da81 100644
--- a/LttPAdjuster.py
+++ b/LttPAdjuster.py
@@ -33,10 +33,15 @@
 WINDOW_MIN_WIDTH = 425
 
 class AdjusterWorld(object):
+    class AdjusterSubWorld(object):
+        def __init__(self, random):
+            self.random = random
+
     def __init__(self, sprite_pool):
         import random
         self.sprite_pool = {1: sprite_pool}
         self.per_slot_randoms = {1: random}
+        self.worlds = {1: self.AdjusterSubWorld(random)}
 
 
 class ArgumentDefaultsHelpFormatter(argparse.RawTextHelpFormatter):

From e9c463c897449202c4e958fe5a13947eee3325f2 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 10 Feb 2025 13:23:09 -0500
Subject: [PATCH 362/381] CC: Force Text Client to always connect with empty
 game (#4607)

---
 CommonClient.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CommonClient.py b/CommonClient.py
index 996ba3300575..eb38195216b6 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -1095,7 +1095,7 @@ async def server_auth(self, password_requested: bool = False):
             if password_requested and not self.password:
                 await super(TextContext, self).server_auth(password_requested)
             await self.get_username()
-            await self.send_connect()
+            await self.send_connect(game="")
 
         def on_package(self, cmd: str, args: dict):
             if cmd == "Connected":

From dbf6b6f935c7b049c015a8a6830e078c769326ec Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 10 Feb 2025 13:23:58 -0500
Subject: [PATCH 363/381] CC: don't try to reconnect on invalid version (#4606)

---
 CommonClient.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CommonClient.py b/CommonClient.py
index eb38195216b6..33792f0ed28b 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -907,6 +907,7 @@ async def process_server_cmd(ctx: CommonContext, args: dict):
             ctx.disconnected_intentionally = True
             ctx.event_invalid_game()
         elif 'IncompatibleVersion' in errors:
+            ctx.disconnected_intentionally = True
             raise Exception('Server reported your client version as incompatible. '
                             'This probably means you have to update.')
         elif 'InvalidItemsHandling' in errors:

From 910369a7f8d1e08744c616b59beedbeb5b2c3f90 Mon Sep 17 00:00:00 2001
From: PinkSwitch <52474902+PinkSwitch@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:27:10 -0600
Subject: [PATCH 364/381] Bizhawk Client: Display Err (#4532)

Co-authored-by: Bryce Wilson
---
 worlds/_bizhawk/context.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/_bizhawk/context.py b/worlds/_bizhawk/context.py
index cb59050b84f6..accb5f94c482 100644
--- a/worlds/_bizhawk/context.py
+++ b/worlds/_bizhawk/context.py
@@ -238,6 +238,7 @@ def _patch_and_run_game(patch_file: str):
         return metadata
     except Exception as exc:
         logger.exception(exc)
+        Utils.messagebox("Error Patching Game", str(exc), True)
         return {}
 
 

From f520c1d9f28d50850f7cb3b2cd58e5ad8984e43d Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Mon, 10 Feb 2025 13:34:27 -0500
Subject: [PATCH 365/381] Launcher: Allow for --nogui client launches (#4549)

---
 worlds/_bizhawk/client.py                | 4 ++--
 worlds/ahit/__init__.py                  | 4 ++--
 worlds/factorio/__init__.py              | 4 ++--
 worlds/kh1/__init__.py                   | 4 ++--
 worlds/kh2/__init__.py                   | 4 ++--
 worlds/zork_grand_inquisitor/__init__.py | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/worlds/_bizhawk/client.py b/worlds/_bizhawk/client.py
index ce75b864b88c..16a8325a10f7 100644
--- a/worlds/_bizhawk/client.py
+++ b/worlds/_bizhawk/client.py
@@ -7,7 +7,7 @@
 import abc
 from typing import TYPE_CHECKING, Any, ClassVar
 
-from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, launch_subprocess
+from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, launch as launch_component
 
 if TYPE_CHECKING:
     from .context import BizHawkClientContext
@@ -15,7 +15,7 @@
 
 def launch_client(*args) -> None:
     from .context import launch
-    launch_subprocess(launch, name="BizHawkClient", args=args)
+    launch_component(launch, name="BizHawkClient", args=args)
 
 
 component = Component("BizHawk Client", "BizHawkClient", component_type=Type.CLIENT, func=launch_client,
diff --git a/worlds/ahit/__init__.py b/worlds/ahit/__init__.py
index 14cf13ec346d..c2fe39872f31 100644
--- a/worlds/ahit/__init__.py
+++ b/worlds/ahit/__init__.py
@@ -12,13 +12,13 @@
 from worlds.AutoWorld import World, WebWorld, CollectionState
 from worlds.generic.Rules import add_rule
 from typing import List, Dict, TextIO
-from worlds.LauncherComponents import Component, components, icon_paths, launch_subprocess, Type
+from worlds.LauncherComponents import Component, components, icon_paths, launch as launch_component, Type
 from Utils import local_path
 
 
 def launch_client():
     from .Client import launch
-    launch_subprocess(launch, name="AHITClient")
+    launch_component(launch, name="AHITClient")
 
 
 components.append(Component("A Hat in Time Client", "AHITClient", func=launch_client,
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index ca9f12f1b21a..3f480527f549 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -8,7 +8,7 @@
 import settings
 from BaseClasses import Region, Location, Item, Tutorial, ItemClassification
 from worlds.AutoWorld import World, WebWorld
-from worlds.LauncherComponents import Component, components, Type, launch_subprocess
+from worlds.LauncherComponents import Component, components, Type, launch as launch_component
 from worlds.generic import Rules
 from .Locations import location_pools, location_table
 from .Mod import generate_mod
@@ -24,7 +24,7 @@
 
 def launch_client():
     from .Client import launch
-    launch_subprocess(launch, name="FactorioClient")
+    launch_component(launch, name="FactorioClient")
 
 
 components.append(Component("Factorio Client", "FactorioClient", func=launch_client, component_type=Type.CLIENT))
diff --git a/worlds/kh1/__init__.py b/worlds/kh1/__init__.py
index 3b498acf4670..ac0afca50142 100644
--- a/worlds/kh1/__init__.py
+++ b/worlds/kh1/__init__.py
@@ -9,12 +9,12 @@
 from .Regions import connect_entrances, create_regions
 from .Rules import set_rules
 from .Presets import kh1_option_presets
-from worlds.LauncherComponents import Component, components, Type, launch_subprocess
+from worlds.LauncherComponents import Component, components, Type, launch as launch_component
 
 
 def launch_client():
     from .Client import launch
-    launch_subprocess(launch, name="KH1 Client")
+    launch_component(launch, name="KH1 Client")
 
 
 components.append(Component("KH1 Client", "KH1Client", func=launch_client, component_type=Type.CLIENT))
diff --git a/worlds/kh2/__init__.py b/worlds/kh2/__init__.py
index 59c77627eebe..edc4305accaf 100644
--- a/worlds/kh2/__init__.py
+++ b/worlds/kh2/__init__.py
@@ -3,7 +3,7 @@
 
 from BaseClasses import Tutorial, ItemClassification
 from Fill import fast_fill
-from worlds.LauncherComponents import Component, components, Type, launch_subprocess
+from worlds.LauncherComponents import Component, components, Type, launch as launch_component
 from worlds.AutoWorld import World, WebWorld
 from .Items import *
 from .Locations import *
@@ -17,7 +17,7 @@
 
 def launch_client():
     from .Client import launch
-    launch_subprocess(launch, name="KH2Client")
+    launch_component(launch, name="KH2Client")
 
 
 components.append(Component("KH2 Client", "KH2Client", func=launch_client, component_type=Type.CLIENT))
diff --git a/worlds/zork_grand_inquisitor/__init__.py b/worlds/zork_grand_inquisitor/__init__.py
index 4da257e47bd0..791f41dd00a2 100644
--- a/worlds/zork_grand_inquisitor/__init__.py
+++ b/worlds/zork_grand_inquisitor/__init__.py
@@ -5,7 +5,7 @@
 
 def launch_client() -> None:
     from .client import main
-    LauncherComponents.launch_subprocess(main, name="ZorkGrandInquisitorClient")
+    LauncherComponents.launch(main, name="ZorkGrandInquisitorClient")
 
 
 LauncherComponents.components.append(

From f1769a8d0070dad489e35edb481e81ba0330c95f Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Wed, 12 Feb 2025 19:45:03 +0300
Subject: [PATCH 366/381] Stardew Valley: Fixed Powdermelon and option
 inconsistencies (#4632)

* - Fixed powdermelon season

* - Improve cohesion in presets

* - Update several tooltips to be more consistent and accurate
---
 worlds/stardew_valley/content/vanilla/base.py |  2 +-
 worlds/stardew_valley/options/options.py      | 35 ++++++++++---------
 worlds/stardew_valley/options/presets.py      |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/worlds/stardew_valley/content/vanilla/base.py b/worlds/stardew_valley/content/vanilla/base.py
index 2c910df5d00f..9e5f53eb866e 100644
--- a/worlds/stardew_valley/content/vanilla/base.py
+++ b/worlds/stardew_valley/content/vanilla/base.py
@@ -140,7 +140,7 @@ def finalize_hook(self, content: StardewContent):
 
         Vegetable.broccoli: (HarvestCropSource(seed=Seed.broccoli, seasons=(Season.fall,)),),
         Vegetable.carrot: (HarvestCropSource(seed=Seed.carrot, seasons=(Season.spring,)),),
-        Fruit.powdermelon: (HarvestCropSource(seed=Seed.powdermelon, seasons=(Season.summer,)),),
+        Fruit.powdermelon: (HarvestCropSource(seed=Seed.powdermelon, seasons=(Season.winter,)),),
         Vegetable.summer_squash: (HarvestCropSource(seed=Seed.summer_squash, seasons=(Season.summer,)),),
 
         Fruit.strawberry: (HarvestCropSource(seed=Seed.strawberry, seasons=(Season.spring,)),),
diff --git a/worlds/stardew_valley/options/options.py b/worlds/stardew_valley/options/options.py
index f66ec3bdad80..aaeeedd1b3d8 100644
--- a/worlds/stardew_valley/options/options.py
+++ b/worlds/stardew_valley/options/options.py
@@ -66,7 +66,8 @@ def get_option_name(cls, value) -> str:
 
 
 class FarmType(Choice):
-    """What farm to play on?"""
+    """What farm to play on?
+    Custom farms are not supported"""
     internal_name = "farm_type"
     display_name = "Farm Type"
     default = "random"
@@ -203,7 +204,7 @@ class SeasonRandomization(Choice):
 
 
 class Cropsanity(Choice):
-    """Formerly named "Seed Shuffle"
+    """
     Pierre now sells a random amount of seasonal seeds and Joja sells them without season requirements, but only in huge packs.
     Disabled: All the seeds are unlocked from the start, there are no location checks for growing and harvesting crops
     Enabled: Seeds are unlocked as archipelago items, for each seed there is a location check for growing and harvesting that crop
@@ -233,9 +234,9 @@ class BackpackProgression(Choice):
 class ToolProgression(Choice):
     """Shuffle the tool upgrades?
     Vanilla: Clint will upgrade your tools with metal bars.
-    Progressive: You will randomly find Progressive Tool upgrades.
-    Cheap: Tool Upgrades will cost 2/5th as much
-    Very Cheap: Tool Upgrades will cost 1/5th as much"""
+    Progressive: Your tools upgrades are randomized.
+    Cheap: Tool Upgrades have a 60% discount
+    Very Cheap: Tool Upgrades have an 80% discount"""
     internal_name = "tool_progression"
     display_name = "Tool Progression"
     default = 1
@@ -279,8 +280,8 @@ class BuildingProgression(Choice):
     Vanilla: You can buy each building normally.
     Progressive: You will receive the buildings and will be able to build the first one of each type for free,
         once it is received. If you want more of the same building, it will cost the vanilla price.
-    Cheap: Buildings will cost half as much
-    Very Cheap: Buildings will cost 1/5th as much
+    Cheap: Buildings will have a 50% discount
+    Very Cheap: Buildings will an 80% discount
     """
     internal_name = "building_progression"
     display_name = "Building Progression"
@@ -327,7 +328,7 @@ class ArcadeMachineLocations(Choice):
 
 class SpecialOrderLocations(Choice):
     """Shuffle Special Orders?
-    Disabled: The special orders are not included in the Archipelago shuffling.
+    Vanilla: The special orders are not included in the Archipelago shuffling. You may need to complete some of them anyway for their vanilla rewards
     Board Only: The Special Orders on the board in town are location checks
     Board and Qi: The Special Orders from Mr Qi's walnut room are checks, in addition to the board in town
     Short: All Special Order requirements are reduced by 40%
@@ -377,12 +378,12 @@ class QuestLocations(NamedRange):
 
 
 class Fishsanity(Choice):
-    """Locations for catching a fish the first time?
+    """Locations for catching each fish the first time?
     None: There are no locations for catching fish
     Legendaries: Each of the 5 legendary fish are checks, plus the extended family if qi board is turned on
     Special: A curated selection of strong fish are checks
     Randomized: A random selection of fish are checks
-    All: Every single fish in the game is a location that contains an item. Pairs well with the Master Angler Goal
+    All: Every single fish in the game is a location that contains an item.
     Exclude Legendaries: Every fish except legendaries
     Exclude Hard Fish: Every fish under difficulty 80
     Only Easy Fish: Every fish under difficulty 50
@@ -517,7 +518,7 @@ class Chefsanity(NamedRange):
 class Craftsanity(Choice):
     """Checks for crafting items?
     If enabled, all recipes purchased in shops will be checks as well.
-    Recipes obtained from other sources will depend on related archipelago settings
+    Recipes obtained from other sources will depend on their respective archipelago settings
     """
     internal_name = "craftsanity"
     display_name = "Craftsanity"
@@ -530,9 +531,9 @@ class Friendsanity(Choice):
     """Shuffle Friendships?
     None: Friendship hearts are earned normally
     Bachelors: Hearts with bachelors are shuffled
-    Starting NPCs: Hearts for NPCs available immediately are checks
-    All: Hearts for all npcs are checks, including Leo, Kent, Sandy, etc
-    All With Marriage: Hearts for all npcs are checks, including romance hearts up to 14 when applicable
+    Starting NPCs: Hearts for NPCs available immediately are shuffled
+    All: Hearts for all npcs are shuffled, including Leo, Kent, Sandy, etc
+    All With Marriage: All hearts for all npcs are shuffled, including romance hearts up to 14 when applicable
     """
     internal_name = "friendsanity"
     display_name = "Friendsanity"
@@ -577,7 +578,7 @@ class Walnutsanity(OptionSet):
     """Shuffle walnuts?
     Puzzles: Walnuts obtained from solving a special puzzle or winning a minigame
     Bushes: Walnuts that are in a bush and can be collected by clicking it
-    Dig spots: Walnuts that are underground and must be digged up. Includes Journal scrap walnuts
+    Dig Spots: Walnuts that are underground and must be digged up. Includes Journal scrap walnuts
     Repeatables: Random chance walnuts from normal actions (fishing, farming, combat, etc)
     """
     internal_name = "walnutsanity"
@@ -612,7 +613,7 @@ class NumberOfMovementBuffs(Range):
 
 class EnabledFillerBuffs(OptionSet):
     """Enable various permanent player buffs to roll as filler items
-    Luck: Increase daily luck
+    Luck: Increased daily luck
     Damage: Increased Damage %
     Defense: Increased Defense
     Immunity: Increased Immunity
@@ -637,7 +638,7 @@ class EnabledFillerBuffs(OptionSet):
 class ExcludeGingerIsland(Toggle):
     """Exclude Ginger Island?
     This option will forcefully exclude everything related to Ginger Island from the slot.
-    If you pick a goal that requires Ginger Island, you cannot exclude it and it will get included anyway"""
+    If you pick a goal that requires Ginger Island, this option will get forced to 'false'"""
     internal_name = "exclude_ginger_island"
     display_name = "Exclude Ginger Island"
     default = 0
diff --git a/worlds/stardew_valley/options/presets.py b/worlds/stardew_valley/options/presets.py
index c2c210e5ca6e..3dbb5ab3f554 100644
--- a/worlds/stardew_valley/options/presets.py
+++ b/worlds/stardew_valley/options/presets.py
@@ -122,7 +122,7 @@
     options.Friendsanity.internal_name:             options.Friendsanity.option_starting_npcs,
     options.FriendsanityHeartSize.internal_name:    4,
     options.Booksanity.internal_name:               options.Booksanity.option_power_skill,
-    options.Walnutsanity.internal_name:             [WalnutsanityOptionName.puzzles],
+    options.Walnutsanity.internal_name:             options.Walnutsanity.preset_none,
     options.NumberOfMovementBuffs.internal_name:    6,
     options.EnabledFillerBuffs.internal_name:       options.EnabledFillerBuffs.preset_all,
     options.ExcludeGingerIsland.internal_name:      options.ExcludeGingerIsland.option_true,

From b2162bb8e698fcc910377c3f76d5893c5f36ff3e Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Wed, 12 Feb 2025 11:46:07 -0500
Subject: [PATCH 367/381] Docs: clean up create_item/event example (#4596)

* eyes

* remove line wraps where unnecessary
---
 docs/world api.md | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/world api.md b/docs/world api.md
index da74be70fb91..6a45ccbf99dc 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -562,17 +562,13 @@ from .items import is_progression  # this is just a dummy
 
 def create_item(self, item: str) -> MyGameItem:
     # this is called when AP wants to create an item by name (for plando) or when you call it from your own code
-    classification = ItemClassification.progression if is_progression(item) else
-    ItemClassification.filler
-
-
-return MyGameItem(item, classification, self.item_name_to_id[item],
-                  self.player)
+    classification = ItemClassification.progression if is_progression(item) else ItemClassification.filler
+    return MyGameItem(item, classification, self.item_name_to_id[item], self.player)
 
 
 def create_event(self, event: str) -> MyGameItem:
     # while we are at it, we can also add a helper to create events
-    return MyGameItem(event, True, None, self.player)
+    return MyGameItem(event, ItemClassification.progression, None, self.player)
 ```
 
 #### create_items

From 5c1ded1fe97a8f9fc5c69ac24d2832605c34347b Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Wed, 12 Feb 2025 11:46:43 -0500
Subject: [PATCH 368/381] LADX: bomb as logical bush breaker #4636

---
 worlds/ladx/LADXR/logic/requirements.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/ladx/LADXR/logic/requirements.py b/worlds/ladx/LADXR/logic/requirements.py
index fa01627a15c3..4e1fe03b096f 100644
--- a/worlds/ladx/LADXR/logic/requirements.py
+++ b/worlds/ladx/LADXR/logic/requirements.py
@@ -253,7 +253,7 @@ def isConsumable(item) -> bool:
 
 class RequirementsSettings:
     def __init__(self, options):
-        self.bush = OR(SWORD, MAGIC_POWDER, MAGIC_ROD, POWER_BRACELET, BOOMERANG)
+        self.bush = OR(SWORD, MAGIC_POWDER, MAGIC_ROD, POWER_BRACELET, BOOMERANG, BOMB)
         self.pit_bush = OR(SWORD, MAGIC_POWDER, MAGIC_ROD, BOOMERANG, BOMB) # unique
         self.attack = OR(SWORD, BOMB, BOW, MAGIC_ROD, BOOMERANG)
         self.attack_hookshot = OR(SWORD, BOMB, BOW, MAGIC_ROD, BOOMERANG, HOOKSHOT) # hinox, shrouded stalfos

From c799531105808c45849aa282168a3efa1a58f2e7 Mon Sep 17 00:00:00 2001
From: Matthew Wells <91291346+richarm4@users.noreply.github.com>
Date: Wed, 12 Feb 2025 08:47:17 -0800
Subject: [PATCH 369/381] Docs: Add missing plural in faq (#4622)

---
 WebHostLib/static/assets/faq/en.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebHostLib/static/assets/faq/en.md b/WebHostLib/static/assets/faq/en.md
index e64535b42d03..96e526612be6 100644
--- a/WebHostLib/static/assets/faq/en.md
+++ b/WebHostLib/static/assets/faq/en.md
@@ -22,7 +22,7 @@ players to rely upon each other to complete their game.
 
 While a multiworld game traditionally requires all players to be playing the same game, a multi-game multiworld allows
 players to randomize any of the supported games, and send items between them. This allows players of different
-games to interact with one another in a single multiplayer environment.  Archipelago supports multi-game multiworld.
+games to interact with one another in a single multiplayer environment.  Archipelago supports multi-game multiworlds.
 Here is a list of our [Supported Games](https://archipelago.gg/games).
 
 ## Can I generate a single-player game with Archipelago?

From efd5004330e2cb25bac094a2b78f370cacece635 Mon Sep 17 00:00:00 2001
From: JoshuaEagles <joshuaeagles1@gmail.com>
Date: Wed, 12 Feb 2025 11:47:43 -0500
Subject: [PATCH 370/381] Docs: Update SA2B Linux and Steam Deck Setup Guide +
 Add Celeste 64 Linux Setup Guide (#4593)

* Update Linux and Steam Deck setup guide for sa2b

* Add Linux and Steam Deck setup guide for Celeste 64
---
 worlds/celeste64/docs/guide_en.md |  8 +++++--
 worlds/sa2b/docs/setup_en.md      | 36 ++++++++++++++-----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/worlds/celeste64/docs/guide_en.md b/worlds/celeste64/docs/guide_en.md
index 74ab94b913d1..87ebf09f755e 100644
--- a/worlds/celeste64/docs/guide_en.md
+++ b/worlds/celeste64/docs/guide_en.md
@@ -12,6 +12,12 @@
 
 1. Download the above release and extract it.
 
+## Installation Procedures (Linux and Steam Deck)
+
+1. Download the above release and extract it.
+
+2. Add Celeste64.exe to Steam as a Non-Steam Game. In the properties for it on Steam, set it to use Proton as the compatibility tool. Launch the game through Steam in order to run it.
+
 ## Joining a MultiWorld Game
 
 1. Before launching the game, edit the `AP.json` file in the root of the Celeste 64 install.
@@ -33,5 +39,3 @@ An Example `AP.json` file:
 	"Password": ""
 }
 ```
-
-
diff --git a/worlds/sa2b/docs/setup_en.md b/worlds/sa2b/docs/setup_en.md
index f32001a67827..c34e45ce9b51 100644
--- a/worlds/sa2b/docs/setup_en.md
+++ b/worlds/sa2b/docs/setup_en.md
@@ -5,7 +5,7 @@
 - Sonic Adventure 2: Battle from: [Sonic Adventure 2: Battle Steam Store Page](https://store.steampowered.com/app/213610/Sonic_Adventure_2/)
 	- The Battle DLC is required if you choose to add Chao Karate locations to the randomizer
 - SA Mod Manager from: [SA Mod Manager GitHub Releases Page](https://github.com/X-Hax/SA-Mod-Manager/releases)
-- .NET Desktop Runtime 7.0 from: [.NET Desktop Runtime 7.0 Download Page](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-7.0.9-windows-x64-installer)
+- .NET Desktop Runtime 8.0 from: [.NET Desktop Runtime 8.0 Download Page](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.12-windows-x64-installer)
 - Archipelago Mod for Sonic Adventure 2: Battle
   from: [Sonic Adventure 2: Battle Archipelago Randomizer Mod Releases Page](https://github.com/PoryGone/SA2B_Archipelago/releases/)
 
@@ -36,27 +36,23 @@
 
 1. Install Sonic Adventure 2: Battle from Steam.
 
-2. In the properties for Sonic Adventure 2 on Steam, force the use of Proton Experimental as the compatibility tool.
-
-3. Launch the game at least once without mods.
-
-4. Create both a `/mods` directory and a `/SAManager` directory in the folder into which you installed Sonic Adventure 2: Battle.
+2. Launch the game at least once without mods.
 
-5. Install SA Mod Manager as per [its instructions](https://github.com/X-Hax/SA-Mod-Manager/tree/master?tab=readme-ov-file). Specifically, extract SAModManager.exe file to the folder that Sonic Adventure 2: Battle is installed to. To launch it, add ``SAModManager.exe`` as a non-Steam game. In the properties on Steam for SA Mod Manager, set it to use Proton as the compatibility tool.
+3. Create both a `/mods` directory and a `/SAManager` directory in the folder into which you installed Sonic Adventure 2: Battle.
 
-6. Run SAModManager.exe from Steam once. It should produce an error popup for a missing dependency, close the error.
+4. Unpack the Archipelago Mod into this folder, so that `/mods/SA2B_Archipelago` is a valid path.
 
-7. Install protontricks, on the Steam Deck this can be done via the Discover store, on other distros instructions vary, [see its github page](https://github.com/Matoking/protontricks).
+5. In the SA2B_Archipelago folder, copy the `APCpp.dll` file and paste it in the Sonic Adventure 2 install folder (where `sonic2app.exe` is).
 
-8. Download the [.NET 7 Desktop Runtime for x64 Windows](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-7.0.17-windows-x64-installer). If this link does not work, the download can be found on [this page](https://dotnet.microsoft.com/en-us/download/dotnet/7.0).
+6. Install SA Mod Manager as per [its instructions](https://github.com/X-Hax/SA-Mod-Manager/tree/master?tab=readme-ov-file). Specifically, extract SAModManager.exe file to the folder that Sonic Adventure 2: Battle is installed to. To launch it, add ``SAModManager.exe`` as a non-Steam game. In the properties on Steam for SA Mod Manager, set it to use Proton as the compatibility tool.
 
-9. Right click the .NET 7 Desktop Runtime exe, and assuming protontricks was installed correctly, the option to "Open with Protontricks Launcher" should be available. Click that, and in the popup window that opens, select SAModManager.exe. Follow the prompts after this to install the .NET 7 Desktop Runtime for SAModManager. Once it is done, you should be able to successfully launch SAModManager to steam.
+7. Run SAModManager.exe from Steam once. It should produce an error popup saying you need .NET Desktop Runtime and ask you if you'd like to download it. Say yes and it will download through your browser.
 
-6. Unpack the Archipelago Mod into this folder, so that `/mods/SA2B_Archipelago` is a valid path.
+8. Install protontricks, on the Steam Deck this can be done via the Discover store, on other distros instructions vary, [see its github page](https://github.com/Matoking/protontricks).
 
-7. In the SA2B_Archipelago folder, copy the `APCpp.dll` file and paste it in the Sonic Adventure 2 install folder (where `sonic2app.exe` is).
+9. Right click the .NET Desktop Runtime exe that was downloaded in step 6, and assuming protontricks was installed correctly, the option to "Open with Protontricks Launcher" should be available. Click that, and in the popup window that opens, select SAModManager.exe. Follow the prompts after this to install the .NET Desktop Runtime for SAModManager. Once it is done, you should be able to successfully launch SAModManager to steam.
 
-8. Launch `SAModManager.exe` from Steam and make sure the SA2B_Archipelago mod is listed and enabled.
+10. Launch `SAModManager.exe` from Steam and make sure the SA2B_Archipelago mod is listed and enabled.
 
 Note: Ensure that you launch Sonic Adventure 2 from Steam directly on Linux, rather than launching using the `Save & Play` button in SA Mod Manager.
 
@@ -77,7 +73,7 @@ Note: Ensure that you launch Sonic Adventure 2 from Steam directly on Linux, rat
 ## Additional Options
 
 Some additional settings related to the Archipelago messages in game can be adjusted in the SAModManager if you select `Configure Mod` on the SA2B_Archipelago mod. This settings will be under a `General Settings` tab.
-	
+
 - Message Display Count: This is the maximum number of Archipelago messages that can be displayed on screen at any given time.
 - Message Display Duration: This dictates how long Archipelago messages are displayed on screen (in seconds).
 - Message Font Size: The is the size of the font used to display the messages from Archipelago.
@@ -94,7 +90,7 @@ If you wish to use the `SADX Music` option of the Randomizer, you must own a cop
 
 - "The following mods didn't load correctly: SA2B_Archipelago: DLL error - The specified module could not be found."
 	- Make sure the `APCpp.dll` is in the same folder as the `sonic2app.exe`. (See Installation Procedures step 6)
-	
+
 - "sonic2app.exe - Entry Point Not Found"
 	- Make sure the `APCpp.dll` is up to date. Follow Installation Procedures step 6 to update the dll.
 
@@ -116,7 +112,7 @@ If you wish to use the `SADX Music` option of the Randomizer, you must own a cop
 	1. Run the Launcher.exe which should be in the same folder as the your Sonic Adventure 2: Battle install.
 	2. Select the `Player` tab and reselect the controller for the player 1 input method.
 	3. Click the `Save settings and launch SONIC ADVENTURE 2` button. (Any mod manager settings will apply even if the game is launched this way rather than through the mod manager)
-	
+
 - Game crashes after display logos.
 	- This may be caused by a high monitor refresh rate.
 		- Change the monitor refresh rate to 60 Hz [Change display refresh rate on Windows] (https://support.microsoft.com/en-us/windows/change-your-display-refresh-rate-in-windows-c8ea729e-0678-015c-c415-f806f04aae5a)
@@ -125,13 +121,13 @@ If you wish to use the `SADX Music` option of the Randomizer, you must own a cop
 		2. Select the `Compatibility` tab.
 		3. Check the `Run this program in compatility mode for:` box and select Windows 7 in the drop down.
 		4. Click the `Apply` button.
-		
+
 - No resolution options in the Launcher.exe.
 	- In the `Graphics device` dropdown, select the device and display you plan to run the game on. The `Resolution` dropdown should populate once a graphics device is selected.
-	
+
 - No music is playing in the game.
 	- If you enabled an `SADX Music` option, then most likely the music data was not copied properly into the mod folder (See Additional Options for instructions).
-	
+
 - Mission 1 is missing a texture in the stage select UI.
 	- Most likely another mod is conflicting and overwriting the texture pack. It is recommeded to have the SA2B Archipelago mod load last in the mod manager.
 

From 34795b598a7a94cca93a744c8e8a115183f9e028 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Sun, 16 Feb 2025 14:21:09 -0500
Subject: [PATCH 371/381] GER: Use Itempool Count for Minimal handling (#4649)

* uses itempool count vs unfilled location count instead of counting prog_items values which could have custom counters

* move unfilled location check to before can_reach

* add tests for successful minimal GER call with extra collect override prog_items in the pool to regression test issue fixed in this PR
---
 entrance_rando.py                   |  5 +++--
 test/general/test_entrance_rando.py | 31 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/entrance_rando.py b/entrance_rando.py
index 5aa16fa0bb06..b6e64002bd38 100644
--- a/entrance_rando.py
+++ b/entrance_rando.py
@@ -378,13 +378,14 @@ def find_pairing(dead_end: bool, require_new_exits: bool) -> bool:
                     and world.multiworld.has_beaten_game(er_state.collection_state, world.player):
                 # ensure that we have enough locations to place our progression
                 accessible_location_count = 0
-                prog_item_count = sum(er_state.collection_state.prog_items[world.player].values())
+                prog_item_count = len([item for item in world.multiworld.itempool if item.advancement and item.player == world.player])
                 # short-circuit location checking in this case
                 if prog_item_count == 0:
                     return True
                 for region in er_state.placed_regions:
                     for loc in region.locations:
-                        if loc.can_reach(er_state.collection_state):
+                        if not loc.item and loc.can_reach(er_state.collection_state):
+                            # don't count locations with preplaced items
                             accessible_location_count += 1
                             if accessible_location_count >= prog_item_count:
                                 perform_validity_check = False
diff --git a/test/general/test_entrance_rando.py b/test/general/test_entrance_rando.py
index efbcf7df4636..7e904d33403d 100644
--- a/test/general/test_entrance_rando.py
+++ b/test/general/test_entrance_rando.py
@@ -311,6 +311,37 @@ def test_minimal_entrance_rando(self):
         self.assertEqual([], [exit_ for region in multiworld.get_regions()
                               for exit_ in region.exits if not exit_.connected_region])
 
+    def test_minimal_entrance_rando_with_collect_override(self):
+        """
+        tests that entrance randomization can complete with minimal accessibility and unreachable exits
+        when the world defines a collect override that add extra values to prog_items
+        """
+        multiworld = generate_test_multiworld()
+        multiworld.worlds[1].options.accessibility = Accessibility.from_any(Accessibility.option_minimal)
+        multiworld.completion_condition[1] = lambda state: state.can_reach("region24", player=1)
+        generate_disconnected_region_grid(multiworld, 5, 1)
+        prog_items = generate_items(10, 1, True)
+        multiworld.itempool += prog_items
+        filler_items = generate_items(15, 1, False)
+        multiworld.itempool += filler_items
+        e = multiworld.get_entrance("region1_right", 1)
+        set_rule(e, lambda state: False)
+
+        old_collect = multiworld.worlds[1].collect
+
+        def new_collect(state, item):
+            old_collect(state, item)
+            state.prog_items[item.player]["counter"] += 300
+
+        multiworld.worlds[1].collect = new_collect
+
+        randomize_entrances(multiworld.worlds[1], False, directionally_matched_group_lookup)
+
+        self.assertEqual([], [entrance for region in multiworld.get_regions()
+                              for entrance in region.entrances if not entrance.parent_region])
+        self.assertEqual([], [exit_ for region in multiworld.get_regions()
+                              for exit_ in region.exits if not exit_.connected_region])
+
     def test_restrictive_region_requirement_does_not_fail(self):
         multiworld = generate_test_multiworld()
         generate_disconnected_region_grid(multiworld, 2, 1)

From 8349774c5cfb18487124019c43d1c03dcb6e5698 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Sun, 16 Feb 2025 23:51:36 +0100
Subject: [PATCH 372/381] customserver: ignore static datapackage optimization
 for old games (#4650)

---
 WebHostLib/customserver.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WebHostLib/customserver.py b/WebHostLib/customserver.py
index a2eef108b0a1..76a2b8a4dc15 100644
--- a/WebHostLib/customserver.py
+++ b/WebHostLib/customserver.py
@@ -117,6 +117,7 @@ def load(self, room_id: int):
         self.gamespackage = {"Archipelago": static_gamespackage.get("Archipelago", {})}  # this may be modified by _load
         self.item_name_groups = {"Archipelago": static_item_name_groups.get("Archipelago", {})}
         self.location_name_groups = {"Archipelago": static_location_name_groups.get("Archipelago", {})}
+        missing_checksum = False
 
         for game in list(multidata.get("datapackage", {})):
             game_data = multidata["datapackage"][game]
@@ -132,11 +133,13 @@ def load(self, room_id: int):
                         continue
                     else:
                         self.logger.warning(f"Did not find game_data_package for {game}: {game_data['checksum']}")
+            else:
+                missing_checksum = True  # Game rolled on old AP and will load data package from multidata
             self.gamespackage[game] = static_gamespackage.get(game, {})
             self.item_name_groups[game] = static_item_name_groups.get(game, {})
             self.location_name_groups[game] = static_location_name_groups.get(game, {})
 
-        if not game_data_packages:
+        if not game_data_packages and not missing_checksum:
             # all static -> use the static dicts directly
             self.gamespackage = static_gamespackage
             self.item_name_groups = static_item_name_groups

From 378fa5d5c4b5dfea8ebd51e67ae4fc8309cfedff Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sun, 16 Feb 2025 19:30:40 -0500
Subject: [PATCH 373/381] Fix gun missing from combat_items, add new for combat
 logic cache, very slight refactor of check_combat_reqs to let it do the
 changeover in a less complicated fashion, fix area being a boss area rather
 than non-boss area for a check (#4657)

---
 worlds/tunic/combat_logic.py     | 22 +++++-------------
 worlds/tunic/er_rules.py         |  2 +-
 worlds/tunic/items.py            |  2 +-
 worlds/tunic/test/test_combat.py | 38 +++++++++++++++++++++++++++++++-
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/worlds/tunic/combat_logic.py b/worlds/tunic/combat_logic.py
index 2e490d1dad6e..2e9f19dbc296 100644
--- a/worlds/tunic/combat_logic.py
+++ b/worlds/tunic/combat_logic.py
@@ -140,24 +140,14 @@ def check_combat_reqs(area_name: str, state: CollectionState, player: int, alt_d
                 # need sword for bosses
                 if data.is_boss:
                     return False
-                equipment.remove("Sword")
-                if has_magic:
-                    if "Magic" not in equipment:
-                        equipment.append("Magic")
-                    # +4 mp pretty much makes up for the lack of sword, at least in Quarry
-                    extra_mp_needed += 4
-                    if stick_bool:
-                        # stick is a backup plan, and doesn't scale well, so let's require a little less
-                        equipment.append("Stick")
-                        extra_att_needed -= 2
-                    else:
-                        extra_mp_needed += 2
-                        extra_att_needed -= 32
-                elif stick_bool:
+                if stick_bool:
+                    equipment.remove("Sword")
                     equipment.append("Stick")
                     # may revise this later based on feedback
                     extra_att_needed += 3
                     extra_def_needed += 2
+                    # this is for when it changes over to the magic-only state if it needs to later
+                    extra_mp_needed += 4
                 else:
                     return False
 
@@ -204,7 +194,7 @@ def check_combat_reqs(area_name: str, state: CollectionState, player: int, alt_d
                 equip_list.append("Magic")
             more_modified_stats = AreaStats(modified_stats.att_level - 32, modified_stats.def_level,
                                             modified_stats.potion_level, modified_stats.hp_level,
-                                            modified_stats.sp_level, modified_stats.mp_level + 4,
+                                            modified_stats.sp_level, modified_stats.mp_level + 2,
                                             modified_stats.potion_count, equip_list, data.is_boss)
             if check_combat_reqs("none", state, player, more_modified_stats):
                 return True
@@ -222,7 +212,7 @@ def has_required_stats(data: AreaStats, state: CollectionState, player: int) ->
     player_att, att_offerings = get_att_level(state, player)
 
     # if you have 2 more attack than needed, we can forego needing mp
-    if data.mp_level > 1:
+    if data.mp_level > 1 and "Magic" in data.equipment:
         if player_att < data.att_level + 2:
             player_mp, mp_offerings = get_mp_level(state, player)
             if player_mp < data.mp_level:
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index 4d0a462cbb8a..f111fed8b13a 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1832,7 +1832,7 @@ def combat_logic_to_loc(loc_name: str, combat_req_area: str, set_instead: bool =
     if world.options.combat_logic == CombatLogic.option_on:
         combat_logic_to_loc("Overworld - [Northeast] Flowers Holy Cross", "Garden Knight")
         combat_logic_to_loc("Overworld - [Northwest] Chest Near Quarry Gate", "Before Well", dagger=True)
-        combat_logic_to_loc("Overworld - [Northeast] Chest Above Patrol Cave", "Garden Knight", dagger=True)
+        combat_logic_to_loc("Overworld - [Northeast] Chest Above Patrol Cave", "West Garden", dagger=True)
         combat_logic_to_loc("Overworld - [Southwest] West Beach Guarded By Turret", "Overworld", dagger=True)
         combat_logic_to_loc("Overworld - [Southwest] West Beach Guarded By Turret 2", "Overworld")
         combat_logic_to_loc("Overworld - [Southwest] Bombable Wall Near Fountain", "Before Well", dagger=True)
diff --git a/worlds/tunic/items.py b/worlds/tunic/items.py
index 846650c68fef..20696eb51128 100644
--- a/worlds/tunic/items.py
+++ b/worlds/tunic/items.py
@@ -212,7 +212,7 @@ class TunicItemData(NamedTuple):
 
 combat_items: List[str] = [name for name, data in item_table.items()
                            if data.combat_ic and IC.progression in data.combat_ic]
-combat_items.extend(["Stick", "Sword", "Sword Upgrade", "Magic Wand", "Hero's Laurels"])
+combat_items.extend(["Stick", "Sword", "Sword Upgrade", "Magic Wand", "Hero's Laurels", "Gun"])
 
 item_name_to_id: Dict[str, int] = {name: item_base_id + data.item_id_offset for name, data in item_table.items()}
 
diff --git a/worlds/tunic/test/test_combat.py b/worlds/tunic/test/test_combat.py
index 866dc5f81429..c0e76ef92bca 100644
--- a/worlds/tunic/test/test_combat.py
+++ b/worlds/tunic/test/test_combat.py
@@ -4,7 +4,7 @@
 from . import TunicTestBase
 from .. import options
 from ..combat_logic import (check_combat_reqs, area_data, get_money_count, calc_effective_hp, get_potion_level,
-                            get_hp_level, get_def_level, get_sp_level)
+                            get_hp_level, get_def_level, get_sp_level, has_combat_reqs)
 from ..items import item_table
 from .. import TunicWorld
 
@@ -81,3 +81,39 @@ def test_combat_doesnt_fail_backwards(self):
                                     f"Free Def and Offerings: {player_def - def_offerings}, {def_offerings}\n"
                                     f"Free SP and Offerings: {player_sp - sp_offerings}, {sp_offerings}")
                 prev_statuses[area] = curr_statuses[area]
+
+    # the issue was that a direct check of the logic and the cache had different results
+    # it was actually due to the combat_items in items.py not having the Gun in it
+    # but this test is still helpful for verifying the cache
+    def test_combat_magic_weapons(self):
+        combat_items = self.combat_items.copy()
+        combat_items.remove("Magic Wand")
+        combat_items.remove("Gun")
+        area_names = list(area_data.keys())
+        self.multiworld.worlds[1].random.shuffle(combat_items)
+        self.multiworld.worlds[1].random.shuffle(area_names)
+        current_items = Counter()
+        state = self.multiworld.state.copy()
+        player = self.player
+        gun = TunicWorld.create_item(self.world, "Gun")
+
+        for current_item_name in combat_items:
+            current_item = TunicWorld.create_item(self.world, current_item_name)
+            state.collect(current_item)
+            current_items[current_item_name] += 1
+            for area in area_names:
+                if check_combat_reqs(area, state, player) != has_combat_reqs(area, state, player):
+                    raise Exception(f"Cache for {area} does not match a direct check "
+                                    f"after collecting {current_item_name}.\n"
+                                    f"Current items: {current_items}.\n"
+                                    f"Cache {'succeeded' if has_combat_reqs(area, state, player) else 'failed'}\n"
+                                    f"Direct {'succeeded' if check_combat_reqs(area, state, player) else 'failed'}")
+            state.collect(gun)
+            for area in area_names:
+                if check_combat_reqs(area, state, player) != has_combat_reqs(area, state, player):
+                    raise Exception(f"Cache for {area} does not match a direct check "
+                                    f"after collecting the Gun.\n"
+                                    f"Current items: {current_items}.\n"
+                                    f"Cache {'succeeded' if has_combat_reqs(area, state, player) else 'failed'}\n"
+                                    f"Direct {'succeeded' if check_combat_reqs(area, state, player) else 'failed'}")
+            state.remove(gun)

From d744e086efb23673326d791a01a748c0f7213597 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Mon, 17 Feb 2025 15:16:18 +0100
Subject: [PATCH 374/381] MultiServer: Fix hinting an item that someone else
 already hinted in their slot not resolving correctly (#4655)

* Fix get_hint not checking for finding_player

* Fix using the wrong variable for slot lookup
---
 MultiServer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MultiServer.py b/MultiServer.py
index 51b72c93ad3d..a310808b3aec 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -783,7 +783,7 @@ def notify_hints(self, team: int, hints: typing.List[Hint], only_new: bool = Fal
 
     def get_hint(self, team: int, finding_player: int, seeked_location: int) -> typing.Optional[Hint]:
         for hint in self.hints[team, finding_player]:
-            if hint.location == seeked_location:
+            if hint.location == seeked_location and hint.finding_player == finding_player:
                 return hint
         return None
     
@@ -1135,7 +1135,7 @@ def collect_hints(ctx: Context, team: int, slot: int, item: typing.Union[int, st
     seeked_item_id = item if isinstance(item, int) else ctx.item_names_for_game(ctx.games[slot])[item]
     for finding_player, location_id, item_id, receiving_player, item_flags \
             in ctx.locations.find_item(slots, seeked_item_id):
-        prev_hint = ctx.get_hint(team, slot, location_id)
+        prev_hint = ctx.get_hint(team, finding_player, location_id)
         if prev_hint:
             hints.append(prev_hint)
         else:

From 15bde565511e4d1e4eb4522df6cc938cf9e33ba0 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Mon, 17 Feb 2025 18:58:38 +0100
Subject: [PATCH 375/381] Factorio: prevent invalid starting items count
 (#4658)

---
 worlds/factorio/Options.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index 4848cd992664..fe72d386507c 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -235,6 +235,12 @@ class FactorioStartItems(OptionDict):
     """Mapping of Factorio internal item-name to amount granted on start."""
     display_name = "Starting Items"
     default = {"burner-mining-drill": 4, "stone-furnace": 4,  "raw-fish": 50}
+    schema = Schema(
+        {
+            str: And(int, lambda n: n > 0,
+                     error="amount of starting items has to be a positive integer"),
+        }
+    )
 
 
 class FactorioFreeSampleBlacklist(OptionSet):

From 91a8fc91d6636e15a8967b764928bd37bae5e656 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Wed, 19 Feb 2025 13:50:25 +0100
Subject: [PATCH 376/381] CI: fix native tests toolchain on windows (#4668)

* CI: ctest: fix trigger on CMakeLists change

* CI: ctest: update cmake version

this removes a warning
and matches gtest

* CI: ctest: remove explicit build mode for MSVC

gtest switched to dynamic libc (/MD), which is default, so this just works now
---
 .github/workflows/ctest.yml | 4 ++--
 test/cpp/CMakeLists.txt     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml
index 9492c83c9e53..a0ae2cb25206 100644
--- a/.github/workflows/ctest.yml
+++ b/.github/workflows/ctest.yml
@@ -11,7 +11,7 @@ on:
       - '**.hh?'
       - '**.hpp'
       - '**.hxx'
-      - '**.CMakeLists'
+      - '**/CMakeLists.txt'
       - '.github/workflows/ctest.yml'
   pull_request:
     paths:
@@ -21,7 +21,7 @@ on:
       - '**.hh?'
       - '**.hpp'
       - '**.hxx'
-      - '**.CMakeLists'
+      - '**/CMakeLists.txt'
       - '.github/workflows/ctest.yml'
 
 jobs:
diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt
index 927b7494dac4..03deb8f98224 100644
--- a/test/cpp/CMakeLists.txt
+++ b/test/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ap-cpp-tests)
 
 enable_testing()
@@ -7,8 +7,8 @@ find_package(GTest REQUIRED)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     add_definitions("/source-charset:utf-8")
-    set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
-    set(CMAKE_CXX_FLAGS_RELEASE "/MT")
+    # set(CMAKE_CXX_FLAGS_DEBUG "/MDd") # this is the default
+    # set(CMAKE_CXX_FLAGS_RELEASE "/MD") # this is the default
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # enable static analysis for gcc
     add_compile_options(-fanalyzer -Werror)

From 11fa43f0a49abcab762bc15613e1d74ce4d5869b Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Thu, 20 Feb 2025 00:17:19 +0100
Subject: [PATCH 377/381] Factorio: prevent players from getting stuck from
 Teleport Traps (#4537)

---
 worlds/factorio/Options.py                    |  3 +-
 worlds/factorio/data/mod/lib.lua              | 67 +++++++++++++++++++
 worlds/factorio/data/mod_template/control.lua | 13 ++--
 3 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index fe72d386507c..481ed00987f2 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -263,7 +263,8 @@ class AttackTrapCount(TrapCount):
 
 
 class TeleportTrapCount(TrapCount):
-    """Trap items that when received trigger a random teleport."""
+    """Trap items that when received trigger a random teleport.
+    It is ensured the player can walk back to where they got teleported from."""
     display_name = "Teleport Traps"
 
 
diff --git a/worlds/factorio/data/mod/lib.lua b/worlds/factorio/data/mod/lib.lua
index edec5b7acdc0..aa50b926f04f 100644
--- a/worlds/factorio/data/mod/lib.lua
+++ b/worlds/factorio/data/mod/lib.lua
@@ -49,6 +49,73 @@ function fire_entity_at_entities(entity_name, entities, speed)
     end
 end
 
+local teleport_requests = {}
+local teleport_attempts = {}
+local max_attempts = 100
+
+function attempt_teleport_player(player, attempt)
+    -- global attempt storage as metadata can't be stored
+    if attempt == nil then
+        attempt = teleport_attempts[player.index]
+    else
+        teleport_attempts[player.index] = attempt
+    end
+
+    if attempt > max_attempts then
+        player.print("Teleport failed: No valid position found after " .. max_attempts .. " attempts!")
+        teleport_attempts[player.index] = 0
+        return
+    end
+
+    local surface = player.character.surface
+    local prototype_name = player.character.prototype.name
+    local original_position = player.character.position
+    local candidate_position = random_offset_position(original_position, 1024)
+
+    local non_colliding_position = surface.find_non_colliding_position(
+        prototype_name, candidate_position, 0, 1
+    )
+
+    if non_colliding_position then
+        -- Request pathfinding asynchronously
+        local path_id = surface.request_path{
+            bounding_box = player.character.prototype.collision_box,
+            collision_mask = { layers = { ["player"] = true } },
+            start = original_position,
+            goal = non_colliding_position,
+            force = player.force.name,
+            radius = 1,
+            pathfind_flags = {cache = true, low_priority = true, allow_paths_through_own_entities = true},
+        }
+
+        -- Store the request with the player index as the key
+        teleport_requests[player.index] = path_id
+    else
+        attempt_teleport_player(player, attempt + 1)
+    end
+end
+
+function handle_teleport_attempt(event)
+    for player_index, path_id in pairs(teleport_requests) do
+        -- Check if the event matches the stored path_id
+        if path_id == event.id then
+            local player = game.players[player_index]
+
+            if event.path then
+                if player.character then
+                    player.character.teleport(event.path[#event.path].position)  -- Teleport to the last point in the path
+                    -- Clear the attempts for this player
+                    teleport_attempts[player_index] = 0
+                    return
+                end
+                return
+            end
+
+            attempt_teleport_player(player, nil)
+            break
+        end
+    end
+end
 function spill_character_inventory(character)
     if not (character and character.valid) then
         return false
diff --git a/worlds/factorio/data/mod_template/control.lua b/worlds/factorio/data/mod_template/control.lua
index 07fd4c04afae..cd0c00e9877f 100644
--- a/worlds/factorio/data/mod_template/control.lua
+++ b/worlds/factorio/data/mod_template/control.lua
@@ -134,6 +134,9 @@ end
 
 script.on_event(defines.events.on_player_changed_position, on_player_changed_position)
 {% endif %}
+-- Handle the pathfinding result of teleport traps
+script.on_event(defines.events.on_script_path_request_finished, handle_teleport_attempt)
+
 function count_energy_bridges()
     local count = 0
     for i, bridge in pairs(storage.energy_link_bridges) do
@@ -143,9 +146,11 @@ function count_energy_bridges()
     end
     return count
 end
+
 function get_energy_increment(bridge)
     return ENERGY_INCREMENT + (ENERGY_INCREMENT * 0.3 * bridge.quality.level)
 end
+
 function on_check_energy_link(event)
     --- assuming 1 MJ increment and 5MJ battery:
     --- first 2 MJ request fill, last 2 MJ push energy, middle 1 MJ does nothing
@@ -722,12 +727,10 @@ end,
     game.forces["enemy"].set_evolution_factor(new_factor, "nauvis")
     game.print({"", "New evolution factor:", new_factor})
 end,
-["Teleport Trap"] = function ()
+["Teleport Trap"] = function()
     for _, player in ipairs(game.forces["player"].players) do
-        current_character = player.character
-        if current_character ~= nil then
-            current_character.teleport(current_character.surface.find_non_colliding_position(
-                current_character.prototype.name, random_offset_position(current_character.position, 1024), 0, 1))
+        if player.character then
+            attempt_teleport_player(player, 1)
         end
     end
 end,

From 18de035b4deec96a237a8dd49a739db3ac659039 Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Sat, 22 Feb 2025 05:33:58 -0800
Subject: [PATCH 378/381] DS3: Update setup documentation (#4437)

---
 worlds/dark_souls_3/docs/setup_en.md | 68 +++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 2 deletions(-)

diff --git a/worlds/dark_souls_3/docs/setup_en.md b/worlds/dark_souls_3/docs/setup_en.md
index 484afdce3fcb..4c3a6b2a7d60 100644
--- a/worlds/dark_souls_3/docs/setup_en.md
+++ b/worlds/dark_souls_3/docs/setup_en.md
@@ -3,11 +3,13 @@
 ## Required Software
 
 - [Dark Souls III](https://store.steampowered.com/app/374320/DARK_SOULS_III/)
-- [Dark Souls III AP Client](https://github.com/nex3/Dark-Souls-III-Archipelago-client/releases/latest)
+- [Dark Souls III AP Client]
+
+[Dark Souls III AP Client]: https://github.com/nex3/Dark-Souls-III-Archipelago-client/releases/latest
 
 ## Optional Software
 
-- Map tracker not yet updated for 3.0.0
+- [Map tracker](https://github.com/TVV1GK/DS3_AP_Maptracker)
 
 ## Setting Up
 
@@ -73,3 +75,65 @@ things to keep in mind:
 
 [.NET Runtime]: https://dotnet.microsoft.com/en-us/download/dotnet/8.0
 [WINE]: https://www.winehq.org/
+
+## Troubleshooting
+
+### Enemy randomizer issues
+
+The DS3 Archipelago randomizer uses [thefifthmatt's DS3 enemy randomizer],
+essentially unchanged. Unfortunately, this randomizer has a few known issues,
+including enemy AI not working, enemies spawning in places they can't be killed,
+and, in a few rare cases, enemies spawning in ways that crash the game when they
+load. These bugs should be [reported upstream], but unfortunately the
+Archipelago devs can't help much with them.
+
+[thefifthmatt's DS3 enemy randomizer]: https://www.nexusmods.com/darksouls3/mods/484
+[reported upstream]: https://github.com/thefifthmatt/SoulsRandomizers/issues
+
+Because in rare cases the enemy randomizer can cause seeds to be impossible to
+complete, we recommend disabling it for large async multiworlds for safety
+purposes.
+
+### `launchmod_darksouls3.bat` isn't working
+
+Sometimes `launchmod_darksouls3.bat` will briefly flash a terminal on your
+screen and then terminate without actually starting the game. This is usually
+caused by some issue communicating with Steam either to find `DarkSoulsIII.exe`
+or to launch it properly. If this is happening to you, make sure:
+
+* You have DS3 1.15.2 installed. This is the latest patch as of January 2025.
+  (Note that older versions of Archipelago required an older patch, but that
+  _will not work_ with the current version.)
+
+* You own the DS3 DLC if your randomizer config has DLC enabled. (It's possible,
+  but unconfirmed, that you need the DLC even when it's disabled in your config).
+
+* Steam is not running in administrator mode. To fix this, right-click
+  `steam.exe` (by default this is in `C:\Program Files\Steam`), select
+  "Properties", open the "Compatiblity" tab, and uncheck "Run this program as an
+  administrator".
+
+* There is no `dinput8.dll` file in your DS3 game directory. This is the old way
+  of installing mods, and it can interfere with the new ModEngine2 workflow.
+
+If you've checked all of these, you can also try:
+
+* Running `launchmod_darksouls3.bat` as an administrator.
+
+* Reinstalling DS3 or even reinstalling Steam itself.
+
+* Making sure DS3 is installed on the same drive as Steam and as the randomizer.
+  (A number of users are able to run these on different drives, but this has
+  helped some users.)
+
+If none of this works, unfortunately there's not much we can do. We use
+ModEngine2 to launch DS3 with the Archipelago mod enabled, but unfortunately
+it's no longer maintained and its successor, ModEngine3, isn't usable yet.
+
+### `DS3Randomizer.exe` isn't working
+
+This is almost always caused by using a version of the randomizer client that's
+not compatible with the version used to generate the multiworld. If you're
+generating your multiworld on archipelago.gg, you *must* use the latest [Dark
+Souls III AP Client]. If you want to use a different client version, you *must*
+generate the multiworld locally using the apworld bundled with the client.

From 0f7fd48cddac9dc5d6da8347aca7ee27afc7bb8a Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sun, 23 Feb 2025 11:02:30 -0500
Subject: [PATCH 379/381] TUNIC: Add some more rules for Monastery connections
 (#4564)

* Move a couple locations to monastery

* Connect Quarry Back to Monastery

* Quarry Back -> Monastery with laurels, Monastery -> Monastery Back with wand/sword

* Add Monastery Back region

* Move a couple non-ER locations to monastery back

* Monastery front -> back with sword, wand, or laurels zip

* also laurels zip for non-ER
---
 worlds/tunic/er_rules.py  | 4 +++-
 worlds/tunic/locations.py | 8 ++++----
 worlds/tunic/regions.py   | 5 +++--
 worlds/tunic/rules.py     | 5 +++++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index f111fed8b13a..1d3ede21a41a 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -990,7 +990,9 @@ def get_paired_portal(portal_sd: str) -> Tuple[str, str]:
         rule=lambda state: has_ice_grapple_logic(True, IceGrappling.option_hard, state, world))
 
     monastery_front_to_back = regions["Monastery Front"].connect(
-        connecting_region=regions["Monastery Back"])
+        connecting_region=regions["Monastery Back"],
+        rule=lambda state: has_sword(state, player) or state.has(fire_wand, player)
+        or laurels_zip(state, world))
     # laurels through the gate, no setup needed
     regions["Monastery Back"].connect(
         connecting_region=regions["Monastery Front"],
diff --git a/worlds/tunic/locations.py b/worlds/tunic/locations.py
index d0c4f860e47f..d3c23406ed38 100644
--- a/worlds/tunic/locations.py
+++ b/worlds/tunic/locations.py
@@ -206,7 +206,7 @@ class TunicLocationData(NamedTuple):
     "Fountain Cross Door - Page Pickup": TunicLocationData("Overworld Holy Cross", "Fountain Cross Room", location_group="Holy Cross"),
     "Secret Gathering Place - Holy Cross Chest": TunicLocationData("Overworld Holy Cross", "Secret Gathering Place", location_group="Holy Cross"),
     "Top of the Mountain - Page At The Peak": TunicLocationData("Overworld Holy Cross", "Top of the Mountain", location_group="Holy Cross"),
-    "Monastery - Monastery Chest": TunicLocationData("Monastery", "Monastery Back"),
+    "Monastery - Monastery Chest": TunicLocationData("Monastery Back", "Monastery Back"),
     "Quarry - [Back Entrance] Bushes Holy Cross": TunicLocationData("Quarry Back", "Quarry Back", location_group="Holy Cross"),
     "Quarry - [Back Entrance] Chest": TunicLocationData("Quarry Back", "Quarry Back"),
     "Quarry - [Central] Near Shortcut Ladder": TunicLocationData("Quarry Back", "Quarry Back"),
@@ -220,12 +220,12 @@ class TunicLocationData(NamedTuple):
     "Quarry - [Central] Obscured Below Entry Walkway": TunicLocationData("Quarry Back", "Quarry Back"),
     "Quarry - [Central] Top Floor Overhang": TunicLocationData("Quarry", "Quarry"),
     "Quarry - [East] Near Bridge": TunicLocationData("Quarry", "Quarry"),
-    "Quarry - [Central] Above Ladder": TunicLocationData("Quarry", "Quarry Monastery Entry"),
+    "Quarry - [Central] Above Ladder": TunicLocationData("Monastery", "Quarry Monastery Entry"),
     "Quarry - [Central] Obscured Behind Staircase": TunicLocationData("Quarry", "Quarry"),
-    "Quarry - [Central] Above Ladder Dash Chest": TunicLocationData("Quarry", "Quarry Monastery Entry"),
+    "Quarry - [Central] Above Ladder Dash Chest": TunicLocationData("Monastery", "Quarry Monastery Entry"),
     "Quarry - [West] Upper Area Bombable Wall": TunicLocationData("Quarry Back", "Quarry Back"),
     "Quarry - [East] Bombable Wall": TunicLocationData("Quarry", "Quarry"),
-    "Hero's Grave - Ash Relic": TunicLocationData("Monastery", "Hero Relic - Quarry"),
+    "Hero's Grave - Ash Relic": TunicLocationData("Monastery Back", "Hero Relic - Quarry"),
     "Quarry - [West] Shooting Range Secret Path": TunicLocationData("Lower Quarry", "Lower Quarry"),
     "Quarry - [West] Near Shooting Range": TunicLocationData("Lower Quarry", "Lower Quarry"),
     "Quarry - [West] Below Shooting Range": TunicLocationData("Lower Quarry", "Lower Quarry"),
diff --git a/worlds/tunic/regions.py b/worlds/tunic/regions.py
index 8f5df8896ac9..f21af11ee49d 100644
--- a/worlds/tunic/regions.py
+++ b/worlds/tunic/regions.py
@@ -13,9 +13,10 @@
     "Library": tuple(),
     "Eastern Vault Fortress": ("Beneath the Vault",),
     "Beneath the Vault": ("Eastern Vault Fortress",),
-    "Quarry Back": ("Quarry",),
+    "Quarry Back": ("Quarry", "Monastery"),
     "Quarry": ("Monastery", "Lower Quarry"),
-    "Monastery": tuple(),
+    "Monastery": ("Monastery Back",),
+    "Monastery Back": tuple(),
     "Lower Quarry": ("Rooted Ziggurat",),
     "Rooted Ziggurat": tuple(),
     "Swamp": ("Cathedral",),
diff --git a/worlds/tunic/rules.py b/worlds/tunic/rules.py
index 959376787d0e..63f76ac92984 100644
--- a/worlds/tunic/rules.py
+++ b/worlds/tunic/rules.py
@@ -124,6 +124,11 @@ def set_region_rules(world: "TunicWorld") -> None:
         and (state.has_any({grapple, laurels, gun}, player) or can_ladder_storage(state, world))
     world.get_entrance("Quarry Back -> Quarry").access_rule = \
         lambda state: has_sword(state, player) or state.has(fire_wand, player)
+    world.get_entrance("Quarry Back -> Monastery").access_rule = \
+        lambda state: state.has(laurels, player)
+    world.get_entrance("Monastery -> Monastery Back").access_rule = \
+        lambda state: (has_sword(state, player) or state.has(fire_wand, player)
+                       or laurels_zip(state, world))
     world.get_entrance("Quarry -> Lower Quarry").access_rule = \
         lambda state: has_mask(state, world)
     world.get_entrance("Lower Quarry -> Rooted Ziggurat").access_rule = \

From 58d460678e5e0e22995e3ce0b0fd93fa86db0c99 Mon Sep 17 00:00:00 2001
From: threeandthreee <a.l.nordstrom@gmail.com>
Date: Sun, 23 Feb 2025 11:11:24 -0500
Subject: [PATCH 380/381] LADX: drop rupee farm condition (#4189)

* drop rupee farm condition

* cleanup

* rupee farm backup for all spending checks

* not power bracelet

* oops
---
 worlds/ladx/LADXR/logic/overworld.py    | 12 ++++++------
 worlds/ladx/LADXR/logic/requirements.py |  1 +
 worlds/ladx/Locations.py                | 13 +------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/worlds/ladx/LADXR/logic/overworld.py b/worlds/ladx/LADXR/logic/overworld.py
index a85a97ae6451..b63aad2b340d 100644
--- a/worlds/ladx/LADXR/logic/overworld.py
+++ b/worlds/ladx/LADXR/logic/overworld.py
@@ -11,7 +11,7 @@ def __init__(self, options, world_setup, r):
 
         mabe_village = Location("Mabe Village")
         Location().add(HeartPiece(0x2A4)).connect(mabe_village, r.bush)  # well
-        Location().add(FishingMinigame()).connect(mabe_village, AND(r.bush, COUNT("RUPEES", 20)))  # fishing game, heart piece is directly done by the minigame.
+        Location().add(FishingMinigame()).connect(mabe_village, AND(r.can_farm, COUNT("RUPEES", 20)))  # fishing game, heart piece is directly done by the minigame.
         Location().add(Seashell(0x0A3)).connect(mabe_village, r.bush)  # bushes below the shop
         Location().add(Seashell(0x0D2)).connect(mabe_village, PEGASUS_BOOTS)  # smash into tree next to lv1
         Location().add(Song(0x092)).connect(mabe_village, OCARINA)  # Marins song
@@ -23,7 +23,7 @@ def __init__(self, options, world_setup, r):
         papahl_house.connect(mamasha_trade, TRADING_ITEM_YOSHI_DOLL)
 
         trendy_shop = Location("Trendy Shop")
-        trendy_shop.connect(Location().add(TradeSequenceItem(0x2A0, TRADING_ITEM_YOSHI_DOLL)), FOUND("RUPEES", 50))
+        trendy_shop.connect(Location().add(TradeSequenceItem(0x2A0, TRADING_ITEM_YOSHI_DOLL)), AND(r.can_farm, FOUND("RUPEES", 50)))
         outside_trendy = Location()
         outside_trendy.connect(mabe_village, r.bush)
 
@@ -43,8 +43,8 @@ def __init__(self, options, world_setup, r):
         self._addEntrance("start_house", mabe_village, start_house, None)
 
         shop = Location("Shop")
-        Location().add(ShopItem(0)).connect(shop, OR(COUNT("RUPEES", 500), SWORD))
-        Location().add(ShopItem(1)).connect(shop, OR(COUNT("RUPEES", 1480), SWORD))
+        Location().add(ShopItem(0)).connect(shop, OR(AND(r.can_farm, COUNT("RUPEES", 500)), SWORD))
+        Location().add(ShopItem(1)).connect(shop, OR(AND(r.can_farm, COUNT("RUPEES", 1480)), SWORD))
         self._addEntrance("shop", mabe_village, shop, None)
 
         dream_hut = Location("Dream Hut")
@@ -164,7 +164,7 @@ def __init__(self, options, world_setup, r):
         self._addEntrance("prairie_left_cave2", ukuku_prairie, prairie_left_cave2, BOMB)
         self._addEntranceRequirementExit("prairie_left_cave2", None) # if exiting, you do not need bombs
 
-        mamu = Location().connect(Location().add(Song(0x2FB)), AND(OCARINA, COUNT("RUPEES", 1480)))
+        mamu = Location().connect(Location().add(Song(0x2FB)), AND(OCARINA, r.can_farm, COUNT("RUPEES", 1480)))
         self._addEntrance("mamu", ukuku_prairie, mamu, AND(OR(AND(FEATHER, PEGASUS_BOOTS), ROOSTER), OR(HOOKSHOT, ROOSTER), POWER_BRACELET))
 
         dungeon3_entrance = Location().connect(ukuku_prairie, OR(FEATHER, ROOSTER, FLIPPERS))
@@ -377,7 +377,7 @@ def __init__(self, options, world_setup, r):
 
         # Raft game.
         raft_house = Location("Raft House")
-        Location().add(KeyLocation("RAFT")).connect(raft_house, AND(r.bush, COUNT("RUPEES", 100))) # add bush requirement for farming in case player has to try again
+        Location().add(KeyLocation("RAFT")).connect(raft_house, AND(r.can_farm, COUNT("RUPEES", 100)))
         raft_return_upper = Location()
         raft_return_lower = Location().connect(raft_return_upper, None, one_way=True)
         outside_raft_house = Location().connect(below_right_taltal, HOOKSHOT).connect(below_right_taltal, FLIPPERS, one_way=True)
diff --git a/worlds/ladx/LADXR/logic/requirements.py b/worlds/ladx/LADXR/logic/requirements.py
index 4e1fe03b096f..8d637ecfe99b 100644
--- a/worlds/ladx/LADXR/logic/requirements.py
+++ b/worlds/ladx/LADXR/logic/requirements.py
@@ -253,6 +253,7 @@ def isConsumable(item) -> bool:
 
 class RequirementsSettings:
     def __init__(self, options):
+        self.can_farm = OR(SWORD, MAGIC_POWDER, MAGIC_ROD, BOOMERANG, BOMB, HOOKSHOT, BOW)
         self.bush = OR(SWORD, MAGIC_POWDER, MAGIC_ROD, POWER_BRACELET, BOOMERANG, BOMB)
         self.pit_bush = OR(SWORD, MAGIC_POWDER, MAGIC_ROD, BOOMERANG, BOMB) # unique
         self.attack = OR(SWORD, BOMB, BOW, MAGIC_ROD, BOOMERANG)
diff --git a/worlds/ladx/Locations.py b/worlds/ladx/Locations.py
index 8670738e0869..45fa99adc56a 100644
--- a/worlds/ladx/Locations.py
+++ b/worlds/ladx/Locations.py
@@ -110,15 +110,6 @@ def filter_item(item):
         add_item_rule(self, filter_item)
 
 
-def has_free_weapon(state: CollectionState, player: int) -> bool:
-    return state.has("Progressive Sword", player) or state.has("Magic Rod", player) or state.has("Boomerang", player) or state.has("Hookshot", player)
-
-
-# If the player has access to farm enough rupees to afford a game, we assume that they can keep beating the game
-def can_farm_rupees(state: CollectionState, player: int) -> bool:
-    return has_free_weapon(state, player) and (state.has("Can Play Trendy Game", player=player) or state.has("RAFT", player=player))
-
-
 class LinksAwakeningRegion(Region):
     dungeon_index = None
     ladxr_region = None
@@ -154,9 +145,7 @@ def __contains__(self, item):
     def get(self, item, default):
         # Don't allow any money usage if you can't get back wasted rupees
         if item == "RUPEES":
-            if can_farm_rupees(self.state, self.player):
-                return self.state.prog_items[self.player]["RUPEES"]
-            return 0
+            return self.state.prog_items[self.player]["RUPEES"]
         elif item.endswith("_USED"):
             return 0
         else:

From 6dc461609b1df651e327050f279f8cdce38fe95b Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sun, 23 Feb 2025 11:27:05 -0500
Subject: [PATCH 381/381] Noita: Fix bug with Traps disabled in 1-player games
 #4651

---
 worlds/noita/items.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/noita/items.py b/worlds/noita/items.py
index 394bcdb5757f..20d9ff1930de 100644
--- a/worlds/noita/items.py
+++ b/worlds/noita/items.py
@@ -52,8 +52,8 @@ def create_kantele(victory_condition: VictoryCondition) -> List[str]:
 def create_random_items(world: NoitaWorld, weights: Dict[str, int], count: int) -> List[str]:
     filler_pool = weights.copy()
     if not world.options.bad_effects:
-        del filler_pool["Trap"]
-        del filler_pool["Greed Die"]
+        filler_pool["Trap"] = 0
+        filler_pool["Greed Die"] = 0
 
     return world.random.choices(population=list(filler_pool.keys()),
                                 weights=list(filler_pool.values()),