From 6fd16ecced785b4b14b97e8ae9e952335902858e Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:35:03 +0200
Subject: [PATCH 01/24] MultiServer: Allow games with no locations, add checks
 to pure python implementation. (#1944)

* Server: allow games with no locations again

* Server: validate locations in pure python implementation

and rework tests

* Server: fix tests for py<3.11
---
 NetUtils.py                        |  12 ++
 _speedups.pyx                      |  14 ++-
 test/netutils/TestLocationStore.py | 190 ++++++++++++++++-------------
 3 files changed, 124 insertions(+), 92 deletions(-)

diff --git a/NetUtils.py b/NetUtils.py
index b30316ca6d7b..99c37238c35a 100644
--- a/NetUtils.py
+++ b/NetUtils.py
@@ -347,6 +347,18 @@ def local(self):
 
 
 class _LocationStore(dict, typing.MutableMapping[int, typing.Dict[int, typing.Tuple[int, int, int]]]):
+    def __init__(self, values: typing.MutableMapping[int, typing.Dict[int, typing.Tuple[int, int, int]]]):
+        super().__init__(values)
+
+        if not self:
+            raise ValueError(f"Rejecting game with 0 players")
+
+        if len(self) != max(self):
+            raise ValueError("Player IDs not continuous")
+
+        if len(self.get(0, {})):
+            raise ValueError("Invalid player id 0 for location")
+
     def find_item(self, slots: typing.Set[int], seeked_item_id: int
                   ) -> typing.Generator[typing.Tuple[int, int, int, int, int], None, None]:
         for finding_player, check_data in self.items():
diff --git a/_speedups.pyx b/_speedups.pyx
index 95e837d1bba6..fc2413ceb5d1 100644
--- a/_speedups.pyx
+++ b/_speedups.pyx
@@ -8,6 +8,7 @@ This is deliberately .pyx because using a non-compiled "pure python" may be slow
 
 # pip install cython cymem
 import cython
+import warnings
 from cpython cimport PyObject
 from typing import Any, Dict, Iterable, Iterator, Generator, Sequence, Tuple, TypeVar, Union, Set, List, TYPE_CHECKING
 from cymem.cymem cimport Pool
@@ -107,13 +108,16 @@ cdef class LocationStore:
                 count += 1
             sender_count += 1
 
-        if not count:
-            raise ValueError("No locations")
+        if not sender_count:
+            raise ValueError(f"Rejecting game with 0 players")
 
         if sender_count != max_sender:
             # we assume player 0 will never have locations
             raise ValueError("Player IDs not continuous")
 
+        if not count:
+            warnings.warn("Game has no locations")
+
         # allocate the arrays and invalidate index (0xff...)
         self.entries = <LocationEntry*>self._mem.alloc(count, sizeof(LocationEntry))
         self.sender_index = <IndexEntry*>self._mem.alloc(max_sender + 1, sizeof(IndexEntry))
@@ -140,9 +144,9 @@ cdef class LocationStore:
         self._proxies.append(None)  # player 0
         assert self.sender_index[0].count == 0
         for i in range(1, max_sender + 1):
-            if self.sender_index[i].count == 0 and self.sender_index[i].start >= count:
-                self.sender_index[i].start = 0  # do not point outside valid entries
-            assert self.sender_index[i].start < count
+            assert self.sender_index[i].count == 0 or (
+                    self.sender_index[i].start < count and
+                    self.sender_index[i].start + self.sender_index[i].count <= count)
             key = i  # allocate python integer
             proxy = PlayerLocationProxy(self, i)
             self._keys.append(key)
diff --git a/test/netutils/TestLocationStore.py b/test/netutils/TestLocationStore.py
index 5c98437a031e..9fe904f68a16 100644
--- a/test/netutils/TestLocationStore.py
+++ b/test/netutils/TestLocationStore.py
@@ -1,10 +1,13 @@
 # Tests for _speedups.LocationStore and NetUtils._LocationStore
 import typing
 import unittest
+import warnings
 from NetUtils import LocationStore, _LocationStore
 
+State = typing.Dict[typing.Tuple[int, int], typing.Set[int]]
+RawLocations = typing.Dict[int, typing.Dict[int, typing.Tuple[int, int, int]]]
 
-sample_data = {
+sample_data: RawLocations = {
     1: {
         11: (21, 2, 7),
         12: (22, 2, 0),
@@ -23,28 +26,29 @@
     },
 }
 
-empty_state = {
+empty_state: State = {
     (0, slot): set() for slot in sample_data
 }
 
-full_state = {
+full_state: State = {
     (0, slot): set(locations) for (slot, locations) in sample_data.items()
 }
 
-one_state = {
+one_state: State = {
     (0, 1): {12}
 }
 
 
 class Base:
     class TestLocationStore(unittest.TestCase):
+        """Test method calls on a loaded store."""
         store: typing.Union[LocationStore, _LocationStore]
 
-        def test_len(self):
+        def test_len(self) -> None:
             self.assertEqual(len(self.store), 4)
             self.assertEqual(len(self.store[1]), 3)
 
-        def test_key_error(self):
+        def test_key_error(self) -> None:
             with self.assertRaises(KeyError):
                 _ = self.store[0]
             with self.assertRaises(KeyError):
@@ -54,25 +58,25 @@ def test_key_error(self):
                 _ = locations[7]
             _ = locations[11]  # no Exception
 
-        def test_getitem(self):
+        def test_getitem(self) -> None:
             self.assertEqual(self.store[1][11], (21, 2, 7))
             self.assertEqual(self.store[1][13], (13, 1, 0))
             self.assertEqual(self.store[2][22], (12, 1, 0))
             self.assertEqual(self.store[4][9], (99, 3, 0))
 
-        def test_get(self):
+        def test_get(self) -> None:
             self.assertEqual(self.store.get(1, None), self.store[1])
             self.assertEqual(self.store.get(0, None), None)
             self.assertEqual(self.store[1].get(11, (None, None, None)), self.store[1][11])
             self.assertEqual(self.store[1].get(10, (None, None, None)), (None, None, None))
 
-        def test_iter(self):
+        def test_iter(self) -> None:
             self.assertEqual(sorted(self.store), [1, 2, 3, 4])
             self.assertEqual(len(self.store), len(sample_data))
             self.assertEqual(list(self.store[1]), [11, 12, 13])
             self.assertEqual(len(self.store[1]), len(sample_data[1]))
 
-        def test_items(self):
+        def test_items(self) -> None:
             self.assertEqual(sorted(p for p, _ in self.store.items()), sorted(self.store))
             self.assertEqual(sorted(p for p, _ in self.store[1].items()), sorted(self.store[1]))
             self.assertEqual(sorted(self.store.items())[0][0], 1)
@@ -80,7 +84,7 @@ def test_items(self):
             self.assertEqual(sorted(self.store[1].items())[0][0], 11)
             self.assertEqual(sorted(self.store[1].items())[0][1], self.store[1][11])
 
-        def test_find_item(self):
+        def test_find_item(self) -> None:
             self.assertEqual(sorted(self.store.find_item(set(), 99)), [])
             self.assertEqual(sorted(self.store.find_item({3}, 1)), [])
             self.assertEqual(sorted(self.store.find_item({5}, 99)), [])
@@ -89,129 +93,141 @@ def test_find_item(self):
             self.assertEqual(sorted(self.store.find_item({3, 4}, 99)),
                              [(3, 9, 99, 4, 0), (4, 9, 99, 3, 0)])
 
-        def test_get_for_player(self):
+        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}})
 
-        def get_checked(self):
+        def get_checked(self) -> None:
             self.assertEqual(self.store.get_checked(full_state, 0, 1), [11, 12, 13])
             self.assertEqual(self.store.get_checked(one_state, 0, 1), [12])
             self.assertEqual(self.store.get_checked(empty_state, 0, 1), [])
             self.assertEqual(self.store.get_checked(full_state, 0, 3), [9])
 
-        def get_missing(self):
+        def 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 get_remaining(self):
+        def get_remaining(self) -> None:
             self.assertEqual(self.store.get_remaining(full_state, 0, 1), [])
             self.assertEqual(self.store.get_remaining(one_state, 0, 1), [13, 21])
             self.assertEqual(self.store.get_remaining(empty_state, 0, 1), [13, 21, 22])
             self.assertEqual(self.store.get_remaining(empty_state, 0, 3), [99])
 
+    class TestLocationStoreConstructor(unittest.TestCase):
+        """Test constructors for a given store type."""
+        type: type
+
+        def test_hole(self) -> None:
+            with self.assertRaises(Exception):
+                self.type({
+                    1: {1: (1, 1, 1)},
+                    3: {1: (1, 1, 1)},
+                })
+
+        def test_no_slot1(self) -> None:
+            with self.assertRaises(Exception):
+                self.type({
+                    2: {1: (1, 1, 1)},
+                    3: {1: (1, 1, 1)},
+                })
+
+        def test_slot0(self) -> None:
+            with self.assertRaises(ValueError):
+                self.type({
+                    0: {1: (1, 1, 1)},
+                    1: {1: (1, 1, 1)},
+                })
+            with self.assertRaises(ValueError):
+                self.type({
+                    0: {1: (1, 1, 1)},
+                    2: {1: (1, 1, 1)},
+                })
+
+        def test_no_players(self) -> None:
+            with self.assertRaises(Exception):
+                _ = self.type({})
+
+        def test_no_locations(self) -> None:
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore")
+                store = self.type({
+                    1: {},
+                })
+                self.assertEqual(len(store), 1)
+                self.assertEqual(len(store[1]), 0)
+
+        def test_no_locations_for_1(self) -> None:
+            store = self.type({
+                1: {},
+                2: {1: (1, 2, 3)},
+            })
+            self.assertEqual(len(store), 2)
+            self.assertEqual(len(store[1]), 0)
+            self.assertEqual(len(store[2]), 1)
+
+        def test_no_locations_for_last(self) -> None:
+            store = self.type({
+                1: {1: (1, 2, 3)},
+                2: {},
+            })
+            self.assertEqual(len(store), 2)
+            self.assertEqual(len(store[1]), 1)
+            self.assertEqual(len(store[2]), 0)
+
 
 class TestPurePythonLocationStore(Base.TestLocationStore):
+    """Run base method tests for pure python implementation."""
     def setUp(self) -> None:
         self.store = _LocationStore(sample_data)
         super().setUp()
 
 
+class TestPurePythonLocationStoreConstructor(Base.TestLocationStoreConstructor):
+    """Run base constructor tests for the pure python implementation."""
+    def setUp(self) -> None:
+        self.type = _LocationStore
+        super().setUp()
+
+
 @unittest.skipIf(LocationStore is _LocationStore, "_speedups not available")
 class TestSpeedupsLocationStore(Base.TestLocationStore):
+    """Run base method tests for cython implementation."""
     def setUp(self) -> None:
         self.store = LocationStore(sample_data)
         super().setUp()
 
 
 @unittest.skipIf(LocationStore is _LocationStore, "_speedups not available")
-class TestSpeedupsLocationStoreConstructor(unittest.TestCase):
-    def test_float_key(self):
+class TestSpeedupsLocationStoreConstructor(Base.TestLocationStoreConstructor):
+    """Run base constructor tests and tests the additional constraints for cython implementation."""
+    def setUp(self) -> None:
+        self.type = LocationStore
+        super().setUp()
+
+    def test_float_key(self) -> None:
         with self.assertRaises(Exception):
-            LocationStore({
+            self.type({
                 1: {1: (1, 1, 1)},
                 1.1: {1: (1, 1, 1)},
                 3: {1: (1, 1, 1)}
             })
 
-    def test_string_key(self):
+    def test_string_key(self) -> None:
         with self.assertRaises(Exception):
-            LocationStore({
+            self.type({
                 "1": {1: (1, 1, 1)},
             })
 
-    def test_hole(self):
+    def test_high_player_number(self) -> None:
         with self.assertRaises(Exception):
-            LocationStore({
-                1: {1: (1, 1, 1)},
-                3: {1: (1, 1, 1)},
-            })
-
-    def test_no_slot1(self):
-        with self.assertRaises(Exception):
-            LocationStore({
-                2: {1: (1, 1, 1)},
-                3: {1: (1, 1, 1)},
-            })
-
-    def test_slot0(self):
-        with self.assertRaises(Exception):
-            LocationStore({
-                0: {1: (1, 1, 1)},
-                1: {1: (1, 1, 1)},
-            })
-        with self.assertRaises(Exception):
-            LocationStore({
-                0: {1: (1, 1, 1)},
-                2: {1: (1, 1, 1)},
-            })
-
-    def test_high_player_number(self):
-        with self.assertRaises(Exception):
-            LocationStore({
+            self.type({
                 1 << 32: {1: (1, 1, 1)},
             })
 
-    def test_no_players(self):
-        try:  # either is fine: raise during init, or behave like {}
-            store = LocationStore({})
-            self.assertEqual(len(store), 0)
-            with self.assertRaises(KeyError):
-                _ = store[1]
-        except ValueError:
-            pass
-
-    def test_no_locations(self):
-        try:  # either is fine: raise during init, or behave like {1: {}}
-            store = LocationStore({
-                1: {},
-            })
-            self.assertEqual(len(store), 1)
-            self.assertEqual(len(store[1]), 0)
-        except ValueError:
-            pass
-
-    def test_no_locations_for_1(self):
-        store = LocationStore({
-            1: {},
-            2: {1: (1, 2, 3)},
-        })
-        self.assertEqual(len(store), 2)
-        self.assertEqual(len(store[1]), 0)
-        self.assertEqual(len(store[2]), 1)
-
-    def test_no_locations_for_last(self):
-        store = LocationStore({
-            1: {1: (1, 2, 3)},
-            2: {},
-        })
-        self.assertEqual(len(store), 2)
-        self.assertEqual(len(store[1]), 1)
-        self.assertEqual(len(store[2]), 0)
-
-    def test_not_a_tuple(self):
+    def test_not_a_tuple(self) -> None:
         with self.assertRaises(Exception):
-            LocationStore({
+            self.type({
                 1: {1: None},
             })

From e920692ec3b76471088787ddcc0a67d5fc45b6bb Mon Sep 17 00:00:00 2001
From: Samuel Thayer <samonella7@gmail.com>
Date: Wed, 5 Jul 2023 13:21:32 -0500
Subject: [PATCH 02/24] DS3, Docs: Add downpatching instructions to Dark Souls
 III setup guide (#1874)

* add links to downpatching instructions

* renumber properly

* Update setup_en.md

* Update setup_en.md

* DS3, Docs: Avoid having to update the guide for steam updates

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 worlds/dark_souls_3/docs/setup_en.md | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/worlds/dark_souls_3/docs/setup_en.md b/worlds/dark_souls_3/docs/setup_en.md
index 8e1af8e92d90..d9dbb2e54729 100644
--- a/worlds/dark_souls_3/docs/setup_en.md
+++ b/worlds/dark_souls_3/docs/setup_en.md
@@ -11,27 +11,32 @@
 
 ## General Concept
 
+<span style="color:tomato">
+**This mod can ban you permanently from the FromSoftware servers if used online.** 
+</span>
 The Dark Souls III AP Client is a dinput8.dll triggered when launching Dark Souls III. This .dll file will launch a command 
 prompt where you can read information about your run and write any command to interact with the Archipelago server.
 
-## Installation Procedures
+This client has only been tested with the Official Steam version of the game at version 1.15. It does not matter which DLCs are installed. However, you will have to downpatch your Dark Souls III installation from current patch.
 
-<span style="color:tomato">
-**This mod can ban you permanently from the FromSoftware servers if used online.** 
-</span>  
-This client has only been tested with the Official Steam version of the game (v1.15/1.35) not matter which DLCs are installed.
+## Downpatching Dark Souls III
+
+Follow instructions from the [speedsouls wiki](https://wiki.speedsouls.com/darksouls3:Downpatching) to download version 1.15. Your download command, including the correct depot and manifest ids, will be "download_depot 374320 374321 4471176929659548333"
+
+## Installing the Archipelago mod
 
 Get the dinput8.dll from the [Dark Souls III AP Client](https://github.com/Marechal-L/Dark-Souls-III-Archipelago-client/releases) and 
 add it at the root folder of your game (e.g. "SteamLibrary\steamapps\common\DARK SOULS III\Game")
 
 ## Joining a MultiWorld Game
 
-1. Run DarkSoulsIII.exe or run the game through Steam
-2. Type in "/connect {SERVER_IP}:{SERVER_PORT} {SLOT_NAME}" in the "Windows Command Prompt" that opened
-3. Once connected, create a new game, choose a class and wait for the others before starting
-4. You can quit and launch at anytime during a game
+1. Run Steam in offline mode, both to avoid being banned and to prevent Steam from updating the game files
+2. Launch Dark Souls III
+3. Type in "/connect {SERVER_IP}:{SERVER_PORT} {SLOT_NAME}" in the "Windows Command Prompt" that opened
+4. Once connected, create a new game, choose a class and wait for the others before starting
+5. You can quit and launch at anytime during a game
 
 ## Where do I get a config file?
 
 The [Player Settings](/games/Dark%20Souls%20III/player-settings) page on the website allows you to
-configure your personal settings and export them into a config file
+configure your personal settings and export them into a config file.

From d8a89976844d5fe3b0c45b4938fab978a4e8471d Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Wed, 5 Jul 2023 21:51:38 +0200
Subject: [PATCH 03/24] Core: remove "names" from multidata (#1928)

---
 Main.py               |  1 -
 WebHostLib/tracker.py | 28 +++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Main.py b/Main.py
index 9804e6bd4582..63173601cb96 100644
--- a/Main.py
+++ b/Main.py
@@ -368,7 +368,6 @@ def precollect_hint(location):
                 multidata = {
                     "slot_data": slot_data,
                     "slot_info": slot_info,
-                    "names": names,  # TODO: remove after 0.3.9
                     "connect_names": {name: (0, player) for player, name in world.player_name.items()},
                     "locations": locations_data,
                     "checks_in_area": checks_in_area,
diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py
index decb3dd8ceb7..987a96d02da8 100644
--- a/WebHostLib/tracker.py
+++ b/WebHostLib/tracker.py
@@ -1,7 +1,7 @@
 import collections
 import datetime
 import typing
-from typing import Counter, Optional, Dict, Any, Tuple
+from typing import Counter, Optional, Dict, Any, Tuple, List
 from uuid import UUID
 
 from flask import render_template
@@ -9,7 +9,7 @@
 from werkzeug.exceptions import abort
 
 from MultiServer import Context, get_saving_second
-from NetUtils import SlotType
+from NetUtils import SlotType, NetworkSlot
 from Utils import restricted_loads
 from worlds import lookup_any_item_id_to_name, lookup_any_location_id_to_name, network_data_package
 from worlds.alttp import Items
@@ -264,16 +264,17 @@ def get_static_room_data(room: Room):
     multidata = Context.decompress(room.seed.multidata)
     # in > 100 players this can take a bit of time and is the main reason for the cache
     locations: Dict[int, Dict[int, Tuple[int, int, int]]] = multidata['locations']
-    names: Dict[int, Dict[int, str]] = multidata["names"]
-    games = {}
+    names: List[List[str]] = multidata.get("names", [])
+    games = multidata.get("games", {})
     groups = {}
     custom_locations = {}
     custom_items = {}
     if "slot_info" in multidata:
-        games = {slot: slot_info.game for slot, slot_info in multidata["slot_info"].items()}
-        groups = {slot: slot_info.group_members for slot, slot_info in multidata["slot_info"].items()
+        slot_info_dict: Dict[int, NetworkSlot] = multidata["slot_info"]
+        games = {slot: slot_info.game for slot, slot_info in slot_info_dict.items()}
+        groups = {slot: slot_info.group_members for slot, slot_info in slot_info_dict.items()
                   if slot_info.type == SlotType.group}
-
+        names = [[slot_info.name for slot, slot_info in sorted(slot_info_dict.items())]]
         for game in games.values():
             if game not in multidata["datapackage"]:
                 continue
@@ -290,8 +291,7 @@ def get_static_room_data(room: Room):
                 {id_: name for name, id_ in game_data["location_name_to_id"].items()})
             custom_items.update(
                 {id_: name for name, id_ in game_data["item_name_to_id"].items()})
-    elif "games" in multidata:
-        games = multidata["games"]
+
     seed_checks_in_area = checks_in_area.copy()
 
     use_door_tracker = False
@@ -341,7 +341,7 @@ def _get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, w
         precollected_items, games, slot_data, groups, saving_second, custom_locations, custom_items = \
         get_static_room_data(room)
     player_name = names[tracked_team][tracked_player - 1]
-    location_to_area = player_location_to_area[tracked_player]
+    location_to_area = player_location_to_area.get(tracked_player, {})
     inventory = collections.Counter()
     checks_done = {loc_name: 0 for loc_name in default_locations}
 
@@ -373,7 +373,9 @@ def _get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, w
                     if recipient in slots_aimed_at_player:  # a check done for the tracked player
                         attribute_item_solo(inventory, item)
                     if ms_player == tracked_player:  # a check done by the tracked player
-                        checks_done[location_to_area[location]] += 1
+                        area_name = location_to_area.get(location, None)
+                        if area_name:
+                            checks_done[area_name] += 1
                         checks_done["Total"] += 1
     specific_tracker = game_specific_trackers.get(games[tracked_player], None)
     if specific_tracker and not want_generic:
@@ -1508,8 +1510,8 @@ def attribute_item(team: int, recipient: int, item: int):
                 checks_done[team][player][player_location_to_area[player][location]] += 1
                 checks_done[team][player]["Total"] += 1
         percent_total_checks_done[team][player] = int(
-            checks_done[team][player]["Total"] / seed_checks_in_area[player]["Total"] * 100) if \
-        seed_checks_in_area[player]["Total"] else 100
+            checks_done[team][player]["Total"] / len(player_locations) * 100) if \
+        player_locations else 100
 
     for (team, player), game_state in multisave.get("client_game_state", {}).items():
         if player in groups:

From 827444f5a4e065bc310c889892580eb1f97c73cb Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:39:35 +0200
Subject: [PATCH 04/24] Core: Add settings API ("auto settings") for host.yaml
 (#1871)

* Add settings API ("auto settings") for host.yaml

* settings: no BOM when saving

* settings: fix saving / groups resetting themselves

* settings: fix AutoWorldRegister import

Co-authored-by: el-u <109771707+el-u@users.noreply.github.com>

* Lufia2: settings: clean up imports

* settings: more consistent class naming

* Docs: update world api for settings api refactor

* settings: fix access from World instance

* settings: update migration timeline

* Docs: Apply suggestions from code review

Co-authored-by: Zach Parks <zach@alliware.com>

* Settings: correctly resolve .exe in UserPath and LocalPath

---------

Co-authored-by: el-u <109771707+el-u@users.noreply.github.com>
Co-authored-by: Zach Parks <zach@alliware.com>
---
 .github/workflows/unittests.yml |   1 +
 .gitignore                      |   1 +
 Generate.py                     |  40 +-
 Launcher.py                     |  23 +-
 Main.py                         |   7 +-
 MinecraftClient.py              |   2 +-
 OoTClient.py                    |   2 -
 Utils.py                        | 208 +++------
 WebHost.py                      |   2 +
 docs/settings api.md            | 187 ++++++++
 docs/world api.md               |  24 +-
 host.yaml                       | 190 --------
 inno_setup.iss                  |   1 +
 settings.py                     | 772 ++++++++++++++++++++++++++++++++
 setup.py                        |  10 +-
 test/programs/TestGenerate.py   |  24 +-
 worlds/AutoWorld.py             |  26 ++
 worlds/adventure/__init__.py    |  40 +-
 worlds/alttp/__init__.py        |  26 +-
 worlds/dkc3/__init__.py         |  12 +
 worlds/factorio/__init__.py     |  26 ++
 worlds/ff1/__init__.py          |   9 +
 worlds/ladx/__init__.py         |  15 +
 worlds/lufia2ac/__init__.py     |  13 +
 worlds/minecraft/__init__.py    |  19 +
 worlds/mmbn3/__init__.py        |  13 +
 worlds/oot/__init__.py          |  25 ++
 worlds/pokemon_rb/__init__.py   |  33 +-
 worlds/sm/__init__.py           |  18 +-
 worlds/smw/__init__.py          |  12 +
 worlds/soe/__init__.py          |  13 +
 worlds/tloz/__init__.py         |  29 +-
 worlds/wargroove/__init__.py    |  16 +-
 worlds/zillion/__init__.py      |  26 +-
 34 files changed, 1454 insertions(+), 411 deletions(-)
 create mode 100644 docs/settings api.md
 delete mode 100644 host.yaml
 create mode 100644 settings.py

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index 4358c8032bdd..8ff0f8bb44e1 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -65,6 +65,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pytest pytest-subtests
         python ModuleUpdate.py --yes --force --append "WebHostLib/requirements.txt"
+        python Launcher.py --update_settings  # make sure host.yaml exists for tests
     - name: Unittests
       run: |
         pytest
diff --git a/.gitignore b/.gitignore
index 3e242d89af9f..8e4cc86657a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ README.html
 EnemizerCLI/
 /Players/
 /SNI/
+/host.yaml
 /options.yaml
 /config.yaml
 /logs/
diff --git a/Generate.py b/Generate.py
index bd265879fa31..bd1c4aa6fdea 100644
--- a/Generate.py
+++ b/Generate.py
@@ -14,44 +14,42 @@
 
 ModuleUpdate.update()
 
+import copy
 import Utils
+import Options
+from BaseClasses import seeddigits, get_seed, PlandoOptions
+from Main import main as ERmain
+from settings import get_settings
+from Utils import parse_yamls, version_tuple, __version__, tuplize_version, user_path
 from worlds.alttp import Options as LttPOptions
-from worlds.generic import PlandoConnection
-from Utils import parse_yamls, version_tuple, __version__, tuplize_version, get_options, user_path
 from worlds.alttp.EntranceRandomizer import parse_arguments
-from Main import main as ERmain
-from BaseClasses import seeddigits, get_seed, PlandoOptions
-import Options
 from worlds.alttp.Text import TextTable
 from worlds.AutoWorld import AutoWorldRegister
-import copy
+from worlds.generic import PlandoConnection
 
 
 def mystery_argparse():
-    options = get_options()
-    defaults = options["generator"]
-
-    def resolve_path(path: str, resolver: Callable[[str], str]) -> str:
-        return path if os.path.isabs(path) else resolver(path)
+    options = get_settings()
+    defaults = options.generator
 
     parser = argparse.ArgumentParser(description="CMD Generation Interface, defaults come from host.yaml.")
-    parser.add_argument('--weights_file_path', default=defaults["weights_file_path"],
+    parser.add_argument('--weights_file_path', default=defaults.weights_file_path,
                         help='Path to the weights file to use for rolling game settings, urls are also valid')
     parser.add_argument('--samesettings', help='Rolls settings per weights file rather than per player',
                         action='store_true')
-    parser.add_argument('--player_files_path', default=resolve_path(defaults["player_files_path"], user_path),
+    parser.add_argument('--player_files_path', default=defaults.player_files_path,
                         help="Input directory for player files.")
     parser.add_argument('--seed', help='Define seed number to generate.', type=int)
-    parser.add_argument('--multi', default=defaults["players"], type=lambda value: max(int(value), 1))
-    parser.add_argument('--spoiler', type=int, default=defaults["spoiler"])
-    parser.add_argument('--outputpath', default=resolve_path(options["general_options"]["output_path"], user_path),
+    parser.add_argument('--multi', default=defaults.players, type=lambda value: max(int(value), 1))
+    parser.add_argument('--spoiler', type=int, default=defaults.spoiler)
+    parser.add_argument('--outputpath', default=options.general_options.output_path,
                         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('--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('--yaml_output', default=0, type=lambda value: max(int(value), 0),
                         help='Output rolled mystery results to yaml up to specified number (made for async multiworld)')
-    parser.add_argument('--plando', default=defaults["plando_options"],
+    parser.add_argument('--plando', default=defaults.plando_options,
                         help='List of options that can be set manually. Can be combined, for example "bosses, items"')
     parser.add_argument("--skip_prog_balancing", action="store_true",
                         help="Skip progression balancing step during generation.")
@@ -71,6 +69,8 @@ def get_seed_name(random_source) -> str:
 def main(args=None, callback=ERmain):
     if not args:
         args, options = mystery_argparse()
+    else:
+        options = get_settings()
 
     seed = get_seed(args.seed)
     Utils.init_logging(f"Generate_{seed}", loglevel=args.log_level)
@@ -137,7 +137,7 @@ def main(args=None, callback=ERmain):
     erargs = parse_arguments(['--multi', str(args.multi)])
     erargs.seed = seed
     erargs.plando_options = args.plando
-    erargs.glitch_triforce = options["generator"]["glitch_triforce_room"]
+    erargs.glitch_triforce = options.generator.glitch_triforce_room
     erargs.spoiler = args.spoiler
     erargs.race = args.race
     erargs.outputname = seed_name
diff --git a/Launcher.py b/Launcher.py
index 84bdeeb72508..a1548d594ce8 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -22,6 +22,7 @@
 from typing import Sequence, Union, Optional
 
 import Utils
+import settings
 from worlds.LauncherComponents import Component, components, Type, SuffixIdentifier, icon_paths
 
 if __name__ == "__main__":
@@ -33,7 +34,8 @@
 
 
 def open_host_yaml():
-    file = user_path('host.yaml')
+    file = settings.get_settings().filename
+    assert file, "host.yaml missing"
     if is_linux:
         exe = which('sensible-editor') or which('gedit') or \
               which('xdg-open') or which('gnome-open') or which('kde-open')
@@ -84,6 +86,11 @@ def open_folder(folder_path):
         webbrowser.open(folder_path)
 
 
+def update_settings():
+    from settings import get_settings
+    get_settings().save()
+
+
 components.extend([
     # Functions
     Component("Open host.yaml", func=open_host_yaml),
@@ -256,11 +263,13 @@ def main(args: Optional[Union[argparse.Namespace, dict]] = None):
         if not component:
             logging.warning(f"Could not identify Component responsible for {args['Patch|Game|Component']}")
 
+    if args["update_settings"]:
+        update_settings()
     if 'file' in args:
         run_component(args["component"], args["file"], *args["args"])
     elif 'component' in args:
         run_component(args["component"], *args["args"])
-    else:
+    elif not args["update_settings"]:
         run_gui()
 
 
@@ -269,9 +278,13 @@ def main(args: Optional[Union[argparse.Namespace, dict]] = None):
     Utils.freeze_support()
     multiprocessing.set_start_method("spawn")  # if launched process uses kivy, fork won't work
     parser = argparse.ArgumentParser(description='Archipelago Launcher')
-    parser.add_argument('Patch|Game|Component', type=str, nargs='?',
-                        help="Pass either a patch file, a generated game or the name of a component to run.")
-    parser.add_argument('args', nargs="*", help="Arguments to pass to component.")
+    run_group = parser.add_argument_group("Run")
+    run_group.add_argument("--update_settings", action="store_true",
+                           help="Update host.yaml and exit.")
+    run_group.add_argument("Patch|Game|Component", type=str, nargs="?",
+                           help="Pass either a patch file, a generated game or the name of a component to run.")
+    run_group.add_argument("args", nargs="*",
+                           help="Arguments to pass to component.")
     main(parser.parse_args())
 
     from worlds.LauncherComponents import processes
diff --git a/Main.py b/Main.py
index 63173601cb96..6dfd61149b4f 100644
--- a/Main.py
+++ b/Main.py
@@ -13,7 +13,8 @@
 from BaseClasses import CollectionState, Item, Location, LocationProgressType, MultiWorld, Region
 from Fill import balance_multiworld_progression, distribute_items_restrictive, distribute_planned, flood_items
 from Options import StartInventoryPool
-from Utils import __version__, get_options, output_path, version_tuple
+from settings import get_settings
+from Utils import __version__, output_path, version_tuple
 from worlds import AutoWorld
 from worlds.generic.Rules import exclusion_rules, locality_rules
 
@@ -22,7 +23,7 @@
 
 def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = None):
     if not baked_server_options:
-        baked_server_options = get_options()["server_options"]
+        baked_server_options = get_settings().server_options
     if args.outputpath:
         os.makedirs(args.outputpath, exist_ok=True)
         output_path.cached_path = args.outputpath
@@ -371,7 +372,7 @@ def precollect_hint(location):
                     "connect_names": {name: (0, player) for player, name in world.player_name.items()},
                     "locations": locations_data,
                     "checks_in_area": checks_in_area,
-                    "server_options": baked_server_options,
+                    "server_options": baked_server_options.as_dict(),
                     "er_hint_data": er_hint_data,
                     "precollected_items": precollected_items,
                     "precollected_hints": precollected_hints,
diff --git a/MinecraftClient.py b/MinecraftClient.py
index dd7a5cfd3efb..93385ec5385e 100644
--- a/MinecraftClient.py
+++ b/MinecraftClient.py
@@ -299,7 +299,7 @@ def is_correct_forge(forge_dir) -> bool:
 
     versions = get_minecraft_versions(data_version, channel)
 
-    forge_dir = Utils.user_path(options["minecraft_options"]["forge_directory"])
+    forge_dir = options["minecraft_options"]["forge_directory"]
     max_heap = options["minecraft_options"]["max_heap_size"]
     forge_version = args.forge or versions["forge"]
     java_version = args.java or versions["java"]
diff --git a/OoTClient.py b/OoTClient.py
index fd93c09338ac..115490417334 100644
--- a/OoTClient.py
+++ b/OoTClient.py
@@ -296,8 +296,6 @@ async def patch_and_run_game(apz5_file):
     comp_path = base_name + '.z64'
     # Load vanilla ROM, patch file, compress ROM
     rom_file_name = Utils.get_options()["oot_options"]["rom_file"]
-    if not os.path.exists(rom_file_name):
-        rom_file_name = Utils.user_path(rom_file_name)
     rom = Rom(rom_file_name)
 
     sub_file = None
diff --git a/Utils.py b/Utils.py
index 1acd56514f86..f3e748d1cc09 100644
--- a/Utils.py
+++ b/Utils.py
@@ -13,8 +13,9 @@
 import collections
 import importlib
 import logging
-from typing import BinaryIO, Coroutine, Optional, Set, Dict, Any, Union
 
+from settings import Settings, get_settings
+from typing import BinaryIO, Coroutine, Optional, Set, Dict, Any, Union
 from yaml import load, load_all, dump, SafeLoader
 
 try:
@@ -138,13 +139,16 @@ def user_path(*path: str) -> str:
         user_path.cached_path = local_path()
     else:
         user_path.cached_path = home_path()
-        # populate home from local - TODO: upgrade feature
-        if user_path.cached_path != local_path() and not os.path.exists(user_path("host.yaml")):
-            import shutil
-            for dn in ("Players", "data/sprites"):
-                shutil.copytree(local_path(dn), user_path(dn), dirs_exist_ok=True)
-            for fn in ("manifest.json", "host.yaml"):
-                shutil.copy2(local_path(fn), user_path(fn))
+        # populate home from local
+        if user_path.cached_path != local_path():
+            import filecmp
+            if not os.path.exists(user_path("manifest.json")) or \
+                    not filecmp.cmp(local_path("manifest.json"), user_path("manifest.json"), shallow=True):
+                import shutil
+                for dn in ("Players", "data/sprites"):
+                    shutil.copytree(local_path(dn), user_path(dn), dirs_exist_ok=True)
+                for fn in ("manifest.json",):
+                    shutil.copy2(local_path(fn), user_path(fn))
 
     return os.path.join(user_path.cached_path, *path)
 
@@ -238,155 +242,15 @@ def get_public_ipv6() -> str:
     return ip
 
 
-OptionsType = typing.Dict[str, typing.Dict[str, typing.Any]]
+OptionsType = Settings  # TODO: remove ~2 versions after 0.4.1
 
 
 @cache_argsless
-def get_default_options() -> OptionsType:
-    # Refer to host.yaml for comments as to what all these options mean.
-    options = {
-        "general_options": {
-            "output_path": "output",
-        },
-        "factorio_options": {
-            "executable": os.path.join("factorio", "bin", "x64", "factorio"),
-            "filter_item_sends": False,
-            "bridge_chat_out": True,
-        },
-        "sni_options": {
-            "sni_path": "SNI",
-            "snes_rom_start": True,
-        },
-        "sm_options": {
-            "rom_file": "Super Metroid (JU).sfc",
-        },
-        "soe_options": {
-            "rom_file": "Secret of Evermore (USA).sfc",
-        },
-        "lttp_options": {
-            "rom_file": "Zelda no Densetsu - Kamigami no Triforce (Japan).sfc",
-        },
-        "ladx_options": {
-            "rom_file": "Legend of Zelda, The - Link's Awakening DX (USA, Europe) (SGB Enhanced).gbc",
-        },
-        "server_options": {
-            "host": None,
-            "port": 38281,
-            "password": None,
-            "multidata": None,
-            "savefile": None,
-            "disable_save": False,
-            "loglevel": "info",
-            "server_password": None,
-            "disable_item_cheat": False,
-            "location_check_points": 1,
-            "hint_cost": 10,
-            "release_mode": "goal",
-            "collect_mode": "disabled",
-            "remaining_mode": "goal",
-            "auto_shutdown": 0,
-            "compatibility": 2,
-            "log_network": 0
-        },
-        "generator": {
-            "enemizer_path": os.path.join("EnemizerCLI", "EnemizerCLI.Core"),
-            "player_files_path": "Players",
-            "players": 0,
-            "weights_file_path": "weights.yaml",
-            "meta_file_path": "meta.yaml",
-            "spoiler": 3,
-            "glitch_triforce_room": 1,
-            "race": 0,
-            "plando_options": "bosses",
-        },
-        "minecraft_options": {
-            "forge_directory": "Minecraft Forge server",
-            "max_heap_size": "2G",
-            "release_channel": "release"
-        },
-        "oot_options": {
-            "rom_file": "The Legend of Zelda - Ocarina of Time.z64",
-            "rom_start": True
-        },
-        "dkc3_options": {
-            "rom_file": "Donkey Kong Country 3 - Dixie Kong's Double Trouble! (USA) (En,Fr).sfc",
-        },
-        "smw_options": {
-            "rom_file": "Super Mario World (USA).sfc",
-        },
-        "zillion_options": {
-            "rom_file": "Zillion (UE) [!].sms",
-            # RetroArch doesn't make it easy to launch a game from the command line.
-            # You have to know the path to the emulator core library on the user's computer.
-            "rom_start": "retroarch",
-        },
-        "pokemon_rb_options": {
-            "red_rom_file": "Pokemon Red (UE) [S][!].gb",
-            "blue_rom_file": "Pokemon Blue (UE) [S][!].gb",
-            "rom_start": True
-        },
-        "ffr_options": {
-            "display_msgs": True,
-        },
-        "lufia2ac_options": {
-            "rom_file": "Lufia II - Rise of the Sinistrals (USA).sfc",
-        },
-        "tloz_options": {
-            "rom_file": "Legend of Zelda, The (U) (PRG0) [!].nes",
-            "rom_start": True,
-            "display_msgs": True,
-        },
-        "wargroove_options": {
-            "root_directory": "C:/Program Files (x86)/Steam/steamapps/common/Wargroove"
-        },
-        "mmbn3_options": {
-            "rom_file": "Mega Man Battle Network 3 - Blue Version (USA).gba",
-            "rom_start": True
-        },
-        "adventure_options": {
-            "rom_file": "ADVNTURE.BIN",
-            "display_msgs": True,
-            "rom_start": True,
-            "rom_args": ""
-        },
-    }
-    return options
-
-
-def update_options(src: dict, dest: dict, filename: str, keys: list) -> OptionsType:
-    for key, value in src.items():
-        new_keys = keys.copy()
-        new_keys.append(key)
-        option_name = '.'.join(new_keys)
-        if key not in dest:
-            dest[key] = value
-            if filename.endswith("options.yaml"):
-                logging.info(f"Warning: {filename} is missing {option_name}")
-        elif isinstance(value, dict):
-            if not isinstance(dest.get(key, None), dict):
-                if filename.endswith("options.yaml"):
-                    logging.info(f"Warning: {filename} has {option_name}, but it is not a dictionary. overwriting.")
-                dest[key] = value
-            else:
-                dest[key] = update_options(value, dest[key], filename, new_keys)
-    return dest
+def get_default_options() -> Settings:  # TODO: remove ~2 versions after 0.4.1
+    return Settings(None)
 
 
-@cache_argsless
-def get_options() -> OptionsType:
-    filenames = ("options.yaml", "host.yaml")
-    locations: typing.List[str] = []
-    if os.path.join(os.getcwd()) != local_path():
-        locations += filenames  # use files from cwd only if it's not the local_path
-    locations += [user_path(filename) for filename in filenames]
-
-    for location in locations:
-        if os.path.exists(location):
-            with open(location) as f:
-                options = parse_yaml(f.read())
-            return update_options(get_default_options(), options, location, list())
-
-    raise FileNotFoundError(f"Could not find {filenames[1]} to load options.")
+get_options = get_settings  # TODO: add a warning ~2 versions after 0.4.1 and remove once all games are ported
 
 
 def persistent_store(category: str, key: typing.Any, value: typing.Any):
@@ -677,7 +541,7 @@ def get_fuzzy_ratio(word1: str, word2: str) -> float:
     )
 
 
-def open_filename(title: str, filetypes: typing.Sequence[typing.Tuple[str, typing.Sequence[str]]]) \
+def open_filename(title: str, filetypes: typing.Sequence[typing.Tuple[str, typing.Sequence[str]]], suggest: str = "") \
         -> typing.Optional[str]:
     def run(*args: str):
         return subprocess.run(args, capture_output=True, text=True).stdout.split("\n", 1)[0] or None
@@ -688,11 +552,43 @@ def run(*args: str):
         kdialog = which("kdialog")
         if kdialog:
             k_filters = '|'.join((f'{text} (*{" *".join(ext)})' for (text, ext) in filetypes))
-            return run(kdialog, f"--title={title}", "--getopenfilename", ".", k_filters)
+            return run(kdialog, f"--title={title}", "--getopenfilename", suggest or ".", k_filters)
         zenity = which("zenity")
         if zenity:
             z_filters = (f'--file-filter={text} ({", ".join(ext)}) | *{" *".join(ext)}' for (text, ext) in filetypes)
-            return run(zenity, f"--title={title}", "--file-selection", *z_filters)
+            selection = (f'--filename="{suggest}',) if suggest else ()
+            return run(zenity, f"--title={title}", "--file-selection", *z_filters, *selection)
+
+    # fall back to tk
+    try:
+        import tkinter
+        import tkinter.filedialog
+    except Exception as e:
+        logging.error('Could not load tkinter, which is likely not installed. '
+                      f'This attempt was made because open_filename was used for "{title}".')
+        raise e
+    else:
+        root = tkinter.Tk()
+        root.withdraw()
+        return tkinter.filedialog.askopenfilename(title=title, filetypes=((t[0], ' '.join(t[1])) for t in filetypes),
+                                                  initialfile=suggest or None)
+
+
+def open_directory(title: str, suggest: str = "") -> typing.Optional[str]:
+    def run(*args: str):
+        return subprocess.run(args, capture_output=True, text=True).stdout.split("\n", 1)[0] or None
+
+    if is_linux:
+        # prefer native dialog
+        from shutil import which
+        kdialog = None#which("kdialog")
+        if kdialog:
+            return run(kdialog, f"--title={title}", "--getexistingdirectory", suggest or ".")
+        zenity = None#which("zenity")
+        if zenity:
+            z_filters = ("--directory",)
+            selection = (f'--filename="{suggest}',) if suggest else ()
+            return run(zenity, f"--title={title}", "--file-selection", *z_filters, *selection)
 
     # fall back to tk
     try:
@@ -705,7 +601,7 @@ def run(*args: str):
     else:
         root = tkinter.Tk()
         root.withdraw()
-        return tkinter.filedialog.askopenfilename(title=title, filetypes=((t[0], ' '.join(t[1])) for t in filetypes))
+        return tkinter.filedialog.askdirectory(title=title, mustexist=True, initialdir=suggest or None)
 
 
 def messagebox(title: str, text: str, error: bool = False) -> None:
diff --git a/WebHost.py b/WebHost.py
index 40d366a02f9e..eb859ec5852b 100644
--- a/WebHost.py
+++ b/WebHost.py
@@ -10,6 +10,7 @@
 
 # in case app gets imported by something like gunicorn
 import Utils
+import settings
 
 Utils.local_path.cached_path = os.path.dirname(__file__) or "."  # py3.8 is not abs. remove "." when dropping 3.8
 
@@ -21,6 +22,7 @@
 from WebHostLib.lttpsprites import update_sprites_lttp
 from WebHostLib.options import create as create_options_files
 
+settings.no_gui = True
 configpath = os.path.abspath("config.yaml")
 if not os.path.exists(configpath):  # fall back to config.yaml in home
     configpath = os.path.abspath(Utils.user_path('config.yaml'))
diff --git a/docs/settings api.md b/docs/settings api.md
new file mode 100644
index 000000000000..f9cbe5e021cc
--- /dev/null
+++ b/docs/settings api.md	
@@ -0,0 +1,187 @@
+# Archipelago Settings API
+
+The settings API describes how to use installation-wide config and let the user configure them, like paths, etc. using
+host.yaml. For the player settings / player yamls see [options api.md](options api.md).
+
+The settings API replaces `Utils.get_options()` and `Utils.get_default_options()`
+as well as the predefined `host.yaml` in the repository.
+
+For backwards compatibility with APWorlds, some interfaces are kept for now and will produce a warning when being used.
+
+
+## Config File
+
+Settings use options.yaml (manual override), if that exists, or host.yaml (the default) otherwise.
+The files are searched for in the current working directory, if different from install directory, and in `user_path`,
+which either points to the installation directory, if writable, or to %home%/Archipelago otherwise.
+
+**Examples:**
+* C:\Program Data\Archipelago\options.yaml
+* C:\Program Data\Archipelago\host.yaml
+* path\to\code\repository\host.yaml
+* ~/Archipelago/host.yaml
+
+Using the settings API, AP can update the config file or create a new one with default values and comments, 
+if it does not exist.
+
+
+## Global Settings
+
+All non-world-specific settings are defined directly in settings.py.
+Each value needs to have a default. If the default should be `None`, define it as `typing.Optional` and assign `None`.
+
+To access a "global" config value, with correct typing, use one of
+```python
+from settings import get_settings, GeneralOptions, FolderPath
+from typing import cast
+
+x = get_settings().general_options.output_path
+y = cast(GeneralOptions, get_settings()["general_options"]).output_path
+z = cast(FolderPath, get_settings()["general_options"]["output_path"])
+```
+
+
+## World Settings
+
+Worlds can define the top level key to use by defining `settings_key: ClassVar[str]` in their World class.
+It defaults to `{folder_name}_options` if undefined, i.e. `worlds/factorio/...` defaults to `factorio_options`.
+
+Worlds define the layout of their config section using type annotation of the variable `settings` in the class.
+The type has to inherit from `settings.Group`. Each value in the config can have a comment by subclassing a built-in
+type. Some helper types are defined in `settings.py`, see [Types](#Types) for a list.```
+
+Inside the class code, you can then simply use `self.settings.rom_file` to get the value.
+In case of paths they will automatically be read as absolute file paths. No need to use user_path or local_path.
+
+```python
+import settings
+from worlds.AutoWorld import World
+
+
+class MyGameSettings(settings.Group):
+    class RomFile(settings.SNESRomPath):
+        """Description that is put into host.yaml"""
+        description = "My Game US v1.0 ROM File"  # displayed in the file browser
+        copy_to = "MyGame.sfc"  # instead of storing the path, copy to AP dir
+        md5s = ["..."]
+
+    rom_file: RomFile = RomFile("MyGame.sfc")  # definition and default value
+
+
+class MyGameWorld(World):
+    ...
+    settings: MyGameSettings
+    ...
+
+    def something(self):
+        pass  # use self.settings.rom_file here
+```
+
+
+## Types
+
+When writing the host.yaml, the code will down cast the values to builtins.
+When reading the host.yaml, the code will upcast the values to what is defined in the type annotations.
+E.g. an IntEnum becomes int when saving and will construct the IntEnum when loading.
+
+Types that can not be down cast to / up cast from a builtin can not be used except for Group, which will be converted
+to/from a dict.
+`bool` is a special case, see settings.py: ServerOptions.disable_item_cheat for an example.
+
+Below are some predefined types that can be used if they match your requirements:
+
+
+### Group
+
+A section / dict in the config file. Behaves similar to a dataclass.
+Type annotation and default assignment define how loading, saving and default values behave.
+It can be accessed using attributes or as a dict: `group["a"]` is equivalent to `group.a`.
+
+In worlds, this should only be used for the top level to avoid issues when upgrading/migrating.
+
+
+### Bool
+
+Since `bool` can not be subclassed, use the `settings.Bool` helper in a `typing.Union` to get a comment in host.yaml.
+
+```python
+import settings
+import typing
+
+class MySettings(settings.Group):
+    class MyBool(settings.Bool):
+        """Doc string"""
+
+    my_value: typing.Union[MyBool, bool] = True
+```
+
+### UserFilePath
+
+Path to a single file. Automatically resolves as user_path:
+Source folder or AP install path on Windows. ~/Archipelago for the AppImage.
+Will open a file browser if the file is missing when in GUI mode.
+
+#### class method validate(cls, path: str)
+
+Override this and raise ValueError if validation fails.
+Checks the file against [md5s](#md5s) by default.
+
+#### is_exe: bool
+
+Resolves to an executable (varying file extension based on platform)
+
+#### description: Optional\[str\]
+
+Human-readable name to use in file browser
+
+#### copy_to: Optional\[str\]
+
+Instead of storing the path, copy the file.
+
+#### md5s: List[Union[str, bytes]]
+
+Provide md5 hashes as hex digests or raw bytes for automatic validation.
+
+
+### UserFolderPath
+
+Same as [UserFilePath](#UserFilePath), but for a folder instead of a file.
+
+
+### LocalFilePath
+
+Same as [UserFilePath](#UserFilePath), but resolves as local_path:
+path inside the AP dir or Appimage even if read-only.
+
+
+### LocalFolderPath
+
+Same as [LocalFilePath](#LocalFilePath), but for a folder instead of a file.
+
+
+### OptionalUserFilePath, OptionalUserFolderPath, OptionalLocalFilePath, OptionalLocalFolderPath
+
+Same as UserFilePath, UserFolderPath, LocalFilePath, LocalFolderPath but does not open a file browser if missing.
+
+
+### SNESRomPath
+
+Specialized [UserFilePath](#UserFilePath) that ignores an optional 512 byte header when validating.
+
+
+## Caveats
+
+### Circular Imports
+
+Because the settings are defined on import, code that runs on import can not use settings since that would result in
+circular / partial imports. Instead, the code should fetch from settings on demand during generation.
+
+"Global" settings are populated immediately, while worlds settings are lazy loaded, so if really necessary,
+"global" settings could be used in global scope of worlds.
+
+
+### APWorld Backwards Compatibility
+
+APWorlds that want to be compatible with both stable and dev versions, have two options:
+1. use the old Utils.get_options() API until Archipelago 0.4.2 is out
+2. add some sort of compatibility code to your world that mimics the new API
diff --git a/docs/world api.md b/docs/world api.md
index cc764ba3a6e0..b866549a85fd 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -91,10 +91,13 @@ added to the `World` object for easy access.
 
 ### World Options
 
-Any AP installation can provide settings for a world, for example a ROM file,
-accessible through `Utils.get_options()['<world>_options']['<option>']`.
+Any AP installation can provide settings for a world, for example a ROM file, accessible through `self.settings.option`
+or `cls.settings.option` (new API) or `Utils.get_options()["<world>_options"]["<option>"]` (deprecated).
 
-Users can set those in their `host.yaml` file.
+Users can set those in their `host.yaml` file. Some options may automatically open a file browser if a file is missing.
+
+Refer to [settings api.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/settings%20api.md)
+for details.
 
 ### Locations
 
@@ -349,6 +352,8 @@ class MyGameWorld(World):
 ```python
 # world/mygame/__init__.py
 
+import settings
+import typing
 from .Options import mygame_options  # the options we defined earlier
 from .Items import mygame_items  # data used below to add items to the World
 from .Locations import mygame_locations  # same as above
@@ -356,16 +361,27 @@ from worlds.AutoWorld import World
 from BaseClasses import Region, Location, Entrance, Item, RegionType, ItemClassification
 from Utils import get_options, output_path
 
+
 class MyGameItem(Item):  # or from Items import MyGameItem
     game = "My Game"  # name of the game/world this item is from
 
+
 class MyGameLocation(Location):  # or from Locations import MyGameLocation
     game = "My Game"  # name of the game/world this location is in
 
+
+class MyGameSettings(settings.Group):
+    class RomFile(settings.SNESRomPath):
+        """Insert help text for host.yaml here."""
+
+    rom_file: RomFile = RomFile("MyGame.sfc")
+
+
 class MyGameWorld(World):
     """Insert description of the world/game here."""
     game = "My Game"  # name of the game/world
     option_definitions = mygame_options  # options the player can set
+    settings: typing.ClassVar[MyGameSettings]  # will be automatically assigned from type hint
     topology_present = True  # show path to required location checks in spoiler
 
     # ID of first item and location, could be hard-coded but code may be easier
@@ -668,7 +684,7 @@ def generate_output(self, output_directory: str):
         "fix_xyz_glitch": self.multiworld.fix_xyz_glitch[self.player].value
     }
     # point to a ROM specified by the installation
-    src = Utils.get_options()["mygame_options"]["rom_file"]
+    src = self.settings.rom_file
     # or point to worlds/mygame/data/mod_template
     src = os.path.join(os.path.dirname(__file__), "data", "mod_template")
     # generate output path
diff --git a/host.yaml b/host.yaml
deleted file mode 100644
index c2647c44caae..000000000000
--- a/host.yaml
+++ /dev/null
@@ -1,190 +0,0 @@
-general_options:
-  # Where to place output files
-  output_path: "output"
-# Options for MultiServer
-# Null means nothing, for the server this means to default the value
-# These overwrite command line arguments!
-server_options:
-  host: null
-  port: 38281
-  password: null
-  multidata: null
-  savefile: null
-  disable_save: false
-  loglevel: "info"
-  # Allows for clients to log on and manage the server.  If this is null, no remote administration is possible.
-  server_password: null
-  # Disallow !getitem.
-  disable_item_cheat: false
-  # Client hint system
-  # Points given to a player for each acquired item in their world
-  location_check_points: 1
-  # Relative point cost to receive a hint via !hint for players
-  # so for example hint_cost: 20 would mean that for every 20% of available checks, you get the ability to hint, for a total of 5
-  hint_cost: 10 # Set to 0 if you want free hints
-  # Release modes
-  # A Release sends out the remaining items *from* a world that releases
-  # "disabled" -> clients can't release,
-  # "enabled" -> clients can always release
-  # "auto" -> automatic release on goal completion
-  # "auto-enabled" -> automatic release on goal completion and manual release is also enabled
-  # "goal" -> release is allowed after goal completion
-  release_mode: "goal"
-  # Collect modes
-  # A Collect sends the remaining items *to* a world that collects
-  # "disabled" -> clients can't collect,
-  # "enabled" -> clients can always collect
-  # "auto" -> automatic collect on goal completion
-  # "auto-enabled" -> automatic collect on goal completion and manual collect is also enabled
-  # "goal" -> collect is allowed after goal completion
-  collect_mode: "goal"
-  # Remaining modes
-  # !remaining handling, that tells a client which items remain in their pool
-  # "enabled" -> Client can always ask for remaining items
-  # "disabled" -> Client can never ask for remaining items
-  # "goal" -> Client can ask for remaining items after goal completion
-  remaining_mode: "goal"
-  # Automatically shut down the server after this many seconds without new location checks, 0 to keep running
-  auto_shutdown: 0
-  # Compatibility handling
-  # 2 -> Recommended for casual/cooperative play, attempt to be compatible with everything across all versions
-  # 1 -> No longer in use, kept reserved in case of future use
-  # 0 -> Recommended for tournaments to force a level playing field, only allow an exact version match
-  compatibility: 2
-  # log all server traffic, mostly for dev use
-  log_network: 0
-# Options for Generation
-generator:
-  # Location of your Enemizer CLI, available here: https://github.com/Ijwu/Enemizer/releases
-  enemizer_path: "EnemizerCLI/EnemizerCLI.Core" # + ".exe" is implied on Windows
-  # Folder from which the player yaml files are pulled from
-  player_files_path: "Players"
-  #amount of players, 0 to infer from player files
-  players: 0
-  # general weights file, within the stated player_files_path location
-  # gets used if players is higher than the amount of per-player files found to fill remaining slots
-  weights_file_path: "weights.yaml"
-  # Meta file name, within the stated player_files_path location
-  meta_file_path: "meta.yaml"
-  # Create a spoiler file
-  # 0 -> None
-  # 1 -> Spoiler without playthrough or paths to playthrough required items
-  # 2 -> Spoiler with playthrough (viable solution to goals)
-  # 3 -> Spoiler with playthrough and traversal paths towards items
-  spoiler: 3
-  # Glitch to Triforce room from Ganon
-  # When disabled, you have to have a weapon that can hurt ganon (master sword or swordless/easy item functionality + hammer)
-  # and have completed the goal required for killing ganon to be able to access the triforce room.
-  # 1 -> Enabled.
-  # 0 -> Disabled (except in no-logic)
-  glitch_triforce_room: 1
-  # Create encrypted race roms and flag games as race mode
-  race: 0
-  # List of options that can be plando'd. Can be combined, for example "bosses, items"
-  # Available options: bosses, items, texts, connections
-  plando_options: "bosses"
-sni_options:
-  # Set this to your SNI folder location if you want the MultiClient to attempt an auto start, does nothing if not found
-  sni_path: "SNI"
-  # Set this to false to never autostart a rom (such as after patching)
-  # True for operating system default program
-  # Alternatively, a path to a program to open the .sfc file with
-  snes_rom_start: true
-lttp_options:
-  # File name of the v1.0 J rom
-  rom_file: "Zelda no Densetsu - Kamigami no Triforce (Japan).sfc"
-ladx_options:
-  # File name of the Link's Awakening DX rom
-  rom_file: "Legend of Zelda, The - Link's Awakening DX (USA, Europe) (SGB Enhanced).gbc"
-
-lufia2ac_options:
-  # File name of the US rom
-  rom_file: "Lufia II - Rise of the Sinistrals (USA).sfc"
-sm_options:
-  # File name of the v1.0 J rom
-  rom_file: "Super Metroid (JU).sfc"
-factorio_options:
-  executable: "factorio/bin/x64/factorio"
-  # by default, no settings are loaded if this file does not exist.  If this file does exist, then it will be used.
-  # server_settings: "factorio\\data\\server-settings.json"
-  # Whether to filter item send messages displayed in-game to only those that involve you.
-  filter_item_sends: false
-  # Whether to send chat messages from players on the Factorio server to Archipelago.
-  bridge_chat_out: true
-minecraft_options:
-  forge_directory: "Minecraft Forge server"
-  max_heap_size: "2G"
-  # release channel, currently "release", or "beta"
-  # any games played on the "beta" channel have a high likelihood of no longer working on the "release" channel.
-  release_channel: "release"
-oot_options:
-  # File name of the OoT v1.0 ROM
-  rom_file: "The Legend of Zelda - Ocarina of Time.z64"
-  # Set this to false to never autostart a rom (such as after patching)
-  #             true  for operating system default program
-  # Alternatively, a path to a program to open the .z64 file with
-  rom_start: true
-soe_options:
-  # File name of the SoE US ROM
-  rom_file: "Secret of Evermore (USA).sfc"
-ffr_options:
-  display_msgs: true
-tloz_options:
-  # File name of the Zelda 1
-  rom_file: "Legend of Zelda, The (U) (PRG0) [!].nes"
-  # Set this to false to never autostart a rom (such as after patching)
-  #             true  for operating system default program
-  # Alternatively, a path to a program to open the .nes file with
-  rom_start: true
-  # Display message inside of EmuHawk
-  display_msgs: true
-dkc3_options:
-  # File name of the DKC3 US rom
-  rom_file: "Donkey Kong Country 3 - Dixie Kong's Double Trouble! (USA) (En,Fr).sfc"
-smw_options:
-  # File name of the SMW US rom
-  rom_file: "Super Mario World (USA).sfc"
-pokemon_rb_options:
-  # File names of the Pokemon Red and Blue roms
-  red_rom_file: "Pokemon Red (UE) [S][!].gb"
-  blue_rom_file: "Pokemon Blue (UE) [S][!].gb"
-  # Set this to false to never autostart a rom (such as after patching)
-  # True for operating system default program
-  # Alternatively, a path to a program to open the .gb file with
-  rom_start: true
-
-wargroove_options:
-  # Locate the Wargroove root directory on your system.
-  # This is used by the Wargroove client, so it knows where to send communication files to
-  root_directory: "C:/Program Files (x86)/Steam/steamapps/common/Wargroove"
-
-zillion_options:
-  # File name of the Zillion US rom
-  rom_file: "Zillion (UE) [!].sms"
-  # Set this to false to never autostart a rom (such as after patching)
-  # True for operating system default program
-  # Alternatively, a path to a program to open the .sfc file with
-  # RetroArch doesn't make it easy to launch a game from the command line.
-  # You have to know the path to the emulator core library on the user's computer.
-  rom_start: "retroarch"
-mmbn3_options:
-  # File name of the MMBN3 Blue US rom
-  rom_file: "Mega Man Battle Network 3 - Blue Version (USA).gba"
-  rom_start: true
-adventure_options:
-  # File name of the standard NTSC Adventure rom.
-  # The licensed "The 80 Classic Games" CD-ROM contains this.
-  # It may also have a .a26 extension
-  rom_file: "ADVNTURE.BIN"
-  # Set this to false to never autostart a rom (such as after patching)
-  # True for operating system default program for '.a26'
-  # Alternatively, a path to a program to open the .a26 file with (generally EmuHawk for multiworld)
-  rom_start: true
-  # Optional, additional args passed into rom_start before the .bin file
-  # For example, this can be used to autoload the connector script in EmuHawk
-  # (see EmuHawk --lua= option)
-  # Windows example:
-  # rom_args: "--lua=C:/ProgramData/Archipelago/data/lua/connector_adventure.lua"
-  rom_args: " "
-  # Set this to true to display item received messages in Emuhawk
-  display_msgs: true
diff --git a/inno_setup.iss b/inno_setup.iss
index 5e289187ffd2..7087b58cca0c 100644
--- a/inno_setup.iss
+++ b/inno_setup.iss
@@ -182,6 +182,7 @@ Name: "{commondesktop}\{#MyAppName} Undertale Client"; Filename: "{app}\Archipel
 Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/passive /norestart"; Check: IsVCRedist64BitNeeded; StatusMsg: "Installing VC++ redistributable..."
 Filename: "{app}\ArchipelagoLttPAdjuster"; Parameters: "--update_sprites"; StatusMsg: "Updating Sprite Library..."; Components: client/sni/lttp or generator/lttp
 Filename: "{app}\ArchipelagoMinecraftClient.exe"; Parameters: "--install"; StatusMsg: "Installing Forge Server..."; Components: client/minecraft
+Filename: "{app}\ArchipelagoLauncher"; Parameters: "--update_settings"; StatusMsg: "Updating host.yaml..."; Flags: runasoriginaluser runhidden
 
 [UninstallDelete]
 Type: dirifempty; Name: "{app}"
diff --git a/settings.py b/settings.py
new file mode 100644
index 000000000000..ede2d95da490
--- /dev/null
+++ b/settings.py
@@ -0,0 +1,772 @@
+"""
+Application settings / host.yaml interface using type hints.
+This is different from player settings.
+"""
+
+import os.path
+import shutil
+import sys
+import typing
+import warnings
+from enum import IntEnum
+from threading import Lock
+from typing import cast, Any, BinaryIO, ClassVar, Dict, Iterator, List, Optional, TextIO, Tuple, Union, TypeVar
+import os
+
+__all__ = [
+    "get_settings", "fmt_doc", "no_gui",
+    "Group", "Bool", "Path", "UserFilePath", "UserFolderPath", "LocalFilePath", "LocalFolderPath",
+    "OptionalUserFilePath", "OptionalUserFolderPath", "OptionalLocalFilePath", "OptionalLocalFolderPath",
+    "GeneralOptions", "ServerOptions", "GeneratorOptions", "SNIOptions", "Settings"
+]
+
+no_gui = False
+_world_settings_name_cache: Dict[str, str] = {}  # TODO: cache on disk and update when worlds change
+_world_settings_name_cache_updated = False
+_lock = Lock()
+
+
+def _update_cache() -> None:
+    """Load all worlds and update world_settings_name_cache"""
+    global _world_settings_name_cache_updated
+    if _world_settings_name_cache_updated:
+        return
+
+    try:
+        from worlds.AutoWorld import AutoWorldRegister
+        for world in AutoWorldRegister.world_types.values():
+            annotation = world.__annotations__.get("settings", None)
+            if annotation is None or annotation == "ClassVar[Optional['Group']]":
+                continue
+            _world_settings_name_cache[world.settings_key] = f"{world.__module__}.{world.__name__}"
+    finally:
+        _world_settings_name_cache_updated = True
+
+
+def fmt_doc(cls: type, level: int) -> str:
+    comment = cls.__doc__
+    assert comment, f"{cls} has no __doc__"
+    indent = level * 2 * " "
+    return "\n".join(map(lambda s: f"{indent}# {s}", filter(None, map(lambda s: s.strip(), comment.split("\n")))))
+
+
+class Group:
+    _type_cache: ClassVar[Optional[Dict[str, Any]]] = None
+    _dumping: bool = False
+    _has_attr: bool = False
+    _changed: bool = False
+
+    def __getitem__(self, key: str) -> Any:
+        try:
+            return getattr(self, key)
+        except NameError:
+            raise KeyError(key)
+
+    def __iter__(self) -> Iterator[str]:
+        cls_members = dir(self.__class__)
+        members = filter(lambda k: not k.startswith("_") and (k not in cls_members or k in self.__annotations__),
+                         list(self.__annotations__) +
+                         [name for name in dir(self) if name not in self.__annotations__])
+        return members.__iter__()
+
+    def __contains__(self, key: str) -> bool:
+        try:
+            self._has_attr = True
+            return hasattr(self, key)
+        finally:
+            self._has_attr = False
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        setattr(self, key, value)
+
+    def __getattribute__(self, item: str) -> Any:
+        attr = super().__getattribute__(item)
+        if isinstance(attr, Path) and not super().__getattribute__("_dumping"):
+            if attr.required and not attr.exists() and not super().__getattribute__("_has_attr"):
+                # if a file is required, and the one from settings does not exist, ask the user to provide it
+                # unless we are dumping the settings, because that would ask for each entry
+                with _lock:  # lock to avoid opening multiple
+                    new = None if no_gui else attr.browse()
+                    if new is None:
+                        raise FileNotFoundError(f"{attr} does not exist, but "
+                                                f"{self.__class__.__name__}.{item} is required")
+                    setattr(self, item, new)
+                    self._changed = True
+                    attr = new
+            # resolve the path immediately when accessing it
+            return attr.__class__(attr.resolve())
+        return attr
+
+    @property
+    def changed(self) -> bool:
+        return self._changed or any(map(lambda v: isinstance(v, Group) and v.changed,
+                                        self.__dict__.values()))
+
+    @classmethod
+    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):
+                # non-str: assume already resolved
+                cls._type_cache = cls.__annotations__
+            else:
+                # str: build dicts and resolve with eval
+                mod = sys.modules[cls.__module__]  # assume the module wasn't deleted
+                mod_dict = {k: getattr(mod, k) for k in dir(mod)}
+                cls._type_cache = typing.get_type_hints(cls, globalns=mod_dict, localns=cls.__dict__)
+        return cls._type_cache
+
+    def get(self, key: str, default: Any) -> Any:
+        if key in self:
+            return self[key]
+        return default
+
+    def items(self) -> List[Tuple[str, Any]]:
+        return [(key, getattr(self, key)) for key in self]
+
+    def update(self, dct: Dict[str, Any]) -> None:
+        assert isinstance(dct, dict), f"{self.__class__.__name__}.update called with " \
+                                      f"{dct.__class__.__name__} instead of dict."
+
+        for k in self.__annotations__:
+            if not k.startswith("_") and k not in dct:
+                self._changed = True  # key missing from host.yaml
+
+        for k, v in dct.items():
+            # don't do getattr to stay lazy with world group init/loading
+            # instead we assign unknown groups as dicts and a later getattr will upcast them
+            attr = self.__dict__[k] if k in self.__dict__ else \
+                self.__class__.__dict__[k] if k in self.__class__.__dict__ else None
+            if isinstance(attr, Group):
+                # update group
+                if k not in self.__dict__:
+                    attr = attr.__class__()  # make a copy of default
+                    setattr(self, k, attr)
+                attr.update(v)
+            elif isinstance(attr, dict):
+                # update dict
+                if k not in self.__dict__:
+                    attr = attr.copy()  # make a copy of default
+                    setattr(self, k, attr)
+                attr.update(v)
+            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]
+                none_type = type(None)
+                for cls in candidates:
+                    assert isinstance(cls, type), f"{self.__class__.__name__}.{k}: type {cls} not supported in settings"
+                    if v is None and cls is none_type:
+                        # assign None, i.e. from Optional
+                        setattr(self, k, v)
+                        break
+                    if cls is bool and isinstance(v, bool):
+                        # assign bool - special handling because issubclass(int, bool) is True
+                        setattr(self, k, v)
+                        break
+                    if cls is not bool and issubclass(cls, type(v)):
+                        # upcast, i.e. int -> IntEnum, str -> Path
+                        setattr(self, k, cls.__call__(v))
+                        break
+                else:
+                    # assign scalar and hope for the best
+                    setattr(self, k, v)
+                    if annotation:
+                        warnings.warn(f"{self.__class__.__name__}.{k} "
+                                      f"assigned from incompatible type {type(v).__name__}")
+
+    def as_dict(self, *args: str, downcast: bool = True) -> Dict[str, Any]:
+        return {
+            name: _to_builtin(cast(object, getattr(self, name))) if downcast else getattr(self, name)
+            for name in self if not args or name in args
+        }
+
+    def dump(self, f: TextIO, level: int = 0) -> None:
+        from Utils import dump, Dumper as BaseDumper
+        from yaml import ScalarNode, MappingNode
+
+        class Dumper(BaseDumper):
+            def represent_mapping(self, tag: str, mapping: Any, flow_style: Any = None) -> MappingNode:
+                res: MappingNode = super().represent_mapping(tag, mapping, flow_style)
+                pairs = cast(List[Tuple[ScalarNode, Any]], res.value)
+                for k, v in pairs:
+                    k.style = None  # remove quotes from keys
+                return res
+
+            def represent_str(self, data: str) -> ScalarNode:
+                # default double quote all strings
+                return self.represent_scalar("tag:yaml.org,2002:str", data, style='"')
+
+        Dumper.add_representer(str, Dumper.represent_str)
+
+        self._dumping = True
+        try:
+            # fetch class to avoid going through getattr
+            cls = self.__class__
+            type_hints = cls.get_type_hints()
+            # 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:
+                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
+                    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":
+                    f.write(fmt_doc(attr_cls, level=level) + "\n")
+                indent = '  ' * level
+                if isinstance(attr, Group):
+                    f.write(f"{indent}{name}:\n")
+                    attr.dump(f, level=level+1)
+                elif isinstance(attr, (dict, list, tuple, set)):
+                    # TODO: special handling for dicts and iterables
+                    raise NotImplementedError()
+                else:
+                    yaml_line = dump({name: _to_builtin(attr)}, Dumper=Dumper)
+                    f.write(f"{indent}{yaml_line}")
+            self._changed = False
+        finally:
+            self._dumping = False
+
+
+class Bool:
+    # can't subclass bool, so we use this and Union or type: ignore
+    def __bool__(self) -> bool:
+        raise NotImplementedError()
+
+
+# Types for generic settings
+T = TypeVar("T", bound="Path")
+
+
+def _resolve_exe(s: str) -> str:
+    """Append exe file extension if the file is an executable"""
+    if isinstance(s, Path):
+        from Utils import is_windows
+        if s.is_exe and is_windows and not s.lower().endswith(".exe"):
+            return str(s + ".exe")
+    return str(s)
+
+
+def _to_builtin(o: object) -> Any:
+    """Downcast object to a builtin type for output"""
+    if o is None:
+        return None
+    c = o.__class__
+    while c.__module__ != "builtins":
+        c = c.__base__
+    return c.__call__(o)
+
+
+class Path(str):
+    # paths in host.yaml are str
+    required: bool = True
+    """Marks the file as required and opens a file browser when missing"""
+    is_exe: bool = False
+    """Special cross-platform handling for executables"""
+    description: Optional[str] = None
+    """Title to display when browsing for the file"""
+    copy_to: Optional[str] = None
+    """If not None, copy to AP folder instead of linking it"""
+
+    @classmethod
+    def validate(cls, path: str) -> None:
+        """Overload and raise to validate input files from browse"""
+        pass
+
+    def browse(self: T, **kwargs: Any) -> Optional[T]:
+        """Opens a file browser to search for the file"""
+        raise NotImplementedError(f"Please use a subclass of Path for {self.__class__.__name__}")
+
+    def resolve(self) -> str:
+        return _resolve_exe(self)
+
+    def exists(self) -> bool:
+        return os.path.exists(self.resolve())
+
+
+class _UserPath(str):
+    def resolve(self) -> str:
+        if os.path.isabs(self):
+            return str(self)
+        from Utils import user_path
+        return user_path(_resolve_exe(self))
+
+
+class _LocalPath(str):
+    def resolve(self) -> str:
+        if os.path.isabs(self):
+            return str(self)
+        from Utils import local_path
+        return local_path(_resolve_exe(self))
+
+
+class FilePath(Path):
+    # path to a file
+
+    md5s: ClassVar[List[Union[str, bytes]]] = []
+    """MD5 hashes for default validator."""
+
+    def browse(self: T,
+               filetypes: Optional[typing.Sequence[typing.Tuple[str, typing.Sequence[str]]]] = None, **kwargs: Any)\
+            -> Optional[T]:
+        from Utils import open_filename, is_windows
+        if not filetypes:
+            if self.is_exe:
+                name, ext = "Program", ".exe" if is_windows else ""
+            else:
+                ext = os.path.splitext(self)[1]
+                name = ext[1:] if ext else "File"
+            filetypes = [(name, [ext])]
+        res = open_filename(f"Select {self.description or self.__class__.__name__}", filetypes, self)
+        if res:
+            self.validate(res)
+            if self.copy_to:
+                # instead of linking the file, copy it
+                dst = self.__class__(self.copy_to).resolve()
+                shutil.copy(res, dst, follow_symlinks=True)
+                res = dst
+            try:
+                rel = os.path.relpath(res, self.__class__("").resolve())
+                if not rel.startswith(".."):
+                    res = rel
+            except ValueError:
+                pass
+            return self.__class__(res)
+        return None
+
+    @classmethod
+    def _validate_stream_hashes(cls, f: BinaryIO) -> None:
+        """Helper to efficiently validate stream against hashes"""
+        if not cls.md5s:
+            return  # no hashes to validate against
+
+        pos = f.tell()
+        try:
+            from hashlib import md5
+            file_md5 = md5()
+            block = bytearray(64*1024)
+            view = memoryview(block)
+            while n := f.readinto(view):  # type: ignore
+                file_md5.update(view[:n])
+            file_md5_hex = file_md5.hexdigest()
+            for valid_md5 in cls.md5s:
+                if isinstance(valid_md5, str):
+                    if valid_md5.lower() == file_md5_hex:
+                        break
+                elif valid_md5 == file_md5.digest():
+                    break
+            else:
+                raise ValueError(f"Hashes do not match for {cls.__name__}")
+        finally:
+            f.seek(pos)
+
+    @classmethod
+    def validate(cls, path: str) -> None:
+        """Try to open and validate file against hashes"""
+        with open(path, "rb", buffering=0) as f:
+            try:
+                cls._validate_stream_hashes(f)
+            except ValueError:
+                raise ValueError(f"File hash does not match for {path}")
+
+
+class FolderPath(Path):
+    # path to a folder
+
+    def browse(self: T, **kwargs: Any) -> Optional[T]:
+        from Utils import open_directory
+        res = open_directory(f"Select {self.description or self.__class__.__name__}", self)
+        if res:
+            try:
+                rel = os.path.relpath(res, self.__class__("").resolve())
+                if not rel.startswith(".."):
+                    res = rel
+            except ValueError:
+                pass
+            return self.__class__(res)
+        return None
+
+
+class UserFilePath(_UserPath, FilePath):
+    pass
+
+
+class UserFolderPath(_UserPath, FolderPath):
+    pass
+
+
+class OptionalUserFilePath(UserFilePath):
+    required = False
+
+
+class OptionalUserFolderPath(UserFolderPath):
+    required = False
+
+
+class LocalFilePath(_LocalPath, FilePath):
+    pass
+
+
+class LocalFolderPath(_LocalPath, FolderPath):
+    pass
+
+
+class OptionalLocalFilePath(LocalFilePath):
+    required = False
+
+
+class OptionalLocalFolderPath(LocalFolderPath):
+    required = False
+
+
+class SNESRomPath(UserFilePath):
+    # Special UserFilePath that ignores an optional header when validating
+
+    @classmethod
+    def validate(cls, path: str) -> None:
+        """Try to open and validate file against hashes"""
+        with open(path, "rb", buffering=0) as f:
+            f.seek(0, os.SEEK_END)
+            size = f.tell()
+            if size % 1024 == 512:
+                f.seek(512)  # skip header
+            elif size % 1024 == 0:
+                f.seek(0)  # header-less
+            else:
+                raise ValueError(f"Unexpected file size for {path}")
+
+            try:
+                cls._validate_stream_hashes(f)
+            except ValueError:
+                raise ValueError(f"File hash does not match for {path}")
+
+
+# World-independent setting groups
+
+class GeneralOptions(Group):
+    class OutputPath(OptionalUserFolderPath):
+        """
+        Where to place output files
+        """
+        # created on demand, so marked as optional
+
+    output_path: OutputPath = OutputPath("output")
+
+
+class ServerOptions(Group):
+    """
+    Options for MultiServer
+    Null means nothing, for the server this means to default the value
+    These overwrite command line arguments!
+    """
+
+    class ServerPassword(str):
+        """
+        Allows for clients to log on and manage the server.  If this is null, no remote administration is possible.
+        """
+
+    class DisableItemCheat(Bool):
+        """Disallow !getitem"""
+
+    class LocationCheckPoints(int):
+        """
+        Client hint system
+        Points given to a player for each acquired item in their world
+        """
+
+    class HintCost(int):
+        """
+        Relative point cost to receive a hint via !hint for players
+        so for example hint_cost: 20 would mean that for every 20% of available checks, you get the ability to hint,
+        for a total of 5
+        """
+
+    class ReleaseMode(str):
+        """
+        Release modes
+        A Release sends out the remaining items *from* a world that releases
+        "disabled" -> clients can't release,
+        "enabled" -> clients can always release
+        "auto" -> automatic release on goal completion
+        "auto-enabled" -> automatic release on goal completion and manual release is also enabled
+        "goal" -> release is allowed after goal completion
+        """
+
+    class CollectMode(str):
+        """
+        Collect modes
+        A Collect sends the remaining items *to* a world that collects
+        "disabled" -> clients can't collect,
+        "enabled" -> clients can always collect
+        "auto" -> automatic collect on goal completion
+        "auto-enabled" -> automatic collect on goal completion and manual collect is also enabled
+        "goal" -> collect is allowed after goal completion
+        """
+
+    class RemainingMode(str):
+        """
+        Remaining modes
+        !remaining handling, that tells a client which items remain in their pool
+        "enabled" -> Client can always ask for remaining items
+        "disabled" -> Client can never ask for remaining items
+        "goal" -> Client can ask for remaining items after goal completion
+        """
+
+    class AutoShutdown(int):
+        """Automatically shut down the server after this many seconds without new location checks, 0 to keep running"""
+
+    class Compatibility(IntEnum):
+        """
+        Compatibility handling
+        2 -> Recommended for casual/cooperative play, attempt to be compatible with everything across all versions
+        1 -> No longer in use, kept reserved in case of future use
+        0 -> Recommended for tournaments to force a level playing field, only allow an exact version match
+        """
+        OFF = 0
+        ON = 1
+        FULL = 2
+
+    class LogNetwork(IntEnum):
+        """log all server traffic, mostly for dev use"""
+        OFF = 0
+        ON = 1
+
+    host: Optional[str] = None
+    port: int = 38281
+    password: Optional[str] = None
+    multidata: Optional[str] = None
+    savefile: Optional[str] = None
+    disable_save: bool = False
+    loglevel: str = "info"
+    server_password: Optional[ServerPassword] = None
+    disable_item_cheat: Union[DisableItemCheat, bool] = False
+    location_check_points: LocationCheckPoints = LocationCheckPoints(1)
+    hint_cost: HintCost = HintCost(10)
+    release_mode: ReleaseMode = ReleaseMode("goal")
+    collect_mode: CollectMode = CollectMode("goal")
+    remaining_mode: RemainingMode = RemainingMode("goal")
+    auto_shutdown: AutoShutdown = AutoShutdown(0)
+    compatibility: Compatibility = Compatibility(2)
+    log_network: LogNetwork = LogNetwork(0)
+
+
+class GeneratorOptions(Group):
+    """Options for Generation"""
+
+    class EnemizerPath(LocalFilePath):
+        """Location of your Enemizer CLI, available here: https://github.com/Ijwu/Enemizer/releases"""
+        is_exe = True
+
+    class PlayerFilesPath(OptionalUserFolderPath):
+        """Folder from which the player yaml files are pulled from"""
+        # created on demand, so marked as optional
+
+    class Players(int):
+        """amount of players, 0 to infer from player files"""
+
+    class WeightsFilePath(str):
+        """
+        general weights file, within the stated player_files_path location
+        gets used if players is higher than the amount of per-player files found to fill remaining slots
+        """
+        # this is special because the path is relative to player_files_path
+
+    class MetaFilePath(str):
+        """Meta file name, within the stated player_files_path location"""
+        # this is special because the path is relative to player_files_path
+
+    class Spoiler(IntEnum):
+        """
+        Create a spoiler file
+        0 -> None
+        1 -> Spoiler without playthrough or paths to playthrough required items
+        2 -> Spoiler with playthrough (viable solution to goals)
+        3 -> Spoiler with playthrough and traversal paths towards items
+        """
+        NONE = 0
+        BASIC = 1
+        PLAYTHROUGH = 2
+        FULL = 3
+
+    class GlitchTriforceRoom(IntEnum):
+        """
+        Glitch to Triforce room from Ganon
+        When disabled, you have to have a weapon that can hurt ganon (master sword or swordless/easy item functionality
+        + hammer) and have completed the goal required for killing ganon to be able to access the triforce room.
+        1 -> Enabled.
+        0 -> Disabled (except in no-logic)
+        """
+        OFF = 0
+        ON = 1
+
+    class PlandoOptions(str):
+        """
+        List of options that can be plando'd. Can be combined, for example "bosses, items"
+        Available options: bosses, items, texts, connections
+        """
+
+    class Race(IntEnum):
+        """Create encrypted race roms and flag games as race mode"""
+        OFF = 0
+        ON = 1
+
+    enemizer_path: EnemizerPath = EnemizerPath("EnemizerCLI/EnemizerCLI.Core")  # + ".exe" is implied on Windows
+    player_files_path: PlayerFilesPath = PlayerFilesPath("Players")
+    players: Players = Players(0)
+    weights_file_path: WeightsFilePath = WeightsFilePath("weights.yaml")
+    meta_file_path: MetaFilePath = MetaFilePath("meta.yaml")
+    spoiler: Spoiler = Spoiler(3)
+    glitch_triforce_room: GlitchTriforceRoom = GlitchTriforceRoom(1)  # why is this here?
+    race: Race = Race(0)
+    plando_options: PlandoOptions = PlandoOptions("bosses")
+
+
+class SNIOptions(Group):
+    class SNIPath(LocalFolderPath):
+        """
+        Set this to your SNI folder location if you want the MultiClient to attempt an auto start, \
+does nothing if not found
+        """
+
+    class SnesRomStart(str):
+        """
+        Set this to false to never autostart a rom (such as after patching)
+        True for operating system default program
+        Alternatively, a path to a program to open the .sfc file with
+        """
+
+    sni_path: SNIPath = SNIPath("SNI")
+    snes_rom_start: Union[SnesRomStart, bool] = True
+
+
+# Top-level group with lazy loading of worlds
+
+class Settings(Group):
+    general_options: GeneralOptions = GeneralOptions()
+    server_options: ServerOptions = ServerOptions()
+    generator: GeneratorOptions = GeneratorOptions()
+    sni_options: SNIOptions = SNIOptions()
+
+    _filename: Optional[str] = None
+
+    def __getattribute__(self, key: str) -> Any:
+        if key.startswith("_") or key in self.__class__.__dict__:
+            # not a group or a hard-coded group
+            pass
+        elif key not in dir(self) or isinstance(super().__getattribute__(key), dict):
+            # settings class not loaded yet
+            if key not in _world_settings_name_cache:
+                # find world that provides the settings class
+                _update_cache()
+                # check for missing keys to update _changed
+                for world_settings_name in _world_settings_name_cache:
+                    if world_settings_name not in dir(self):
+                        self._changed = True
+            if key not in _world_settings_name_cache:
+                # not a world group
+                return super().__getattribute__(key)
+            # directly import world and grab settings class
+            world_mod, world_cls_name = _world_settings_name_cache[key].rsplit(".", 1)
+            world = cast(type, getattr(__import__(world_mod, fromlist=[world_cls_name]), world_cls_name))
+            assert getattr(world, "settings_key") == key
+            try:
+                cls_or_name = world.__annotations__["settings"]
+            except KeyError:
+                import warnings
+                warnings.warn(f"World {world_cls_name} does not define settings. Please consider upgrading the world.")
+                return super().__getattribute__(key)
+            if isinstance(cls_or_name, str):
+                # Try to resolve type. Sadly we can't use get_type_hints, see https://bugs.python.org/issue43463
+                cls_name = cls_or_name
+                if "[" in cls_name:  # resolve ClassVar[]
+                    cls_name = cls_name.split("[", 1)[1].rsplit("]", 1)[0]
+                cls = cast(type, getattr(__import__(world_mod, fromlist=[cls_name]), cls_name))
+            else:
+                type_args = typing.get_args(cls_or_name)  # resolve ClassVar[]
+                cls = type_args[0] if type_args else cast(type, cls_or_name)
+            impl: Group = cast(Group, cls())
+            assert isinstance(impl, Group), f"{world_cls_name}.settings has to inherit from settings.Group. " \
+                                            "If that's already the case, please avoid recursive partial imports."
+            # above assert fails for recursive partial imports
+            # upcast loaded data to settings class
+            try:
+                dct = super().__getattribute__(key)
+                if isinstance(dct, dict):
+                    impl.update(dct)
+                else:
+                    self._changed = True  # key is a class var -> new section
+            except AttributeError:
+                self._changed = True  # key is unknown -> new section
+            setattr(self, key, impl)
+
+        return super().__getattribute__(key)
+
+    def __init__(self, location: Optional[str]):  # change to PathLike[str] once we drop 3.8?
+        super().__init__()
+        if location:
+            from Utils import parse_yaml
+            with open(location, encoding="utf-8-sig") as f:
+                options = parse_yaml(f.read())
+                # 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 {})
+            self._filename = location
+
+        def autosave() -> None:
+            if self._filename and self.changed:
+                self.save()
+
+        import atexit
+        atexit.register(autosave)
+
+    def save(self, location: Optional[str] = None) -> None:  # as above
+        location = location or self._filename
+        assert location, "No file specified"
+        # can't use utf-8-sig because it breaks backward compat: pyyaml on Windows with bytes does not strip the BOM
+        with open(location, "w", encoding="utf-8") as f:
+            self.dump(f)
+        self._filename = location
+
+    def dump(self, f: TextIO, level: int = 0) -> None:
+        # load all world setting classes
+        _update_cache()
+        for key in _world_settings_name_cache:
+            self.__getattribute__(key)  # load all worlds
+        super().dump(f, level)
+
+    @property
+    def filename(self) -> Optional[str]:
+        return self._filename
+
+
+# host.yaml loader
+
+def get_settings() -> Settings:
+    """Returns settings from the default host.yaml"""
+    with _lock:  # make sure we only have one instance
+        res = getattr(get_settings, "_cache", None)
+        if not res:
+            import os
+            from Utils import user_path, local_path
+            filenames = ("options.yaml", "host.yaml")
+            locations: List[str] = []
+            if os.path.join(os.getcwd()) != local_path():
+                locations += filenames  # use files from cwd only if it's not the local_path
+            locations += [user_path(filename) for filename in filenames]
+            for location in locations:
+                try:
+                    res = Settings(location)
+                    break
+                except FileNotFoundError:
+                    continue
+            else:
+                warnings.warn(f"Could not find {filenames[1]} to load options. Creating a new one.")
+                res = Settings(None)
+                res.save(user_path(filenames[1]))
+            setattr(get_settings, "_cache", res)
+        return res
diff --git a/setup.py b/setup.py
index ab97536c1173..c3e2dbac6b70 100644
--- a/setup.py
+++ b/setup.py
@@ -192,7 +192,7 @@ def resolve_icon(icon_name: str):
     ) for c in components if c.script_name and c.frozen_name
 ]
 
-extra_data = ["LICENSE", "data", "EnemizerCLI", "host.yaml", "SNI"]
+extra_data = ["LICENSE", "data", "EnemizerCLI", "SNI"]
 extra_libs = ["libssl.so", "libcrypto.so"] if is_linux else []
 
 
@@ -418,14 +418,6 @@ def run(self):
             for extra_exe in extra_exes:
                 if extra_exe.is_file():
                     extra_exe.chmod(0o755)
-            # rewrite windows-specific things in host.yaml
-            host_yaml = self.buildfolder / 'host.yaml'
-            with host_yaml.open('r+b') as f:
-                data = f.read()
-                data = data.replace(b'factorio\\\\bin\\\\x64\\\\factorio', b'factorio/bin/x64/factorio')
-                f.seek(0, os.SEEK_SET)
-                f.write(data)
-                f.truncate()
 
 
 class AppImageCommand(setuptools.Command):
diff --git a/test/programs/TestGenerate.py b/test/programs/TestGenerate.py
index 1418ec05a4aa..d04e1f2c5bf4 100644
--- a/test/programs/TestGenerate.py
+++ b/test/programs/TestGenerate.py
@@ -73,13 +73,21 @@ def test_generate_relative(self):
 
     def test_generate_yaml(self):
         # override host.yaml
-        defaults = Generate.Utils.get_options()["generator"]
-        defaults["player_files_path"] = str(self.yaml_input_dir)
-        defaults["players"] = 0
-
-        sys.argv = [sys.argv[0], '--seed', '0',
-                    '--outputpath', self.output_tempdir.name]
-        print(f'Testing Generate.py {sys.argv} in {os.getcwd()}, player_files_path={self.yaml_input_dir}')
-        Generate.main()
+        from settings import get_settings
+        from Utils import user_path, local_path
+        settings = get_settings()
+        # NOTE: until/unless we override settings.Group's setattr, we have to upcast the input dir here
+        settings.generator.player_files_path = settings.generator.PlayerFilesPath(self.yaml_input_dir)
+        settings.generator.players = 0
+        settings._filename = None  # don't write to disk
+        user_path_backup = user_path.cached_path
+        user_path.cached_path = local_path()  # test yaml is actually in local_path
+        try:
+            sys.argv = [sys.argv[0], '--seed', '0',
+                        '--outputpath', self.output_tempdir.name]
+            print(f'Testing Generate.py {sys.argv} in {os.getcwd()}, player_files_path={self.yaml_input_dir}')
+            Generate.main()
+        finally:
+            user_path.cached_path = user_path_backup
 
         self.assertOutput(self.output_tempdir.name)
diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py
index 72a9da4b524a..763b450b95a0 100644
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -14,12 +14,23 @@
     import random
     from BaseClasses import MultiWorld, Item, Location, Tutorial
     from . import GamesPackage
+    from settings import Group
 
 
 class AutoWorldRegister(type):
     world_types: Dict[str, Type[World]] = {}
     __file__: str
     zip_path: Optional[str]
+    settings_key: str
+    __settings: Any
+
+    @property
+    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]
+        return cls.__settings
 
     def __new__(mcs, name: str, bases: Tuple[type, ...], dct: Dict[str, Any]) -> AutoWorldRegister:
         if "web" in dct:
@@ -61,6 +72,11 @@ def __new__(mcs, name: str, bases: Tuple[type, ...], dct: Dict[str, Any]) -> Aut
         new_class.__file__ = sys.modules[new_class.__module__].__file__
         if ".apworld" in new_class.__file__:
             new_class.zip_path = pathlib.Path(new_class.__file__).parents[1]
+        if "settings_key" not in dct:
+            mod_name = new_class.__module__
+            world_folder_name = mod_name[7:].lower() if mod_name.startswith("worlds.") else mod_name.lower()
+            new_class.settings_key = world_folder_name + "_options"
+        new_class.__settings = None
         return new_class
 
 
@@ -207,6 +223,11 @@ class World(metaclass=AutoWorldRegister):
     random: random.Random
     """This world's random object. Should be used for any randomization needed in world for this player slot."""
 
+    settings_key: ClassVar[str]
+    """name of the section in host.yaml for world-specific settings, will default to {folder}_options"""
+    settings: ClassVar[Optional["Group"]]
+    """loaded settings from host.yaml"""
+
     zip_path: ClassVar[Optional[pathlib.Path]] = None
     """If loaded from a .apworld, this is the Path to it."""
     __file__: ClassVar[str]
@@ -216,6 +237,11 @@ def __init__(self, multiworld: "MultiWorld", player: int):
         self.multiworld = multiworld
         self.player = player
 
+    def __getattr__(self, item: str) -> Any:
+        if item == "settings":
+            return self.__class__.settings
+        raise AttributeError
+
     # overridable methods that get called by Main.py, sorted by execution order
     # can also be implemented as a classmethod and called "stage_<original_name>",
     # in that case the MultiWorld object is passed as an argument and it gets called once for the entire multiworld.
diff --git a/worlds/adventure/__init__.py b/worlds/adventure/__init__.py
index 59383977b097..105725bd053c 100644
--- a/worlds/adventure/__init__.py
+++ b/worlds/adventure/__init__.py
@@ -3,6 +3,8 @@
 import itertools
 import math
 import os
+import settings
+import typing
 from enum import IntFlag
 from typing import Any, ClassVar, Dict, List, Optional, Set, Tuple
 
@@ -31,6 +33,42 @@
 components.append(Component('Adventure Client', 'AdventureClient', file_identifier=SuffixIdentifier('.apadvn')))
 
 
+class AdventureSettings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """
+        File name of the standard NTSC Adventure rom.
+        The licensed "The 80 Classic Games" CD-ROM contains this.
+        It may also have a .a26 extension
+        """
+        copy_to = "ADVNTURE.BIN"
+        description = "Adventure ROM File"
+        md5s = [AdventureDeltaPatch.hash]
+
+    class RomStart(str):
+        """
+        Set this to false to never autostart a rom (such as after patching)
+        True for operating system default program for '.a26'
+        Alternatively, a path to a program to open the .a26 file with (generally EmuHawk for multiworld)
+        """
+
+    class RomArgs(str):
+        """
+        Optional, additional args passed into rom_start before the .bin file
+        For example, this can be used to autoload the connector script in BizHawk
+        (see BizHawk --lua= option)
+        Windows example:
+        rom_args: "--lua=C:/ProgramData/Archipelago/data/lua/connector_adventure.lua"
+        """
+
+    class DisplayMsgs(settings.Bool):
+        """Set this to true to display item received messages in EmuHawk"""
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+    rom_start: typing.Union[RomStart, bool] = True
+    rom_args: Optional[RomArgs] = " "
+    display_msgs: typing.Union[DisplayMsgs, bool] = True
+
+
 class AdventureWeb(WebWorld):
     theme = "dirt"
 
@@ -53,7 +91,6 @@ class AdventureWeb(WebWorld):
     )
 
     tutorials = [setup, setup_fr]
-    
 
 
 def get_item_position_data_start(table_index: int):
@@ -73,6 +110,7 @@ class AdventureWorld(World):
     web: ClassVar[WebWorld] = AdventureWeb()
 
     option_definitions: ClassVar[Dict[str, AssembleOptions]] = adventure_option_definitions
+    settings: ClassVar[AdventureSettings]
     item_name_to_id: ClassVar[Dict[str, int]] = {name: data.id for name, data in item_table.items()}
     location_name_to_id: ClassVar[Dict[str, int]] = {name: data.location_id for name, data in location_table.items()}
     data_version: ClassVar[int] = 1
diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py
index 8f74a35430bb..64fc45a3e413 100644
--- a/worlds/alttp/__init__.py
+++ b/worlds/alttp/__init__.py
@@ -1,6 +1,7 @@
 import logging
 import os
 import random
+import settings
 import threading
 import typing
 
@@ -29,6 +30,16 @@
 extras_list = sum(difficulties['normal'].extras[0:5], [])
 
 
+class ALTTPSettings(settings.Group):
+    class RomFile(settings.SNESRomPath):
+        """File name of the v1.0 J rom"""
+        description = "ALTTP v1.0 J ROM File"
+        copy_to = "Zelda no Densetsu - Kamigami no Triforce (Japan).sfc"
+        md5s = [LttPDeltaPatch.hash]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
 class ALTTPWeb(WebWorld):
     setup_en = Tutorial(
         "Multiworld Setup Tutorial",
@@ -123,6 +134,8 @@ class ALTTPWorld(World):
     """
     game = "A Link to the Past"
     option_definitions = alttp_options
+    settings_key = "lttp_options"
+    settings: typing.ClassVar[ALTTPSettings]
     topology_present = True
     item_name_groups = item_name_groups
     location_name_groups = {
@@ -219,9 +232,16 @@ class ALTTPWorld(World):
 
     create_items = generate_itempool
 
-    enemizer_path: str = Utils.get_options()["generator"]["enemizer_path"] \
-        if os.path.isabs(Utils.get_options()["generator"]["enemizer_path"]) \
-        else Utils.local_path(Utils.get_options()["generator"]["enemizer_path"])
+    _enemizer_path: typing.ClassVar[typing.Optional[str]] = None
+
+    @property
+    def enemizer_path(self) -> str:
+        # TODO: directly use settings
+        cls = self.__class__
+        if cls._enemizer_path is None:
+            cls._enemizer_path = settings.get_settings().generator.enemizer_path
+            assert isinstance(cls._enemizer_path, str)
+        return cls._enemizer_path
 
     # custom instance vars
     dungeon_local_item_names: typing.Set[str]
diff --git a/worlds/dkc3/__init__.py b/worlds/dkc3/__init__.py
index adbb23061438..68139dfd1a0b 100644
--- a/worlds/dkc3/__init__.py
+++ b/worlds/dkc3/__init__.py
@@ -3,6 +3,7 @@
 import math
 import threading
 
+import settings
 from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification
 from .Items import DKC3Item, ItemData, item_table, inventory_table, junk_table
 from .Locations import DKC3Location, all_locations, setup_locations
@@ -17,6 +18,16 @@
 import Patch
 
 
+class DK3Settings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """File name of the DKC3 US rom"""
+        copy_to = "Donkey Kong Country 3 - Dixie Kong's Double Trouble! (USA) (En,Fr).sfc"
+        description = "DKC3 (US) ROM File"
+        md5s = [DKC3DeltaPatch.hash]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
 class DKC3Web(WebWorld):
     theme = "jungle"
 
@@ -40,6 +51,7 @@ class DKC3World(World):
     """
     game: str = "Donkey Kong Country 3"
     option_definitions = dkc3_options
+    settings: typing.ClassVar[DK3Settings]
     topology_present = False
     data_version = 2
     #hint_blacklist = {LocationName.rocket_rush_flag}
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index 6ca3af751b71..515776ee1964 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -2,6 +2,7 @@
 
 import collections
 import logging
+import settings
 import typing
 
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification
@@ -27,6 +28,29 @@ def launch_client():
 components.append(Component("Factorio Client", "FactorioClient", func=launch_client, component_type=Type.CLIENT))
 
 
+class FactorioSettings(settings.Group):
+    class Executable(settings.UserFilePath):
+        is_exe = True
+
+    class ServerSettings(settings.OptionalUserFilePath):
+        """
+        by default, no settings are loaded if this file does not exist. \
+If this file does exist, then it will be used.
+        server_settings: "factorio\\\\data\\\\server-settings.json"
+        """
+
+    class FilterItemSends(settings.Bool):
+        """Whether to filter item send messages displayed in-game to only those that involve you."""
+
+    class BridgeChatOut(settings.Bool):
+        """Whether to send chat messages from players on the Factorio server to Archipelago."""
+
+    executable: Executable = Executable("factorio/bin/x64/factorio")
+    server_settings: typing.Optional[FactorioSettings.ServerSettings] = None
+    filter_item_sends: typing.Union[FilterItemSends, bool] = False
+    bridge_chat_out: typing.Union[BridgeChatOut, bool] = True
+
+
 class FactorioWeb(WebWorld):
     tutorials = [Tutorial(
         "Multiworld Setup Tutorial",
@@ -80,6 +104,8 @@ class Factorio(World):
     skip_silo: bool = False
     science_locations: typing.List[FactorioScienceLocation]
 
+    settings: typing.ClassVar[FactorioSettings]
+
     def __init__(self, world, player: int):
         super(Factorio, self).__init__(world, player)
         self.advancement_technologies = set()
diff --git a/worlds/ff1/__init__.py b/worlds/ff1/__init__.py
index 51dd4b2ad33c..56b41d62d042 100644
--- a/worlds/ff1/__init__.py
+++ b/worlds/ff1/__init__.py
@@ -1,3 +1,6 @@
+import settings
+import typing
+
 from typing import Dict
 from BaseClasses import Item, Location, MultiWorld, Tutorial, ItemClassification
 from .Items import ItemData, FF1Items, FF1_STARTER_ITEMS, FF1_PROGRESSION_LIST, FF1_BRIDGE
@@ -6,6 +9,10 @@
 from ..AutoWorld import World, WebWorld
 
 
+class FF1Settings(settings.Group):
+    display_msgs: bool = True
+
+
 class FF1Web(WebWorld):
     settings_page = "https://finalfantasyrandomizer.com/"
     tutorials = [Tutorial(
@@ -28,6 +35,8 @@ class FF1World(World):
     """
 
     option_definitions = ff1_options
+    settings: typing.ClassVar[FF1Settings]
+    settings_key = "ffr_options"
     game = "Final Fantasy"
     topology_present = False
     data_version = 2
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 53396c00d267..84fd235cf055 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -2,8 +2,11 @@
 import bsdiff4
 import os
 import pkgutil
+import settings
+import typing
 import tempfile
 
+
 from BaseClasses import Entrance, Item, ItemClassification, Location, Tutorial
 from Fill import fill_restrictive
 from worlds.AutoWorld import WebWorld, World
@@ -29,6 +32,16 @@
 DEVELOPER_MODE = False
 
 
+class LinksAwakeningSettings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """File name of the Link's Awakening DX rom"""
+        copy_to = "Legend of Zelda, The - Link's Awakening DX (USA, Europe) (SGB Enhanced).gbc"
+        description = "LADX ROM File"
+        md5s = [LADXDeltaPatch.hash]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
 class LinksAwakeningWebWorld(WebWorld):
     tutorials = [Tutorial(
         "Multiworld Setup Guide",
@@ -40,6 +53,7 @@ class LinksAwakeningWebWorld(WebWorld):
     )]
     theme = "dirt"
 
+
 class LinksAwakeningWorld(World):
     """
     After a previous adventure, Link is stranded on Koholint Island, full of mystery and familiar faces.
@@ -49,6 +63,7 @@ class LinksAwakeningWorld(World):
     web = LinksAwakeningWebWorld()
     
     option_definitions = links_awakening_options  # options the player can set
+    settings: typing.ClassVar[LinksAwakeningSettings]
     topology_present = True  # show path to required location checks in spoiler
 
     # data_version is used to signal that items, locations or their names
diff --git a/worlds/lufia2ac/__init__.py b/worlds/lufia2ac/__init__.py
index c9e8f303e4b1..bcf8e75d01e4 100644
--- a/worlds/lufia2ac/__init__.py
+++ b/worlds/lufia2ac/__init__.py
@@ -1,6 +1,8 @@
 import base64
 import itertools
 import os
+import settings
+
 from enum import IntFlag
 from random import Random
 from typing import Any, ClassVar, Dict, get_type_hints, Iterator, List, Set, Tuple
@@ -22,6 +24,16 @@
 CHESTS_PER_SPHERE: int = 5
 
 
+class L2ACSettings(settings.Group):
+    class RomFile(settings.SNESRomPath):
+        """File name of the US rom"""
+        description = "Lufia II ROM File"
+        copy_to = "Lufia II - Rise of the Sinistrals (USA).sfc"
+        md5s = [L2ACDeltaPatch.hash]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
 class L2ACWeb(WebWorld):
     tutorials = [Tutorial(
         "Multiworld Setup Guide",
@@ -45,6 +57,7 @@ class L2ACWorld(World):
     web: ClassVar[WebWorld] = L2ACWeb()
 
     option_definitions: ClassVar[Dict[str, AssembleOptions]] = get_type_hints(L2ACOptions)
+    settings: ClassVar[L2ACSettings]
     item_name_to_id: ClassVar[Dict[str, int]] = l2ac_item_name_to_id
     location_name_to_id: ClassVar[Dict[str, int]] = l2ac_location_name_to_id
     item_name_groups: ClassVar[Dict[str, Set[str]]] = {
diff --git a/worlds/minecraft/__init__.py b/worlds/minecraft/__init__.py
index a685d1ab4b19..fa992e1e1146 100644
--- a/worlds/minecraft/__init__.py
+++ b/worlds/minecraft/__init__.py
@@ -1,5 +1,7 @@
 import os
 import json
+import settings
+import typing
 from base64 import b64encode, b64decode
 from typing import Dict, Any
 
@@ -14,6 +16,22 @@
 
 client_version = 9
 
+
+class MinecraftSettings(settings.Group):
+    class ForgeDirectory(settings.OptionalUserFolderPath):
+        pass
+
+    class ReleaseChannel(str):
+        """
+        release channel, currently "release", or "beta"
+        any games played on the "beta" channel have a high likelihood of no longer working on the "release" channel.
+        """
+
+    forge_directory: ForgeDirectory = ForgeDirectory("Minecraft Forge server")
+    max_heap_size: str = "2G"
+    release_channel: ReleaseChannel = ReleaseChannel("release")
+
+
 class MinecraftWebWorld(WebWorld):
     theme = "jungle"
     bug_report_page = "https://github.com/KonoTyran/Minecraft_AP_Randomizer/issues/new?assignees=&labels=bug&template=bug_report.yaml&title=%5BBug%5D%3A+Brief+Description+of+bug+here"
@@ -67,6 +85,7 @@ class MinecraftWorld(World):
     """
     game: str = "Minecraft"
     option_definitions = minecraft_options
+    settings: typing.ClassVar[MinecraftSettings]
     topology_present = True
     web = MinecraftWebWorld()
 
diff --git a/worlds/mmbn3/__init__.py b/worlds/mmbn3/__init__.py
index 9c6d11fade03..ec68825c2d2c 100644
--- a/worlds/mmbn3/__init__.py
+++ b/worlds/mmbn3/__init__.py
@@ -1,4 +1,5 @@
 import os
+import settings
 import typing
 import threading
 
@@ -16,6 +17,17 @@
 from .Names.LocationName import LocationName
 
 
+class MMBN3Settings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """File name of the MMBN3 Blue US rom"""
+        copy_to = "Mega Man Battle Network 3 - Blue Version (USA).gba"
+        description = "MMBN3 ROM File"
+        md5s = [MMBN3DeltaPatch.hash]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+    rom_start: bool = True
+
+
 class MMBN3Web(WebWorld):
     theme = "ice"
 
@@ -39,6 +51,7 @@ class MMBN3World(World):
     """
     game = "MegaMan Battle Network 3"
     option_definitions = MMBN3Options
+    settings: typing.ClassVar[MMBN3Settings]
     topology_present = False
 
     data_version = 1
diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py
index c967dfe18204..655f4989b243 100644
--- a/worlds/oot/__init__.py
+++ b/worlds/oot/__init__.py
@@ -2,6 +2,8 @@
 import threading
 import copy
 import functools
+import settings
+import typing
 from typing import Optional, List, AbstractSet, Union  # remove when 3.8 support is dropped
 from collections import Counter, deque
 from string import printable
@@ -66,6 +68,28 @@ def copy_mixin(self, ret) -> CollectionState:
         return ret
 
 
+class OOTSettings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """File name of the OoT v1.0 ROM"""
+        description = "Ocarina of Time ROM File"
+        copy_to = "The Legend of Zelda - Ocarina of Time.z64"
+        md5s = [
+            "5bd1fe107bf8106b2ab6650abecd54d6",  # normal
+            "6697768a7a7df2dd27a692a2638ea90b",  # byte-swapped
+            "05f0f3ebacbc8df9243b6148ffe4792f",  # decompressed
+        ]
+
+    class RomStart(str):
+        """
+        Set this to false to never autostart a rom (such as after patching),
+                    true  for operating system default program
+        Alternatively, a path to a program to open the .z64 file with
+        """
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+    rom_start: typing.Union[RomStart, bool] = True
+
+
 class OOTWeb(WebWorld):
     setup = Tutorial(
         "Multiworld Setup Tutorial",
@@ -105,6 +129,7 @@ class OOTWorld(World):
     """
     game: str = "Ocarina of Time"
     option_definitions: dict = oot_options
+    settings: typing.ClassVar[OOTSettings]
     topology_present: bool = True
     item_name_to_id = {item_name: oot_data_to_ap_id(data, False) for item_name, data in item_table.items() if
                        data[2] is not None and item_name not in {
diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
index 753d35c735cd..2497c2deebb4 100644
--- a/worlds/pokemon_rb/__init__.py
+++ b/worlds/pokemon_rb/__init__.py
@@ -1,7 +1,9 @@
-from typing import TextIO
 import os
-import logging
+import settings
+import typing
+
 from copy import deepcopy
+from typing import TextIO
 
 from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification
 from Fill import fill_restrictive, FillError, sweep_from_pool
@@ -15,12 +17,36 @@
 from .rom_addresses import rom_addresses
 from .text import encode_text
 from .rom import generate_output, get_base_rom_bytes, get_base_rom_path, process_pokemon_data, process_wild_pokemon,\
-    process_static_pokemon, process_move_data
+    process_static_pokemon, process_move_data, RedDeltaPatch, BlueDeltaPatch
 from .rules import set_rules
 
 import worlds.pokemon_rb.poke_data as poke_data
 
 
+class PokemonSettings(settings.Group):
+    class RedRomFile(settings.UserFilePath):
+        """File names of the Pokemon Red and Blue roms"""
+        description = "Pokemon Red (UE) ROM File"
+        copy_to = "Pokemon Red (UE) [S][!].gb"
+        md5s = [RedDeltaPatch.hash]
+
+    class BlueRomFile(settings.UserFilePath):
+        description = "Pokemon Blue (UE) ROM File"
+        copy_to = "Pokemon Blue (UE) [S][!].gb"
+        md5s = [BlueDeltaPatch.hash]
+
+    class RomStart(str):
+        """
+        Set this to false to never autostart a rom (such as after patching)
+        True for operating system default program
+        Alternatively, a path to a program to open the .gb file with
+        """
+
+    red_rom_file: RedRomFile = RedRomFile(RedRomFile.copy_to)
+    blue_rom_file: BlueRomFile = BlueRomFile(BlueRomFile.copy_to)
+    rom_start: typing.Union[RomStart, bool] = True
+
+
 class PokemonWebWorld(WebWorld):
     tutorials = [Tutorial(
         "Multiworld Setup Guide",
@@ -39,6 +65,7 @@ class PokemonRedBlueWorld(World):
     # -MuffinJets#4559
     game = "Pokemon Red and Blue"
     option_definitions = pokemon_rb_options
+    settings: typing.ClassVar[PokemonSettings]
 
     data_version = 8
     required_client_version = (0, 3, 9)
diff --git a/worlds/sm/__init__.py b/worlds/sm/__init__.py
index f7d0f717c949..aa03c0783bdf 100644
--- a/worlds/sm/__init__.py
+++ b/worlds/sm/__init__.py
@@ -5,6 +5,8 @@
 import os
 import threading
 import base64
+import settings
+import typing
 from typing import Any, Dict, Iterable, List, Set, TextIO, TypedDict
 
 from BaseClasses import Region, Entrance, Location, MultiWorld, Item, ItemClassification, CollectionState, Tutorial
@@ -34,6 +36,16 @@
 from .variaRandomizer.graph.graph_utils import GraphUtils
 
 
+class SMSettings(settings.Group):
+    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]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
 class SMCollectionState(metaclass=AutoLogicRegister):
     def init_mixin(self, parent: MultiWorld):
         
@@ -78,6 +90,7 @@ class ByteEdit(TypedDict):
 locations_start_id = 82000
 items_start_id = 83000
 
+
 class SMWorld(World):
     """
      This is Very Adaptive Randomizer of Items and Areas for Super Metroid (VARIA SM). It supports
@@ -89,6 +102,7 @@ class SMWorld(World):
     topology_present = True
     data_version = 3
     option_definitions = sm_options
+    settings: typing.ClassVar[SMSettings]
 
     item_name_to_id = {value.Name: items_start_id + value.Id for key, value in ItemManager.Items.items() if value.Id != None}
     location_name_to_id = {key: locations_start_id + value.Id for key, value in locationsDict.items() if value.Id != None}
@@ -119,7 +133,8 @@ def stage_assert_generate(cls, multiworld: MultiWorld):
     def generate_early(self):
         Logic.factory('vanilla')
 
-        self.variaRando = VariaRandomizer(self.multiworld, get_base_rom_path(), self.player)
+        dummy_rom_file = Utils.user_path(SMSettings.RomFile.copy_to)  # actual rom set in generate_output
+        self.variaRando = VariaRandomizer(self.multiworld, dummy_rom_file, self.player)
         self.multiworld.state.smbm[self.player] = SMBoolManager(self.player, self.variaRando.maxDifficulty)
 
         # keeps Nothing items local so no player will ever pickup Nothing
@@ -777,6 +792,7 @@ 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")
 
diff --git a/worlds/smw/__init__.py b/worlds/smw/__init__.py
index 014b9af5f98e..9e9c123fdf5d 100644
--- a/worlds/smw/__init__.py
+++ b/worlds/smw/__init__.py
@@ -1,6 +1,7 @@
 import os
 import typing
 import math
+import settings
 import threading
 
 from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification
@@ -17,6 +18,16 @@
 from .Rom import LocalRom, patch_rom, get_base_rom_path, SMWDeltaPatch
 
 
+class SMWSettings(settings.Group):
+    class RomFile(settings.SNESRomPath):
+        """File name of the SMW US rom"""
+        description = "Super Mario World (USA) ROM File"
+        copy_to = "Super Mario World (USA).sfc"
+        md5s = [SMWDeltaPatch.hash]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
 class SMWWeb(WebWorld):
     theme = "grass"
 
@@ -40,6 +51,7 @@ class SMWWorld(World):
     """
     game: str = "Super Mario World"
     option_definitions = smw_options
+    settings: typing.ClassVar[SMWSettings]
     topology_present = False
     data_version = 3
     required_client_version = (0, 3, 5)
diff --git a/worlds/soe/__init__.py b/worlds/soe/__init__.py
index 20f18d1aebda..f887325c60ea 100644
--- a/worlds/soe/__init__.py
+++ b/worlds/soe/__init__.py
@@ -3,6 +3,8 @@
 import os.path
 import threading
 import typing
+
+import settings
 from worlds.AutoWorld import WebWorld, World
 from worlds.generic.Rules import add_item_rule, set_rule
 from BaseClasses import Entrance, Item, ItemClassification, Location, LocationProgressType, Region, Tutorial
@@ -145,6 +147,16 @@ class SoEWebWorld(WebWorld):
     )]
 
 
+class SoESettings(settings.Group):
+    class RomFile(settings.SNESRomPath):
+        """File name of the SoE US ROM"""
+        description = "Secret of Evermore (USA) ROM"
+        copy_to = "Secret of Evermore (USA).sfc"
+        md5s = [SoEDeltaPatch.hash]
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+
+
 class SoEWorld(World):
     """
     Secret of Evermore is a SNES action RPG. You learn alchemy spells, fight bosses and gather rocket parts to visit a
@@ -152,6 +164,7 @@ class SoEWorld(World):
     """
     game: str = "Secret of Evermore"
     option_definitions = soe_options
+    settings: typing.ClassVar[SoESettings]
     topology_present = False
     data_version = 4
     web = SoEWebWorld()
diff --git a/worlds/tloz/__init__.py b/worlds/tloz/__init__.py
index 2af92a799727..2227a7c5e2ed 100644
--- a/worlds/tloz/__init__.py
+++ b/worlds/tloz/__init__.py
@@ -1,11 +1,13 @@
 import os
 import threading
 from pkgutil import get_data
-from typing import Dict, Any
 
 import bsdiff4
-
 import Utils
+import settings
+import typing
+
+from typing import NamedTuple, Union, Dict, Any
 from BaseClasses import Item, Location, Region, Entrance, MultiWorld, ItemClassification, Tutorial
 from .ItemPool import generate_itempool, starting_weapons, dangerous_weapon_locations
 from .Items import item_table, item_prices, item_game_ids
@@ -18,6 +20,28 @@
 from worlds.generic.Rules import add_rule
 
 
+class TLoZSettings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """File name of the Zelda 1"""
+        description = "The Legend of Zelda (U) ROM File"
+        copy_to = "Legend of Zelda, The (U) (PRG0) [!].nes"
+        md5s = [TLoZDeltaPatch.hash]
+
+    class RomStart(str):
+        """
+        Set this to false to never autostart a rom (such as after patching)
+                    true  for operating system default program
+        Alternatively, a path to a program to open the .nes file with
+        """
+
+    class DisplayMsgs(settings.Bool):
+        """Display message inside of Bizhawk"""
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+    rom_start: typing.Union[RomStart, bool] = True
+    display_msgs: typing.Union[DisplayMsgs, bool] = True
+
+
 class TLoZWeb(WebWorld):
     theme = "stone"
     setup = Tutorial(
@@ -40,6 +64,7 @@ class TLoZWorld(World):
     every time.
     """
     option_definitions = tloz_options
+    settings: typing.ClassVar[TLoZSettings]
     game = "The Legend of Zelda"
     topology_present = False
     data_version = 1
diff --git a/worlds/wargroove/__init__.py b/worlds/wargroove/__init__.py
index ca387c4142d1..7dab77dacba2 100644
--- a/worlds/wargroove/__init__.py
+++ b/worlds/wargroove/__init__.py
@@ -1,6 +1,6 @@
-import os
+import settings
 import string
-import json
+import typing
 
 from BaseClasses import Item, MultiWorld, Region, Location, Entrance, Tutorial, ItemClassification
 from .Items import item_table, faction_table
@@ -11,6 +11,17 @@
 from .Options import wargroove_options
 
 
+class WargrooveSettings(settings.Group):
+    class RootDirectory(settings.UserFolderPath):
+        """
+        Locate the Wargroove root directory on your system.
+        This is used by the Wargroove client, so it knows where to send communication files to
+        """
+        description = "Wargroove root directory"
+
+    root_directory: RootDirectory = RootDirectory("C:/Program Files (x86)/Steam/steamapps/common/Wargroove")
+
+
 class WargrooveWeb(WebWorld):
     tutorials = [Tutorial(
         "Multiworld Setup Guide",
@@ -28,6 +39,7 @@ class WargrooveWorld(World):
     """
 
     option_definitions = wargroove_options
+    settings: typing.ClassVar[WargrooveSettings]
     game = "Wargroove"
     topology_present = True
     data_version = 1
diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index e52e7300725c..2ea7ffdea5cd 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -1,7 +1,9 @@
 from collections import deque, Counter
 from contextlib import redirect_stdout
 import functools
+import settings
 import threading
+import typing
 from typing import Any, Dict, List, Literal, Set, Tuple, Optional, cast
 import os
 import logging
@@ -26,6 +28,26 @@
 from ..AutoWorld import World, WebWorld
 
 
+class ZillionSettings(settings.Group):
+    class RomFile(settings.UserFilePath):
+        """File name of the Zillion US rom"""
+        description = "Zillion US ROM File"
+        copy_to = "Zillion (UE) [!].sms"
+        md5s = [ZillionDeltaPatch.hash]
+
+    class RomStart(str):
+        """
+        Set this to false to never autostart a rom (such as after patching)
+        True for operating system default program
+        Alternatively, a path to a program to open the .sfc file with
+        RetroArch doesn't make it easy to launch a game from the command line.
+        You have to know the path to the emulator core library on the user's computer.
+        """
+
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+    rom_start: typing.Union[RomStart, bool] = RomStart("retroarch")
+
+
 class ZillionWebWorld(WebWorld):
     theme = "stone"
     tutorials = [Tutorial(
@@ -48,6 +70,7 @@ class ZillionWorld(World):
     web = ZillionWebWorld()
 
     option_definitions = zillion_options
+    settings: typing.ClassVar[ZillionSettings]
     topology_present = True  # indicate if world type has any meaningful layout/pathing
 
     # map names to their IDs
@@ -122,7 +145,8 @@ def generate_early(self) -> None:
 
         self._item_counts = item_counts
 
-        rom_dir_name = os.path.dirname(get_base_rom_path())
+        import __main__
+        rom_dir_name = "" if "test" in __main__.__file__ else os.path.dirname(get_base_rom_path())
         with redirect_stdout(self.lsi):  # type: ignore
             self.zz_system.make_patcher(rom_dir_name)
             self.zz_system.make_randomizer(zz_op)

From 354a18285975371fc949cb7fdfa6da2d9610a229 Mon Sep 17 00:00:00 2001
From: Remy Jette <remy@remyjette.com>
Date: Wed, 5 Jul 2023 14:36:46 -0700
Subject: [PATCH 05/24] WebHost: Fix docs generation from a .apworld (#1862)

zfile.filename is the full path within the archive, so by default
zf.extract will maintain that directory structure when extracting.

This causes the docs to be placed in the wrong place, as the Javascript
code expects them to be placed directly in the game folder.
---
 WebHost.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WebHost.py b/WebHost.py
index eb859ec5852b..45d017cf1f67 100644
--- a/WebHost.py
+++ b/WebHost.py
@@ -74,6 +74,7 @@ def create_ordered_tutorials_file() -> typing.List[typing.Dict[str, typing.Any]]
             with zipfile.ZipFile(zipfile_path) as zf:
                 for zfile in zf.infolist():
                     if not zfile.is_dir() and "/docs/" in zfile.filename:
+                        zfile.filename = os.path.basename(zfile.filename)
                         zf.extract(zfile, target_path)
         else:
             source_path = Utils.local_path(os.path.dirname(world.__file__), "docs")

From 81b956408e4c8de9876cf43e130d0b34d9ce8d17 Mon Sep 17 00:00:00 2001
From: ScorelessPine <scorelesspine@gmail.com>
Date: Wed, 5 Jul 2023 18:49:36 -0700
Subject: [PATCH 06/24] SMZ3: Fixed Ganon sign text on
 AllDungeonsDefeatMotherBrain goal (#1617)

---
 worlds/smz3/TotalSMZ3/Patch.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/worlds/smz3/TotalSMZ3/Patch.py b/worlds/smz3/TotalSMZ3/Patch.py
index a79c99a8da2d..bb23b0b97bf6 100644
--- a/worlds/smz3/TotalSMZ3/Patch.py
+++ b/worlds/smz3/TotalSMZ3/Patch.py
@@ -122,7 +122,7 @@ def Create(self, config: Config):
 
         self.WriteGanonInvicible(config.Goal)
         self.WritePreOpenPyramid(config.Goal)
-        self.WriteCrystalsNeeded(self.myWorld.TowerCrystals, self.myWorld.GanonCrystals)
+        self.WriteCrystalsNeeded(self.myWorld.TowerCrystals, self.myWorld.GanonCrystals, config.Goal)
         self.WriteBossesNeeded(self.myWorld.TourianBossTokens)
         self.WriteRngBlock()
 
@@ -776,12 +776,15 @@ def WriteGanonInvicible(self, goal: Goal):
     def WriteBossesNeeded(self, tourianBossTokens):
         self.patches.append((Snes(0xF47200), getWordArray(tourianBossTokens)))
 
-    def WriteCrystalsNeeded(self, towerCrystals, ganonCrystals):
+    def WriteCrystalsNeeded(self, towerCrystals, ganonCrystals, goal: Goal):
         self.patches.append((Snes(0x30805E), [towerCrystals]))
         self.patches.append((Snes(0x30805F), [ganonCrystals]))
 
         self.stringTable.SetTowerRequirementText(f"You need {towerCrystals} crystals to enter Ganon's Tower.")
-        self.stringTable.SetGanonRequirementText(f"You need {ganonCrystals} crystals to defeat Ganon.")
+        if (goal == Goal.AllDungeonsDefeatMotherBrain):
+            self.stringTable.SetGanonRequirementText(f"You need to complete all the dungeons and bosses to defeat Ganon.")
+        else:
+            self.stringTable.SetGanonRequirementText(f"You need {ganonCrystals} crystals to defeat Ganon.")
 
     def WriteRngBlock(self):
         #/* Repoint RNG Block */

From 5f2c226b43eaed1884d07b47a586497a6e51b442 Mon Sep 17 00:00:00 2001
From: lordlou <87331798+lordlou@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:44:59 -0400
Subject: [PATCH 07/24] SMZ3: update to upstream version 11.3.1 and item link
 fix (#1950)

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

diff --git a/worlds/smz3/TotalSMZ3/Patch.py b/worlds/smz3/TotalSMZ3/Patch.py
index bb23b0b97bf6..049b200c46b0 100644
--- a/worlds/smz3/TotalSMZ3/Patch.py
+++ b/worlds/smz3/TotalSMZ3/Patch.py
@@ -84,6 +84,7 @@ class DropPrize(Enum):
 class Patch:
     Major = 11
     Minor = 3
+    Patch = 1
     allWorlds: List[World]
     myWorld: World
     seedGuid: str
@@ -615,7 +616,7 @@ def WriteGameTitle(self):
                     "H" if self.myWorld.Config.SMLogic == Config.SMLogic.Hard else \
                     "X"
 
-        self.title = f"ZSM{Patch.Major}{Patch.Minor}{z3Glitch}{smGlitch}{self.myWorld.Id}{self.seed:08x}".ljust(21)[:21]
+        self.title = f"ZSM{Patch.Major}{Patch.Minor}{Patch.Patch}{z3Glitch}{smGlitch}{self.myWorld.Id}{self.seed:08x}".ljust(21)[:21]
         self.patches.append((Snes(0x00FFC0), bytearray(self.title, 'utf8')))
         self.patches.append((Snes(0x80FFC0), bytearray(self.title, 'utf8')))
     
diff --git a/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py b/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py
index fe81069164c5..42933b9f2fd5 100644
--- a/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py
+++ b/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py
@@ -136,7 +136,7 @@ def CanBeatMoldorm(self, items: Progression):
     def CanEnter(self, items: Progression):
         return items.MoonPearl and self.world.CanEnter("Dark World Death Mountain East", items) and \
             self.world.CanAcquireAtLeast(self.world.TowerCrystals, items, RewardType.AnyCrystal) and \
-            self.world.CanAcquireAtLeast(self.world.TourianBossTokens * (self.world.TowerCrystals / 7), items, RewardType.AnyBossToken)
+            self.world.CanAcquireAtLeast((self.world.TourianBossTokens * self.world.TowerCrystals) / 7, items, RewardType.AnyBossToken)
 
     # added for AP completion_condition when TowerCrystals is lower than GanonCrystals
     def CanComplete(self, items: Progression):
@@ -144,7 +144,8 @@ def CanComplete(self, items: Progression):
 
     def CanFill(self, item: Item):
         if (self.Config.Multiworld):
-            if (item.World != self.world or item.Progression):
+            # item.World will be None for item created by create_item for item links
+            if (item.World is not None and (item.World != self.world or item.Progression)):
                 return False
             if (self.Config.Keysanity and not ((item.Type == ItemType.BigKeyGT or item.Type == ItemType.KeyGT) and item.World == self.world) and (item.IsKey() or item.IsBigKey() or item.IsKeycard())):
                 return False
diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index 969ad9dfccaa..79ba17db82b1 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -200,13 +200,13 @@ def generate_early(self):
 
         self.local_random = random.Random(self.multiworld.random.randint(0, 1000))
         self.smz3World = TotalSMZ3World(self.config, self.multiworld.get_player_name(self.player), self.player, self.multiworld.seed_name)
+        self.smz3World.Setup(WorldState.Generate(self.config, self.multiworld.random))
         self.smz3DungeonItems = []
         SMZ3World.location_names = frozenset(self.smz3World.locationLookup.keys())
 
         self.multiworld.state.smz3state[self.player] = TotalSMZ3Item.Progression([])
     
-    def generate_basic(self):
-        self.smz3World.Setup(WorldState.Generate(self.config, self.multiworld.random))
+    def create_items(self):
         self.dungeon = TotalSMZ3Item.Item.CreateDungeonPool(self.smz3World)
         self.dungeon.reverse()
         self.progression = TotalSMZ3Item.Item.CreateProgressionPool(self.smz3World)
@@ -487,7 +487,7 @@ def create_item(self, name: str) -> Item:
                         ItemClassification.progression if SMZ3World.isProgression(TotalSMZ3Item.ItemType[name]) else ItemClassification.filler,
                         TotalSMZ3Item.ItemType[name], self.item_name_to_id[name],
                         self.player,
-                        TotalSMZ3Item.Item(TotalSMZ3Item.ItemType[name], self))
+                        TotalSMZ3Item.Item(TotalSMZ3Item.ItemType[name], getattr(self, "smz3World", None)))
 
     def pre_fill(self):
         from Fill import fill_restrictive

From f2117be7d986afb6ea58fd27ff1cc4f82ae8bd67 Mon Sep 17 00:00:00 2001
From: kindasneaki <ryandj67@hotmail.com>
Date: Wed, 5 Jul 2023 21:45:43 -0600
Subject: [PATCH 08/24] RoR2: fix event exits for dlc stages (#1946)

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

diff --git a/worlds/ror2/Regions.py b/worlds/ror2/Regions.py
index 589603469959..94f5aaf71ee8 100644
--- a/worlds/ror2/Regions.py
+++ b/worlds/ror2/Regions.py
@@ -90,8 +90,8 @@ def create_regions(multiworld: MultiWorld, player: int):
     # DLC Locations
     if multiworld.dlc_sotv[player]:
         non_dlc_regions["Menu"].region_exits.append("Siphoned Forest")
-        other_regions["OrderedStage_2"].region_exits.append("Aphelian Sanctuary")
-        other_regions["OrderedStage_3"].region_exits.append("Sulfur Pools")
+        other_regions["OrderedStage_1"].region_exits.append("Aphelian Sanctuary")
+        other_regions["OrderedStage_2"].region_exits.append("Sulfur Pools")
         other_regions["Void Fields"].region_exits.append("Void Locus")
         regions_pool: Dict = {**all_location_regions, **other_regions, **dlc_other_regions}
 

From 1338d7a9685300b6505b844fa262265fde7c3635 Mon Sep 17 00:00:00 2001
From: Trevor L <80716066+TRPG0@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:39:26 -0600
Subject: [PATCH 09/24] Blasphemous: Randomizer 2.0 (#1883)

Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
---
 setup.py                            |    1 -
 worlds/blasphemous/Exits.py         |  135 -
 worlds/blasphemous/Items.py         |   39 +-
 worlds/blasphemous/Locations.py     |  579 +--
 worlds/blasphemous/Options.py       |  214 +-
 worlds/blasphemous/Rooms.py         | 5405 ++++++++++++++++++++++++++
 worlds/blasphemous/Rules.py         | 5529 ++++++++++++++++++++-------
 worlds/blasphemous/Vanilla.py       |  209 +-
 worlds/blasphemous/__init__.py      |  499 ++-
 worlds/blasphemous/docs/setup_en.md |   49 +-
 10 files changed, 10143 insertions(+), 2516 deletions(-)
 delete mode 100644 worlds/blasphemous/Exits.py
 create mode 100644 worlds/blasphemous/Rooms.py

diff --git a/setup.py b/setup.py
index c3e2dbac6b70..c4165ba99bed 100644
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,6 @@
     "Adventure",
     "ArchipIDLE",
     "Archipelago",
-    "Blasphemous",
     "ChecksFinder",
     "Clique",
     "DLCQuest",
diff --git a/worlds/blasphemous/Exits.py b/worlds/blasphemous/Exits.py
deleted file mode 100644
index a4460e2aed19..000000000000
--- a/worlds/blasphemous/Exits.py
+++ /dev/null
@@ -1,135 +0,0 @@
-from typing import List, Dict
-
-
-region_exit_table: Dict[str, List[str]] = {
-    "menu"     : ["New Game"],
-
-    "albero"   : ["To The Holy Line",
-                  "To Desecrated Cistern",
-                  "To Wasteland of the Buried Churches",
-                  "To Dungeons"],
-
-    "attots"   : ["To Mother of Mothers"],
-
-    "ar"       : ["To Mother of Mothers",
-                  "To Wall of the Holy Prohibitions",
-                  "To Deambulatory of His Holiness"],
-
-    "bottc"    : ["To Wasteland of the Buried Churches",
-                  "To Ferrous Tree"],
-
-    "botss"    : ["To The Holy Line",
-                  "To Mountains of the Endless Dusk"],
-
-    "coolotcv" : ["To Graveyard of the Peaks",
-                  "To Wall of the Holy Prohibitions"],
-
-    "dohh"     : ["To Archcathedral Rooftops"],
-
-    "dc"       : ["To Albero",
-                  "To Mercy Dreams",
-                  "To Mountains of the Endless Dusk",
-                  "To Echoes of Salt",
-                  "To Grievance Ascends"],
-
-    "eos"      : ["To Jondo",
-                  "To Mountains of the Endless Dusk",
-                  "To Desecrated Cistern",
-                  "To The Resting Place of the Sister",
-                  "To Mourning and Havoc"],
-
-    "ft"       : ["To Bridge of the Three Cavalries",
-                  "To Hall of the Dawning",
-                  "To Patio of the Silent Steps"],
-
-    "gotp"     : ["To Where Olive Trees Wither",
-                  "To Convent of Our Lady of the Charred Visage"],
-
-    "ga"       : ["To Jondo",
-                  "To Desecrated Cistern"],
-
-    "hotd"     : ["To Ferrous Tree"],
-
-    "jondo"    : ["To Mountains of the Endless Dusk",
-                  "To Grievance Ascends"],
-
-    "kottw"    : ["To Mother of Mothers"],
-
-    "lotnw"    : ["To Mother of Mothers",
-                  "To The Sleeping Canvases"],
-
-    "md"       : ["To Wasteland of the Buried Churches",
-                  "To Desecrated Cistern",
-                  "To The Sleeping Canvases"],
-
-    "mom"      : ["To Patio of the Silent Steps",
-                  "To Archcathedral Rooftops",
-                  "To Knot of the Three Words",
-                  "To Library of the Negated Words",
-                  "To All the Tears of the Sea"],
-
-    "moted"    : ["To Brotherhood of the Silent Sorrow",
-                  "To Jondo",
-                  "To Desecrated Cistern"],
-
-    "mah"      : ["To Echoes of Salt",
-                  "To Mother of Mothers"],
-
-    "potss"    : ["To Ferrous Tree",
-                  "To Mother of Mothers",
-                  "To Wall of the Holy Prohibitions"],
-
-    "petrous"  : ["To The Holy Line"],
-
-    "thl"      : ["To Brotherhood of the Silent Sorrow",
-                  "To Petrous",
-                  "To Albero"],
-
-    "trpots"   : ["To Echoes of Salt"],
-
-    "tsc"      : ["To Library of the Negated Words",
-                  "To Mercy Dreams"],
-
-    "wothp"    : ["To Archcathedral Rooftops",
-                  "To Convent of Our Lady of the Charred Visage"],
-
-    "wotbc"    : ["To Albero",
-                  "To Where Olive Trees Wither",
-                  "To Mercy Dreams"],
-
-    "wotw"     : ["To Wasteland of the Buried Churches",
-                  "To Graveyard of the Peaks"]
-}
-
-exit_lookup_table: Dict[str, str] = {
-    "New Game": "botss",
-    "To Albero": "albero",
-    "To All the Tears of the Sea": "attots",
-    "To Archcathedral Rooftops": "ar",
-    "To Bridge of the Three Cavalries": "bottc",
-    "To Brotherhood of the Silent Sorrow": "botss",
-    "To Convent of Our Lady of the Charred Visage": "coolotcv",
-    "To Deambulatory of His Holiness": "dohh",
-    "To Desecrated Cistern": "dc",
-    "To Echoes of Salt": "eos",
-    "To Ferrous Tree": "ft",
-    "To Graveyard of the Peaks": "gotp",
-    "To Grievance Ascends": "ga",
-    "To Hall of the Dawning": "hotd",
-    "To Jondo": "jondo",
-    "To Knot of the Three Words": "kottw",
-    "To Library of the Negated Words": "lotnw",
-    "To Mercy Dreams": "md",
-    "To Mother of Mothers": "mom",
-    "To Mountains of the Endless Dusk": "moted",
-    "To Mourning and Havoc": "mah",
-    "To Patio of the Silent Steps": "potss",
-    "To Petrous": "petrous",
-    "To The Holy Line": "thl",
-    "To The Resting Place of the Sister": "trpots",
-    "To The Sleeping Canvases": "tsc",
-    "To Wall of the Holy Prohibitions": "wothp",
-    "To Wasteland of the Buried Churches": "wotbc",
-    "To Where Olive Trees Wither": "wotw",
-    "To Dungeons": "dungeon"
-}
\ No newline at end of file
diff --git a/worlds/blasphemous/Items.py b/worlds/blasphemous/Items.py
index 97dcefde7efa..23cad0f5c4dd 100644
--- a/worlds/blasphemous/Items.py
+++ b/worlds/blasphemous/Items.py
@@ -219,6 +219,12 @@ class ItemDict(TypedDict):
     {'name': "Three Gnarled Tongues",
         'count': 1,
         'classification': ItemClassification.progression},
+    {'name': "Boots of Pleading",
+        'count': 1,
+        'classification': ItemClassification.progression},
+    {'name': "Purified Hand of the Nun",
+        'count': 1,
+        'classification': ItemClassification.progression},
 
     # Mea Culpa Hearts
     {'name': "Smoking Heart of Incense",
@@ -372,7 +378,7 @@ class ItemDict(TypedDict):
         'classification': ItemClassification.progression},
     {'name': "Quicksilver",
         'count': 5,
-        'classification': ItemClassification.useful},
+        'classification': ItemClassification.progression},
     {'name': "Petrified Bell",
         'count': 1,
         'classification': ItemClassification.progression},
@@ -398,7 +404,7 @@ class ItemDict(TypedDict):
     # Skills
     {'name': "Combo Skill",
         'count': 3,
-        'classification': ItemClassification.useful},
+        'classification': ItemClassification.progression},
     {'name': "Charged Skill",
         'count': 3,
         'classification': ItemClassification.progression},
@@ -410,7 +416,13 @@ class ItemDict(TypedDict):
         'classification': ItemClassification.progression},
     {'name': "Lunge Skill",
         'count': 3,
-        'classification': ItemClassification.useful},
+        'classification': ItemClassification.progression},
+    {'name': "Dash Ability",
+        'count': 1,
+        'classification': ItemClassification.progression},
+    {'name': "Wall Climb Ability",
+        'count': 1,
+        'classification': ItemClassification.progression},
 
     # Other
     {'name': "Parietal bone of Lasser, the Inquisitor",
@@ -625,6 +637,23 @@ class ItemDict(TypedDict):
         'classification': ItemClassification.filler}
 ]
 
+event_table: Dict[str, str] = {
+    "OpenedDCGateW": "D01Z05S24",
+    "OpenedDCGateE": "D01Z05S12",
+    "OpenedDCLadder": "D01Z05S20",
+    "OpenedWOTWCave": "D02Z01S06",
+    "RodeGOTPElevator": "D02Z02S11",
+    "OpenedConventLadder": "D02Z03S11",
+    "BrokeJondoBellW": "D03Z02S09",
+    "BrokeJondoBellE": "D03Z02S05",
+    "OpenedMOMLadder": "D04Z02S06",
+    "OpenedTSCGate": "D05Z02S11",
+    "OpenedARLadder": "D06Z01S23",
+    "BrokeBOTTCStatue": "D08Z01S02",
+    "OpenedWOTHPGate": "D09Z01S05",
+    "OpenedBOTSSLadder": "D17Z01S04"
+}
+
 group_table: Dict[str, Set[str]] = {
     "wounds"  : ["Holy Wound of Attrition",
                  "Holy Wound of Contrition",
@@ -634,6 +663,10 @@ class ItemDict(TypedDict):
                  "Mirrored Mask of Dolphos",
                  "Embossed Mask of Crescente"],
 
+    "marks"   : ["Mark of the First Refuge",
+                 "Mark of the Second Refuge",
+                 "Mark of the Third Refuge"],
+
     "tirso"   : ["Bouquet of Rosemary",
                  "Incense Garlic",
                  "Olive Seeds",
diff --git a/worlds/blasphemous/Locations.py b/worlds/blasphemous/Locations.py
index 88065de44220..6dd6e03180b3 100644
--- a/worlds/blasphemous/Locations.py
+++ b/worlds/blasphemous/Locations.py
@@ -1,1295 +1,986 @@
-from typing import List, Set, TypedDict
+from typing import List, TypedDict
 
 
 class LocationDict(TypedDict):
     name: str
-    region: str
     game_id: str
     room: str
 
 
 location_table: List[LocationDict] = [
-    # Albero (35)
+    # Albero
     {'name': "Albero: Tirso's house, top floor",
-        'region': "albero",
         'game_id': "RB01",
         'room': "D01Z02S02"},
     {'name': "Albero: Outside Ossuary",
-        'region': "albero",
         'game_id': "CO43",
         'room': "D01Z02S04"},
     {'name': "Albero: Graveyard",
-        'region': "albero",
         'game_id': "CO16",
         'room': "D01Z02S05"},
     {'name': "Albero: Gate of Travel room",
-        'region': "albero",
         'game_id': "QI65",
         'room': "D01Z02S07"},
     {'name': "Albero: Child of Moonlight",
-        'region': "albero",
         'game_id': "RESCUED_CHERUB_08",
         'room': "D01Z02S03"},
     {'name': "Albero: Bless Linen Cloth",
-        'region': "albero",
         'game_id': "RE04",
         'room': "D01Z02S01"},
     {'name': "Albero: Bless Hatched Egg",
-        'region': "albero",
         'game_id': "RE10",
         'room': "D01Z02S01"},
     {'name': "Albero: Bless Severed Hand",
-        'region': "albero",
         'game_id': "RE02",
         'room': "D01Z02S01"},
     {'name': "Albero: First gift for Cleofas",
-        'region': "albero",
         'game_id': "QI01",
         'room': "D01Z02S03"},
     {'name': "Albero: Final gift for Cleofas",
-        'region': "albero",
         'game_id': "PR11",
-        'room': "D01Z02S03"},
+        'room': "D01BZ04S01"},
     {'name': "Albero: Tirso's 1st reward",
-        'region': "albero",
         'game_id': "QI66",
         'room': "D01Z02S02"},
     {'name': "Albero: Tirso's 2nd reward",
-        'region': "albero",
         'game_id': "Tirso[500]",
         'room': "D01Z02S02"},
     {'name': "Albero: Tirso's 3rd reward",
-        'region': "albero",
         'game_id': "Tirso[1000]",
         'room': "D01Z02S02"},
     {'name': "Albero: Tirso's 4th reward",
-        'region': "albero",
         'game_id': "Tirso[2000]",
         'room': "D01Z02S02"},
     {'name': "Albero: Tirso's 5th reward",
-        'region': "albero",
         'game_id': "Tirso[5000]",
         'room': "D01Z02S02"},
     {'name': "Albero: Tirso's 6th reward",
-        'region': "albero",
         'game_id': "Tirso[10000]",
         'room': "D01Z02S02"},
     {'name': "Albero: Tirso's final reward",
-        'region': "albero",
         'game_id': "QI56",
         'room': "D01Z02S02"},
     {'name': "Albero: Lvdovico's 1st reward",
-        'region': "albero",
         'game_id': "Lvdovico[500]",
         'room': "D01Z02S03"},
     {'name': "Albero: Lvdovico's 2nd reward",
-        'region': "albero",
         'game_id': "Lvdovico[1000]",
         'room': "D01Z02S03"},
     {'name': "Albero: Lvdovico's 3rd reward",
-        'region': "albero",
         'game_id': "PR03",
         'room': "D01Z02S03"},
     {'name': "Ossuary: Isidora, Voice of the Dead",
-        'region': "albero",
         'game_id': "QI201",
         'room': "D01BZ08S01"},
     {'name': "Albero: Mea Culpa altar",
-        'region': "albero",
         'game_id': "Sword[D01Z02S06]",
         'room': "D01Z02S06"},
     {'name': "Albero: Donate 5000 Tears",
-        'region': "albero",
         'game_id': "RB104",
         'room': "D01BZ04S01"},
     {'name': "Albero: Donate 50000 Tears",
-        'region': "albero",
         'game_id': "RB105",
         'room': "D01BZ04S01"},
     {'name': "Ossuary: 1st reward",
-        'region': "albero",
         'game_id': "Undertaker[250]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 2nd reward",
-        'region': "albero",
         'game_id': "Undertaker[500]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 3rd reward",
-        'region': "albero",
         'game_id': "Undertaker[750]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 4th reward",
-        'region': "albero",
         'game_id': "Undertaker[1000]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 5th reward",
-        'region': "albero",
         'game_id': "Undertaker[1250]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 6th reward",
-        'region': "albero",
         'game_id': "Undertaker[1500]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 7th reward",
-        'region': "albero",
         'game_id': "Undertaker[1750]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 8th reward",
-        'region': "albero",
         'game_id': "Undertaker[2000]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 9th reward",
-        'region': "albero",
         'game_id': "Undertaker[2500]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 10th reward",
-        'region': "albero",
         'game_id': "Undertaker[3000]",
         'room': "D01BZ06S01"},
     {'name': "Ossuary: 11th reward",
-        'region': "albero",
         'game_id': "Undertaker[5000]",
         'room': "D01BZ06S01"},
     
-    # All the Tears of the Sea (1)
+    # All the Tears of the Sea
     {'name': "AtTotS: Miriam's gift",
-        'region': "attots",
         'game_id': "PR201",
-        'room': "D04Z04S02"},
+        'room': "D04Z04S01"},
 
-    # Archcathedral Rooftops (11)
+    # Archcathedral Rooftops
     {'name': "AR: First soldier fight",
-        'region': "ar",
         'game_id': "QI02",
         'room': "D06Z01S03"},
     {'name': "AR: Second soldier fight",
-        'region': "ar",
         'game_id': "QI03",
         'room': "D06Z01S06"},
     {'name': "AR: Third soldier fight",
-        'region': "ar",
         'game_id': "QI04",
         'room': "D06Z01S21"},
     {'name': "AR: Upper west shaft ledge",
-        'region': "ar",
         'game_id': "CO06",
         'room': "D06Z01S12"},
     {'name': "AR: Upper west shaft Child of Moonlight",
-        'region': "ar",
         'game_id': "RESCUED_CHERUB_36",
         'room': "D06Z01S12"},
     {'name': "AR: Upper west shaft chest",
-        'region': "ar",
         'game_id': "PR12",
         'room': "D06Z01S12"},
     {'name': "AR: Statue near MoM",
-        'region': "ar",
         'game_id': "HE04",
         'room': "D06Z01S22"},
     {'name': "AR: Lady of the Six Sorrows",
-        'region': "ar",
         'game_id': "Lady[D06Z01S24]",
         'room': "D06Z01S24"},
     {'name': "AR: Upper east shaft ledge",
-        'region': "ar",
         'game_id': "CO40",
         'room': "D06Z01S15"},
     {'name': "AR: Mea Culpa altar",
-        'region': "ar",
         'game_id': "Sword[D06Z01S11]",
         'room': "D06Z01S11"},
     {'name': "AR: Crisanta of the Wrapped Agony",
-        'region': "ar",
         'game_id': "BS16",
         'room': "D06Z01S25"},
 
-    # Bridge of the Three Cavalries (3)
+    # Bridge of the Three Cavalries
     {'name': "BotTC: Esdras, of the Anointed Legion",
-        'region': "bottc",
         'game_id': "BS12",
         'room': "D08Z01S01"},
     {'name': "BotTC: Esdras' gift",
-        'region': "bottc",
         'game_id': "PR09",
         'room': "D08Z01S01"},
     {'name': "BotTC: Inside giant statue",
-        'region': "bottc",
         'game_id': "HE101",
         'room': "D08Z01S02"},
 
-    # Brotherhood of the Silent Sorrow (11)
-    {'name': "BotSS: Beginning gift",
-        'region': "botss",
-        'game_id': "QI106",
-        'room': "D17Z01S01"},
+    # Brotherhood of the Silent Sorrow
     {'name': "BotSS: Starting room Child of Moonlight",
-        'region': "botss",
         'game_id': "RESCUED_CHERUB_06",
         'room': "D17Z01S01"},
     {'name': "BotSS: Starting room ledge",
-        'region': "botss",
         'game_id': "RB204",
         'room': "D17Z01S01"},
     {'name': "BotSS: Chamber of the Eldest Brother",
-        'region': "botss",
         'game_id': "RE01",
-        'room': "D17BZ01S01[relic]"},
+        'room': "D17BZ01S01"},
     {'name': "BotSS: Mea Culpa altar",
-        'region': "botss",
         'game_id': "Sword[D17Z01S08]",
         'room': "D17Z01S08"},
     {'name': "BotSS: Platforming gauntlet",
-        'region': "botss",
         'game_id': "CO25",
-        'room': "D17Z01S04"},
-    {'name': "BotSS: Blue candle",
-        'region': "botss",
-        'game_id': "RB25",
-        'room': "D17Z01S04"},
+        'room': "D17BZ02S01"},
     {'name': "BotSS: Outside church",
-        'region': "botss",
         'game_id': "PR203",
         'room': "D17Z01S14"},
     {'name': "BotSS: Esdras' final gift",
-        'region': "botss",
         'game_id': "QI204",
         'room': "D17Z01S15"},
     {'name': "BotSS: Crisanta's gift",
-        'region': "botss",
         'game_id': "QI301",
         'room': "D17Z01S15"},
     {'name': "BotSS: Warden of the Silent Sorrow",
-        'region': "botss",
         'game_id': "BS13",
         'room': "D17Z01S11"},
     
-    # Convent of Our Lady of the Charred Visage (13)
+    # Convent of Our Lady of the Charred Visage
     {'name': "CoOLotCV: Snowy window ledge",
-        'region': "coolotcv",
         'game_id': "CO05",
         'room': "D02Z03S03"},
     {'name': "CoOLotCV: Center enemy lineup",
-        'region': "coolotcv",
         'game_id': "CO15",
         'room': "D02Z03S07"},
     {'name': "CoOLotCV: Center miasma room",
-        'region': "coolotcv",
         'game_id': "RB08",
         'room': "D02Z03S05"},
     {'name': "CoOLotCV: Lower west statue",
-        'region': "coolotcv",
         'game_id': "HE03",
         'room': "D02Z03S12"},
     {'name': "CoOLotCV: Lady of the Six Sorrows",
-        'region': "coolotcv",
         'game_id': "Lady[D02Z03S15]",
         'room': "D02Z03S15"},
     {'name': "CoOLotCV: Mea Culpa altar",
-        'region': "coolotcv",
         'game_id': "Sword[D02Z03S13]",
         'room': "D02Z03S13"},
-    {'name': "CoOLotCV: Red candle",
-        'region': "coolotcv",
-        'game_id': "RB18",
-        'room': "D02Z03S06"},
-    {'name': "CoOLotCV: Blue candle",
-        'region': "coolotcv",
+    {'name': "CoOLotCV: First blue candle",
         'game_id': "RB24",
         'room': "D02Z03S17"},
     {'name': "CoOLotCV: Outside pathway",
-        'region': "coolotcv",
         'game_id': "RB107",
         'room': "D02Z03S23"},
     {'name': "CoOLotCV: Fountain of burning oil",
-        'region': "coolotcv",
         'game_id': "QI57",
         'room': "D02Z03S21"},
     {'name': "CoOLotCV: Our Lady of the Charred Visage",
-        'region': "coolotcv",
         'game_id': "BS03",
         'room': "D02Z03S20"},
     {'name': "CoOLotCV: Visage of Compunction",
-        'region': "coolotcv",
         'game_id': "QI40",
         'room': "D02Z03S21"},
     {'name': "CoOLotCV: Mask room",
-        'region': "coolotcv",
         'game_id': "QI61",
         'room': "D02Z03S19"},
 
-    # Deambulatory of His Holiness (3)
+    # Deambulatory of His Holiness
     {'name': "DoHH: Viridiana's gift",
-        'region': "dohh",
         'game_id': "PR08",
         'room': "D07Z01S01"},
 
-    # Desecrated Cistern (20)
+    # Desecrated Cistern
     {'name': "DC: Lady of the Six Sorrows, from MD",
-        'region': "dc",
         'game_id': "Lady[D01Z05S22]",
         'room': "D01Z05S22"},
     {'name': "DC: Behind sewage drips",
-        'region': "dc",
         'game_id': "CO41",
         'room': "D01Z05S15"},
     {'name': "DC: Child of Moonlight, above water",
-        'region': "dc",
         'game_id': "RESCUED_CHERUB_11",
         'room': "D01Z05S14"},
     {'name': "DC: Lower east tunnel chest",
-        'region': "dc",
         'game_id': "QI45",
         'room': "D01Z05S11"},
     {'name': "DC: Upper east tunnel chest",
-        'region': "dc",
         'game_id': "PR16",
         'room': "D01Z05S06"},
     {'name': "DC: Upper east Child of Moonlight",
-        'region': "dc",
         'game_id': "RESCUED_CHERUB_13",
         'room': "D01Z05S06"},
     {'name': "DC: Hidden alcove near fountain",
-        'region': "dc",
         'game_id': "QI67",
         'room': "D01Z05S05"},
     {'name': "DC: Shortcut to WotBC",
-        'region': "dc",
         'game_id': "CO09",
         'room': "D01Z05S05"},
     {'name': "DC: Oil of the Pilgrims",
-        'region': "dc",
         'game_id': "Oil[D01Z05S07]",
         'room': "D01Z05S07"},
     {'name': "DC: Child of Moonlight, miasma room",
-        'region': "dc",
         'game_id': "RESCUED_CHERUB_14",
         'room': "D01Z05S08"},
     {'name': "DC: Behind gate in miasma room",
-        'region': "dc",
         'game_id': "QI12",
         'room': "D01Z05S08"},
     {'name': "DC: Child of Moonlight, behind pillar",
-        'region': "dc",
         'game_id': "RESCUED_CHERUB_12",
         'room': "D01Z05S13"},
     {'name': "DC: High ledge near elevator shaft",
-        'region': "dc",
         'game_id': "CO32",
         'room': "D01Z05S17"},
     {'name': "DC: Shroud puzzle",
-        'region': "dc",
         'game_id': "RB03",
-        'room': "D01Z05S21"},
+        'room': "D01BZ05S01"},
     {'name': "DC: Chalice room",
-        'region': "dc",
         'game_id': "QI75",
         'room': "D01Z05S23"},
     {'name': "DC: Mea Culpa altar",
-        'region': "dc",
         'game_id': "Sword[D01Z05S24]",
         'room': "D01Z05S24"},
     {'name': "DC: Lady of the Six Sorrows, elevator shaft",
-        'region': "dc",
         'game_id': "Lady[D01Z05S26]",
         'room': "D01Z05S26"},
     {'name': "DC: Top of elevator Child of Moonlight",
-        'region': "dc",
         'game_id': "RESCUED_CHERUB_15",
         'room': "D01Z05S20"},
     {'name': "DC: Elevator shaft Child of Moonlight",
-        'region': "dc",
         'game_id': "RESCUED_CHERUB_22",
         'room': "D01Z05S25"},
     {'name': "DC: Elevator shaft ledge",
-        'region': "dc",
         'game_id': "CO44",
         'room': "D01Z05S25"},
 
-    # Echoes of Salt (2)
+    # Echoes of Salt
     {'name': "EoS: Lantern jump near MotED",
-        'region': "eos",
         'game_id': "RB108",
         'room': "D20Z01S02"},
     {'name': "EoS: Lantern jump near elevator",
-        'region': "eos",
         'game_id': "RB202",
         'room': "D20Z01S09"},
     
-    # Graveyard of the Peaks (21)
+    # Graveyard of the Peaks
     {'name': "GotP: Shop cave Child of Moonlight",
-        'region': "gotp",
         'game_id': "RESCUED_CHERUB_31",
         'room': "D02Z02S08"},
     {'name': "GotP: Shop cave hidden hole",
-        'region': "gotp",
         'game_id': "CO42",
         'room': "D02Z02S08"},
     {'name': "GotP: Shop item 1",
-        'region': "gotp",
         'game_id': "QI11",
-        'room': "D02BZ01S01"},
+        'room': "D02BZ02S01"},
     {'name': "GotP: Shop item 2",
-        'region': "gotp",
         'game_id': "RB37",
-        'room': "D02BZ01S01"},
+        'room': "D02BZ02S01"},
     {'name': "GotP: Shop item 3",
-        'region': "gotp",
         'game_id': "RB02",
-        'room': "D02BZ01S01"},
+        'room': "D02BZ02S01"},
     {'name': "GotP: Confessor Dungeon room",
-        'region': "gotp",
         'game_id': "RB38",
         'room': "D02Z02S06"},
     {'name': "GotP: Elevator shaft Child of Moonlight",
-        'region': "gotp",
         'game_id': "RESCUED_CHERUB_26",
         'room': "D02Z02S11"},
     {'name': "GotP: Elevator shaft ledge",
-        'region': "gotp",
         'game_id': "QI53",
         'room': "D02Z02S11"},
     {'name': "GotP: Lady of the Six Sorrows",
-        'region': "gotp",
         'game_id': "Lady[D02Z02S12]",
         'room': "D02Z02S12"},
     {'name': "GotP: Self sacrifice statue",
-        'region': "gotp",
         'game_id': "HE11",
         'room': "D02Z02S13"},
     {'name': "GotP: Lower east shaft",
-        'region': "gotp",
         'game_id': "QI46",
         'room': "D02Z02S03"},
     {'name': "GotP: Center east shaft",
-        'region': "gotp",
         'game_id': "CO29",
         'room': "D02Z02S03"},
     {'name': "GotP: Upper east shaft",
-        'region': "gotp",
         'game_id': "QI08",
         'room': "D02Z02S03"},
     {'name': "GotP: East cliffside",
-        'region': "gotp",
         'game_id': "RB106",
         'room': "D02Z02S14"},
     {'name': "GotP: West shaft Child of Moonlight",
-        'region': "gotp",
         'game_id': "RESCUED_CHERUB_25",
         'room': "D02Z02S04"},
     {'name': "GotP: Lower west shaft",
-        'region': "gotp",
         'game_id': "RB32",
         'room': "D02Z02S04"},
     {'name': "GotP: Upper west shaft",
-        'region': "gotp",
         'game_id': "CO01",
         'room': "D02Z02S04"},
     {'name': "GotP: Center shaft Child of Moonlight",
-        'region': "gotp",
         'game_id': "RESCUED_CHERUB_24",
         'room': "D02Z02S02"},
     {'name': "GotP: Center shaft ledge",
-        'region': "gotp",
         'game_id': "RB15",
         'room': "D02Z02S05"},
     {'name': "GotP: Oil of the Pilgrims",
-        'region': "gotp",
         'game_id': "Oil[D02Z02S10]",
         'room': "D02Z02S10"},
     {'name': "GotP: Amanecida of the Bejeweled Arrow",
-        'region': "gotp",
-        'game_id': "D02Z02S14[18000]",
+        'game_id': "Amanecida[D02Z02S14]",
         'room': "D02Z02S14"},
     
-    # Grievance Ascends (12)
+    # Grievance Ascends
     {'name': "GA: Lower west ledge",
-        'region': "ga",
         'game_id': "QI44",
         'room': "D03Z03S02"},
     {'name': "GA: Miasma room treasure",
-        'region': "ga",
         'game_id': "RE07",
         'room': "D03Z03S06"},
     {'name': "GA: Miasma room Child of Moonlight",
-        'region': "ga",
         'game_id': "RESCUED_CHERUB_19",
         'room': "D03Z03S06"},
     {'name': "GA: Miasma room floor",
-        'region': "ga",
         'game_id': "CO12",
         'room': "D03Z03S06"},
     {'name': "GA: Oil of the Pilgrims",
-        'region': "ga",
         'game_id': "Oil[D03Z03S13]",
         'room': "D03Z03S13"},
     {'name': "GA: End of blood bridge",
-        'region': "ga",
         'game_id': "QI10",
         'room': "D03Z03S08"},
     {'name': "GA: Blood bridge Child of Moonlight",
-        'region': "ga",
         'game_id': "RESCUED_CHERUB_21",
         'room': "D03Z03S08"},
     {'name': "GA: Lower east Child of Moonlight",
-        'region': "ga",
         'game_id': "RESCUED_CHERUB_20",
         'room': "D03Z03S09"},
     {'name': "GA: Altasgracias' gift",
-        'region': "ga",
         'game_id': "QI13",
         'room': "D03Z03S10"},
     {'name': "GA: Empty giant egg",
-        'region': "ga",
         'game_id': "RB06",
         'room': "D03Z03S10"},
     {'name': "GA: Tres Angustias",
-        'region': "ga",
         'game_id': "BS04",
         'room': "D03Z03S15"},
     {'name': "GA: Visage of Contrition",
-        'region': "ga",
         'game_id': "QI39",
         'room': "D03Z03S16"},
     
-    # Hall of the Dawning (2)
+    # Hall of the Dawning
     {'name': "HotD: Mirror room",
-        'region': "hotd",
         'game_id': "QI105",
-        'room': "D08Z02S01"},
+        'room': "D08Z03S01"},
     {'name': "HotD: Laudes, the First of the Amanecidas",
-        'region': "hotd",
         'game_id': "LaudesBossTrigger[30000]",
-        'room': "D08Z02S03"},
+        'room': "D08Z03S03"},
     
-    # Jondo (13)
+    # Jondo
     {'name': "Jondo: Upper east ledge",
-        'region': "jondo",
         'game_id': "CO08",
-        'room': "D03Z03S01"},
+        'room': "D03Z02S01"},
     {'name': "Jondo: Upper east chest",
-        'region': "jondo",
         'game_id': "PR10",
-        'room': "D03Z03S01"},
+        'room': "D03Z02S01"},
     {'name': "Jondo: Lower east under chargers",
-        'region': "jondo",
         'game_id': "CO33",
-        'room': "D03Z03S04"},
+        'room': "D03Z02S04"},
     {'name': "Jondo: Lower east bell trap",
-        'region': "jondo",
         'game_id': "QI19",
-        'room': "D03Z03S06"},
+        'room': "D03Z02S06"},
     {'name': "Jondo: Upper east Child of Moonlight",
-        'region': "jondo",
         'game_id': "RESCUED_CHERUB_18",
-        'room': "D03Z03S05"},
+        'room': "D03Z02S05"},
     {'name': "Jondo: Spike tunnel Child of Moonlight",
-        'region': "jondo",
         'game_id': "RESCUED_CHERUB_37",
-        'room': "D03Z03S11"},
+        'room': "D03Z02S11"},
     {'name': "Jondo: Spike tunnel statue",
-        'region': "jondo",
         'game_id': "HE06",
-        'room': "D03Z03S11"},
+        'room': "D03Z02S11"},
     {'name': "Jondo: Spike tunnel cave",
-        'region': "jondo",
         'game_id': "QI103",
-        'room': "D03Z03S15"},
+        'room': "D03Z02S15"},
     {'name': "Jondo: Lower west lift alcove",
-        'region': "jondo",
         'game_id': "CO07",
-        'room': "D03Z03S07"},
+        'room': "D03Z02S07"},
     {'name': "Jondo: Lower west bell alcove",
-        'region': "jondo",
         'game_id': "QI41",
-        'room': "D03Z03S08"},
+        'room': "D03Z02S08"},
     {'name': "Jondo: Upper west bell puzzle",
-        'region': "jondo",
         'game_id': "QI52",
-        'room': "D03Z03S12"},
+        'room': "D03Z02S12"},
     {'name': "Jondo: Upper west tree root",
-        'region': "jondo",
         'game_id': "RB28",
-        'room': "D03Z03S13"},
+        'room': "D03Z02S13"},
     {'name': "Jondo: Upper west Child of Moonlight",
-        'region': "jondo",
         'game_id': "RESCUED_CHERUB_17",
-        'room': "D03Z03S10"},
+        'room': "D03Z02S10"},
     
-    # Knot of the Three Words (1)
+    # Knot of the Three Words
     {'name': "KotTW: Gift from the Traitor",
-        'region': "kottw",
         'game_id': "HE201",
         'room': "D04Z03S02"},
     
-    # Library of the Negated Words (18)
+    # Library of the Negated Words
     {'name': "LotNW: Platform room Child of Moonlight",
-        'region': "lotnw",
         'game_id': "RESCUED_CHERUB_01",
         'room': "D05Z01S04"},
     {'name': "LotNW: Platform room ledge",
-        'region': "lotnw",
         'game_id': "CO18",
         'room': "D05Z01S04"},
     {'name': "LotNW: Root ceiling platform",
-        'region': "lotnw",
         'game_id': "CO22",
         'room': "D05Z01S05"},
     {'name': "LotNW: Hidden floor",
-        'region': "lotnw",
         'game_id': "QI50",
         'room': "D05Z01S05"},
     {'name': "LotNW: Miasma hallway chest",
-        'region': "lotnw",
         'game_id': "RB31",
         'room': "D05Z01S06"},
     {'name': "LotNW: Lady of the Six Sorrows",
-        'region': "lotnw",
         'game_id': "Lady[D05Z01S14]",
         'room': "D05Z01S14"},
     {'name': "LotNW: Bone puzzle",
-        'region': "lotnw",
         'game_id': "PR15",
         'room': "D05Z01S18"},
     {'name': "LotNW: Lowest west upper ledge",
-        'region': "lotnw",
         'game_id': "CO28",
         'room': "D05Z01S11"},
     {'name': "LotNW: Platform puzzle chest",
-        'region': "lotnw",
         'game_id': "PR07",
         'room': "D05Z01S10"},
     {'name': "LotNW: Lowest west center ledge",
-        'region': "lotnw",
         'game_id': "RB30",
         'room': "D05Z01S11"},
     {'name': "LotNW: Lowest west Child of Moonlight",
-        'region': "lotnw",
         'game_id': "RESCUED_CHERUB_02",
         'room': "D05Z01S11"},
     {'name': "LotNW: Oil of the Pilgrims",
-        'region': "lotnw",
         'game_id': "Oil[D05Z01S19]",
         'room': "D05Z01S19"},
     {'name': "LotNW: Elevator Child of Moonlight",
-        'region': "lotnw",
         'game_id': "RESCUED_CHERUB_32",
         'room': "D05Z01S21"},
     {'name': "LotNW: Mask room",
-        'region': "lotnw",
         'game_id': "QI62",
         'room': "D05Z01S15"},
     {'name': "LotNW: Mea Culpa altar",
-        'region': "lotnw",
         'game_id': "Sword[D05Z01S13]",
         'room': "D05Z01S13"},
-    {'name': "LotNW: Red candle",
-        'region': "lotnw",
-        'game_id': "RB19",
-        'room': "D05Z01S02"},
     {'name': "LotNW: Silence for Diosdado",
-        'region': "lotnw",
         'game_id': "RB203",
-        'room': "D05Z01S11"}, # ?
+        'room': "D05Z01S11"},
     {'name': "LotNW: Twisted wood hidden wall",
-        'region': "lotnw",
         'game_id': "RB301",
         'room': "D05BZ01S01"},
 
-    # Mercy Dreams (15)
+    # Mercy Dreams
     {'name': "MD: First area hidden wall",
-        'region': "md",
         'game_id': "CO30",
         'room': "D01Z04S05"},
     {'name': "MD: Second area trapped chest",
-        'region': "md",
         'game_id': "PR01",
         'room': "D01Z04S07"},
     {'name': "MD: Second area ledge",
-        'region': "md",
         'game_id': "CO03",
         'room': "D01Z04S06"},
     {'name': "MD: Second area Child of Moonlight",
-        'region': "md",
         'game_id': "RESCUED_CHERUB_09",
         'room': "D01Z04S06"},
-    {'name': "MD: Red candle",
-        'region': "md",
+    {'name': "MD: First red candle",
         'game_id': "RB17",
         'room': "D01Z04S08"},
     {'name': "MD: Shop item 1",
-        'region': "md",
         'game_id': "QI58",
         'room': "D01BZ02S01"},
     {'name': "MD: Shop item 2",
-        'region': "md",
         'game_id': "RB05",
         'room': "D01BZ02S01"},
     {'name': "MD: Shop item 3",
-        'region': "md",
         'game_id': "RB09",
         'room': "D01BZ02S01"},
     {'name': "MD: Third area hidden room",
-        'region': "md",
         'game_id': "QI48",
         'room': "D01Z04S11"},
     {'name': "MD: Sliding challenge",
-        'region': "md",
         'game_id': "CO38",
         'room': "D01Z04S14"},
     {'name': "MD: Ten Piedad",
-        'region': "md",
         'game_id': "BS01",
         'room': "D01Z04S18"},
     {'name': "MD: Visage of Attrition",
-        'region': "md",
         'game_id': "QI38",
         'room': "D01Z04S19"},
-    {'name': "MD: Blue candle",
-        'region': "md",
-        'game_id': "RB26",
-        'room': "D01Z04S16"},
     {'name': "MD: Cave Child of Moonlight",
-        'region': "md",
         'game_id': "RESCUED_CHERUB_33",
         'room': "D01Z04S16"}, 
     {'name': "MD: Behind gate to TSC",
-        'region': "md",
         'game_id': "CO21",
         'room': "D01Z04S13"},
 
-    # Mother of Mothers (14)
+    # Mother of Mothers
     {'name': "MoM: Oil of the Pilgrims",
-        'region': "mom",
         'game_id': "Oil[D04Z02S14]",
         'room': "D04Z02S14"},
     {'name': "MoM: Upper east ledge",
-        'region': "mom",
         'game_id': "RB33",
         'room': "D04Z02S07"},
     {'name': "MoM: East chandelier platform",
-        'region': "mom",
         'game_id': "CO35",
-        'room': "D04Z02S"},
+        'room': "D04Z02S07"},
     {'name': "MoM: Lower west Child of Moonlight",
-        'region': "mom",
         'game_id': "RESCUED_CHERUB_30",
-        'room': ""},
+        'room': "D04Z02S01"},
     {'name': "MoM: Upper west floor",
-        'region': "mom",
         'game_id': "CO17",
         'room': "D04Z02S02"},
     {'name': "MoM: Redento's treasure",
-        'region': "mom",
         'game_id': "RE03",
         'room': "D04BZ02S01"},
     {'name': "MoM: Final meeting with Redento",
-        'region': "mom",
         'game_id': "QI54",
         'room': "D04BZ02S01"},
     {'name': "MoM: Giant chandelier statue",
-        'region': "mom",
         'game_id': "HE01",
         'room': "D04Z02S16"},
     {'name': "MoM: Outside Cleofas' room",
-        'region': "mom",
         'game_id': "CO34",
         'room': "D04Z02S06"},
     {'name': "MoM: Upper center floor",
-        'region': "mom",
         'game_id': "CO20",
         'room': "D04Z02S11"},
     {'name': "MoM: Upper center Child of Moonlight",
-        'region': "mom",
         'game_id': "RESCUED_CHERUB_29",
-        'room': ""},
+        'room': "D04Z02S11"},
     {'name': "MoM: Mea Culpa altar",
-        'region': "mom",
         'game_id': "Sword[D04Z02S12]",
         'room': "D04Z02S12"},
     {'name': "MoM: Melquiades, The Exhumed Archbishop",
-        'region': "mom",
         'game_id': "BS05",
         'room': "D04Z02S22"},
     {'name': "MoM: Mask room",
-        'region': "mom",
         'game_id': "QI60",
         'room': "D04Z02S15"},
 
-    # Mountains of the Endless Dusk (8)
+    # Mountains of the Endless Dusk
     {'name': "MotED: Under entrance to DC",
-        'region': "moted",
         'game_id': "CO13",
         'room': "D03Z01S01"},
     {'name': "MotED: Perpetva",
-        'region': "moted",
         'game_id': "RB13",
         'room': "D03Z01S06"},
     {'name': "MotED: Child of Moonlight, above chasm",
-        'region': "moted",
         'game_id': "RESCUED_CHERUB_16",
         'room': "D03Z01S03"},
     {'name': "MotED: Platform above chasm",
-        'region': "moted",
         'game_id': "QI47",
         'room': "D03Z01S03"},
     {'name': "MotED: 1st meeting with Redento",
-        'region': "moted",
         'game_id': "RB22",
         'room': "D03Z01S03"},
     {'name': "MotED: Blood platform alcove",
-        'region': "moted",
         'game_id': "QI63",
         'room': "D03Z01S04"},
     {'name': "MotED: Egg hatching",
-        'region': "moted",
         'game_id': "QI14",
         'room': "D03Z01S06"},
     {'name': "MotED: Amanecida of the Golden Blades",
-        'region': "moted",
-        'game_id': "D03Z01S03[18000]",
+        'game_id': "Amanecida[D03Z01S03]",
         'room': "D03Z01S03"},
 
-    # Mourning and Havoc (4)
+    # Mourning and Havoc
     {'name': "MaH: West chest",
-        'region': "mah",
         'game_id': "PR202",
         'room': "D20Z02S11"},
     {'name': "MaH: Upper east chest",
-        'region': "mah",
         'game_id': "RB201",
         'room': "D20Z02S02"},
     {'name': "MaH: Sierpes' eye",
-        'region': "mah",
         'game_id': "QI202",
         'room': "D20Z02S08"},
     {'name': "MaH: Sierpes",
-        'region': "mah",
         'game_id': "BossTrigger[5000]",
         'room': "D20Z02S08"},
     
-    # Patio of the Silent Steps (9)
+    # Patio of the Silent Steps
     {'name': "PotSS: First area Child of Moonlight",
-        'region': "potss",
         'game_id': "RESCUED_CHERUB_35",
         'room': "D04Z01S01"},
     {'name': "PotSS: First area ledge",
-        'region': "potss",
         'game_id': "CO23",
         'room': "D04Z01S01"},
     {'name': "PotSS: Second area ledge",
-        'region': "potss",
         'game_id': "RB14",
         'room': "D04Z01S02"},
     {'name': "PotSS: Third area Child of Moonlight",
-        'region': "potss",
         'game_id': "RESCUED_CHERUB_28",
         'room': "D04Z01S03"},
     {'name': "PotSS: Third area lower ledge",
-        'region': "potss",
         'game_id': "QI37",
         'room': "D04Z01S03"},
     {'name': "PotSS: Third area upper ledge",
-        'region': "potss",
         'game_id': "CO39",
         'room': "D04Z01S03"},
     {'name': "PotSS: Climb to WotHP",
-        'region': "potss",
         'game_id': "QI102",
-        'room': "D04Z01S05"},
+        'room': "D04Z01S06"},
     {'name': "PotSS: 4th meeting with Redento",
-        'region': "potss",
         'game_id': "RB21",
-        'room': "D04Z01S01"},
+        'room': "D04Z01S04"},
     {'name': "PotSS: Amanecida of the Chiselled Steel",
-        'region': "potss",
-        'game_id': "D04Z01S04[18000]",
+        'game_id': "Amanecida[D04Z01S04]",
         'room': "D04Z01S04"},
 
-    # Petrous (1)
+    # Petrous
     {'name': "Petrous: Temple entrance",
-        'region': "petrous",
         'game_id': "QI101",
         'room': "D01Z06S01"},
 
-    # The Resting Place of the Sister (1)
+    # The Resting Place of the Sister
     {'name': "TRPotS: Perpetva's shrine",
-        'region': "trpots",
         'game_id': "QI203",
         'room': "D20Z03S01"},
     
-    # The Sleeping Canvases (10)
+    # The Sleeping Canvases
     {'name': "TSC: Painting ladder ledge",
-        'region': "tsc",
         'game_id': "QI64",
         'room': "D05Z02S02"},
     {'name': "TSC: Candle wax puzzle",
-        'region': "tsc",
         'game_id': "HE07",
         'room': "D05Z02S08"},
     {'name': "TSC: Shop item 1",
-        'region': "tsc",
         'game_id': "RB12",
         'room': "D05BZ02S01"},
     {'name': "TSC: Shop item 2",
-        'region': "tsc",
         'game_id': "QI49",
         'room': "D05BZ02S01"},
     {'name': "TSC: Shop item 3",
-        'region': "tsc",
         'game_id': "QI71",
         'room': "D05BZ02S01"},
     {'name': "TSC: Swinging blade tunnel",
-        'region': "tsc",
         'game_id': "QI104",
         'room': "D05Z02S15"},
     {'name': "TSC: Exposito, Scion of Abjuration",
-        'region': "tsc",
         'game_id': "BS06",
         'room': "D05Z02S14"},
     {'name': "TSC: Under elevator shaft",
-        'region': "tsc",
         'game_id': "CO31",
         'room': "D05Z02S11"},
     {'name': "TSC: Jocinero's 1st reward",
-        'region': "tsc",
         'game_id': "RE05",
-        'room': "D05Z02S10"}, # ?
+        'room': "D05Z02S10"},
     {'name': "TSC: Jocinero's final reward",
-        'region': "tsc",
         'game_id': "PR05",
-        'room': "D05Z02S10"}, # ?
+        'room': "D05Z02S10"},
 
-    # The Holy Line (6)
+    # The Holy Line
     {'name': "THL: Deogracias' gift",
-        'region': "thl",
         'game_id': "QI31",
         'room': "D01Z01S07"},
     {'name': "THL: Hanging skeleton",
-        'region': "thl",
         'game_id': "PR14",
         'room': "D01Z01S02"},
     {'name': "THL: Across blood platforms",
-        'region': "thl",
         'game_id': "RB07",
         'room': "D01Z01S02"},
     {'name': "THL: Child of Moonlight",
-        'region': "thl",
         'game_id': "RESCUED_CHERUB_07",
         'room': "D01Z01S03"},
     {'name': "THL: Underground ledge",
-        'region': "thl",
         'game_id': "CO04",
         'room': "D01Z01S03"},
     {'name': "THL: Underground chest",
-        'region': "thl",
         'game_id': "QI55",
         'room': "D01Z01S03"},
 
-    # Wall of the Holy Prohibitions (19)
+    # Wall of the Holy Prohibitions
     {'name': "WotHP: Upper east room, lift puzzle",
-        'region': "wothp",
         'game_id': "RB11",
         'room': "D09Z01S02"},
     {'name': "WotHP: Upper east room, center cell ledge",
-        'region': "wothp",
         'game_id': "CO10",
-        'room': "D09BZ01S01[Cell22]"},
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Upper east room, center cell floor",
-        'region': "wothp",
         'game_id': "QI69",
-        'room': "D09BZ01S01[Cell22]"},
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Upper east room, top bronze cell",
-        'region': "wothp",
         'game_id': "RESCUED_CHERUB_03",
-        'room': "D09BZ01S01[Cell1]"},
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Upper east room, top silver cell",
-        'region': "wothp",
         'game_id': "CO24",
-        'room': "D09BZ01S01[Cell6]"},
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Upper east room, center gold cell",
-        'region': "wothp",
         'game_id': "QI51",
         'room': "D09Z01S02"},
     {'name': "WotHP: Upper west room, center gold cell",
-        'region': "wothp",
         'game_id': "CO26",
-        'room': "D09BZ01S01[Cell16]"},
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Lower west room, bottom gold cell",
-        'region': "wothp",
         'game_id': "CO02",
-        'room': "D09BZ01S01[Cell21]"},
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Upper west room, top silver cell",
-        'region': "wothp",
         'game_id': "RESCUED_CHERUB_34",
-        'room': "D09BZ01S01[Cell17~18]"}, # ?
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Lower west room, top ledge",
-        'region': "wothp",
         'game_id': "RB16",
-        'room': "D09BZ01S01[Cell24]"},
+        'room': "D09Z01S09"},
     {'name': "WotHP: Lower east room, hidden ledge",
-        'region': "wothp",
         'game_id': "CO27",
         'room': "D09Z01S10"},
     {'name': "WotHP: Lower east room, bottom silver cell",
-        'region': "wothp",
         'game_id': "RESCUED_CHERUB_04",
-        'room': "D09BZ01S01[Cell11]"},
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Lower east room, top bronze cell",
-        'region': "wothp",
         'game_id': "QI70",
         'room': "D09Z01S10"},
     {'name': "WotHP: Lower east room, top silver cell",
-        'region': "wothp",
         'game_id': "CO37",
-        'room': "D09BZ01S01[Cell10]"},
+        'room': "D09BZ01S01"},
     {'name': "WotHP: Outside Child of Moonlight",
-        'region': "wothp",
         'game_id': "RESCUED_CHERUB_05",
         'room': "D09Z01S06"},
     {'name': "WotHP: Oil of the Pilgrims",
-        'region': "wothp",
         'game_id': "Oil[D09Z01S12]",
         'room': "D09Z01S12"},
     {'name': "WotHP: Quirce, Returned By The Flames",
-        'region': "wothp",
         'game_id': "BS14",
         'room': "D09Z01S03"},
     {'name': "WotHP: Collapsing floor ledge",
-        'region': "wothp",
         'game_id': "QI72",
         'room': "D09Z01S08"},
     {'name': "WotHP: Amanecida of the Molten Thorn",
-        'region': "wothp",
-        'game_id': "D09Z01S01[18000]",
+        'game_id': "Amanecida[D09Z01S01]",
         'room': "D09Z01S01"},
 
-    # Wasteland of the Buried Churches (8)
+    # Wasteland of the Buried Churches
     {'name': "WotBC: Lower log path",
-        'region': "wotbc",
         'game_id': "RB04",
         'room': "D01Z03S01"},
     {'name': "WotBC: Hidden alcove",
-        'region': "wotbc",
         'game_id': "CO14",
         'room': "D01Z03S02"},
     {'name': "WotBC: Outside ledge",
-        'region': "wotbc",
         'game_id': "CO36",
         'room': "D01Z03S03"},
     {'name': "WotBC: Outside Child of Moonlight",
-        'region': "wotbc",
         'game_id': "RESCUED_CHERUB_10",
         'room': "D01Z03S03"},
     {'name': "WotBC: Under broken bridge",
-        'region': "wotbc",
         'game_id': "QI06",
         'room': "D01Z03S05"},
     {'name': "WotBC: Cliffside statue",
-        'region': "wotbc",
         'game_id': "HE02",
         'room': "D01Z03S07"},
     {'name': "WotBC: Cliffside Child of Moonlight",
-        'region': "wotbc",
         'game_id': "RESCUED_CHERUB_38",
         'room': "D01Z03S07"},
     {'name': "WotBC: 3rd meeting with Redento",
-        'region': "wotbc",
         'game_id': "RB20",
-        'room': "D01Z03S01"}, # ?
+        'room': "D01Z03S06"},
     
-    # Where Olive Trees Wither (11)
+    # Where Olive Trees Wither
     {'name': "WOTW: Below Prie Dieu",
-        'region': "wotw",
         'game_id': "CO11",
         'room': "D02Z01S01"},
     {'name': "WOTW: Entrance to tomb",
-        'region': "wotw",
         'game_id': "QI20",
         'room': "D02Z01S04"},
     {'name': "WOTW: Gift for the tomb",
-        'region': "wotw",
         'game_id': "QI68",
-        'room': "D02Z01S"},
+        'room': "D02Z01S04"},
     {'name': "WOTW: Underground tomb",
-        'region': "wotw",
         'game_id': "PR04",
         'room': "D02Z01S08"},
     {'name': "WOTW: Underground Child of Moonlight",
-        'region': "wotw",
         'game_id': "RESCUED_CHERUB_27",
         'room': "D02Z01S06"},
     {'name': "WOTW: Underground ledge",
-        'region': "wotw",
         'game_id': "CO19",
         'room': "D02Z01S06"},
     {'name': "WOTW: Upper east Child of Moonlight",
-        'region': "wotw",
         'game_id': "RESCUED_CHERUB_23",
-        'room': "D02Z01S09"},
+        'room': "D02Z01S02"},
     {'name': "WOTW: Upper east statue",
-        'region': "wotw",
         'game_id': "HE05",
         'room': "D02Z01S09"},
     {'name': "WOTW: Death run",
-        'region': "wotw",
         'game_id': "QI07",
         'room': "D02Z01S05"},
     {'name': "WOTW: Gemino's gift",
-        'region': "wotw",
         'game_id': "QI59",
         'room': "D02Z01S01"},
     {'name': "WOTW: Gemino's reward",
-        'region': "wotw",
         'game_id': "RB10",
         'room': "D02Z01S01"},
 
-    # Various (20)
+    # Various
+    {'name': "Beginning gift",
+        'game_id': "QI106",
+        'room': "Misc"},
+    {'name': "Second red candle",
+        'game_id': "RB18",
+        'room': "Misc"},
+    {'name': "Third red candle",
+        'game_id': "RB19",
+        'room': "Misc"},
+    {'name': "Second blue candle",
+        'game_id': "RB25",
+        'room': "Misc"},
+    {'name': "Third blue candle",
+        'game_id': "RB26",
+        'room': "Misc"},
     {'name': "Confessor Dungeon 1 extra",
-        'region': "dungeon",
         'game_id': "Arena_NailManager[1000]",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 1 main",
-        'region': "dungeon",
         'game_id': "QI32",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 2 extra",
-        'region': "dungeon",
         'game_id': "HE10",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 2 main",
-        'region': "dungeon",
         'game_id': "QI33",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 3 extra",
-        'region': "dungeon",
         'game_id': "Arena_NailManager[3000]",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 3 main",
-        'region': "dungeon",
         'game_id': "QI34",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 4 extra",
-        'region': "dungeon",
         'game_id': "RB34",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 4 main",
-        'region': "dungeon",
         'game_id': "QI35",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 5 extra",
-        'region': "dungeon",
         'game_id': "Arena_NailManager[5000]",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 5 main",
-        'region': "dungeon",
         'game_id': "QI79",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 6 extra",
-        'region': "dungeon",
         'game_id': "RB35",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 6 main",
-        'region': "dungeon",
         'game_id': "QI80",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 7 extra",
-        'region': "dungeon",
         'game_id': "RB36",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Confessor Dungeon 7 main",
-        'region': "dungeon",
         'game_id': "QI81",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Defeat 1 Amanecida",
-        'region': "dungeon",
         'game_id': "QI107",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Defeat 2 Amanecidas",
-        'region': "dungeon",
         'game_id': "QI108",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Defeat 3 Amanecidas",
-        'region': "dungeon",
         'game_id': "QI109",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Defeat 4 Amanecidas",
-        'region': "dungeon",
         'game_id': "QI110",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Defeat all Amanecidas",
-        'region': "dungeon",
         'game_id': "PR101",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 1, Tier 1",
-        'region': "dungeon",
         'game_id': "COMBO_1",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 1, Tier 2",
-        'region': "dungeon",
         'game_id': "COMBO_2",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 1, Tier 3",
-        'region': "dungeon",
         'game_id': "COMBO_3",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 2, Tier 1",
-        'region': "dungeon",
         'game_id': "CHARGED_1",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 2, Tier 2",
-        'region': "dungeon",
         'game_id': "CHARGED_2",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 2, Tier 3",
-        'region': "dungeon",
         'game_id': "CHARGED_3",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 3, Tier 1",
-        'region': "dungeon",
         'game_id': "RANGED_1",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 3, Tier 2",
-        'region': "dungeon",
         'game_id': "RANGED_2",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 3, Tier 3",
-        'region': "dungeon",
         'game_id': "RANGED_3",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 4, Tier 1",
-        'region': "dungeon",
         'game_id': "VERTICAL_1",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 4, Tier 2",
-        'region': "dungeon",
         'game_id': "VERTICAL_2",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 4, Tier 3",
-        'region': "dungeon",
         'game_id': "VERTICAL_3",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 5, Tier 1",
-        'region': "dungeon",
         'game_id': "LUNGE_1",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 5, Tier 2",
-        'region': "dungeon",
         'game_id': "LUNGE_2",
-        'room': "dungeon"},
+        'room': "Misc"},
     {'name': "Skill 5, Tier 3",
-        'region': "dungeon",
         'game_id': "LUNGE_3",
-        'room': "dungeon"},
-]
+        'room': "Misc"},
 
-shop_set: Set[str] = [
-    "GotP: Shop item 1",
-    "GotP: Shop item 2",
-    "GotP: Shop item 3",
-    "MD: Shop item 1",
-    "MD: Shop item 2",
-    "MD: Shop item 3",
-    "TSC: Shop item 1",
-    "TSC: Shop item 2",
-    "TSC: Shop item 3"
+    # Custom Items
+    {'name': "BotSS: 2nd meeting with Redento",
+        'game_id': "RE401",
+        'room': "D17Z01S04"},
+    {'name': "MoM: Western room ledge",
+        'game_id': "RE402",
+        'room': "D04Z02S01"}
 ]
\ No newline at end of file
diff --git a/worlds/blasphemous/Options.py b/worlds/blasphemous/Options.py
index b3bb3a6bf53d..ea304d22ed66 100644
--- a/worlds/blasphemous/Options.py
+++ b/worlds/blasphemous/Options.py
@@ -1,4 +1,22 @@
-from Options import Choice, Toggle, DefaultOnToggle, DeathLink
+from Options import Choice, Toggle, DefaultOnToggle, DeathLink, StartInventoryPool
+import random
+
+
+class ChoiceIsRandom(Choice):
+    randomized: bool = False
+
+    @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)))
+        for option_name, value in cls.options.items():
+            if option_name == text:
+                return cls(value)
+        raise KeyError(
+            f'Could not find option "{text}" for "{cls.__name__}", '
+            f'known options are {", ".join(f"{option}" for option in cls.name_lookup.values())}')
 
 
 class PrieDieuWarp(DefaultOnToggle):
@@ -17,13 +35,12 @@ class CorpseHints(DefaultOnToggle):
 
 
 class Difficulty(Choice):
-    """Adjusts the logic required to defeat bosses.
-    Impossible: Removes all logic requirements for bosses. Good luck."""
+    """Adjusts the overall difficulty of the randomizer, including upgrades required to defeat bosses 
+    and advanced movement tricks or glitches."""
     display_name = "Difficulty"
     option_easy = 0
     option_normal = 1
     option_hard = 2
-    option_impossible = 3
     default = 1
 
 
@@ -32,9 +49,20 @@ class Penitence(Toggle):
     display_name = "Penitence"
 
 
-class ExpertLogic(Toggle):
-    """Expands the logic used by the randomizer to allow for some difficult and/or lesser known tricks."""
-    display_name = "Expert Logic"
+class StartingLocation(ChoiceIsRandom):
+    """Choose where to start the randomizer. Note that some starting locations cannot be chosen with certain 
+    other options.
+    Specifically, Brotherhood and Mourning And Havoc cannot be chosen if Shuffle Dash is enabled, and Grievance Ascends 
+    cannot be chosen if Shuffle Wall Climb is enabled."""
+    display_name = "Starting Location"
+    option_brotherhood = 0
+    option_albero = 1
+    option_convent = 2
+    option_grievance = 3
+    option_knot_of_words = 4
+    option_rooftops = 5
+    option_mourning_havoc = 6
+    default = 0
 
 
 class Ending(Choice):
@@ -48,6 +76,13 @@ class Ending(Choice):
     default = 0
 
 
+class SkipLongQuests(Toggle):
+    """Ensures that the rewards for long quests will be filler items.
+    Affected locations: \"Albero: Donate 50000 Tears\", \"Ossuary: 11th reward\", \"AtTotS: Miriam's gift\", 
+    \"TSC: Jocinero's final reward\""""
+    display_name = "Skip Long Quests"
+
+
 class ThornShuffle(Choice):
     """Shuffles the Thorn given by Deogracias and all Thorn upgrades into the item pool."""
     display_name = "Shuffle Thorn"
@@ -57,124 +92,33 @@ class ThornShuffle(Choice):
     default = 0
 
 
-class ReliquaryShuffle(DefaultOnToggle):
-    """Adds the True Torment exclusive Reliquary rosary beads into the item pool."""
-    display_name = "Shuffle Penitence Rewards"
-
-
-class CherubShuffle(DefaultOnToggle):
-    """Shuffles Children of Moonlight into the item pool."""
-    display_name = "Shuffle Children of Moonlight"
-
-
-class LifeShuffle(DefaultOnToggle):
-    """Shuffles life upgrades from the Lady of the Six Sorrows into the item pool."""
-    display_name = "Shuffle Life Upgrades"
-
-
-class FervourShuffle(DefaultOnToggle):
-    """Shuffles fervour upgrades from the Oil of the Pilgrims into the item pool."""
-    display_name = "Shuffle Fervour Upgrades"
-
-
-class SwordShuffle(DefaultOnToggle):
-    """Shuffles Mea Culpa upgrades from the Mea Culpa Altars into the item pool."""
-    display_name = "Shuffle Mea Culpa Upgrades"
-
-
-class BlessingShuffle(DefaultOnToggle):
-    """Shuffles blessings from the Lake of Silent Pilgrims into the item pool."""
-    display_name = "Shuffle Blessings"
-
-
-class DungeonShuffle(DefaultOnToggle):
-    """Shuffles rewards from completing Confessor Dungeons into the item pool."""
-    display_name = "Shuffle Dungeon Rewards"
-
-
-class TirsoShuffle(DefaultOnToggle):
-    """Shuffles rewards from delivering herbs to Tirso into the item pool."""
-    display_name = "Shuffle Tirso's Rewards"
-
-
-class MiriamShuffle(DefaultOnToggle):
-    """Shuffles the prayer given by Miriam into the item pool."""
-    display_name = "Shuffle Miriram's Reward"
+class DashShuffle(Toggle):
+    """Turns the ability to dash into an item that must be found in the multiworld."""
+    display_name = "Shuffle Dash"
 
 
-class RedentoShuffle(DefaultOnToggle):
-    """Shuffles rewards from assisting Redento into the item pool."""
-    display_name = "Shuffle Redento's Rewards"
+class WallClimbShuffle(Toggle):
+    """Turns the ability to climb walls with your sword into an item that must be found in the multiworld."""
+    display_name = "Shuffle Wall Climb"
 
 
-class JocineroShuffle(DefaultOnToggle):
-    """Shuffles rewards from rescuing 20 and 38 Children of Moonlight into the item pool."""
-    display_name = "Shuffle Jocinero's Rewards"
-
-
-class AltasgraciasShuffle(DefaultOnToggle):
-    """Shuffles the reward given by Altasgracias and the item left behind by them into the item pool."""
-    display_name = "Shuffle Altasgracias' Rewards"
-
-
-class TentudiaShuffle(DefaultOnToggle):
-    """Shuffles the rewards from delivering Tentudia's remains to Lvdovico into the item pool."""
-    display_name = "Shuffle Lvdovico's Rewards"
-
-
-class GeminoShuffle(DefaultOnToggle):
-    """Shuffles the rewards from Gemino's quest and the hidden tomb into the item pool."""
-    display_name = "Shuffle Gemino's Rewards"
-
-
-class GuiltShuffle(DefaultOnToggle):
-    """Shuffles the Weight of True Guilt into the item pool."""
-    display_name = "Shuffle Immaculate Bead"
-
-
-class OssuaryShuffle(DefaultOnToggle):
-    """Shuffles the rewards from delivering bones to the Ossuary into the item pool."""
-    display_name = "Shuffle Ossuary Rewards"
-
-
-class BossShuffle(DefaultOnToggle):
-    """Shuffles the Tears of Atonement from defeating bosses into the item pool."""
-    display_name = "Shuffle Boss Tears"
-
-
-class WoundShuffle(DefaultOnToggle):
-    """Shuffles the Holy Wounds required to pass the Bridge of the Three Cavalries into the item pool."""
-    display_name = "Shuffle Holy Wounds"
-
-
-class MaskShuffle(DefaultOnToggle):
-    """Shuffles the masks required to use the elevator in Archcathedral Rooftops into the item pool."""
-    display_name = "Shuffle Masks"
-
-
-class EyeShuffle(DefaultOnToggle):
-    """Shuffles the Eyes of the Traitor from defeating Isidora and Sierpes into the item pool."""
-    display_name = "Shuffle Traitor's Eyes"
-
-
-class HerbShuffle(DefaultOnToggle):
-    """Shuffles the herbs required for Tirso's quest into the item pool."""
-    display_name = "Shuffle Herbs"
-
-
-class ChurchShuffle(DefaultOnToggle):
-    """Shuffles the rewards from donating 5,000 and 50,000 Tears of Atonement to the Church in Albero into the item pool."""
-    display_name = "Shuffle Donation Rewards"
+class ReliquaryShuffle(DefaultOnToggle):
+    """Adds the True Torment exclusive Reliquary rosary beads into the item pool."""
+    display_name = "Shuffle Penitence Rewards"
 
 
-class ShopShuffle(DefaultOnToggle):
-    """Shuffles the items sold in Candelaria's shops into the item pool."""
-    display_name = "Shuffle Shop Items"
+class CustomItem1(Toggle):
+    """Adds the custom relic Boots of Pleading into the item pool, which grants the ability to fall onto spikes 
+    and survive.
+    Must have the \"Blasphemous-Boots-of-Pleading\" mod installed to connect to a multiworld."""
+    display_name = "Boots of Pleading"
 
 
-class CandleShuffle(DefaultOnToggle):
-    """Shuffles the Beads of Wax and their upgrades into the item pool."""
-    display_name = "Shuffle Candles"
+class CustomItem2(Toggle):
+    """Adds the custom relic Purified Hand of the Nun into the item pool, which grants the ability to jump 
+    a second time in mid-air.
+    Must have the \"Blasphemous-Double-Jump\" mod installed to connect to a multiworld."""
+    display_name = "Purified Hand of the Nun"
 
 
 class StartWheel(Toggle):
@@ -189,7 +133,8 @@ class SkillRando(Toggle):
 
 class EnemyRando(Choice):
     """Randomizes the enemies that appear in each room.
-    Shuffled: Enemies will be shuffled amongst each other, but can only appear as many times as they do in a standard game.
+    Shuffled: Enemies will be shuffled amongst each other, but can only appear as many times as they do in 
+    a standard game.
     Randomized: Every enemy is completely random, and can appear any number of times.
     Some enemies will never be randomized."""
     display_name = "Enemy Randomizer"
@@ -223,37 +168,20 @@ class BlasphemousDeathLink(DeathLink):
     "corpse_hints": CorpseHints,
     "difficulty": Difficulty,
     "penitence": Penitence,
-    "expert_logic": ExpertLogic,
+    "starting_location": StartingLocation,
     "ending": Ending,
+    "skip_long_quests": SkipLongQuests,
     "thorn_shuffle" : ThornShuffle,
+    "dash_shuffle": DashShuffle,
+    "wall_climb_shuffle": WallClimbShuffle,
     "reliquary_shuffle": ReliquaryShuffle,
-    "cherub_shuffle" : CherubShuffle,
-    "life_shuffle" : LifeShuffle,
-    "fervour_shuffle" : FervourShuffle,
-    "sword_shuffle" : SwordShuffle,
-    "blessing_shuffle" : BlessingShuffle,
-    "dungeon_shuffle" : DungeonShuffle,
-    "tirso_shuffle" : TirsoShuffle,
-    "miriam_shuffle" : MiriamShuffle,
-    "redento_shuffle" : RedentoShuffle,
-    "jocinero_shuffle" : JocineroShuffle,
-    "altasgracias_shuffle" : AltasgraciasShuffle,
-    "tentudia_shuffle" : TentudiaShuffle,
-    "gemino_shuffle" : GeminoShuffle,
-    "guilt_shuffle" : GuiltShuffle,
-    "ossuary_shuffle" : OssuaryShuffle,
-    "boss_shuffle" : BossShuffle,
-    "wound_shuffle" : WoundShuffle,
-    "mask_shuffle" : MaskShuffle,
-    "eye_shuffle": EyeShuffle,
-    "herb_shuffle" : HerbShuffle,
-    "church_shuffle" : ChurchShuffle,
-    "shop_shuffle" : ShopShuffle,
-    "candle_shuffle" : CandleShuffle,
+    "boots_of_pleading": CustomItem1,
+    "purified_hand": CustomItem2,
     "start_wheel": StartWheel,
     "skill_randomizer": SkillRando,
     "enemy_randomizer": EnemyRando,
     "enemy_groups": EnemyGroups,
     "enemy_scaling": EnemyScaling,
-    "death_link": BlasphemousDeathLink
+    "death_link": BlasphemousDeathLink,
+    "start_inventory": StartInventoryPool
 }
\ No newline at end of file
diff --git a/worlds/blasphemous/Rooms.py b/worlds/blasphemous/Rooms.py
new file mode 100644
index 000000000000..74f245adeff7
--- /dev/null
+++ b/worlds/blasphemous/Rooms.py
@@ -0,0 +1,5405 @@
+from typing import List, TypedDict
+
+
+room_table: List[str] = [
+    "D01Z01S01", # THL
+    "D01Z01S02", # THL
+    "D01Z01S03", # THL
+    "D01Z01S07", # THL
+    "D01Z02S01", # Albero
+    "D01Z02S02", # Albero
+    "D01Z02S03", # Albero
+    "D01Z02S04", # Albero
+    "D01Z02S05", # Albero
+    "D01Z02S06", # Albero
+    "D01Z02S07", # Albero
+    "D01BZ04S01", # Albero Church
+    "D01BZ06S01", # Ossuary
+    "D01BZ08S01", # Ossuary - isidora's room?
+    "D01Z03S01", # WotBC
+    "D01Z03S02", # WotBC
+    "D01Z03S03", # WotBC
+    "D01Z03S04", # WotBC
+    "D01Z03S05", # WotBC
+    "D01Z03S06", # WotBC
+    "D01Z03S07", # WotBC
+    "D01Z04S01", # MD
+    "D01Z04S02", # MD
+    "D01Z04S03", # MD
+    "D01Z04S05", # MD
+    "D01Z04S06", # MD
+    "D01Z04S07", # MD
+    "D01Z04S08", # MD
+    "D01Z04S09", # MD
+    "D01Z04S10", # MD
+    "D01Z04S11", # MD
+    "D01Z04S12", # MD
+    "D01Z04S13", # MD
+    "D01Z04S14", # MD
+    "D01Z04S15", # MD
+    "D01Z04S16", # MD
+    "D01Z04S17", # MD
+    "D01Z04S18", # MD
+    "D01Z04S19", # MD
+    "D01BZ02S01", # MD - shop
+    "D01Z05S01", # DC
+    "D01Z05S02", # DC
+    "D01Z05S03", # DC
+    "D01Z05S04", # DC
+    "D01Z05S05", # DC
+    "D01Z05S06", # DC
+    "D01Z05S07", # DC
+    "D01Z05S08", # DC
+    "D01Z05S09", # DC
+    "D01Z05S10", # DC
+    "D01Z05S11", # DC
+    "D01Z05S12", # DC
+    "D01Z05S13", # DC
+    "D01Z05S14", # DC
+    "D01Z05S15", # DC
+    "D01Z05S16", # DC
+    "D01Z05S17", # DC
+    "D01Z05S18", # DC
+    "D01Z05S19", # DC
+    "D01Z05S20", # DC
+    "D01Z05S21", # DC
+    "D01Z05S22", # DC
+    "D01Z05S23", # DC
+    "D01Z05S24", # DC
+    "D01Z05S25", # DC
+    "D01Z05S26", # DC
+    "D01Z05S27", # DC
+    "D01BZ05S01", # DC - shroud of dreamt sins room?
+    "D01BZ09S01", # DC - arcade room
+    "D01Z06S01", # Petrous
+    "D01BZ07S01", # Petrous - Jibrael
+    "D02Z01S01", # WOTW
+    "D02Z01S02", # WOTW
+    "D02Z01S03", # WOTW
+    "D02Z01S04", # WOTW
+    "D02Z01S05", # WOTW
+    "D02Z01S06", # WOTW
+    "D02Z01S08", # WOTW
+    "D02Z01S09", # WOTW
+    "D02Z02S01", # GOTP
+    "D02Z02S02", # GOTP
+    "D02Z02S03", # GOTP
+    "D02Z02S04", # GOTP
+    "D02Z02S05", # GOTP
+    "D02Z02S06", # GOTP
+    "D02Z02S07", # GOTP
+    "D02Z02S08", # GOTP
+    "D02Z02S09", # GOTP
+    "D02Z02S10", # GOTP
+    "D02Z02S11", # GOTP
+    "D02Z02S12", # GOTP
+    "D02Z02S13", # GOTP
+    "D02Z02S14", # GOTP
+    "D02BZ02S01", # GOTP - shop
+    "D02Z03S01", # COOLOTCV
+    "D02Z03S02", # COOLOTCV
+    "D02Z03S03", # COOLOTCV
+    "D02Z03S05", # COOLOTCV
+    "D02Z03S06", # COOLOTCV
+    "D02Z03S07", # COOLOTCV
+    "D02Z03S08", # COOLOTCV
+    "D02Z03S09", # COOLOTCV
+    "D02Z03S10", # COOLOTCV
+    "D02Z03S11", # COOLOTCV
+    "D02Z03S12", # COOLOTCV
+    "D02Z03S13", # COOLOTCV
+    "D02Z03S14", # COOLOTCV
+    "D02Z03S15", # COOLOTCV
+    "D02Z03S16", # COOLOTCV
+    "D02Z03S17", # COOLOTCV
+    "D02Z03S18", # COOLOTCV
+    "D02Z03S19", # COOLOTCV
+    "D02Z03S20", # COOLOTCV
+    "D02Z03S21", # COOLOTCV
+    "D02Z03S22", # COOLOTCV
+    "D02Z03S23", # COOLOTCV
+    "D02Z03S24", # COOLOTCV
+    "D03Z01S01", # MOTED
+    "D03Z01S02", # MOTED
+    "D03Z01S03", # MOTED
+    "D03Z01S04", # MOTED
+    "D03Z01S05", # MOTED
+    "D03Z01S06", # MOTED
+    "D03Z02S01", # Jondo
+    "D03Z02S02", # Jondo
+    "D03Z02S03", # Jondo
+    "D03Z02S04", # Jondo
+    "D03Z02S05", # Jondo
+    "D03Z02S06", # Jondo
+    "D03Z02S07", # Jondo
+    "D03Z02S08", # Jondo
+    "D03Z02S09", # Jondo
+    "D03Z02S10", # Jondo
+    "D03Z02S11", # Jondo
+    "D03Z02S12", # Jondo
+    "D03Z02S13", # Jondo
+    "D03Z02S14", # Jondo
+    "D03Z02S15", # Jondo
+    "D03Z03S01", # GA
+    "D03Z03S02", # GA
+    "D03Z03S03", # GA
+    "D03Z03S04", # GA
+    "D03Z03S05", # GA
+    "D03Z03S06", # GA
+    "D03Z03S07", # GA
+    "D03Z03S08", # GA
+    "D03Z03S09", # GA
+    "D03Z03S10", # GA
+    "D03Z03S11", # GA
+    "D03Z03S12", # GA
+    "D03Z03S13", # GA
+    "D03Z03S14", # GA
+    "D03Z03S15", # GA
+    "D03Z03S16", # GA
+    "D03Z03S17", # GA
+    "D03Z03S18", # GA
+    "D03Z03S19", # GA
+    "D04Z01S01", # POTSS
+    "D04Z01S02", # POTSS
+    "D04Z01S03", # POTSS
+    "D04Z01S04", # POTSS
+    "D04Z01S05", # POTSS
+    "D04Z01S06", # POTSS
+    "D04Z02S01", # MOM
+    "D04Z02S02", # MOM
+    "D04Z02S03", # MOM
+    "D04Z02S04", # MOM
+    "D04Z02S05", # MOM
+    "D04Z02S06", # MOM
+    "D04Z02S07", # MOM
+    "D04Z02S08", # MOM
+    "D04Z02S09", # MOM
+    "D04Z02S10", # MOM
+    "D04Z02S11", # MOM
+    "D04Z02S12", # MOM
+    "D04Z02S13", # MOM
+    "D04Z02S14", # MOM
+    "D04Z02S15", # MOM
+    "D04Z02S16", # MOM
+    "D04Z02S17", # MOM
+    "D04Z02S19", # MOM
+    "D04Z02S20", # MOM
+    "D04Z02S21", # MOM
+    "D04Z02S22", # MOM
+    "D04Z02S23", # MOM
+    "D04Z02S24", # MOM
+    "D04Z02S25", # MOM
+    "D04BZ02S01", # MOM - Redento
+    "D04Z03S01", # KOTTW
+    "D04Z03S02", # KOTTW
+    "D04Z04S01", # ATTOTS
+    "D04Z04S02", # ATTOTS
+    "D05Z01S01", # LOTNW
+    "D05Z01S02", # LOTNW
+    "D05Z01S03", # LOTNW
+    "D05Z01S04", # LOTNW
+    "D05Z01S05", # LOTNW
+    "D05Z01S06", # LOTNW
+    "D05Z01S07", # LOTNW
+    "D05Z01S08", # LOTNW
+    "D05Z01S09", # LOTNW
+    "D05Z01S10", # LOTNW
+    "D05Z01S11", # LOTNW
+    "D05Z01S12", # LOTNW
+    "D05Z01S13", # LOTNW
+    "D05Z01S14", # LOTNW
+    "D05Z01S15", # LOTNW
+    "D05Z01S16", # LOTNW
+    "D05Z01S17", # LOTNW
+    "D05Z01S18", # LOTNW
+    "D05Z01S19", # LOTNW
+    "D05Z01S20", # LOTNW
+    "D05Z01S21", # LOTNW
+    "D05Z01S22", # LOTNW
+    "D05Z01S23", # LOTNW
+    "D05Z01S24", # LOTNW
+    "D05BZ01S01", # LOTNW - secret entrance to KOTTW?
+    "D05Z02S01", # TSC
+    "D05Z02S02", # TSC
+    "D05Z02S03", # TSC
+    "D05Z02S04", # TSC
+    "D05Z02S05", # TSC
+    "D05Z02S06", # TSC
+    "D05Z02S07", # TSC
+    "D05Z02S08", # TSC
+    "D05Z02S09", # TSC
+    "D05Z02S10", # TSC
+    "D05Z02S11", # TSC
+    "D05Z02S12", # TSC
+    "D05Z02S13", # TSC
+    "D05Z02S14", # TSC
+    "D05Z02S15", # TSC
+    "D05BZ02S01", # TSC - shop
+    "D06Z01S01", # AR
+    "D06Z01S02", # AR
+    "D06Z01S03", # AR
+    "D06Z01S04", # AR
+    "D06Z01S05", # AR
+    "D06Z01S06", # AR
+    "D06Z01S07", # AR
+    "D06Z01S08", # AR
+    "D06Z01S09", # AR
+    "D06Z01S10", # AR
+    "D06Z01S11", # AR
+    "D06Z01S12", # AR
+    "D06Z01S13", # AR
+    "D06Z01S14", # AR
+    "D06Z01S15", # AR
+    "D06Z01S16", # AR
+    "D06Z01S17", # AR
+    "D06Z01S18", # AR
+    "D06Z01S19", # AR
+    "D06Z01S20", # AR
+    "D06Z01S21", # AR
+    "D06Z01S22", # AR
+    "D06Z01S23", # AR
+    "D06Z01S24", # AR
+    "D06Z01S25", # AR
+    "D06Z01S26", # AR
+    "D07Z01S01", # DOHH?
+    "D07Z01S02", # DOHH?
+    "D07Z01S03", # DOHH?
+    "D08Z01S01", # BOTTC
+    "D08Z01S02", # BOTTC
+    "D08Z02S01", # FT
+    "D08Z02S02", # FT
+    "D08Z02S03", # FT
+    "D08Z03S01", # HOTD
+    "D08Z03S02", # HOTD
+    "D08Z03S03", # HOTD
+    "D09Z01S01", # WOTHP
+    "D09Z01S02", # WOTHP
+    "D09Z01S03", # WOTHP
+    "D09Z01S04", # WOTHP
+    "D09Z01S05", # WOTHP
+    "D09Z01S06", # WOTHP
+    "D09Z01S07", # WOTHP
+    "D09Z01S08", # WOTHP
+    "D09Z01S09", # WOTHP
+    "D09Z01S10", # WOTHP
+    "D09Z01S11", # WOTHP
+    "D09Z01S12", # WOTHP
+    "D09Z01S13", # WOTHP
+    "D09BZ01S01", # WOTHP - all cells
+    "D17Z01S01", # BOTSS
+    "D17Z01S02", # BOTSS
+    "D17Z01S03", # BOTSS
+    "D17Z01S04", # BOTSS
+    "D17Z01S05", # BOTSS
+    "D17Z01S06", # BOTSS
+    "D17Z01S07", # BOTSS
+    "D17Z01S08", # BOTSS
+    "D17Z01S09", # BOTSS
+    "D17Z01S10", # BOTSS
+    "D17Z01S11", # BOTSS
+    "D17Z01S12", # BOTSS
+    "D17Z01S13", # BOTSS
+    "D17Z01S14", # BOTSS
+    "D17Z01S15", # BOTSS
+    "D17BZ01S01", # BOTSS - chamber of the eldest brother
+    "D17BZ02S01", # BOTSS - platforming challenge
+    "D20Z01S01", # EOS
+    "D20Z01S02", # EOS
+    "D20Z01S03", # EOS
+    "D20Z01S04", # EOS
+    "D20Z01S05", # EOS
+    "D20Z01S06", # EOS
+    "D20Z01S07", # EOS
+    "D20Z01S08", # EOS
+    "D20Z01S09", # EOS
+    "D20Z01S10", # EOS
+    "D20Z01S11", # EOS
+    "D20Z01S12", # EOS
+    "D20Z01S13", # EOS
+    "D20Z01S14", # EOS
+    "D20Z02S01", # MAH
+    "D20Z02S02", # MAH
+    "D20Z02S03", # MAH
+    "D20Z02S04", # MAH
+    "D20Z02S05", # MAH
+    "D20Z02S06", # MAH
+    "D20Z02S07", # MAH
+    "D20Z02S08", # MAH
+    "D20Z02S09", # MAH
+    "D20Z02S10", # MAH
+    "D20Z02S11", # MAH
+    "D20Z02S12", # MAH
+    "D20Z03S01", # TRPOTS
+]
+
+
+class DoorDict(TypedDict, total=False):
+    Id: str
+    Direction: int
+    OriginalDoor: str
+    Type: int
+    Logic: str
+    VisibilityFlags: int
+    RequiredDoors: List[str]
+
+
+door_table: List[DoorDict] = [
+	{
+		"Id": "D01Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z01S07[E]"
+	},
+	{
+		"Id": "D01Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z01S02[W]"
+	},
+	{
+		"Id": "D01Z01S01[S]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z06S01[N]",
+		"Type": 1,
+		"Logic": "D01Z01S01[S] || canBreakHoles || doubleJump"
+	},
+	{
+		"Id": "D01Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z01S01[E]"
+	},
+	{
+		"Id": "D01Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z01S03[W]"
+	},
+	{
+		"Id": "D01Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z01S02[E]"
+	},
+	{
+		"Id": "D01Z01S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z02S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z01S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S03[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z01S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z01S01[W]"
+	},
+
+	{
+		"Id": "D01Z02S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z01S03[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z02S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z02S02[W]"
+	},
+	{
+		"Id": "D01Z02S02[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S06[E]"
+	},
+	{
+		"Id": "D01Z02S02[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z02S04[W]"
+	},
+	{
+		"Id": "D01Z02S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S01[E]"
+	},
+	{
+		"Id": "D01Z02S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z02S03[W]"
+	},
+	{
+		"Id": "D01Z02S02[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z02S03[NW]"
+	},
+	{
+		"Id": "D01Z02S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S02[E]"
+	},
+	{
+		"Id": "D01Z02S03[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S02[NE]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D02Z02S11[NW]", "D02Z02S11[NE]", "D02Z02S11[W]", "D02Z02S11[E]", "D02Z02S11[SE]" ]
+	},
+	{
+		"Id": "D01Z02S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z02S05[W]"
+	},
+	{
+		"Id": "D01Z02S03[church]",
+		"Direction": 4,
+		"OriginalDoor": "D01BZ04S01[church]",
+		"Logic": "canBeatMercyBoss || canBeatConventBoss || canBeatGrievanceBoss"
+	},
+	{
+		"Id": "D01Z02S03[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D01Z02S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S02[SE]"
+	},
+	{
+		"Id": "D01Z02S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S01[N]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z02S04[Ossary]",
+		"Direction": 4,
+		"OriginalDoor": "D01BZ06S01[Ossary]"
+	},
+	{
+		"Id": "D01Z02S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S03[E]"
+	},
+	{
+		"Id": "D01Z02S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z02S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S07[E]"
+	},
+	{
+		"Id": "D01Z02S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z02S02[SW]"
+	},
+	{
+		"Id": "D01Z02S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z02S06[W]"
+	},
+	{
+		"Id": "D01BZ04S01[church]",
+		"Direction": 7,
+		"OriginalDoor": "D01Z02S03[church]"
+	},
+	{
+		"Id": "D01BZ06S01[Ossary]",
+		"Direction": 7,
+		"OriginalDoor": "D01Z02S04[Ossary]"
+	},
+	{
+		"Id": "D01BZ06S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01BZ08S01[W]",
+		"Logic": "bones >= 30"
+	},
+	{
+		"Id": "D01BZ08S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01BZ06S01[E]"
+	},
+	
+	{
+		"Id": "D01Z03S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S05[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z03S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S02[W]"
+	},
+	{
+		"Id": "D01Z03S01[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S02[SW]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D01Z03S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S01[E]"
+	},
+	{
+		"Id": "D01Z03S02[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S01[SE]"
+	},
+	{
+		"Id": "D01Z03S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S03[W]"
+	},
+	{
+		"Id": "D01Z03S02[S]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z05S05[N]",
+		"Type": 1,
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D01Z03S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S02[E]"
+	},
+	{
+		"Id": "D01Z03S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S04[SW]"
+	},
+	{
+		"Id": "D01Z03S03[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D01Z03S03[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D01Z05S06[Cherubs]",
+		"Type": 1,
+		"Logic": "linen"
+	},
+	{
+		"Id": "D01Z03S04[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S03[E]"
+	},
+	{
+		"Id": "D01Z03S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S07[E]"
+	},
+	{
+		"Id": "D01Z03S04[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z01S01[SE]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z03S04[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S05[W]"
+	},
+	{
+		"Id": "D01Z03S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S06[W]"
+	},
+	{
+		"Id": "D01Z03S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S04[SE]"
+	},
+	{
+		"Id": "D01Z03S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S01[NW]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z03S05[Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D01Z05S11[Cherubs]",
+		"Type": 1,
+		"Logic": "linen"
+	},
+	{
+		"Id": "D01Z03S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S04[E]"
+	},
+	{
+		"Id": "D01Z03S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D08Z01S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z03S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S04[W]"
+	},
+	{
+		"Id": "D01Z03S07[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D01Z03S03[Cherubs]",
+		"Logic": "linen"
+	},
+	
+	{
+		"Id": "D01Z04S01[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S05[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z04S01[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S17[W]"
+	},
+	{
+		"Id": "D01Z04S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S03[E]"
+	},
+	{
+		"Id": "D01Z04S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S05[NW]"
+	},
+	{
+		"Id": "D01Z04S01[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S05[SW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D01Z04S01[S]" ]
+	},
+	{
+		"Id": "D01Z04S01[S]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z04S15[N]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D01Z04S01[SE]" ]
+	},
+	{
+		"Id": "D01Z04S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S13[NE]"
+	},
+	{
+		"Id": "D01Z04S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S01[W]"
+	},
+	{
+		"Id": "D01Z04S05[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S01[E]"
+	},
+	{
+		"Id": "D01Z04S05[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S01[SE]"
+	},
+	{
+		"Id": "D01Z04S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S07[W]"
+	},
+	{
+		"Id": "D01Z04S06[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S15[NE]"
+	},
+	{
+		"Id": "D01Z04S06[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S15[E]"
+	},
+	{
+		"Id": "D01Z04S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S06[E]"
+	},
+	{
+		"Id": "D01Z04S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S15[W]"
+	},
+	{
+		"Id": "D01Z04S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S12[E]",
+		"Type": 1,
+		"Logic": "openedDCGateE"
+	},
+	{
+		"Id": "D01Z04S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S15[SW]"
+	},
+	{
+		"Id": "D01Z04S09[C]",
+		"Direction": 4,
+		"OriginalDoor": "D01BZ02S01[C]"
+	},
+	{
+		"Id": "D01Z04S10[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S15[SE]"
+	},
+	{
+		"Id": "D01Z04S10[SW]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z04S11[NE]"
+	},
+	{
+		"Id": "D01Z04S10[SE]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z04S12[NW]"
+	},
+	{
+		"Id": "D01Z04S11[NE]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z04S10[SW]"
+	},
+	{
+		"Id": "D01Z04S12[NW]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z04S10[SE]"
+	},
+	{
+		"Id": "D01Z04S12[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S18[E]"
+	},
+	{
+		"Id": "D01Z04S12[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S13[NW]"
+	},
+	{
+		"Id": "D01Z04S13[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S12[SE]"
+	},
+	{
+		"Id": "D01Z04S13[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S02[W]"
+	},
+	{
+		"Id": "D01Z04S13[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S14[E]"
+	},
+	{
+		"Id": "D01Z04S13[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S16[W]",
+		"VisibilityFlags": 5,
+		"Logic": "D01Z04S13[SE] || canDiveLaser && (canAirStall || wheel || doubleJump || canEnemyBounce)"
+	},
+	{
+		"Id": "D01Z04S14[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S13[SW]"
+	},
+	{
+		"Id": "D01Z04S15[N]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z04S01[S]"
+	},
+	{
+		"Id": "D01Z04S15[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S06[NW]"
+	},
+	{
+		"Id": "D01Z04S15[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S08[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D01Z04S15[E]", "D01Z04S15[SW]", "D01Z04S15[SE]" ]
+	},
+	{
+		"Id": "D01Z04S15[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S06[SW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D01Z04S15[W]", "D01Z04S15[SW]", "D01Z04S15[SE]" ]
+	},
+	{
+		"Id": "D01Z04S15[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S09[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D01Z04S15[W]", "D01Z04S15[E]", "D01Z04S15[SE]" ]
+	},
+	{
+		"Id": "D01Z04S15[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S10[NW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D01Z04S15[W]", "D01Z04S15[E]", "D01Z04S15[SW]" ]
+	},
+	{
+		"Id": "D01Z04S16[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S13[SE]"
+	},
+	{
+		"Id": "D01Z04S16[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S12[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z04S17[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S01[NE]"
+	},
+	{
+		"Id": "D01Z04S18[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S19[E]",
+		"Logic": "D01Z04S18[W] || canBeatMercyBoss"
+	},
+	{
+		"Id": "D01Z04S18[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S12[W]",
+		"Logic": "D01Z04S18[E] || canBeatMercyBoss"
+	},
+	{
+		"Id": "D01Z04S19[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S19[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z04S19[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S18[W]"
+	},
+	{
+		"Id": "D01BZ02S01[C]",
+		"Direction": 7,
+		"OriginalDoor": "D01Z04S09[C]"
+	},
+	
+	{
+		"Id": "D01Z05S01[N]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z02S04[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z05S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S27[E]"
+	},
+	{
+		"Id": "D01Z05S01[S]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z05S02[N]"
+	},
+	{
+		"Id": "D01Z05S02[N]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z05S01[S]"
+	},
+	{
+		"Id": "D01Z05S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z01S01[NE]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z05S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S03[NW]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D01Z05S02[S]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z05S20[N]",
+		"Logic": "openedDCLadder"
+	},
+	{
+		"Id": "D01Z05S03[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S02[E]"
+	},
+	{
+		"Id": "D01Z05S03[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S04[W]"
+	},
+	{
+		"Id": "D01Z05S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S07[E]"
+	},
+	{
+		"Id": "D01Z05S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S08[W]"
+	},
+	{
+		"Id": "D01Z05S03[S]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z05S13[N]"
+	},
+	{
+		"Id": "D01Z05S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S03[NE]"
+	},
+	{
+		"Id": "D01Z05S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S05[NW]"
+	},
+	{
+		"Id": "D01Z05S05[N]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z03S02[S]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z05S05[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S04[E]"
+	},
+	{
+		"Id": "D01Z05S05[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S06[W]"
+	},
+	{
+		"Id": "D01Z05S05[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S18[E]"
+	},
+	{
+		"Id": "D01Z05S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S09[NW]"
+	},
+	{
+		"Id": "D01Z05S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S05[NE]"
+	},
+	{
+		"Id": "D01Z05S06[Cherubs]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D01Z05S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S03[W]"
+	},
+	{
+		"Id": "D01Z05S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S03[E]"
+	},
+	{
+		"Id": "D01Z05S09[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S05[E]"
+	},
+	{
+		"Id": "D01Z05S09[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S10[W]"
+	},
+	{
+		"Id": "D01Z05S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S09[SE]"
+	},
+	{
+		"Id": "D01Z05S10[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S11[W]"
+	},
+	{
+		"Id": "D01Z05S10[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S12[W]"
+	},
+	{
+		"Id": "D01Z05S10[S]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z05S14[N]"
+	},
+	{
+		"Id": "D01Z05S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S10[NE]"
+	},
+	{
+		"Id": "D01Z05S11[Cherubs]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D01Z05S12[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S10[SE]"
+	},
+	{
+		"Id": "D01Z05S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S09[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z05S13[SW]",
+		"Direction": 3,
+		"OriginalDoor": "D01Z05S16[N]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D01Z05S13[E]" ],
+		"Logic": "D01Z05S13[SW] || canSurvivePoison3 && canWaterJump"
+	},
+	{
+		"Id": "D01Z05S13[N]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z05S03[S]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D01Z05S13[E]" ],
+		"Logic": "D01Z05S13[N] || canSurvivePoison3 && canWaterJump"
+	},
+	{
+		"Id": "D01Z05S13[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S14[W]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D01Z05S14[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S13[E]"
+	},
+	{
+		"Id": "D01Z05S14[N]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z05S10[S]"
+	},
+	{
+		"Id": "D01Z05S14[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S15[W]"
+	},
+	{
+		"Id": "D01Z05S15[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S14[SE]"
+	},
+	{
+		"Id": "D01Z05S15[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S22[E]"
+	},
+	{
+		"Id": "D01Z05S15[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S19[W]"
+	},
+	{
+		"Id": "D01Z05S16[N]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z05S13[SW]"
+	},
+	{
+		"Id": "D01Z05S16[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S21[E]"
+	},
+	{
+		"Id": "D01Z05S16[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S17[W]"
+	},
+	{
+		"Id": "D01Z05S17[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S16[SE]"
+	},
+	{
+		"Id": "D01Z05S17[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01BZ09S01[W]",
+		"Logic": "dash && (D01Z05S17[E] || canWaterJump || canCrossGap5)"
+	},
+	{
+		"Id": "D01Z05S18[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S05[SW]"
+	},
+	{
+		"Id": "D01Z05S19[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S15[SE]"
+	},
+	{
+		"Id": "D01Z05S19[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z04S19[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z05S20[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S25[NE]"
+	},
+	{
+		"Id": "D01Z05S20[N]",
+		"Direction": 0,
+		"OriginalDoor": "D01Z05S02[S]"
+	},
+	{
+		"Id": "D01Z05S21[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S25[E]"
+	},
+	{
+		"Id": "D01Z05S21[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S16[SW]"
+	},
+	{
+		"Id": "D01Z05S21[Reward]",
+		"Direction": 4,
+		"OriginalDoor": "D01BZ05S01[Reward]",
+		"Logic": "shroud"
+	},
+	{
+		"Id": "D01Z05S22[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S15[SW]"
+	},
+	{
+		"Id": "D01Z05S23[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S24[E]",
+		"Logic": "chalice && chaliceRooms >= 3"
+	},
+	{
+		"Id": "D01Z05S23[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S25[W]"
+	},
+	{
+		"Id": "D01Z05S24[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S04[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z05S24[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S23[W]"
+	},
+	{
+		"Id": "D01Z05S25[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S20[W]",
+		"Logic": "D01Z05S25[SW] || D01Z05S25[SE] || D01Z05S25[NE] || linen"
+	},
+	{
+		"Id": "D01Z05S25[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S23[E]",
+		"Logic": "D01Z05S25[W] || (linen && (canWalkOnRoot || doubleJump || canAirStall)) || (D01Z05S25[E] && (canWalkOnRoot || canCrossGap3))"
+	},
+	{
+		"Id": "D01Z05S25[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S21[W]",
+		"VisibiliyFlags": 5,
+		"Logic": "D01Z05S25[E] || canBreakTirana && (linen || D01Z05S25[W] && (canWalkOnRoot || canCrossGap3))"
+	},
+	{
+		"Id": "D01Z05S25[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S17[E]",
+		"Type": 1,
+		"Logic": "D01Z05S25[SW] || D01Z05S25[SE] || D01Z05S25[NE] || linen"
+	},
+	{
+		"Id": "D01Z05S25[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S26[W]",
+		"Logic": "D01Z05S25[SW] || D01Z05S25[SE] || D01Z05S25[NE] || linen"
+	},
+	{
+		"Id": "D01Z05S25[EchoesW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S09[E]",
+		"Type": 1,
+		"VisibilityFlags": 11,
+		"RequiredDoors": [ "D01Z05S25[EchoesE]" ],
+		"Logic": "D01Z05S25[EchoesW] || (D01Z05S25[EchoesE] && (blood || canCrossGap8)) || (linen && doubleJump)"
+	},
+	{
+		"Id": "D01Z05S25[EchoesE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S10[W]",
+		"Type": 1,
+		"VisibilityFlags": 11,
+		"RequiredDoors": [ "D01Z05S25[EchoesW]" ],
+		"Logic": "D01Z05S25[EchoesE] || (D01Z05S25[EchoesW] && (blood || canCrossGap8)) || (linen && doubleJump)"
+	},
+	{
+		"Id": "D01Z05S26[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S25[SE]"
+	},
+	{
+		"Id": "D01Z05S27[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S01[W]"
+	},
+	{
+		"Id": "D01BZ05S01[Reward]",
+		"Direction": 7,
+		"OriginalDoor": "D01Z05S21[Reward]"
+	},
+	{
+		"Id": "D01BZ09S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S17[E]"
+	},
+	
+	{
+		"Id": "D01Z06S01[N]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z01S01[S]",
+		"Type": 1
+	},
+	{
+		"Id": "D01Z06S01[Santos]",
+		"Direction": 4,
+		"OriginalDoor": "D01BZ07S01[Santos]",
+		"Logic": "bell"
+	},
+	{
+		"Id": "D01BZ07S01[Santos]",
+		"Direction": 7,
+		"OriginalDoor": "D01Z06S01[Santos]"
+	},
+	
+	{
+		"Id": "D02Z01S01[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z01S06[E]",
+		"Logic": "openedWOTWCave && (D02Z01S01[W] || D02Z01S01[CherubsL] || D02Z01S01[SW] || D02Z01S01[CherubsR] || doubleJump || wallClimb)"
+	},
+	{
+		"Id": "D02Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z01S02[E]",
+		"Logic": "D02Z01S01[W] || D02Z01S01[CherubsL] || wallClimb || doubleJump || ((D02Z01S01[SW] || D02Z01S01[CherubsR]) && canDawnJump)"
+	},
+	{
+		"Id": "D02Z01S01[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z03S04[NW]",
+		"Type": 1
+	},
+	{
+		"Id": "D02Z01S01[CherubsL]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z01S01[CherubsR]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z01S04[E]"
+	},
+	{
+		"Id": "D02Z01S02[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z01S03[SE]",
+		"Logic": "D02Z01S02[NW] || wallClimb || doubleJump || (D02Z01S02[NE] && canWalkOnRoot && canCrossGap5)"
+	},
+	{
+		"Id": "D02Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z01S01[W]"
+	},
+	{
+		"Id": "D02Z01S02[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z01S09[W]",
+		"Logic": "D02Z01S02[NE] || (doubleJump && canEnemyBounce) || (D02Z01S02[NW] || wallClimb || doubleJump) && (canWalkOnRoot || canCrossGap10)"
+	},
+	{
+		"Id": "D02Z01S02[]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z01S06[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02Z01S03[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z01S05[E]"
+	},
+	{
+		"Id": "D02Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S01[E]",
+		"Type": 1,
+		"Logic": "D02Z01S03[W] || D02Z01S03[SE] || D02Z01S03[Cherubs] || wallClimb"
+	},
+	{
+		"Id": "D02Z01S03[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z01S02[NW]",
+		"Logic": "D02Z01S03[W] || D02Z01S03[SE] || D02Z01S03[Cherubs] || wallClimb"
+	},
+	{
+		"Id": "D02Z01S03[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z01S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z01S02[W]"
+	},
+	{
+		"Id": "D02Z01S04[-N]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z01S08[N]",
+		"Logic": "fullThimble && (D02Z01S01[W] || D02Z01S01[CherubsL] || wallClimb || doubleJump || ((D02Z01S01[SW] || D02Z01S01[CherubsR]) && canDawnJump))"
+	},
+	{
+		"Id": "D02Z01S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z01S03[SW]"
+	},
+	{
+		"Id": "D02Z01S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z01S08[E]",
+		"Logic": "D02Z01S06[W] || dash || wallClimb && doubleJump"
+	},
+	{
+		"Id": "D02Z01S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z01S01[SW]",
+		"Logic": "D02Z01S06[E] || wallClimb"
+	},
+	{
+		"Id": "D02Z01S06[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z01S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z01S06[W]"
+	},
+	{
+		"Id": "D02Z01S08[N]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z01S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z01S02[NE]"
+	},
+	{
+		"Id": "D02Z01S09[-CherubsL]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z01S01[CherubsL]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02Z01S09[-CherubsR]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z01S01[CherubsR]",
+		"Logic": "linen && (canWalkOnRoot || canCrossGap2 || canEnemyBounce && canAirStall)"
+	},
+	
+	{
+		"Id": "D02Z02S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S08[E]",
+		"Logic": "D02Z02S01[W] || D02Z02S01[NW] || D02Z02S01[Cherubs] || dash"
+	},
+	{
+		"Id": "D02Z02S01[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S02[SE]",
+		"Logic": "D02Z02S01[NW] || D02Z02S01[Cherubs] || wallClimb && (D02Z02S01[W] || dash)"
+	},
+	{
+		"Id": "D02Z02S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z01S03[W]",
+		"Type": 1,
+		"Logic": "D02Z02S01[E] || D02Z02S01[NW] || D02Z02S01[Cherubs] || wallClimb || dash"
+	},
+	{
+		"Id": "D02Z02S01[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z02S02[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S01[NW]"
+	},
+	{
+		"Id": "D02Z02S02[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S04[SE]",
+		"Logic": "D02Z02S02[NW] || D02Z02S02[NE] || D02Z02S02[CherubsL] || D02Z02S02[CherubsR] || wallClimb"
+	},
+	{
+		"Id": "D02Z02S02[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S03[SW]",
+		"Logic": "D02Z02S02[NW] || D02Z02S02[NE] || D02Z02S02[CherubsL] || D02Z02S02[CherubsR] || wallClimb"
+	},
+	{
+		"Id": "D02Z02S02[-CherubsR]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z02S08[CherubsR]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02Z02S02[CherubsL]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z02S02[CherubsR]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z02S03[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S02[NE]"
+	},
+	{
+		"Id": "D02Z02S03[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S05[SE]",
+		"Logic": "D02Z02S03[NW] || doubleJump || wallClimb || D02Z02S03[NE] && canWalkOnRoot"
+	},
+	{
+		"Id": "D02Z02S03[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S14[W]",
+		"Logic": "D02Z02S03[NE] || wallClimb && (canCrossGap11 || (blood && (canWalkOnRoot || canCrossGap7)) || (canWalkOnRoot && (doubleJump || canAirStall)))"
+	},
+	{
+		"Id": "D02Z02S03[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z02S01[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02Z02S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S09[E]",
+		"Logic": "D02Z02S04[NE] || D02Z02S04[W] || D02Z02S04[E] && dash || D02Z02S04[SE] && (wallClimb || doubleJump && canEnemyUpslash)"
+	},
+	{
+		"Id": "D02Z02S04[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S02[NW]",
+		"Logic": "D02Z02S04[NE] || D02Z02S04[W] || D02Z02S04[SE] || dash"
+	},
+	{
+		"Id": "D02Z02S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S05[SW]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D02Z02S04[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S05[W]",
+		"Logic": "D02Z02S04[NE] || ((D02Z02S04[W] || D02Z02S04[E] && dash) && (doubleJump || wallClimb)) || (D02Z02S04[SE] && (wallClimb || doubleJump && canEnemyUpslash))"
+	},
+	{
+		"Id": "D02Z02S04[-CherubsL]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z02S08[CherubsL]",
+		"Logic": "linen && (D02Z02S04[NE] || D02Z02S04[W] || D02Z02S04[SE] || dash)"
+	},
+	{
+		"Id": "D02Z02S05[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S04[E]"
+	},
+	{
+		"Id": "D02Z02S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S04[NE]",
+		"VisibilityFlags": 65,
+		"Logic": "D02Z02S05[W] || doubleJump && canEnemyBounce"
+	},
+	{
+		"Id": "D02Z02S05[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S03[NW]"
+	},
+	{
+		"Id": "D02Z02S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S10[W]",
+		"Logic": "D02Z02S05[NW] || D02Z02S05[E] || wallClimb"
+	},
+	{
+		"Id": "D02Z02S05[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S07[E]",
+		"Logic": "D02Z02S05[NW] || wallClimb"
+	},
+	{
+		"Id": "D02Z02S05[-CherubsL]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z02S02[CherubsL]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02Z02S05[-CherubsR]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z02S02[CherubsR]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02Z02S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S11[W]"
+	},
+	{
+		"Id": "D02Z02S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S01[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D02Z02S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S05[NW]"
+	},
+	{
+		"Id": "D02Z02S07[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z02S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S11[SE]"
+	},
+	{
+		"Id": "D02Z02S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S01[W]"
+	},
+	{
+		"Id": "D02Z02S08[C]",
+		"Direction": 4,
+		"OriginalDoor": "D02BZ02S01[C]"
+	},
+	{
+		"Id": "D02Z02S08[CherubsL]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z02S08[CherubsR]",
+		"Direction": 5
+	},
+	{
+		"Id": "D02Z02S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S04[W]"
+	},
+	{
+		"Id": "D02Z02S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S05[E]"
+	},
+	{
+		"Id": "D02Z02S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S06[E]"
+	},
+	{
+		"Id": "D02Z02S11[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S08[W]"
+	},
+	{
+		"Id": "D02Z02S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S12[W]",
+		"Logic": "D02Z02S11[E] || D02Z02S11[NW] || D02Z02S11[NE] || canCrossGap6"
+	},
+	{
+		"Id": "D02Z02S11[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S14[E]",
+		"Type": 1,
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D02Z02S11[NE]" ]
+	},
+	{
+		"Id": "D02Z02S11[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S13[W]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D02Z02S11[NW]" ]
+	},
+	{
+		"Id": "D02Z02S11[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D01Z02S03[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02Z02S12[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S11[E]"
+	},
+	{
+		"Id": "D02Z02S13[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S11[NE]"
+	},
+	{
+		"Id": "D02Z02S14[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z02S03[NE]"
+	},
+	{
+		"Id": "D02Z02S14[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z01S03[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02BZ02S01[C]",
+		"Direction": 7,
+		"OriginalDoor": "D02Z02S08[C]"
+	},
+	
+	{
+		"Id": "D02Z03S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S08[E]"
+	},
+	{
+		"Id": "D02Z03S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S07[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D02Z03S02[S]",
+		"Direction": 3,
+		"OriginalDoor": "D02Z03S16[N]"
+	},
+	{
+		"Id": "D02Z03S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S03[E]",
+		"Logic": "D02Z03S02[NW] || D02Z03S02[NE] || D02Z03S02[N] || D02Z03S02[W] || doubleJump || wallClimb"
+	},
+	{
+		"Id": "D02Z03S02[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S21[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D02Z03S02[NE]", "D02Z03S02[N]" ]
+	},
+	{
+		"Id": "D02Z03S02[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S13[W]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D02Z03S02[NW]", "D02Z03S02[N]" ]
+	},
+	{
+		"Id": "D02Z03S02[N]",
+		"Direction": 0,
+		"OriginalDoor": "D02Z03S11[S]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D02Z03S02[NW]", "D02Z03S02[NE]" ],
+		"Logic": "openedConventLadder"
+	},
+	{
+		"Id": "D02Z03S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S05[E]"
+	},
+	{
+		"Id": "D02Z03S03[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S05[NE]",
+		"Logic": "D02Z03S03[NW] || blood || canCrossGap3"
+	},
+	{
+		"Id": "D02Z03S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S02[W]"
+	},
+	{
+		"Id": "D02Z03S05[S]",
+		"Direction": 3,
+		"OriginalDoor": "D02Z03S07[N]",
+		"Logic": "D02Z03S05[S] || D02Z03S05[NE] || wallClimb"
+	},
+	{
+		"Id": "D02Z03S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S03[W]"
+	},
+	{
+		"Id": "D02Z03S05[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S03[NW]",
+		"Logic": "D02Z03S05[S] || D02Z03S05[NE] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D02Z03S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S18[SE]"
+	},
+	{
+		"Id": "D02Z03S06[S]",
+		"Direction": 3,
+		"OriginalDoor": "D02Z03S07[NW]"
+	},
+	{
+		"Id": "D02Z03S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S17[E]"
+	},
+	{
+		"Id": "D02Z03S07[NWW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S24[E]"
+	},
+	{
+		"Id": "D02Z03S07[NW]",
+		"Direction": 0,
+		"OriginalDoor": "D02Z03S06[S]"
+	},
+	{
+		"Id": "D02Z03S07[N]",
+		"Direction": 0,
+		"OriginalDoor": "D02Z03S05[S]"
+	},
+	{
+		"Id": "D02Z03S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S08[W]"
+	},
+	{
+		"Id": "D02Z03S08[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S12[E]"
+	},
+	{
+		"Id": "D02Z03S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S07[E]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D02Z03S08[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S14[W]"
+	},
+	{
+		"Id": "D02Z03S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S01[W]"
+	},
+	{
+		"Id": "D02Z03S08[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S16[W]"
+	},
+	{
+		"Id": "D02Z03S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S18[NE]"
+	},
+	{
+		"Id": "D02Z03S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S20[W]"
+	},
+	{
+		"Id": "D02Z03S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S11[E]"
+	},
+	{
+		"Id": "D02Z03S10[-W]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S06[-E]",
+		"Type": 1
+	},
+	{
+		"Id": "D02Z03S10[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D02Z02S07[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D02Z03S11[S]",
+		"Direction": 3,
+		"OriginalDoor": "D02Z03S02[N]"
+	},
+	{
+		"Id": "D02Z03S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S15[E]"
+	},
+	{
+		"Id": "D02Z03S11[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S19[E]"
+	},
+	{
+		"Id": "D02Z03S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S10[W]"
+	},
+	{
+		"Id": "D02Z03S11[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S22[W]"
+	},
+	{
+		"Id": "D02Z03S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S08[SW]"
+	},
+	{
+		"Id": "D02Z03S13[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S02[NE]"
+	},
+	{
+		"Id": "D02Z03S14[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S08[SE]"
+	},
+	{
+		"Id": "D02Z03S14[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z02S11[NW]",
+		"Type": 1
+	},
+	{
+		"Id": "D02Z03S15[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S11[W]"
+	},
+	{
+		"Id": "D02Z03S16[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S08[NE]"
+	},
+	{
+		"Id": "D02Z03S16[N]",
+		"Direction": 0,
+		"OriginalDoor": "D02Z03S02[S]"
+	},
+	{
+		"Id": "D02Z03S17[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S07[W]"
+	},
+	{
+		"Id": "D02Z03S18[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S23[E]",
+		"Logic": "D02Z03S18[NW] || D02Z03S18[NE] || wallClimb"
+	},
+	{
+		"Id": "D02Z03S18[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S06[W]"
+	},
+	{
+		"Id": "D02Z03S18[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S09[W]",
+		"Logic": "D02Z03S18[NW] || D02Z03S18[NE] || wallClimb"
+	},
+	{
+		"Id": "D02Z03S19[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S11[NW]"
+	},
+	{
+		"Id": "D02Z03S20[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S09[E]",
+		"Logic": "D02Z03S20[W] || canBeatConventBoss"
+	},
+	{
+		"Id": "D02Z03S20[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S21[W]",
+		"Logic": "D02Z03S20[E] || canBeatConventBoss"
+	},
+	{
+		"Id": "D02Z03S21[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S20[E]"
+	},
+	{
+		"Id": "D02Z03S21[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S02[NW]"
+	},
+	{
+		"Id": "D02Z03S22[W]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S11[NE]"
+	},
+	{
+		"Id": "D02Z03S23[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S18[NW]"
+	},
+	{
+		"Id": "D02Z03S24[E]",
+		"Direction": 2,
+		"OriginalDoor": "D02Z03S07[NWW]"
+	},
+	
+	{
+		"Id": "D03Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z01S02[E]"
+	},
+	{
+		"Id": "D03Z01S01[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S02[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D03Z01S01[S]",
+		"Direction": 3,
+		"OriginalDoor": "D20Z01S03[N]",
+		"Type": 1,
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D03Z01S01[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D20Z01S01[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D03Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z01S06[E]",
+		"Logic": "D03Z01S02[W] || wallClimb || canCrossGap3"
+	},
+	{
+		"Id": "D03Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z01S01[W]",
+		"Logic": "D03Z01S02[E] || wallClimb || canCrossGap7"
+	},
+	{
+		"Id": "D03Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z01S04[E]",
+		"Logic": "D03Z01S03[W] || wallClimb && (D03Z01S03[SW] || canCrossGap9)"
+	},
+	{
+		"Id": "D03Z01S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z01S06[W]",
+		"Logic": "D03Z01S03[E] || wallClimb"
+	},
+	{
+		"Id": "D03Z01S03[SW]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S10[N]",
+		"Type": 1,
+		"Logic": "D03Z01S03[W] || D03Z01S03[SW] || canCrossGap9"
+	},
+	{
+		"Id": "D03Z01S03[SE]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S01[N]",
+		"Type": 1
+	},
+	{
+		"Id": "D03Z01S03[-WestL]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z02S10[Cherubs]",
+		"Type": 1,
+		"Logic": "linen && (D03Z01S03[W] || D03Z01S03[SW] || canCrossGap9)"
+	},
+	{
+		"Id": "D03Z01S03[-WestR]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z02S02[CherubsL]",
+		"Type": 1,
+		"Logic": "linen && (D03Z01S03[W] || D03Z01S03[SW] || canCrossGap9)"
+	},
+	{
+		"Id": "D03Z01S03[-EastL]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z02S02[CherubsR]",
+		"Type": 1,
+		"Logic": "linen && (D03Z01S03[W] || D03Z01S03[SW] || canCrossGap5)"
+	},
+	{
+		"Id": "D03Z01S03[-EastR]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z02S01[Cherubs]",
+		"Type": 1,
+		"Logic": "linen"
+	},
+	{
+		"Id": "D03Z01S04[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z01S05[E]"
+	},
+	{
+		"Id": "D03Z01S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z01S03[W]"
+	},
+	{
+		"Id": "D03Z01S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S07[SE]",
+		"Type": 1
+	},
+	{
+		"Id": "D03Z01S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z01S04[NW]"
+	},
+	{
+		"Id": "D03Z01S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z01S03[E]",
+		"Logic": "D03Z01S06[W] || canBeatPerpetua"
+	},
+	{
+		"Id": "D03Z01S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z01S02[W]",
+		"Logic": "D03Z01S06[E] || canBeatPerpetua"
+	},
+	
+	{
+		"Id": "D03Z02S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S02[E]",
+		"Logic": "D03Z02S01[W] || wallClimb || doubleJump && canEnemyBounce"
+	},
+	{
+		"Id": "D03Z02S01[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z01S03[SE]",
+		"Type": 1,
+		"Logic": "D03Z02S01[N] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z02S01[Cherubs]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D03Z02S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S10[E]",
+		"Logic": "D03Z02S02[W] || D03Z02S02[CherubsL] || doubleJump && (D03Z02S02[E] || D03Z02S02[CherubsR] || wallClimb || canEnemyBounce)"
+	},
+	{
+		"Id": "D03Z02S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S01[W]",
+		"Logic": "D03Z02S02[E] || wallClimb || doubleJump && canEnemyBounce"
+	},
+	{
+		"Id": "D03Z02S02[S]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S03[N]"
+	},
+	{
+		"Id": "D03Z02S02[CherubsL]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D03Z02S02[CherubsR]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D03Z02S03[W]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S07[N]",
+		"Logic": "D03Z02S03[W] || dash && (D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])"
+	},
+	{
+		"Id": "D03Z02S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S05[W]",
+		"Logic": "D03Z02S03[E] || (canAirStall || doubleJump || boots) && (D03Z02S03[E] && dash || D03Z02S03[N] || D03Z02S03[SE2])"
+	},
+	{
+		"Id": "D03Z02S03[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S02[S]",
+		"Logic": "D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2]"
+	},
+	{
+		"Id": "D03Z02S03[SE2]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S04[NW]",
+		"Logic": "D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2]"
+	},
+	{
+		"Id": "D03Z02S03[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S07[E]",
+		"Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])"
+	},
+	{
+		"Id": "D03Z02S03[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S06[W]",
+		"Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])"
+	},
+	{
+		"Id": "D03Z02S03[SSL]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z03S01[NL]",
+		"Type": 1,
+		"Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])"
+	},
+	{
+		"Id": "D03Z02S03[SSC]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z03S01[NC]",
+		"Type": 1,
+		"Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])"
+	},
+	{
+		"Id": "D03Z02S03[SSR]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z03S01[NR]",
+		"Type": 1,
+		"Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])"
+	},
+	{
+		"Id": "D03Z02S04[NW]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S03[SE2]",
+		"Logic": "D03Z02S04[NW] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z02S04[NE]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S05[S]",
+		"Logic": "D03Z02S04[NE] || wallClimb || (D03Z02S04[S] && doubleJump)"
+	},
+	{
+		"Id": "D03Z02S04[S]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S06[N]",
+		"Logic": "D03Z02S04[NE] || D03Z02S04[S] || wallClimb"
+	},
+	{
+		"Id": "D03Z02S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S03[E]"
+	},
+	{
+		"Id": "D03Z02S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S11[W]",
+		"Logic": "D03Z02S05[E] || D03Z02S05[S] || canCrossGap5 || (canEnemyBounce && canCrossGap3)"
+	},
+	{
+		"Id": "D03Z02S05[S]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S04[NE]",
+		"Logic": "D03Z02S05[E] || D03Z02S05[S] || canCrossGap5 || (canEnemyBounce && canCrossGap3)"
+	},
+	{
+		"Id": "D03Z02S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S03[SE]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D03Z02S06[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S04[S]"
+	},
+	{
+		"Id": "D03Z02S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S08[E]"
+	},
+	{
+		"Id": "D03Z02S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S03[SW]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D03Z02S07[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S03[W]"
+	},
+	{
+		"Id": "D03Z02S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S14[E]",
+		"Logic": "D03Z02S08[N] || D03Z02S08[W] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z02S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S07[W]"
+	},
+	{
+		"Id": "D03Z02S08[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S09[S]",
+		"Logic": "D03Z02S08[N] || D03Z02S08[W] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z02S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S12[E]",
+		"Logic": "D03Z02S09[W] || dash"
+	},
+	{
+		"Id": "D03Z02S09[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S10[S]",
+		"Logic": "D03Z02S09[N] || D03Z02S09[S] || D03Z02S09[Cherubs] || dash"
+	},
+	{
+		"Id": "D03Z02S09[S]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S08[N]",
+		"Logic": "D03Z02S09[N] || D03Z02S09[S] || D03Z02S09[Cherubs] || dash"
+	},
+	{
+		"Id": "D03Z02S09[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D03Z02S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S13[E]"
+	},
+	{
+		"Id": "D03Z02S10[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z01S03[SW]",
+		"Type": 1
+	},
+	{
+		"Id": "D03Z02S10[S]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z02S09[N]"
+	},
+	{
+		"Id": "D03Z02S10[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S02[W]"
+	},
+	{
+		"Id": "D03Z02S10[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z02S09[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D03Z02S10[Cherubs]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D03Z02S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S05[E]",
+		"Logic": "D03Z02S11[W] || dash && (doubleJump || wallClimb || canCrossGap2)"
+	},
+	{
+		"Id": "D03Z02S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S15[W]",
+		"Logic": "D03Z02S11[E] || dash && (wallClimb || doubleJump)"
+	},
+	{
+		"Id": "D03Z02S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S09[W]"
+	},
+	{
+		"Id": "D03Z02S12[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D03Z02S13[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S10[W]"
+	},
+	{
+		"Id": "D03Z02S13[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z02S12[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D03Z02S14[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z02S08[W]"
+	},
+	{
+		"Id": "D03Z02S15[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S11[E]"
+	},
+	{
+		"Id": "D03Z02S15[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S01[W]",
+		"Type": 1
+	},
+	
+	{
+		"Id": "D03Z03S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S18[E]"
+	},
+	{
+		"Id": "D03Z03S01[S]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S12[W]"
+	},
+	{
+		"Id": "D03Z03S01[NL]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S03[SSL]",
+		"Type": 1,
+		"Logic": "D03Z03S01[NL] || D03Z03S01[NR] || D03Z03S01[NC] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z03S01[NC]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D03Z03S01[NR]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z02S03[SSR]",
+		"Type": 1,
+		"Logic": "D03Z03S01[NL] || D03Z03S01[NR] || D03Z03S01[NC] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z03S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S12[E]",
+		"Logic": "D03Z03S02[NE] || D03Z03S02[W] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z03S02[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S14[W]",
+		"Logic": "D03Z03S02[NE] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z03S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S03[W]"
+	},
+	{
+		"Id": "D03Z03S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S02[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D03Z03S03[NE]" ]
+	},
+	{
+		"Id": "D03Z03S03[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S04[NW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D03Z03S03[W]" ]
+	},
+	{
+		"Id": "D03Z03S03[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S04[SW]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D03Z03S04[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S03[NE]",
+		"Logic": "D03Z03S04[NW] || D03Z03S04[NE] || (wallClimb || doubleJump) && (D03Z03S04[E] || D03Z03S04[SW] || blood || canCrossGap10)"
+	},
+	{
+		"Id": "D03Z03S04[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S05[NW]",
+		"Logic": "D03Z03S04[NE] || wallClimb && (D03Z03S04[NW] || D03Z03S04[E] || D03Z03S04[SW] || blood || canCrossGap10)"
+	},
+	{
+		"Id": "D03Z03S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S05[SW]",
+		"Logic": "D03Z03S04[NW] || D03Z03S04[NE] || D03Z03S04[E] || (wallClimb || doubleJump) && (D03Z03S04[SW] || blood || canCrossGap10)"
+	},
+	{
+		"Id": "D03Z03S04[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S03[SE]",
+		"Logic": "D03Z03S04[NW] || D03Z03S04[NE] || D03Z03S04[E] || D03Z03S04[SW] || blood || canCrossGap10"
+	},
+	{
+		"Id": "D03Z03S04[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S13[W]",
+		"Logic": "D03Z03S04[SE] || blood"
+	},
+	{
+		"Id": "D03Z03S04[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z03S10[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D03Z03S05[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S04[NE]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D03Z03S05[NE]" ]
+	},
+	{
+		"Id": "D03Z03S05[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S06[W]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D03Z03S05[NW]" ]
+	},
+	{
+		"Id": "D03Z03S05[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S04[E]",
+		"Logic": "D03Z03S05[SW] || D03Z03S05[SE] || linen"
+	},
+	{
+		"Id": "D03Z03S05[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S07[SW]",
+		"Logic": "D03Z03S05[SW] || D03Z03S05[SE] || linen"
+	},
+	{
+		"Id": "D03Z03S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S05[NE]"
+	},
+	{
+		"Id": "D03Z03S07[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S19[E]",
+		"Logic": "D03Z03S07[NW] || D03Z03S07[NE] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z03S07[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S08[W]",
+		"Logic": "D03Z03S07[NW] || D03Z03S07[NE] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D03Z03S07[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S05[SE]"
+	},
+	{
+		"Id": "D03Z03S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S11[W]"
+	},
+	{
+		"Id": "D03Z03S07[S]",
+		"Direction": 3,
+		"OriginalDoor": "D03Z03S09[N]"
+	},
+	{
+		"Id": "D03Z03S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S07[NE]"
+	},
+	{
+		"Id": "D03Z03S08[-CherubsL]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z03S11[CherubsL]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D03Z03S08[-CherubsR]",
+		"Direction": 6,
+		"OriginalDoor": "D03Z03S11[CherubsR]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D03Z03S09[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S10[E]"
+	},
+	{
+		"Id": "D03Z03S09[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z03S07[S]"
+	},
+	{
+		"Id": "D03Z03S10[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S09[SW]"
+	},
+	{
+		"Id": "D03Z03S10[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D03Z03S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S07[E]"
+	},
+	{
+		"Id": "D03Z03S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S15[W]"
+	},
+	{
+		"Id": "D03Z03S11[CherubsL]",
+		"Direction": 5
+	},
+	{
+		"Id": "D03Z03S11[CherubsR]",
+		"Direction": 5
+	},
+	{
+		"Id": "D03Z03S12[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S01[S]"
+	},
+	{
+		"Id": "D03Z03S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S02[W]"
+	},
+	{
+		"Id": "D03Z03S13[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S04[SE]"
+	},
+	{
+		"Id": "D03Z03S14[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S02[NE]"
+	},
+	{
+		"Id": "D03Z03S15[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S11[E]",
+		"Logic": "canBeatGrievanceBoss"
+	},
+	{
+		"Id": "D03Z03S15[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S16[W]",
+		"Logic": "canBeatGrievanceBoss"
+	},
+	{
+		"Id": "D03Z03S16[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S15[E]"
+	},
+	{
+		"Id": "D03Z03S16[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S17[W]"
+	},
+	{
+		"Id": "D03Z03S17[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z03S16[E]"
+	},
+	{
+		"Id": "D03Z03S17[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S25[SW]",
+		"Type": 1
+	},
+	{
+		"Id": "D03Z03S18[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S01[W]"
+	},
+	{
+		"Id": "D03Z03S19[E]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z03S07[NW]"
+	},
+	
+	{
+		"Id": "D04Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D08Z02S01[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z01S02[W]"
+	},
+	{
+		"Id": "D04Z01S01[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z01S02[NW]",
+		"Logic": "D04Z01S01[NE] || D04Z01S01[N] || canCrossGap3"
+	},
+	{
+		"Id": "D04Z01S01[N]",
+		"Direction": 0,
+		"OriginalDoor": "D04Z01S05[S]",
+		"Logic": "D04Z01S01[NE] || D04Z01S01[N] || canCrossGap3"
+	},
+	{
+		"Id": "D04Z01S01[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D04Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z01S01[E]"
+	},
+	{
+		"Id": "D04Z01S02[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z01S01[NE]"
+	},
+	{
+		"Id": "D04Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z01S03[W]"
+	},
+	{
+		"Id": "D04Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z01S02[E]"
+	},
+	{
+		"Id": "D04Z01S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z01S04[W]"
+	},
+	{
+		"Id": "D04Z01S03[S]",
+		"Direction": 3,
+		"OriginalDoor": "D05Z01S20[N]",
+		"Type": 1,
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D04Z01S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z01S03[E]"
+	},
+	{
+		"Id": "D04Z01S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z01S04[Cherubs]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D04Z01S05[S]",
+		"Direction": 3,
+		"OriginalDoor": "D04Z01S01[N]"
+	},
+	{
+		"Id": "D04Z01S05[N]",
+		"Direction": 0,
+		"OriginalDoor": "D04Z01S06[S]",
+		"Logic": "D04Z01S05[N] || (blood && canClimbOnRoot) || doubleJump && (blood || canClimbOnRoot)"
+	},
+	{
+		"Id": "D04Z01S05[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D04Z01S01[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D04Z01S05[CherubsN]",
+		"Direction": 5
+	},
+	{
+		"Id": "D04Z01S06[S]",
+		"Direction": 3,
+		"OriginalDoor": "D04Z01S05[N]"
+	},
+	{
+		"Id": "D04Z01S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S09[SW]",
+		"Type": 1,
+		"VisibilityFlags": 9,
+		"Logic": "D04Z01S06[E] || doubleJump"
+	},
+	{
+		"Id": "D04Z01S06[Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D04Z01S05[CherubsN]",
+		"Logic": "linen"
+	},
+
+	{
+		"Id": "D04Z02S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z01S04[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z02S01[N]",
+		"Direction": 0,
+		"OriginalDoor": "D04Z02S02[S]",
+		"Logic": "D04Z02S01[N] || D04Z02S01[NE] && dash && (doubleJump || wallClimb)"
+	},
+	{
+		"Id": "D04Z02S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z03S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z02S01[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S03[W]",
+		"Logic": "D04Z02S01[NE] || D04Z02S01[N] && dash && canCrossGap1"
+	},
+	{
+		"Id": "D04Z02S02[S]",
+		"Direction": 3,
+		"OriginalDoor": "D04Z02S01[N]"
+	},
+	{
+		"Id": "D04Z02S02[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S17[W]"
+	},
+	{
+		"Id": "D04Z02S02[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S15[W]",
+		"VisibilityFlags": 49,
+		"Logic": "D04Z02S02[NE] || (doubleJump && upwarpSkipsAllowed) || (doubleJump && canEnemyUpslash) || (canEnemyUpslash && upwarpSkipsAllowed && (wallClimb || D04Z02S02[N]))"
+	},
+	{
+		"Id": "D04Z02S02[N]",
+		"Direction": 0,
+		"OriginalDoor": "D06Z01S02[S]",
+		"Type": 1,
+		"Logic": "D04Z02S02[N] || D04Z02S02[NE] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D04Z02S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S01[NE]"
+	},
+	{
+		"Id": "D04Z02S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S04[NW]"
+	},
+	{
+		"Id": "D04Z02S04[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S14[E]"
+	},
+	{
+		"Id": "D04Z02S04[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S01[NW]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z02S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z03S01[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z02S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S05[W]"
+	},
+	{
+		"Id": "D04Z02S04[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S03[E]",
+		"Logic": "D04Z02S04[NW] || D04Z02S04[NE] || D04Z02S04[N] || D04Z02S04[Cherubs] || wallClimb && doubleJump"
+	},
+	{
+		"Id": "D04Z02S04[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S19[W]",
+		"Logic": "D04Z02S04[NW] || D04Z02S04[NE] || D04Z02S04[N] || D04Z02S04[Cherubs] || wallClimb && doubleJump"
+	},
+	{
+		"Id": "D04Z02S04[N]",
+		"Direction": 0,
+		"OriginalDoor": "D04Z02S06[S]",
+		"Logic": "(D04Z02S04[NW] || D04Z02S04[NE] || D04Z02S04[N] || D04Z02S04[Cherubs] || wallClimb && doubleJump) && openedMoMLadder"
+	},
+	{
+		"Id": "D04Z02S04[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D04Z02S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S04[E]"
+	},
+	{
+		"Id": "D04Z02S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S07[SW]"
+	},
+	{
+		"Id": "D04Z02S06[S]",
+		"Direction": 3,
+		"OriginalDoor": "D04Z02S04[N]"
+	},
+	{
+		"Id": "D04Z02S06[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S11[E]",
+		"Logic": "D04Z02S06[NW] || D04Z02S06[N] || D04Z02S06[NE] || wallClimb"
+	},
+	{
+		"Id": "D04Z02S06[N]",
+		"Direction": 0,
+		"OriginalDoor": "D06Z01S23[S]",
+		"Type": 1,
+		"Logic": "(D04Z02S06[NW] || D04Z02S06[N] || D04Z02S06[NE] || wallClimb) && openedARLadder"
+	},
+	{
+		"Id": "D04Z02S06[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S09[W]",
+		"Logic": "D04Z02S06[NW] || D04Z02S06[N] || D04Z02S06[NE] || wallClimb"
+	},
+	{
+		"Id": "D04Z02S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S10[W]"
+	},
+	{
+		"Id": "D04Z02S06[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D04Z02S04[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D04Z02S07[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S05[E]"
+	},
+	{
+		"Id": "D04Z02S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S19[E]"
+	},
+	{
+		"Id": "D04Z02S07[N]",
+		"Direction": 0,
+		"OriginalDoor": "D04Z02S08[S]"
+	},
+	{
+		"Id": "D04Z02S07[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S13[W]"
+	},
+	{
+		"Id": "D04Z02S07[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S23[W]"
+	},
+	{
+		"Id": "D04Z02S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S09[E]"
+	},
+	{
+		"Id": "D04Z02S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S20[W]"
+	},
+	{
+		"Id": "D04Z02S08[S]",
+		"Direction": 3,
+		"OriginalDoor": "D04Z02S07[N]"
+	},
+	{
+		"Id": "D04Z02S08[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D04Z02S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S06[NE]"
+	},
+	{
+		"Id": "D04Z02S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S08[W]"
+	},
+	{
+		"Id": "D04Z02S09[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S16[W]",
+		"Logic": "D04Z02S09[NE] || blood"
+	},
+	{
+		"Id": "D04Z02S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S06[E]"
+	},
+	{
+		"Id": "D04Z02S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S21[SE]"
+	},
+	{
+		"Id": "D04Z02S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S06[NW]"
+	},
+	{
+		"Id": "D04Z02S12[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S21[NE]"
+	},
+	{
+		"Id": "D04Z02S13[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S07[NE]"
+	},
+	{
+		"Id": "D04Z02S14[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S04[SW]"
+	},
+	{
+		"Id": "D04Z02S15[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S02[NE]"
+	},
+	{
+		"Id": "D04Z02S15[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S22[W]"
+	},
+	{
+		"Id": "D04Z02S16[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S09[NE]"
+	},
+	{
+		"Id": "D04Z02S16[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D04Z02S08[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D04Z02S17[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S02[SE]"
+	},
+	{
+		"Id": "D04Z02S19[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S04[NE]"
+	},
+	{
+		"Id": "D04Z02S19[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S07[W]"
+	},
+	{
+		"Id": "D04Z02S20[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S08[E]"
+	},
+	{
+		"Id": "D04Z02S20[Redento]",
+		"Direction": 4,
+		"OriginalDoor": "D04BZ02S01[Redento]",
+		"Logic": "redentoRooms >= 5"
+	},
+	{
+		"Id": "D04Z02S21[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S22[E]",
+		"Logic": "D04Z02S21[NE] || D04Z02S21[W] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D04Z02S21[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S11[W]"
+	},
+	{
+		"Id": "D04Z02S21[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S12[W]",
+		"Logic": "D04Z02S21[NE] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D04Z02S22[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S15[E]",
+		"Logic": "D04Z02S22[W] || canBeatMothersBoss"
+	},
+	{
+		"Id": "D04Z02S22[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S21[W]",
+		"Logic": "D04Z02S22[E] || canBeatMothersBoss"
+	},
+	{
+		"Id": "D04Z02S23[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S07[SE]"
+	},
+	{
+		"Id": "D04Z02S23[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S24[NW]"
+	},
+	{
+		"Id": "D04Z02S23[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z04S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z02S24[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S23[SE]"
+	},
+	{
+		"Id": "D04Z02S24[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S01[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z02S24[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S25[W]"
+	},
+	{
+		"Id": "D04Z02S25[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S24[SE]"
+	},
+	{
+		"Id": "D04BZ02S01[Redento]",
+		"Direction": 7,
+		"OriginalDoor": "D04Z02S20[Redento]"
+	},
+	
+	{
+		"Id": "D04Z03S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S01[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z03S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S04[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z03S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S22[E]",
+		"Type": 1
+	},
+	
+	{
+		"Id": "D04Z04S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S23[NE]",
+		"Type": 1
+	},
+	{
+		"Id": "D04Z04S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z04S02[W]",
+		"Type": 9
+	},
+	{
+		"Id": "D04Z04S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z04S01[E]",
+		"Type": 9
+	},
+	
+	{
+		"Id": "D05Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S02[E]"
+	},
+	{
+		"Id": "D05Z01S01[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z02S04[SE]",
+		"Type": 1
+	},
+	{
+		"Id": "D05Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S16[W]"
+	},
+	{
+		"Id": "D05Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S15[E]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D05Z01S02[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S03[E]"
+	},
+	{
+		"Id": "D05Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S01[W]"
+	},
+	{
+		"Id": "D05Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S04[E]"
+	},
+	{
+		"Id": "D05Z01S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S02[NW]"
+	},
+	{
+		"Id": "D05Z01S03[Frontal]",
+		"Direction": 4,
+		"OriginalDoor": "D05BZ01S01[FrontalS]",
+		"Logic": "woodKey && D05Z01S23[E] && (D05Z01S11[NW] || D05Z01S11[NE])"
+	},
+	{
+		"Id": "D05Z01S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S05[E]"
+	},
+	{
+		"Id": "D05Z01S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S03[W]"
+	},
+	{
+		"Id": "D05Z01S05[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S07[E]"
+	},
+	{
+		"Id": "D05Z01S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S04[W]"
+	},
+	{
+		"Id": "D05Z01S05[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S17[W]",
+		"Logic": "D05Z01S05[NE] || blood"
+	},
+	{
+		"Id": "D05Z01S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S24[E]",
+		"Logic": "D05Z01S06[W] || canSurvivePoison3"
+	},
+	{
+		"Id": "D05Z01S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S20[W]",
+		"Logic": "D05Z01S06[E] || canSurvivePoison3"
+	},
+	{
+		"Id": "D05Z01S07[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S08[NE]"
+	},
+	{
+		"Id": "D05Z01S07[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S20[E]",
+		"Logic": "D05Z01S07[NW] || blood && (canClimbOnRoot || doubleJump) || (canClimbOnRoot && canCrossGap3) || canCrossGap7"
+	},
+	{
+		"Id": "D05Z01S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S05[SW]"
+	},
+	{
+		"Id": "D05Z01S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S10[E]"
+	},
+	{
+		"Id": "D05Z01S08[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S12[E]"
+	},
+	{
+		"Id": "D05Z01S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S09[W]"
+	},
+	{
+		"Id": "D05Z01S08[Health]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S14[W]"
+	},
+	{
+		"Id": "D05Z01S08[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S07[SW]"
+	},
+	{
+		"Id": "D05Z01S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S08[E]"
+	},
+	{
+		"Id": "D05Z01S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S18[W]"
+	},
+	{
+		"Id": "D05Z01S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S11[E]"
+	},
+	{
+		"Id": "D05Z01S10[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S11[NE]"
+	},
+	{
+		"Id": "D05Z01S10[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S08[W]"
+	},
+	{
+		"Id": "D05Z01S11[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S19[E]",
+		"VisibilityFlags": 5,
+		"Logic": "canBreakTirana"
+	},
+	{
+		"Id": "D05Z01S11[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S23[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D05Z01S11[NE]" ]
+	},
+	{
+		"Id": "D05Z01S11[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S10[NW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D05Z01S11[NW]" ]
+	},
+	{
+		"Id": "D05Z01S11[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D05Z01S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S10[W]"
+	},
+	{
+		"Id": "D05Z01S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S08[NW]"
+	},
+	{
+		"Id": "D05Z01S13[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S21[NW]"
+	},
+	{
+		"Id": "D05Z01S14[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S08[Health]"
+	},
+	{
+		"Id": "D05Z01S15[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S21[NE]"
+	},
+	{
+		"Id": "D05Z01S15[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S02[W]"
+	},
+	{
+		"Id": "D05Z01S16[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S01[E]"
+	},
+	{
+		"Id": "D05Z01S17[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S05[NE]"
+	},
+	{
+		"Id": "D05Z01S18[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S09[E]"
+	},
+	{
+		"Id": "D05Z01S19[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S15[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D05Z01S19[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S11[SW]"
+	},
+	{
+		"Id": "D05Z01S20[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S06[E]"
+	},
+	{
+		"Id": "D05Z01S20[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S07[NW]"
+	},
+	{
+		"Id": "D05Z01S20[N]",
+		"Direction": 0,
+		"OriginalDoor": "D04Z01S03[S]",
+		"Type": 1
+	},
+	{
+		"Id": "D05Z01S21[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S14[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D05Z01S21[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S13[E]"
+	},
+	{
+		"Id": "D05Z01S21[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S15[W]"
+	},
+	{
+		"Id": "D05Z01S21[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D05Z02S11[Cherubs]",
+		"Type": 1,
+		"Logic": "linen"
+	},
+	{
+		"Id": "D05Z01S22[FrontalN]",
+		"Direction": 4,
+		"OriginalDoor": "D05BZ01S01[FrontalN]"
+	},
+	{
+		"Id": "D05Z01S22[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z03S02[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D05Z01S23[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S11[NW]"
+	},
+	{
+		"Id": "D05Z01S24[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S06[W]"
+	},
+	{
+		"Id": "D05BZ01S01[FrontalS]",
+		"Direction": 7,
+		"OriginalDoor": "D05Z01S03[Frontal]"
+	},
+	{
+		"Id": "D05BZ01S01[FrontalN]",
+		"Direction": 7,
+		"OriginalDoor": "D05Z01S22[FrontalN]"
+	},
+
+	{
+		"Id": "D05Z02S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z01S11[SE]",
+		"Type": 1
+	},
+	{
+		"Id": "D05Z02S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S02[NW]"
+	},
+	{
+		"Id": "D05Z02S02[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S03[E]"
+	},
+	{
+		"Id": "D05Z02S02[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S01[E]"
+	},
+	{
+		"Id": "D05Z02S02[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S09[W]"
+	},
+	{
+		"Id": "D05Z02S02[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S05[W]"
+	},
+	{
+		"Id": "D05Z02S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S04[E]"
+	},
+	{
+		"Id": "D05Z02S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S02[SW]"
+	},
+	{
+		"Id": "D05Z02S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S12[E]"
+	},
+	{
+		"Id": "D05Z02S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S03[W]"
+	},
+	{
+		"Id": "D05Z02S04[C]",
+		"Direction": 4,
+		"OriginalDoor": "D05BZ02S01[C]"
+	},
+	{
+		"Id": "D05Z02S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S02[NE]"
+	},
+	{
+		"Id": "D05Z02S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S06[SW]"
+	},
+	{
+		"Id": "D05Z02S06[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S05[E]"
+	},
+	{
+		"Id": "D05Z02S06[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S07[E]"
+	},
+	{
+		"Id": "D05Z02S06[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S11[W]",
+		"Logic": "openedTSCGate"
+	},
+	{
+		"Id": "D05Z02S06[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S14[W]"
+	},
+	{
+		"Id": "D05Z02S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S10[E]"
+	},
+	{
+		"Id": "D05Z02S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S06[NW]"
+	},
+	{
+		"Id": "D05Z02S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S09[E]"
+	},
+	{
+		"Id": "D05Z02S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S02[SE]"
+	},
+	{
+		"Id": "D05Z02S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S08[W]",
+		"Logic": "redWax >= 3 && blueWax >= 3"
+	},
+	{
+		"Id": "D05Z02S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S13[E]",
+		"Logic": "dash"
+	},
+	{
+		"Id": "D05Z02S10[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S07[W]"
+	},
+	{
+		"Id": "D05Z02S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S06[SE]"
+	},
+	{
+		"Id": "D05Z02S11[Cherubs]",
+		"Direction": 5,
+		"Type": 1
+	},
+	{
+		"Id": "D05Z02S12[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z04S16[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D05Z02S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S04[W]"
+	},
+	{
+		"Id": "D05Z02S12[N]",
+		"Direction": 0,
+		"OriginalDoor": "D05Z02S15[S]"
+	},
+	{
+		"Id": "D05Z02S13[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z02S10[W]",
+		"Logic": "dash"
+	},
+	{
+		"Id": "D05Z02S14[W]",
+		"Direction": 1,
+		"OriginalDoor": "D05Z02S06[NE]",
+		"Logic": "D05Z02S14[W] || canBeatCanvasesBoss"
+	},
+	{
+		"Id": "D05Z02S14[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S21[SW]",
+		"Type": 1,
+		"Logic": "D05Z02S14[E] || canBeatCanvasesBoss"
+	},
+	{
+		"Id": "D05Z02S15[S]",
+		"Direction": 3,
+		"OriginalDoor": "D05Z02S12[N]"
+	},
+	{
+		"Id": "D05Z02S15[E]",
+		"Direction": 2,
+		"OriginalDoor": "D05Z01S19[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D05BZ02S01[C]",
+		"Direction": 7,
+		"OriginalDoor": "D05Z02S04[C]"
+	},
+
+	{
+		"Id": "D06Z01S01[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S14[E]",
+		"Logic": "(D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || linen && (D06Z01S01[NW] || D06Z01S01[NE])"
+	},
+	{
+		"Id": "D06Z01S01[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S03[W]",
+		"Logic": "(D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || linen && (D06Z01S01[NW] || D06Z01S01[NE])"
+	},
+	{
+		"Id": "D06Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S07[E]",
+		"Logic": "(D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || masks >= 1 && (D06Z01S01[SW] || D06Z01S01[SE]) || linen && (D06Z01S01[NW] || D06Z01S01[NE] && (canWalkOnRoot || canCrossGap1))"
+	},
+	{
+		"Id": "D06Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S06[WW]",
+		"Logic": "(D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || masks >= 1 && (D06Z01S01[SW] || D06Z01S01[SE]) || linen && (D06Z01S01[NE] || D06Z01S01[NW] && (canWalkOnRoot || canCrossGap1))"
+	},
+	{
+		"Id": "D06Z01S01[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S16[E]",
+		"Logic": "D06Z01S01[NW] || D06Z01S01[NE] && (canWalkOnRoot || canCrossGap8) || linen && (D06Z01S01[NNW] || D06Z01S01[NNE] && (canWalkOnRoot || canCrossGap3))"
+	},
+	{
+		"Id": "D06Z01S01[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S17[W]",
+		"Logic": "D06Z01S01[NE] || D06Z01S01[NW] && (canWalkOnRoot || canCrossGap8) || linen && (D06Z01S01[NNE] || D06Z01S01[NNW] && (canWalkOnRoot || canCrossGap3))"
+	},
+	{
+		"Id": "D06Z01S01[NNW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S09[E]",
+		"Logic": "(D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || masks >= 2 && (D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || linen && (D06Z01S01[NW] || D06Z01S01[NE]))"
+	},
+	{
+		"Id": "D06Z01S01[NNE]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S10[W]",
+		"Logic": "(D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || masks >= 2 && (D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || linen && (D06Z01S01[NW] || D06Z01S01[NE]))"
+	},
+	{
+		"Id": "D06Z01S01[N]",
+		"Direction": 0,
+		"OriginalDoor": "D06Z01S19[S]",
+		"Logic": "masks >= 3 && (D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N] || linen && (D06Z01S01[NW] || D06Z01S01[NE]))",
+		"Type": 9
+	},
+	{
+		"Id": "D06Z01S01[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D06Z01S23[Cherubs]",
+		"Logic": "linen && (D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NW] || D06Z01S01[NE] || D06Z01S01[NNW] || D06Z01S01[NNE])"
+	},
+	{
+		"Id": "D06Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S18[E]"
+	},
+	{
+		"Id": "D06Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S08[W]"
+	},
+	{
+		"Id": "D06Z01S02[S]",
+		"Direction": 3,
+		"OriginalDoor": "D04Z02S02[N]",
+		"Type": 1
+	},
+	{
+		"Id": "D06Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S01[SE]",
+		"Logic": "D06Z01S03[W] || canBeatLegionary"
+	},
+	{
+		"Id": "D06Z01S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S04[W]",
+		"Logic": "D06Z01S03[E] || canBeatLegionary"
+	},
+	{
+		"Id": "D06Z01S04[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S20[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S04[W]", "D06Z01S04[Health]" ]
+	},
+	{
+		"Id": "D06Z01S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S03[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S04[SW]", "D06Z01S04[Health]" ]
+	},
+	{
+		"Id": "D06Z01S04[Health]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S24[W]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S04[SW]", "D06Z01S04[W]" ],
+		"Logic": "D06Z01S04[Health] || (wallClimb && canSurvivePoison2 && (doubleJump || blood && canClimbOnRoot))"
+	},
+	{
+		"Id": "D06Z01S04[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S06[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S04[NE]", "D06Z01S04[Cherubs]" ],
+		"Logic": "D06Z01S04[NW] || D06Z01S04[Cherubs] || (D06Z01S04[SW] || D06Z01S04[W] || D06Z01S04[Health]) && wallClimb && canSurvivePoison2 && (dash || doubleJump && (canDawnJump || canClimbOnRoot))"
+	},
+	{
+		"Id": "D06Z01S04[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S06[W]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S04[NW]", "D06Z01S04[Cherubs]" ],
+		"Logic": "D06Z01S04[NE] || (D06Z01S04[SW] || D06Z01S04[W] || D06Z01S04[Health]) && wallClimb && canSurvivePoison2 && (dash || doubleJump && (canDawnJump || canClimbOnRoot))"
+	},
+	{
+		"Id": "D06Z01S04[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D06Z01S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S12[NW]"
+	},
+	{
+		"Id": "D06Z01S06[WW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S01[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S06[E]" ],
+		"Logic": "D06Z01S06[WW] || canBeatLegionary"
+	},
+	{
+		"Id": "D06Z01S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S04[NW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S06[WW]" ],
+		"Logic": "D06Z01S06[E] || canBeatLegionary"
+	},
+	{
+		"Id": "D06Z01S06[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S04[NE]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S06[EE]" ]
+	},
+	{
+		"Id": "D06Z01S06[EE]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S15[SW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S06[W]" ]
+	},
+	{
+		"Id": "D06Z01S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S12[E]"
+	},
+	{
+		"Id": "D06Z01S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S01[W]"
+	},
+	{
+		"Id": "D06Z01S07[CherubsL]",
+		"Direction": 5
+	},
+	{
+		"Id": "D06Z01S07[CherubsR]",
+		"Direction": 5
+	},
+	{
+		"Id": "D06Z01S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S02[E]"
+	},
+	{
+		"Id": "D06Z01S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S14[W]",
+		"Logic": "D06Z01S08[N] || D06Z01S08[E] || wallClimb"
+	},
+	{
+		"Id": "D06Z01S08[N]",
+		"Direction": 0,
+		"OriginalDoor": "D06Z01S13[S]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D06Z01S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S12[NE]"
+	},
+	{
+		"Id": "D06Z01S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S01[NNW]"
+	},
+	{
+		"Id": "D06Z01S09[-CherubsL]",
+		"Direction": 6,
+		"OriginalDoor": "D06Z01S16[CherubsL]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D06Z01S09[-CherubsR]",
+		"Direction": 6,
+		"OriginalDoor": "D06Z01S16[CherubsR]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D06Z01S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S01[NNE]"
+	},
+	{
+		"Id": "D06Z01S10[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S21[W]"
+	},
+	{
+		"Id": "D06Z01S10[-CherubsL]",
+		"Direction": 6,
+		"OriginalDoor": "D06Z01S17[CherubsL]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D06Z01S10[-CherubsR]",
+		"Direction": 6,
+		"OriginalDoor": "D06Z01S17[CherubsR]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D06Z01S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S15[NE]"
+	},
+	{
+		"Id": "D06Z01S12[S]",
+		"Direction": 3,
+		"OriginalDoor": "D06Z01S14[N]"
+	},
+	{
+		"Id": "D06Z01S12[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S13[E]",
+		"Logic": "D06Z01S12[NW] || D06Z01S12[NE] || D06Z01S12[NE2] || D06Z01S12[W] || D06Z01S12[E] || wallClimb && doubleJump"
+	},
+	{
+		"Id": "D06Z01S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S07[W]",
+		"Logic": "D06Z01S12[NW] || D06Z01S12[NE] || D06Z01S12[NE2] || D06Z01S12[W] || D06Z01S12[E] || wallClimb && doubleJump"
+	},
+	{
+		"Id": "D06Z01S12[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S05[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S12[NE]", "D06Z01S12[NE2]" ],
+		"Logic": "D06Z01S12[NW] || D06Z01S12[NE] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D06Z01S12[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S09[W]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S12[NW]", "D06Z01S12[NE2]" ],
+		"Logic": "D06Z01S12[NW] || D06Z01S12[NE] || wallClimb || doubleJump"
+	},
+	{
+		"Id": "D06Z01S12[NE2]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S16[W]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D06Z01S13[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S01[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D06Z01S13[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S12[W]"
+	},
+	{
+		"Id": "D06Z01S13[S]",
+		"Direction": 3,
+		"OriginalDoor": "D06Z01S08[N]"
+	},
+	{
+		"Id": "D06Z01S14[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S08[E]"
+	},
+	{
+		"Id": "D06Z01S14[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S01[SW]"
+	},
+	{
+		"Id": "D06Z01S14[N]",
+		"Direction": 0,
+		"OriginalDoor": "D06Z01S12[S]"
+	},
+	{
+		"Id": "D06Z01S15[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S06[EE]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D06Z01S15[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S21[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S15[NE]" ],
+		"Logic": "D06Z01S15[NW] || D06Z01S15[SW] && wallClimb"
+	},
+	{
+		"Id": "D06Z01S15[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S11[W]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D06Z01S15[NW]" ],
+		"Logic": "D06Z01S15[NE] || D06Z01S15[SW] && wallClimb"
+	},
+	{
+		"Id": "D06Z01S16[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S12[NE2]",
+		"Logic": "D06Z01S16[W] || (D06Z01S16[CherubsL] && (doubleJump || wallClimb && (canWalkOnRoot || canAirStall))) || (D06Z01S16[CherubsR] && (doubleJump || canAirStall && (canWalkOnRoot || wheel) && (wallClimb || canDawnJump))) || (D06Z01S16[E] && (canWalkOnRoot || canCrossGap7) && (wallClimb || canCrossGap5))"
+	},
+	{
+		"Id": "D06Z01S16[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S01[NW]",
+		"Logic": "D06Z01S16[E] || ((D06Z01S16[W] || D06Z01S16[CherubsL]) && (canWalkOnRoot || canCrossGap5)) || (D06Z01S16[CherubsR] && (doubleJump || canAirStall && (canWalkOnRoot || wheel)))"
+	},
+	{
+		"Id": "D06Z01S16[-CherubsL]",
+		"Direction": 6,
+		"OriginalDoor": "D06Z01S07[CherubsL]",
+		"Logic": "linen && (D06Z01S16[W] || D06Z01S16[CherubsL] || (D06Z01S16[CherubsR] && (doubleJump || canAirStall && (canWalkOnRoot || wheel))) || (D06Z01S16[E] && (canWalkOnRoot || canCrossGap7)))"
+	},
+	{
+		"Id": "D06Z01S16[-CherubsR]",
+		"Direction": 6,
+		"OriginalDoor": "D06Z01S07[CherubsR]",
+		"Logic": "linen && (D06Z01S16[E] || D06Z01S16[CherubsR] || (D06Z01S16[CherubsL] && (canAirStall || canWalkOnRoot || doubleJump)) || (D06Z01S16[W] && (canWalkOnRoot || canCrossGap1)))"
+	},
+	{
+		"Id": "D06Z01S16[CherubsL]",
+		"Direction": 5
+	},
+	{
+		"Id": "D06Z01S16[CherubsR]",
+		"Direction": 5
+	},
+	{
+		"Id": "D06Z01S17[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S01[NE]",
+		"Logic": "D06Z01S17[W] || (D06Z01S17[E] || D06Z01S17[CherubsR]) && blood || D06Z01S17[CherubsL] && doubleJump"
+	},
+	{
+		"Id": "D06Z01S17[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S26[W]",
+		"Logic": "D06Z01S17[E] || D06Z01S17[CherubsR] || blood && (D06Z01S17[W] || D06Z01S17[CherubsL] && doubleJump)"
+	},
+	{
+		"Id": "D06Z01S17[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D06Z01S04[Cherubs]",
+		"Logic": "linen"
+	},
+	{
+		"Id": "D06Z01S17[CherubsL]",
+		"Direction": 5
+	},
+	{
+		"Id": "D06Z01S17[CherubsR]",
+		"Direction": 5
+	},
+	{
+		"Id": "D06Z01S18[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S02[W]"
+	},
+	{
+		"Id": "D06Z01S18[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D04Z01S04[Cherubs]",
+		"Type": 1,
+		"Logic": "linen"
+	},
+	{
+		"Id": "D06Z01S19[S]",
+		"Direction": 3,
+		"OriginalDoor": "D06Z01S01[N]",
+		"Type": 9
+	},
+	{
+		"Id": "D06Z01S19[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S25[W]",
+		"Type": 9
+	},
+	{
+		"Id": "D06Z01S20[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S23[E]"
+	},
+	{
+		"Id": "D06Z01S20[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S04[SW]"
+	},
+	{
+		"Id": "D06Z01S21[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S10[E]",
+		"Logic": "D06Z01S21[W] || canBeatLegionary"
+	},
+	{
+		"Id": "D06Z01S21[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S15[NW]",
+		"Logic": "D06Z01S21[E] || canBeatLegionary"
+	},
+	{
+		"Id": "D06Z01S22[Sword]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S23[Sword]"
+	},
+	{
+		"Id": "D06Z01S23[Sword]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S22[Sword]"
+	},
+	{
+		"Id": "D06Z01S23[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S20[W]"
+	},
+	{
+		"Id": "D06Z01S23[S]",
+		"Direction": 3,
+		"OriginalDoor": "D04Z02S06[N]",
+		"Type": 1
+	},
+	{
+		"Id": "D06Z01S23[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D06Z01S24[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S04[Health]"
+	},
+	{
+		"Id": "D06Z01S25[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S19[E]",
+		"Logic": "D06Z01S25[W] || canBeatRooftopsBoss",
+		"Type": 9
+	},
+	{
+		"Id": "D06Z01S25[E]",
+		"Direction": 2,
+		"OriginalDoor": "D07Z01S01[W]",
+		"Logic": "D06Z01S25[E] || canBeatRooftopsBoss",
+		"Type": 9
+	},
+	{
+		"Id": "D06Z01S26[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S17[E]"
+	},
+
+	{
+		"Id": "D07Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D06Z01S25[E]",
+		"Type": 9
+	},
+	{
+		"Id": "D07Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D07Z01S02[W]",
+		"Type": 9
+	},
+	{
+		"Id": "D07Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D07Z01S01[E]",
+		"Type": 9
+	},
+	{
+		"Id": "D07Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D07Z01S03[W]",
+		"Type": 9
+	},
+	{
+		"Id": "D07Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D07Z01S02[E]",
+		"Type": 9
+	},
+
+	{
+		"Id": "D08Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z03S06[E]",
+		"Type": 1,
+		"Logic": "D08Z01S01[W] || canBeatBridgeBoss"
+	},
+	{
+		"Id": "D08Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D08Z02S01[W]",
+		"Type": 1,
+		"Logic": "holyWounds >= 3 && (D08Z01S01[E] || D08Z01S01[Cherubs] || canBeatBridgeBoss)"
+	},
+	{
+		"Id": "D08Z01S01[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D08Z01S02[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D08Z03S03[W]",
+		"Type": 1,
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D08Z01S02[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D08Z02S03[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D08Z01S02[-Cherubs]",
+		"Direction": 6,
+		"OriginalDoor": "D08Z01S01[Cherubs]",
+		"Logic": "linen"
+	},
+	
+	{
+		"Id": "D08Z02S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D08Z01S01[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D08Z02S01[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D08Z02S02[W]"
+	},
+	{
+		"Id": "D08Z02S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z01S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D08Z02S01[N]",
+		"Direction": 0,
+		"OriginalDoor": "D08Z02S03[S]"
+	},
+	{
+		"Id": "D08Z02S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D08Z02S01[SE]"
+	},
+	{
+		"Id": "D08Z02S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D08Z01S02[SE]",
+		"Type": 1,
+		"Logic": "brokeBotTCStatue"
+	},
+	{
+		"Id": "D08Z02S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D08Z03S01[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D08Z02S03[S]",
+		"Direction": 3,
+		"OriginalDoor": "D08Z02S01[N]"
+	},
+	
+	{
+		"Id": "D08Z03S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D08Z02S03[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D08Z03S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D08Z03S02[SW]",
+		"Logic": "verses >= 4"
+	},
+	{
+		"Id": "D08Z03S02[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D08Z03S01[E]"
+	},
+	{
+		"Id": "D08Z03S02[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D08Z03S03[E]",
+		"Logic": "D08Z03S02[NW] || wallClimb"
+	},
+	{
+		"Id": "D08Z03S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D08Z01S02[NE]",
+		"Type": 1,
+		"Logic": "D08Z03S03[W] || canBeatHallBoss"
+	},
+	{
+		"Id": "D08Z03S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D08Z03S02[NW]",
+		"Logic": "D08Z03S03[E] || canBeatHallBoss"
+	},
+	
+	{
+		"Id": "D09Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S11[E]"
+	},
+	{
+		"Id": "D09Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D06Z01S13[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D09Z01S02[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S07[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[Cell2]" ]
+	},
+	{
+		"Id": "D09Z01S02[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S07[NE]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ]
+	},
+	{
+		"Id": "D09Z01S02[N]",
+		"Direction": 0,
+		"OriginalDoor": "D09Z01S11[S]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ]
+	},
+	{
+		"Id": "D09Z01S02[Cell1]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell1]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ],
+		"Logic": "bronzeKey"
+	},
+	{
+		"Id": "D09Z01S02[Cell6]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell6]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ],
+		"Logic": "silverKey"
+	},
+	{
+		"Id": "D09Z01S02[Cell5]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell5]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09Z01S02[Cell4]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell4]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ],
+		"Logic": "goldKey"
+	},
+	{
+		"Id": "D09Z01S02[Cell2]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell2]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[SW]" ]
+	},
+	{
+		"Id": "D09Z01S02[Cell3]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell3]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ],
+		"Logic": "bronzeKey"
+	},
+	{
+		"Id": "D09Z01S02[Cell22]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell22]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ]
+	},
+	{
+		"Id": "D09Z01S02[Cell23]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell23]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ],
+		"Logic": "bronzeKey"
+	},
+	{
+		"Id": "D09Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S05[SE]",
+		"Logic": "D09Z01S03[N] && canBeatPrisonBoss"
+	},
+	{
+		"Id": "D09Z01S03[N]",
+		"Direction": 5
+	},
+	{
+		"Id": "D09Z01S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S06[E]"
+	},
+	{
+		"Id": "D09Z01S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S11[W]"
+	},
+	{
+		"Id": "D09Z01S04[S]",
+		"Direction": 3,
+		"OriginalDoor": "D09Z01S07[N]"
+	},
+	{
+		"Id": "D09Z01S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S13[E]"
+	},
+	{
+		"Id": "D09Z01S05[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S03[W]"
+	},
+	{
+		"Id": "D09Z01S05[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S08[W]"
+	},
+	{
+		"Id": "D09Z01S06[-E]",
+		"Direction": 1,
+		"OriginalDoor": "D02Z03S10[-W]",
+		"Type": 1,
+		"Logic": "peaksKey"
+	},
+	{
+		"Id": "D09Z01S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S04[W]"
+	},
+	{
+		"Id": "D09Z01S07[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S09[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ]
+	},
+	{
+		"Id": "D09Z01S07[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S10[W]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ]
+	},
+	{
+		"Id": "D09Z01S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S08[SE]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ]
+	},
+	{
+		"Id": "D09Z01S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S02[SW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ]
+	},
+	{
+		"Id": "D09Z01S07[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S08[NE]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S07[N]" ]
+	},
+	{
+		"Id": "D09Z01S07[N]",
+		"Direction": 0,
+		"OriginalDoor": "D09Z01S04[S]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S07[NW]" ]
+	},
+	{
+		"Id": "D09Z01S07[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S02[NW]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ],
+		"Logic": "D09Z01S07[NE] || blood"
+	},
+	{
+		"Id": "D09Z01S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S05[NE]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S08[Cell14]" ],
+		"Logic": "openedWotHPGate"
+	},
+	{
+		"Id": "D09Z01S08[S]",
+		"Direction": 6,
+		"OriginalDoor": "D09Z01S03[N]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S08[W]", "D09Z01S08[Cell14]" ]
+	},
+	{
+		"Id": "D09Z01S08[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S07[W]",
+		"Logic": "D09Z01S08[SE] || D09Z01S08[Cell15] || D09Z01S08[Cell16] || D09Z01S08[Cell18] || D09Z01S08[Cell17] && dash"
+	},
+	{
+		"Id": "D09Z01S08[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S07[NW]",
+		"Logic": "D09Z01S08[NE] || D09Z01S08[Cell7] || D09Z01S08[Cell17] && dash"
+	},
+	{
+		"Id": "D09Z01S08[Cell14]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell14]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S08[W]" ]
+	},
+	{
+		"Id": "D09Z01S08[Cell15]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell15]",
+		"Logic": "silverKey && (D09Z01S08[SE] || D09Z01S08[Cell15] || D09Z01S08[Cell16] || D09Z01S08[Cell18] || D09Z01S08[Cell17] && dash)"
+	},
+	{
+		"Id": "D09Z01S08[Cell7]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell7]",
+		"Logic": "goldKey && (D09Z01S08[NE] || D09Z01S08[Cell7] || D09Z01S08[Cell17] && dash)"
+	},
+	{
+		"Id": "D09Z01S08[Cell16]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell16]",
+		"Logic": "goldKey && (D09Z01S08[SE] || D09Z01S08[Cell15] || D09Z01S08[Cell16] || D09Z01S08[Cell18] || D09Z01S08[Cell17] && dash)"
+	},
+	{
+		"Id": "D09Z01S08[Cell18]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell18]",
+		"Logic": "silverKey && (D09Z01S08[SE] || D09Z01S08[Cell15] || D09Z01S08[Cell16] || D09Z01S08[Cell18] || D09Z01S08[Cell17] && dash)"
+	},
+	{
+		"Id": "D09Z01S08[Cell17]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell17]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09Z01S09[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D04Z01S06[E]",
+		"Type": 1,
+		"Logic": "D09Z01S09[Cell21] || D09Z01S09[Cell20] || D09Z01S09[SW] || D09Z01S09[E] || dash"
+	},
+	{
+		"Id": "D09Z01S09[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S12[E]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S09[Cell19]", "D09Z01S09[Cell24]" ],
+		"Logic": "D09Z01S09[NW] || D09Z01S09[Cell19] || dash"
+	},
+	{
+		"Id": "D09Z01S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S07[SW]",
+		"Logic": "D09Z01S09[Cell21] || D09Z01S09[Cell20] || D09Z01S09[SW] || D09Z01S09[E] || dash"
+	},
+	{
+		"Id": "D09Z01S09[Cell24]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell24]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S09[NW]", "D09Z01S09[Cell19]" ],
+		"Logic": "D09Z01S09[Cell24] || dash"
+	},
+	{
+		"Id": "D09Z01S09[Cell19]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell19]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S09[NW]", "D09Z01S09[Cell24]" ],
+		"Logic": "D09Z01S09[NW] || D09Z01S09[Cell19] || dash"
+	},
+	{
+		"Id": "D09Z01S09[Cell20]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell20]",
+		"Logic": "silverKey && (D09Z01S09[Cell21] || D09Z01S09[Cell20] || D09Z01S09[SW] || D09Z01S09[E] || dash)"
+	},
+	{
+		"Id": "D09Z01S09[Cell21]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell21]",
+		"Logic": "goldKey && (D09Z01S09[Cell21] || D09Z01S09[Cell20] || D09Z01S09[SW] || D09Z01S09[E] || dash)"
+	},
+	{
+		"Id": "D09Z01S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S07[SE]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S10[Cell12]", "D09Z01S10[Cell10]", "D09Z01S10[Cell11]" ]
+	},
+	{
+		"Id": "D09Z01S10[Cell13]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell13]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09Z01S10[Cell12]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell12]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S10[W]", "D09Z01S10[Cell10]", "D09Z01S10[Cell11]" ],
+		"Logic": "bronzeKey"
+	},
+	{
+		"Id": "D09Z01S10[Cell10]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell10]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S10[W]", "D09Z01S10[Cell12]", "D09Z01S10[Cell11]" ],
+		"Logic": "silverKey"
+	},
+	{
+		"Id": "D09Z01S10[Cell11]",
+		"Direction": 4,
+		"OriginalDoor": "D09BZ01S01[Cell11]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09Z01S10[W]", "D09Z01S10[Cell12]", "D09Z01S10[Cell10]" ],
+		"Logic": "silverKey"
+	},
+	{
+		"Id": "D09Z01S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D09Z01S04[E]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09Z01S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S01[W]"
+	},
+	{
+		"Id": "D09Z01S11[S]",
+		"Direction": 3,
+		"OriginalDoor": "D09Z01S02[N]"
+	},
+	{
+		"Id": "D09Z01S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S09[NW]"
+	},
+	{
+		"Id": "D09Z01S13[E]",
+		"Direction": 2,
+		"OriginalDoor": "D09Z01S05[W]"
+	},
+	{
+		"Id": "D09BZ01S01[Cell1]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S02[Cell1]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell2]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S02[Cell2]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell3]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell3]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S02[Cell3]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell2]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell4]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S02[Cell4]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell5]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell5]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S02[Cell5]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell4]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell6]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S02[Cell6]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell7]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S08[Cell7]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell10]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S10[Cell10]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell11]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S10[Cell11]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell12]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S10[Cell12]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell13]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell13]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S10[Cell13]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell12]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell14]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S08[Cell14]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell15]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell15]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S08[Cell15]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell14]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell16]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S08[Cell16]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell17]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S08[Cell17]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell18]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell18]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S08[Cell18]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell19]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S09[Cell19]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell20]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell20]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S09[Cell20]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell19]" ]
+	},
+	{
+		"Id": "D09BZ01S01[Cell21]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S09[Cell21]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell22]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S02[Cell22]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D09BZ01S01[Cell23]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S02[Cell23]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D09BZ01S01[Cell22]" ],
+		"Logic": "bronzeKey"
+	},
+	{
+		"Id": "D09BZ01S01[Cell24]",
+		"Direction": 7,
+		"OriginalDoor": "D09Z01S09[Cell24]",
+		"VisibilityFlags": 1
+	},
+	
+	{
+		"Id": "D17Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S02[W]"
+	},
+	{
+		"Id": "D17Z01S01[Cherubs1]",
+		"Direction": 5
+	},
+	{
+		"Id": "D17Z01S01[Cherubs2]",
+		"Direction": 5
+	},
+	{
+		"Id": "D17Z01S01[Cherubs3]",
+		"Direction": 5
+	},
+	{
+		"Id": "D17Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S01[E]",
+		"Logic": "D17Z01S02[W] || dash"
+	},
+	{
+		"Id": "D17Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S05[W]",
+		"Logic": "D17Z01S02[N] || D17Z01S02[E] || dash"
+	},
+	{
+		"Id": "D17Z01S02[N]",
+		"Direction": 0,
+		"OriginalDoor": "D17Z01S10[S]",
+		"Logic": "D17Z01S02[N] || blood && (D17Z01S02[E] || D17Z01S02[W] && dash)"
+	},
+	{
+		"Id": "D17Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S11[E]"
+	},
+	{
+		"Id": "D17Z01S03[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z01S07[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D17Z01S03[relic]",
+		"Direction": 4,
+		"OriginalDoor": "D17BZ01S01[relic]",
+		"Logic": "elderKey"
+	},
+	{
+		"Id": "D17Z01S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S12[E]"
+	},
+	{
+		"Id": "D17Z01S04[S]",
+		"Direction": 3,
+		"OriginalDoor": "D17Z01S07[N]"
+	},
+	{
+		"Id": "D17Z01S04[FrontL]",
+		"Direction": 4,
+		"OriginalDoor": "D17BZ02S01[FrontL]"
+	},
+	{
+		"Id": "D17Z01S04[N]",
+		"Direction": 0,
+		"OriginalDoor": "D17Z01S05[S]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D17Z01S04[FrontR]" ]
+	},
+	{
+		"Id": "D17Z01S04[FrontR]",
+		"Direction": 4,
+		"OriginalDoor": "D17BZ02S01[FrontR]",
+		"VisibilityFlags": 3,
+		"RequiredDoors": [ "D17Z01S04[N]" ]
+	},
+	{
+		"Id": "D17Z01S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S02[E]"
+	},
+	{
+		"Id": "D17Z01S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S11[W]"
+	},
+	{
+		"Id": "D17Z01S05[S]",
+		"Direction": 3,
+		"OriginalDoor": "D17Z01S04[N]",
+		"Logic": "openedBotSSLadder"
+	},
+	{
+		"Id": "D17Z01S06[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S07[W]"
+	},
+	{
+		"Id": "D17Z01S07[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S08[E]"
+	},
+	{
+		"Id": "D17Z01S07[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D03Z01S05[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D17Z01S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S06[E]"
+	},
+	{
+		"Id": "D17Z01S07[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S09[E]"
+	},
+	{
+		"Id": "D17Z01S07[N]",
+		"Direction": 0,
+		"OriginalDoor": "D17Z01S04[S]"
+	},
+	{
+		"Id": "D17Z01S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S07[SW]"
+	},
+	{
+		"Id": "D17Z01S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S07[NW]"
+	},
+	{
+		"Id": "D17Z01S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S13[E]",
+		"Logic": "D17Z01S10[W] || blood || doubleJump"
+	},
+	{
+		"Id": "D17Z01S10[S]",
+		"Direction": 3,
+		"OriginalDoor": "D17Z01S02[N]"
+	},
+	{
+		"Id": "D17Z01S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S05[E]",
+		"Logic": "D17Z01S11[W] || canBeatBrotherhoodBoss"
+	},
+	{
+		"Id": "D17Z01S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S03[W]",
+		"Logic": "D17Z01S11[E] || canBeatBrotherhoodBoss"
+	},
+	{
+		"Id": "D17Z01S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S04[W]"
+	},
+	{
+		"Id": "D17Z01S13[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S14[E]"
+	},
+	{
+		"Id": "D17Z01S13[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S10[W]"
+	},
+	{
+		"Id": "D17Z01S14[W]",
+		"Direction": 1,
+		"OriginalDoor": "D17Z01S15[E]",
+		"Logic": "scapular && (D17Z01S14[W] || blood)"
+	},
+	{
+		"Id": "D17Z01S14[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S13[W]",
+		"Logic": "D17Z01S14[E] || blood"
+	},
+	{
+		"Id": "D17Z01S14[-Cherubs1]",
+		"Direction": 6,
+		"OriginalDoor": "D17Z01S01[Cherubs1]",
+		"Logic": "linen && (D17Z01S14[W] || blood || canCrossGap11)"
+	},
+	{
+		"Id": "D17Z01S14[-Cherubs2]",
+		"Direction": 6,
+		"OriginalDoor": "D17Z01S01[Cherubs2]",
+		"Logic": "linen && (D17Z01S14[E] && canCrossGap8 || D17Z01S14[W] && canCrossGap10 || blood)"
+	},
+	{
+		"Id": "D17Z01S14[-Cherubs3]",
+		"Direction": 6,
+		"OriginalDoor": "D17Z01S01[Cherubs3]",
+		"Logic": "linen && (D17Z01S14[E] || blood)"
+	},
+	{
+		"Id": "D17Z01S15[E]",
+		"Direction": 2,
+		"OriginalDoor": "D17Z01S14[W]"
+	},
+	{
+		"Id": "D17BZ01S01[relic]",
+		"Direction": 7,
+		"OriginalDoor": "D17Z01S03[relic]"
+	},
+	{
+		"Id": "D17BZ02S01[FrontL]",
+		"Direction": 7,
+		"OriginalDoor": "D17Z01S04[FrontL]",
+		"VisibilityFlags": 1
+	},
+	{
+		"Id": "D17BZ02S01[FrontR]",
+		"Direction": 7,
+		"OriginalDoor": "D17Z01S04[FrontR]",
+		"Logic": "D17BZ02S01[FrontR] || dash && wallClimb"
+	},
+	
+	{
+		"Id": "D20Z01S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D03Z02S15[E]",
+		"Type": 1
+	},
+	{
+		"Id": "D20Z01S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S02[W]"
+	},
+	{
+		"Id": "D20Z01S01[S]",
+		"Direction": 3,
+		"OriginalDoor": "D20Z01S04[N]"
+	},
+	{
+		"Id": "D20Z01S01[Cherubs]",
+		"Direction": 5
+	},
+	{
+		"Id": "D20Z01S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S01[E]"
+	},
+	{
+		"Id": "D20Z01S02[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S03[W]"
+	},
+	{
+		"Id": "D20Z01S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S02[E]"
+	},
+	{
+		"Id": "D20Z01S03[N]",
+		"Direction": 0,
+		"OriginalDoor": "D03Z01S01[S]",
+		"Type": 1
+	},
+	{
+		"Id": "D20Z01S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S05[E]"
+	},
+	{
+		"Id": "D20Z01S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S24[W]",
+		"Type": 1,
+		"Logic": "openedDCGateW"
+	},
+	{
+		"Id": "D20Z01S04[N]",
+		"Direction": 0,
+		"OriginalDoor": "D20Z01S01[S]"
+	},
+	{
+		"Id": "D20Z01S05[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S06[NE]"
+	},
+	{
+		"Id": "D20Z01S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S04[W]"
+	},
+	{
+		"Id": "D20Z01S06[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S05[W]"
+	},
+	{
+		"Id": "D20Z01S06[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S07[NW]"
+	},
+	{
+		"Id": "D20Z01S07[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S06[SE]"
+	},
+	{
+		"Id": "D20Z01S07[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S08[W]"
+	},
+	{
+		"Id": "D20Z01S07[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S09[W]"
+	},
+	{
+		"Id": "D20Z01S08[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S07[NE]"
+	},
+	{
+		"Id": "D20Z01S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S07[SE]",
+		"Logic": "D20Z01S09[W] || dash"
+	},
+	{
+		"Id": "D20Z01S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D01Z05S25[EchoesW]",
+		"Type": 1,
+		"Logic": "D20Z01S09[E] || blood && dash"
+	},
+	{
+		"Id": "D20Z01S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D01Z05S25[EchoesE]",
+		"Type": 1,
+		"Logic": "D20Z01S10[W] || blood && dash"
+	},
+	{
+		"Id": "D20Z01S10[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S11[W]",
+		"Logic": "D20Z01S10[E] || blood && dash"
+	},
+	{
+		"Id": "D20Z01S11[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S10[E]"
+	},
+	{
+		"Id": "D20Z01S11[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S12[E]"
+	},
+	{
+		"Id": "D20Z01S11[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S13[W]"
+	},
+	{
+		"Id": "D20Z01S11[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S12[W]",
+		"Type": 1
+	},
+	{
+		"Id": "D20Z01S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z01S11[NW]"
+	},
+	{
+		"Id": "D20Z01S13[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S11[NE]"
+	},
+	{
+		"Id": "D20Z01S13[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S11[NW]",
+		"Type": 1
+	},
+	{
+		"Id": "D20Z01S13[N]",
+		"Direction": 0,
+		"OriginalDoor": "D20Z01S14[S]"
+	},
+	{
+		"Id": "D20Z01S14[S]",
+		"Direction": 3,
+		"OriginalDoor": "D20Z01S13[N]"
+	},
+	{
+		"Id": "D20Z01S14[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z03S01[W]",
+		"Type": 1
+	},
+	
+	{
+		"Id": "D20Z02S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S03[SE]"
+	},
+	{
+		"Id": "D20Z02S01[E]",
+		"Direction": 2,
+		"OriginalDoor": "D04Z02S24[SW]",
+		"Type": 1
+	},
+	{
+		"Id": "D20Z02S02[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S03[NE]"
+	},
+	{
+		"Id": "D20Z02S03[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S04[E]"
+	},
+	{
+		"Id": "D20Z02S03[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S02[W]",
+		"Logic": "D20Z02S03[NE] || canWalkOnRoot || canCrossGap5"
+	},
+	{
+		"Id": "D20Z02S03[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S01[W]"
+	},
+	{
+		"Id": "D20Z02S04[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S05[E]",
+		"Logic": "D20Z02S04[W] || dash"
+	},
+	{
+		"Id": "D20Z02S04[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S03[W]",
+		"Logic": "D20Z02S04[E] || dash"
+	},
+	{
+		"Id": "D20Z02S05[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S06[SE]"
+	},
+	{
+		"Id": "D20Z02S05[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S06[NE]",
+		"Logic": "D20Z02S05[NW] || nail || canCrossGap3"
+	},
+	{
+		"Id": "D20Z02S05[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S04[W]"
+	},
+	{
+		"Id": "D20Z02S06[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S09[E]"
+	},
+	{
+		"Id": "D20Z02S06[SE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S05[SW]"
+	},
+	{
+		"Id": "D20Z02S06[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S07[E]",
+		"Logic": "D20Z02S06[NW] || D20Z02S06[NE] || doubleJump || canClimbOnRoot || canDiveLaser"
+	},
+	{
+		"Id": "D20Z02S06[NE]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S05[NW]",
+		"Logic": "D20Z02S06[NW] || D20Z02S06[NE] || doubleJump || canClimbOnRoot || canDiveLaser"
+	},
+	{
+		"Id": "D20Z02S07[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S08[E]"
+	},
+	{
+		"Id": "D20Z02S07[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S06[NW]"
+	},
+	{
+		"Id": "D20Z02S08[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S07[W]"
+	},
+	{
+		"Id": "D20Z02S09[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S10[E]"
+	},
+	{
+		"Id": "D20Z02S09[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S06[SW]"
+	},
+	{
+		"Id": "D20Z02S10[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S11[E]"
+	},
+	{
+		"Id": "D20Z02S10[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S09[W]"
+	},
+	{
+		"Id": "D20Z02S11[SW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z02S12[E]"
+	},
+	{
+		"Id": "D20Z02S11[NW]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S13[E]",
+		"Type": 1,
+		"VisibilityFlags": 5,
+		"RequiredDoors": [ "D20Z02S11[E]" ],
+		"Logic": "D20Z02S11[NW] || mourningSkipAllowed && (doubleJump || canBreakTirana || D20Z02S11[E])"
+	},
+	{
+		"Id": "D20Z02S11[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S10[W]",
+		"VisibilityFlags": 5,
+		"Logic": "D20Z02S11[E] || mourningSkipAllowed && (doubleJump || canBreakTirana || D20Z02S11[NW] && canCrossGap5)"
+	},
+	{
+		"Id": "D20Z02S12[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S11[SE]",
+		"Type": 1
+	},
+	{
+		"Id": "D20Z02S12[E]",
+		"Direction": 2,
+		"OriginalDoor": "D20Z02S11[SW]"
+	},
+	
+	{
+		"Id": "D20Z03S01[W]",
+		"Direction": 1,
+		"OriginalDoor": "D20Z01S14[E]",
+		"Type": 1
+	},
+]
\ No newline at end of file
diff --git a/worlds/blasphemous/Rules.py b/worlds/blasphemous/Rules.py
index 8608d5f38f84..251794dd266b 100644
--- a/worlds/blasphemous/Rules.py
+++ b/worlds/blasphemous/Rules.py
@@ -1,1479 +1,4374 @@
+from typing import Dict, List, Set
 from worlds.generic.Rules import set_rule, add_rule
-from ..AutoWorld import LogicMixin
+from BaseClasses import CollectionState
 
 
-class BlasphemousLogic(LogicMixin):
-    def _blasphemous_blood_relic(self, player):
-        return self.has("Blood Perpetuated in Sand", player)
+def total_fervour(state: CollectionState, player: int) -> int:
+    totalFervour: int = 60 + (20 * state.count("Fervour Upgrade", player)) + (10 * state.count("Bead of Blue Wax", player))
 
-    def _blasphemous_water_relic(self, player):
-        return self.has("Nail Uprooted from Dirt", player)
+    return totalFervour
 
-    def _blasphemous_corpse_relic(self, player):
-        return self.has("Shroud of Dreamt Sins", player)
 
-    def _blasphemous_fall_relic(self, player):
-        return self.has("Linen of Golden Thread", player)
+def aubade(state: CollectionState, player: int) -> bool:
+    return state.has("Aubade of the Nameless Guardian", player) if total_fervour(state, player) >= 90 else False
 
-    def _blasphemous_miasma_relic(self, player):
-        return self.has("Silvered Lung of Dolphos", player)
-    
-    def _blasphemous_root_relic(self, player):
-        return self.has("Three Gnarled Tongues", player)
 
-    def _blasphemous_open_holes(self, player):
-        return self.has_any({"Dive Skill", "Charged Skill"}, player) or \
-            self.has_group("prayer", player, 1) or \
-                (self.has_any({"Tirana of the Celestial Bastion", "Aubade of the Nameless Guardian"}, player) and \
-                    self.has("Fervour Upgrade", player, 2))
+def tirana(state: CollectionState, player: int) -> bool:
+    return state.has("Tirana of the Celestial Bastion", player) if total_fervour(state, player) >= 90 else False
 
-    def _blasphemous_bell(self, player):
-        return self.has("Petrified Bell", player)
 
-    def _blasphemous_bead(self, player):
-        return self.has("Weight of True Guilt", player)
+def pillar(state: CollectionState, player: int) -> bool:
+    return state.has_any({"Debla of the Lights", "Taranto to my Sister", "Cloistered Ruby"}, player)
 
-    def _blasphemous_cloth(self, player):
-        return self.has("Linen Cloth", player)
 
-    def _blasphemous_pre_egg(self, player):
-        return self.has("Egg of Deformity", player)
+def charge_beam(state: CollectionState, player: int) -> bool:
+    return state.has("Charged Skill", player, 3)
 
-    def _blasphemous_egg(self, player):
-        return self.has("Hatched Egg of Deformity", player)
 
-    def _blasphemous_hand(self, player):
-        return self.has("Severed Hand", player)
+def can_air_stall(state: CollectionState, logic: int, player: int) -> bool:
+    return state.has("Ranged Skill", player) if logic >= 1 else False
 
-    def _blasphemous_chalice(self, player):
-        return self.has("Chalice of Inverted Verses", player)
 
-    def _blasphemous_thimble(self, player):
-        return self.has("Empty Golden Thimble", player)
+def can_dawn_jump(state: CollectionState, logic: int, player: int) -> bool:
+    return state.has_all({"Brilliant Heart of Dawn", "Dash Ability"}, player) if logic >= 1 else False
 
-    def _blasphemous_full_thimble(self, player):
-        return self.has("Golden Thimble Filled with Burning Oil", player)
 
-    def _blasphemous_flowers(self, player):
-        return self.has("Dried Flowers bathed in Tears", player)
+def can_water_jump(state: CollectionState, player: int) -> bool:
+    return state.has_any({"Nail Uprooted from Dirt", "Purified Hand of the Nun"}, player)
 
-    def _blasphemous_redento(self, player):
-        return self.has_all({"Little Toe made of Limestone", "Big Toe made of Limestone", \
-            "Fourth Toe made of Limestone"}, player) and \
-                self.has("Knot of Rosary Rope", player)
 
-    def _blasphemous_cord(self, player):
-        return self.has("Cord of the True Burying", player)
+def can_break_holes(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any({"Charged Skill", "Dive Skill"}, player) 
+        or (
+            state.has("Lunge Skill", player, 3)
+            and state.has("Dash Ability", player)
+        )
+        or state.has_group("prayer", player)
+        or aubade(state, player)
+        or tirana(state, player)
+    )
 
-    def _blasphemous_marks(self, player):
-        return self.has_all({"Mark of the First Refuge", "Mark of the Second Refuge", \
-            "Mark of the Third Refuge"}, player)
 
-    def _blasphemous_red_wax(self, player):
-        return self.has("Bead of Red Wax", player)
-    
-    def _blasphemous_blue_wax(self, player):
-        return self.has("Bead of Blue Wax", player)
+def can_break_tirana(state: CollectionState, logic: int, player: int) -> bool:
+    return tirana(state, player) if logic >= 2 else False
 
-    def _blasphemous_both_wax(self, player):
-        return self.has("Bead of Red Wax", player, 3) and \
-            self.has("Bead of Blue Wax", player, 3)
 
-    def _blasphemous_elder_key(self, player):
-        return self.has("Key to the Chamber of the Eldest Brother", player)
+def can_dive_laser(state: CollectionState, logic: int, player: int) -> bool:
+    return state.has("Dive Skill", player, 3) if logic >= 2 else False
 
-    def _blasphemous_bronze_key(self, player):
-        return self.has("Key of the Secular", player)
 
-    def _blasphemous_silver_key(self, player):
-        return self.has("Key of the Scribe", player)
+def can_walk_on_root(state: CollectionState, player: int) -> bool:
+    return state.has("Three Gnarled Tongues", player)
 
-    def _blasphemous_gold_key(self, player):
-        return self.has("Key of the Inquisitor", player)
 
-    def _blasphemous_high_key(self, player):
-        return self.has("Key of the High Peaks", player)
+def can_climb_on_root(state: CollectionState, player: int) -> bool:
+    return state.has_all({"Three Gnarled Tongues", "Wall Climb Ability"}, player)
 
-    def _blasphemous_wood_key(self, player):
-        return self.has("Key Grown from Twisted Wood", player)
 
-    def _blasphemous_scapular(self, player):
-        return self.has("Incomplete Scapular", player)
+def can_survive_poison(state: CollectionState, logic: int, player: int, number: int) -> bool:
+    if number == 1:
+        if logic >= 2:
+            return True
+        elif logic == 1:
+            return state.has_any({"Silvered Lung of Dolphos", "Tiento to your Thorned Hairs"}, player)
+        elif logic == 0:
+            return state.has("Silvered Lung of Dolphos", player)
+    elif number == 2:
+        if logic >= 1:
+            return state.has_any({"Silvered Lung of Dolphos", "Tiento to your Thorned Hairs"}, player)
+        else:
+            return state.has("Silvered Lung of Dolphos", player)
+    elif number == 3:
+        if logic >= 2 and total_fervour(state, player) >= 120:
+            return state.has_any({"Silvered Lung of Dolphos", "Tiento to your Thorned Hairs"}, player)
+        else:
+            return state.has("Silvered Lung of Dolphos", player)
 
-    def _blasphemous_heart_c(self, player):
-        return self.has("Apodictic Heart of Mea Culpa", player)
 
-    def _blasphemous_eyes(self, player):
-        return self.has("Severed Right Eye of the Traitor", player) and \
-            self.has("Broken Left Eye of the Traitor", player)
+def can_enemy_bounce(logic: int, enemy: int) -> bool: # TODO
+    return enemy_skips_allowed(logic, enemy)
 
-    def _blasphemous_debla(self, player):
-        return self.has("Debla of the Lights", player)
 
-    def _blasphemous_taranto(self, player):
-        return self.has("Taranto to my Sister", player)
+def can_enemy_upslash(state: CollectionState, logic: int, enemy: int, player: int) -> bool:
+    return state.has("Combo Skill", player, 2) and \
+        enemy_skips_allowed(logic, enemy)
 
-    def _blasphemous_tirana(self, player):
-        return self.has("Tirana of the Celestial Bastion", player) and \
-            self.has("Fervour Upgrade", player, 2)
 
-    def _blasphemous_aubade(self, player):
-        return self.has("Aubade of the Nameless Guardian", player) and \
-            self.has("Fervour Upgrade", player, 2)
+def can_cross_gap(state: CollectionState, logic: int, player: int, number: int) -> bool:
+    if number == 1:
+        return (
+            state.has_any({"Purified Hand of the Nun", "The Young Mason's Wheel"}, player)
+            or can_dawn_jump(state, logic, player)
+            or can_air_stall(state, logic, player)
+        )
+    elif number == 2:
+        return (
+            state.has_any({"Purified Hand of the Nun", "The Young Mason's Wheel"}, player)
+            or can_dawn_jump(state, logic, player)
+        )
+    elif number == 3:
+        return (
+            state.has("Purified Hand of the Nun", player)
+            or can_dawn_jump(state, logic, player)
+            or (
+                state.has("The Young Mason's Wheel", player)
+                and can_air_stall(state, logic, player)
+            )
+        )
+    elif number == 4:
+        return (
+            state.has("Purified Hand of the Nun", player)
+            or can_dawn_jump(state, logic, player)
+        )
+    elif number == 5:
+        return (
+            state.has("Purified Hand of the Nun", player)
+            or (
+                can_dawn_jump(state, logic, player)
+                and can_air_stall(state, logic, player))
+        )
+    elif number == 6:
+        return state.has("Purified Hand of the Nun", player)
+    elif number == 7:
+        return (
+            state.has("Purified Hand of the Nun", player)
+            and (
+                can_dawn_jump(state, logic, player)
+                or state.has("The Young Mason's Wheel", player)
+                or can_air_stall(state, logic, player)
+            )
+        )
+    elif number == 8:
+        return (
+            state.has("Purified Hand of the Nun", player)
+            and (
+                can_dawn_jump(state, logic, player)
+                or state.has("The Young Mason's Wheel", player)
+            )
+        )
+    elif number == 9:
+        return (
+            state.has("Purified Hand of the Nun", player)
+            and (
+                can_dawn_jump(state, logic, player)
+                or state.has("The Young Mason's Wheel", player)
+                and can_air_stall(state, logic, player)
+            )
+        )
+    elif number == 10:
+        return (
+            state.has("Purified Hand of the Nun", player)
+            and can_dawn_jump(state, logic, player)
+        )
+    elif number == 11:
+        return (
+            state.has("Purified Hand of the Nun", player)
+            and can_dawn_jump(state, logic, player)
+            and can_air_stall(state, logic, player)
+        )
 
-    def _blasphemous_cherub_6(self, player):
-        return self.has_any({"Debla of the Lights", "Taranto to my Sister", "Verdiales of the Forsaken Hamlet", \
-            "Cloistered Ruby"}, player) or \
-                (self.has("Tirana of the Celestial Bastion", player) and \
-                    self.has("Fervour Upgrade", player, 2))
 
-    def _blasphemous_cherub_13(self, player):
-        return self.has_any({"Ranged Skill", "Debla of the Lights", "Taranto to my Sister", \
-            "Cante Jondo of the Three Sisters", "Cloistered Ruby"}, player) or \
-                    (self.has_any({"Aubade of the Nameless Guardian", "Tirana of the Celestial Bastion"}, player) and \
-                        self.has("Fervour Upgrade", player, 2))
-    
-    def _blasphemous_cherub_20(self, player):
-        return self.has_any({"Debla of the Lights", "Lorquiana", "Zarabanda of the Safe Haven", "Taranto to my Sister", \
-            "Cante Jondo of the Three Sisters", "Cloistered Ruby"}, player) or \
-                    (self.has_any({"Aubade of the Nameless Guardian", "Tirana of the Celestial Bastion"}, player) and \
-                        self.has("Fervour Upgrade", player, 2))
-
-    def _blasphemous_cherub_21(self, player):
-        return self.has_any({"Debla of the Lights", "Taranto to my Sister", "Cante Jondo of the Three Sisters", \
-            "Verdiales of the Forsaken Hamlet", "Cloistered Ruby"}, player) or \
-                (self.has("Tirana of the Celestial Bastion", player) and \
-                    self.has("Fervour Upgrade", player, 2))
-    
-    def _blasphemous_cherub_22_23_31_32(self, player):
-        return self.has_any({"Debla of the Lights", "Taranto to my Sister", "Cloistered Ruby"}, player)
-
-    def _blasphemous_cherub_24_33(self, player):
-        return self.has_any({"Debla of the Lights", "Taranto to my Sister", "Cante Jondo of the Three Sisters", \
-            "Cloistered Ruby"}, player) or \
-                (self.has("Tirana of the Celestial Bastion", player) and \
-                    self.has("Fervour Upgrade", player, 2))
-
-    def _blasphemous_cherub_25(self, player):
-        return self.has_any({"Debla of the Lights", "Lorquiana", "Taranto to my Sister", \
-            "Cante Jondo of the Three Sisters", "Verdiales of the Forsaken Hamlet", "Cantina of the Blue Rose", \
-                "Cloistered Ruby"}, player) or \
-                    (self.has("Aubade of the Nameless Guardian", player) and \
-                        self.has("Fervour Upgrade", player, 2))
-
-    def _blasphemous_cherub_27(self, player):
-        return self.has_any({"Ranged Skill", "Debla of the Lights", "Lorquiana", "Taranto to my Sister", \
-            "Cante Jondo of the Three Sisters", "Cantina of the Blue Rose", "Cloistered Ruby"}, player) or \
-                    (self.has("Aubade of the Nameless Guardian", player) and \
-                        self.has("Fervour Upgrade", player, 2))
-
-    def _blasphemous_cherub_38(self, player):
-        return self.has_any({"Ranged Skill", "Lorquiana", "Cante Jondo of the Three Sisters", \
-            "Cantina of the Blue Rose", "Cloistered Ruby"}, player) or \
-                self.has("The Young Mason's Wheel", player) or \
-                    self.has("Brilliant Heart of Dawn", player) or \
-                        (self.has("Aubade of the Nameless Guardian", player) and \
-                            self.has("Fervour Upgrade", player, 2))
-
-    def _blasphemous_wheel(self, player):
-        return self.has("The Young Mason's Wheel", player)
-
-    def _blasphemous_dawn_heart(self, player):
-        return self.has("Brilliant Heart of Dawn", player)
-
-    def _blasphemous_tirso_1(self, player):
-        return self.has_group("tirso", player, 1)
-    
-    def _blasphemous_tirso_2(self, player):
-        return self.has_group("tirso", player, 2)
+def can_ride_albero_elevator(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D02Z02S11[NW]", "D02Z02S11[NE]", "D02Z02S11[W]", "D02Z02S11[E]", \
+                            "D02Z02S11[SE]"}, player)
 
-    def _blasphemous_tirso_3(self, player):
-        return self.has_group("tirso", player, 3)
 
-    def _blasphemous_tirso_4(self, player):
-        return self.has_group("tirso", player, 4)
+def opened_dc_gate_w(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D01Z05S24[W]", "D01Z05S24[E]"}, player)
 
-    def _blasphemous_tirso_5(self, player):
-        return self.has_group("tirso", player, 5)
 
-    def _blasphemous_tirso_6(self, player):
-        return self.has_group("tirso", player, 6)
+def opened_dc_gate_e(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D01Z05S12[W]", "D01Z05S12[E]"}, player)
 
-    def _blasphemous_tentudia_1(self, player):
-        return self.has_group("tentudia", player, 1)
 
-    def _blasphemous_tentudia_2(self, player):
-        return self.has_group("tentudia", player, 2)
+def opened_dc_ladder(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D01Z05S20[W]", "D01Z05S20[N]"}, player)
 
-    def _blasphemous_tentudia_3(self, player):
-        return self.has_group("tentudia", player, 3)
 
-    def _blasphemous_altasgracias_3(self, player):
-        return self.has_group("egg", player, 3)
+def opened_wotw_cave(state: CollectionState, player: int) -> bool:
+    return (
+        state.has("D02Z01S06[E]", player)
+        or state.has("Wall Climb Ability", player)
+        and (
+            state.has("D02Z01S06[W]", player)
+            or state.has("D02Z01S06[Cherubs]", player)
+        )
+    )
 
-    def _blasphemous_cherubs_20(self, player):
-        return self.has("Child of Moonlight", player, 20)
 
-    def _blasphemous_cherubs_all(self, player):
-        return self.has("Child of Moonlight", player, 38)
+def rode_gotp_elevator(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D02Z02S11[NW]", "D02Z02S11[NE]", "D02Z02S11[W]", "D02Z02S11[E]", \
+                            "D02Z02S11[SE]"}, player)
 
-    def _blasphemous_bones_4(self, player):
-        return self.has_group("bones", player, 4)
 
-    def _blasphemous_bones_8(self, player):
-        return self.has_group("bones", player, 8)
+def opened_convent_ladder(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D02Z03S11[S]", "D02Z03S11[W]", "D02Z03S11[NW]", "D02Z03S11[E]", \
+                            "D02Z03S11[NE]"}, player)
 
-    def _blasphemous_bones_12(self, player):
-        return self.has_group("bones", player, 12)
-    
-    def _blasphemous_bones_16(self, player):
-        return self.has_group("bones", player, 16)
 
-    def _blasphemous_bones_20(self, player):
-        return self.has_group("bones", player, 20)
+def broke_jondo_bell_w(state: CollectionState, player: int) -> bool:
+    return (
+        state.has("D03Z02S09[S]", player)
+        or state.has("D03Z02S09[W]", player)
+        and state.has("Dash Ability", player)
+        or state.has("D03Z02S09[N]", player)
+        or state.has("D03Z02S09[Cherubs]", player)
+    )
 
-    def _blasphemous_bones_24(self, player):
-        return self.has_group("bones", player, 24)
 
-    def _blasphemous_bones_28(self, player):
-        return self.has_group("bones", player, 28)
+def broke_jondo_bell_e(state: CollectionState, logic: int, enemy: int, player: int) -> bool:
+    return (
+        state.has("D03Z02S05[S]", player)
+        or state.has("D03Z02S05[E]", player)
+        or state.has("D03Z02S05[W]", player)
+        and (
+            can_cross_gap(state, logic, player, 5)
+            or can_enemy_bounce(logic, enemy)
+            and can_cross_gap(state, logic, player, 3)
+        )
+    )
 
-    def _blasphemous_bones_30(self, player):
-        return self.has_group("bones", player, 30)
 
-    def _blasphemous_bones_32(self, player):
-        return self.has_group("bones", player, 32)
+def opened_mom_ladder(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D04Z02S06[NW]", "D04Z02S06[NE]", "D04Z02S06[N]", "D04Z02S06[S]"}, player)
 
-    def _blasphemous_bones_36(self, player):
-        return self.has_group("bones", player, 36)
 
-    def _blasphemous_bones_40(self, player):
-        return self.has_group("bones", player, 40)
+def opened_tsc_gate(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D05Z02S11[W]", "D05Z02S11[Cherubs]"}, player)
 
-    def _blasphemous_bones_44(self, player):
-        return self.has_group("bones", player, 44)
 
-    def _blasphemous_sword_1(self, player):
-        return self.has("Mea Culpa Upgrade", player)
+def opened_ar_ladder(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D06Z01S23[Sword]", "D06Z01S23[E]", "D06Z01S23[S]", "D06Z01S23[Cherubs]"}, player)
 
-    def _blasphemous_sword_2(self, player):
-        return self.has("Mea Culpa Upgrade", player, 2)
-    
-    def _blasphemous_sword_3(self, player):
-        return self.has("Mea Culpa Upgrade", player, 3)
 
-    def _blasphemous_sword_4(self, player):
-        return self.has("Mea Culpa Upgrade", player, 4)
+def broke_bottc_statue(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D08Z01S02[NE]", "D08Z01S02[SE]"}, player)
+
 
-    def _blasphemous_sword_5(self, player):
-        return self.has("Mea Culpa Upgrade", player, 5)
+def opened_wothp_gate(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D09Z01S05[W]", "D09Z01S05[SE]", "D09Z01S05[NE]"}, player)
 
-    def _blasphemous_sword_6(self, player):
-        return self.has("Mea Culpa Upgrade", player, 6)
 
-    def _blasphemous_sword_7(self, player):
-        return self.has("Mea Culpa Upgrade", player, 7)
+def opened_botss_ladder(state: CollectionState, player: int) -> bool:
+    return state.has_any({"D17Z01S04[N]", "D17Z01S04[FrontR]"}, player)
 
-    def _blasphemous_ranged(self, player):
-        return self.has("Ranged Skill", player)
 
-    def _blasphemous_bridge_access(self, player):
-        return self.has_group("wounds", player, 3)
+def upwarp_skips_allowed(logic: int) -> bool:
+    return True if logic >= 2 else False
 
-    def _blasphemous_ex_bridge_access(self, player):
-        return self.has_group("wounds", player, 3) or \
-            (self.has("Brilliant Heart of Dawn", player) and \
-                self.has("Ranged Skill", player) and \
-                    self.has("Blood Perpetuated in Sand", player)) or \
-                        (self.has("Blood Perpetuated in Sand", player) and \
-                            self.has("Tirana of the Celestial Bastion", player) and \
-                                self.has("Fervour Upgrade", player, 2))
 
-    def _blasphemous_1_mask(self, player):
-        return self.has_group("masks", player, 1)
+def mourning_skips_allowed(logic: int) -> bool:
+    return True if logic >= 2 else False
 
-    def _blasphemous_2_masks(self, player):
-        return self.has_group("masks", player, 2)
 
-    def _blasphemous_3_masks(self, player):
-        return self.has_group("masks", player, 3)
+def enemy_skips_allowed(logic: int, enemy: int) -> bool:
+    return True if logic >= 2 and enemy == 0 else False
 
-    def _blasphemous_laudes_gate(self, player): 
-        return self.has("Verses Spun from Gold", player, 4)
 
-    # Ten Piedad, Tres Angustias, Our Lady of the Charred Visage
-    def _blasphemous_wound_boss_easy(self, player):
-        return self.has("Mea Culpa Upgrade", player, 2) and \
-            self.has_group("power", player, 3)
+#def unknown_skips_allowed():
+#    return False
+
+
+#def precise_skips_allowed():
+#    return False
+
+
+def can_beat_boss(state: CollectionState, boss: str, logic: int, player: int) -> bool:
+    def has_boss_strength(name: str) -> bool:
+        silver: int = state.count("Quicksilver", player) if state.has("D01Z05S27[E]", player) else 0
+        flasks: int = state.count("Empty Bile Flask", player) if \
+            state.has_any({"D01Z05S18[E]", "D02Z02S09[E]", "D03Z02S14[E]", "D03Z03S03[SE]", "D04Z02S13[W]", \
+                "D05Z01S12[E]", "D20Z01S08[W]"}, player) else 0
+        
+
+        playerStrength: float = state.count("Life Upgrade", player) * 0.25 / 6 + \
+            state.count("Mea Culpa Upgrade", player) * 0.25 / 7 + state.count("Fervour Upgrade", player) * 0.20 \
+                / 6 + flasks * 0.15 / 8 + silver * 0.15 / 5
+        
+        bosses: Dict[str, int] = {
+            "warden": -0.10,
+            "ten-piedad": 0.05,
+            "charred-visage": 0.20,
+            "tres-angustias": 0.15,
+            "esdras": 0.25,
+            "melquiades": 0.25,
+            "exposito": 0.30,
+            "quirce": 0.35,
+            "crisanta": 0.50,
+            "isidora": 0.70,
+            "sierpes": 0.70,
+            "amanecida": 0.60,
+            "laudes": 0.60,
+            "perpetua": -0.05,
+            "legionary": 0.20
+        }
+
+        bossStrength: int = bosses[name]
+
+        return playerStrength >= (bossStrength - 0.10 if logic >= 2 else (bossStrength if logic >= 1 else bossStrength + 0.10))
+    
+    if boss == "Brotherhood":
+        return (
+            has_boss_strength("warden")
+            and state.has_any({"D17Z01S11[W]", "D17Z01S11[E]"}, player)
+        )
+    elif boss == "Mercy":
+        return (
+            has_boss_strength("ten-piedad")
+            and state.has_any({"D01Z04S18[W]", "D01Z04S18[E]"}, player)
+        )
+    elif boss == "Convent":
+        return (
+            has_boss_strength("charred-visage")
+            and state.has_any({"D02Z03S20[W]", "D02Z03S20[E]"}, player)
+        )
+    elif boss == "Grievance":
+        return (
+            has_boss_strength("tres-angustias")
+            and state.has_any({"Wall Climb Ability", "Purified Hand of the Nun"}, player)
+            and state.has_any({"D03Z03S15[W]", "D03Z03S15[E]"}, player)
+        )
+    elif boss == "Bridge":
+        return (
+            has_boss_strength("esdras")
+            and state.has_any({"D08Z01S01[W]", "D08Z01S01[E]"}, player)
+        )
+    elif boss == "Mothers":
+        return (
+            has_boss_strength("melquiades")
+            and state.has_any({"D04Z02S22[W]", "D04Z02S22[E]"}, player)
+        )
+    elif boss == "Canvases":
+        return (
+            has_boss_strength("exposito")
+            and state.has_any({"D05Z02S14[W]", "D05Z02S14[E]"}, player)
+        )
+    elif boss == "Prison":
+        return (
+            has_boss_strength("quirce")
+            and state.has_any({"D09Z01S03[W]", "D09Z01S03[N]"}, player)
+        )
+    elif boss == "Rooftops":
+        return (
+            has_boss_strength("crisanta")
+            and state.has_any({"D06Z01S25[W]", "D06Z01S25[E]"}, player)
+        )
+    elif boss == "Ossuary":
+        return (
+            has_boss_strength("isidora")
+            and state.has("D01BZ08S01[W]", player)
+        )
+    elif boss == "Mourning":
+        return (
+            has_boss_strength("sierpes")
+            and state.has("D20Z02S08[E]", player)
+        )
+    elif boss == "Graveyard":
+        return (
+            has_boss_strength("amanecida")
+            and state.has_all({"D01BZ07S01[Santos]", "D02Z03S23[E]", "D02Z02S14[W]", "Wall Climb Ability"}, player)
+        )
+    elif boss == "Jondo":
+        return (
+            has_boss_strength("amanecida")
+            and state.has("D01BZ07S01[Santos]", player)
+            and state.has_any({"D20Z01S05[W]", "D20Z01S05[E]"}, player)
+            and state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player)
+        )
+    elif boss == "Patio":
+        return (
+            has_boss_strength("amanecida")
+            and state.has_all({"D01BZ07S01[Santos]", "D06Z01S18[E]"}, player)
+            and state.has_any({"D04Z01S04[W]", "D04Z01S04[E]", "D04Z01S04[Cherubs]"}, player)
+        )
+    elif boss == "Wall":
+        return (
+            has_boss_strength("amanecida")
+            and state.has_all({"D01BZ07S01[Santos]", "D09BZ01S01[Cell24]"}, player)
+            and state.has_any({"D09Z01S01[W]", "D09Z01S01[E]"}, player)
+        )
+    elif boss == "Hall":
+        return (
+            has_boss_strength("laudes")
+            and state.has_any({"D08Z03S03[W]", "D08Z03S03[E]"}, player)
+        )
+    elif boss == "Perpetua":
+        return has_boss_strength("perpetua")
+    elif boss == "Legionary":
+        return has_boss_strength("legionary")
 
-    def _blasphemous_wound_boss_normal(self, player):
-        return self.has("Mea Culpa Upgrade", player, 1)
 
-    def _blasphemous_wound_boss_hard(self, player):
-        return True
+def guilt_rooms(state: CollectionState, player: int, number: int) -> bool:
+    doors: List[str] = [
+        "D01Z04S17[W]",
+        "D02Z02S06[E]",
+        "D03Z03S14[W]",
+        "D04Z02S17[W]",
+        "D05Z01S17[W]",
+        "D09Z01S13[E]",
+        "D17Z01S12[E]"
+    ]
 
-    # Esdras
-    def _blasphemous_esdras_boss_easy(self, player):
-        return self.has("Mea Culpa Upgrade", player, 3) and \
-            self.has_group("power", player, 5)
+    total: int = sum(state.has(item, player) for item in doors)
 
-    def _blasphemous_esdras_boss_normal(self, player):
-        return self.has("Mea Culpa Upgrade", player, 2) and \
-            self.has_group("power", player, 2)
+    return True if total >= number else False
 
-    def _blasphemous_esdras_boss_hard(self, player):
-        return self.has("Mea Culpa Upgrade", player, 1) and \
-            self.has_group("power", player, 1)
 
-    # Melquiades, Exposito, Quirce
-    def _blasphemous_mask_boss_easy(self, player):
-        return self.has("Mea Culpa Upgrade", player, 4) and \
-            self.has_group("power", player, 8)
+def sword_rooms(state: CollectionState, player: int, number: int) -> bool:
+    doors: List[Set[str]] = [
+        {"D01Z02S06[W]", "D01Z02S06[E]"},
+        {"D01Z05S24[W]", "D01Z05S24[E]"},
+        {"D02Z03S13[W]"},
+        {"D04Z02S12[W]"},
+        {"D05Z01S13[E]"},
+        {"D06Z01S11[W]"},
+        {"D17Z01S08[E]"}
+    ]
 
-    def _blasphemous_mask_boss_normal(self, player):
-        return self.has("Mea Culpa Upgrade", player, 3) and \
-            self.has_group("power", player, 4)
+    total: int = sum(state.has_any(items, player) for items in doors)
 
-    def _blasphemous_mask_boss_hard(self, player):
-        return self.has("Mea Culpa Upgrade", player, 2) and \
-            self.has_group("power", player, 2)
+    return True if total >= number else False
 
-    # Crisanta, Isidora, Sierpes, Amanecidas, Laudes
-    def _blasphemous_endgame_boss_easy(self, player):
-        return self.has("Mea Culpa Upgrade", player, 6) and \
-            self.has_group("power", player, 16)
 
-    def _blasphemous_endgame_boss_normal(self, player):
-        return self.has("Mea Culpa Upgrade", player, 5) and \
-            self.has_group("power", player, 8)
+def redento(state: CollectionState, world, player: int, number: int) -> bool:
+    if number == 1:
+        return state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player)
+    elif number == 2:
+        return (
+            state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player)
+            and state.has("OpenedBOTSSLadder", player)
+        )
+    elif number == 3:
+        return (
+            state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player)
+            and state.has("OpenedBOTSSLadder", player)
+            and state.can_reach(world.multiworld.get_region("D01Z03S06", player))
+        )
+    elif number == 4:
+        return (
+            state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player)
+            and state.has("OpenedBOTSSLadder", player)
+            and state.can_reach(world.multiworld.get_region("D01Z03S06", player))
+            and state.can_reach(world.multiworld.get_region("D04Z01S04", player))
+        )
+    elif number == 5:
+        return (
+            state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player)
+            and state.has("OpenedBOTSSLadder", player)
+            and state.can_reach(world.multiworld.get_region("D01Z03S06", player))
+            and state.can_reach(world.multiworld.get_region("D04Z01S04", player))
+            and state.can_reach(world.multiworld.get_region("D04Z02S20", player))
+            and state.has_all({"Little Toe made of Limestone", "Big Toe made of Limestone", \
+                                "Fourth Toe made of Limestone", "D17Z01S09[E]"}, player)
+            and state.has("Knot of Rosary Rope", player)
+        )
 
-    def _blasphemous_endgame_boss_hard(self, player):
-        return self.has("Mea Culpa Upgrade", player, 4) and \
-            self.has_group("power", player, 5)
+
+def miriam(state: CollectionState, player: int) -> bool:
+    return state.has_all({"D02Z03S24[E]", "D03Z03S19[E]", "D04Z04S02[W]", "D05Z01S24[E]", "D06Z01S26[W]"}, player)
+
+
+def amanecida_rooms(state: CollectionState, logic: int, player: int, number: int) -> bool:
+    bosses: List[str] = [
+        "Graveyard",
+        "Jondo",
+        "Patio",
+        "Wall"
+    ]
+
+    total = sum(can_beat_boss(state, boss, logic, player) for boss in bosses)
+
+    return True if total >= number else False
+
+
+def chalice_rooms(state: CollectionState, player: int, number: int) -> bool:
+    doors: List[Set[str]] = [
+        {"D03Z01S01[W]", "D03Z01S01[NE]", "D03Z01S01[S]"},
+        {"D05Z02S01[W]", "D05Z02S01[E]"},
+        {"D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]"}
+    ]
+
+    total: int = sum(state.has_any(items, player) for items in doors)
+
+    return True if total >= number else False
 
 
 def rules(blasphemousworld):
     world = blasphemousworld.multiworld
     player = blasphemousworld.player
+    logic = world.difficulty[player].value
+    enemy = world.enemy_randomizer[player].value
+
+
+    # D01Z01S01 (The Holy Line)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z01S01[S]", player),
+        lambda state: (
+            can_break_holes(state, player)
+            or state.has("Purified Hand of the Nun", player)
+        ))
+
+
+    # D01Z01S02 (The Holy Line)
+    # Items
+    set_rule(world.get_location("THL: Across blood platforms", player),
+        lambda state: (
+            state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player)
+        ))
+    # No doors
+
 
-    # entrances
-    for i in world.get_region("Deambulatory of His Holiness", player).entrances:
-        set_rule(i, lambda state: state._blasphemous_3_masks(player))
-    for i in world.get_region("Ferrous Tree", player).entrances:
-        set_rule(i, lambda state: state._blasphemous_bridge_access(player))
-    for i in world.get_region("Mother of Mothers", player).entrances:
-        set_rule(i, lambda state: state._blasphemous_bridge_access(player))
-    for i in world.get_region("Mourning and Havoc", player).entrances:
-        set_rule(i, lambda state: state._blasphemous_blood_relic(player) or \
-            state.can_reach(world.get_region("Mother of Mothers", player), player))
-    for i in world.get_region("Patio of the Silent Steps", player).entrances:
-        set_rule(i, lambda state: state._blasphemous_bridge_access(player))
-    for i in world.get_region("The Resting Place of the Sister", player).entrances:
-        set_rule(i, lambda state: state._blasphemous_blood_relic(player))
-    for i in world.get_region("The Sleeping Canvases", player).entrances:
-        set_rule(i, lambda state: state._blasphemous_bridge_access(player))
-    for i in world.get_region("Wall of the Holy Prohibitions", player).entrances:
-        set_rule(i, lambda state: state._blasphemous_1_mask(player) and \
-            state._blasphemous_bridge_access(player))
-
-    # Albero
-    set_rule(world.get_location("Albero: Bless Linen Cloth", player), 
-        lambda state: state._blasphemous_cloth(player))
+    # D01Z01S03 (The Holy Line)
+    # Items
+    set_rule(world.get_location("THL: Underground chest", player),
+        lambda state: (
+            state.has_all({"Blood Perpetuated in Sand", "Dash Ability"}, player)
+            and can_water_jump(state, player)
+        ))
+    # No doors
+
+
+    # D01Z02S01 (Albero)
+    # Items
+    set_rule(world.get_location("Albero: Bless Linen Cloth", player),
+        lambda state: state.has("Linen Cloth", player))
     set_rule(world.get_location("Albero: Bless Hatched Egg", player),
-        lambda state: state._blasphemous_egg(player))
+        lambda state: state.has("Hatched Egg of Deformity", player))
     set_rule(world.get_location("Albero: Bless Severed Hand", player),
-        lambda state: state._blasphemous_hand(player))
-    set_rule(world.get_location("Albero: First gift for Cleofas", player),
-        lambda state: state.can_reach(world.get_region("Mother of Mothers", player)))
-    set_rule(world.get_location("Albero: Final gift for Cleofas", player),
-        lambda state: state.can_reach(world.get_region("Mother of Mothers", player)) and \
-            state._blasphemous_marks(player) and \
-                state._blasphemous_cord(player))
+        lambda state: state.has("Severed Hand", player))
+    # No doors
+
+
+    # D01Z02S02 (Albero)
+    # Items
     set_rule(world.get_location("Albero: Tirso's 1st reward", player),
-        lambda state: state._blasphemous_tirso_1(player))
+        lambda state: state.has_group("tirso", player, 1))
     set_rule(world.get_location("Albero: Tirso's 2nd reward", player),
-        lambda state: state._blasphemous_tirso_2(player))
+        lambda state: state.has_group("tirso", player, 2))
     set_rule(world.get_location("Albero: Tirso's 3rd reward", player),
-        lambda state: state._blasphemous_tirso_3(player))
+        lambda state: state.has_group("tirso", player, 3))
     set_rule(world.get_location("Albero: Tirso's 4th reward", player),
-        lambda state: state._blasphemous_tirso_4(player))
+        lambda state: state.has_group("tirso", player, 4))
     set_rule(world.get_location("Albero: Tirso's 5th reward", player),
-        lambda state: state._blasphemous_tirso_5(player))
+        lambda state: state.has_group("tirso", player, 5))
     set_rule(world.get_location("Albero: Tirso's 6th reward", player),
-        lambda state: state._blasphemous_tirso_6(player))
+        lambda state: state.has_group("tirso", player, 6))
     set_rule(world.get_location("Albero: Tirso's final reward", player),
-        lambda state: state._blasphemous_tirso_6(player) and \
-            state.can_reach(world.get_region("Wall of the Holy Prohibitions", player)) and \
-                state._blasphemous_silver_key(player) and \
-                    state._blasphemous_bronze_key(player))
+        lambda state: (
+            state.has_group("tirso", player, 6)
+            and can_beat_boss(state, "Mercy", logic, player)
+            and can_beat_boss(state, "Convent", logic, player)
+            and can_beat_boss(state, "Grievance", logic, player)
+            and can_beat_boss(state, "Mothers", logic, player)
+            and can_beat_boss(state, "Canvases", logic, player)
+            and can_beat_boss(state, "Prison", logic, player)
+        ))
+    # No doors
+
+
+    # D01Z02S03 (Albero)
+    # Items
+    set_rule(world.get_location("Albero: Child of Moonlight", player),
+        lambda state: (
+            state.has("RodeGOTPElevator", player)
+            or pillar(state, player)
+            or state.has("Cante Jondo of the Three Sisters", player)
+            or state.has("D01Z02S03[NW]", player) and (
+                can_cross_gap(state, logic, player, 2)
+                or state.has("Lorquiana", player)
+                or aubade(state, player)
+                or state.has("Cantina of the Blue Rose", player)
+                or can_air_stall(state, logic, player)
+                or charge_beam(state, player)
+            )
+        ))
     set_rule(world.get_location("Albero: Lvdovico's 1st reward", player),
-        lambda state: state._blasphemous_tentudia_1(player))
+        lambda state: state.has_group("tentudia", player, 1))
     set_rule(world.get_location("Albero: Lvdovico's 2nd reward", player),
-        lambda state: state._blasphemous_tentudia_2(player))
+        lambda state: state.has_group("tentudia", player, 2))
     set_rule(world.get_location("Albero: Lvdovico's 3rd reward", player),
-        lambda state: state._blasphemous_tentudia_3(player))
-    set_rule(world.get_location("Ossuary: Isidora, Voice of the Dead", player),
-        lambda state: state._blasphemous_bones_30(player))
+        lambda state: state.has_group("tentudia", player, 3))
+    set_rule(world.get_location("Albero: First gift for Cleofas", player),
+        lambda state: state.has("D04Z02S10[W]", player))
+    # Doors
+    set_rule(world.get_entrance("D01Z02S03[NW]", player),
+        lambda state: (
+            state.has("D02Z02S11[NW]", player)
+            or state.has("D02Z02S11[NE]", player)
+            or state.has("D02Z02S11[W]", player)
+            or state.has("D02Z02S11[E]", player)
+            or state.has("D02Z02S11[SE]", player)
+        ))
+    set_rule(world.get_entrance("D01Z02S03[church]", player),
+        lambda state: (
+            can_beat_boss(state, "Mercy", logic, player)
+            or can_beat_boss(state, "Convent", logic, player)
+            or can_beat_boss(state, "Grievance", logic, player)
+        ))
+
+
+    # D01BZ04S01 (Albero: Inside church)
+    # Items
+    set_rule(world.get_location("Albero: Final gift for Cleofas", player),
+        lambda state: (
+            state.has_group("marks", player, 3)
+            and state.has("Cord of the True Burying", player)
+            and state.has("D04Z02S10[W]", player)
+            and state.has("D06Z01S18[E]", player)
+        ))
+    # No doors
+
+
+    # D01BZ06S01 (Ossuary)
+    # Items
     set_rule(world.get_location("Ossuary: 1st reward", player),
-        lambda state: state._blasphemous_bones_4(player))
+        lambda state: state.has_group("bones", player, 4))
     set_rule(world.get_location("Ossuary: 2nd reward", player),
-        lambda state: state._blasphemous_bones_8(player))
+        lambda state: state.has_group("bones", player, 8))
     set_rule(world.get_location("Ossuary: 3rd reward", player),
-        lambda state: state._blasphemous_bones_12(player))
+        lambda state: state.has_group("bones", player, 12))
     set_rule(world.get_location("Ossuary: 4th reward", player),
-        lambda state: state._blasphemous_bones_16(player))
+        lambda state: state.has_group("bones", player, 16))
     set_rule(world.get_location("Ossuary: 5th reward", player),
-        lambda state: state._blasphemous_bones_20(player))
+        lambda state: state.has_group("bones", player, 20))
     set_rule(world.get_location("Ossuary: 6th reward", player),
-        lambda state: state._blasphemous_bones_24(player))
+        lambda state: state.has_group("bones", player, 24))
     set_rule(world.get_location("Ossuary: 7th reward", player),
-        lambda state: state._blasphemous_bones_28(player))
+        lambda state: state.has_group("bones", player, 28))
     set_rule(world.get_location("Ossuary: 8th reward", player),
-        lambda state: state._blasphemous_bones_32(player))
+        lambda state: state.has_group("bones", player, 32))
     set_rule(world.get_location("Ossuary: 9th reward", player),
-        lambda state: state._blasphemous_bones_36(player))
+        lambda state: state.has_group("bones", player, 36))
     set_rule(world.get_location("Ossuary: 10th reward", player),
-        lambda state: state._blasphemous_bones_40(player))
+        lambda state: state.has_group("bones", player, 40))
     set_rule(world.get_location("Ossuary: 11th reward", player),
-        lambda state: state._blasphemous_bones_44(player))
+        lambda state: state.has_group("bones", player, 44))
+    # Doors
+    set_rule(world.get_entrance("D01BZ06S01[E]", player),
+        lambda state: state.has_group("bones", player, 30))
 
-    # All the Tears of the Sea
-    set_rule(world.get_location("AtTotS: Miriam's gift", player),
-        lambda state: state._blasphemous_2_masks(player) and \
-            state._blasphemous_fall_relic(player) and \
-                state._blasphemous_blood_relic(player) and \
-                    state._blasphemous_root_relic(player) and \
-                        state._blasphemous_miasma_relic(player))
 
-    # Archcathedral Rooftops
-    set_rule(world.get_location("AR: Second soldier fight", player),
-        lambda state: state._blasphemous_1_mask(player))
-    set_rule(world.get_location("AR: Third soldier fight", player),
-        lambda state: state._blasphemous_2_masks(player))
-    set_rule(world.get_location("AR: Upper west shaft Child of Moonlight", player),
-        lambda state: state._blasphemous_1_mask(player))
-    set_rule(world.get_location("AR: Upper west shaft chest", player),
-        lambda state: state._blasphemous_2_masks(player) and \
-            state._blasphemous_fall_relic(player) and \
-                state._blasphemous_root_relic(player))
-    set_rule(world.get_location("AR: Lady of the Six Sorrows", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_miasma_relic(player) and \
-                state._blasphemous_root_relic(player))
-    set_rule(world.get_location("AR: Upper east shaft ledge", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_miasma_relic(player) and \
-                state._blasphemous_root_relic(player) and \
-                    state._blasphemous_1_mask(player))
-    set_rule(world.get_location("AR: Mea Culpa altar", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_miasma_relic(player) and \
-                    state._blasphemous_2_masks(player))
-    set_rule(world.get_location("AR: Crisanta of the Wrapped Agony", player),
-        lambda state: state._blasphemous_3_masks(player))
-    
-    # Bridge of the Three Cavalries
-    set_rule(world.get_location("BotTC: Esdras, of the Anointed Legion", player),
-        lambda state: state._blasphemous_bridge_access(player))
-    set_rule(world.get_location("BotTC: Esdras' gift", player),
-        lambda state: state._blasphemous_bridge_access(player))
-    set_rule(world.get_location("BotTC: Inside giant statue", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            state._blasphemous_laudes_gate(player))
-    
-    # Brotherhood of the Silent Sorrow
-    set_rule(world.get_location("BotSS: Starting room Child of Moonlight", player),
-        lambda state: (state._blasphemous_blood_relic(player) and \
-            (state._blasphemous_root_relic(player) or \
-                state._blasphemous_fall_relic(player))) or \
-                    (state._blasphemous_root_relic(player) and \
-                        state._blasphemous_cherub_6(player)) or \
-                            state._blasphemous_taranto(player))
-    set_rule(world.get_location("BotSS: Starting room ledge", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_fall_relic(player))
-    set_rule(world.get_location("BotSS: Chamber of the Eldest Brother", player),
-        lambda state: state._blasphemous_elder_key(player))
-    set_rule(world.get_location("BotSS: Blue candle", player),
-        lambda state: state._blasphemous_blue_wax(player))
-    set_rule(world.get_location("BotSS: Outside church", player),
-        lambda state: state._blasphemous_blood_relic(player))
-    set_rule(world.get_location("BotSS: Esdras' final gift", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_scapular(player) and \
-                state._blasphemous_bridge_access(player))
-    set_rule(world.get_location("BotSS: Crisanta's gift", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_scapular(player) and \
-                state._blasphemous_heart_c(player) and \
-                    state._blasphemous_3_masks(player) and \
-                        state._blasphemous_bridge_access(player))
+    # D01BZ08S01 (Isidora)
+    # Items
+    set_rule(world.get_location("Ossuary: Isidora, Voice of the Dead", player),
+        lambda state: can_beat_boss(state, "Ossuary", logic, player))
+    # No doors
+
+
+    # D01Z03S01 (Wasteland of the Buried Churches)
+    # Items
+    set_rule(world.get_location("WotBC: Lower log path", player),
+        lambda state: state.has("D01Z03S01[SE]", player))
+    # No doors
+
+
+    # D01Z03S02 (Wasteland of the Buried Churches)
+    # Items
+    set_rule(world.get_location("WotBC: Hidden alcove", player),
+        lambda state: state.has("Dash Ability", player))
+    # No doors
+
+
+    # D01Z03S03 (Wasteland of the Buried Churches)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z03S03[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D01Z03S05 (Wasteland of the Buried Churches)
+    # Items
+    set_rule(world.get_location("WotBC: Under broken bridge", player),
+        lambda state: (
+            state.has_any({"Blood Perpetuated in Sand", "Boots of Pleading"}, player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D01Z03S05[Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D01Z03S06 (Wasteland of the Buried Churches)
+    # Items
+    set_rule(world.get_location("WotBC: 3rd meeting with Redento", player),
+        lambda state: redento(state, blasphemousworld, player, 3))
+    # No doors
+
+
+    # D01Z03S07 (Wasteland of the Buried Churches)
+    # Items
+    set_rule(world.get_location("WotBC: Cliffside Child of Moonlight", player),
+        lambda state: (
+            can_cross_gap(state, logic, player, 1)
+            or aubade(state, player)
+            or charge_beam(state, player)
+            or state.has_any({"Lorquiana", "Cante Jondo of the Three Sisters", "Cantina of the Blue Rose", "Cloistered Ruby"}, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D01Z03S07[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
     
-    # Convent of our Lady of the Charred Visage
-    set_rule(world.get_location("CoOLotCV: Lower west statue", player),
-        lambda state: state._blasphemous_miasma_relic(player))
-    set_rule(world.get_location("CoOLotCV: Lady of the Six Sorrows", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            state._blasphemous_1_mask(player) and \
-                state._blasphemous_bronze_key(player) and \
-                    state._blasphemous_silver_key(player) and \
-                        state._blasphemous_high_key(player))
-    set_rule(world.get_location("CoOLotCV: Red candle", player),
-        lambda state: state._blasphemous_red_wax(player))
-    set_rule(world.get_location("CoOLotCV: Fountain of burning oil", player),
-        lambda state: state._blasphemous_thimble(player))
-    set_rule(world.get_location("CoOLotCV: Mask room", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            state._blasphemous_1_mask(player) and \
-                state._blasphemous_bronze_key(player) and \
-                    state._blasphemous_silver_key(player) and \
-                        state._blasphemous_high_key(player))
-
-    # Desecrated Cistern
+    # D01Z04S01 (Mercy Dreams)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z04S01[SE]", player),
+        lambda state: state.has("D01Z04S01[S]", player))
+    set_rule(world.get_entrance("D01Z04S01[S]", player),
+        lambda state: state.has("D01Z04S01[SE]", player))
+
+
+    # D01Z04S09 (Mercy Dreams)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z04S09[W]", player),
+        lambda state: state.has("OpenedDCGateE", player))
+
+
+    # D01Z04S13 (Mercy Dreams)
+    # Items
+    set_rule(world.get_location("MD: Behind gate to TSC", player),
+        lambda state: (
+            state.has("D01Z04S13[SE]", player)
+            or can_dive_laser(state, logic, player) and (
+                can_air_stall(state, logic, player)
+                or state.has_any({"The Young Mason's Wheel", "Purified Hand of the Nun"}, player)
+                or can_enemy_bounce(logic, enemy)
+                )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D01Z04S13[SE]", player),
+        lambda state: (
+            can_dive_laser(state, logic, player) and (
+                can_air_stall(state, logic, player)
+                or state.has_any({"The Young Mason's Wheel", "Purified Hand of the Nun"}, player)
+                or can_enemy_bounce(logic, enemy)
+                )
+        ))
+
+
+    # D01Z04S14 (Mercy Dreams)
+    # Items
+    set_rule(world.get_location("MD: Sliding challenge", player),
+        lambda state: state.has("Dash Ability", player))
+    # No doors
+
+
+    # D01Z04S15 (Mercy Dreams)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z04S15[W]", player),
+        lambda state: (
+            state.has("D01Z04S15[E]", player)
+            or state.has("D01Z04S15[SW]", player)
+            or state.has("D01Z04S15[SE]", player)
+        ))
+    set_rule(world.get_entrance("D01Z04S15[E]", player),
+        lambda state: (
+            state.has("D01Z04S15[W]", player)
+            or state.has("D01Z04S15[SW]", player)
+            or state.has("D01Z04S15[SE]", player)
+        ))
+    set_rule(world.get_entrance("D01Z04S15[SW]", player),
+        lambda state: (
+            state.has("D01Z04S15[W]", player)
+            or state.has("D01Z04S15[E]", player)
+            or state.has("D01Z04S15[SE]", player)
+        ))
+    set_rule(world.get_entrance("D01Z04S15[SE]", player),
+        lambda state: (
+            state.has("D01Z04S15[W]", player)
+            or state.has("D01Z04S15[E]", player)
+            or state.has("D01Z04S15[SW]", player)
+        ))
+
+
+    # D01Z04S16 (Mercy Dreams)
+    # Items
+    set_rule(world.get_location("MD: Cave Child of Moonlight", player),
+        lambda state: (
+            state.has_any({"Purified Hand of the Nun", "Cante Jondo of the Three Sisters"}, player)
+            or pillar(state, player)
+            or tirana(state, player)
+        ))
+    # No doors
+
+
+    # D01Z04S18 (Ten Piedad)
+    # Items
+    set_rule(world.get_location("MD: Ten Piedad", player),
+        lambda state: can_beat_boss(state, "Mercy", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D01Z04S18[W]", player),
+        lambda state: can_beat_boss(state, "Mercy", logic, player))
+    set_rule(world.get_entrance("D01Z04S18[E]", player),
+        lambda state: can_beat_boss(state, "Mercy", logic, player))
+
+
+    # D01Z05S02 (Desecrated Cistern)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z05S02[S]", player),
+        lambda state: state.has("OpenedDCLadder", player))
+
+
+    # D01Z05S05 (Desecrated Cistern)
+    # Items
+    set_rule(world.get_location("DC: Hidden alcove near fountain", player),
+        lambda state: (
+            state.has("Dash Ability", player)
+            and can_water_jump(state, player)
+        ))
+    # No doors
+
+
+    # D01Z05S06 (Desecrated Cistern)
+    # Items
     set_rule(world.get_location("DC: Upper east tunnel chest", player),
-        lambda state: state._blasphemous_water_relic(player) or \
-            state._blasphemous_fall_relic(player))
+        lambda state: (
+            state.has("D01Z05S06[Cherubs]", player)
+            or can_water_jump(state, player)
+        ))
     set_rule(world.get_location("DC: Upper east Child of Moonlight", player),
-        lambda state: state._blasphemous_water_relic(player) or \
-            state._blasphemous_fall_relic(player) or \
-                state._blasphemous_cherub_13(player))
-    set_rule(world.get_location("DC: Hidden alcove near fountain", player),
-        lambda state: state._blasphemous_water_relic(player))
-    set_rule(world.get_location("DC: Shroud puzzle", player),
-        lambda state: state._blasphemous_corpse_relic(player) and \
-            state._blasphemous_miasma_relic(player) and \
-                state._blasphemous_water_relic(player))
-    set_rule(world.get_location("DC: Chalice room", player),
-        lambda state: (state._blasphemous_miasma_relic(player) and \
-            state._blasphemous_water_relic(player) and \
-                state._blasphemous_root_relic(player)) or \
-                    (state._blasphemous_fall_relic(player) and \
-                        state._blasphemous_root_relic(player)))
-    set_rule(world.get_location("DC: Mea Culpa altar", player),
-        lambda state: state._blasphemous_chalice(player) and \
-            state._blasphemous_bridge_access(player) and \
-                state._blasphemous_1_mask(player) and \
-                    state._blasphemous_bronze_key(player) and \
-                        (state._blasphemous_miasma_relic(player) and \
-                            state._blasphemous_water_relic(player) and \
-                                state._blasphemous_root_relic(player) or \
-                                    state._blasphemous_fall_relic(player) and \
-                                        state._blasphemous_root_relic(player)))
+        lambda state: (
+            state.has("D01Z05S06[Cherubs]", player)
+            or can_water_jump(state, player)
+            or pillar(state, player)
+            or state.has("Cante Jondo of the Three Sisters", player)
+            or aubade(state, player)
+            or tirana(state, player)
+            or can_air_stall(state, logic, player)
+        ))
+    # No doors
+
+
+    # D01Z05S12 (Desecrated Cistern)
+    # Event
+    set_rule(world.get_location("OpenedDCGateE", player),
+        lambda state: opened_dc_gate_e(state, player))
+
+
+    # D01Z05S13 (Desecrated Cistern)
+    # Items
     set_rule(world.get_location("DC: Child of Moonlight, behind pillar", player),
-        lambda state: state._blasphemous_miasma_relic(player) and \
-            state._blasphemous_water_relic(player))
+        lambda state: (
+            state.has("D01Z05S13[SW]", player)
+            or state.has("D01Z05S13[E]", player)
+            and can_survive_poison(state, logic, player, 3)
+            and can_water_jump(state, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D01Z05S13[SW]", player),
+        lambda state: state.has("D01Z05S13[E]", player))
+    add_rule(world.get_entrance("D01Z05S13[SW]", player),
+        lambda state: (
+            can_survive_poison(state, logic, player, 3)
+            and can_water_jump(state, player)
+        ))
+    set_rule(world.get_entrance("D01Z05S13[N]", player),
+        lambda state: state.has("D01Z05S13[E]", player))
+    add_rule(world.get_entrance("D01Z05S13[N]", player),
+        lambda state: (
+            can_survive_poison(state, logic, player, 3)
+            and can_water_jump(state, player)
+        ))
+
+
+    # D01Z05S17 (Desecrated Cistern)
+    # Items
     set_rule(world.get_location("DC: High ledge near elevator shaft", player),
-        lambda state: state._blasphemous_miasma_relic(player) and \
-            state._blasphemous_water_relic(player))
-    set_rule(world.get_location("DC: Elevator shaft Child of Moonlight", player),
-        lambda state: state._blasphemous_fall_relic(player) or \
-            (state._blasphemous_miasma_relic(player) and \
-                state._blasphemous_water_relic(player) and \
-                    state._blasphemous_cherub_22_23_31_32(player)))
+        lambda state: (
+            state.has("D01Z05S17[E]", player)
+            or can_water_jump(state, player)
+            or can_cross_gap(state, logic, player, 5)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D01Z05S17[E]", player),
+        lambda state: (
+            state.has("Dash Ability", player) and (
+                can_water_jump(state, player)
+                or can_cross_gap(state, logic, player, 5)
+            )
+        ))
+    
+
+    # D01Z05S20 (Desecrated Cistern)
+    # Event
+    set_rule(world.get_location("OpenedDCLadder", player),
+        lambda state: opened_dc_ladder(state, player))
+
+
+    # D01Z05S21 (Desecrated Cistern)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z05S21[Reward]", player),
+        lambda state: state.has("Shroud of Dreamt Sins", player))
+
+
+    # D01Z05S23 (Desecrated Cistern)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z05S23[W]", player),
+        lambda state: (
+            chalice_rooms(state, player, 3)
+            and state.has("Chalice of Inverted Verses", player)
+        ))
+    
+
+    # D01Z05S24 (Desecrated Cistern)
+    # Event
+    set_rule(world.get_location("OpenedDCGateW", player),
+        lambda state: opened_dc_gate_w(state, player))
+
+
+    # D01Z05S25 (Desecrated Cistern)
+    # Items
     set_rule(world.get_location("DC: Elevator shaft ledge", player),
-        lambda state: state._blasphemous_fall_relic(player))
+        lambda state: state.has("Linen of Golden Thread", player))
+    set_rule(world.get_location("DC: Elevator shaft Child of Moonlight", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            or (
+                pillar(state, player)
+                and (
+                    state.has("D01Z05S25[E]", player)
+                    or state.has("D01Z05S25[W]", player)
+                    and (
+                        can_walk_on_root(state, player)
+                        or can_cross_gap(state, logic, player, 3)
+                    )
+                )
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D01Z05S25[NE]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            or state.has("D01Z05S25[SW]", player)
+            or state.has("D01Z05S25[SE]", player)
+        ))
+    set_rule(world.get_entrance("D01Z05S25[W]", player),
+        lambda state: (
+            (
+                state.has("Linen of Golden Thread", player)
+                and (
+                    can_walk_on_root(state, player)
+                    or state.has("Purified Hand of the Nun", player)
+                    or can_air_stall(state, logic, player)
+                )
+            )
+            or (
+                state.has("D01Z05S25[E]", player)
+                and (
+                    can_walk_on_root(state, player)
+                    or can_cross_gap(state, logic, player, 3)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D01Z05S25[E]", player),
+        lambda state: (
+            can_break_tirana(state, logic, player)
+            and (
+                state.has("Linen of Golden Thread", player)
+                or state.has("D01Z05S25[W]", player)
+                and (
+                    can_walk_on_root(state, player)
+                    or can_cross_gap(state, logic, player, 3)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D01Z05S25[SW]", player),
+        lambda state: (
+            state.has("D01Z05S25[SE]", player)
+            or state.has("D01Z05S25[NE]", player)
+            or state.has("Linen of Golden Thread", player)
+        ))
+    set_rule(world.get_entrance("D01Z05S25[SE]", player),
+        lambda state: (
+            state.has("D01Z05S25[SW]", player)
+            or state.has("D01Z05S25[NE]", player)
+            or state.has("Linen of Golden Thread", player)
+        ))
+    set_rule(world.get_entrance("D01Z05S25[EchoesW]", player),
+        lambda state: state.has("D01Z05S25[EchoesE]", player))
+    add_rule(world.get_entrance("D01Z05S25[EchoesW]", player),
+        lambda state: (
+            (
+                state.has("D01Z05S25[EchoesE]", player)
+                and (
+                    state.has("Blood Perpetuated in Sand", player)
+                    or can_cross_gap(state, logic, player, 8)
+                )
+            )
+            or state.has_all({"Linen of Golden Thread", "Purified Hand of the Nun"}, player)
+        ))
+    set_rule(world.get_entrance("D01Z05S25[EchoesE]", player),
+        lambda state: state.has("D01Z05S25[EchoesW]", player))
+    add_rule(world.get_entrance("D01Z05S25[EchoesE]", player),
+        lambda state: (
+            (
+                state.has("D01Z05S25[EchoesW]", player)
+                and (
+                    state.has("Blood Perpetuated in Sand", player)
+                    or can_cross_gap(state, logic, player, 8)
+                )
+            )
+            or state.has_all({"Linen of Golden Thread", "Purified Hand of the Nun"}, player)
+        ))
 
-    # Graveyard of the Peaks
-    set_rule(world.get_location("GotP: Shop cave Child of Moonlight", player),
-        lambda state: state._blasphemous_blood_relic(player) or \
-            state._blasphemous_fall_relic(player) or \
-                state._blasphemous_cherub_22_23_31_32(player))
-    # to do: or dive
-    set_rule(world.get_location("GotP: Shop cave hidden hole", player),
-        lambda state: state._blasphemous_blood_relic(player) or \
-            state._blasphemous_open_holes(player))
+
+    # D01Z06S01 (Petrous)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D01Z06S01[Santos]", player),
+        lambda state: state.has("Petrified Bell", player))
+
+
+    # D02Z01S01 (Where Olive Trees Wither)
+    # Items
+    set_rule(world.get_location("WOTW: Below Prie Dieu", player),
+        lambda state: (
+            state.has("D02Z01S01[W]", player)
+            or state.has("D02Z01S01[CherubsL]", player)
+            or state.has("D02Z01S01[SW]", player)
+            or state.has("D02Z01S01[CherubsR]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_location("WOTW: Gemino's gift", player),
+        lambda state: (
+            state.has("D02Z01S01[W]", player)
+            or state.has("D02Z01S01[CherubsL]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            or (
+                (
+                    state.has("D02Z01S01[SW]", player)
+                    or state.has("D02Z01S01[CherubsR]", player)
+                )
+                and can_dawn_jump(state, logic, player)
+            )
+        ))
+    set_rule(world.get_location("WOTW: Gemino's reward", player),
+        lambda state: (
+            state.has("Golden Thimble Filled with Burning Oil", player)
+            and (
+                state.has("D02Z01S01[W]", player)
+                or state.has("D02Z01S01[CherubsL]", player)
+                or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+                or (
+                    (
+                        state.has("D02Z01S01[SW]", player)
+                        or state.has("D02Z01S01[CherubsR]", player)
+                    )
+                    and can_dawn_jump(state, logic, player)
+                )
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z01S01[SW]", player),
+        lambda state: (
+            state.has("OpenedWOTWCave", player)
+            and (
+                state.has("D02Z01S01[W]", player)
+                or state.has("D02Z01S01[CherubsL]", player)
+                or state.has("D02Z01S01[CherubsR]", player)
+                or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            )
+        ))
+    set_rule(world.get_entrance("D02Z01S01[W]", player),
+        lambda state: (
+            state.has("D02Z01S01[CherubsL]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            or (
+                (
+                    state.has("D02Z01S01[SW]", player)
+                    or state.has("D02Z01S01[CherubsR]", player)
+                )
+                and can_dawn_jump(state, logic, player)
+            )
+        ))
+
+
+    # D02Z01S02 (Where Olive Trees Wither)
+    # Items
+    set_rule(world.get_location("WOTW: Upper east Child of Moonlight", player),
+        lambda state: (
+            state.has("D02Z01S02[NE]", player)
+            or (
+                state.has("D02Z01S02[NW]", player)
+                or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            )
+            and (
+                can_walk_on_root(state, player)
+                or can_cross_gap(state, logic, player, 4)
+                or pillar(state, player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z01S02[NW]", player),
+        lambda state: (
+            state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            or (
+                state.has("D02Z01S02[NE]", player)
+                and can_walk_on_root(state, player)
+                and can_cross_gap(state, logic, player, 5)
+            )
+        ))
+    set_rule(world.get_entrance("D02Z01S02[NE]", player),
+        lambda state: (
+            (
+                state.has("Purified Hand of the Nun", player)
+                and can_enemy_bounce(logic, enemy)
+            )
+            or (
+                state.has("D02Z01S02[NW]", player)
+                or state.has("Wall Climb Ability", player)
+                or state.has("Purified Hand of the Nun", player)
+            )
+            and (
+                can_walk_on_root(state, player)
+                or can_cross_gap(state, logic, player, 10)
+            )
+        ))
+    set_rule(world.get_entrance("D02Z01S02[]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D02Z01S03 (Where Olive Trees Wither)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D02Z01S03[W]", player),
+        lambda state: (
+            state.has("D02Z01S03[SE]", player)
+            or state.has("D02Z01S03[Cherubs]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z01S03[SE]", player),
+        lambda state: (
+            state.has("D02Z01S03[W]", player)
+            or state.has("D02Z01S03[Cherubs]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+
+
+    # D02Z01S04 (Where Olive Trees Wither)
+    # Items
+    set_rule(world.get_location("WOTW: Gift for the tomb", player),
+        lambda state: (
+            state.has("Golden Thimble Filled with Burning Oil", player)
+            and (
+                state.has("D02Z01S01[W]", player)
+                or state.has("D02Z01S01[CherubsL]", player)
+                or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+                or (
+                    (
+                        state.has("D02Z01S01[SW]", player)
+                        or state.has("D02Z01S01[CherubsR]", player)
+                    )
+                    and can_dawn_jump(state, logic, player)
+                )
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z01S04[-N]", player),
+        lambda state: (
+            state.has("Golden Thimble Filled with Burning Oil", player)
+            and (
+                state.has("D02Z01S01[W]", player)
+                or state.has("D02Z01S01[CherubsL]", player)
+                or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+                or (
+                    (
+                        state.has("D02Z01S01[SW]", player)
+                        or state.has("D02Z01S01[CherubsR]", player)
+                    ) 
+                    and can_dawn_jump(state, logic, player)
+                )
+            )
+        ))
+
+
+    # D02Z01S06 (Where Olive Trees Wither)
+    # Items
+    set_rule(world.get_location("WOTW: Underground ledge", player),
+        lambda state: (
+            state.has_all({"Wall Climb Ability", "Blood Perpetuated in Sand"}, player)
+            and (
+                state.has("Dash Ability", player)
+                or state.has("D02Z01S06[Cherubs]", player)
+            )
+            or state.has("Purified Hand of the Nun", player)
+            and (
+                state.has("D02Z01S06[Cherubs]", player)
+                or state.has("D02Z01S06[E]", player)
+                or state.has_any({"Wall Climb Ability", "Dash Ability"}, player)
+            )
+        ))
+    set_rule(world.get_location("WOTW: Underground Child of Moonlight", player),
+        lambda state: (
+            (
+                state.has("D02Z01S06[W]", player)
+                or state.has("Dash Ability", player)
+                or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            )
+            and (
+                pillar(state, player)
+                or state.has("Cante Jondo of the Three Sisters", player)
+            )
+            or (
+                state.has("D02Z01S06[W]", player)
+                or state.has_any({"Purified Hand of the Nun", "Dash Ability"}, player)
+            )
+            and state.has("Wall Climb Ability", player)
+            and (
+                state.has_any({"Lorquiana", "Cantina of the Blue Rose"}, player)
+                or aubade(state, player)
+                or can_air_stall(state, logic, player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z01S06[W]", player),
+        lambda state: (
+            state.has("Dash Ability", player)
+            or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D02Z01S06[E]", player),
+        lambda state: state.has("Wall Climb Ability", player))
+    # Event
+    set_rule(world.get_location("OpenedWOTWCave", player),
+        lambda state: opened_wotw_cave(state, player))
+
+
+    # D02Z01S08 (Where Olive Trees Wither)
+    # Items
+    set_rule(world.get_location("WOTW: Underground tomb", player),
+        lambda state: state.has("Dried Flowers bathed in Tears", player))
+    # No doors
+
+
+    # D02Z01S09 (Where Olive Trees Wither)
+    # Items
+    set_rule(world.get_location("WOTW: Upper east statue", player),
+        lambda state: (
+            can_walk_on_root(state, player)
+            or can_cross_gap(state, logic, player, 11)
+            or state.has("Purified Hand of the Nun", player)
+            and can_enemy_bounce(logic, enemy)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z01S09[-CherubsL]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+    set_rule(world.get_entrance("D02Z01S09[-CherubsR]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                can_walk_on_root(state, player)
+                or can_cross_gap(state, logic, player, 2)
+                or can_enemy_bounce(logic, enemy)
+                and can_air_stall(state, logic, player)
+            )
+        ))
+
+
+    # D02Z02S01 (Graveyard of the Peaks)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D02Z02S01[W]", player),
+        lambda state: (
+            state.has("D02Z02S01[NW]", player)
+            or state.has("D02Z02S01[Cherubs]", player)
+            or state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z02S01[NW]", player),
+        lambda state: (
+            state.has("D02Z02S01[Cherubs]", player)
+            or state.has("Wall Climb Ability", player)
+            and (
+                state.has("D02Z02S01[W]", player)
+                or state.has("Dash Ability", player)
+            )
+        ))
+    set_rule(world.get_entrance("D02Z02S01[E]", player),
+        lambda state: (
+            state.has("D02Z02S01[NW]", player)
+            or state.has("D02Z02S01[Cherubs]", player)
+            or state.has_any({"Wall Climb Ability", "Dash Ability"}, player)
+        ))
+
+
+    # D02Z02S02 (Graveyard of the Peaks)
+    # Items
+    set_rule(world.get_location("GotP: Center shaft Child of Moonlight", player),
+        lambda state: (
+            state.has("D02Z02S02[CherubsL]", player)
+            or state.has("D02Z02S02[CherubsR]", player)
+            or (
+                (
+                    state.has("D02Z02S02[NW]", player)
+                    or state.has("D02Z02S02[NE]", player)
+                    or state.has("Wall Climb Ability", player)
+                )
+                and (
+                    state.has_any({"Purified Hand of the Nun", "Cante Jondo of the Three Sisters"}, player)
+                    or pillar(state, player)
+                    or tirana(state, player)
+                    or can_dive_laser(state, logic, player)
+                )
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z02S02[NW]", player),
+        lambda state: (
+            state.has("D02Z02S02[NE]", player)
+            or state.has("D02Z02S02[CherubsL]", player)
+            or state.has("D02Z02S02[CherubsR]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z02S02[NE]", player),
+        lambda state: (
+            state.has("D02Z02S02[NW]", player)
+            or state.has("D02Z02S02[CherubsL]", player)
+            or state.has("D02Z02S02[CherubsR]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z02S02[-CherubsR]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D02Z02S03 (Graveyard of the Peaks)
+    # Items
+    set_rule(world.get_location("GotP: Lower east shaft", player),
+        lambda state: (
+            state.has("D02Z02S03[NW]", player)
+            or state.has("D02Z02S03[NE]", player)
+            or state.has("Wall Climb Ability", player)
+            or can_cross_gap(state, logic, player, 2)
+        ))
+    set_rule(world.get_location("GotP: Center east shaft", player),
+        lambda state: (
+            state.has("D02Z02S03[NW]", player)
+            or state.has("D02Z02S03[NE]", player)
+            or state.has_any({"Wall Climb Ability", "Purified Hand of the Nun"}, player)
+        ))
     set_rule(world.get_location("GotP: Upper east shaft", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_root_relic(player))
-    set_rule(world.get_location("GotP: East cliffside", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_root_relic(player))
+        lambda state: (
+            (
+                can_climb_on_root(state, player)
+                and state.has("Purified Hand of the Nun", player)
+            )
+            or (
+                state.has("Blood Perpetuated in Sand", player)
+                and (
+                    state.has("Purified Hand of the Nun", player)
+                    or can_climb_on_root(state, player)
+                )
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z02S03[NW]", player),
+        lambda state: (
+            state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            or state.has("D02Z02S03[NE]", player)
+            and can_walk_on_root(state, player)
+        ))
+    set_rule(world.get_entrance("D02Z02S03[NE]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            and (
+                can_cross_gap(state, logic, player, 11)
+                or (
+                    state.has("Blood Perpetuated in Sand", player)
+                    and (
+                        can_walk_on_root(state, player)
+                        or can_cross_gap(state, logic, player, 7)
+                    )
+                )
+                or (
+                    can_walk_on_root(state, player)
+                    and (
+                        state.has("Purified Hand of the Nun", player)
+                        or can_air_stall(state, logic, player)
+                    )
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D02Z02S03[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D02Z02S04 (Graveyard of the Peaks)
+    # Items
+    set_rule(world.get_location("GotP: Lower west shaft", player),
+        lambda state: state.has("D02Z02S04[E]", player))
+    set_rule(world.get_location("GotP: Upper west shaft", player),
+        lambda state:
+        (
+            state.has("D02Z02S04[NE]", player)
+            or (
+                (
+                    state.has("D02Z02S04[W]", player)
+                    or state.has("D02Z02S04[E]", player)
+                    and state.has("Dash Ability", player)
+                )
+                and (
+                    state.has("Purified Hand of the Nun", player)
+                    or state.has("Wall Climb Ability", player)
+                )
+            )
+            or (
+                state.has("D02Z02S04[SE]", player)
+                and (
+                    state.has("Wall Climb Ability", player)
+                    or state.has("Purified Hand of the Nun", player)
+                    and can_enemy_upslash(state, logic, enemy, player)
+                )
+            )
+        ))
     set_rule(world.get_location("GotP: West shaft Child of Moonlight", player),
-        lambda state: state._blasphemous_blood_relic(player) or \
-            state._blasphemous_cherub_25(player))
-    set_rule(world.get_location("GotP: Center shaft Child of Moonlight", player),
-        lambda state: state._blasphemous_fall_relic(player) or \
-            state._blasphemous_cherub_24_33(player))
-    # to do: requires dive
+        lambda state: 
+        (
+            (
+                state.has("D02Z02S04[NE]", player)
+                or state.has("D02Z02S04[W]", player)
+                or state.has("D02Z02S04[E]", player)
+                and state.has("Dash Ability", player)
+                or state.has("D02Z02S04[SE]", player)
+                and (
+                    state.has("Wall Climb Ability", player)
+                    or state.has("Purified Hand of the Nun", player)
+                    and can_enemy_upslash(state, logic, enemy, player)
+                )
+            )
+            and (
+                state.has("Blood Perpetuated in Sand", player)
+                and state.has("Dash Ability", player)
+                or state.has("Purified Hand of the Nun", player)
+                and can_enemy_bounce(logic, enemy)
+                or state.has_any({"Lorquiana", "Cante Jondo of the Three Sisters", "Verdiales of the Forsaken Hamlet", "Cantina of the Blue Rose"}, player)
+                or aubade(state, player)
+            )
+            or (
+                state.has("D02Z02S04[NE]", player)
+                or state.has("D02Z02S04[W]", player)
+                or state.has("D02Z02S04[E]", player)
+                and state.has("Dash Ability", player)
+                or state.has("D02Z02S04[SE]", player)
+            )
+            and pillar(state, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z02S04[W]", player),
+        lambda state: (
+            state.has("D02Z02S04[NE]", player)
+            or state.has("D02Z02S04[E]", player)
+            and state.has("Dash Ability", player)
+            or state.has("D02Z02S04[SE]", player)
+            and (
+                state.has("Wall Climb Ability", player)
+                or state.has("Purified Hand of the Nun", player)
+                and can_enemy_upslash(state, logic, enemy, player)
+            )
+        ))
+    set_rule(world.get_entrance("D02Z02S04[SE]", player),
+        lambda state: (
+            state.has("D02Z02S04[NE]", player)
+            or state.has("D02Z02S04[W]", player)
+            or state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z02S04[NE]", player),
+        lambda state: (
+            (
+                (
+                    state.has("D02Z02S04[W]", player)
+                    or state.has("D02Z02S04[E]", player)
+                    and state.has("Dash Ability", player)
+                )
+                and state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            )
+            or (
+                state.has("D02Z02S04[SE]", player)
+                and (
+                    state.has("Wall Climb Ability", player)
+                    or state.has("Purified Hand of the Nun", player)
+                    and can_enemy_upslash(state, logic, enemy, player)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D02Z02S04[-CherubsL]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D02Z02S04[NE]", player)
+                or state.has("D02Z02S04[W]", player)
+                or state.has("D02Z02S04[SE]", player)
+                or state.has("Dash Ability", player)
+            )
+        ))
+
+
+    # D02Z02S05 (Graveyard of the Peaks)
+    # Items
+    set_rule(world.get_location("GotP: Center shaft ledge", player),
+        lambda state: (
+            state.has("D02Z02S05[NW]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z02S05[W]", player),
+        lambda state: (
+            state.has("Purified Hand of the Nun", player)
+            and can_enemy_bounce(logic, enemy)
+        ))
+    set_rule(world.get_entrance("D02Z02S05[E]", player),
+        lambda state: (
+            state.has("D02Z02S05[NW]", player)
+            or state.has("D02Z02S05[E]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z02S05[NW]", player),
+        lambda state: (
+            state.has("D02Z02S05[NW]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z02S05[-CherubsL]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+    set_rule(world.get_entrance("D02Z02S05[-CherubsR]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D02Z02S08 (Graveyard of the Peaks)
+    # Items
+    set_rule(world.get_location("GotP: Shop cave hidden hole", player),
+        lambda state: (
+            state.has("D02Z02S08[CherubsR]", player)
+            or state.has("Blood Perpetuated in Sand", player)
+            or can_break_holes(state, player)
+            or can_cross_gap(state, logic, player, 8)
+        ))
+    set_rule(world.get_location("GotP: Shop cave Child of Moonlight", player),
+        lambda state: (
+            state.has("D02Z02S08[CherubsR]", player)
+            or state.has("Blood Perpetuated in Sand", player)
+            or pillar(state, player)
+            or can_cross_gap(state, logic, player, 8)
+        ))
+    # No doors
+
+
+    # D02Z02S11 (Graveyard of the Peaks)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D02Z02S11[E]", player),
+        lambda state: (
+            state.has("D02Z02S11[NW]", player)
+            or state.has("D02Z02S11[NE]", player)
+            or can_cross_gap(state, logic, player, 6)
+        ))
+    set_rule(world.get_entrance("D02Z02S11[NW]", player),
+        lambda state: state.has("D02Z02S11[NE]", player))
+    set_rule(world.get_entrance("D02Z02S11[NE]", player),
+        lambda state: state.has("D02Z02S11[NW]", player))
+    set_rule(world.get_entrance("D02Z02S11[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D02Z02S14 (Graveyard of the Peaks)
+    # Items
     set_rule(world.get_location("GotP: Amanecida of the Bejeweled Arrow", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_blood_relic(player) and \
-                state._blasphemous_root_relic(player) and \
-                    state._blasphemous_open_holes(player))
+        lambda state: can_beat_boss(state, "Graveyard", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D02Z02S14[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D02Z03S02 (Convent of Our Lady of the Charred Visage)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D02Z03S02[W]", player),
+        lambda state: (
+            state.has("D02Z03S02[NW]", player)
+            or state.has("D02Z03S02[NE]", player)
+            or state.has("D02Z03S02[N]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D02Z03S02[NW]", player),
+        lambda state: (
+            state.has("D02Z03S02[NE]", player)
+            or state.has("D02Z03S02[N]", player)
+        ))
+    set_rule(world.get_entrance("D02Z03S02[NE]", player),
+        lambda state: (
+            state.has("D02Z03S02[NW]", player)
+            or state.has("D02Z03S02[N]", player)
+        ))
+    set_rule(world.get_entrance("D02Z03S02[N]", player),
+        lambda state: (
+            state.has("D02Z03S02[NW]", player)
+            or state.has("D02Z03S02[NE]", player)
+        ))
+    add_rule(world.get_entrance("D02Z03S02[N]", player),
+        lambda state: state.has("OpenedConventLadder", player))
+
+
+    # D02Z03S03 (Convent of Our Lady of the Charred Visage)
+    # Items
+    set_rule(world.get_location("CoOLotCV: Snowy window ledge", player),
+        lambda state: (
+            state.has("D02Z03S03[NW]", player)
+            or state.has("Blood Perpetuated in Sand", player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z03S03[NW]", player),
+        lambda state: (
+            state.has("Blood Perpetuated in Sand", player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+
+
+    # D02Z03S05 (Convent of Our Lady of the Charred Visage)
+    # Items
+    set_rule(world.get_location("CoOLotCV: Center miasma room", player),
+        lambda state: (
+            state.has("Dash Ability", player)
+            and (
+                state.has("D02Z03S05[S]", player)
+                or state.has("D02Z03S05[NE]", player)
+                or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D02Z03S05[S]", player),
+        lambda state: (
+            state.has("D02Z03S05[NE]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z03S05[NE]", player),
+        lambda state: (
+            state.has("D02Z03S05[S]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+
+
+    # D02Z03S10 (Convent of Our Lady of the Charred Visage)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D02Z03S10[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+    
+
+    # D02Z03S11 (Convent of Our Lady of the Charred Visage)
+    # Event
+    set_rule(world.get_location("OpenedConventLadder", player),
+        lambda state: opened_convent_ladder(state, player))
+
+
+    # D02Z03S12 (Convent of Our Lady of the Charred Visage)
+    # Items
+    set_rule(world.get_location("CoOLotCV: Lower west statue", player),
+        lambda state: (
+            can_survive_poison(state, logic, player, 1)
+            and state.has("Dash Ability", player)
+        ))
+    # No doors
+
+
+    # D02Z03S18 (Convent of Our Lady of the Charred Visage)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D02Z03S18[NW]", player),
+        lambda state: (
+            state.has("D02Z03S18[NE]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D02Z03S18[NE]", player),
+        lambda state: (
+            state.has("D02Z03S18[NW]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+
+
+    # D02Z03S20 (Convent of Our Lady of the Charred Visage)
+    # Items
+    set_rule(world.get_location("CoOLotCV: Our Lady of the Charred Visage", player),
+        lambda state: can_beat_boss(state, "Convent", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D02Z03S20[W]", player),
+        lambda state: can_beat_boss(state, "Convent", logic, player))
+    set_rule(world.get_entrance("D02Z03S20[E]", player),
+        lambda state: can_beat_boss(state, "Convent", logic, player))
+
+
+    # D02Z03S21 (Convent of Our Lady of the Charred Visage)
+    # Items
+    set_rule(world.get_location("CoOLotCV: Fountain of burning oil", player),
+        lambda state: state.has("Empty Golden Thimble", player))
+    # No doors
+
 
-    # Grievance Ascends
+    # D03Z01S01 (Mountains of the Endless Dusk)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z01S01[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D03Z01S02 (Mountains of the Endless Dusk)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z01S02[W]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    set_rule(world.get_entrance("D03Z01S02[E]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            or can_cross_gap(state, logic, player, 7)
+        ))
+
+
+    # D03Z01S03 (Mountains of the Endless Dusk)
+    # Items
+    set_rule(world.get_location("MotED: Platform above chasm", player),
+        lambda state: (
+            state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player)
+            and (
+                state.has("D03Z01S03[W]", player)
+                or state.has("D03Z01S03[SW]", player)
+                or can_cross_gap(state, logic, player, 9)
+            )
+        ))
+    set_rule(world.get_location("MotED: 1st meeting with Redento", player),
+        lambda state: (
+            state.has("D03Z01S03[W]", player)
+            or state.has("D03Z01S03[SW]", player)
+            or can_cross_gap(state, logic, player, 9)
+        ))
+    set_rule(world.get_location("MotED: Child of Moonlight, above chasm", player),
+        lambda state: (
+            state.has("D03Z01S03[W]", player)
+            or state.has("D03Z01S03[SW]", player)
+            or can_cross_gap(state, logic, player, 9)
+        ))
+    set_rule(world.get_location("MotED: Amanecida of the Golden Blades", player),
+        lambda state: (
+            can_beat_boss(state, "Jondo", logic, player)
+            and (
+                state.has("D03Z01S03[W]", player)
+                or state.has("D03Z01S03[SW]", player)
+                or can_cross_gap(state, logic, player, 9)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D03Z01S03[W]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            and (
+                state.has("D03Z01S03[SW]", player)
+                or can_cross_gap(state, logic, player, 9)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z01S03[E]", player),
+        lambda state: state.has("Wall Climb Ability", player))
+    set_rule(world.get_entrance("D03Z01S03[SW]", player),
+        lambda state: (
+            state.has("D03Z01S03[W]", player)
+            or can_cross_gap(state, logic, player, 9)
+        ))
+    set_rule(world.get_entrance("D03Z01S03[-WestL]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D03Z01S03[W]", player)
+                or state.has("D03Z01S03[SW]", player)
+                or can_cross_gap(state, logic, player, 9)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z01S03[-WestR]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D03Z01S03[W]", player)
+                or state.has("D03Z01S03[SW]", player)
+                or can_cross_gap(state, logic, player, 9)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z01S03[-EastL]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D03Z01S03[W]", player)
+                or state.has("D03Z01S03[SW]", player)
+                or can_cross_gap(state, logic, player, 5)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z01S03[-EastR]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D03Z01S04 (Mountains of the Endless Dusk)
+    # Items
+    set_rule(world.get_location("MotED: Blood platform alcove", player),
+        lambda state: (
+            state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player)
+            or upwarp_skips_allowed(logic)
+        ))
+    # No doors
+
+
+    # D03Z01S06 (Mountains of the Endless Dusk)
+    # Items
+    set_rule(world.get_location("MotED: Perpetva", player),
+        lambda state: can_beat_boss(state, "Perpetua", logic, player))
+    set_rule(world.get_location("MotED: Egg hatching", player),
+        lambda state: can_beat_boss(state, "Perpetua", logic, player) and \
+            state.has("Egg of Deformity", player))
+    # Doors
+    set_rule(world.get_entrance("D03Z01S06[W]", player),
+        lambda state: can_beat_boss(state, "Perpetua", logic, player))
+    set_rule(world.get_entrance("D03Z01S06[E]", player),
+        lambda state: can_beat_boss(state, "Perpetua", logic, player))
+
+
+    # D03Z02S01 (Jondo)
+    # Items
+    set_rule(world.get_location("Jondo: Upper east chest", player),
+        lambda state: (
+            state.has("D03Z02S01[Cherubs]", player)
+            or can_climb_on_root(state, player)
+            or can_cross_gap(state, logic, player, 8)
+            or state.has("Purified Hand of the Nun", player)
+            and can_enemy_bounce(logic, enemy)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D03Z02S01[W]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            or state.has("Purified Hand of the Nun", player)
+            and can_enemy_bounce(logic, enemy)
+        ))
+    set_rule(world.get_entrance("D03Z02S01[N]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            or state.has("Purified Hand of the Nun", player)
+        ))
+
+
+    # D03Z02S02 (Jondo)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z02S02[W]", player),
+        lambda state: (
+            state.has("D03Z02S02[CherubsL]", player)
+            or state.has("Purified Hand of the Nun", player)
+            and (
+                state.has("D03Z02S02[E]", player)
+                or state.has("D03Z02S02[CherubsR]", player)
+                or state.has("Wall Climb Ability", player)
+                or can_enemy_bounce(logic, enemy)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S02[E]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            or state.has("Purified Hand of the Nun", player)
+            and can_enemy_bounce(logic, enemy)
+        ))
+    
+    # D03Z02S03 (Jondo)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z02S03[W]", player),
+        lambda state: (
+            state.has("Dash Ability", player)
+            and (
+                state.has("D03Z02S03[E]", player)
+                or state.has("D03Z02S03[N]", player)
+                or state.has("D03Z02S03[SE2]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S03[E]", player),
+        lambda state: (
+            (
+                can_air_stall(state, logic, player)
+                or state.has_any({"Purified Hand of the Nun", "Boots of Pleading"}, player)
+            )
+            and (
+                state.has("Dash Ability", player)
+                or state.has("D03Z02S03[N]", player)
+                or state.has("D03Z02S03[SE2]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S03[N]", player),
+        lambda state: (
+            state.has("D03Z02S03[W]", player)
+            and state.has("Dash Ability", player)
+            or state.has("D03Z02S03[E]", player)
+            or state.has("D03Z02S03[SE2]", player)
+        ))
+    set_rule(world.get_entrance("D03Z02S03[SE2]", player),
+        lambda state: (
+            state.has("D03Z02S03[W]", player)
+            and state.has("Dash Ability", player)
+            or state.has("D03Z02S03[E]", player)
+            or state.has("D03Z02S03[N]", player)
+        ))
+    set_rule(world.get_entrance("D03Z02S03[SW]", player),
+        lambda state: (
+            state.has("D03Z02S03[SE]", player)
+            or state.has("D03Z02S03[SSL]", player)
+            or state.has("D03Z02S03[SSR]", player)
+            or state.has("BrokeJondoBellW", player)
+            and state.has("BrokeJondoBellE", player)
+            and (
+                state.has("D03Z02S03[W]", player)
+                and state.has("Dash Ability", player)
+                or state.has("D03Z02S03[E]", player)
+                or state.has("D03Z02S03[N]", player)
+                or state.has("D03Z02S03[SE2]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S03[SE]", player),
+        lambda state: (
+            state.has("D03Z02S03[SW]", player)
+            or state.has("D03Z02S03[SSL]", player)
+            or state.has("D03Z02S03[SSR]", player)
+            or state.has("BrokeJondoBellW", player)
+            and state.has("BrokeJondoBellE", player)
+            and (
+                state.has("D03Z02S03[W]", player)
+                and state.has("Dash Ability", player)
+                or state.has("D03Z02S03[E]", player)
+                or state.has("D03Z02S03[N]", player)
+                or state.has("D03Z02S03[SE2]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S03[SSL]", player),
+        lambda state: (
+            state.has("D03Z02S03[SW]", player)
+            or state.has("D03Z02S03[SE]", player)
+            or state.has("D03Z02S03[SSR]", player)
+            or state.has("BrokeJondoBellW", player)
+            and state.has("BrokeJondoBellE", player)
+            and (
+                state.has("D03Z02S03[W]", player)
+                and state.has("Dash Ability", player)
+                or state.has("D03Z02S03[E]", player)
+                or state.has("D03Z02S03[N]", player)
+                or state.has("D03Z02S03[SE2]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S03[SSC]", player),
+        lambda state: (
+            state.has("D03Z02S03[SW]", player)
+            or state.has("D03Z02S03[SE]", player)
+            or state.has("D03Z02S03[SSL]", player)
+            or state.has("D03Z02S03[SSR]", player)
+            or state.has("BrokeJondoBellW", player)
+            and state.has("BrokeJondoBellE", player)
+            and (
+                state.has("D03Z02S03[W]", player)
+                and state.has("Dash Ability", player)
+                or state.has("D03Z02S03[E]", player)
+                or state.has("D03Z02S03[N]", player)
+                or state.has("D03Z02S03[SE2]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S03[SSR]", player),
+        lambda state: (
+            state.has("D03Z02S03[SW]", player)
+            or state.has("D03Z02S03[SE]", player)
+            or state.has("D03Z02S03[SSL]", player)
+            or state.has("BrokeJondoBellW", player)
+            and state.has("BrokeJondoBellE", player)
+            and (
+                state.has("D03Z02S03[W]", player)
+                and state.has("Dash Ability", player)
+                or state.has("D03Z02S03[E]", player)
+                or state.has("D03Z02S03[N]", player)
+                or state.has("D03Z02S03[SE2]", player)
+            )
+        ))
+
+
+    # D03Z02S04 (Jondo)
+    # Items
+    set_rule(world.get_location("Jondo: Lower east under chargers", player),
+        lambda state: (
+            state.has("D03Z02S04[NE]", player)
+            or state.has("D03Z02S04[S]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D03Z02S04[NW]", player),
+        lambda state: state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player))
+    set_rule(world.get_entrance("D03Z02S04[NE]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            or (
+                state.has("D03Z02S04[S]", player)
+                and state.has("Purified Hand of the Nun", player)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S04[S]", player),
+        lambda state: (
+            state.has("D03Z02S04[NE]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+
+
+    # D03Z02S05 (Jondo)
+    # Items
+    set_rule(world.get_location("Jondo: Upper east Child of Moonlight", player),
+        lambda state: (
+            state.has("D03Z02S05[E]", player)
+            or state.has("D03Z02S05[S]", player)
+            or can_cross_gap(state, logic, player, 5)
+            or (
+                can_enemy_bounce(logic, enemy)
+                and can_cross_gap(state, logic, player, 3)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D03Z02S05[E]", player),
+        lambda state: (
+            state.has("D03Z02S05[S]", player)
+            or can_cross_gap(state, logic, player, 5)
+            or (
+                can_enemy_bounce(logic, enemy)
+                and can_cross_gap(state, logic, player, 3)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S05[S]", player),
+        lambda state: (
+            state.has("D03Z02S05[E]", player)
+            or can_cross_gap(state, logic, player, 5)
+            or (
+                can_enemy_bounce(logic, enemy)
+                and can_cross_gap(state, logic, player, 3)
+            )
+        ))
+    # Event
+    set_rule(world.get_location("BrokeJondoBellE", player),
+        lambda state: broke_jondo_bell_e(state, logic, enemy, player))
+
+
+    # D03Z02S07 (Jondo)
+    # Items
+    set_rule(world.get_location("Jondo: Lower west lift alcove", player),
+        lambda state: state.has("Dash Ability", player))
+    # No doors
+
+
+    # D03Z02S08 (Jondo)
+    # Items
+    set_rule(world.get_location("Jondo: Lower west bell alcove", player),
+        lambda state: (
+            state.has("D03Z02S08[N]", player)
+            or state.has("D03Z02S08[W]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D03Z02S08[W]", player),
+        lambda state: (
+            state.has("D03Z02S08[N]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D03Z02S08[N]", player),
+        lambda state: (
+            state.has("D03Z02S08[W]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+
+
+    # D03Z02S09 (Jondo)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z02S09[W]", player),
+        lambda state: state.has("Dash Ability", player))
+    set_rule(world.get_entrance("D03Z02S09[N]", player),
+        lambda state: (
+            state.has("D03Z02S09[S]", player)
+            or state.has("D03Z02S09[Cherubs]", player)
+            or state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D03Z02S09[S]", player),
+        lambda state: (
+            state.has("D03Z02S09[N]", player)
+            or state.has("D03Z02S09[Cherubs]", player)
+            or state.has("Dash Ability", player)
+        ))
+    # Event
+    set_rule(world.get_location("BrokeJondoBellW", player),
+        lambda state: broke_jondo_bell_w(state, player))
+
+
+    # D03Z02S10 (Jondo)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z02S10[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D03Z02S11 (Jondo)
+    # Items
+    set_rule(world.get_location("Jondo: Spike tunnel statue", player),
+        lambda state: (
+            state.has("Dash Ability", player)
+            and (
+                state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+                or state.has("D03Z02S11[E]", player)
+                and can_cross_gap(state, logic, player, 2)
+            )
+        ))
+    set_rule(world.get_location("Jondo: Spike tunnel Child of Moonlight", player),
+        lambda state: (
+            state.has("Dash Ability", player)
+            and (
+                state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+                or state.has("D03Z02S11[W]", player)
+                and (
+                    can_cross_gap(state, logic, player, 2)
+                    and can_enemy_bounce(logic, enemy)
+                    or can_cross_gap(state, logic, player, 3)
+                )
+                or state.has("D03Z02S11[E]", player)
+                and (
+                    can_cross_gap(state, logic, player, 1)
+                    or can_enemy_bounce(logic, enemy)
+                )
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D03Z02S11[W]", player),
+        lambda state: (
+            state.has("Dash Ability", player)
+            and (
+                state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+                or can_cross_gap(state, logic, player, 2)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z02S11[E]", player),
+        lambda state: (
+            state.has("Dash Ability", player)
+            and state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+
+    # D03Z02S13 (Jondo)
+    # Items
+    set_rule(world.get_location("Jondo: Upper west tree root", player),
+        lambda state: (
+            can_walk_on_root(state, player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D03Z02S13[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D03Z03S01 (Grievance Ascends)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z03S01[NL]", player),
+        lambda state: (
+            state.has("D03Z03S01[NR]", player)
+            or state.has("D03Z03S01[NC]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D03Z03S01[NR]", player),
+        lambda state: (
+            state.has("D03Z03S01[NL]", player)
+            or state.has("D03Z03S01[NC]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+
+
+    # D03Z03S02 (Grievance Ascends)
+    # Items
     set_rule(world.get_location("GA: Lower west ledge", player),
-        lambda state: state._blasphemous_miasma_relic(player))
+        lambda state: can_survive_poison(state, logic, player, 1))
+    # Doors
+    set_rule(world.get_entrance("D03Z03S02[W]", player),
+        lambda state: (
+            state.has("D03Z03S02[NE]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D03Z03S02[NE]", player),
+        lambda state: state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player))
+
+
+    # D03Z03S03 (Grievance Ascends)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z03S03[W]", player),
+        lambda state: state.has("D03Z03S03[NE]", player))
+    set_rule(world.get_entrance("D03Z03S03[NE]", player),
+        lambda state: state.has("D03Z03S03[W]", player))
+
+
+    # D03Z03S04 (Grievance Ascends)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z03S04[NW]", player),
+        lambda state: (
+            state.has("D03Z03S04[NE]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            and (
+                state.has("D03Z03S04[E]", player)
+                or state.has("D03Z03S04[SW]", player)
+                or state.has("Blood Perpetuated in Sand", player)
+                or can_cross_gap(state, logic, player, 10)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z03S04[NE]", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            and (
+                state.has("D03Z03S04[NW]", player)
+                or state.has("D03Z03S04[E]", player)
+                or state.has("D03Z03S04[SW]", player)
+                or state.has("Blood Perpetuated in Sand", player)
+                or can_cross_gap(state, logic, player, 10)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z03S04[E]", player),
+        lambda state: (
+            state.has("D03Z03S04[NW]", player)
+            or state.has("D03Z03S04[NE]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            and (
+                state.has("D03Z03S04[SW]", player)
+                or state.has("Blood Perpetuated in Sand", player)
+                or can_cross_gap(state, logic, player, 10)
+            )
+        ))
+    set_rule(world.get_entrance("D03Z03S04[SW]", player),
+        lambda state: (
+            state.has("D03Z03S04[NW]", player)
+            or state.has("D03Z03S04[NE]", player)
+            or state.has("D03Z03S04[E]", player)
+            or state.has("Blood Perpetuated in Sand", player)
+            or can_cross_gap(state, logic, player, 10)
+        ))
+    set_rule(world.get_entrance("D03Z03S04[SE]", player),
+        lambda state: state.has("Blood Perpetuated in Sand", player))
+    set_rule(world.get_entrance("D03Z03S04[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D03Z03S05 (Grievance Ascends)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z03S05[NW]", player),
+        lambda state: state.has("D03Z03S05[NE]", player))
+    set_rule(world.get_entrance("D03Z03S05[NE]", player),
+        lambda state: state.has("D03Z03S05[NW]", player))
+    set_rule(world.get_entrance("D03Z03S05[SW]", player),
+        lambda state: state.has("D03Z03S05[SE]", player) or \
+            state.has("Linen of Golden Thread", player))
+    set_rule(world.get_entrance("D03Z03S05[SE]", player),
+        lambda state: state.has("D03Z03S05[SW]", player) or \
+            state.has("Linen of Golden Thread", player))
+
+
+    # D03Z03S06 (Grievance Ascends)
+    # Items
     set_rule(world.get_location("GA: Miasma room floor", player),
-        lambda state: state._blasphemous_miasma_relic(player))
-    set_rule(world.get_location("GA: Oil of the Pilgrims", player),
-        lambda state: state._blasphemous_blood_relic(player))
+        lambda state: can_survive_poison(state, logic, player, 1))
+    set_rule(world.get_location("GA: Miasma room treasure", player),
+        lambda state: state.has("Wall Climb Ability", player))
+    set_rule(world.get_location("GA: Miasma room Child of Moonlight", player),
+        lambda state: state.has("Wall Climb Ability", player))
+    # No doors
+
+
+    # D03Z03S07 (Grievance Ascends)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D03Z03S07[NW]", player),
+        lambda state: (
+            state.has("D03Z03S07[NE]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D03Z03S07[NE]", player),
+        lambda state: (
+            state.has("D03Z03S07[NE]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+
+
+    # D03Z03S08 (Grievance Ascends)
+    # Items
     set_rule(world.get_location("GA: End of blood bridge", player),
-        lambda state: state._blasphemous_blood_relic(player))
+        lambda state: (
+            state.has("Blood Perpetuated in Sand", player)
+            or can_cross_gap(state, logic, player, 11)
+        ))
     set_rule(world.get_location("GA: Blood bridge Child of Moonlight", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            ((state._blasphemous_aubade(player) and \
-                state._blasphemous_ranged(player)) or \
-                    state._blasphemous_cherub_21(player)))
+        lambda state: (
+            (
+                state.has("Blood Perpetuated in Sand", player)
+                or can_cross_gap(state, logic, player, 11)
+            )
+            and (
+                state.has_any({"Purified Hand of the Nun", "Cante Jondo of the Three Sisters", "Verdiales of the Forsaken Hamlet"}, player)
+                or pillar(state, player)
+                or tirana(state, player)
+                or aubade(state, player)
+                and can_air_stall(state, logic, player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D03Z03S08[-CherubsL]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+    set_rule(world.get_entrance("D03Z03S08[-CherubsR]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D03Z03S09 (Grievance Ascends)
+    # Items
     set_rule(world.get_location("GA: Lower east Child of Moonlight", player),
-        lambda state: state._blasphemous_root_relic(player) or \
-            state._blasphemous_cherub_20(player))
+        lambda state: (
+            can_climb_on_root(state, player)
+            or state.has_any({"Purified Hand of the Nun", "Lorquiana", "Zarabanda of the Safe Haven", "Cante Jondo of the Three Sisters"}, player)
+            or pillar(state, player)
+            or aubade(state, player)
+            or tirana(state, player)
+        ))
+    # No doors
+
+
+    # D03Z03S10 (Grievance Ascends)
+    # Items
     set_rule(world.get_location("GA: Altasgracias' gift", player),
-        lambda state: state._blasphemous_altasgracias_3(player))
+        lambda state: state.has_group("egg", player, 3))
     set_rule(world.get_location("GA: Empty giant egg", player),
-        lambda state: state._blasphemous_altasgracias_3(player) and \
-            state._blasphemous_egg(player))
+        lambda state: (
+            state.has_group("egg", player, 3)
+            and state.has("Hatched Egg of Deformity", player)
+            and (
+                state.has("D01Z02S01[W]", player)
+                or state.has("D01Z02S01[E]", player)
+            )
+        ))
+    # No doors
 
-    # Hall of the Dawning
-    set_rule(world.get_location("HotD: Laudes, the First of the Amanecidas", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            state._blasphemous_laudes_gate(player))
 
-    # Jondo
-    set_rule(world.get_location("Jondo: Upper east chest", player),
-        lambda state: state._blasphemous_fall_relic(player) or \
-            state._blasphemous_root_relic(player))
-    set_rule(world.get_location("Jondo: Upper west tree root", player),
-        lambda state: state._blasphemous_root_relic(player) or \
-            state._blasphemous_dawn_heart(player))
+    # D03Z03S15 (Grievance Ascends)
+    # Items
+    set_rule(world.get_location("GA: Tres Angustias", player),
+        lambda state: can_beat_boss(state, "Grievance", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D03Z03S15[W]", player),
+        lambda state: can_beat_boss(state, "Grievance", logic, player))
+    set_rule(world.get_entrance("D03Z03S15[E]", player),
+        lambda state: can_beat_boss(state, "Grievance", logic, player))
+
+
+    # D04Z01S01 (Patio of the Silent Steps)
+    # Items
+    set_rule(world.get_location("PotSS: First area ledge", player),
+        lambda state: (
+            state.has("D04Z01S01[NE]", player)
+            or state.has("D04Z01S01[N]", player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D04Z01S01[NE]", player),
+        lambda state: (
+            state.has("D04Z01S01[N]", player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    set_rule(world.get_entrance("D04Z01S01[N]", player),
+        lambda state: (
+            state.has("D04Z01S01[NE]", player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+
+
+    # D04Z01S02 (Patio of the Silent Steps)
+    # Items
+    set_rule(world.get_location("PotSS: Second area ledge", player),
+        lambda state: (
+            can_climb_on_root(state, player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    # No doors
 
-    # Knot of the Three Words
+
+    # D04Z01S03 (Patio of the Silent Steps)
+    # Items
+    set_rule(world.get_location("PotSS: Third area upper ledge", player),
+        lambda state: (
+            can_walk_on_root(state, player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    # No doors
+
+
+    # D04Z01S04 (Patio of the Silent Steps)
+    # Items
+    set_rule(world.get_location("PotSS: 4th meeting with Redento", player),
+        lambda state: redento(state, blasphemousworld, player, 4))
+    # No doors
+
+
+    # D04Z01S05 (Patio of the Silent Steps)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D04Z01S05[N]", player),
+        lambda state: (
+            (
+                state.has("Blood Perpetuated in Sand", player)
+                and can_climb_on_root(state, player)
+            )
+            or state.has("Purified Hand of the Nun", player)
+            and (
+                state.has("Blood Perpetuated in Sand", player)
+                or can_climb_on_root(state, player)
+            )
+        ))
+    set_rule(world.get_entrance("D04Z01S05[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D04Z01S06 (Patio of the Silent Steps)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D04Z01S06[E]", player),
+        lambda state: state.has("Purified Hand of the Nun", player))
+    set_rule(world.get_entrance("D04Z01S06[Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D04Z02S01 (Mother of Mothers)
+    # Items
+    if world.purified_hand[player]:
+        set_rule(world.get_location("MoM: Western room ledge", player),
+            lambda state: (
+                state.has("D04Z02S01[N]", player)
+                or state.has("D04Z02S01[NE]", player)
+                and state.has("Dash Ability", player)
+                and state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            ))
+    set_rule(world.get_location("MoM: Lower west Child of Moonlight", player),
+        lambda state: (
+            state.has("D04Z02S01[N]", player)
+            or pillar(state, player)
+            or state.has("D04Z02S01[NE]", player)
+            and state.has("Dash Ability", player)
+            and (
+                state.has("Wall Climb Ability", player)
+                or can_cross_gap(state, logic, player, 1)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D04Z02S01[N]", player),
+        lambda state: (
+            state.has("D04Z02S04[NE]", player)
+            and state.has("Dash Ability", player)
+            and state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D04Z02S01[NE]", player),
+        lambda state: (
+            state.has("D04Z02S01[N]", player)
+            or state.has("Dash Ability", player)
+            and can_cross_gap(state, logic, player, 1)
+        ))
+
+
+    # D04Z02S02 (Mother of Mothers)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D04Z02S02[NE]", player),
+        lambda state: (
+            (
+                state.has("Purified Hand of the Nun", player)
+                and upwarp_skips_allowed(logic)
+            )
+            or (
+                state.has("Purified Hand of the Nun", player)
+                and can_enemy_upslash(state, logic, enemy, player)
+            )
+            or (
+                can_enemy_upslash(state, logic, enemy, player)
+                and upwarp_skips_allowed(logic)
+                and (
+                    state.has("Wall Climb Ability", player)
+                    or state.has("D04Z02S02[N]", player)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D04Z02S02[N]", player),
+        lambda state: (
+            state.has("D04Z02S02[NE]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+
+
+    # D04Z02S04 (Mother of Mothers)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D04Z02S04[NW]", player),
+        lambda state: (
+            state.has("D04Z02S04[NE]", player)
+            or state.has("D04Z02S04[N]", player)
+            or state.has("D04Z02S04[Cherubs]", player)
+            or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D04Z02S04[NE]", player),
+        lambda state: (
+            state.has("D04Z02S04[NW]", player)
+            or state.has("D04Z02S04[N]", player)
+            or state.has("D04Z02S04[Cherubs]", player)
+            or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D04Z02S04[N]", player),
+        lambda state: (
+            (
+                state.has("D04Z02S04[NW]", player)
+                or state.has("D04Z02S04[NE]", player)
+                or state.has("D04Z02S04[Cherubs]", player)
+                or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+            )
+            and state.has("OpenedMOMLadder", player)
+        ))
+
+
+    # D04Z02S06 (Mother of Mothers)
+    # Items
+    set_rule(world.get_location("MoM: Outside Cleofas' room", player),
+        lambda state: (
+            state.has("D04Z02S06[NW]", player)
+            or state.has("D04Z02S06[N]", player)
+            or state.has("D04Z02S06[NE]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D04Z02S06[NW]", player),
+        lambda state: (
+            state.has("D04Z02S06[N]", player)
+            or state.has("D04Z02S06[NE]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D04Z02S06[N]", player),
+        lambda state: (
+            (
+                state.has("D04Z02S06[NW]", player)
+                or state.has("D04Z02S06[NE]", player)
+                or state.has("Wall Climb Ability", player)
+            )
+            and state.has("OpenedARLadder", player)
+        ))
+    set_rule(world.get_entrance("D04Z02S06[NE]", player),
+        lambda state: (
+            state.has("D04Z02S06[NW]", player)
+            or state.has("D04Z02S06[N]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D04Z02S06[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+    # Event
+    set_rule(world.get_location("OpenedMOMLadder", player),
+        lambda state: opened_mom_ladder(state, player))
+
+
+    # D04Z02S07 (Mother of Mothers)
+    # Items
+    set_rule(world.get_location("MoM: East chandelier platform", player),
+        lambda state: (
+            state.has("Blood Perpetuated in Sand", player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+    # No doors
+
+
+    # D04Z02S09 (Mother of Mothers)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D04Z02S09[NE]", player),
+        lambda state: state.has("Blood Perpetuated in Sand", player))
+
+
+    # D04Z02S16 (Mother of Mothers)
+    # Items
+    set_rule(world.get_location("MoM: Giant chandelier statue", player),
+        lambda state: (
+            state.has("Wall Climb Ability", player)
+            and state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D04Z02S16[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D04Z02S20 (Mother of Mothers)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D04Z02S20[Redento]", player),
+        lambda state: redento(state, blasphemousworld, player, 5))
+
+
+    # D04Z02S21 (Mother of Mothers)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D04Z02S21[W]", player),
+        lambda state: (
+            state.has("D04Z02S21[NE]", player)
+            or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)
+        ))
+    set_rule(world.get_entrance("D04Z02S21[NE]", player),
+        lambda state: state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player))
+
+
+    # D04Z02S22 (Mother of Mothers)
+    # Items
+    set_rule(world.get_location("MoM: Melquiades, The Exhumed Archbishop", player),
+        lambda state: can_beat_boss(state, "Mothers", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D04Z02S22[W]", player),
+        lambda state: can_beat_boss(state, "Mothers", logic, player))
+    set_rule(world.get_entrance("D04Z02S22[E]", player),
+        lambda state: can_beat_boss(state, "Mothers", logic, player))
+
+
+    # D04BZ02S01 (Mother of Mothers - Redento)
+    # Items
+    set_rule(world.get_location("MoM: Final meeting with Redento", player),
+        lambda state: redento(state, blasphemousworld, player, 5))
+    # No doors
+
+
+    # D04Z03S02 (Knot of the Three Words)
+    # Items
     set_rule(world.get_location("KotTW: Gift from the Traitor", player),
-        lambda state: state._blasphemous_wood_key(player) and \
-            state._blasphemous_eyes(player))
-    
-    # Library of the Negated Words
-    set_rule(world.get_location("LotNW: Root ceiling platform", player),
-        lambda state: state._blasphemous_root_relic(player))
-    # to do: requires dive (sometimes opens with other skills?)
+        lambda state: state.has_all({"Severed Right Eye of the Traitor", "Broken Left Eye of the Traitor"}, player))
+    # No doors
+
+
+    # D04Z04S01 (All the Tears of the Sea)
+    # Items
+    set_rule(world.get_location("AtTotS: Miriam's gift", player),
+        lambda state: (
+            miriam(state, player)
+            and state.has("Dash Ability", player)
+            and state.has("Wall Climb Ability", player)
+        ))
+    # No doors
+
+
+    # D05Z01S03 (Library of the Negated Words)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D05Z01S03[Frontal]", player),
+        lambda state: (
+            state.has("Key Grown from Twisted Wood", player)
+            and state.has("D05Z01S23[E]", player)
+            and (
+                state.has("D05Z01S11[NW]", player)
+                or state.has("D05Z01S11[NE]", player)
+            )
+        ))
+
+
+    # D05Z01S05 (Library of the Negated Words)
+    # Items
     set_rule(world.get_location("LotNW: Hidden floor", player),
-        lambda state: state._blasphemous_open_holes(player))
+        lambda state: can_break_holes(state, player))
+    set_rule(world.get_location("LotNW: Root ceiling platform", player),
+        lambda state: (
+            (
+                can_climb_on_root(state, player)
+                or state.has("Purified Hand of the Nun", player)
+            )
+            and (
+                state.has("D05Z01S05[NE]", player)
+                or state.has("Blood Perpetuated in Sand", player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D05Z01S05[NE]", player),
+        lambda state: state.has("Blood Perpetuated in Sand", player))
+
+
+    # D05Z01S06 (Library of the Negated Words)
+    # Items
     set_rule(world.get_location("LotNW: Miasma hallway chest", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_root_relic(player) and \
-                state._blasphemous_miasma_relic(player))
+        lambda state: (
+            state.has("D05Z01S06[W]", player)
+            or can_survive_poison(state, logic, player, 3)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D05Z01S06[W]", player),
+        lambda state: can_survive_poison(state, logic, player, 3))
+    set_rule(world.get_entrance("D05Z01S06[E]", player),
+        lambda state: can_survive_poison(state, logic, player, 3))
+
+
+    # D05Z01S07 (Library of the Negated Words)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D05Z01S07[NW]", player),
+        lambda state: (
+            state.has("Blood Perpetuated in Sand", player)
+            and (
+                can_climb_on_root(state, player)
+                or state.has("Purified Hand of the Nun", player)
+            )
+            or (
+                can_climb_on_root(state, player)
+                and can_cross_gap(state, logic, player, 3)
+            )
+            or can_cross_gap(state, logic, player, 7)
+        ))
+
+
+    # D05Z01S10 (Library of the Negated Words)
+    # Items
     set_rule(world.get_location("LotNW: Platform puzzle chest", player),
-        lambda state: state._blasphemous_blood_relic(player))
+        lambda state: (
+            state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player)
+            or can_enemy_bounce(logic, enemy)
+            and can_cross_gap(state, logic, player, 2)
+        ))
+    # No doors
+
+
+    # D05Z01S11 (Library of the Negated Words)
+    # Items
+    set_rule(world.get_location("LotNW: Silence for Diosdado", player),
+        lambda state: (
+            (
+                state.has("D05Z01S11[NW]", player)
+                or state.has("D05Z01S11[NE]", player)
+            )
+            and state.has("D05Z01S23[E]", player)
+        ))
+    set_rule(world.get_location("LotNW: Lowest west upper ledge", player),
+        lambda state: (
+            state.has("D05Z01S11[NW]", player)
+            or state.has("D05Z01S11[NE]", player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D05Z01S11[SW]", player),
+        lambda state: can_break_tirana(state, logic, player))
+    set_rule(world.get_entrance("D05Z01S11[NW]", player),
+        lambda state: state.has("D05Z01S11[NE]", player))
+    set_rule(world.get_entrance("D05Z01S11[NE]", player),
+        lambda state: state.has("D05Z01S11[NW]", player))
+
+
+    # D05Z01S21 (Library of the Negated Words)
+    # Items
     set_rule(world.get_location("LotNW: Elevator Child of Moonlight", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_root_relic(player))
-    set_rule(world.get_location("LotNW: Red candle", player),
-        lambda state: state._blasphemous_red_wax(player))
-    set_rule(world.get_location("LotNW: Twisted wood hidden wall", player),
-        lambda state: state._blasphemous_wood_key(player))
-
-    # Mercy Dreams
-    set_rule(world.get_location("MD: Blue candle", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            state._blasphemous_blue_wax(player))
-    set_rule(world.get_location("MD: Cave Child of Moonlight", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            state._blasphemous_cherub_24_33(player))
-    set_rule(world.get_location("MD: Behind gate to TSC", player),
-        lambda state: state._blasphemous_bridge_access(player))
-    
-    # Mother of Mothers
-    set_rule(world.get_location("MoM: East chandelier platform", player),
-        lambda state: state._blasphemous_blood_relic(player) or \
-            state._blasphemous_dawn_heart(player))
-    set_rule(world.get_location("MoM: Redento's treasure", player),
-        lambda state: state._blasphemous_redento(player))
-    set_rule(world.get_location("MoM: Final meeting with Redento", player),
-        lambda state: state._blasphemous_redento(player))
-    set_rule(world.get_location("MoM: Giant chandelier statue", player),
-        lambda state: state._blasphemous_blood_relic(player))
+        lambda state: (
+            state.has("Zarabanda of the Safe Haven", player)
+            or state.has("Blood Perpetuated in Sand", player)
+            and (
+                can_walk_on_root(state, player)
+                or state.has("Purified Hand of the Nun", player)
+                or can_cross_gap(state, logic, player, 5)
+                and pillar(state, player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D05Z01S21[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
 
-    # Mountains of the Endless Dusk
-    set_rule(world.get_location("MotED: Platform above chasm", player),
-        lambda state: state._blasphemous_blood_relic(player))
-    set_rule(world.get_location("MotED: Blood platform alcove", player),
-        lambda state: state._blasphemous_blood_relic(player))
-    set_rule(world.get_location("MotED: Egg hatching", player),
-        lambda state: state._blasphemous_pre_egg(player))
-    # to do: requires dive
-    set_rule(world.get_location("MotED: Amanecida of the Golden Blades", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_open_holes(player))
-    
-    # Mourning and Havoc
-    set_rule(world.get_location("MaH: Upper east chest", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            state._blasphemous_root_relic(player))
-    set_rule(world.get_location("MaH: Sierpes' eye", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            (state._blasphemous_root_relic(player) or \
-                state._blasphemous_water_relic(player) or \
-                    state._blasphemous_dawn_heart(player)))
-    set_rule(world.get_location("MaH: Sierpes", player),
-        lambda state: state._blasphemous_bridge_access(player) and \
-            (state._blasphemous_root_relic(player) or \
-                state._blasphemous_water_relic(player) or \
-                    state._blasphemous_dawn_heart(player)))
 
-    # Patio of the Silent Steps
-    set_rule(world.get_location("PotSS: Second area ledge", player),
-        lambda state: state._blasphemous_root_relic(player) or \
-            state._blasphemous_dawn_heart(player))
-    set_rule(world.get_location("PotSS: Third area upper ledge", player),
-        lambda state: state._blasphemous_root_relic(player) or \
-            state._blasphemous_dawn_heart(player))
-    set_rule(world.get_location("PotSS: Climb to WotHP", player),
-        lambda state: (state._blasphemous_blood_relic(player) and \
-            state._blasphemous_root_relic(player)) or \
-                (state.can_reach(world.get_region("Wall of the Holy Prohibitions", player)) and \
-                    state._blasphemous_bronze_key(player)))
-    # to do: requires dive
-    set_rule(world.get_location("PotSS: Amanecida of the Chiselled Steel", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_open_holes(player))
-    
-    # Petrous
-    # to do: requires dive
-    set_rule(world.get_location("Petrous: Temple entrance", player),
-        lambda state: state._blasphemous_open_holes(player))
-
-    # The Sleeping Canvases
-    set_rule(world.get_location("TSC: Candle wax puzzle", player),
-        lambda state: state._blasphemous_both_wax(player))
-    set_rule(world.get_location("TSC: Under elevator shaft", player),
-        lambda state: state._blasphemous_fall_relic(player))
+    # D05Z02S06 (The Sleeping Canvases)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D05Z02S06[SE]", player),
+        lambda state: state.has("OpenedTSCGate", player))
+
+
+    # D05Z02S09 (The Sleeping Canvases)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D05Z02S09[E]", player),
+        lambda state: (
+            state.has("Bead of Red Wax", player, 3)
+            and state.has("Bead of Blue Wax", player, 3)
+        ))
+
+
+    # D05Z02S10 (The Sleeping Canvases)
+    # Items
     set_rule(world.get_location("TSC: Jocinero's 1st reward", player),
-        lambda state: state._blasphemous_cherubs_20(player))
+        lambda state: state.has("Child of Moonlight", player, 20))
     set_rule(world.get_location("TSC: Jocinero's final reward", player),
-        lambda state: state._blasphemous_cherubs_all(player))
+        lambda state: state.has("Child of Moonlight", player, 38))
+    # Doors
+    set_rule(world.get_entrance("D05Z02S10[W]", player),
+        lambda state: state.has("Dash Ability", player))
     
-    # The Holy Line
-    set_rule(world.get_location("THL: Across blood platforms", player),
-        lambda state: state._blasphemous_blood_relic(player))
-    set_rule(world.get_location("THL: Underground chest", player),
-        lambda state: state._blasphemous_blood_relic(player) and \
-            state._blasphemous_water_relic(player))
+
+    # D05Z02S11 (The Sleeping Canvases)
+    # Event
+    set_rule(world.get_location("OpenedTSCGate", player),
+        lambda state: opened_tsc_gate(state, player))
+
+
+    # D05Z02S13 (The Sleeping Canvases)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D05Z02S13[E]", player),
+        lambda state: state.has("Dash Ability", player))
+
+
+    # D05Z02S14 (The Sleeping Canvases)
+    # Items
+    set_rule(world.get_location("TSC: Exposito, Scion of Abjuration", player),
+        lambda state: can_beat_boss(state, "Canvases", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D05Z02S14[W]", player),
+        lambda state: can_beat_boss(state, "Canvases", logic, player))
+    set_rule(world.get_entrance("D05Z02S14[E]", player),
+        lambda state: can_beat_boss(state, "Canvases", logic, player))
+
+
+    # D05Z02S15 (The Sleeping Canvases)
+    # Items
+    set_rule(world.get_location("TSC: Swinging blade tunnel", player),
+        lambda state: state.has("Dash Ability", player))
+    # No doors
+
+
+    # D06Z01S01 (Archcathedral Rooftops)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D06Z01S01[SW]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S01[SE]", player)
+                or state.has("D06Z01S01[W]", player)
+                or state.has("D06Z01S01[E]", player)
+                or state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[NNE]", player)
+                or state.has("D06Z01S01[N]", player)
+            )
+            or state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S01[NW]", player)
+                or state.has("D06Z01S01[NE]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[SE]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S01[SW]", player)
+                or state.has("D06Z01S01[W]", player)
+                or state.has("D06Z01S01[E]", player)
+                or state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[NNE]", player)
+                or state.has("D06Z01S01[N]", player)
+            )
+            or state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S01[NW]", player)
+                or state.has("D06Z01S01[NE]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[W]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S01[E]", player)
+                or state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[NNE]", player)
+                or state.has("D06Z01S01[N]", player)
+            )
+            or state.has_group("masks", player, 1)
+            and (
+                state.has("D06Z01S01[SW]", player)
+                or state.has("D06Z01S01[SE]", player)
+            )
+            or state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S01[NW]", player)
+                or state.has("D06Z01S01[NE]", player)
+                and (
+                    can_walk_on_root(state, player)
+                    or can_cross_gap(state, logic, player, 1)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[E]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S01[W]", player)
+                or state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[NNE]", player)
+                or state.has("D06Z01S01[N]", player)
+            )
+            or state.has_group("masks", player, 1)
+            and (
+                state.has("D06Z01S01[SW]", player)
+                or state.has("D06Z01S01[SE]", player)
+            )
+            or state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S01[NW]", player)
+                or state.has("D06Z01S01[NE]", player)
+                and (
+                    can_walk_on_root(state, player)
+                    or can_cross_gap(state, logic, player, 1)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[NW]", player),
+        lambda state: (
+            state.has("D06Z01S01[NE]", player)
+            and (
+                can_walk_on_root(state, player)
+                or can_cross_gap(state, logic, player, 8)
+            )
+            or state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[NNE]", player)
+                and (
+                    can_walk_on_root(state, player)
+                    or can_cross_gap(state, logic, player, 3)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[NE]", player),
+        lambda state: (
+            state.has("D06Z01S01[NW]", player)
+            or (
+                can_walk_on_root(state, player)
+                or can_cross_gap(state, logic, player, 8)
+            )
+            or state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[NNE]", player)
+                and (
+                    can_walk_on_root(state, player)
+                    or can_cross_gap(state, logic, player, 3)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[NNW]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S01[NNE]", player)
+                or state.has("D06Z01S01[N]", player)
+            )
+            or state.has_group("masks", player, 2)
+            and (
+                state.has("D06Z01S01[SW]", player)
+                or state.has("D06Z01S01[SE]", player)
+                or state.has("D06Z01S01[W]", player)
+                or state.has("D06Z01S01[E]", player)
+                or state.has("Linen of Golden Thread", player)
+                and (
+                    state.has("D06Z01S01[NW]", player)
+                    or state.has("D06Z01S01[NE]", player)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[NNE]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[N]", player)
+            )
+            or state.has_group("masks", player, 2)
+            and (
+                state.has("D06Z01S01[SW]", player)
+                or state.has("D06Z01S01[SE]", player)
+                or state.has("D06Z01S01[W]", player)
+                or state.has("D06Z01S01[E]", player)
+                or state.has("Linen of Golden Thread", player)
+                and (
+                    state.has("D06Z01S01[NW]", player)
+                    or state.has("D06Z01S01[NE]", player)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[N]", player),
+        lambda state: (
+            state.has_group("masks", player, 3)
+            and (
+                state.has("D06Z01S01[SW]", player)
+                or state.has("D06Z01S01[SE]", player)
+                or state.has("D06Z01S01[W]", player)
+                or state.has("D06Z01S01[E]", player)
+                or state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[NNE]", player)
+                or state.has("Linen of Golden Thread", player)
+                and (
+                    state.has("D06Z01S01[NW]", player)
+                    or state.has("D06Z01S01[NE]", player)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S01[-Cherubs]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S01[SW]", player)
+                or state.has("D06Z01S01[SE]", player)
+                or state.has("D06Z01S01[W]", player)
+                or state.has("D06Z01S01[E]", player)
+                or state.has("D06Z01S01[NW]", player)
+                or state.has("D06Z01S01[NE]", player)
+                or state.has("D06Z01S01[NNW]", player)
+                or state.has("D06Z01S01[NNE]", player))
+        ))
+
+
+    # D06Z01S03 (Archcathedral Rooftops)
+    # Items
+    set_rule(world.get_location("AR: First soldier fight", player),
+        lambda state: can_beat_boss(state, "Legionary", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D06Z01S03[W]", player),
+        lambda state: can_beat_boss(state, "Legionary", logic, player))
+    set_rule(world.get_entrance("D06Z01S03[E]", player),
+        lambda state: can_beat_boss(state, "Legionary", logic, player))
+
+
+    # D06Z01S04 (Archcathedral Rooftops)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D06Z01S04[SW]", player),
+        lambda state: (
+            state.has("D06Z01S04[W]", player)
+            or state.has("D06Z01S04[Health]", player)
+        ))
+    set_rule(world.get_entrance("D06Z01S04[W]", player),
+        lambda state: (
+            state.has("D06Z01S04[SW]", player)
+            or state.has("D06Z01S04[Health]", player)
+        ))
+    set_rule(world.get_entrance("D06Z01S04[Health]", player),
+        lambda state: (
+            state.has("D06Z01S04[SW]", player)
+            or state.has("D06Z01S04[W]", player)
+        ))
+    add_rule(world.get_entrance("D06Z01S04[Health]", player),
+        lambda state: (
+            (
+                state.has("Wall Climb Ability", player)
+                and can_survive_poison(state, logic, player, 2)
+                and (
+                    state.has("Purified Hand of the Nun", player)
+                    or (
+                        state.has("Blood Perpetuated in Sand", player)
+                        and can_climb_on_root(state, player)
+                    )
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S04[NW]", player),
+        lambda state: (
+            state.has("D06Z01S04[NE]", player)
+            or state.has("D06Z01S04[Cherubs]", player)
+        ))
+    add_rule(world.get_entrance("D06Z01S04[NW]", player),
+        lambda state: (
+            state.has("D06Z01S04[Cherubs]", player)
+            or (
+                state.has("D06Z01S04[SW]", player)
+                or state.has("D06Z01S04[W]", player)
+                or state.has("D06Z01S04[Health]", player)
+            )
+            and state.has("Wall Climb Ability", player)
+            and can_survive_poison(state, logic, player, 2)
+            and (
+                state.has_any({"Dash Ability", "Purified Hand of the Nun"}, player)
+                and (
+                    can_dawn_jump(state, logic, player)
+                    or can_climb_on_root(state, player)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S04[NE]", player),
+        lambda state: (
+            state.has("D06Z01S04[NW]", player)
+            or state.has("D06Z01S04[Cherubs]", player)
+        ))
+    add_rule(world.get_entrance("D06Z01S04[NE]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S04[SW]", player)
+                or state.has("D06Z01S04[W]", player)
+                or state.has("D06Z01S04[Health]", player)
+            )
+            and state.has("Wall Climb Ability", player)
+            and can_survive_poison(state, logic, player, 2)
+            and (
+                state.has_any({"Dash Ability", "Purified Hand of the Nun"}, player)
+                and (
+                    can_dawn_jump(state, logic, player)
+                    or can_climb_on_root(state, player)
+                )
+            )
+        ))
+
+
+    # D06Z01S06 (Archcathedral Rooftops)
+    # Items
+    set_rule(world.get_location("AR: Second soldier fight", player),
+        lambda state: (
+            can_beat_boss(state, "Legionary", logic, player)
+            and (
+                state.has("D06Z01S06[WW]", player)
+                or state.has("D06Z01S06[E]", player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D06Z01S06[WW]", player),
+        lambda state: state.has("D06Z01S06[E]", player))
+    add_rule(world.get_entrance("D06Z01S06[WW]", player),
+        lambda state: can_beat_boss(state, "Legionary", logic, player))
+    set_rule(world.get_entrance("D06Z01S06[E]", player),
+        lambda state: state.has("D06Z01S06[WW]", player))
+    add_rule(world.get_entrance("D06Z01S06[E]", player),
+        lambda state: can_beat_boss(state, "Legionary", logic, player))
+    set_rule(world.get_entrance("D06Z01S06[W]", player),
+        lambda state: state.has("D06Z01S06[EE]", player))
+    set_rule(world.get_entrance("D06Z01S06[EE]", player),
+        lambda state: state.has("D06Z01S06[W]", player))
+
+
+    # D06Z01S08 (Archcathedral Rooftops)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D06Z01S08[E]", player),
+        lambda state: state.has("D06Z01S08[N]", player) or \
+            state.has("Wall Climb Ability", player))
+
+
+    # D06Z01S09 (Archcathedral Rooftops)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D06Z01S09[-CherubsL]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+    set_rule(world.get_entrance("D06Z01S09[-CherubsR]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D06Z01S10 (Archcathedral Rooftops)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D06Z01S10[-CherubsL]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+    set_rule(world.get_entrance("D06Z01S10[-CherubsR]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D06Z01S12 (Archcathedral Rooftops)
+    # Items
+    set_rule(world.get_location("AR: Upper west shaft ledge", player),
+        lambda state: (
+            state.has("D06Z01S12[NW]", player)
+            or state.has("D06Z01S12[NE]", player)
+            or state.has("D06Z01S12[NE2]", player)
+            or state.has("D06Z01S12[W]", player)
+            or state.has("D06Z01S12[E]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_location("AR: Upper west shaft chest", player),
+        lambda state: (
+            state.has("D06Z01S12[NE2]", player)
+            or (
+                state.has("D06Z01S12[NW]", player)
+                or state.has("D06Z01S12[NE]", player)
+            )
+            and state.has("Purified Hand of the Nun", player)
+        ))
+    set_rule(world.get_location("AR: Upper west shaft Child of Moonlight", player),
+        lambda state: (
+            state.has("D06Z01S12[W]", player)
+            or state.has("D06Z01S12[E]", player)
+            or state.has("D06Z01S12[NW]", player)
+            or state.has("D06Z01S12[NE]", player)
+            or state.has("D06Z01S12[NE2]", player)
+            or state.has("Wall Climb Ability", player)
+            and state.has_any({"Purified Hand of the Nun", "Taranto to my Sister"}, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D06Z01S12[W]", player),
+        lambda state: (
+            state.has("D06Z01S12[NW]", player)
+            or state.has("D06Z01S12[NE]", player)
+            or state.has("D06Z01S12[NE2]", player)
+            or state.has("D06Z01S12[E]", player)
+            or state.has_all({"Wall Climb Ability", "Purified Hand of the Nun"}, player)
+        ))
+    set_rule(world.get_entrance("D06Z01S12[E]", player),
+        lambda state: (
+            state.has("D06Z01S12[NW]", player)
+            or state.has("D06Z01S12[NE]", player)
+            or state.has("D06Z01S12[NE2]", player)
+            or state.has("D06Z01S12[W]", player)
+            or state.has_all({"Wall Climb Ability", "Purified Hand of the Nun"}, player)
+        ))
+    set_rule(world.get_entrance("D06Z01S12[NW]", player),
+        lambda state: (
+            state.has("D06Z01S12[NE]", player)
+            or state.has("D06Z01S12[NE2]", player)
+        ))
+    add_rule(world.get_entrance("D06Z01S12[NW]", player),
+        lambda state: (
+            state.has("D06Z01S12[NE]", player)
+            or state.has_any({"Wall Climb Ability", "Purified Hand of the Nun"}, player)
+        ))
+    set_rule(world.get_entrance("D06Z01S12[NE]", player),
+        lambda state: (
+            state.has("D06Z01S12[NW]", player)
+            or state.has("D06Z01S12[NE2]", player)
+        ))
+    add_rule(world.get_entrance("D06Z01S12[NE]", player),
+        lambda state: (
+            state.has("D06Z01S12[NW]", player)
+            or state.has_any({"Wall Climb Ability", "Purified Hand of the Nun"}, player)
+        ))
+
+
+    # D06Z01S15 (Archcathedral Rooftops)
+    # Items
+    set_rule(world.get_location("AR: Upper east shaft ledge", player),
+        lambda state: (
+            state.has("D06Z01S15[SW]", player)
+            and state.has("Wall Climb Ability", player)
+            and (
+                can_cross_gap(state, logic, player, 10)
+                or can_climb_on_root(state, player)
+                and (
+                    state.has("Blood Perpetuated in Sand", player)
+                    or state.has("Purified Hand of the Nun", player)
+                    and can_air_stall(state, logic, player)
+                )
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D06Z01S15[NW]", player),
+        lambda state: state.has("D06Z01S15[NE]", player))
+    add_rule(world.get_entrance("D06Z01S15[NW]", player),
+        lambda state: (
+            state.has("D06Z01S15[SW]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+    set_rule(world.get_entrance("D06Z01S15[NE]", player),
+        lambda state: state.has("D06Z01S15[NW]", player))
+    add_rule(world.get_entrance("D06Z01S15[NE]", player),
+        lambda state: (
+            state.has("D06Z01S15[SW]", player)
+            or state.has("Wall Climb Ability", player)
+        ))
+
+
+    # D06Z01S16 (Archcathedral Rooftops)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D06Z01S16[W]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S16[CherubsL]", player)
+                and (
+                    state.has("Purified Hand of the Nun", player)
+                    or state.has("Wall Climb Ability", player)
+                    and (
+                        can_walk_on_root(state, player)
+                        or can_air_stall(state, logic, player)
+                    )
+                )
+            )
+            or (
+                state.has("D06Z01S16[CherubsR]", player)
+                and (
+                    state.has("Purified Hand of the Nun", player)
+                    or can_air_stall(state, logic, player)
+                    and (
+                        can_walk_on_root(state, player)
+                        or state.has("The Young Mason's Wheel", player)
+                    )
+                    and (
+                        state.has("Wall Climb Ability", player)
+                        or can_dawn_jump(state, logic, player)
+                    )
+                )
+            )
+            or (
+                state.has("D06Z01S16[E]", player)
+                and (
+                    can_walk_on_root(state, player)
+                    or can_cross_gap(state, logic, player, 7)
+                )
+                and (
+                    state.has("Wall Climb Ability", player) or 
+                    can_cross_gap(state, logic, player, 5)
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S16[E]", player),
+        lambda state: (
+            (
+                (
+                    state.has("D06Z01S16[W]", player)
+                    or state.has("D06Z01S16[CherubsL]", player)
+                )
+                and (
+                    can_walk_on_root(state, player)
+                    or can_cross_gap(state, logic, player, 5)
+                )
+            )
+            or (
+                state.has("D06Z01S16[CherubsR]", player)
+                and (
+                    state.has("Purified Hand of the Nun", player)
+                    or can_air_stall(state, logic, player)
+                    and (
+                        can_walk_on_root(state, player)
+                        and state.has("The Young Mason's Wheel", player)
+                    )
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S16[-CherubsL]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S16[W]", player)
+                or (
+                    state.has("D06Z01S16[CherubsR]", player)
+                    and (
+                        state.has("Purified Hand of the Nun", player)
+                        or can_air_stall(state, logic, player)
+                        and (
+                            can_walk_on_root(state, player)
+                            or state.has("The Young Mason's Wheel", player)
+                        )
+                    )
+                )
+                or (
+                    state.has("D06Z01S16[E]", player)
+                    and (
+                        can_walk_on_root(state, player)
+                        or can_cross_gap(state, logic, player, 7)
+                    )
+                )
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S16[-CherubsR]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D06Z01S16[E]", player)
+                or (
+                    state.has("D06Z01S16[CherubsL]", player)
+                    and (
+                        can_air_stall(state, logic, player)
+                        or can_walk_on_root(state, player)
+                        or state.has("Purified Hand of the Nun", player)
+                    )
+                )
+                or (
+                    state.has("D06Z01S16[W]", player)
+                    and (
+                        can_walk_on_root(state, player)
+                        or can_cross_gap(state, logic, player, 1)
+                    )
+                )
+            )
+        ))
+
+
+    # D06Z01S17 (Archcathedral Rooftops)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D06Z01S17[W]", player),
+        lambda state: (
+            (
+                state.has("D06Z01S17[E]", player)
+                or state.has("D06Z01S17[CherubsR]", player)
+            )
+            and state.has("Blood Perpetuated in Sand", player)
+            or state.has("D06Z01S17[CherubsL]", player)
+            and state.has("Purified Hand of the Nun", player)
+        ))
+    set_rule(world.get_entrance("D06Z01S17[E]", player),
+        lambda state: (
+            state.has("D06Z01S17[CherubsR]", player)
+            or state.has("Blood Perpetuated in Sand", player)
+            and (
+                state.has("D06Z01S17[W]", player)
+                or state.has("D06Z01S17[CherubsL]", player)
+                and state.has("Purified Hand of the Nun", player)
+            )
+        ))
+    set_rule(world.get_entrance("D06Z01S17[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+
+    # D06Z01S18 (Archcathedral Rooftops)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D06Z01S18[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+
+    # D06Z01S21 (Archcathedral Rooftops)
+    # Items
+    set_rule(world.get_location("AR: Third soldier fight", player),
+        lambda state: can_beat_boss(state, "Legionary", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D06Z01S21[W]", player),
+        lambda state: can_beat_boss(state, "Legionary", logic, player))
+    set_rule(world.get_entrance("D06Z01S21[E]", player),
+        lambda state: can_beat_boss(state, "Legionary", logic, player))
     
-    # Wall of the Holy Prohibitions
+
+    # D06Z01S23 (Archcathedral Rooftops)
+    # Event
+    set_rule(world.get_location("OpenedARLadder", player),
+        lambda state: opened_ar_ladder(state, player))
+
+
+    # D06Z01S25 (Archcathedral Rooftops)
+    # Items
+    set_rule(world.get_location("AR: Crisanta of the Wrapped Agony", player),
+        lambda state: can_beat_boss(state, "Rooftops", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D06Z01S25[W]", player),
+        lambda state: can_beat_boss(state, "Rooftops", logic, player))
+    set_rule(world.get_entrance("D06Z01S25[E]", player),
+        lambda state: can_beat_boss(state, "Rooftops", logic, player))
+
+
+    # D08Z01S01 (Bridge of the Three Cavalries)
+    # Items
+    set_rule(world.get_location("BotTC: Esdras, of the Anointed Legion", player),
+        lambda state: (
+            state.has_group("wounds", player, 3)
+            and can_beat_boss(state, "Bridge", logic, player)
+        ))
+    set_rule(world.get_location("BotTC: Esdras' gift", player),
+        lambda state: (
+            state.has_group("wounds", player, 3)
+            and can_beat_boss(state, "Bridge", logic, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D08Z01S01[W]", player),
+        lambda state: can_beat_boss(state, "Bridge", logic, player))
+    set_rule(world.get_entrance("D08Z01S01[E]", player),
+        lambda state: (
+            state.has_group("wounds", player, 3)
+            and (
+                state.has("D08Z01S01[Cherubs]", player)
+                or can_beat_boss(state, "Bridge", logic, player)
+            )
+        ))
+
+
+    # D08Z01S02 (Bridge of the Three Cavalries)
+    # No items
+    # Items
+    set_rule(world.get_entrance("D08Z01S02[-Cherubs]", player),
+        lambda state: state.has("Linen of Golden Thread", player))
+    # Event
+    set_rule(world.get_location("BrokeBOTTCStatue", player),
+        lambda state: broke_bottc_statue(state, player))
+
+
+    # D08Z02S03 (Ferrous Tree)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D08Z02S03[W]", player),
+        lambda state: state.has("OpenedBOTTCStatue", player))
+
+
+    # D08Z03S01 (Hall of the Dawning)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D08Z03S01[E]", player),
+        lambda state: state.has("Verses Spun from Gold", player, 4))
+
+
+    # D08Z03S02 (Hall of the Dawning)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D08Z03S02[NW]", player),
+        lambda state: state.has("Wall Climb Ability", player))
+
+
+    # D08Z03S03 (Hall of the Dawning)
+    # Items
+    set_rule(world.get_location("HotD: Laudes, the First of the Amanecidas", player),
+        lambda state: can_beat_boss(state, "Hall", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D08Z03S03[W]", player),
+        lambda state: can_beat_boss(state, "Hall", logic, player))
+    set_rule(world.get_entrance("D08Z03S03[E]", player),
+        lambda state: can_beat_boss(state, "Hall", logic, player))
+
+
+    # D09Z01S01 (Wall of the Holy Prohibitions)
+    # Items
+    set_rule(world.get_location("WotHP: Amanecida of the Molten Thorn", player),
+        lambda state: can_beat_boss(state, "Wall", logic, player))
+    # No doors
+
+
+    # D09Z01S02 (Wall of the Holy Prohibitions)
+    # Items
+    set_rule(world.get_location("WotHP: Upper east room, center gold cell", player),
+        lambda state: state.has("D09Z01S02[Cell5]", player))
+    set_rule(world.get_location("WotHP: Upper east room, lift puzzle", player),
+        lambda state: (
+            state.has("D09Z01S02[NW]", player)
+            or state.has("D09Z01S02[N]", player)
+            or state.has("D09Z01S02[Cell1]", player)
+            or state.has("D09Z01S02[Cell6]", player)
+            or state.has("D09Z01S02[Cell4]", player)
+            or state.has("D09Z01S02[Cell3]", player)
+            or state.has("D09Z01S02[Cell22]", player)
+            or state.has("D09Z01S02[Cell23]", player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D09Z01S02[SW]", player),
+        lambda state: state.has("D09Z01S02[Cell2]", player))
+    set_rule(world.get_entrance("D09Z01S02[NW]", player),
+        lambda state: (
+            state.has("D09Z01S02[N]", player)
+            or state.has("D09Z01S02[Cell1]", player)
+            or state.has("D09Z01S02[Cell6]", player)
+            or state.has("D09Z01S02[Cell4]", player)
+            or state.has("D09Z01S02[Cell3]", player)
+            or state.has("D09Z01S02[Cell22]", player)
+            or state.has("D09Z01S02[Cell23]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S02[N]", player),
+        lambda state: (
+            state.has("D09Z01S02[NW]", player)
+            or state.has("D09Z01S02[Cell1]", player)
+            or state.has("D09Z01S02[Cell6]", player)
+            or state.has("D09Z01S02[Cell4]", player)
+            or state.has("D09Z01S02[Cell3]", player)
+            or state.has("D09Z01S02[Cell22]", player)
+            or state.has("D09Z01S02[Cell23]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S02[Cell1]", player),
+        lambda state: (
+            state.has("D09Z01S02[NW]", player)
+            or state.has("D09Z01S02[N]", player)
+            or state.has("D09Z01S02[Cell6]", player)
+            or state.has("D09Z01S02[Cell4]", player)
+            or state.has("D09Z01S02[Cell3]", player)
+            or state.has("D09Z01S02[Cell22]", player)
+            or state.has("D09Z01S02[Cell23]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S02[Cell1]", player),
+        lambda state: state.has("Key of the Secular", player))
+    set_rule(world.get_entrance("D09Z01S02[Cell6]", player),
+        lambda state: (
+            state.has("D09Z01S02[NW]", player)
+            or state.has("D09Z01S02[N]", player)
+            or state.has("D09Z01S02[Cell1]", player)
+            or state.has("D09Z01S02[Cell4]", player)
+            or state.has("D09Z01S02[Cell3]", player)
+            or state.has("D09Z01S02[Cell22]", player)
+            or state.has("D09Z01S02[Cell23]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S02[Cell6]", player),
+        lambda state: state.has("Key of the Scribe", player))
+    set_rule(world.get_entrance("D09Z01S02[Cell4]", player),
+        lambda state: (
+            state.has("D09Z01S02[NW]", player)
+            or state.has("D09Z01S02[N]", player)
+            or state.has("D09Z01S02[Cell1]", player)
+            or state.has("D09Z01S02[Cell6]", player)
+            or state.has("D09Z01S02[Cell3]", player)
+            or state.has("D09Z01S02[Cell22]", player)
+            or state.has("D09Z01S02[Cell23]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S02[Cell4]", player),
+        lambda state: state.has("Key of the Inquisitor", player))
+    set_rule(world.get_entrance("D09Z01S02[Cell2]", player),
+        lambda state: state.has("D09Z01S02[SW]", player))
+    set_rule(world.get_entrance("D09Z01S02[Cell3]", player),
+        lambda state: (
+            state.has("D09Z01S02[NW]", player)
+            or state.has("D09Z01S02[N]", player)
+            or state.has("D09Z01S02[Cell1]", player)
+            or state.has("D09Z01S02[Cell6]", player)
+            or state.has("D09Z01S02[Cell4]", player)
+            or state.has("D09Z01S02[Cell22]", player)
+            or state.has("D09Z01S02[Cell23]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S02[Cell3]", player),
+        lambda state: state.has("Key of the Secular", player))
+    set_rule(world.get_entrance("D09Z01S02[Cell22]", player),
+        lambda state: (
+            state.has("D09Z01S02[NW]", player)
+            or state.has("D09Z01S02[N]", player)
+            or state.has("D09Z01S02[Cell1]", player)
+            or state.has("D09Z01S02[Cell6]", player)
+            or state.has("D09Z01S02[Cell4]", player)
+            or state.has("D09Z01S02[Cell3]", player)
+            or state.has("D09Z01S02[Cell23]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S02[Cell23]", player),
+        lambda state: (
+            state.has("D09Z01S02[NW]", player)
+            or state.has("D09Z01S02[N]", player)
+            or state.has("D09Z01S02[Cell1]", player)
+            or state.has("D09Z01S02[Cell6]", player)
+            or state.has("D09Z01S02[Cell4]", player)
+            or state.has("D09Z01S02[Cell3]", player)
+            or state.has("D09Z01S02[Cell22]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S02[Cell23]", player),
+        lambda state: state.has("Key of the Secular", player))
+
+
+    # D09Z01S03 (Wall of the Holy Prohibitions)
+    # Items
+    set_rule(world.get_location("WotHP: Quirce, Returned By The Flames", player),
+        lambda state: can_beat_boss(state, "Prison", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D09Z01S03[W]", player),
+        lambda state: (
+            state.has("D09Z01S03[N]", player)
+            and can_beat_boss(state, "Prison", logic, player)
+        ))
+    
+
+    # D09Z01S05 (Wall of the Holy Prohibitions)
+    # Event
+    set_rule(world.get_location("OpenedWOTHPGate", player),
+        lambda state: opened_wothp_gate(state, player))
+
+
+    # D09Z01S06 (Wall of the Holy Prohibitions)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D09Z01S06[-E]", player),
+        lambda state: state.has("Key of the High Peaks", player))
+
+
+    # D09Z01S07 (Wall of the Holy Prohibitions)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D09Z01S07[SW]", player),
+        lambda state: (
+            state.has("D09Z01S07[SE]", player)
+            or state.has("D09Z01S07[W]", player)
+            or state.has("D09Z01S07[E]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S07[SE]", player),
+        lambda state: (
+            state.has("D09Z01S07[SW]", player)
+            or state.has("D09Z01S07[W]", player)
+            or state.has("D09Z01S07[E]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S07[W]", player),
+        lambda state: (
+            state.has("D09Z01S07[SW]", player)
+            or state.has("D09Z01S07[SE]", player)
+            or state.has("D09Z01S07[E]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S07[E]", player),
+        lambda state: (
+            state.has("D09Z01S07[SW]", player)
+            or state.has("D09Z01S07[SE]", player)
+            or state.has("D09Z01S07[W]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S07[NW]", player),
+        lambda state: state.has("D09Z01S07[N]", player))
+    set_rule(world.get_entrance("D09Z01S07[N]", player),
+        lambda state: state.has("D09Z01S07[NW]", player))
+    set_rule(world.get_entrance("D09Z01S07[NE]", player),
+        lambda state: (
+            state.has("D09Z01S07[SW]", player)
+            or state.has("D09Z01S07[SE]", player)
+            or state.has("D09Z01S07[W]", player)
+            or state.has("D09Z01S07[E]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S07[NE]", player),
+        lambda state: state.has("Blood Perpetuated in Sand", player))
+
+
+    # D09Z01S08 (Wall of the Holy Prohibitions)
+    # Items
+    set_rule(world.get_location("WotHP: Collapsing floor ledge", player),
+        lambda state: (
+            (
+                state.has("D09Z01S08[W]", player)
+                or state.has("D09Z01S08[Cell18]", player)
+            )
+            and state.has("OpenedWOTHPGate", player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D09Z01S08[W]", player),
+        lambda state: state.has("D09Z01S08[Cell14]", player))
+    add_rule(world.get_entrance("D09Z01S08[W]", player),
+        lambda state: state.has("OpenedWOTHPGate", player))
+    set_rule(world.get_entrance("D09Z01S08[S]", player),
+        lambda state: (
+            state.has("D09Z01S08[W]", player)
+            or state.has("D09Z01S08[Cell14]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S08[SE]", player),
+        lambda state: (
+            state.has("D09Z01S08[Cell15]", player)
+            or state.has("D09Z01S08[Cell16]", player)
+            or state.has("D09Z01S08[Cell18]", player)
+            or state.has("D09Z01S08[Cell17]", player)
+            and state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S08[NE]", player),
+        lambda state: (
+            state.has("D09Z01S08[Cell7]", player)
+            or state.has("D09Z01S08[Cell17]", player)
+            and state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S08[Cell14]", player),
+        lambda state: state.has("D09Z01S08[W]", player))
+    set_rule(world.get_entrance("D09Z01S08[Cell15]", player),
+        lambda state: (
+            state.has("Key of the Scribe", player)
+            and (
+                state.has("D09Z01S08[SE]", player)
+                or state.has("D09Z01S08[Cell16]", player)
+                or state.has("D09Z01S08[Cell18]", player)
+                or state.has("D09Z01S08[Cell17]", player)
+                and state.has("Dash Ability", player)
+            )
+        ))
+    set_rule(world.get_entrance("D09Z01S08[Cell7]", player),
+        lambda state: (
+            state.has("Key of the Inquisitor", player)
+            and (
+                state.has("D09Z01S08[NE]", player)
+                or state.has("D09Z01S08[Cell17]", player)
+                and state.has("Dash Ability", player)
+            )
+        ))
+    set_rule(world.get_entrance("D09Z01S08[Cell16]", player),
+        lambda state: (
+            state.has("Key of the Inquisitor", player)
+            and (
+                state.has("D09Z01S08[SE]", player)
+                or state.has("D09Z01S08[Cell15]", player)
+                or state.has("D09Z01S08[Cell18]", player)
+                or state.has("D09Z01S08[Cell17]", player)
+                and state.has("Dash Ability", player)
+            )
+        ))
+    set_rule(world.get_entrance("D09Z01S08[Cell18]", player),
+        lambda state: (
+            state.has("Key of the Scribe", player)
+            and (
+                state.has("D09Z01S08[SE]", player)
+                or state.has("D09Z01S08[Cell15]", player)
+                or state.has("D09Z01S08[Cell16]", player)
+                or state.has("D09Z01S08[Cell17]", player)
+                and state.has("Dash Ability", player)
+            )
+        ))
+
+
+    # D09Z01S09 (Wall of the Holy Prohibitions)
+    # Items
+    set_rule(world.get_location("WotHP: Lower west room, top ledge", player),
+        lambda state: (
+            state.has("D09Z01S09[Cell24]", player)
+            or state.has("Dash Ability", player)
+            and (
+                state.has("D09Z01S09[NW]", player)
+                or state.has("D09Z01S09[Cell19]", player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D09Z01S09[SW]", player),
+        lambda state: (
+            state.has("D09Z01S09[Cell21]", player)
+            or state.has("D09Z01S09[Cell20]", player)
+            or state.has("D09Z01S09[E]", player)
+            or state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S09[NW]", player),
+        lambda state: (
+            state.has("D09Z01S09[Cell19]", player)
+            or state.has("D09Z01S09[Cell24]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S09[NW]", player),
+        lambda state: (
+            state.has("D09Z01S09[Cell19]", player)
+            or state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S09[E]", player),
+        lambda state: (
+            state.has("D09Z01S09[Cell21]", player)
+            or state.has("D09Z01S09[Cell20]", player)
+            or state.has("D09Z01S09[SW]", player)
+            or state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S09[Cell24]", player),
+        lambda state: (
+            state.has("D09Z01S09[NW]", player)
+            or state.has("D09Z01S09[Cell19]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S09[Cell24]", player),
+        lambda state: state.has("Dash Ability", player))
+    set_rule(world.get_entrance("D09Z01S09[Cell24]", player),
+        lambda state: (
+            state.has("D09Z01S09[NW]", player)
+            or state.has("D09Z01S09[Cell24]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S09[Cell19]", player),
+        lambda state: (
+            state.has("D09Z01S09[NW]", player)
+            or state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S09[Cell20]", player),
+        lambda state: (
+            state.has("Key of the Scribe", player)
+            and (
+                state.has("D09Z01S09[Cell21]", player)
+                or state.has("D09Z01S09[SW]", player)
+                or state.has("D09Z01S09[E]", player)
+                or state.has("Dash Ability", player)
+            )
+        ))
+    set_rule(world.get_entrance("D09Z01S09[Cell21]", player),
+        lambda state: (
+            state.has("Key of the Inquisitor", player)
+            and (
+                state.has("D09Z01S09[Cell20]", player)
+                or state.has("D09Z01S09[SW]", player)
+                or state.has("D09Z01S09[E]", player)
+                or state.has("Dash Ability", player)
+            )
+        ))
+
+
+    # D09Z01S10 (Wall of the Holy Prohibitions)
+    # Items
+    set_rule(world.get_location("WotHP: Lower east room, top bronze cell", player),
+        lambda state: state.has("D09Z01S10[Cell13]", player))
+    set_rule(world.get_location("WotHP: Lower east room, hidden ledge", player),
+        lambda state: (
+            state.has("D09Z01S10[W]", player)
+            or state.has("D09Z01S10[Cell12]", player)
+            or state.has("D09Z01S10[Cell10]", player)
+            or state.has("D09Z01S10[Cell11]", player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D09Z01S10[W]", player),
+        lambda state: (
+            state.has("D09Z01S10[Cell12]", player)
+            or state.has("D09Z01S10[Cell10]", player)
+            or state.has("D09Z01S10[Cell11]", player)
+        ))
+    set_rule(world.get_entrance("D09Z01S10[Cell12]", player),
+        lambda state: (
+            state.has("D09Z01S10[W]", player) or \
+            state.has("D09Z01S10[Cell10]", player) or \
+                state.has("D09Z01S10[Cell11]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S10[Cell12]", player),
+        lambda state: state.has("Key of the Secular", player))
+    set_rule(world.get_entrance("D09Z01S10[Cell10]", player),
+        lambda state: (
+            state.has("D09Z01S10[W]", player)
+            or state.has("D09Z01S10[Cell12]", player)
+            or state.has("D09Z01S10[Cell11]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S10[Cell10]", player),
+        lambda state: state.has("Key of the Scribe", player))
+    set_rule(world.get_entrance("D09Z01S10[Cell11]", player),
+        lambda state: (
+            state.has("D09Z01S10[W]", player)
+            or state.has("D09Z01S10[Cell12]", player)
+            or state.has("D09Z01S10[Cell10]", player)
+        ))
+    add_rule(world.get_entrance("D09Z01S10[Cell11]", player),
+        lambda state: state.has("Key of the Scribe", player))
+    
+    # D09BZ01S01 (Wall of the Holy Prohibitions - Inside cells)
+    # Items
+    set_rule(world.get_location("WotHP: Upper east room, center cell ledge", player),
+        lambda state: state.has("D09BZ01S01[Cell22]", player))
+    set_rule(world.get_location("WotHP: Upper east room, center cell floor", player),
+        lambda state: (
+            state.has("D09BZ01S01[Cell22]", player)
+            or state.has("D09BZ01S01[Cell23]", player)
+        ))
     set_rule(world.get_location("WotHP: Upper east room, top bronze cell", player),
-        lambda state: state._blasphemous_bronze_key(player))
+        lambda state: state.has("D09BZ01S01[Cell1]", player))
     set_rule(world.get_location("WotHP: Upper east room, top silver cell", player),
-        lambda state: state._blasphemous_silver_key(player))
-    set_rule(world.get_location("WotHP: Upper east room, center gold cell", player),
-        lambda state: state._blasphemous_gold_key(player))
-    set_rule(world.get_location("WotHP: Upper west room, center gold cell", player),
-        lambda state: state._blasphemous_gold_key(player) and \
-            state._blasphemous_bronze_key(player))
+        lambda state: state.has("D09BZ01S01[Cell6]", player))
     set_rule(world.get_location("WotHP: Upper west room, top silver cell", player),
-        lambda state: state._blasphemous_silver_key(player) and \
-            state._blasphemous_bronze_key(player))
+        lambda state: (
+            state.has("D09BZ01S01[Cell14]", player)
+            or state.has("D09BZ01S01[Cell15]", player)
+        ))
+    set_rule(world.get_location("WotHP: Upper west room, center gold cell", player),
+        lambda state: state.has("D09BZ01S01[Cell16]", player))
     set_rule(world.get_location("WotHP: Lower west room, bottom gold cell", player),
-        lambda state: state._blasphemous_gold_key(player) and \
-            state._blasphemous_bronze_key(player) and \
-                state._blasphemous_root_relic(player) and \
-                    state._blasphemous_blood_relic(player) and \
-                        state._blasphemous_miasma_relic(player))
-    set_rule(world.get_location("WotHP: Lower west room, top ledge", player),
-        lambda state: state._blasphemous_silver_key(player) and \
-            state._blasphemous_bronze_key(player))
-    set_rule(world.get_location("WotHP: Lower east room, hidden ledge", player),
-        lambda state: state._blasphemous_bronze_key(player))
-    set_rule(world.get_location("WotHP: Lower east room, bottom silver cell", player),
-        lambda state: state._blasphemous_silver_key(player) and \
-            state._blasphemous_bronze_key(player))
-    set_rule(world.get_location("WotHP: Lower east room, top bronze cell", player),
-        lambda state: state._blasphemous_bronze_key(player))
+        lambda state: (
+            state.has("D09BZ01S01[Cell21]", player)
+            and state.has("Blood Perpetuated in Sand", player)
+            and can_climb_on_root(state, player)
+            and can_survive_poison(state, logic, player, 2)
+            and state.has("Dash Ability", player)
+        ))
     set_rule(world.get_location("WotHP: Lower east room, top silver cell", player),
-        lambda state: state._blasphemous_silver_key(player) and \
-            state._blasphemous_bronze_key(player))
-    set_rule(world.get_location("WotHP: Outside Child of Moonlight", player),
-        lambda state: state._blasphemous_silver_key(player) and \
-            state._blasphemous_bronze_key(player))
-    set_rule(world.get_location("WotHP: Oil of the Pilgrims", player),
-        lambda state: state._blasphemous_silver_key(player) and \
-            state._blasphemous_bronze_key(player))
-    set_rule(world.get_location("WotHP: Quirce, Returned By The Flames", player),
-        lambda state: state._blasphemous_silver_key(player) and \
-            state._blasphemous_bronze_key(player))
-    set_rule(world.get_location("WotHP: Collapsing floor ledge", player),
-        lambda state: state._blasphemous_silver_key(player) and \
-            state._blasphemous_bronze_key(player))
-    set_rule(world.get_location("WotHP: Amanecida of the Molten Thorn", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_silver_key(player) and \
-                state._blasphemous_bronze_key(player))
+        lambda state: state.has("D09BZ01S01[Cell10]", player))
+    set_rule(world.get_location("WotHP: Lower east room, bottom silver cell", player),
+        lambda state: (
+            state.has("D09BZ01S01[Cell11]", player)
+            and (
+                can_survive_poison(state, logic, player, 1)
+                and state.has("Dash Ability", player)
+                or state.has_any({"Debla of the Lights", "Taranto to my Sister", "Cante Jondo of the Three Sisters", "Verdiales of the Forsaken Hamlet", "Cantina of the Blue Rose"}, player)
+                or aubade(state, player)
+            )
+        ))
+    # Doors
+    set_rule(world.get_entrance("D09BZ01S01[Cell2]", player),
+        lambda state: state.has("D09BZ01S01[Cell3]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell3]", player),
+        lambda state: state.has("D09BZ01S01[Cell2]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell4]", player),
+        lambda state: state.has("D09BZ01S01[Cell5]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell5]", player),
+        lambda state: state.has("D09BZ01S01[Cell5]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell12]", player),
+        lambda state: state.has("D09BZ01S01[Cell13]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell13]", player),
+        lambda state: state.has("D09BZ01S01[Cell12]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell14]", player),
+        lambda state: state.has("D09BZ01S01[Cell15]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell15]", player),
+        lambda state: state.has("D09BZ01S01[Cell14]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell17]", player),
+        lambda state: state.has("D09BZ01S01[Cell18]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell19]", player),
+        lambda state: state.has("D09BZ01S01[Cell20]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell20]", player),
+        lambda state: state.has("D09BZ01S01[Cell19]", player))
+    set_rule(world.get_entrance("D09BZ01S01[Cell23]", player),
+        lambda state: state.has("D09BZ01S01[Cell22]", player))
+    add_rule(world.get_entrance("D09BZ01S01[Cell23]", player),
+        lambda state: state.has("Key of the Secular", player))
 
-    # Wasteland of the Buried Churches
-    set_rule(world.get_location("WotBC: Under broken bridge", player),
-        lambda state: state._blasphemous_blood_relic(player) or \
-            state._blasphemous_dawn_heart(player))
-    set_rule(world.get_location("WotBC: Cliffside Child of Moonlight", player),
-        lambda state: state._blasphemous_cherub_38(player))
 
-    # Where Olive Trees Wither
-    set_rule(world.get_location("WOTW: Gift for the tomb", player),
-        lambda state: state._blasphemous_full_thimble(player))
-    set_rule(world.get_location("WOTW: Underground tomb", player),
-        lambda state: state._blasphemous_flowers(player) and \
-            (state._blasphemous_full_thimble(player) or \
-                state._blasphemous_fall_relic(player)))
-    set_rule(world.get_location("WOTW: Underground Child of Moonlight", player),
-        lambda state: (state._blasphemous_full_thimble(player) or \
-            state._blasphemous_fall_relic(player)) and \
-                state._blasphemous_cherub_27(player))
-    set_rule(world.get_location("WOTW: Underground ledge", player),
-        lambda state: (state._blasphemous_full_thimble(player) or \
-            state._blasphemous_fall_relic(player)) and \
-                state._blasphemous_blood_relic(player))
-    set_rule(world.get_location("WOTW: Upper east Child of Moonlight", player),
-        lambda state: state._blasphemous_root_relic(player) or \
-            state._blasphemous_cherub_22_23_31_32(player))
-    set_rule(world.get_location("WOTW: Upper east statue", player),
-        lambda state: state._blasphemous_root_relic(player))
-    set_rule(world.get_location("WOTW: Gemino's reward", player),
-        lambda state: state._blasphemous_full_thimble(player))
+    # D17Z01S01 (Brotherhood of the Silent Sorrow)
+    set_rule(world.get_location("BotSS: Starting room ledge", player),
+        lambda state: state.has("D17Z01S01[Cherubs3]", player))
+    set_rule(world.get_location("BotSS: Starting room Child of Moonlight", player),
+        lambda state: (
+            state.has("D17Z01S01[Cherubs1]", player)
+            or state.has("Taranto to my Sister", player)
+            or (
+                can_climb_on_root(state, player)
+                or can_cross_gap(state, logic, player, 9)
+            )
+            and (
+                state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun", "Debla of the Lights", "Verdiales of the Forsaken Hamlet", "Cloistered Ruby"}, player)
+                or tirana(state, player)
+            )
+        ))
 
-    # Various
-    set_rule(world.get_location("Confessor Dungeon 1 extra", player),
-        lambda state: state._blasphemous_bead(player))
+
+    # D17Z01S02 (Brotherhood of the Silent Sorrow)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D17Z01S02[W]", player),
+        lambda state: state.has("Dash Ability", player))
+    set_rule(world.get_entrance("D17Z01S02[E]", player),
+        lambda state: (
+            state.has("D17Z01S02[N]", player)
+            or state.has("Dash Ability", player)
+        ))
+    set_rule(world.get_entrance("D17Z01S02[N]", player),
+        lambda state: (
+            state.has("Blood Perpetuated in Sand", player)
+            and (
+                state.has("D17Z01S02[E]", player)
+                or state.has("D17Z01S02[W]", player)
+                and state.has("Dash Ability", player)
+            )
+        ))
+
+
+    # D17Z01S03 (Brotherhood of the Silent Sorrow)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D17Z01S03[relic]", player),
+        lambda state: state.has("Key to the Chamber of the Eldest Brother", player))
+
+
+    # D17Z01S04 (Brotherhood of the Silent Sorrow)
+    # Items
+    if world.boots_of_pleading[player]:
+        set_rule(world.get_location("BotSS: 2nd meeting with Redento", player),
+            lambda state: redento(state, blasphemousworld, player, 2))
+    # Doors
+    set_rule(world.get_entrance("D17Z01S04[N]", player),
+        lambda state: state.has("D17Z01S04[FrontR]", player))
+    set_rule(world.get_entrance("D17Z01S04[FrontR]", player),
+        lambda state: state.has("D17Z01S04[N]", player))
+    # Event
+    set_rule(world.get_location("OpenedBOTSSLadder", player),
+        lambda state: opened_botss_ladder(state, player))
+
+
+    # D17Z01S05 (Brotherhood of the Silent Sorrow)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D17Z01S05[S]", player),
+        lambda state: state.has("OpenedBOTSSLadder", player))
+
+
+    # D17Z01S10 (Brotherhood of the Silent Sorrow)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D17Z01S10[W]", player),
+        lambda state: state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player))
+
+
+    # D17Z01S11 (Brotherhood of the Silent Sorrow)
+    # Items
+    set_rule(world.get_location("BotSS: Warden of the Silent Sorrow", player),
+        lambda state: can_beat_boss(state, "Brotherhood", logic, player))
+    # Doors
+    set_rule(world.get_entrance("D17Z01S11[W]", player),
+        lambda state: can_beat_boss(state, "Brotherhood", logic, player))
+    set_rule(world.get_entrance("D17Z01S11[E]", player),
+        lambda state: can_beat_boss(state, "Brotherhood", logic, player))
+
+
+    # D17Z01S14 (Brotherhood of the Silent Sorrow)
+    # Items
+    set_rule(world.get_location("BotSS: Outside church", player),
+        lambda state: (
+            state.has("D17Z01S14[W]", player)
+            or state.has("Blood Perpetuated in Sand", player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D17Z01S14[W]", player),
+        lambda state: (
+            state.has("Incomplete Scapular", player)
+            and state.has("Blood Perpetuated in Sand", player)
+        ))
+    set_rule(world.get_entrance("D17Z01S14[E]", player),
+        lambda state: state.has("Blood Perpetuated in Sand", player))
+    set_rule(world.get_entrance("D17Z01S14[-Cherubs1]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D17Z01S14[W]", player)
+                or state.has("Blood Perpetuated in Sand", player)
+                or can_cross_gap(state, logic, player, 11)
+            )
+        ))
+    set_rule(world.get_entrance("D17Z01S14[-Cherubs2]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D17Z01S14[E]", player)
+                and can_cross_gap(state, logic, player, 8)
+                or state.has("D17Z01S14[W]", player)
+                and can_cross_gap(state, logic, player, 10)
+                or state.has("Blood Perpetuated in Sand", player)
+            )
+        ))
+    set_rule(world.get_entrance("D17Z01S14[-Cherubs3]", player),
+        lambda state: (
+            state.has("Linen of Golden Thread", player)
+            and (
+                state.has("D17Z01S14[E]", player)
+                or state.has("Blood Perpetuated in Sand", player)
+            )
+        ))
+
+
+    # D17Z01S15 (Brotherhood of the Silent Sorrow)
+    # Items
+    set_rule(world.get_location("BotSS: Esdras' final gift", player),
+        lambda state: (
+            can_beat_boss(state, "Bridge", logic, player)
+            and state.has_group("wounds", player, 3)
+        ))
+    set_rule(world.get_location("BotSS: Crisanta's gift", player),
+        lambda state: (
+            can_beat_boss(state, "Rooftops", logic, player)
+            and state.has("Apodictic Heart of Mea Culpa", player)
+        ))
+    # No doors
+
+
+    # D17BZ02S01 (Brotherhood of the Silent Sorrow - Platforming challenge)
+    # Items
+    set_rule(world.get_location("BotSS: Platforming gauntlet", player),
+        lambda state: (
+            state.has("D17BZ02S01[FrontR]", player)
+            or state.has_all({"Dash Ability", "Wall Climb Ability"}, player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D17BZ02S01[FrontR]", player),
+        lambda state: state.has_all({"Dash Ability", "Wall Climb Ability"}, player))
+
+
+    # D20Z01S04 (Echoes of Salt)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D20Z01S04[E]", player),
+        lambda state: state.has("OpenedDCGateW", player))
+
+
+    # D20Z01S09 (Echoes of Salt)
+    # Items
+    set_rule(world.get_location("EoS: Lantern jump near elevator", player),
+        lambda state: (
+            state.has("D20Z01S09[W]", player)
+            or state.has("Dash Ability", player)
+        ))
+    # Doors
+    set_rule(world.get_entrance("D20Z01S09[W]", player),
+        lambda state: state.has("Dash Ability", player))
+    set_rule(world.get_entrance("D20Z01S09[E]", player),
+        lambda state: state.has_all({"Blood Perpetuated in Sand", "Dash Ability"}, player))
+
+
+    # D20Z01S10 (Echoes of Salt)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D20Z01S10[W]", player),
+        lambda state: state.has_all({"Blood Perpetuated in Sand", "Dash Ability"}, player))
+    set_rule(world.get_entrance("D20Z01S10[E]", player),
+        lambda state: state.has_all({"Blood Perpetuated in Sand", "Dash Ability"}, player))
+
+
+    # D20Z02S03 (Mourning and Havoc)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D20Z02S03[NE]", player),
+        lambda state: (
+            can_walk_on_root(state, player)
+            or can_cross_gap(state, logic, player, 5)
+        ))
+
+
+    # D20Z02S04 (Mourning and Havoc)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D20Z02S04[W]", player),
+        lambda state: state.has("Dash Ability", player))
+    set_rule(world.get_entrance("D20Z02S04[E]", player),
+        lambda state: state.has("Dash Ability", player))
+
+
+    # D20Z02S05 (Mourning and Havoc)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D20Z02S05[NW]", player),
+        lambda state: (
+            state.has("Nail Uprooted from Dirt", player)
+            or can_cross_gap(state, logic, player, 3)
+        ))
+
+
+    # D20Z02S06 (Mourning and Havoc)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D20Z02S06[NW]", player),
+        lambda state: (
+            state.has("D20Z02S06[NE]", player)
+            or state.has("Purified Hand of the Nun", player)
+            or can_climb_on_root(state, player)
+            or can_dive_laser(state, logic, player)
+        ))
+    set_rule(world.get_entrance("D20Z02S06[NE]", player),
+        lambda state: (
+            state.has("D20Z02S06[NW]", player)
+            or state.has("Purified Hand of the Nun", player)
+            or can_climb_on_root(state, player)
+            or can_dive_laser(state, logic, player)
+        ))
+
+
+    # D20Z02S08 (Mourning and Havoc)
+    # Items
+    set_rule(world.get_location("MaH: Sierpes", player),
+        lambda state: can_beat_boss(state, "Mourning", logic, player))
+    set_rule(world.get_location("MaH: Sierpes' eye", player),
+        lambda state: can_beat_boss(state, "Mourning", logic, player))
+    # No doors
+
+
+    # D20Z02S11 (Mourning and Havoc)
+    # No items
+    # Doors
+    set_rule(world.get_entrance("D20Z02S11[NW]", player),
+        lambda state: state.has("D20Z02S11[E]", player))
+    set_rule(world.get_entrance("D20Z02S11[NW]", player),
+        lambda state: (
+            mourning_skips_allowed(logic)
+            and (
+                state.has("Purified Hand of the Nun", player)
+                or can_break_tirana(state, logic, player)
+                or state.has("D20Z02S11[E]", player)
+            )
+        ))
+    set_rule(world.get_entrance("D20Z02S11[E]", player),
+        lambda state: (
+            mourning_skips_allowed(logic)
+            and (
+                state.has("Purified Hand of the Nun", player)
+                or can_break_tirana(state, logic, player)
+                or state.has("D20Z02S11[NW]", player)
+                and can_cross_gap(state, logic, player, 5)
+            )
+        ))
+    
+
+    # Misc Items
+    set_rule(world.get_location("Second red candle", player),
+        lambda state: (
+            state.has("Bead of Red Wax", player)
+            and (
+                state.can_reach(world.get_region("D02Z03S06", player), player)
+                or state.has("D05Z01S02[W]", player)
+            )
+        ))
+    set_rule(world.get_location("Third red candle", player),
+        lambda state: (
+            state.has("Bead of Red Wax", player)
+            and state.has("D05Z01S02[W]", player)
+            and state.can_reach(world.get_region("D02Z03S06", player), player)
+        ))
+    set_rule(world.get_location("Second blue candle", player),
+        lambda state: (
+            state.has("Bead of Blue Wax", player)
+            and (
+                state.has("OpenedBOTSSLadder", player)
+                or state.can_reach(world.get_region("D01Z04S16", player), player)
+            )
+        ))
+    set_rule(world.get_location("Third blue candle", player),
+        lambda state: (
+            state.has("Bead of Blue Wax", player)
+            and state.has("OpenedBOTSSLadder", player)
+            and state.can_reach(world.get_region("D01Z04S16", player), player)
+        ))
+    set_rule(world.get_location("Defeat 1 Amanecida", player),
+        lambda state: amanecida_rooms(state, logic, player, 1))
+    set_rule(world.get_location("Defeat 2 Amanecidas", player),
+        lambda state: amanecida_rooms(state, logic, player, 2))
+    set_rule(world.get_location("Defeat 3 Amanecidas", player),
+        lambda state: amanecida_rooms(state, logic, player, 3))
+    set_rule(world.get_location("Defeat 4 Amanecidas", player),
+        lambda state: amanecida_rooms(state, logic, player, 4))
+    set_rule(world.get_location("Defeat all Amanecidas", player),
+        lambda state: amanecida_rooms(state, logic, player, 4))
     set_rule(world.get_location("Confessor Dungeon 1 main", player),
-        lambda state: state._blasphemous_bead(player))
-    set_rule(world.get_location("Confessor Dungeon 2 extra", player),
-        lambda state: state._blasphemous_bead(player))
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 1)
+        ))
     set_rule(world.get_location("Confessor Dungeon 2 main", player),
-        lambda state: state._blasphemous_bead(player))
-    set_rule(world.get_location("Confessor Dungeon 3 extra", player),
-        lambda state: state._blasphemous_bead(player))
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 2)
+        ))
     set_rule(world.get_location("Confessor Dungeon 3 main", player),
-        lambda state: state._blasphemous_bead(player))
-    set_rule(world.get_location("Confessor Dungeon 4 extra", player),
-        lambda state: state._blasphemous_bead(player))
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 3)
+        ))
     set_rule(world.get_location("Confessor Dungeon 4 main", player),
-        lambda state: state._blasphemous_bead(player))
-    set_rule(world.get_location("Confessor Dungeon 5 extra", player),
-        lambda state: state._blasphemous_bead(player) and \
-            state._blasphemous_bridge_access(player))
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 4)
+        ))
     set_rule(world.get_location("Confessor Dungeon 5 main", player),
-        lambda state: state._blasphemous_bead(player) and \
-            state._blasphemous_bridge_access(player))
-    set_rule(world.get_location("Confessor Dungeon 6 extra", player),
-        lambda state: state._blasphemous_bead(player) and \
-            state._blasphemous_bridge_access(player) and \
-                (state._blasphemous_blood_relic(player) or \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_silver_key(player) and \
-                            state._blasphemous_bronze_key(player)))
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 5)
+        ))
     set_rule(world.get_location("Confessor Dungeon 6 main", player),
-        lambda state: state._blasphemous_bead(player) and \
-            state._blasphemous_bridge_access(player) and \
-                (state._blasphemous_blood_relic(player) or \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_silver_key(player) and \
-                            state._blasphemous_bronze_key(player)))
-    set_rule(world.get_location("Confessor Dungeon 7 extra", player),
-        lambda state: state._blasphemous_bead(player) and \
-            state._blasphemous_bridge_access(player) and \
-                state._blasphemous_1_mask(player) and \
-                    state._blasphemous_bronze_key(player) and \
-                        state._blasphemous_silver_key(player) and \
-                            state._blasphemous_blood_relic(player))
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 6)
+        ))
     set_rule(world.get_location("Confessor Dungeon 7 main", player),
-        lambda state: state._blasphemous_bead(player) and \
-            state._blasphemous_bridge_access(player) and \
-                state._blasphemous_1_mask(player) and \
-                    state._blasphemous_bronze_key(player) and \
-                        state._blasphemous_silver_key(player) and \
-                            state._blasphemous_blood_relic(player))
-    # to do: requires dive
-    set_rule(world.get_location("Defeat 1 Amanecida", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_open_holes(player))
-    set_rule(world.get_location("Defeat 2 Amanecidas", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_open_holes(player) and \
-                (state._blasphemous_blood_relic(player) and \
-                    state._blasphemous_root_relic(player) or \
-                        state._blasphemous_bridge_access(player)))
-    set_rule(world.get_location("Defeat 3 Amanecidas", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_open_holes(player) and \
-                state._blasphemous_bridge_access(player) and \
-                    (state._blasphemous_blood_relic(player) and \
-                        state._blasphemous_root_relic(player) or \
-                            (state._blasphemous_1_mask(player) and \
-                                state._blasphemous_bronze_key(player) and \
-                                    state._blasphemous_silver_key(player))))
-    set_rule(world.get_location("Defeat 4 Amanecidas", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_open_holes(player) and \
-                state._blasphemous_bridge_access(player) and \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_blood_relic(player) and \
-                            state._blasphemous_root_relic(player) and \
-                                state._blasphemous_bronze_key(player) and \
-                                    state._blasphemous_silver_key(player))
-    set_rule(world.get_location("Defeat all Amanecidas", player),
-        lambda state: state._blasphemous_bell(player) and \
-            state._blasphemous_open_holes(player) and \
-                state._blasphemous_bridge_access(player) and \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_blood_relic(player) and \
-                            state._blasphemous_root_relic(player) and \
-                                state._blasphemous_bronze_key(player) and \
-                                    state._blasphemous_silver_key(player))
-
-    # expert logic
-    if world.expert_logic[player]:
-        # entrances
-        for i in world.get_region("Ferrous Tree", player).entrances:
-            set_rule(i, lambda state: state._blasphemous_ex_bridge_access(player))
-        for i in world.get_region("Mother of Mothers", player).entrances:
-            set_rule(i, lambda state: state._blasphemous_ex_bridge_access(player))
-        for i in world.get_region("Patio of the Silent Steps", player).entrances:
-            set_rule(i, lambda state: state._blasphemous_ex_bridge_access(player))
-        for i in world.get_region("The Sleeping Canvases", player).entrances:
-            set_rule(i, lambda state: state._blasphemous_ex_bridge_access(player))
-        for i in world.get_region("Wall of the Holy Prohibitions", player).entrances:
-            set_rule(i, lambda state: state._blasphemous_1_mask(player) and \
-                state._blasphemous_ex_bridge_access(player))
-
-        # locations
-        set_rule(world.get_location("AR: Upper west shaft chest", player),
-            lambda state: state._blasphemous_2_masks(player) and \
-                state._blasphemous_fall_relic(player) and \
-                    (state._blasphemous_root_relic(player) or \
-                        state._blasphemous_ranged(player)))
-        set_rule(world.get_location("BotTC: Esdras, of the Anointed Legion", player),
-            lambda state: state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("BotTC: Esdras' gift", player),
-            lambda state: state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("BotTC: Inside giant statue", player),
-            lambda state: state._blasphemous_ex_bridge_access(player) and \
-                state._blasphemous_laudes_gate(player))
-        set_rule(world.get_location("BotSS: Esdras' final gift", player),
-            lambda state: state._blasphemous_blood_relic(player) and \
-                state._blasphemous_scapular(player) and \
-                    state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("BotSS: Crisanta's gift", player),
-            lambda state: state._blasphemous_blood_relic(player) and \
-                state._blasphemous_scapular(player) and \
-                    state._blasphemous_heart_c(player) and \
-                        state._blasphemous_3_masks(player) and \
-                            state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("CoOLotCV: Lady of the Six Sorrows", player),
-            lambda state: state._blasphemous_ex_bridge_access(player) and \
-                state._blasphemous_1_mask(player) and \
-                    state._blasphemous_bronze_key(player) and \
-                        state._blasphemous_silver_key(player) and \
-                            state._blasphemous_high_key(player))
-        set_rule(world.get_location("CoOLotCV: Mask room", player),
-            lambda state: state._blasphemous_ex_bridge_access(player) and \
-                state._blasphemous_1_mask(player) and \
-                    state._blasphemous_bronze_key(player) and \
-                        state._blasphemous_silver_key(player) and \
-                            state._blasphemous_high_key(player))
-        set_rule(world.get_location("DC: Chalice room", player),
-            lambda state: (state._blasphemous_miasma_relic(player) and \
-                state._blasphemous_water_relic(player) and \
-                    (state._blasphemous_root_relic(player) or \
-                        state._blasphemous_dawn_heart(player) or \
-                            (state._blasphemous_wheel(player) and \
-                                state._blasphemous_ranged(player)))) or \
-                                    (state._blasphemous_fall_relic(player) and \
-                                        (state._blasphemous_root_relic(player) or \
-                                            state._blasphemous_ranged(player))))
-        set_rule(world.get_location("DC: Mea Culpa altar", player),
-            lambda state: state._blasphemous_chalice(player) and \
-                state._blasphemous_ex_bridge_access(player) and \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_bronze_key(player) and \
-                            (state._blasphemous_fall_relic(player) and \
-                                (state._blasphemous_ranged(player) or \
-                                    state._blasphemous_root_relic(player))) or \
-                                        (state._blasphemous_miasma_relic(player) and \
-                                            state._blasphemous_water_relic(player) and \
-                                                (state._blasphemous_root_relic(player) or \
-                                                    state._blasphemous_dawn_heart(player) or \
-                                                        (state._blasphemous_wheel(player) and \
-                                                            state._blasphemous_ranged(player)))))
-        set_rule(world.get_location("HotD: Laudes, the First of the Amanecidas", player),
-            lambda state: state._blasphemous_ex_bridge_access(player) and \
-                state._blasphemous_laudes_gate(player))
-        set_rule(world.get_location("Jondo: Upper west tree root", player),
-            lambda state: state._blasphemous_root_relic(player) or \
-                state._blasphemous_dawn_heart(player) or \
-                    (state._blasphemous_wheel(player) and \
-                        state._blasphemous_ranged(player)))
-        set_rule(world.get_location("LotNW: Elevator Child of Moonlight", player),
-            lambda state: state._blasphemous_blood_relic(player) and \
-                (state._blasphemous_cherub_22_23_31_32(player) and \
-                    state._blasphemous_dawn_heart(player) and \
-                        state._blasphemous_ranged(player)) or \
-                            state._blasphemous_root_relic(player))
-        set_rule(world.get_location("MD: Cave Child of Moonlight", player),
-            lambda state: state._blasphemous_ex_bridge_access(player) and \
-                state._blasphemous_cherub_24_33(player))
-        set_rule(world.get_location("MD: Behind gate to TSC", player),
-            lambda state: state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("MoM: East chandelier platform", player),
-            lambda state: state._blasphemous_blood_relic(player) or \
-                state._blasphemous_dawn_heart(player) or \
-                    (state._blasphemous_wheel(player) and \
-                        state._blasphemous_ranged(player)))
-        set_rule(world.get_location("MaH: Upper east chest", player),
-            lambda state: state._blasphemous_ex_bridge_access(player) and \
-                (state._blasphemous_root_relic(player)) or \
-                    (state._blasphemous_dawn_heart(player) and \
-                        state._blasphemous_ranged(player)))
-        set_rule(world.get_location("MaH: Sierpes' eye", player),
-            lambda state: state._blasphemous_ex_bridge_access(player) and \
-                (state._blasphemous_root_relic(player)) or \
-                    state._blasphemous_dawn_heart(player) or \
-                        state._blasphemous_water_relic(player) or \
-                            (state._blasphemous_wheel(player) and \
-                                state._blasphemous_ranged(player)))
-        set_rule(world.get_location("MaH: Sierpes", player),
-            lambda state: state._blasphemous_ex_bridge_access(player) and \
-                (state._blasphemous_root_relic(player)) or \
-                    state._blasphemous_dawn_heart(player) or \
-                        state._blasphemous_water_relic(player) or \
-                            (state._blasphemous_wheel(player) and \
-                                state._blasphemous_ranged(player)))
-        set_rule(world.get_location("PotSS: Second area ledge", player),
-            lambda state: state._blasphemous_root_relic(player) or \
-                state._blasphemous_dawn_heart(player) or \
-                    (state._blasphemous_wheel(player) and \
-                        state._blasphemous_ranged(player)))
-        set_rule(world.get_location("PotSS: Third area upper ledge", player),
-            lambda state: state._blasphemous_root_relic(player) or \
-                state._blasphemous_dawn_heart(player) or \
-                    (state._blasphemous_wheel(player) and \
-                        state._blasphemous_ranged(player)))
-        set_rule(world.get_location("WotBC: Under broken bridge", player),
-            lambda state: state._blasphemous_blood_relic(player) or \
-                state._blasphemous_dawn_heart(player) or \
-                    (state._blasphemous_wheel(player) and \
-                        state._blasphemous_ranged(player)))
-        set_rule(world.get_location("Confessor Dungeon 5 extra", player),
-            lambda state: state._blasphemous_bead(player) and \
-                state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("Confessor Dungeon 5 main", player),
-            lambda state: state._blasphemous_bead(player) and \
-                state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("Confessor Dungeon 6 extra", player),
-            lambda state: state._blasphemous_bead(player) and \
-                state._blasphemous_ex_bridge_access(player) and \
-                    (state._blasphemous_blood_relic(player) or \
-                        state._blasphemous_1_mask(player) and \
-                            state._blasphemous_silver_key(player) and \
-                                state._blasphemous_bronze_key(player)))
-        set_rule(world.get_location("Confessor Dungeon 6 main", player),
-            lambda state: state._blasphemous_bead(player) and \
-                state._blasphemous_ex_bridge_access(player) and \
-                    (state._blasphemous_blood_relic(player) or \
-                        state._blasphemous_1_mask(player) and \
-                            state._blasphemous_silver_key(player) and \
-                                state._blasphemous_bronze_key(player)))
-        set_rule(world.get_location("Confessor Dungeon 7 extra", player),
-            lambda state: state._blasphemous_bead(player) and \
-                state._blasphemous_ex_bridge_access(player) and \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_bronze_key(player) and \
-                            state._blasphemous_silver_key(player) and \
-                                state._blasphemous_blood_relic(player))
-        set_rule(world.get_location("Confessor Dungeon 7 main", player),
-            lambda state: state._blasphemous_bead(player) and \
-                state._blasphemous_ex_bridge_access(player) and \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_bronze_key(player) and \
-                            state._blasphemous_silver_key(player) and \
-                                state._blasphemous_blood_relic(player))
-        set_rule(world.get_location("Defeat 2 Amanecidas", player),
-            lambda state: state._blasphemous_bell(player) and \
-                state._blasphemous_open_holes(player) and \
-                    (state._blasphemous_blood_relic(player) and \
-                        state._blasphemous_root_relic(player) or \
-                            state._blasphemous_ex_bridge_access(player)))
-        set_rule(world.get_location("Defeat 3 Amanecidas", player),
-            lambda state: state._blasphemous_bell(player) and \
-                state._blasphemous_open_holes(player) and \
-                    state._blasphemous_ex_bridge_access(player) and \
-                        (state._blasphemous_blood_relic(player) and \
-                            state._blasphemous_root_relic(player) or \
-                                (state._blasphemous_1_mask(player) and \
-                                    state._blasphemous_bronze_key(player) and \
-                                        state._blasphemous_silver_key(player))))
-        set_rule(world.get_location("Defeat 4 Amanecidas", player),
-            lambda state: state._blasphemous_bell(player) and \
-                state._blasphemous_open_holes(player) and \
-                    state._blasphemous_ex_bridge_access(player) and \
-                        state._blasphemous_1_mask(player) and \
-                            state._blasphemous_blood_relic(player) and \
-                                state._blasphemous_root_relic(player) and \
-                                    state._blasphemous_bronze_key(player) and \
-                                        state._blasphemous_silver_key(player))
-        set_rule(world.get_location("Defeat all Amanecidas", player),
-            lambda state: state._blasphemous_bell(player) and \
-                state._blasphemous_open_holes(player) and \
-                    state._blasphemous_ex_bridge_access(player) and \
-                        state._blasphemous_1_mask(player) and \
-                            state._blasphemous_blood_relic(player) and \
-                                state._blasphemous_root_relic(player) and \
-                                    state._blasphemous_bronze_key(player) and \
-                                        state._blasphemous_silver_key(player))
-
-    # skill rando
-    if world.skill_randomizer[player] and not world.expert_logic[player]:
-        set_rule(world.get_location("Skill 1, Tier 3", player),
-            lambda state: state._blasphemous_bridge_access(player))
-        set_rule(world.get_location("Skill 5, Tier 3", player),
-            lambda state: state._blasphemous_bridge_access(player))
-        set_rule(world.get_location("Skill 3, Tier 2", player),
-            lambda state: state._blasphemous_bridge_access(player))
-        set_rule(world.get_location("Skill 2, Tier 3", player),
-            lambda state: state._blasphemous_blood_relic(player) and \
-                state._blasphemous_miasma_relic(player) and \
-                        state._blasphemous_2_masks(player) and \
-                            state._blasphemous_bridge_access(player))
-        set_rule(world.get_location("Skill 4, Tier 3", player),
-            lambda state: state._blasphemous_blood_relic(player) and \
-                state._blasphemous_miasma_relic(player) and \
-                        state._blasphemous_2_masks(player) and \
-                            state._blasphemous_bridge_access(player))
-        set_rule(world.get_location("Skill 3, Tier 3", player),
-            lambda state: state._blasphemous_chalice(player) and \
-                state._blasphemous_bridge_access(player) and \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_bronze_key(player) and \
-                            state._blasphemous_miasma_relic(player) and \
-                                state._blasphemous_water_relic(player) and \
-                                    state._blasphemous_root_relic(player))
-    elif world.skill_randomizer[player] and world.expert_logic[player]:
-        set_rule(world.get_location("Skill 1, Tier 3", player),
-            lambda state: state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("Skill 5, Tier 3", player),
-            lambda state: state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("Skill 3, Tier 2", player),
-            lambda state: state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("Skill 2, Tier 3", player),
-            lambda state: state._blasphemous_blood_relic(player) and \
-                state._blasphemous_miasma_relic(player) and \
-                        state._blasphemous_2_masks(player) and \
-                            state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("Skill 4, Tier 3", player),
-            lambda state: state._blasphemous_blood_relic(player) and \
-                state._blasphemous_miasma_relic(player) and \
-                        state._blasphemous_2_masks(player) and \
-                            state._blasphemous_ex_bridge_access(player))
-        set_rule(world.get_location("Skill 3, Tier 3", player),
-            lambda state: state._blasphemous_chalice(player) and \
-                state._blasphemous_ex_bridge_access(player) and \
-                    state._blasphemous_1_mask(player) and \
-                        state._blasphemous_bronze_key(player) and \
-                            (state._blasphemous_fall_relic(player) and \
-                                (state._blasphemous_ranged(player) or \
-                                    state._blasphemous_root_relic(player))) or \
-                                        (state._blasphemous_miasma_relic(player) and \
-                                            state._blasphemous_water_relic(player) and \
-                                                (state._blasphemous_root_relic(player) or \
-                                                    state._blasphemous_dawn_heart(player) or \
-                                                        (state._blasphemous_wheel(player) and \
-                                                            state._blasphemous_ranged(player)))))
-
-    # difficulty (easy)
-    if world.difficulty[player].value == 0:
-        for i in world.get_region("Desecrated Cistern", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_wound_boss_easy(player))
-        for i in world.get_region("Ferrous Tree", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_easy(player))
-        for i in world.get_region("Patio of the Silent Steps", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_easy(player))
-        for i in world.get_region("The Sleeping Canvases", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_easy(player))
-        for i in world.get_region("Deambulatory of His Holiness", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("Albero: Donate 5000 Tears", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Albero: Donate 50000 Tears", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Albero: Tirso's final reward", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("Ossuary: Isidora, Voice of the Dead", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("AR: Crisanta of the Wrapped Agony", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("BotTC: Esdras, of the Anointed Legion", player),
-            lambda state: state._blasphemous_esdras_boss_easy(player))
-        add_rule(world.get_location("BotTC: Esdras' gift", player),
-            lambda state: state._blasphemous_esdras_boss_easy(player))
-        add_rule(world.get_location("BotTC: Inside giant statue", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("BotSS: Crisanta's gift", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("CoOLotCV: Lady of the Six Sorrows", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("CoOLotCV: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("GotP: Amanecida of the Bejeweled Arrow", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("HotD: Laudes, the First of the Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("LotNW: Elevator Child of Moonlight", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("LotNW: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("LotNW: Mea Culpa altar", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("LotNW: Red candle", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("MD: Blue candle", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("MD: Cave Child of Moonlight", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("MD: Behind gate to TSC", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("MoM: Melquiades, The Exhumed Archbishop", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("MoM: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("MotED: Amanecida of the Golden Blades", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("MaH: Sierpes' eye", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("MaH: Sierpes", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("PotSS: Amanecida of the Chiselled Steel", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("TSC: Under elevator shaft", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("TSC: Exposito, Scion of Abjuration", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("WotHP: Quirce, Returned By The Flames", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("WotHP: Collapsing floor ledge", player),
-            lambda state: state._blasphemous_mask_boss_easy(player))
-        add_rule(world.get_location("WotHP: Amanecida of the Molten Thorn", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("Confessor Dungeon 4 extra", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Confessor Dungeon 4 main", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Confessor Dungeon 5 extra", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Confessor Dungeon 5 main", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Confessor Dungeon 6 extra", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Confessor Dungeon 6 main", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Confessor Dungeon 7 extra", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Confessor Dungeon 7 main", player),
-            lambda state: state._blasphemous_wound_boss_easy(player))
-        add_rule(world.get_location("Defeat 1 Amanecida", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("Defeat 2 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("Defeat 3 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("Defeat 4 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-        add_rule(world.get_location("Defeat all Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_easy(player))
-
-    # difficulty (normal)
-    elif world.difficulty[player].value == 1:
-        for i in world.get_region("Desecrated Cistern", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_wound_boss_normal(player))
-        for i in world.get_region("Ferrous Tree", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_normal(player))
-        for i in world.get_region("Patio of the Silent Steps", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_normal(player))
-        for i in world.get_region("The Sleeping Canvases", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_normal(player))
-        for i in world.get_region("Deambulatory of His Holiness", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("Albero: Donate 5000 Tears", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Albero: Donate 50000 Tears", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Albero: Tirso's final reward", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("Ossuary: Isidora, Voice of the Dead", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("AR: Crisanta of the Wrapped Agony", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("BotTC: Esdras, of the Anointed Legion", player),
-            lambda state: state._blasphemous_esdras_boss_normal(player))
-        add_rule(world.get_location("BotTC: Esdras' gift", player),
-            lambda state: state._blasphemous_esdras_boss_normal(player))
-        add_rule(world.get_location("BotTC: Inside giant statue", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("BotSS: Crisanta's gift", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("CoOLotCV: Lady of the Six Sorrows", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("CoOLotCV: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("GotP: Amanecida of the Bejeweled Arrow", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("HotD: Laudes, the First of the Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("LotNW: Elevator Child of Moonlight", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("LotNW: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("LotNW: Mea Culpa altar", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("LotNW: Red candle", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("MD: Blue candle", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("MD: Cave Child of Moonlight", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("MD: Behind gate to TSC", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("MoM: Melquiades, The Exhumed Archbishop", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("MoM: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("MotED: Amanecida of the Golden Blades", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("MaH: Sierpes' eye", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("MaH: Sierpes", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("PotSS: Amanecida of the Chiselled Steel", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("TSC: Under elevator shaft", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("TSC: Exposito, Scion of Abjuration", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("WotHP: Quirce, Returned By The Flames", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("WotHP: Collapsing floor ledge", player),
-            lambda state: state._blasphemous_mask_boss_normal(player))
-        add_rule(world.get_location("WotHP: Amanecida of the Molten Thorn", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("Confessor Dungeon 4 extra", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Confessor Dungeon 4 main", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Confessor Dungeon 5 extra", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Confessor Dungeon 5 main", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Confessor Dungeon 6 extra", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Confessor Dungeon 6 main", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Confessor Dungeon 7 extra", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Confessor Dungeon 7 main", player),
-            lambda state: state._blasphemous_wound_boss_normal(player))
-        add_rule(world.get_location("Defeat 1 Amanecida", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("Defeat 2 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("Defeat 3 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("Defeat 4 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-        add_rule(world.get_location("Defeat all Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_normal(player))
-
-    # difficulty (hard)
-    elif world.difficulty[player].value == 2:
-        for i in world.get_region("Desecrated Cistern", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_wound_boss_hard(player))
-        for i in world.get_region("Ferrous Tree", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_hard(player))
-        for i in world.get_region("Patio of the Silent Steps", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_hard(player))
-        for i in world.get_region("The Sleeping Canvases", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_esdras_boss_hard(player))
-        for i in world.get_region("Deambulatory of His Holiness", player).entrances:
-            add_rule(i, lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("Albero: Donate 5000 Tears", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Albero: Donate 50000 Tears", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Albero: Tirso's final reward", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("Ossuary: Isidora, Voice of the Dead", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("AR: Crisanta of the Wrapped Agony", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("BotTC: Esdras, of the Anointed Legion", player),
-            lambda state: state._blasphemous_esdras_boss_hard(player))
-        add_rule(world.get_location("BotTC: Esdras' gift", player),
-            lambda state: state._blasphemous_esdras_boss_hard(player))
-        add_rule(world.get_location("BotTC: Inside giant statue", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("BotSS: Crisanta's gift", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("CoOLotCV: Lady of the Six Sorrows", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("CoOLotCV: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("GotP: Amanecida of the Bejeweled Arrow", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("HotD: Laudes, the First of the Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("LotNW: Elevator Child of Moonlight", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("LotNW: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("LotNW: Mea Culpa altar", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("LotNW: Red candle", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("MD: Blue candle", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("MD: Cave Child of Moonlight", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("MD: Behind gate to TSC", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("MoM: Melquiades, The Exhumed Archbishop", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("MoM: Mask room", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("MotED: Amanecida of the Golden Blades", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("MaH: Sierpes' eye", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("MaH: Sierpes", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("PotSS: Amanecida of the Chiselled Steel", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("TSC: Under elevator shaft", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("TSC: Exposito, Scion of Abjuration", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("WotHP: Quirce, Returned By The Flames", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("WotHP: Collapsing floor ledge", player),
-            lambda state: state._blasphemous_mask_boss_hard(player))
-        add_rule(world.get_location("WotHP: Amanecida of the Molten Thorn", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("Confessor Dungeon 4 extra", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Confessor Dungeon 4 main", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Confessor Dungeon 5 extra", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Confessor Dungeon 5 main", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Confessor Dungeon 6 extra", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Confessor Dungeon 6 main", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Confessor Dungeon 7 extra", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Confessor Dungeon 7 main", player),
-            lambda state: state._blasphemous_wound_boss_hard(player))
-        add_rule(world.get_location("Defeat 1 Amanecida", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("Defeat 2 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("Defeat 3 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("Defeat 4 Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
-        add_rule(world.get_location("Defeat all Amanecidas", player),
-            lambda state: state._blasphemous_endgame_boss_hard(player))
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 7)
+        ))
+    set_rule(world.get_location("Confessor Dungeon 1 extra", player),
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 1)
+        ))
+    set_rule(world.get_location("Confessor Dungeon 2 extra", player),
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 2)
+        ))
+    set_rule(world.get_location("Confessor Dungeon 3 extra", player),
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 3)
+        ))
+    set_rule(world.get_location("Confessor Dungeon 4 extra", player),
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 4)
+        ))
+    set_rule(world.get_location("Confessor Dungeon 5 extra", player),
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 5)
+        ))
+    set_rule(world.get_location("Confessor Dungeon 6 extra", player),
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 6)
+        ))
+    set_rule(world.get_location("Confessor Dungeon 7 extra", player),
+        lambda state: (
+            state.has("Weight of True Guilt", player)
+            and guilt_rooms(state, player, 7)
+        ))
+    set_rule(world.get_location("Skill 1, Tier 1", player),
+        lambda state: sword_rooms(state, player, 1))
+    set_rule(world.get_location("Skill 1, Tier 2", player),
+        lambda state: sword_rooms(state, player, 2))
+    set_rule(world.get_location("Skill 1, Tier 3", player),
+        lambda state: sword_rooms(state, player, 4))
+    set_rule(world.get_location("Skill 2, Tier 1", player),
+        lambda state: sword_rooms(state, player, 1))
+    set_rule(world.get_location("Skill 2, Tier 2", player),
+        lambda state: sword_rooms(state, player, 3))
+    set_rule(world.get_location("Skill 2, Tier 3", player),
+        lambda state: sword_rooms(state, player, 6))
+    set_rule(world.get_location("Skill 3, Tier 1", player),
+        lambda state: sword_rooms(state, player, 2))
+    set_rule(world.get_location("Skill 3, Tier 2", player),
+        lambda state: sword_rooms(state, player, 5))
+    set_rule(world.get_location("Skill 3, Tier 3", player),
+        lambda state: sword_rooms(state, player, 7))
+    set_rule(world.get_location("Skill 4, Tier 1", player),
+        lambda state: sword_rooms(state, player, 1))
+    set_rule(world.get_location("Skill 4, Tier 2", player),
+        lambda state: sword_rooms(state, player, 3))
+    set_rule(world.get_location("Skill 4, Tier 3", player),
+        lambda state: sword_rooms(state, player, 6))
+    set_rule(world.get_location("Skill 5, Tier 1", player),
+        lambda state: sword_rooms(state, player, 1))
+    set_rule(world.get_location("Skill 5, Tier 2", player),
+        lambda state: sword_rooms(state, player, 2))
+    set_rule(world.get_location("Skill 5, Tier 3", player),
+        lambda state: sword_rooms(state, player, 4))
\ No newline at end of file
diff --git a/worlds/blasphemous/Vanilla.py b/worlds/blasphemous/Vanilla.py
index 82ec7c5f4e5a..034a2a295b6b 100644
--- a/worlds/blasphemous/Vanilla.py
+++ b/worlds/blasphemous/Vanilla.py
@@ -7,205 +7,14 @@
     "DC: Chalice room": "Chalice of Inverted Verses"
 }
 
-cherub_set: Set[str] = [
-    "Albero: Child of Moonlight",
-    "AR: Upper west shaft Child of Moonlight",
-    "BotSS: Starting room Child of Moonlight",
-    "DC: Child of Moonlight, above water",
-    "DC: Upper east Child of Moonlight",
-    "DC: Child of Moonlight, miasma room",
-    "DC: Child of Moonlight, behind pillar",
-    "DC: Top of elevator Child of Moonlight",
-    "DC: Elevator shaft Child of Moonlight",
-    "GotP: Shop cave Child of Moonlight",
-    "GotP: Elevator shaft Child of Moonlight",
-    "GotP: West shaft Child of Moonlight",
-    "GotP: Center shaft Child of Moonlight",
-    "GA: Miasma room Child of Moonlight",
-    "GA: Blood bridge Child of Moonlight",
-    "GA: Lower east Child of Moonlight",
-    "Jondo: Upper east Child of Moonlight",
-    "Jondo: Spike tunnel Child of Moonlight",
-    "Jondo: Upper west Child of Moonlight",
-    "LotNW: Platform room Child of Moonlight",
-    "LotNW: Lowest west Child of Moonlight",
-    "LotNW: Elevator Child of Moonlight",
-    "MD: Second area Child of Moonlight",
-    "MD: Cave Child of Moonlight",
-    "MoM: Lower west Child of Moonlight",
-    "MoM: Upper center Child of Moonlight",
-    "MotED: Child of Moonlight, above chasm",
-    "PotSS: First area Child of Moonlight",
-    "PotSS: Third area Child of Moonlight",
-    "THL: Child of Moonlight",
-    "WotHP: Upper east room, top bronze cell",
-    "WotHP: Upper west room, top silver cell",
-    "WotHP: Lower east room, bottom silver cell",
-    "WotHP: Outside Child of Moonlight",
-    "WotBC: Outside Child of Moonlight",
-    "WotBC: Cliffside Child of Moonlight",
-    "WOTW: Underground Child of Moonlight",
-    "WOTW: Upper east Child of Moonlight",
-]
-
-life_set: Set[str] = [
-    "AR: Lady of the Six Sorrows",
-    "CoOLotCV: Lady of the Six Sorrows",
-    "DC: Lady of the Six Sorrows, from MD",
-    "DC: Lady of the Six Sorrows, elevator shaft",
-    "GotP: Lady of the Six Sorrows",
-    "LotNW: Lady of the Six Sorrows"
-]
-
-fervour_set: Set[str] = [
-    "DC: Oil of the Pilgrims",
-    "GotP: Oil of the Pilgrims",
-    "GA: Oil of the Pilgrims",
-    "LotNW: Oil of the Pilgrims",
-    "MoM: Oil of the Pilgrims",
-    "WotHP: Oil of the Pilgrims"
-]
 
-sword_set: Set[str] = [
-    "Albero: Mea Culpa altar",
-    "AR: Mea Culpa altar",
-    "BotSS: Mea Culpa altar",
-    "CoOLotCV: Mea Culpa altar",
-    "DC: Mea Culpa altar",
-    "LotNW: Mea Culpa altar",
-    "MoM: Mea Culpa altar"
+junk_locations: Set[str] = [
+    "Albero: Donate 50000 Tears",
+    "Ossuary: 11th reward",
+    "AtTotS: Miriam's gift",
+    "TSC: Jocinero's final reward"
 ]
 
-blessing_dict: Dict[str, str] = {
-    "Albero: Bless Severed Hand": "Incorrupt Hand of the Fraternal Master",
-    "Albero: Bless Linen Cloth": "Shroud of Dreamt Sins",
-    "Albero: Bless Hatched Egg": "Three Gnarled Tongues"
-}
-
-dungeon_dict: Dict[str, str] = {
-    "Confessor Dungeon 1 extra": "Tears of Atonement (1000)",
-    "Confessor Dungeon 2 extra": "Heart of the Single Tone",
-    "Confessor Dungeon 3 extra": "Tears of Atonement (3000)",
-    "Confessor Dungeon 4 extra": "Embers of a Broken Star",
-    "Confessor Dungeon 5 extra": "Tears of Atonement (5000)",
-    "Confessor Dungeon 6 extra": "Scaly Coin",
-    "Confessor Dungeon 7 extra": "Seashell of the Inverted Spiral"
-}
-
-tirso_dict: Dict[str, str] = {
-    "Albero: Tirso's 1st reward": "Linen Cloth",
-    "Albero: Tirso's 2nd reward": "Tears of Atonement (500)",
-    "Albero: Tirso's 3rd reward": "Tears of Atonement (1000)",
-    "Albero: Tirso's 4th reward": "Tears of Atonement (2000)",
-    "Albero: Tirso's 5th reward": "Tears of Atonement (5000)",
-    "Albero: Tirso's 6th reward": "Tears of Atonement (10000)",
-    "Albero: Tirso's final reward": "Knot of Rosary Rope"
-}
-
-redento_dict: Dict[str, str] = {
-    "MoM: Redento's treasure": "Nail Uprooted from Dirt",
-    "MoM: Final meeting with Redento": "Knot of Rosary Rope",
-    "MotED: 1st meeting with Redento": "Fourth Toe made of Limestone",
-    "PotSS: 4th meeting with Redento": "Big Toe made of Limestone",
-    "WotBC: 3rd meeting with Redento": "Little Toe made of Limestone"
-}
-
-jocinero_dict: Dict[str, str] = {
-    "TSC: Jocinero's 1st reward": "Linen of Golden Thread",
-    "TSC: Jocinero's final reward": "Campanillero to the Sons of the Aurora"
-}
-
-altasgracias_dict: Dict[str, str] = {
-    "GA: Altasgracias' gift": "Egg of Deformity",
-    "GA: Empty giant egg": "Knot of Hair"
-}
-
-tentudia_dict: Dict[str, str] = {
-    "Albero: Lvdovico's 1st reward": "Tears of Atonement (500)",
-    "Albero: Lvdovico's 2nd reward": "Tears of Atonement (1000)",
-    "Albero: Lvdovico's 3rd reward": "Debla of the Lights"
-}
-
-gemino_dict: Dict[str, str] = {
-    "WOTW: Gift for the tomb": "Dried Flowers bathed in Tears",
-    "WOTW: Underground tomb": "Saeta Dolorosa",
-    "WOTW: Gemino's gift": "Empty Golden Thimble",
-    "WOTW: Gemino's reward": "Frozen Olive"
-}
-
-ossuary_dict: Dict[str, str] = {
-    "Ossuary: 1st reward": "Tears of Atonement (250)",
-    "Ossuary: 2nd reward": "Tears of Atonement (500)",
-    "Ossuary: 3rd reward": "Tears of Atonement (750)",
-    "Ossuary: 4th reward": "Tears of Atonement (1000)",
-    "Ossuary: 5th reward": "Tears of Atonement (1250)",
-    "Ossuary: 6th reward": "Tears of Atonement (1500)",
-    "Ossuary: 7th reward": "Tears of Atonement (1750)",
-    "Ossuary: 8th reward": "Tears of Atonement (2000)",
-    "Ossuary: 9th reward": "Tears of Atonement (2500)",
-    "Ossuary: 10th reward": "Tears of Atonement (3000)",
-    "Ossuary: 11th reward": "Tears of Atonement (5000)",
-}
-
-boss_dict: Dict[str, str] = {
-    "BotTC: Esdras, of the Anointed Legion": "Tears of Atonement (4300)",
-    "BotSS: Warden of the Silent Sorrow": "Tears of Atonement (300)",
-    "CoOLotCV: Our Lady of the Charred Visage": "Tears of Atonement (2600)",
-    "HotD: Laudes, the First of the Amanecidas": "Tears of Atonement (30000)",
-    "GotP: Amanecida of the Bejeweled Arrow": "Tears of Atonement (18000)",
-    "GA: Tres Angustias": "Tears of Atonement (2100)",
-    "MD: Ten Piedad": "Tears of Atonement (625)",
-    "MoM: Melquiades, The Exhumed Archbishop": "Tears of Atonement (5500)",
-    "MotED: Amanecida of the Golden Blades": "Tears of Atonement (18000)",
-    "MaH: Sierpes": "Tears of Atonement (5000)",
-    "PotSS: Amanecida of the Chiselled Steel": "Tears of Atonement (18000)",
-    "TSC: Exposito, Scion of Abjuration": "Tears of Atonement (9000)",
-    "WotHP: Quirce, Returned By The Flames": "Tears of Atonement (11250)",
-    "WotHP: Amanecida of the Molten Thorn": "Tears of Atonement (18000)"
-}
-
-wound_dict: Dict[str, str] = {
-    "CoOLotCV: Visage of Compunction": "Holy Wound of Compunction",
-    "GA: Visage of Contrition": "Holy Wound of Contrition",
-    "MD: Visage of Attrition": "Holy Wound of Attrition"
-}
-
-mask_dict: Dict[str, str] = {
-    "CoOLotCV: Mask room": "Mirrored Mask of Dolphos",
-    "LotNW: Mask room": "Embossed Mask of Crescente",
-    "MoM: Mask room": "Deformed Mask of Orestes"
-}
-
-eye_dict: Dict[str, str] = {
-    "Ossuary: Isidora, Voice of the Dead": "Severed Right Eye of the Traitor",
-    "MaH: Sierpes' eye": "Broken Left Eye of the Traitor"
-}
-
-herb_dict: Dict[str, str] = {
-    "Albero: Gate of Travel room": "Bouquet of Thyme",
-    "Jondo: Lower east bell trap": "Bouquet of Rosemary",
-    "MotED: Blood platform alcove": "Dried Clove",
-    "PotSS: Third area lower ledge": "Olive Seeds",
-    "TSC: Painting ladder ledge": "Sooty Garlic",
-    "WOTW: Entrance to tomb": "Incense Garlic"
-}
-
-church_dict: Dict[str, str] = {
-    "Albero: Donate 5000 Tears": "Token of Appreciation",
-    "Albero: Donate 50000 Tears": "Cloistered Ruby"
-}
-
-shop_dict: Dict[str, str] = {
-    "GotP: Shop item 1": "Torn Bridal Ribbon",
-    "GotP: Shop item 2": "Calcified Eye of Erudition",
-    "GotP: Shop item 3": "Ember of the Holy Cremation",
-    "MD: Shop item 1": "Key to the Chamber of the Eldest Brother",
-    "MD: Shop item 2": "Hollow Pearl",
-    "MD: Shop item 3": "Moss Preserved in Glass",
-    "TSC: Shop item 1": "Wicker Knot",
-    "TSC: Shop item 2": "Empty Bile Vessel",
-    "TSC: Shop item 3": "Key of the Inquisitor"
-}
 
 thorn_set: Set[str] = {
     "THL: Deogracias' gift",
@@ -218,14 +27,6 @@
     "Confessor Dungeon 7 main",
 }
 
-candle_dict: Dict[str, str] = {
-    "CoOLotCV: Red candle": "Bead of Red Wax",
-    "LotNW: Red candle": "Bead of Red Wax",
-    "MD: Red candle": "Bead of Red Wax",
-    "BotSS: Blue candle": "Bead of Blue Wax",
-    "CoOLotCV: Blue candle": "Bead of Blue Wax",
-    "MD: Blue candle": "Bead of Blue Wax"
-}
 
 skill_dict: Dict[str, str] = {
     "Skill 1, Tier 1": "Combo Skill",
diff --git a/worlds/blasphemous/__init__.py b/worlds/blasphemous/__init__.py
index ac6d9b703868..d53965d9751f 100644
--- a/worlds/blasphemous/__init__.py
+++ b/worlds/blasphemous/__init__.py
@@ -1,14 +1,14 @@
-from typing import Dict, Set, List, Any
+from typing import Dict, List, Set, Any
 from collections import Counter
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification
-from ..AutoWorld import World, WebWorld
-from .Items import base_id, item_table, group_table, tears_set, reliquary_set, skill_set
-from .Locations import location_table, shop_set
-from .Exits import region_exit_table, exit_lookup_table
+from worlds.AutoWorld import World, WebWorld
+from .Items import base_id, item_table, group_table, tears_set, reliquary_set, event_table
+from .Locations import location_table
+from .Rooms import room_table, door_table
 from .Rules import rules
-from worlds.generic.Rules import set_rule
+from worlds.generic.Rules import set_rule, add_rule
 from .Options import blasphemous_options
-from . import Vanilla
+from .Vanilla import unrandomized_dict, junk_locations, thorn_set, skill_dict
 
 
 class BlasphemousWeb(WebWorld):
@@ -32,7 +32,7 @@ class BlasphemousWorld(World):
 
     game: str = "Blasphemous"
     web = BlasphemousWeb()
-    data_version = 1
+    data_version = 2
 
     item_name_to_id = {item["name"]: (base_id + index) for index, item in enumerate(item_table)}
     location_name_to_id = {loc["name"]: (base_id + index) for index, loc in enumerate(location_table)}
@@ -41,6 +41,14 @@ class BlasphemousWorld(World):
     item_name_groups = group_table
     option_definitions = blasphemous_options
 
+    required_client_version = (0, 4, 2)
+
+
+    def __init__(self, multiworld, player):
+        super(BlasphemousWorld, self).__init__(multiworld, player)
+        self.start_room: str = "D17Z01S01"
+        self.door_connections: Dict[str, str] = {}
+
 
     def set_rules(self):
         rules(self)
@@ -61,102 +69,134 @@ def get_filler_item_name(self) -> str:
         return self.multiworld.random.choice(tears_set)
 
 
-    def create_items(self):
-        placed_items = []
-
-        placed_items.extend(Vanilla.unrandomized_dict.values())
-
-        if not self.multiworld.reliquary_shuffle[self.player]:
-            placed_items.extend(reliquary_set)
-        elif self.multiworld.reliquary_shuffle[self.player]:
-            placed_items.append("Tears of Atonement (250)")
-            placed_items.append("Tears of Atonement (300)")
-            placed_items.append("Tears of Atonement (500)")
-
-        if not self.multiworld.cherub_shuffle[self.player]:
-            for i in range(38):
-                placed_items.append("Child of Moonlight")
-
-        if not self.multiworld.life_shuffle[self.player]:
-            for i in range(6):
-                placed_items.append("Life Upgrade")
-
-        if not self.multiworld.fervour_shuffle[self.player]:
-            for i in range(6):
-                placed_items.append("Fervour Upgrade")
-
-        if not self.multiworld.sword_shuffle[self.player]:
-            for i in range(7):
-                placed_items.append("Mea Culpa Upgrade")
-
-        if not self.multiworld.blessing_shuffle[self.player]:
-            placed_items.extend(Vanilla.blessing_dict.values())
-
-        if not self.multiworld.dungeon_shuffle[self.player]:
-            placed_items.extend(Vanilla.dungeon_dict.values())
-
-        if not self.multiworld.tirso_shuffle[self.player]:
-            placed_items.extend(Vanilla.tirso_dict.values())
+    def generate_early(self):
+        world = self.multiworld
+        player = self.player
 
-        if not self.multiworld.miriam_shuffle[self.player]:
-            placed_items.append("Cantina of the Blue Rose")
+        if not world.starting_location[player].randomized:
+            if world.starting_location[player].value == 6 and world.difficulty[player].value < 2:
+                raise Exception(f"[Blasphemous - '{world.get_player_name(player)}'] {world.starting_location[player]}"
+                                " cannot be chosen if Difficulty is lower than Hard.")
 
-        if not self.multiworld.redento_shuffle[self.player]:
-            placed_items.extend(Vanilla.redento_dict.values())
+            if (world.starting_location[player].value == 0 or world.starting_location[player].value == 6) \
+                and world.dash_shuffle[player]:
+                    raise Exception(f"[Blasphemous - '{world.get_player_name(player)}'] {world.starting_location[player]}"
+                                    " cannot be chosen if Shuffle Dash is enabled.")
+            
+            if world.starting_location[player].value == 3 and world.wall_climb_shuffle[player]:
+                raise Exception(f"[Blasphemous - '{world.get_player_name(player)}'] {world.starting_location[player]}"
+                                " cannot be chosen if Shuffle Wall Climb is enabled.")
+        else:
+            locations: List[int] = [ 0, 1, 2, 3, 4, 5, 6 ]
+            invalid: bool = False
+
+            if world.difficulty[player].value < 2:
+                locations.remove(6)
+
+            if world.dash_shuffle[player]:
+                locations.remove(0)
+                if 6 in locations:
+                    locations.remove(6)
+
+            if world.wall_climb_shuffle[player]:
+                locations.remove(3)
+
+            if world.starting_location[player].value == 6 and world.difficulty[player].value < 2:
+                invalid = True
+
+            if (world.starting_location[player].value == 0 or world.starting_location[player].value == 6) \
+                and world.dash_shuffle[player]:
+                    invalid = True
+            
+            if world.starting_location[player].value == 3 and world.wall_climb_shuffle[player]:
+                invalid = True
 
-        if not self.multiworld.jocinero_shuffle[self.player]:
-            placed_items.extend(Vanilla.jocinero_dict.values())
+            if invalid:
+                world.starting_location[player].value = world.random.choice(locations)
+            
         
-        if not self.multiworld.altasgracias_shuffle[self.player]:
-            placed_items.extend(Vanilla.altasgracias_dict.values())
+        if not world.dash_shuffle[player]:
+            world.push_precollected(self.create_item("Dash Ability"))
+
+        if not world.wall_climb_shuffle[player]:
+            world.push_precollected(self.create_item("Wall Climb Ability"))
+
+        if world.skip_long_quests[player]:
+            for loc in junk_locations:
+                world.exclude_locations[player].value.add(loc)
+
+        start_rooms: Dict[int, str] = {
+            0: "D17Z01S01",
+            1: "D01Z02S01",
+            2: "D02Z03S09",
+            3: "D03Z03S11",
+            4: "D04Z03S01",
+            5: "D06Z01S09",
+            6: "D20Z02S09"
+        }
 
-        if not self.multiworld.tentudia_shuffle[self.player]:
-            placed_items.extend(Vanilla.tentudia_dict.values())
+        self.start_room = start_rooms[world.starting_location[player].value]
 
-        if not self.multiworld.gemino_shuffle[self.player]:
-            placed_items.extend(Vanilla.gemino_dict.values())
 
-        if not self.multiworld.guilt_shuffle[self.player]:
-            placed_items.append("Weight of True Guilt")
+    def create_items(self):
+        world = self.multiworld
+        player = self.player
 
-        if not self.multiworld.ossuary_shuffle[self.player]:
-            placed_items.extend(Vanilla.ossuary_dict.values())
+        removed: int = 0
+        to_remove: List[str] = [
+            "Tears of Atonement (250)",
+            "Tears of Atonement (300)",
+            "Tears of Atonement (500)",
+            "Tears of Atonement (500)",
+            "Tears of Atonement (500)"
+        ]
 
-        if not self.multiworld.boss_shuffle[self.player]:
-            placed_items.extend(Vanilla.boss_dict.values())
+        skipped_items = []
+        junk: int = 0
 
-        if not self.multiworld.wound_shuffle[self.player]:
-            placed_items.extend(Vanilla.wound_dict.values())
+        for item, count in world.start_inventory[player].value.items():
+            for _ in range(count):
+                skipped_items.append(item)
+                junk += 1
 
-        if not self.multiworld.mask_shuffle[self.player]:
-            placed_items.extend(Vanilla.mask_dict.values())
+        skipped_items.extend(unrandomized_dict.values())
 
-        if not self.multiworld.eye_shuffle[self.player]:
-            placed_items.extend(Vanilla.eye_dict.values())
+        if world.thorn_shuffle[player] == 2:
+            for i in range(8):
+                skipped_items.append("Thorn Upgrade")
 
-        if not self.multiworld.herb_shuffle[self.player]:
-            placed_items.extend(Vanilla.herb_dict.values())
+        if world.dash_shuffle[player]:
+            skipped_items.append(to_remove[removed])
+            removed += 1
+        elif not world.dash_shuffle[player]:
+            skipped_items.append("Dash Ability")
 
-        if not self.multiworld.church_shuffle[self.player]:
-            placed_items.extend(Vanilla.church_dict.values())
+        if world.wall_climb_shuffle[player]:
+            skipped_items.append(to_remove[removed])
+            removed += 1
+        elif not world.wall_climb_shuffle[player]:
+            skipped_items.append("Wall Climb Ability")
 
-        if not self.multiworld.shop_shuffle[self.player]:
-            placed_items.extend(Vanilla.shop_dict.values())
+        if not world.reliquary_shuffle[player]:
+            skipped_items.extend(reliquary_set)
+        elif world.reliquary_shuffle[player]:
+            for i in range(3):
+                skipped_items.append(to_remove[removed])
+                removed += 1
 
-        if self.multiworld.thorn_shuffle[self.player] == 2:
-            for i in range(8):
-                placed_items.append("Thorn Upgrade")
+        if not world.boots_of_pleading[player]:
+            skipped_items.append("Boots of Pleading")
 
-        if not self.multiworld.candle_shuffle[self.player]:
-            placed_items.extend(Vanilla.candle_dict.values())
+        if not world.purified_hand[player]:
+            skipped_items.append("Purified Hand of the Nun")
 
-        if self.multiworld.start_wheel[self.player]:
-            placed_items.append("The Young Mason's Wheel")
+        if world.start_wheel[player]:
+            skipped_items.append("The Young Mason's Wheel")
 
-        if not self.multiworld.skill_randomizer[self.player]:
-            placed_items.extend(Vanilla.skill_dict.values())
+        if not world.skill_randomizer[player]:
+            skipped_items.extend(skill_dict.values())
 
-        counter = Counter(placed_items)
+        counter = Counter(skipped_items)
 
         pool = []
 
@@ -169,95 +209,30 @@ def create_items(self):
                 for i in range(count):
                     pool.append(self.create_item(item["name"]))
 
-        self.multiworld.itempool += pool
-
-
-    def pre_fill(self):
-        self.place_items_from_dict(Vanilla.unrandomized_dict)
-
-        if not self.multiworld.cherub_shuffle[self.player]:
-            self.place_items_from_set(Vanilla.cherub_set, "Child of Moonlight")
-
-        if not self.multiworld.life_shuffle[self.player]:
-            self.place_items_from_set(Vanilla.life_set, "Life Upgrade")
-
-        if not self.multiworld.fervour_shuffle[self.player]:
-            self.place_items_from_set(Vanilla.fervour_set, "Fervour Upgrade")
-
-        if not self.multiworld.sword_shuffle[self.player]:
-            self.place_items_from_set(Vanilla.sword_set, "Mea Culpa Upgrade")
-
-        if not self.multiworld.blessing_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.blessing_dict)
-
-        if not self.multiworld.dungeon_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.dungeon_dict)
-
-        if not self.multiworld.tirso_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.tirso_dict)
-
-        if not self.multiworld.miriam_shuffle[self.player]:
-            self.multiworld.get_location("AtTotS: Miriam's gift", self.player)\
-                .place_locked_item(self.create_item("Cantina of the Blue Rose"))
-
-        if not self.multiworld.redento_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.redento_dict)
+        for _ in range(junk):
+            pool.append(self.create_item(self.get_filler_item_name()))
 
-        if not self.multiworld.jocinero_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.jocinero_dict)
+        world.itempool += pool
 
-        if not self.multiworld.altasgracias_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.altasgracias_dict)
 
-        if not self.multiworld.tentudia_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.tentudia_dict)
-
-        if not self.multiworld.gemino_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.gemino_dict)
-
-        if not self.multiworld.guilt_shuffle[self.player]:
-            self.multiworld.get_location("GotP: Confessor Dungeon room", self.player)\
-                .place_locked_item(self.create_item("Weight of True Guilt"))
-
-        if not self.multiworld.ossuary_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.ossuary_dict)
-
-        if not self.multiworld.boss_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.boss_dict)
-
-        if not self.multiworld.wound_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.wound_dict)
-
-        if not self.multiworld.mask_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.mask_dict)
-
-        if not self.multiworld.eye_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.eye_dict)
-
-        if not self.multiworld.herb_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.herb_dict)
-
-        if not self.multiworld.church_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.church_dict)
-
-        if not self.multiworld.shop_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.shop_dict)
+    def pre_fill(self):
+        world = self.multiworld
+        player = self.player
 
-        if self.multiworld.thorn_shuffle[self.player] == 2:
-            self.place_items_from_set(Vanilla.thorn_set, "Thorn Upgrade")
+        self.place_items_from_dict(unrandomized_dict)
 
-        if not self.multiworld.candle_shuffle[self.player]:
-            self.place_items_from_dict(Vanilla.candle_dict)
+        if world.thorn_shuffle[player] == 2:
+            self.place_items_from_set(thorn_set, "Thorn Upgrade")
 
-        if self.multiworld.start_wheel[self.player]:
-            self.multiworld.get_location("BotSS: Beginning gift", self.player)\
+        if world.start_wheel[player]:
+            world.get_location("Beginning gift", player)\
                 .place_locked_item(self.create_item("The Young Mason's Wheel"))
 
-        if not self.multiworld.skill_randomizer[self.player]:
-            self.place_items_from_dict(Vanilla.skill_dict)
+        if not world.skill_randomizer[player]:
+            self.place_items_from_dict(skill_dict)
 
-        if self.multiworld.thorn_shuffle[self.player] == 1:
-            self.multiworld.local_items[self.player].value.add("Thorn Upgrade")
+        if world.thorn_shuffle[player] == 1:
+            world.local_items[player].value.add("Thorn Upgrade")
         
 
     def place_items_from_set(self, location_set: Set[str], name: str):
@@ -273,133 +248,143 @@ def place_items_from_dict(self, option_dict: Dict[str, str]):
 
 
     def create_regions(self) -> None:
-        
         player = self.player
         world = self.multiworld
+        
+        menu_region = Region("Menu", player, world)
+        misc_region = Region("Misc", player, world)
+        world.regions += [menu_region, misc_region]
 
-        region_table: Dict[str, Region] = {
-            "menu"    : Region("Menu", player, world),
-            "albero"  : Region("Albero", player, world),
-            "attots"  : Region("All the Tears of the Sea", player, world),
-            "ar"      : Region("Archcathedral Rooftops", player, world),
-            "bottc"   : Region("Bridge of the Three Cavalries", player, world),
-            "botss"   : Region("Brotherhood of the Silent Sorrow", player, world),
-            "coolotcv": Region("Convent of Our Lady of the Charred Visage", player, world),
-            "dohh"    : Region("Deambulatory of His Holiness", player, world),
-            "dc"      : Region("Desecrated Cistern", player, world),
-            "eos"     : Region("Echoes of Salt", player, world),
-            "ft"      : Region("Ferrous Tree", player, world),
-            "gotp"    : Region("Graveyard of the Peaks", player, world),
-            "ga"      : Region("Grievance Ascends", player, world),
-            "hotd"    : Region("Hall of the Dawning", player, world),
-            "jondo"   : Region("Jondo", player, world),
-            "kottw"   : Region("Knot of the Three Words", player, world),
-            "lotnw"   : Region("Library of the Negated Words", player, world),
-            "md"      : Region("Mercy Dreams", player, world),
-            "mom"     : Region("Mother of Mothers", player, world),
-            "moted"   : Region("Mountains of the Endless Dusk", player, world),
-            "mah"     : Region("Mourning and Havoc", player, world),
-            "potss"   : Region("Patio of the Silent Steps", player, world),
-            "petrous" : Region("Petrous", player, world),
-            "thl"     : Region("The Holy Line", player, world),
-            "trpots"  : Region("The Resting Place of the Sister", player, world),
-            "tsc"     : Region("The Sleeping Canvases", player, world),
-            "wothp"   : Region("Wall of the Holy Prohibitions", player, world),
-            "wotbc"   : Region("Wasteland of the Buried Churches", player, world),
-            "wotw"    : Region("Where Olive Trees Wither", player, world),
-            "dungeon" : Region("Dungeons", player, world)
-        }
-
-        for rname, reg in region_table.items():
-            world.regions.append(reg)
+        for room in room_table:
+            region = Region(room, player, world)
+            world.regions.append(region)
 
-            for ename, exits in region_exit_table.items():
-                if ename == rname:
-                    for i in exits:
-                        ent = Entrance(player, i, reg)
-                        reg.exits.append(ent)
+        menu_region.add_exits({self.start_room: "New Game"})
+        world.get_region(self.start_room, player).add_exits({"Misc": "Misc"})
 
-                        for e, r in exit_lookup_table.items():
-                            if i == e:
-                                ent.connect(region_table[r])
+        for door in door_table:
+            if door.get("OriginalDoor") is None:
+                continue
+            else:
+                if not door["Id"] in self.door_connections.keys():
+                    self.door_connections[door["Id"]] = door["OriginalDoor"]
+                    self.door_connections[door["OriginalDoor"]] = door["Id"]
+
+                parent_region: Region = self.get_room_from_door(door["Id"])
+                target_region: Region = self.get_room_from_door(door["OriginalDoor"])
+                parent_region.add_exits({
+                    target_region.name: door["Id"]
+                }, {
+                    target_region.name: lambda x: door.get("VisibilityFlags") != 1
+                })
+
+        for index, loc in enumerate(location_table):
+            if not world.boots_of_pleading[player] and loc["name"] == "BotSS: 2nd meeting with Redento":
+                continue
+            if not world.purified_hand[player] and loc["name"] == "MoM: Western room ledge":
+                continue
 
-        for loc in location_table:
-            id = base_id + location_table.index(loc)
-            region_table[loc["region"]].locations\
-                .append(BlasphemousLocation(self.player, loc["name"], id, region_table[loc["region"]]))
+            region: Region = world.get_region(loc["room"], player)
+            region.add_locations({loc["name"]: base_id + index})
+            #id = base_id + location_table.index(loc)
+            #reg.locations.append(BlasphemousLocation(player, loc["name"], id, reg))
+
+        for e, r in event_table.items():
+            region: Region = world.get_region(r, player)
+            event = BlasphemousLocation(player, e, None, region)
+            event.show_in_spoiler = False
+            event.place_locked_item(self.create_event(e))
+            region.locations.append(event)
+
+        for door in door_table:
+            region: Region = self.get_room_from_door(self.door_connections[door["Id"]])
+            event = BlasphemousLocation(player, door["Id"], None, region)
+            event.show_in_spoiler = False
+            event.place_locked_item(self.create_event(door["Id"]))
+            add_rule(event, lambda state: state.can_reach(self.get_connected_door(door["Id"])), player)
+            region.locations.append(event)
         
-        victory = Location(self.player, "His Holiness Escribar", None, self.multiworld.get_region("Deambulatory of His Holiness", self.player))
+        victory = Location(player, "His Holiness Escribar", None, world.get_region("D07Z01S03", player))
         victory.place_locked_item(self.create_event("Victory"))
-        self.multiworld.get_region("Deambulatory of His Holiness", self.player).locations.append(victory)
+        world.get_region("D07Z01S03", player).locations.append(victory)
 
-        if self.multiworld.ending[self.player].value == 1:
+        if world.ending[self.player].value == 1:
             set_rule(victory, lambda state: state.has("Thorn Upgrade", player, 8))
-        elif self.multiworld.ending[self.player].value == 2:
-            set_rule(victory, lambda state: state.has("Thorn Upgrade", player, 8) and \
+        elif world.ending[self.player].value == 2:
+            set_rule(victory, lambda state: state.has("Thorn Upgrade", player, 8) and
                 state.has("Holy Wound of Abnegation", player))
 
-        self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player)
+        world.completion_condition[self.player] = lambda state: state.has("Victory", player)
+        
+
+    def get_room_from_door(self, door: str) -> Region:
+        return self.multiworld.get_region(door.split("[")[0], self.player)
 
     
+    def get_connected_door(self, door: str) -> Entrance:
+        return self.multiworld.get_entrance(self.door_connections[door], self.player)
+    
+    
     def fill_slot_data(self) -> Dict[str, Any]:
         slot_data: Dict[str, Any] = {}
         locations = []
+        doors: Dict[str, str] = {}
 
-        for loc in self.multiworld.get_filled_locations(self.player):
-            if loc.name == "His Holiness Escribar":
+        world = self.multiworld
+        player = self.player
+        thorns: bool = True
+
+        if world.thorn_shuffle[player].value == 2:
+            thorns = False
+
+        for loc in world.get_filled_locations(player):
+            if loc.item.code == None:
                 continue
             else:
                 data = {
                     "id": self.location_name_to_game_id[loc.name],
                     "ap_id": loc.address,
                     "name": loc.item.name,
-                    "player_name": self.multiworld.player_name[loc.item.player]
+                    "player_name": world.player_name[loc.item.player],
+                    "type": int(loc.item.classification)
                 }
 
-                if loc.name in shop_set:
-                    data["type"] = loc.item.classification.name
-
                 locations.append(data)
 
         config = {
-            "versionCreated": "AP",
-            "general": {
-                "teleportationAlwaysUnlocked": bool(self.multiworld.prie_dieu_warp[self.player].value),
-                "skipCutscenes": bool(self.multiworld.skip_cutscenes[self.player].value),
-                "enablePenitence": bool(self.multiworld.penitence[self.player].value),
-                "hardMode": False,
-                "customSeed": 0,
-                "allowHints": bool(self.multiworld.corpse_hints[self.player].value)
-            },
-            "items": {
-                "type": 1,
-                "lungDamage": False,
-                "disableNPCDeath": True,
-                "startWithWheel": bool(self.multiworld.start_wheel[self.player].value),
-                "shuffleReliquaries": bool(self.multiworld.reliquary_shuffle[self.player].value)
-            },
-            "enemies": {
-                "type": self.multiworld.enemy_randomizer[self.player].value,
-                "maintainClass": bool(self.multiworld.enemy_groups[self.player].value),
-                "areaScaling": bool(self.multiworld.enemy_scaling[self.player].value)
-            },
-            "prayers": {
-                "type": 0,
-                "removeMirabis": False
-            },
-            "doors": {
-                "type": 0
-            },
-            "debug": {
-                "type": 0
-            }
+            "LogicDifficulty": world.difficulty[player].value,
+            "StartingLocation": world.starting_location[player].value,
+            "VersionCreated": "AP",
+            
+            "UnlockTeleportation": bool(world.prie_dieu_warp[player].value),
+            "AllowHints": bool(world.corpse_hints[player].value),
+            "AllowPenitence": bool(world.penitence[player].value),
+            
+            "ShuffleReliquaries": bool(world.reliquary_shuffle[player].value),
+            "ShuffleBootsOfPleading": bool(world.boots_of_pleading[player].value),
+            "ShufflePurifiedHand": bool(world.purified_hand[player].value),
+            "ShuffleDash": bool(world.dash_shuffle[player].value),
+            "ShuffleWallClimb": bool(world.wall_climb_shuffle[player].value),
+            
+            "ShuffleSwordSkills": bool(world.skill_randomizer[player].value),
+            "ShuffleThorns": thorns,
+            "JunkLongQuests": bool(world.skip_long_quests[player].value),
+            "StartWithWheel": bool(world.start_wheel[player].value),
+
+            "EnemyShuffleType": world.enemy_randomizer[player].value,
+            "MaintainClass": bool(world.enemy_groups[player].value),
+            "AreaScaling": bool(world.enemy_scaling[player].value),
+
+            "BossShuffleType": 0,
+            "DoorShuffleType": 0
         }
     
         slot_data = {
             "locations": locations,
+            "doors": doors,
             "cfg": config,
-            "ending": self.multiworld.ending[self.player].value,
-            "death_link": bool(self.multiworld.death_link[self.player].value)
+            "ending": world.ending[self.player].value,
+            "death_link": bool(world.death_link[self.player].value)
         }
     
         return slot_data
diff --git a/worlds/blasphemous/docs/setup_en.md b/worlds/blasphemous/docs/setup_en.md
index 999765bb69bb..cc238a492eb3 100644
--- a/worlds/blasphemous/docs/setup_en.md
+++ b/worlds/blasphemous/docs/setup_en.md
@@ -1,24 +1,49 @@
 # Blasphemous Multiworld Setup Guide
 
-## Required Software
+## Useful Links
 
-- Blasphemous from: [Steam](https://store.steampowered.com/app/774361/Blasphemous/)
-- Blasphemous Modding API from: [GitHub](https://github.com/BrandenEK/Blasphemous-Modding-API)
-- Blasphemous Randomizer from: [GitHub](https://github.com/BrandenEK/Blasphemous-Randomizer)
-- Blasphemous Multiworld from: [GitHub](https://github.com/BrandenEK/Blasphemous-Multiworld)
-- (*Optional*) PopTracker Pack from: [GitHub](https://github.com/sassyvania/Blasphemous-Randomizer-Maptracker) 
+Required:
+- Blasphemous: [Steam](https://store.steampowered.com/app/774361/Blasphemous/)
+    - The GOG version of Blasphemous will also work.
+- Blasphemous Mod Installer: [GitHub](https://github.com/BrandenEK/Blasphemous-Mod-Installer)
+- Blasphemous Modding API: [GitHub](https://github.com/BrandenEK/Blasphemous-Modding-API)
+- Blasphemous Randomizer: [GitHub](https://github.com/BrandenEK/Blasphemous-Randomizer)
+- Blasphemous Multiworld: [GitHub](https://github.com/BrandenEK/Blasphemous-Multiworld)
 
-## Instructions (Windows)
+Optional:
+- In-game map tracker: [GitHub](https://github.com/BrandenEK/Blasphemous-Rando-Map)
+- Quick Prie Dieu warp mod: [GitHub](https://github.com/BadMagic100/Blasphemous-PrieWarp)
+- Boots of Pleading mod: [GitHub](https://github.com/BrandenEK/Blasphemous-Boots-of-Pleading)
+- Double Jump mod: [GitHub](https://github.com/BrandenEK/Blasphemous-Double-Jump)
+- PopTracker pack: [GitHub](https://github.com/sassyvania/Blasphemous-Randomizer-Maptracker) 
 
-1. Download the [Modding API](https://github.com/BrandenEK/Blasphemous-Modding-API/releases), and follow the [installation instructions](https://github.com/BrandenEK/Blasphemous-Modding-API#installation) on the GitHub page.
+## Mod Installer (Recommended)
 
-2. After the Modding API has been installed, download the [Randomizer](https://github.com/BrandenEK/Blasphemous-Randomizer/releases) and [Multiworld](https://github.com/BrandenEK/Blasphemous-Multiworld/releases) archives, and extract the contents of both into the `Modding` folder.
+1. Download the [Mod Installer](https://github.com/BrandenEK/Blasphemous-Mod-Installer),
+and point it to your install directory for Blasphemous.
 
-3. Start Blasphemous. To verfy that the mods are working, look for a version number for both the Randomizer and Multiworld on the title screen.
+2. Install the `Modding API`, `Randomizer`, and `Multiworld` mods. Optionally, you can also install the
+`Rando Map`, `PrieWarp`, `Boots of Pleading`, and `Double Jump` mods, and set up the PopTracker pack if desired.
 
-4. (*Optional*) Add the Blasphemous pack to PopTracker. In game, open the console by pressing backslash `\` and type `randomizer autotracker on` to automatically connect the game to PopTracker.
+3. Start Blasphemous. To verfy that the mods are working, look for a version number for both
+the Randomizer and Multiworld on the title screen.
+
+## Manual Installation
+
+1. Download the [Modding API](https://github.com/BrandenEK/Blasphemous-Modding-API/releases), and follow
+the [installation instructions](https://github.com/BrandenEK/Blasphemous-Modding-API#installation) on the GitHub page.
+
+2. After the Modding API has been installed, download the 
+[Randomizer](https://github.com/BrandenEK/Blasphemous-Randomizer/releases) and 
+[Multiworld](https://github.com/BrandenEK/Blasphemous-Multiworld/releases) archives, and extract the contents of both
+into the `Modding` folder. Then, add any desired additional mods.
+
+3. Start Blasphemous. To verfy that the mods are working, look for a version number for both
+the Randomizer and Multiworld on the title screen.
 
 ## Connecting
 
-To connect to an Archipelago server, open the in-game console by pressing backslash `\` and use the command `multiworld connect [address:port] [name] [password]`. The port and password are both optional - if no port is provided then the default port of 38281 is used.
+To connect to an Archipelago server, open the in-game console by pressing backslash `\` and use
+the command `multiworld connect [address:port] [name] [password]`. 
+The port and password are both optional - if no port is provided then the default port of 38281 is used.
 **Make sure to connect to the server before attempting to start a new save file.**
\ No newline at end of file

From feaa30d80834342d667331d5f6ee07caf6377b1c Mon Sep 17 00:00:00 2001
From: Remy Jette <remy@remyjette.com>
Date: Fri, 7 Jul 2023 07:47:11 -0700
Subject: [PATCH 10/24] Docs, StS: Document setup for Slay the Spire GOG/Game
 Pass installations (#1913)

Co-authored-by: KonoTyran <Kono.Tyran@gmail.com>
---
 worlds/spire/docs/slay-the-spire_en.md | 47 ++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/worlds/spire/docs/slay-the-spire_en.md b/worlds/spire/docs/slay-the-spire_en.md
index d7ce686284e8..d85a17d987b2 100644
--- a/worlds/spire/docs/slay-the-spire_en.md
+++ b/worlds/spire/docs/slay-the-spire_en.md
@@ -2,12 +2,36 @@
 
 ## Required Software
 
-For steam-based installation, subscribe to the following mods:
+For Steam-based installation, subscribe to the following mods:
 
-- ModTheSpire from the [Slay the Spire Workshop](https://steamcommunity.com/sharedfiles/filedetails/?id=1605060445)
-- BaseMod from the [Slay the Spire Workshop](https://steamcommunity.com/workshop/filedetails/?id=1605833019)
-- Archipelago Multiworld Randomizer Mod from
-  the [Slay the Spire Workshop](https://steamcommunity.com/sharedfiles/filedetails/?id=2596397288)
+- [ModTheSpire](https://steamcommunity.com/sharedfiles/filedetails/?id=1605060445)
+- [BaseMod](https://steamcommunity.com/workshop/filedetails/?id=1605833019)
+- [Archipelago Multiworld Randomizer](https://steamcommunity.com/sharedfiles/filedetails/?id=2596397288)
+- (optional) [Downfall](https://steamcommunity.com/sharedfiles/filedetails/?id=1610056683)
+- (required for downfall) [StSLib](https://steamcommunity.com/workshop/filedetails/?id=1609158507)
+
+For GOG or Xbox PC Game Pass installation:
+
+1. Download the official Steam Console Client [SteamCMD](https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip).
+2. Unpack that .zip file into some folder and double-click on `steamcmd.exe`.
+3. The client will now update itself. When it's ready type `login anonymous`. Now you are ready to download the actual
+    mods.
+4. Run the following commands to download the required mod files:
+  - Mod the Spire: `workshop_download_item 646570 1605060445`
+  - BaseMod: `workshop_download_item 646570 1605833019`
+  - ArchipelagoMW: `workshop_download_item 646570 2596397288`
+  - (optional) Downfall: `workshop_download_item 646570 1610056683`
+  - (required for Downfall) StSLib: `workshop_download_item 646570 1609158507`
+5. Open your Slay the Spire installation directory. By default on GOG this is `C:\GOG Games\Slay the Spire`, on PC Game
+    Pass this is `C:\XboxGames\Slay The Spire\Content`.
+6. In the folder where you unzipped SteamCMD there will now be a `steamapps` folder. Copy ModTheSpire.jar from
+    `steamapps\workshop\content\646570\1605060445\ModTheSpire.jar` to your Slay The Spire installation directory.
+7. Create a folder named `mods` inside the Slay the Spire installation directory. Each folder inside
+    `steamapps\workshop\content\646570` will have a single .jar file. Copy each of them except ModTheSpire.jar into the
+    `mods` folder you made.
+8. Now open Notepad. Paste in the following text: `jre\bin\java.exe -jar ModTheSpire.jar`. Go to "File -> Save as" and
+    save it into your Slay the Spire installation directory with the name `"start.bat"`. Make sure to include the quotes
+    in the file name!
 
 ## Configuring your YAML file
 
@@ -25,12 +49,21 @@ the [Slay the Spire Settings Page](/games/Slay%20the%20Spire/player-settings).
 ### Connect to the MultiServer
 
 For Steam-based installations, if you are subscribed to ModTheSpire, when you launch the game, you should have the
-option to launch the game with mods. On the mod loader screen, ensure you only have the following mods enabled and then
-start the game:
+option to launch the game with mods.
+
+For GOG or Xbox PC Game Pass intallations, launch the game by double-clicking the `start.bat` file you created earlier
+which will give you the option to launch the game with mods.
+
+On the mod loader screen, ensure you only have the following mods enabled and then start the game:
 
 - BaseMod
 - Archipelago Multiworld Randomizer
 
+If playing with Downfall, also make sure the following are enabled:
+
+- Downfall
+- StSLib
+
 Once you are in-game, you will be able to click the **Archipelago** menu option and enter the ip and port (separated by
 a colon) in the hostname field and enter your player slot name in the Slot Name field. Then click connect, and now you
 are ready to climb the spire!

From cfe14aec76f8adc1d184afa5b1303e65bc0c46fd Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Sun, 9 Jul 2023 14:21:05 +0200
Subject: [PATCH 11/24] The Witness: Add Quarry Stoneworks Control Room Left to
 the hint pool (#1957)

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

diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index 4336f8006510..2f9e79297062 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -180,6 +180,7 @@ def get_priority_hint_locations(multiworld: MultiWorld, player: int):
         "Mountainside Discard",
         "Tunnels Theater Flowers EP",
         "Boat Shipwreck Green EP",
+        "Quarry Stoneworks Control Room Left",
     }
 
 

From 736945658aad2ba7344ae4f33888f25722966924 Mon Sep 17 00:00:00 2001
From: espeon65536 <81029175+espeon65536@users.noreply.github.com>
Date: Sun, 9 Jul 2023 06:30:05 -0600
Subject: [PATCH 12/24] OoT: Python 3.11 Compatibility fix and Minor Bug fixes
 (#1948)

* OoT: biggoron's sword and giant's knife now considered progression in non-glitchless

* OoT: fixed seeding the random module with the Random object
---
 worlds/oot/Cosmetics.py | 2 +-
 worlds/oot/Items.py     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/worlds/oot/Cosmetics.py b/worlds/oot/Cosmetics.py
index 7b8008fbe6d1..f40f8a1ebb06 100644
--- a/worlds/oot/Cosmetics.py
+++ b/worlds/oot/Cosmetics.py
@@ -769,7 +769,7 @@ def patch_instrument(rom, ootworld, symbols):
 
 def patch_cosmetics(ootworld, rom):
     # Use the world's slot seed for cosmetics
-    random.seed(ootworld.multiworld.per_slot_randoms[ootworld.player])
+    random.seed(ootworld.multiworld.per_slot_randoms[ootworld.player].random())
 
     # try to detect the cosmetic patch data format
     versioned_patch_set = None
diff --git a/worlds/oot/Items.py b/worlds/oot/Items.py
index e3ce920d12b6..4569256382a0 100644
--- a/worlds/oot/Items.py
+++ b/worlds/oot/Items.py
@@ -94,7 +94,7 @@ def dungeonitem(self) -> bool:
     'Eyedrops':                                        ('Item',     True,  0x25, {'trade': True}),
     'Claim Check':                                     ('Item',     True,  0x26, {'trade': True}),
     'Kokiri Sword':                                    ('Item',     True,  0x27, None),
-    'Giants Knife':                                    ('Item',     None,  0x28, None),
+    'Giants Knife':                                    ('Item',     True,  0x28, None),
     'Deku Shield':                                     ('Item',     None,  0x29, None),
     'Hylian Shield':                                   ('Item',     None,  0x2A, None),
     'Mirror Shield':                                   ('Item',     True,  0x2B, None),
@@ -124,7 +124,7 @@ def dungeonitem(self) -> bool:
     'Gerudo Mask':                                     ('Item',     None,  0x53, None),
     'Rupees (50)':                                     ('Item',     None,  0x55, {'junk': 1}),
     'Rupees (200)':                                    ('Item',     None,  0x56, {'junk': 0}),
-    'Biggoron Sword':                                  ('Item',     None,  0x57, None),
+    'Biggoron Sword':                                  ('Item',     True,  0x57, None),
     'Fire Arrows':                                     ('Item',     True,  0x58, None),
     'Ice Arrows':                                      ('Item',     True,  0x59, None),
     'Light Arrows':                                    ('Item',     True,  0x5A, None),

From 36474c3ccc43e9bd89aa044b5f02151a8295691f Mon Sep 17 00:00:00 2001
From: zig-for <san.francisco.engineer@gmail.com>
Date: Sun, 9 Jul 2023 06:17:24 -0700
Subject: [PATCH 13/24] LADX: Client Fixes (#1934)

---
 LinksAwakeningClient.py | 248 +++++++++++++++++++++++++++-------------
 data/lua/socket.lua     |  18 ++-
 worlds/ladx/__init__.py |  21 +++-
 3 files changed, 200 insertions(+), 87 deletions(-)

diff --git a/LinksAwakeningClient.py b/LinksAwakeningClient.py
index 7a5972eb0182..8f1cbc1e9e83 100644
--- a/LinksAwakeningClient.py
+++ b/LinksAwakeningClient.py
@@ -9,16 +9,19 @@
 import asyncio
 import base64
 import binascii
+import colorama
 import io
-import logging
+import os
+import re
 import select
+import shlex
 import socket
+import struct
+import sys
+import subprocess
 import time
 import typing
-import urllib
 
-import colorama
-import struct
 
 from CommonClient import (CommonContext, get_base_parser, gui_enabled, logger,
                           server_loop)
@@ -30,6 +33,7 @@
 from worlds.ladx.Locations import get_locations_to_id, meta_to_name
 from worlds.ladx.Tracker import LocationTracker, MagpieBridge
 
+
 class GameboyException(Exception):
     pass
 
@@ -115,17 +119,17 @@ def __init__(self, address, port) -> None:
         assert (self.socket)
         self.socket.setblocking(False)
 
-    def get_retroarch_version(self):
-        self.send(b'VERSION\n')
-        select.select([self.socket], [], [])
-        response_str, addr = self.socket.recvfrom(16)
+    async def send_command(self, command, timeout=1.0):
+        self.send(f'{command}\n')
+        response_str = await self.async_recv()
+        self.check_command_response(command, response_str)
         return response_str.rstrip()
 
-    def get_retroarch_status(self, timeout):
-        self.send(b'GET_STATUS\n')
-        select.select([self.socket], [], [], timeout)
-        response_str, addr = self.socket.recvfrom(1000, )
-        return response_str.rstrip()
+    async def get_retroarch_version(self):
+        return await self.send_command("VERSION")
+
+    async def get_retroarch_status(self):
+        return await self.send_command("GET_STATUS")
 
     def set_cache_limits(self, cache_start, cache_size):
         self.cache_start = cache_start
@@ -141,8 +145,8 @@ def recv(self):
         response, _ = self.socket.recvfrom(4096)
         return response
 
-    async def async_recv(self):
-        response = await asyncio.get_event_loop().sock_recv(self.socket, 4096)
+    async def async_recv(self, timeout=1.0):
+        response = await asyncio.wait_for(asyncio.get_event_loop().sock_recv(self.socket, 4096), timeout)
         return response
 
     async def check_safe_gameplay(self, throw=True):
@@ -169,6 +173,8 @@ async def check_wram():
                 raise InvalidEmulatorStateError()
             return False
         if not await check_wram():
+            if throw:
+                raise InvalidEmulatorStateError()
             return False
         return True
 
@@ -227,20 +233,30 @@ async def async_read_memory_safe(self, address, size=1):
 
         return r
 
+    def check_command_response(self, command: str, response: bytes):
+        if command == "VERSION":
+            ok = re.match("\d+\.\d+\.\d+", response.decode('ascii')) is not None
+        else:
+            ok = response.startswith(command.encode())
+        if not ok:
+            logger.warning(f"Bad response to command {command} - {response}")
+            raise BadRetroArchResponse()
+
     def read_memory(self, address, size=1):
         command = "READ_CORE_MEMORY"
 
         self.send(f'{command} {hex(address)} {size}\n')
         response = self.recv()
 
-        splits = response.decode().split(" ", 2)
+        self.check_command_response(command, response)
 
-        assert (splits[0] == command)
+        splits = response.decode().split(" ", 2)
         # Ignore the address for now
-
-        # TODO: transform to bytes
-        if splits[2][:2] == "-1" or splits[0] != "READ_CORE_MEMORY":
+        if splits[2][:2] == "-1":
             raise BadRetroArchResponse()
+
+        # TODO: check response address, check hex behavior between RA and BH
+
         return bytearray.fromhex(splits[2])
 
     async def async_read_memory(self, address, size=1):
@@ -248,14 +264,21 @@ async def async_read_memory(self, address, size=1):
 
         self.send(f'{command} {hex(address)} {size}\n')
         response = await self.async_recv()
+        self.check_command_response(command, response)
         response = response[:-1]
         splits = response.decode().split(" ", 2)
+        try:
+            response_addr = int(splits[1], 16)
+        except ValueError:
+            raise BadRetroArchResponse()
 
-        assert (splits[0] == command)
-        # Ignore the address for now
+        if response_addr != address:
+            raise BadRetroArchResponse()
 
-        # TODO: transform to bytes
-        return bytearray.fromhex(splits[2])
+        ret = bytearray.fromhex(splits[2])
+        if len(ret) > size:
+            raise BadRetroArchResponse()
+        return ret
 
     def write_memory(self, address, bytes):
         command = "WRITE_CORE_MEMORY"
@@ -263,7 +286,7 @@ def write_memory(self, address, bytes):
         self.send(f'{command} {hex(address)} {" ".join(hex(b) for b in bytes)}')
         select.select([self.socket], [], [])
         response, _ = self.socket.recvfrom(4096)
-
+        self.check_command_response(command, response)
         splits = response.decode().split(" ", 3)
 
         assert (splits[0] == command)
@@ -281,6 +304,9 @@ class LinksAwakeningClient():
     pending_deathlink = False
     deathlink_debounce = True
     recvd_checks = {}
+    retroarch_address = None
+    retroarch_port = None
+    gameboy = None
 
     def msg(self, m):
         logger.info(m)
@@ -288,50 +314,47 @@ def msg(self, m):
         self.gameboy.send(s)
 
     def __init__(self, retroarch_address="127.0.0.1", retroarch_port=55355):
-        self.gameboy = RAGameboy(retroarch_address, retroarch_port)
+        self.retroarch_address = retroarch_address
+        self.retroarch_port = retroarch_port
+        pass
 
+    stop_bizhawk_spam = False
     async def wait_for_retroarch_connection(self):
-        logger.info("Waiting on connection to Retroarch...")
+        if not self.stop_bizhawk_spam:
+            logger.info("Waiting on connection to Retroarch...")
+            self.stop_bizhawk_spam = True
+        self.gameboy = RAGameboy(self.retroarch_address, self.retroarch_port)
+
         while True:
             try:
-                version = self.gameboy.get_retroarch_version()
+                version = await self.gameboy.get_retroarch_version()
                 NO_CONTENT = b"GET_STATUS CONTENTLESS"
                 status = NO_CONTENT
                 core_type = None
                 GAME_BOY = b"game_boy"
                 while status == NO_CONTENT or core_type != GAME_BOY:
-                    try:
-                        status = self.gameboy.get_retroarch_status(0.1)
-                        if status.count(b" ") < 2:
-                            await asyncio.sleep(1.0)
-                            continue
-                        
-                        GET_STATUS, PLAYING, info = status.split(b" ", 2)
-                        if status.count(b",") < 2:
-                            await asyncio.sleep(1.0)
-                            continue
-                        core_type, rom_name, self.game_crc = info.split(b",", 2)
-                        if core_type != GAME_BOY:
-                            logger.info(
-                                f"Core type should be '{GAME_BOY}', found {core_type} instead - wrong type of ROM?")
-                            await asyncio.sleep(1.0)
-                            continue
-                    except (BlockingIOError, TimeoutError) as e:
-                        await asyncio.sleep(0.1)
-                        pass
-                logger.info(f"Connected to Retroarch {version} {info}")
-                self.gameboy.read_memory(0x1000)
+                    status = await self.gameboy.get_retroarch_status()
+                    if status.count(b" ") < 2:
+                        await asyncio.sleep(1.0)
+                        continue
+                    GET_STATUS, PLAYING, info = status.split(b" ", 2)
+                    if status.count(b",") < 2:
+                        await asyncio.sleep(1.0)
+                        continue
+                    core_type, rom_name, self.game_crc = info.split(b",", 2)
+                    if core_type != GAME_BOY:
+                        logger.info(
+                            f"Core type should be '{GAME_BOY}', found {core_type} instead - wrong type of ROM?")
+                        await asyncio.sleep(1.0)
+                        continue
+                logger.info(f"Connected to Retroarch {version.decode('ascii')} running {rom_name.decode('ascii')}")
                 return
-            except ConnectionResetError:
+            except (BlockingIOError, TimeoutError, ConnectionResetError):
                 await asyncio.sleep(1.0)
                 pass
-
-    def reset_auth(self):
-        auth = binascii.hexlify(self.gameboy.read_memory(0x0134, 12)).decode()
-
-        if self.auth:
-            assert (auth == self.auth)
-
+        self.stop_bizhawk_spam = False
+    async def reset_auth(self):
+        auth = binascii.hexlify(await self.gameboy.async_read_memory(0x0134, 12)).decode()
         self.auth = auth
 
     async def wait_and_init_tracker(self):
@@ -367,11 +390,14 @@ async def recved_item_from_ap(self, item_id, from_player, next_index):
         status = self.gameboy.write_memory(LAClientConstants.wLinkStatusBits, [status])
         self.gameboy.write_memory(LAClientConstants.wRecvIndex, struct.pack(">H", next_index))
 
+    should_reset_auth = False
     async def wait_for_game_ready(self):
         logger.info("Waiting on game to be in valid state...")
         while not await self.gameboy.check_safe_gameplay(throw=False):
-            pass
-        logger.info("Ready!")
+            if self.should_reset_auth:
+                self.should_reset_auth = False
+                raise GameboyException("Resetting due to wrong archipelago server")
+        logger.info("Game connection ready!")
 
     async def is_victory(self):
         return (await self.gameboy.read_memory_cache([LAClientConstants.wGameplayType]))[LAClientConstants.wGameplayType] == 1
@@ -398,7 +424,7 @@ async def main_tick(self, item_get_cb, win_cb, deathlink_cb):
         if await self.is_victory():
             await win_cb()
 
-        recv_index = struct.unpack(">H", self.gameboy.read_memory(LAClientConstants.wRecvIndex, 2))[0]
+        recv_index = struct.unpack(">H", await self.gameboy.async_read_memory(LAClientConstants.wRecvIndex, 2))[0]
 
         # Play back one at a time
         if recv_index in self.recvd_checks:
@@ -480,6 +506,15 @@ async def send_checks(self):
         message = [{"cmd": 'LocationChecks', "locations": self.found_checks}]
         await self.send_msgs(message)
 
+    had_invalid_slot_data = None
+    def event_invalid_slot(self):
+        # The next time we try to connect, reset the game loop for new auth
+        self.had_invalid_slot_data = True
+        self.auth = None
+        # Don't try to autoreconnect, it will just fail
+        self.disconnected_intentionally = True
+        CommonContext.event_invalid_slot(self)
+
     ENABLE_DEATHLINK = False
     async def send_deathlink(self):
         if self.ENABLE_DEATHLINK:
@@ -511,8 +546,17 @@ def new_checks(self, item_ids, ladxr_ids):
     async def server_auth(self, password_requested: bool = False):
         if password_requested and not self.password:
             await super(LinksAwakeningContext, self).server_auth(password_requested)
+
+        if self.had_invalid_slot_data:
+            # We are connecting when previously we had the wrong ROM or server - just in case
+            # re-read the ROM so that if the user had the correct address but wrong ROM, we
+            # allow a successful reconnect
+            self.client.should_reset_auth = True
+            self.had_invalid_slot_data = False
+
+        while self.client.auth == None:
+            await asyncio.sleep(0.1)
         self.auth = self.client.auth
-        await self.get_username()
         await self.send_connect()
 
     def on_package(self, cmd: str, args: dict):
@@ -520,9 +564,13 @@ def on_package(self, cmd: str, args: dict):
             self.game = self.slot_info[self.slot].game
         # TODO - use watcher_event
         if cmd == "ReceivedItems":
-            for index, item in enumerate(args["items"], args["index"]):
+            for index, item in enumerate(args["items"], start=args["index"]):
                 self.client.recvd_checks[index] = item
 
+    async def sync(self):
+        sync_msg = [{'cmd': 'Sync'}]
+        await self.send_msgs(sync_msg)
+
     item_id_lookup = get_locations_to_id()
 
     async def run_game_loop(self):
@@ -539,17 +587,31 @@ async def deathlink():
 
         if self.magpie_enabled:
             self.magpie_task = asyncio.create_task(self.magpie.serve())
-        
+
         # yield to allow UI to start
         await asyncio.sleep(0)
 
         while True:
             try:
                 # TODO: cancel all client tasks
-                logger.info("(Re)Starting game loop")
+                if not self.client.stop_bizhawk_spam:
+                    logger.info("(Re)Starting game loop")
                 self.found_checks.clear()
+                # On restart of game loop, clear all checks, just in case we swapped ROMs
+                # this isn't totally neccessary, but is extra safety against cross-ROM contamination
+                self.client.recvd_checks.clear()
                 await self.client.wait_for_retroarch_connection()
-                self.client.reset_auth()
+                await self.client.reset_auth()
+                # If we find ourselves with new auth after the reset, reconnect
+                if self.auth and self.client.auth != self.auth:
+                    # It would be neat to reconnect here, but connection needs this loop to be running
+                    logger.info("Detected new ROM, disconnecting...")
+                    await self.disconnect()
+                    continue
+
+                if not self.client.recvd_checks:
+                    await self.sync()
+
                 await self.client.wait_and_init_tracker()
 
                 while True:
@@ -560,39 +622,59 @@ async def deathlink():
                         self.last_resend = now
                         await self.send_checks()
                     if self.magpie_enabled:
-                        self.magpie.set_checks(self.client.tracker.all_checks)
-                        await self.magpie.set_item_tracker(self.client.item_tracker)
-                        await self.magpie.send_gps(self.client.gps_tracker)
+                        try:
+                            self.magpie.set_checks(self.client.tracker.all_checks)
+                            await self.magpie.set_item_tracker(self.client.item_tracker)
+                            await self.magpie.send_gps(self.client.gps_tracker)
+                        except Exception:
+                            # Don't let magpie errors take out the client
+                            pass
+                    if self.client.should_reset_auth:
+                        self.client.should_reset_auth = False
+                        raise GameboyException("Resetting due to wrong archipelago server")
+            except (GameboyException, asyncio.TimeoutError, TimeoutError, ConnectionResetError):
+                await asyncio.sleep(1.0)
 
-            except GameboyException:
-                time.sleep(1.0)
-                pass
+def run_game(romfile: str) -> None:
+    auto_start = typing.cast(typing.Union[bool, str],
+                            Utils.get_options()["ladx_options"].get("rom_start", True))
+    if auto_start is True:
+        import webbrowser
+        webbrowser.open(romfile)
+    elif isinstance(auto_start, str):
+        args = shlex.split(auto_start)
+        # Specify full path to ROM as we are going to cd in popen
+        full_rom_path = os.path.realpath(romfile)
+        args.append(full_rom_path)
+        try:
+            # set cwd so that paths to lua scripts are always relative to our client
+            if getattr(sys, 'frozen', False):
+                # The application is frozen
+                script_dir = os.path.dirname(sys.executable)
+            else:
+                script_dir = os.path.dirname(os.path.realpath(__file__))
 
+            subprocess.Popen(args, stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=script_dir)
+        except FileNotFoundError:
+            logger.error(f"Couldn't launch ROM, {args[0]} is missing")
 
 async def main():
     parser = get_base_parser(description="Link's Awakening Client.")
     parser.add_argument("--url", help="Archipelago connection url")
     parser.add_argument("--no-magpie", dest='magpie', default=True, action='store_false', help="Disable magpie bridge")
-
     parser.add_argument('diff_file', default="", type=str, nargs="?",
                         help='Path to a .apladx Archipelago Binary Patch file')
-                        
+
     args = parser.parse_args()
-    logger.info(args)
 
     if args.diff_file:
         import Patch
         logger.info("patch file was supplied - creating rom...")
         meta, rom_file = Patch.create_rom_file(args.diff_file)
-        if "server" in meta:
-            args.url = meta["server"]
+        if "server" in meta and not args.connect:
+            args.connect = meta["server"]
         logger.info(f"wrote rom file to {rom_file}")
 
-    if args.url:
-        url = urllib.parse.urlparse(args.url)
-        args.connect = url.netloc
-        if url.password:
-            args.password = urllib.parse.unquote(url.password)
 
     ctx = LinksAwakeningContext(args.connect, args.password, args.magpie)
 
@@ -604,6 +686,10 @@ async def main():
         ctx.run_gui()
     ctx.run_cli()
 
+    # Down below run_gui so that we get errors out of the process
+    if args.diff_file:
+        run_game(rom_file)
+
     await ctx.exit_event.wait()
     await ctx.shutdown()
 
diff --git a/data/lua/socket.lua b/data/lua/socket.lua
index 0005c3273ffb..72ffe0c88a6b 100644
--- a/data/lua/socket.lua
+++ b/data/lua/socket.lua
@@ -46,10 +46,10 @@ function get_socket_path()
     local pwd = (io.popen and io.popen("cd"):read'*l') or "."
 	return pwd .. "/" .. arch .. "/socket-" .. the_os .. "-" .. get_lua_version() .. "." .. ext
 end
-
+local lua_version = get_lua_version()
 local socket_path = get_socket_path()
 local socket = assert(package.loadlib(socket_path, "luaopen_socket_core"))()
-
+local event = event
 -- http://lua-users.org/wiki/ModulesTutorial
 local M = {}
 if setfenv then
@@ -59,6 +59,20 @@ else
 end
 
 M.socket = socket
+-- Bizhawk <= 2.8 has an issue where resetting the lua doesn't close the socket
+-- ...to get around this, we register an exit handler to close the socket first
+if lua_version == '5-1' then
+    local old_udp = socket.udp
+    function udp(self)
+        s = old_udp(self)
+        function close_socket(self)
+            s:close()
+        end
+        event.onexit(close_socket)
+        return s
+    end
+    socket.udp = udp
+end
 
 -----------------------------------------------------------------------------
 -- Exported auxiliar functions
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 84fd235cf055..f1c3ba0d4d60 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -39,8 +39,23 @@ class RomFile(settings.UserFilePath):
         description = "LADX ROM File"
         md5s = [LADXDeltaPatch.hash]
 
-    rom_file: RomFile = RomFile(RomFile.copy_to)
+    class RomStart(str):
+        """
+        Set this to false to never autostart a rom (such as after patching)
+                    true  for operating system default program
+        Alternatively, a path to a program to open the .gbc file with
+        Examples:
+           Retroarch:
+        rom_start: "C:/RetroArch-Win64/retroarch.exe -L sameboy"
+           BizHawk:
+        rom_start: "C:/BizHawk-2.9-win-x64/EmuHawk.exe --lua=data/lua/connector_ladx_bizhawk.lua"
+        """
+
+    class DisplayMsgs(settings.Bool):
+        """Display message inside of Bizhawk"""
 
+    rom_file: RomFile = RomFile(RomFile.copy_to)
+    rom_start: typing.Union[RomStart, bool] = True
 
 class LinksAwakeningWebWorld(WebWorld):
     tutorials = [Tutorial(
@@ -451,12 +466,10 @@ def generate_output(self, output_directory: str):
                     # Kind of kludge, make it possible for the location to differentiate between local and remote items
                     loc.ladxr_item.location_owner = self.player
 
-        rom_name = "Legend of Zelda, The - Link's Awakening DX (USA, Europe) (SGB Enhanced).gbc"
+        rom_name = Rom.get_base_rom_path()
         out_name = f"AP-{self.multiworld.seed_name}-P{self.player}-{self.multiworld.player_name[self.player]}.gbc"
         out_path = os.path.join(output_directory, f"{self.multiworld.get_out_file_name_base(self.player)}.gbc")
 
-
-
         parser = get_parser()
         args = parser.parse_args([rom_name, "-o", out_name, "--dump"])
 

From 07d74ac1863c31906020cc1f7f500e1f8260a142 Mon Sep 17 00:00:00 2001
From: Aaron Wagener <mmmcheese158@gmail.com>
Date: Sun, 9 Jul 2023 10:52:20 -0500
Subject: [PATCH 14/24] Core: Region connection helpers (#1923)

* Region.create_exit and Region.connect helpers

* reduce code duplication and better naming in Region.connect

* thank you tests

* reorder class definition

* define entrance_type on Region

* document helpers

* drop __class_getitem__ for now

* review changes
---
 BaseClasses.py    | 124 ++++++++++++++++++++++++++++------------------
 docs/world api.md |  40 +++++++--------
 2 files changed, 95 insertions(+), 69 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 2cc7596e5fe0..7c12a94dea65 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -9,7 +9,8 @@
 from argparse import Namespace
 from collections import ChainMap, Counter, deque
 from enum import IntEnum, IntFlag
-from typing import Any, Callable, Dict, Iterable, Iterator, List, NamedTuple, Optional, Set, Tuple, TypedDict, Union
+from typing import Any, Callable, Dict, Iterable, Iterator, List, NamedTuple, Optional, Set, Tuple, TypedDict, Union, \
+    Type, ClassVar
 
 import NetUtils
 import Options
@@ -788,6 +789,44 @@ def remove(self, item: Item):
             self.stale[item.player] = True
 
 
+class Entrance:
+    access_rule: Callable[[CollectionState], bool] = staticmethod(lambda state: True)
+    hide_path: bool = False
+    player: int
+    name: str
+    parent_region: Optional[Region]
+    connected_region: Optional[Region] = None
+    # LttP specific, TODO: should make a LttPEntrance
+    addresses = None
+    target = None
+
+    def __init__(self, player: int, name: str = '', parent: Region = None):
+        self.name = name
+        self.parent_region = parent
+        self.player = player
+
+    def can_reach(self, state: CollectionState) -> bool:
+        if self.parent_region.can_reach(state) and self.access_rule(state):
+            if not self.hide_path and not self in state.path:
+                state.path[self] = (self.name, state.path.get(self.parent_region, (self.parent_region.name, None)))
+            return True
+
+        return False
+
+    def connect(self, region: Region, addresses: Any = None, target: Any = None) -> None:
+        self.connected_region = region
+        self.target = target
+        self.addresses = addresses
+        region.entrances.append(self)
+
+    def __repr__(self):
+        return self.__str__()
+
+    def __str__(self):
+        world = self.parent_region.multiworld if self.parent_region else None
+        return world.get_name_string_for_object(self) if world else f'{self.name} (Player {self.player})'
+
+
 class Region:
     name: str
     _hint_text: str
@@ -796,6 +835,7 @@ class Region:
     entrances: List[Entrance]
     exits: List[Entrance]
     locations: List[Location]
+    entrance_type: ClassVar[Type[Entrance]] = Entrance
 
     def __init__(self, name: str, player: int, multiworld: MultiWorld, hint: Optional[str] = None):
         self.name = name
@@ -823,20 +863,48 @@ def can_reach_private(self, state: CollectionState) -> bool:
     def hint_text(self) -> str:
         return self._hint_text if self._hint_text else self.name
 
-    def get_connecting_entrance(self, is_main_entrance: typing.Callable[[Entrance], bool]) -> Entrance:
+    def get_connecting_entrance(self, is_main_entrance: Callable[[Entrance], bool]) -> Entrance:
         for entrance in self.entrances:
             if is_main_entrance(entrance):
                 return entrance
         for entrance in self.entrances:  # BFS might be better here, trying DFS for now.
             return entrance.parent_region.get_connecting_entrance(is_main_entrance)
 
-    def add_locations(self, locations: Dict[str, Optional[int]], location_type: Optional[typing.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."""
+    def add_locations(self, locations: Dict[str, Optional[int]],
+                      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.
+        
+        :param locations: dictionary of locations to be created and added to this Region `{name: ID}`
+        :param location_type: Location class to be used to create the locations with"""
         if location_type is None:
             location_type = Location
         for location, address in locations.items():
             self.locations.append(location_type(self.player, location, address, self))
+    
+    def connect(self, connecting_region: Region, name: Optional[str] = None,
+                rule: Optional[Callable[[CollectionState], bool]] = None) -> None:
+        """
+        Connects this Region to another Region, placing the provided rule on the connection.
+        
+        :param connecting_region: Region object to connect to path is `self -> exiting_region`
+        :param name: name of the connection being created
+        :param rule: callable to determine access of this connection to go from self to the exiting_region"""
+        exit_ = self.create_exit(name if name else f"{self.name} -> {connecting_region.name}")
+        if rule:
+            exit_.access_rule = rule
+        exit_.connect(connecting_region)
+    
+    def create_exit(self, name: str) -> Entrance:
+        """
+        Creates and returns an Entrance object as an exit of this region.
+        
+        :param name: name of the Entrance being created
+        """
+        exit_ = self.entrance_type(self.player, name, self)
+        self.exits.append(exit_)
+        return exit_
 
     def add_exits(self, exits: Union[Iterable[str], Dict[str, Optional[str]]],
                   rules: Dict[str, Callable[[CollectionState], bool]] = None) -> None:
@@ -850,11 +918,9 @@ 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():
-            entrance = Entrance(self.player, name if name else f"{self.name} -> {connecting_region}", self)
-            if rules and connecting_region in rules:
-                entrance.access_rule = rules[connecting_region]
-            self.exits.append(entrance)
-            entrance.connect(self.multiworld.get_region(connecting_region, self.player))
+            self.connect(self.multiworld.get_region(connecting_region, self.player),
+                         name,
+                         rules[connecting_region] if rules and connecting_region in rules else None)
 
     def __repr__(self):
         return self.__str__()
@@ -863,44 +929,6 @@ def __str__(self):
         return self.multiworld.get_name_string_for_object(self) if self.multiworld else f'{self.name} (Player {self.player})'
 
 
-class Entrance:
-    access_rule: Callable[[CollectionState], bool] = staticmethod(lambda state: True)
-    hide_path: bool = False
-    player: int
-    name: str
-    parent_region: Optional[Region]
-    connected_region: Optional[Region] = None
-    # LttP specific, TODO: should make a LttPEntrance
-    addresses = None
-    target = None
-
-    def __init__(self, player: int, name: str = '', parent: Region = None):
-        self.name = name
-        self.parent_region = parent
-        self.player = player
-
-    def can_reach(self, state: CollectionState) -> bool:
-        if self.parent_region.can_reach(state) and self.access_rule(state):
-            if not self.hide_path and not self in state.path:
-                state.path[self] = (self.name, state.path.get(self.parent_region, (self.parent_region.name, None)))
-            return True
-
-        return False
-
-    def connect(self, region: Region, addresses: Any = None, target: Any = None) -> None:
-        self.connected_region = region
-        self.target = target
-        self.addresses = addresses
-        region.entrances.append(self)
-
-    def __repr__(self):
-        return self.__str__()
-
-    def __str__(self):
-        world = self.parent_region.multiworld if self.parent_region else None
-        return world.get_name_string_for_object(self) if world else f'{self.name} (Player {self.player})'
-
-
 class LocationProgressType(IntEnum):
     DEFAULT = 1
     PRIORITY = 2
diff --git a/docs/world api.md b/docs/world api.md
index b866549a85fd..4df8efa4e3c8 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -512,30 +512,28 @@ def create_items(self) -> None:
 def create_regions(self) -> None:
     # Add regions to the multiworld. "Menu" is the required starting point.
     # Arguments to Region() are name, player, world, and optionally hint_text
-    r = Region("Menu", self.player, self.multiworld)
-    # Set Region.exits to a list of entrances that are reachable from region
-    r.exits = [Entrance(self.player, "New game", r)]  # or use r.exits.append
-    # Append region to MultiWorld's regions
-    self.multiworld.regions.append(r)  # or use += [r...]
+    menu_region = Region("Menu", self.player, self.multiworld)
+    self.multiworld.regions.append(menu_region)  # or use += [menu_region...]
     
-    r = Region("Main Area", self.player, self.multiworld)
+    main_region = Region("Main Area", self.player, self.multiworld)
     # Add main area's locations to main area (all but final boss)
-    r.locations = [MyGameLocation(self.player, location.name,
-                   self.location_name_to_id[location.name], r)]
-    r.exits = [Entrance(self.player, "Boss Door", r)]
-    self.multiworld.regions.append(r)
+    main_region.add_locations(main_region_locations, MyGameLocation)
+    # or 
+    # main_region.locations = \
+    #   [MyGameLocation(self.player, location_name, self.location_name_to_id[location_name], main_region]
+    self.multiworld.regions.append(main_region)
     
-    r = Region("Boss Room", self.player, self.multiworld)
-    # add event to Boss Room
-    r.locations = [MyGameLocation(self.player, "Final Boss", None, r)]
-    self.multiworld.regions.append(r)
-    
-    # If entrances are not randomized, they should be connected here, otherwise
-    # they can also be connected at a later stage.
-    self.multiworld.get_entrance("New Game", self.player)
-        .connect(self.multiworld.get_region("Main Area", self.player))
-    self.multiworld.get_entrance("Boss Door", self.player)
-        .connect(self.multiworld.get_region("Boss Room", self.player))
+    boss_region = Region("Boss Room", self.player, self.multiworld)
+    # Add event to Boss Room
+    boss_region.locations.append(MyGameLocation(self.player, "Final Boss", None, boss_region))
+
+    # If entrances are not randomized, they should be connected here,
+    # otherwise they can also be connected at a later stage.
+    # Create Entrances and connect the Regions
+    menu_region.connect(main_region)  # connects the "Menu" and "Main Area", can also pass a rule
+    # or
+    main_region.add_exits({"Boss Room": "Boss Door"}, {"Boss Room": lambda state: state.has("Sword", self.player)})
+    # Connects the "Main Area" and "Boss Room" regions, and places a rule requiring the "Sword" item to traverse
     
     # If setting location access rules from data is easier here, set_rules can
     # possibly omitted.

From ab22b11bac2441fea3cf4ecf2c1ee48b295351b7 Mon Sep 17 00:00:00 2001
From: el-u <109771707+el-u@users.noreply.github.com>
Date: Sun, 9 Jul 2023 18:04:24 +0200
Subject: [PATCH 15/24] Docs: clean up world api.md a bit (#1958)

---
 docs/apworld specification.md |  2 +-
 docs/world api.md             | 83 ++++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/docs/apworld specification.md b/docs/apworld specification.md
index ba2f2dbbb885..98cd25a73032 100644
--- a/docs/apworld specification.md	
+++ b/docs/apworld specification.md	
@@ -1,7 +1,7 @@
 # apworld Specification
 
 Archipelago depends on worlds to provide game-specific details like items, locations and output generation.
-Those are located in the `worlds/` folder (source) or  `<insall dir>/lib/worlds/` (when installed).
+Those are located in the `worlds/` folder (source) or `<install dir>/lib/worlds/` (when installed).
 See [world api.md](world%20api.md) for details.
 
 apworld provides a way to package and ship a world that is not part of the main distribution by placing a `*.apworld`
diff --git a/docs/world api.md b/docs/world api.md
index 4df8efa4e3c8..22ec0dd62b47 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -22,8 +22,8 @@ allows using WebSockets.
 
 ## Coding style
 
-AP follows all the PEPs. When in doubt use an IDE with coding style
-linter, for example PyCharm Community Edition.
+AP follows [style.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/style.md).
+When in doubt use an IDE with coding style linter, for example PyCharm Community Edition.
 
 
 ## Docstrings
@@ -44,7 +44,7 @@ class MyGameWorld(World):
 ## Definitions
 
 This section will cover various classes and objects you can use for your world.
-While some of the attributes and methods are mentioned here not all of them are,
+While some of the attributes and methods are mentioned here, not all of them are,
 but you can find them in `BaseClasses.py`.
 
 ### World Class
@@ -56,11 +56,12 @@ game.
 ### WebWorld Class
 
 A `WebWorld` class contains specific attributes and methods that can be modified
-for your world specifically on the webhost.
+for your world specifically on the webhost:
 
-`settings_page` which can be changed to a link instead of an AP generated settings page.
+`settings_page`, which can be changed to a link instead of an AP generated settings page.
 
 `theme` to be used for your game specific AP pages. Available themes:
+
 | dirt  | grass (default) | grassFlowers | ice  | jungle  | ocean | partyTime | stone |
 |---|---|---|---|---|---|---|---|
 | <img src="img/theme_dirt.JPG" width="100"> | <img src="img/theme_grass.JPG" width="100"> | <img src="img/theme_grassFlowers.JPG" width="100"> | <img src="img/theme_ice.JPG" width="100"> | <img src="img/theme_jungle.JPG" width="100"> | <img src="img/theme_ocean.JPG" width="100"> | <img src="img/theme_partyTime.JPG" width="100"> | <img src="img/theme_stone.JPG" width="100"> |
@@ -75,26 +76,27 @@ prefixed with the same string as defined here. Default already has 'en'.
 ### MultiWorld Object
 
 The `MultiWorld` object references the whole multiworld (all items and locations
-for all players) and is accessible through `self.world` inside a `World` object.
+for all players) and is accessible through `self.multiworld` inside a `World` object.
 
 ### Player
 
 The player is just an integer in AP and is accessible through `self.player`
-inside a World object.
+inside a `World` object.
 
 ### Player Options
 
 Players provide customized settings for their World in the form of yamls.
-Those are accessible through `self.world.<option_name>[self.player]`. A dict
+Those are accessible through `self.multiworld.<option_name>[self.player]`. A dict
 of valid options has to be provided in `self.option_definitions`. Options are automatically
 added to the `World` object for easy access.
 
-### World Options
+### World Settings
 
-Any AP installation can provide settings for a world, for example a ROM file, accessible through `self.settings.option`
-or `cls.settings.option` (new API) or `Utils.get_options()["<world>_options"]["<option>"]` (deprecated).
+Any AP installation can provide settings for a world, for example a ROM file, accessible through
+`self.settings.<setting_name>` or `cls.settings.<setting_name>` (new API)
+or `Utils.get_options()["<world>_options"]["<setting_name>"]` (deprecated).
 
-Users can set those in their `host.yaml` file. Some options may automatically open a file browser if a file is missing.
+Users can set those in their `host.yaml` file. Some settings may automatically open a file browser if a file is missing.
 
 Refer to [settings api.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/settings%20api.md)
 for details.
@@ -135,10 +137,10 @@ same ID. Name must not be numeric (has to contain at least 1 letter or symbol).
 Special items with ID `None` can mark events (read below).
 
 Other classifications include
-* filler: a regular item or trash item
-* useful: generally quite useful, but not required for anything logical
-* trap: negative impact on the player
-* skip_balancing: add to progression to skip balancing; e.g. currency or tokens
+* `filler`: a regular item or trash item
+* `useful`: generally quite useful, but not required for anything logical
+* `trap`: negative impact on the player
+* `skip_balancing`: add to `progression` to skip balancing; e.g. currency or tokens
 
 ### Events
 
@@ -162,10 +164,10 @@ or more event locations based on player options.
 
 Regions are logical groups of locations that share some common access rules. If
 location logic is written from scratch, using regions greatly simplifies the
-definition and allow to somewhat easily implement things like entrance
+definition and allows to somewhat easily implement things like entrance
 randomizer in logic.
 
-Regions have a list called `exits` which are `Entrance` objects representing
+Regions have a list called `exits`, which are `Entrance` objects representing
 transitions to other regions.
 
 There has to be one special region "Menu" from which the logic unfolds. AP
@@ -182,7 +184,7 @@ They can be static (regular logic) or be defined/connected during generation
 ### Access Rules
 
 An access rule is a function that returns `True` or `False` for a `Location` or
-`Entrance` based on the the current `state` (items that can be collected).
+`Entrance` based on the current `state` (items that can be collected).
 
 ### Item Rules
 
@@ -199,14 +201,14 @@ the `/worlds` directory. The starting point for the package is `__init__.py`.
 Conventionally, your world class is placed in that file.
 
 World classes must inherit from the `World` class in `/worlds/AutoWorld.py`,
-which can be imported as `worlds.AutoWorld.World` from your package.
+which can be imported as `from worlds.AutoWorld import World` from your package.
 
 AP will pick up your world automatically due to the `AutoWorld` implementation.
 
 ### Requirements
 
 If your world needs specific python packages, they can be listed in
-`world/[world_name]/requirements.txt`. ModuleUpdate.py will automatically
+`worlds/<world_name>/requirements.txt`. ModuleUpdate.py will automatically
 pick up and install them.
 
 See [pip documentation](https://pip.pypa.io/en/stable/cli/pip_install/#requirements-file-format).
@@ -217,7 +219,7 @@ AP will only import the `__init__.py`. Depending on code size it makes sense to
 use multiple files and use relative imports to access them.
 
 e.g. `from .Options import mygame_options` from your `__init__.py` will load
-`world/[world_name]/Options.py` and make its `mygame_options` accesible.
+`worlds/<world_name>/Options.py` and make its `mygame_options` accessible.
 
 When imported names pile up it may be easier to use `from . import Options`
 and access the variable as `Options.mygame_options`.
@@ -228,12 +230,12 @@ function, see [apworld specification.md](apworld%20specification.md).
 
 ### Your Item Type
 
-Each world uses its own subclass of `BaseClasses.Item`. The constuctor can be
+Each world uses its own subclass of `BaseClasses.Item`. The constructor can be
 overridden to attach additional data to it, e.g. "price in shop".
 Since the constructor is only ever called from your code, you can add whatever
 arguments you like to the constructor.
 
-In its simplest form we only set the game name and use the default constuctor
+In its simplest form we only set the game name and use the default constructor
 ```python
 from BaseClasses import Item
 
@@ -268,7 +270,7 @@ Each option has its own class, inherits from a base option type, has a docstring
 to describe it and a `display_name` property for display on the website and in
 spoiler logs.
 
-The actual name as used in the yaml is defined in a `dict[str, Option]`, that is
+The actual name as used in the yaml is defined in a `Dict[str, AssembleOptions]`, that is
 assigned to the world under `self.option_definitions`.
 
 Common option types are `Toggle`, `DefaultOnToggle`, `Choice`, `Range`.
@@ -329,10 +331,10 @@ class FixXYZGlitch(Toggle):
     display_name = "Fix XYZ Glitch"
 
 # By convention we call the options dict variable `<world>_options`.
-mygame_options: typing.Dict[str, type(Option)] = {
+mygame_options: typing.Dict[str, AssembleOptions] = {
     "difficulty": Difficulty,
     "final_boss_hp": FinalBossHP,
-    "fix_xyz_glitch": FixXYZGlitch
+    "fix_xyz_glitch": FixXYZGlitch,
 }
 ```
 ```python
@@ -359,7 +361,6 @@ from .Items import mygame_items  # data used below to add items to the World
 from .Locations import mygame_locations  # same as above
 from worlds.AutoWorld import World
 from BaseClasses import Region, Location, Entrance, Item, RegionType, ItemClassification
-from Utils import get_options, output_path
 
 
 class MyGameItem(Item):  # or from Items import MyGameItem
@@ -385,7 +386,7 @@ class MyGameWorld(World):
     topology_present = True  # show path to required location checks in spoiler
 
     # ID of first item and location, could be hard-coded but code may be easier
-    # to read with this as a propery.
+    # to read with this as a property.
     base_id = 1234
     # Instead of dynamic numbering, IDs could be part of data.
 
@@ -400,7 +401,7 @@ class MyGameWorld(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 = {
-        "weapons": {"sword", "lance"}
+        "weapons": {"sword", "lance"},
     }
 ```
 
@@ -414,7 +415,7 @@ The world has to provide the following things for generation
 * 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 start inventory
-* `required_client_version: Tuple(int, int, int)`
+* `required_client_version: Tuple[int, int, int]`
   Optional client version as tuple of 3 ints to make sure the client is compatible to
   this world (e.g. implements all required features) when connecting.
 
@@ -587,7 +588,7 @@ def set_rules(self) -> None:
     # require one item from an item group
     add_rule(self.multiworld.get_location("Chest3", self.player),
              lambda state: state.has_group("weapons", self.player))
-    # state also has .item_count() for items, .has_any() and.has_all() for sets
+    # state also has .item_count() for items, .has_any() and .has_all() for sets
     # and .count_group() for groups
     # set_rule is likely to be a bit faster than add_rule
 
@@ -625,7 +626,7 @@ public members with `mygame_`.
 More advanced uses could be to add additional variables to the state object,
 override `World.collect(self, state, item)` and `remove(self, state, item)`
 to update the state object, and check those added variables in added methods.
-Please do this with caution and only when neccessary.
+Please do this with caution and only when necessary.
 
 #### Sample
 
@@ -637,7 +638,7 @@ from worlds.AutoWorld import LogicMixin
 class MyGameLogic(LogicMixin):
     def mygame_has_key(self, player: int):
         # Arguments above are free to choose
-        # MultiWorld can be accessed through self.world, explicitly passing in
+        # MultiWorld can be accessed through self.multiworld, explicitly passing in
         # MyGameWorld instance for easy options access is also a valid approach
         return self.has("key", player)  # or whatever
 ```
@@ -650,8 +651,8 @@ import .Logic  # apply the mixin by importing its file
 class MyGameWorld(World):
     # ...
     def set_rules(self):
-        set_rule(self.world.get_location("A Door", self.player),
-                 lamda state: state.mygame_has_key(self.player))
+        set_rule(self.multiworld.get_location("A Door", self.player),
+                 lambda state: state.mygame_has_key(self.player))
 ```
 
 ### Generate Output
@@ -679,14 +680,14 @@ def generate_output(self, output_directory: str):
         # store option name "easy", "normal" or "hard" for difficuly
         "difficulty": self.multiworld.difficulty[self.player].current_key,
         # store option value True or False for fixing a glitch
-        "fix_xyz_glitch": self.multiworld.fix_xyz_glitch[self.player].value
+        "fix_xyz_glitch": self.multiworld.fix_xyz_glitch[self.player].value,
     }
     # point to a ROM specified by the installation
     src = self.settings.rom_file
     # or point to worlds/mygame/data/mod_template
     src = os.path.join(os.path.dirname(__file__), "data", "mod_template")
     # generate output path
-    mod_name = f"AP-{self.multiworld.seed_name}-P{self.player}-{self.multiworld.player_name[self.player]}"
+    mod_name = self.multiworld.get_out_file_name_base(self.player)
     out_file = os.path.join(output_directory, mod_name + ".zip")
     # generate the file
     generate_mod(src, out_file, data)
@@ -735,14 +736,14 @@ from . import MyGameTestBase
 
 
 class TestChestAccess(MyGameTestBase):
-    def testSwordChests(self):
+    def test_sword_chests(self):
         """Test locations that require a sword"""
         locations = ["Chest1", "Chest2"]
         items = [["Sword"]]
         # this will test that each location can't be accessed without the "Sword", but can be accessed once obtained.
         self.assertAccessDependency(locations, items)
-    
-    def testAnyWeaponChests(self):
+
+    def test_any_weapon_chests(self):
         """Test locations that require any weapon"""
         locations = [f"Chest{i}" for i in range(3, 6)]
         items = [["Sword"], ["Axe"], ["Spear"]]

From 9af56ec0dd7622a364411bcfcf88fcdb4df3d07e Mon Sep 17 00:00:00 2001
From: Zach Parks <zach@alliware.com>
Date: Sun, 9 Jul 2023 13:23:50 -0500
Subject: [PATCH 16/24] WebHost: Update copyright year in footer. (#1951)

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

diff --git a/WebHostLib/templates/islandFooter.html b/WebHostLib/templates/islandFooter.html
index 243eea7c1a73..7b89c4a9e079 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 2022 Archipelago</div>
+        <div id="copyright-notice">Copyright 2023 Archipelago</div>
         <div id="links">
             <a href="/sitemap">Site Map</a>
             -

From 5b606e53fcad7f69c7412a1dccf48e57d15ded2a Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Tue, 11 Jul 2023 04:49:40 -0500
Subject: [PATCH 17/24] HK: Fix bugs and update setup guide for Scarab+ and
 XBox Game Pass support (#1955)

Fixing three bugs:
1. Made Salubra Charm Shop Slots use the actual options value and not the Iselda Shop Slots value.
2. Made Mask Shards no longer considered Filler but instead Progression so they can actually be used for access requirements that require damage boosts.
3. Fixed goal requirements to account for Focus being required for The Hollow Knight and Sealed Siblings endings and adjusted the Radiance and Any goal requirements accordingly.

Updated Setup Guide:
Changed to mention Scarab+ instead of Scarab (it is better maintained and has several quality of life improvements and fixes a bug for XBox Game Pass).
Added info about how to use Scarab+ with XBox Game Pass.
---
 worlds/hk/Options.py       |  2 +-
 worlds/hk/__init__.py      | 22 ++++++++++++----------
 worlds/hk/docs/setup_en.md | 28 +++++++++++++++++++++++-----
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py
index d47ab2c38b3f..2a19ffd3e7c3 100644
--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -111,7 +111,7 @@
     "Iselda": "IseldaShopSlots",
     "Salubra": "SalubraShopSlots",
     "Leg_Eater": "LegEaterShopSlots",
-    "Salubra_(Requires_Charms)": "IseldaShopSlots",
+    "Salubra_(Requires_Charms)": "SalubraCharmShopSlots",
     "Egg_Shop": "EggShopSlots",
 }
 
diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index 41602cee3479..061f71edd444 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -422,13 +422,15 @@ def set_rules(self):
         player = self.player
         if world.logic[player] != 'nologic':
             goal = world.Goal[player]
-            if goal == Goal.option_siblings:
+            if goal == Goal.option_hollowknight:
+                world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player)
+            elif goal == Goal.option_siblings:
                 world.completion_condition[player] = lambda state: state._hk_siblings_ending(player)
             elif goal == Goal.option_radiance:
                 world.completion_condition[player] = lambda state: state._hk_can_beat_radiance(player)
             else:
-                # Hollow Knight or Any goal.
-                world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player)
+                # Any goal
+                world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player) or state._hk_can_beat_radiance(player)
 
         set_rules(self)
 
@@ -640,7 +642,7 @@ def __init__(self, name, advancement, code, type: str, player: int = None):
             classification = ItemClassification.progression_skip_balancing
         elif type in ("Map", "Journal"):
             classification = ItemClassification.filler
-        elif type in ("Mask", "Ore", "Vessel"):
+        elif type in ("Ore", "Vessel"):
             classification = ItemClassification.useful
         elif advancement:
             classification = ItemClassification.progression
@@ -674,6 +676,7 @@ def _hk_can_beat_thk(self, player: int) -> bool:
                 self.has_any({'LEFTDASH', 'RIGHTDASH'}, player)
                 or self._hk_option(player, 'ProficientCombat')
             )
+            and self.has('FOCUS', player)
         )
 
     def _hk_siblings_ending(self, player: int) -> bool:
@@ -681,16 +684,15 @@ def _hk_siblings_ending(self, player: int) -> bool:
 
     def _hk_can_beat_radiance(self, player: int) -> bool:
         return (
-            self._hk_siblings_ending(player)
-            and self.has('DREAMNAIL', player, 1)
+            self.has('Opened_Black_Egg_Temple', player)
+            and self._hk_nail_combat(player)
+            and self.has('WHITEFRAGMENT', player, 3)
+            and self.has('DREAMNAIL', player)
             and (
                 (self.has('LEFTCLAW', player) and self.has('RIGHTCLAW', player))
                 or self.has('WINGS', player)
             )
-            and (
-                self.count('FIREBALL', player) + self.count('SCREAM', player)
-                + self.count('QUAKE', player)
-            ) > 1
+            and (self.count('FIREBALL', player) + self.count('SCREAM', player) + self.count('QUAKE', player)) > 1
             and (
                 (self.has('LEFTDASH', player, 2) and self.has('RIGHTDASH', player, 2))  # Both Shade Cloaks
                 or (self._hk_option(player, 'ProficientCombat') and self.has('QUAKE', player))  # or Dive
diff --git a/worlds/hk/docs/setup_en.md b/worlds/hk/docs/setup_en.md
index 0584af0f04e8..e25e6bc4ac6f 100644
--- a/worlds/hk/docs/setup_en.md
+++ b/worlds/hk/docs/setup_en.md
@@ -1,15 +1,33 @@
 # Hollow Knight for Archipelago Setup Guide
 
 ## Required Software
-* Download and unzip the Scarab Mod Manager from the [Scarab GitHub Releases page](https://github.com/fifty-six/Scarab/releases).
-* A legal copy of Hollow Knight, not purchased or played through XBox Game Pass.
-    * Unfortunately, the Game Pass version is not currently compatible with mods.
+* Download and unzip the Scarab+ Mod Manager from the [Scarab+ website](https://themulhima.github.io/Scarab/).
+* A legal copy of Hollow Knight.
+
+## Optional Software
+* Archipelago Map Mod from Scarab+
+  * Ensure that both RandoMapMod and MapChanger are uninstalled or disabled as they are incompatible with Archipelago Map Mod.
 
 ## Installing the Archipelago Mod using Scarab
-1. Launch Scarab and ensure it locates your Hollow Knight installation directory.
-2. Click the "Install" checkbox near the "Archipelago" mod entry.
+1. Launch Scarab+ and ensure it locates your Hollow Knight installation directory.
+2. Click the "Install" button near the "Archipelago" mod entry.
 3. Launch the game, you're all set!
 
+### What to do if Scarab+ fails to find your XBox Game Pass installation directory
+1. Enter the XBox app and move your mouse over "Hollow Knight" on the left sidebar. 
+2. Click the three points then click "Manage".
+3. Go to the "Files" tab and select "Browse...". 
+4. Click "Hollow Knight", then "Content", then click the path bar and copy it.
+5. Run Scarab+ as an administrator and, when it asks you for the path, paste what you copied in step 4.
+
+#### Alternative Method:
+1. Click on your profile then "Settings". 
+2. Go to the "General" tab and select "CHANGE FOLDER".
+3. Look for a folder where you want to install the game (preferably inside a folder on your desktop) and copy the path.
+4. Run Scarab+ as an administrator and, when it asks you for the path, paste what you copied in step 3.
+
+Note: The path folder needs to have the "Hollow Knight_Data" folder inside. 
+
 ## Configuring your YAML File
 ### What is a YAML and why do I need one?
 You can see the [basic multiworld setup guide](/tutorial/Archipelago/setup/en) here on the Archipelago website to learn 

From bff2b80acf8370816ccefd26dcfed71d749102f6 Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Tue, 11 Jul 2023 20:38:09 +0200
Subject: [PATCH 18/24] MultiServer: fix loading of default hint_cost (#1964)

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

diff --git a/MultiServer.py b/MultiServer.py
index aa3119c4f0ab..3e73910b9f86 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -2135,7 +2135,7 @@ async def console(ctx: Context):
 
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser()
-    defaults = Utils.get_options()["server_options"]
+    defaults = Utils.get_options()["server_options"].as_dict()
     parser.add_argument('multidata', nargs="?", default=defaults["multidata"])
     parser.add_argument('--host', default=defaults["host"])
     parser.add_argument('--port', default=defaults["port"], type=int)

From 11278d0e61ed455bd541a0ab2de2e2b9d31fa37e Mon Sep 17 00:00:00 2001
From: Ludwig <80899010+wordfcuk@users.noreply.github.com>
Date: Fri, 14 Jul 2023 03:08:09 +0200
Subject: [PATCH 19/24] SM64: Verbosify SM64 documentation (#1967)

---
 worlds/sm64ex/docs/setup_en.md | 36 ++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/worlds/sm64ex/docs/setup_en.md b/worlds/sm64ex/docs/setup_en.md
index 1ff8b5e93827..38edeb2c4ab6 100644
--- a/worlds/sm64ex/docs/setup_en.md
+++ b/worlds/sm64ex/docs/setup_en.md
@@ -13,7 +13,7 @@ You can use other sm64-port based builds with it, but you can't use a different
 
 ## Installation and Game Start Procedures
 
-# Installation via sm64pclauncher (For Windows)
+### Installation via sm64pclauncher (For Windows)
 
 First, install [MSYS](https://www.msys2.org/) as described on the page. DO NOT INSTALL INTO A FOLDER PATH WITH SPACES.
 Do all steps up to including step 6.
@@ -37,19 +37,31 @@ After it's done, the Build list should have another entry titled with what you n
 NOTE: For some reason first start of the game always crashes the launcher. Just restart it.
 If it still crashes, recheck if you typed the launch options correctly (Described in "Joining a MultiWorld Game")
 
-# Manual Compilation (Linux/Windows)
+### Manual Compilation (Linux/Windows)
 
-Dependencies for Linux: `sdl2 glew cmake python make`.
-Dependencies for Windows: `mingw-w64-x86_64-gcc mingw-w64-x86_64-glew mingw-w64-x86_64-SDL2 git make python3 mingw-w64-x86_64-cmake`
-SM64EX will link `jsoncpp` dynamic if installed. If not, it will compile and link statically.
+*Windows Instructions*
 
-1. Clone `https://github.com/N00byKing/sm64ex` recursively
-2. Enter `sm64ex` and copy your Rom to `baserom.REGION.z64` where `REGION` is either `us` or `jp` respectively.
-3. Compile with `make`. For faster compilation set the parameter `-jn` where `n` is the Number of CPU Cores.
+First, install [MSYS](https://www.msys2.org/) as described on the page. DO NOT INSTALL INTO A FOLDER PATH WITH SPACES.
+
+After launching msys2, and update by entering `pacman -Syuu` in the command prompt. Next, install the relevant dependencies by entering `pacman -S unzip mingw-w64-x86_64-gcc mingw-w64-x86_64-glew mingw-w64-x86_64-SDL2 git make python3 mingw-w64-x86_64-cmake`. SM64EX will link `jsoncpp` dynamic if installed. If not, it will compile and link statically.
+
+After this, obtain the code base by cloning the relevant repository manually via `git clone --recursive https://github.com/N00byKing/sm64ex`. Ready your ROM by copying your legally dumped rom into your sm64ex folder (if you are not sure where your folder is located, do a quick Windows search for sm64ex). The name of the ROM needs to be `baserom.REGION.z64` where `REGION` is either `us` or `jp` respectively.
+
+After all these preparatory steps have succeeded, type `make` in your command prompt and get ready to wait for a bit. If you want to speed up compilation, tell the compiler how many CPU cores to use by using `make -jn` where n is the number of cores you want.
+
+After the compliation was successful, there will be a binary in your `sm64ex/build/REGION_pc/` folder.
+
+*Linux Instructions*
+
+Install the relevant dependencies `sdl2 glew cmake python make`. SM64EX will link `jsoncpp` dynamic if installed. If not, it will compile and link statically.
+
+After this, obtain the code base by cloning the relevant repository manually via `git clone --recursive https://github.com/N00byKing/sm64ex`. Ready your ROM by copying your legally dumped rom into your sm64ex folder. The name of the ROM needs to be `baserom.REGION.z64` where `REGION` is either `us` or `jp` respectively.
+
+After all these preparatory steps have succeeded, type `make` in your command prompt and get ready to wait for a bit. If you want to speed up compilation, tell the compiler how many CPU cores to use by using `make -jn` where n is the number of cores you want.
 
-The Compiled binary will be in `build/REGION_pc/`.
+After the compliation was successful, there will be a binary in your `sm64ex/build/REGION_pc/` folder.
 
-# Joining a MultiWorld Game
+### Joining a MultiWorld Game
 
 To join, set the following launch options: `--sm64ap_name YourName --sm64ap_ip ServerIP:Port`.
 Optionally, add `--sm64ap_passwd "YourPassword"` if the room you are using requires a password.
@@ -62,12 +74,12 @@ Additionally, any time the game is not connected (for example when the connectio
 **Important:** You must start a new file for every new seed you play. Using `⭐x0` files is **not** sufficient.
 Failing to use a new file may make some locations unavailable. However, this can be fixed without losing any progress by exiting and starting a new file.
 
-# Playing offline
+### Playing offline
 
 To play offline, first generate a seed on the game's settings page.
 Create a room and download the `.apsm64ex` file, and start the game with the `--sm64ap_file "path/to/FileName"` launch argument.
 
-# Optional: Using Batch Files to play offline and MultiWorld games
+### Optional: Using Batch Files to play offline and MultiWorld games
 
 As an alternative to launching the game with sm64pclauncher, it is also possible to launch the completed build with the use of Windows batch files. This has the added benefit of streamlining the join process so that manual editing of connection info is not needed for each new game. However, you'll need to be somewhat comfortable with creating and using batch files.
 

From 087cc334f4323c990f741ddf248cf50fef78e515 Mon Sep 17 00:00:00 2001
From: PoryGone <98504756+PoryGone@users.noreply.github.com>
Date: Thu, 13 Jul 2023 21:11:19 -0400
Subject: [PATCH 20/24] SMW: Move item creation earlier (#1942)

---
 worlds/smw/__init__.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/worlds/smw/__init__.py b/worlds/smw/__init__.py
index 9e9c123fdf5d..2c3b1114c3be 100644
--- a/worlds/smw/__init__.py
+++ b/worlds/smw/__init__.py
@@ -90,7 +90,12 @@ def generate_early(self):
         if self.multiworld.early_climb[self.player]:
             self.multiworld.local_early_items[self.player][ItemName.mario_climb] = 1
 
-    def generate_basic(self):
+
+    def create_regions(self):
+        location_table = setup_locations(self.multiworld, self.player)
+        create_regions(self.multiworld, self.player, location_table)
+
+        # Not generate basic
         itempool: typing.List[SMWItem] = []
 
         self.active_level_dict = dict(zip(generate_level_list(self.multiworld, self.player), full_level_list))
@@ -247,10 +252,6 @@ def extend_hint_information(self, hint_data: typing.Dict[int, typing.Dict[int, s
 
             hint_data[self.player] = er_hint_data
 
-    def create_regions(self):
-        location_table = setup_locations(self.multiworld, self.player)
-        create_regions(self.multiworld, self.player, location_table)
-
     def create_item(self, name: str, force_non_progression=False) -> Item:
         data = item_table[name]
 

From a88e75f3a18fcf1b499abf9fedc13724685789e9 Mon Sep 17 00:00:00 2001
From: PoryGone <98504756+PoryGone@users.noreply.github.com>
Date: Thu, 13 Jul 2023 21:11:49 -0400
Subject: [PATCH 21/24] DKC3: Move item creation earlier (#1941)

---
 worlds/dkc3/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/worlds/dkc3/__init__.py b/worlds/dkc3/__init__.py
index 68139dfd1a0b..a0000b0ce475 100644
--- a/worlds/dkc3/__init__.py
+++ b/worlds/dkc3/__init__.py
@@ -86,7 +86,11 @@ def fill_slot_data(self) -> dict:
 
         return slot_data
 
-    def generate_basic(self):
+    def create_regions(self):
+        location_table = setup_locations(self.multiworld, self.player)
+        create_regions(self.multiworld, self.player, location_table)
+
+        # Not generate basic
         self.topology_present = self.multiworld.level_shuffle[self.player].value
         itempool: typing.List[DKC3Item] = []
 
@@ -198,10 +202,6 @@ def modify_multidata(self, multidata: dict):
                         er_hint_data[location.address] = world_names[world_index]
             multidata['er_hint_data'][self.player] = er_hint_data
 
-    def create_regions(self):
-        location_table = setup_locations(self.multiworld, self.player)
-        create_regions(self.multiworld, self.player, location_table)
-
     def create_item(self, name: str, force_non_progression=False) -> Item:
         data = item_table[name]
 

From 48ffad867a9fd4466c1332edc0e10a1630be38ac Mon Sep 17 00:00:00 2001
From: zig-for <san.francisco.engineer@gmail.com>
Date: Thu, 13 Jul 2023 18:14:04 -0700
Subject: [PATCH 22/24] LADX: Add Hints (#1932)

---
 worlds/ladx/LADXR/generator.py | 36 +++++++++++++++++++++++++++++++---
 worlds/ladx/LADXR/hints.py     | 10 +++-------
 worlds/ladx/__init__.py        |  4 +++-
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index c63d2b72c5d3..4d6a2a3f9d3c 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -59,6 +59,8 @@
 
 from .locations.keyLocation import KeyLocation
 
+from BaseClasses import ItemClassification
+from ..Locations import LinksAwakeningLocation
 from ..Options import TrendyGame, Palette, MusicChangeCondition
 
 
@@ -238,12 +240,40 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m
     elif settings.quickswap == 'b':
         patches.core.quickswap(rom, 0)
     
-    # TODO: hints bad
-
     world_setup = logic.world_setup
 
+    JUNK_HINT = 0.33
+    RANDOM_HINT= 0.66
+    # USEFUL_HINT = 1.0
+    # TODO: filter events, filter unshuffled keys
+    all_items = multiworld.get_items()
+    our_items = [item for item in all_items if item.player == player_id and item.code is not None and item.location.show_in_spoiler]
+    our_useful_items = [item for item in our_items if ItemClassification.progression in item.classification]
+    def gen_hint():
+        chance = rnd.uniform(0, 1)
+        if chance < JUNK_HINT:
+            return None
+        elif chance < RANDOM_HINT:
+            location = rnd.choice(our_items).location
+        else: # USEFUL_HINT
+            location = rnd.choice(our_useful_items).location
+
+        if location.item.player == player_id:
+            name = "Your"
+        else:
+            name = f"{multiworld.player_name[location.item.player]}'s"
+        
+        if isinstance(location, LinksAwakeningLocation):
+            location_name = location.ladxr_item.metadata.name
+        else:
+            location_name = location.name
+        hint = f"{name} {location.item} is at {location_name}"
+        if location.player != player_id:
+            hint += f" in {multiworld.player_name[location.player]}'s world"
+
+        return hint
 
-    hints.addHints(rom, rnd, item_list)
+    hints.addHints(rom, rnd, gen_hint)
 
     if world_setup.goal == "raft":
         patches.goal.setRaftGoal(rom)
diff --git a/worlds/ladx/LADXR/hints.py b/worlds/ladx/LADXR/hints.py
index f7ef78a3e8bc..aa7854889bb6 100644
--- a/worlds/ladx/LADXR/hints.py
+++ b/worlds/ladx/LADXR/hints.py
@@ -49,16 +49,12 @@
 ]
 
 
-def addHints(rom, rnd, spots):
-    spots = list(sorted(filter(lambda spot: spot.item in hint_items, spots), key=lambda spot: spot.nameId))
+def addHints(rom, rnd, hint_generator):
     text_ids = hint_text_ids.copy()
     rnd.shuffle(text_ids)
     for text_id in text_ids:
-        if len(spots) > 0:
-            spot_index = rnd.randint(0, len(spots) - 1)
-            spot = spots.pop(spot_index)
-            hint = rnd.choice(hints).format("{%s}" % (spot.item), spot.metadata.area)
-        else:
+        hint = hint_generator()
+        if not hint:
             hint = rnd.choice(hints).format(*rnd.choice(useless_hint))
         rom.texts[text_id] = formatText(hint)
 
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index f1c3ba0d4d60..1d6c85dd6449 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -223,6 +223,7 @@ def create_items(self) -> None:
                     if not self.multiworld.tradequest[self.player] and isinstance(item.item_data, TradeItemData):
                         location = self.multiworld.get_location(item.item_data.vanilla_location, self.player)
                         location.place_locked_item(item)
+                        location.show_in_spoiler = False
                         continue
 
                     if isinstance(item.item_data, DungeonItemData):
@@ -487,7 +488,8 @@ def generate_output(self, output_directory: str):
             rnd=self.multiworld.per_slot_randoms[self.player],
             player_name=name_for_rom,
             player_names=all_names,
-            player_id = self.player)
+            player_id = self.player,
+            multiworld=self.multiworld)
       
         with open(out_path, "wb") as handle:
             rom.save(handle, name="LADXR")

From dfe08298ef2a6bc9daf46a540b427494490f7139 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 13 Jul 2023 20:48:38 -0500
Subject: [PATCH 23/24] Installer: Add desktop and start menu shortcuts for
 Launcher and LADX Client (#1947)

---
 inno_setup.iss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/inno_setup.iss b/inno_setup.iss
index 7087b58cca0c..8a10485ad387 100644
--- a/inno_setup.iss
+++ b/inno_setup.iss
@@ -141,6 +141,7 @@ Source: "vc_redist.x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
 
 [Icons]
 Name: "{group}\{#MyAppName} Folder"; Filename: "{app}";
+Name: "{group}\{#MyAppName} Launcher"; Filename: "{app}\ArchipelagoLauncher.exe"
 Name: "{group}\{#MyAppName} Server"; Filename: "{app}\{#MyAppExeName}"; Components: server
 Name: "{group}\{#MyAppName} Text Client"; Filename: "{app}\ArchipelagoTextClient.exe"; Components: client/text
 Name: "{group}\{#MyAppName} SNI Client"; Filename: "{app}\ArchipelagoSNIClient.exe"; Components: client/sni
@@ -155,11 +156,13 @@ Name: "{group}\{#MyAppName} Starcraft 2 Client"; Filename: "{app}\ArchipelagoSta
 Name: "{group}\{#MyAppName} MegaMan Battle Network 3 Client"; Filename: "{app}\ArchipelagoMMBN3Client.exe"; Components: client/mmbn3
 Name: "{group}\{#MyAppName} The Legend of Zelda Client"; Filename: "{app}\ArchipelagoZelda1Client.exe"; Components: client/tloz
 Name: "{group}\{#MyAppName} Kingdom Hearts 2 Client"; Filename: "{app}\ArchipelagoKH2Client.exe"; Components: client/kh2
+Name: "{group}\{#MyAppName} Link's Awakening Client"; Filename: "{app}\ArchipelagoLinksAwakeningClient.exe"; Components: client/ladx
 Name: "{group}\{#MyAppName} Adventure Client"; Filename: "{app}\ArchipelagoAdventureClient.exe"; Components: client/advn
 Name: "{group}\{#MyAppName} Wargroove Client"; Filename: "{app}\ArchipelagoWargrooveClient.exe"; Components: client/wargroove
 Name: "{group}\{#MyAppName} Undertale Client"; Filename: "{app}\ArchipelagoUndertaleClient.exe"; Components: client/ut
 
 Name: "{commondesktop}\{#MyAppName} Folder"; Filename: "{app}"; Tasks: desktopicon
+Name: "{commondesktop}\{#MyAppName} Launcher"; Filename: "{app}\ArchipelagoLauncher.exe"; Tasks: desktopicon
 Name: "{commondesktop}\{#MyAppName} Server"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; Components: server
 Name: "{commondesktop}\{#MyAppName} SNI Client"; Filename: "{app}\ArchipelagoSNIClient.exe"; Tasks: desktopicon; Components: client/sni
 Name: "{commondesktop}\{#MyAppName} Factorio Client"; Filename: "{app}\ArchipelagoFactorioClient.exe"; Tasks: desktopicon; Components: client/factorio
@@ -174,6 +177,7 @@ Name: "{commondesktop}\{#MyAppName} MegaMan Battle Network 3 Client"; Filename:
 Name: "{commondesktop}\{#MyAppName} The Legend of Zelda Client"; Filename: "{app}\ArchipelagoZelda1Client.exe"; Tasks: desktopicon; Components: client/tloz
 Name: "{commondesktop}\{#MyAppName} Wargroove Client"; Filename: "{app}\ArchipelagoWargrooveClient.exe"; Tasks: desktopicon; Components: client/wargroove
 Name: "{commondesktop}\{#MyAppName} Kingdom Hearts 2 Client"; Filename: "{app}\ArchipelagoKH2Client.exe"; Tasks: desktopicon; Components: client/kh2
+Name: "{commondesktop}\{#MyAppName} Link's Awakening Client"; Filename: "{app}\ArchipelagoLinksAwakeningClient.exe"; Tasks: desktopicon; Components: client/ladx
 Name: "{commondesktop}\{#MyAppName} Adventure Client"; Filename: "{app}\ArchipelagoAdventureClient.exe"; Tasks: desktopicon; Components: client/advn
 Name: "{commondesktop}\{#MyAppName} Undertale Client"; Filename: "{app}\ArchipelagoUndertaleClient.exe"; Tasks: desktopicon; Components: client/ut
 

From 8df08b53d9ed505585fc16f50b5d60174298d761 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Sat, 15 Jul 2023 13:52:52 -0700
Subject: [PATCH 24/24] WebHost: Fix as_dict attribute error (#1977)

* WebHost: Fix as_dict attribute error

Introduced in 827444f5a4e065bc310c889892580eb1f97c73cb

* WebHost: Add assertion that baked_server_options is a dict

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

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 Main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Main.py b/Main.py
index 6dfd61149b4f..c81466bf78e8 100644
--- a/Main.py
+++ b/Main.py
@@ -23,7 +23,8 @@
 
 def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = None):
     if not baked_server_options:
-        baked_server_options = get_settings().server_options
+        baked_server_options = get_settings().server_options.as_dict()
+    assert isinstance(baked_server_options, dict)
     if args.outputpath:
         os.makedirs(args.outputpath, exist_ok=True)
         output_path.cached_path = args.outputpath
@@ -372,7 +373,7 @@ def precollect_hint(location):
                     "connect_names": {name: (0, player) for player, name in world.player_name.items()},
                     "locations": locations_data,
                     "checks_in_area": checks_in_area,
-                    "server_options": baked_server_options.as_dict(),
+                    "server_options": baked_server_options,
                     "er_hint_data": er_hint_data,
                     "precollected_items": precollected_items,
                     "precollected_hints": precollected_hints,