Merge branch 'ArchipelagoMW:main' into main

2026-03-26 10:03:20 -07:00 · 2022-09-27 16:06:43 +02:00
parent ee24afe1d9 b4b9ff5d82
commit 540d7d0739
40 changed files with 1604 additions and 1472 deletions
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -955,6 +955,13 @@ class Region:
                return True
        return False

+    def get_connecting_entrance(self, is_main_entrance: typing.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 __repr__(self):
        return self.__str__()

--- a/Generate.py
+++ b/Generate.py
@@ -455,7 +455,7 @@ def handle_option(ret: argparse.Namespace, game_weights: dict, option_key: str,
        else:
            player_option.verify(AutoWorldRegister.world_types[ret.game], ret.name, plando_options)
    else:
-        setattr(ret, option_key, option(option.default))
+        setattr(ret, option_key, option.from_any(option.default))  # call the from_any here to support default "random"


 def roll_settings(weights: dict, plando_options: PlandoSettings = PlandoSettings.bosses):
--- a/Main.py
+++ b/Main.py
@@ -12,7 +12,7 @@ from typing import Dict, Tuple, Optional, Set

 from BaseClasses import MultiWorld, CollectionState, Region, RegionType, LocationProgressType, Location
 from worlds.alttp.Items import item_name_groups
-from worlds.alttp.Regions import lookup_vanilla_location_to_entrance
+from worlds.alttp.Regions import is_main_entrance
 from Fill import distribute_items_restrictive, flood_items, balance_multiworld_progression, distribute_planned
 from worlds.alttp.Shops import SHOP_ID_START, total_shop_slots, FillDisabledShopSlots
 from Utils import output_path, get_options, __version__, version_tuple
@@ -249,24 +249,9 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
                    output_file_futures.append(
                        pool.submit(AutoWorld.call_single, world, "generate_output", player, temp_dir))

-            def get_entrance_to_region(region: Region):
-                for entrance in region.entrances:
-                    if entrance.parent_region.type in (RegionType.DarkWorld, RegionType.LightWorld, RegionType.Generic):
-                        return entrance
-                for entrance in region.entrances:  # BFS might be better here, trying DFS for now.
-                    return get_entrance_to_region(entrance.parent_region)
-
            # collect ER hint info
-            er_hint_data = {player: {} for player in world.get_game_players("A Link to the Past") if
-                            world.shuffle[player] != "vanilla" or world.retro_caves[player]}
-
-            for region in world.regions:
-                if region.player in er_hint_data and region.locations:
-                    main_entrance = get_entrance_to_region(region)
-                    for location in region.locations:
-                        if type(location.address) == int:  # skips events and crystals
-                            if lookup_vanilla_location_to_entrance[location.address] != main_entrance.name:
-                                er_hint_data[region.player][location.address] = main_entrance.name
+            er_hint_data: Dict[int, Dict[int, str]] = {}
+            AutoWorld.call_all(world, 'extend_hint_information', er_hint_data)

            checks_in_area = {player: {area: list() for area in ordered_areas}
                              for player in range(1, world.players + 1)}
@@ -276,22 +261,23 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No

            for location in world.get_filled_locations():
                if type(location.address) is int:
-                    main_entrance = get_entrance_to_region(location.parent_region)
                    if location.game != "A Link to the Past":
                        checks_in_area[location.player]["Light World"].append(location.address)
-                    elif location.parent_region.dungeon:
-                        dungeonname = {'Inverted Agahnims Tower': 'Agahnims Tower',
-                                       'Inverted Ganons Tower': 'Ganons Tower'} \
-                            .get(location.parent_region.dungeon.name, location.parent_region.dungeon.name)
-                        checks_in_area[location.player][dungeonname].append(location.address)
-                    elif location.parent_region.type == RegionType.LightWorld:
-                        checks_in_area[location.player]["Light World"].append(location.address)
-                    elif location.parent_region.type == RegionType.DarkWorld:
-                        checks_in_area[location.player]["Dark World"].append(location.address)
-                    elif main_entrance.parent_region.type == RegionType.LightWorld:
-                        checks_in_area[location.player]["Light World"].append(location.address)
-                    elif main_entrance.parent_region.type == RegionType.DarkWorld:
-                        checks_in_area[location.player]["Dark World"].append(location.address)
+                    else:
+                        main_entrance = location.parent_region.get_connecting_entrance(is_main_entrance)
+                        if location.parent_region.dungeon:
+                            dungeonname = {'Inverted Agahnims Tower': 'Agahnims Tower',
+                                           'Inverted Ganons Tower': 'Ganons Tower'} \
+                                .get(location.parent_region.dungeon.name, location.parent_region.dungeon.name)
+                            checks_in_area[location.player][dungeonname].append(location.address)
+                        elif location.parent_region.type == RegionType.LightWorld:
+                            checks_in_area[location.player]["Light World"].append(location.address)
+                        elif location.parent_region.type == RegionType.DarkWorld:
+                            checks_in_area[location.player]["Dark World"].append(location.address)
+                        elif main_entrance.parent_region.type == RegionType.LightWorld:
+                            checks_in_area[location.player]["Light World"].append(location.address)
+                        elif main_entrance.parent_region.type == RegionType.DarkWorld:
+                            checks_in_area[location.player]["Dark World"].append(location.address)
                    checks_in_area[location.player]["Total"] += 1

            oldmancaves = []
@@ -305,7 +291,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
                    player = region.player
                    location_id = SHOP_ID_START + total_shop_slots + index

-                    main_entrance = get_entrance_to_region(region)
+                    main_entrance = region.get_connecting_entrance(is_main_entrance)
                    if main_entrance.parent_region.type == RegionType.LightWorld:
                        checks_in_area[player]["Light World"].append(location_id)
                    else:
@@ -340,7 +326,6 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
                                      for player, world_precollected in world.precollected_items.items()}
                precollected_hints = {player: set() for player in range(1, world.players + 1 + len(world.groups))}

-
                for slot in world.player_ids:
                    slot_data[slot] = world.worlds[slot].fill_slot_data()

--- a/MultiServer.py
+++ b/MultiServer.py
@@ -126,6 +126,7 @@ class Context:
    location_names: typing.Dict[int, str] = Utils.KeyedDefaultDict(lambda code: f'Unknown location (ID:{code})')
    all_item_and_group_names: typing.Dict[str, typing.Set[str]]
    forced_auto_forfeits: typing.Dict[str, bool]
+    non_hintable_names: typing.Dict[str, typing.Set[str]]

    def __init__(self, host: str, port: int, server_password: str, password: str, location_check_points: int,
                 hint_cost: int, item_cheat: bool, forfeit_mode: str = "disabled", collect_mode="disabled",
@@ -196,7 +197,7 @@ class Context:
        self.item_name_groups = {}
        self.all_item_and_group_names = {}
        self.forced_auto_forfeits = collections.defaultdict(lambda: False)
-        self.non_hintable_names = {}
+        self.non_hintable_names = collections.defaultdict(frozenset)

        self._load_game_data()
        self._init_game_data()
@@ -221,11 +222,11 @@ class Context:
            self.all_item_and_group_names[game_name] = \
                set(game_package["item_name_to_id"]) | set(self.item_name_groups[game_name])

-    def item_names_for_game(self, game: str) -> typing.Dict[str, int]:
-        return self.gamespackage[game]["item_name_to_id"]
+    def item_names_for_game(self, game: str) -> typing.Optional[typing.Dict[str, int]]:
+        return self.gamespackage[game]["item_name_to_id"] if game in self.gamespackage else None

-    def location_names_for_game(self, game: str) -> typing.Dict[str, int]:
-        return self.gamespackage[game]["location_name_to_id"]
+    def location_names_for_game(self, game: str) -> typing.Optional[typing.Dict[str, int]]:
+        return self.gamespackage[game]["location_name_to_id"] if game in self.gamespackage else None

    # General networking
    async def send_msgs(self, endpoint: Endpoint, msgs: typing.Iterable[dict]) -> bool:
@@ -900,14 +901,14 @@ def register_location_checks(ctx: Context, team: int, slot: int, locations: typi
        ctx.save()


-def collect_hints(ctx: Context, team: int, slot: int, item_name: str) -> typing.List[NetUtils.Hint]:
+def collect_hints(ctx: Context, team: int, slot: int, item: typing.Union[int, str]) -> typing.List[NetUtils.Hint]:
    hints = []
    slots: typing.Set[int] = {slot}
    for group_id, group in ctx.groups.items():
        if slot in group:
            slots.add(group_id)

-    seeked_item_id = ctx.item_names_for_game(ctx.games[slot])[item_name]
+    seeked_item_id = item if isinstance(item, int) else ctx.item_names_for_game(ctx.games[slot])[item]
    for finding_player, check_data in ctx.locations.items():
        for location_id, (item_id, receiving_player, item_flags) in check_data.items():
            if receiving_player in slots and item_id == seeked_item_id:
@@ -1335,13 +1336,33 @@ class ClientMessageProcessor(CommonCommandProcessor):
            self.output(f"A hint costs {self.ctx.get_hint_cost(self.client.slot)} points. "
                        f"You have {points_available} points.")
            return True
+
+        elif input_text.isnumeric():
+            game = self.ctx.games[self.client.slot]
+            hint_id = int(input_text)
+            hint_name = self.ctx.item_names[hint_id] \
+                if not for_location and hint_id in self.ctx.item_names \
+                else self.ctx.location_names[hint_id] \
+                if for_location and hint_id in self.ctx.location_names \
+                else None
+            if hint_name in self.ctx.non_hintable_names[game]:
+                self.output(f"Sorry, \"{hint_name}\" is marked as non-hintable.")
+                hints = []
+            elif not for_location:
+                hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_id)
+            else:
+                hints = collect_hint_location_id(self.ctx, self.client.team, self.client.slot, hint_id)
+
        else:
            game = self.ctx.games[self.client.slot]
+            if game not in self.ctx.all_item_and_group_names:
+                self.output("Can't look up item/location for unknown game. Hint for ID instead.")
+                return False
            names = self.ctx.location_names_for_game(game) \
                if for_location else \
                self.ctx.all_item_and_group_names[game]
-            hint_name, usable, response = get_intended_text(input_text,
-                                                            names)
+            hint_name, usable, response = get_intended_text(input_text, names)
+
            if usable:
                if hint_name in self.ctx.non_hintable_names[game]:
                    self.output(f"Sorry, \"{hint_name}\" is marked as non-hintable.")
@@ -1355,63 +1376,65 @@ class ClientMessageProcessor(CommonCommandProcessor):
                    hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_name)
                else:  # location name
                    hints = collect_hint_location_name(self.ctx, self.client.team, self.client.slot, hint_name)
-                cost = self.ctx.get_hint_cost(self.client.slot)
-                if hints:
-                    new_hints = set(hints) - self.ctx.hints[self.client.team, self.client.slot]
-                    old_hints = set(hints) - new_hints
-                    if old_hints:
-                        notify_hints(self.ctx, self.client.team, list(old_hints))
-                        if not new_hints:
-                            self.output("Hint was previously used, no points deducted.")
-                    if new_hints:
-                        found_hints = [hint for hint in new_hints if hint.found]
-                        not_found_hints = [hint for hint in new_hints if not hint.found]

-                        if not not_found_hints:  # everything's been found, no need to pay
-                            can_pay = 1000
-                        elif cost:
-                            can_pay = int((points_available // cost) > 0)  # limit to 1 new hint per call
-                        else:
-                            can_pay = 1000
-
-                        self.ctx.random.shuffle(not_found_hints)
-                        # By popular vote, make hints prefer non-local placements
-                        not_found_hints.sort(key=lambda hint: int(hint.receiving_player != hint.finding_player))
-
-                        hints = found_hints
-                        while can_pay > 0:
-                            if not not_found_hints:
-                                break
-                            hint = not_found_hints.pop()
-                            hints.append(hint)
-                            can_pay -= 1
-                            self.ctx.hints_used[self.client.team, self.client.slot] += 1
-                            points_available = get_client_points(self.ctx, self.client)
-
-                        if not_found_hints:
-                            if hints and cost and int((points_available // cost) == 0):
-                                self.output(
-                                    f"There may be more hintables, however, you cannot afford to pay for any more. "
-                                    f" You have {points_available} and need at least "
-                                    f"{self.ctx.get_hint_cost(self.client.slot)}.")
-                            elif hints:
-                                self.output(
-                                    "There may be more hintables, you can rerun the command to find more.")
-                            else:
-                                self.output(f"You can't afford the hint. "
-                                            f"You have {points_available} points and need at least "
-                                            f"{self.ctx.get_hint_cost(self.client.slot)}.")
-                        notify_hints(self.ctx, self.client.team, hints)
-                        self.ctx.save()
-                        return True
-
-                else:
-                    self.output("Nothing found. Item/Location may not exist.")
-                    return False
            else:
                self.output(response)
                return False

+        if hints:
+            cost = self.ctx.get_hint_cost(self.client.slot)
+            new_hints = set(hints) - self.ctx.hints[self.client.team, self.client.slot]
+            old_hints = set(hints) - new_hints
+            if old_hints:
+                notify_hints(self.ctx, self.client.team, list(old_hints))
+                if not new_hints:
+                    self.output("Hint was previously used, no points deducted.")
+            if new_hints:
+                found_hints = [hint for hint in new_hints if hint.found]
+                not_found_hints = [hint for hint in new_hints if not hint.found]
+
+                if not not_found_hints:  # everything's been found, no need to pay
+                    can_pay = 1000
+                elif cost:
+                    can_pay = int((points_available // cost) > 0)  # limit to 1 new hint per call
+                else:
+                    can_pay = 1000
+
+                self.ctx.random.shuffle(not_found_hints)
+                # By popular vote, make hints prefer non-local placements
+                not_found_hints.sort(key=lambda hint: int(hint.receiving_player != hint.finding_player))
+
+                hints = found_hints
+                while can_pay > 0:
+                    if not not_found_hints:
+                        break
+                    hint = not_found_hints.pop()
+                    hints.append(hint)
+                    can_pay -= 1
+                    self.ctx.hints_used[self.client.team, self.client.slot] += 1
+                    points_available = get_client_points(self.ctx, self.client)
+
+                if not_found_hints:
+                    if hints and cost and int((points_available // cost) == 0):
+                        self.output(
+                            f"There may be more hintables, however, you cannot afford to pay for any more. "
+                            f" You have {points_available} and need at least "
+                            f"{self.ctx.get_hint_cost(self.client.slot)}.")
+                    elif hints:
+                        self.output(
+                            "There may be more hintables, you can rerun the command to find more.")
+                    else:
+                        self.output(f"You can't afford the hint. "
+                                    f"You have {points_available} points and need at least "
+                                    f"{self.ctx.get_hint_cost(self.client.slot)}.")
+                notify_hints(self.ctx, self.client.team, hints)
+                self.ctx.save()
+                return True
+
+        else:
+            self.output("Nothing found. Item/Location may not exist.")
+            return False
+
    @mark_raw
    def _cmd_hint(self, item_name: str = "") -> bool:
        """Use !hint {item_name},
@@ -1859,17 +1882,25 @@ class ServerCommandProcessor(CommonCommandProcessor):
        seeked_player, usable, response = get_intended_text(player_name, self.ctx.player_names.values())
        if usable:
            team, slot = self.ctx.player_name_lookup[seeked_player]
-            item_name = " ".join(item_name)
            game = self.ctx.games[slot]
-            item_name, usable, response = get_intended_text(item_name, self.ctx.all_item_and_group_names[game])
+            full_name = " ".join(item_name)
+
+            if full_name.isnumeric():
+                item, usable, response = int(full_name), True, None
+            elif game in self.ctx.all_item_and_group_names:
+                item, usable, response = get_intended_text(full_name, self.ctx.all_item_and_group_names[game])
+            else:
+                self.output("Can't look up item for unknown game. Hint for ID instead.")
+                return False
+
            if usable:
-                if item_name in self.ctx.item_name_groups[game]:
+                if game in self.ctx.item_name_groups and item in self.ctx.item_name_groups[game]:
                    hints = []
-                    for item_name_from_group in self.ctx.item_name_groups[game][item_name]:
+                    for item_name_from_group in self.ctx.item_name_groups[game][item]:
                        if item_name_from_group in self.ctx.item_names_for_game(game):  # ensure item has an ID
                            hints.extend(collect_hints(self.ctx, team, slot, item_name_from_group))
-                else:  # item name
-                    hints = collect_hints(self.ctx, team, slot, item_name)
+                else:  # item name or id
+                    hints = collect_hints(self.ctx, team, slot, item)

                if hints:
                    notify_hints(self.ctx, team, hints)
@@ -1890,11 +1921,22 @@ class ServerCommandProcessor(CommonCommandProcessor):
        seeked_player, usable, response = get_intended_text(player_name, self.ctx.player_names.values())
        if usable:
            team, slot = self.ctx.player_name_lookup[seeked_player]
-            location_name = " ".join(location_name)
-            location_name, usable, response = get_intended_text(location_name,
-                                                                self.ctx.location_names_for_game(self.ctx.games[slot]))
+            game = self.ctx.games[slot]
+            full_name = " ".join(location_name)
+
+            if full_name.isnumeric():
+                location, usable, response = int(full_name), True, None
+            elif self.ctx.location_names_for_game(game) is not None:
+                location, usable, response = get_intended_text(full_name, self.ctx.location_names_for_game(game))
+            else:
+                self.output("Can't look up location for unknown game. Hint for ID instead.")
+                return False
+
            if usable:
-                hints = collect_hint_location_name(self.ctx, team, slot, location_name)
+                if isinstance(location, int):
+                    hints = collect_hint_location_id(self.ctx, team, slot, location)
+                else:
+                    hints = collect_hint_location_name(self.ctx, team, slot, location)
                if hints:
                    notify_hints(self.ctx, team, hints)
                else:
--- a/Options.py
+++ b/Options.py
@@ -483,7 +483,7 @@ class Range(NumericOption):
        if text.startswith("random"):
            return cls.weighted_range(text)
        elif text == "default" and hasattr(cls, "default"):
-            return cls(cls.default)
+            return cls.from_any(cls.default)
        elif text == "high":
            return cls(cls.range_end)
        elif text == "low":
@@ -494,7 +494,7 @@ class Range(NumericOption):
                and text in ("true", "false"):
            # these are the conditions where "true" and "false" make sense
            if text == "true":
-                return cls(cls.default)
+                return cls.from_any(cls.default)
            else:  # "false"
                return cls(0)
        return cls(int(text))
@@ -698,10 +698,7 @@ class OptionSet(Option[typing.Set[str]], VerifyKeys):

    @classmethod
    def from_any(cls, data: typing.Any):
-        if type(data) == list:
-            cls.verify_keys(data)
-            return cls(data)
-        elif type(data) == set:
+        if isinstance(data, (list, set, frozenset)):
            cls.verify_keys(data)
            return cls(data)
        return cls.from_text(str(data))
--- a/Starcraft2Client.py
+++ b/Starcraft2Client.py
@@ -295,34 +295,37 @@ class SC2Context(CommonContext):
                            category_panel.add_widget(
                                Label(text=category, size_hint_y=None, height=50, outline_width=1))

-                            # Map is completed
                            for mission in categories[category]:
-                                text = mission
-                                tooltip = ""
+                                text: str = mission
+                                tooltip: str = ""

                                # Map has uncollected locations
                                if mission in unfinished_missions:
                                    text = f"[color=6495ED]{text}[/color]"

-                                    tooltip = f"Uncollected locations:\n"
-                                    tooltip += "\n".join([self.ctx.location_names[loc] for loc in
-                                                          self.ctx.locations_for_mission(mission)
-                                                          if loc in self.ctx.missing_locations])
                                elif mission in available_missions:
                                    text = f"[color=FFFFFF]{text}[/color]"
                                # Map requirements not met
                                else:
                                    text = f"[color=a9a9a9]{text}[/color]"
                                    tooltip = f"Requires: "
-                                    if len(self.ctx.mission_req_table[mission].required_world) > 0:
+                                    if self.ctx.mission_req_table[mission].required_world:
                                        tooltip += ", ".join(list(self.ctx.mission_req_table)[req_mission - 1] for
                                                             req_mission in
                                                             self.ctx.mission_req_table[mission].required_world)

-                                        if self.ctx.mission_req_table[mission].number > 0:
+                                        if self.ctx.mission_req_table[mission].number:
                                            tooltip += " and "
-                                    if self.ctx.mission_req_table[mission].number > 0:
+                                    if self.ctx.mission_req_table[mission].number:
                                        tooltip += f"{self.ctx.mission_req_table[mission].number} missions completed"
+                                remaining_location_names: typing.List[str] = [
+                                    self.ctx.location_names[loc] for loc in self.ctx.locations_for_mission(mission)
+                                    if loc in self.ctx.missing_locations]
+                                if remaining_location_names:
+                                    if tooltip:
+                                        tooltip += "\n"
+                                    tooltip += f"Uncollected locations:\n"
+                                    tooltip += "\n".join(remaining_location_names)

                                mission_button = MissionButton(text=text, size_hint_y=None, height=50)
                                mission_button.tooltip_text = tooltip
@@ -790,7 +793,12 @@ def check_game_install_path() -> bool:
        with open(einfo) as f:
            content = f.read()
        if content:
-            base = re.search(r" = (.*)Versions", content).group(1)
+            try:
+                base = re.search(r" = (.*)Versions", content).group(1)
+            except AttributeError:
+                sc2_logger.warning(f"Found {einfo}, but it was empty. Run SC2 through the Blizzard launcher, then "
+                                   f"try again.")
+                return False
            if os.path.exists(base):
                executable = sc2.paths.latest_executeble(Path(base).expanduser() / "Versions")

@@ -807,7 +815,8 @@ def check_game_install_path() -> bool:
            else:
                sc2_logger.warning(f"{einfo} pointed to {base}, but we could not find an SC2 install there.")
    else:
-        sc2_logger.warning(f"Couldn't find {einfo}. Please run /set_path with your SC2 install directory.")
+        sc2_logger.warning(f"Couldn't find {einfo}. Run SC2 through the Blizzard launcher, then try again. "
+                           f"If that fails, please run /set_path with your SC2 install directory.")
    return False


--- a/WebHostLib/customserver.py
+++ b/WebHostLib/customserver.py
@@ -1,15 +1,16 @@
 from __future__ import annotations

-import functools
-import websockets
 import asyncio
+import collections
+import datetime
+import functools
+import logging
+import pickle
+import random
 import socket
 import threading
 import time
-import random
-import pickle
-import logging
-import datetime
+import websockets

 import Utils
 from .models import db_session, Room, select, commit, Command, db
@@ -49,6 +50,8 @@ class DBCommandProcessor(ServerCommandProcessor):


 class WebHostContext(Context):
+    room_id: int
+
    def __init__(self, static_server_data: dict):
        # static server data is used during _load_game_data to load required data,
        # without needing to import worlds system, which takes quite a bit of memory
@@ -62,6 +65,8 @@ class WebHostContext(Context):
    def _load_game_data(self):
        for key, value in self.static_server_data.items():
            setattr(self, key, value)
+        self.forced_auto_forfeits = collections.defaultdict(lambda: False, self.forced_auto_forfeits)
+        self.non_hintable_names = collections.defaultdict(frozenset, self.non_hintable_names)

    def listen_to_db_commands(self):
        cmdprocessor = DBCommandProcessor(self)
--- a/specification.md
+++ b/specification.md
@@ -23,3 +23,10 @@ No metadata is specified yet.
 ## Extra Data

 The zip can contain arbitrary files in addition what was specified above.
+
+
+## Caveats
+
+Imports from other files inside the apworld have to use relative imports.
+
+Imports from AP base have to use absolute imports, e.g. Options.py and worlds/AutoWorld.py.
--- a/docs/world
+++ b/docs/world
@@ -103,8 +103,9 @@ or boss drops for RPG-like games but could also be progress in a research tree.

 Each location has a `name` and an `id` (a.k.a. "code" or "address"), is placed
 in a Region and has access rules.
-The name needs to be unique in each game, the ID needs to be unique across all
-games and is best in the same range as the item IDs.
+The name needs to be unique in each game and must not be numeric (has to
+contain least 1 letter or symbol). The ID needs to be unique across all games
+and is best in the same range as the item IDs.
 World-specific IDs are 1 to 2<sup>53</sup>-1, IDs ≤ 0 are global and reserved.

 Special locations with ID `None` can hold events.
@@ -121,6 +122,9 @@ their world. Progression items will be assigned to locations with higher
 priority and moved around to meet defined rules and accomplish progression
 balancing.

+The name needs to be unique in each game, meaning a duplicate item has the
+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
@@ -188,15 +192,17 @@ 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 `..AutoWorld.World` from your package.
+which can be imported as `worlds.AutoWorld.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`.
-See [pip documentation](https://pip.pypa.io/en/stable/cli/pip_install/#requirements-file-format)
+`world/[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).

 ### Relative Imports

@@ -209,6 +215,10 @@ e.g. `from .Options import mygame_options` from your `__init__.py` will load
 When imported names pile up it may be easier to use `from . import Options`
 and access the variable as `Options.mygame_options`.

+Imports from directories outside your world should use absolute imports.
+Correct use of relative / absolute imports is required for zipped worlds to
+function, see [apworld specification.md](apworld%20specification.md).
+
 ### Your Item Type

 Each world uses its own subclass of `BaseClasses.Item`. The constuctor can be
@@ -321,7 +331,7 @@ mygame_options: typing.Dict[str, type(Option)] = {
 ```python
 # __init__.py

-from ..AutoWorld import World
+from worlds.AutoWorld import World
 from .Options import mygame_options  # import the options dict

 class MyGameWorld(World):
@@ -350,7 +360,7 @@ more natural. These games typically have been edited to 'bake in' the items.
 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
-from ..AutoWorld import World
+from worlds.AutoWorld import World
 from BaseClasses import Region, Location, Entrance, Item, RegionType, ItemClassification
 from Utils import get_options, output_path

@@ -551,7 +561,7 @@ def generate_basic(self) -> None:
 ### Setting Rules

 ```python
-from ..generic.Rules import add_rule, set_rule, forbid_item
+from worlds.generic.Rules import add_rule, set_rule, forbid_item
 from Items import get_item_type

 def set_rules(self) -> None:
@@ -601,14 +611,16 @@ implement more complex logic in logic mixins, even if there is no need to add
 properties to the `BaseClasses.CollectionState` state object.

 When importing a file that defines a class that inherits from
-`..AutoWorld.LogicMixin` the state object's class is automatically extended by
+`worlds.AutoWorld.LogicMixin` the state object's class is automatically extended by
 the mixin's members. These members should be prefixed with underscore following
 the name of the implementing world. This is due to sharing a namespace with all
 other logic mixins.

 Typical uses are defining methods that are used instead of `state.has`
-in lambdas, e.g.`state._mygame_has(custom, world, player)` or recurring checks
-like `state._mygame_can_do_something(world, player)` to simplify lambdas.
+in lambdas, e.g.`state.mygame_has(custom, player)` or recurring checks
+like `state.mygame_can_do_something(player)` to simplify lambdas.
+Private members, only accessible from mixins, should start with `_mygame_`,
+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)`
@@ -620,25 +632,26 @@ Please do this with caution and only when neccessary.
 ```python
 # Logic.py

-from ..AutoWorld import LogicMixin
+from worlds.AutoWorld import LogicMixin

 class MyGameLogic(LogicMixin):
-    def _mygame_has_key(self, world: MultiWorld, player: int):
+    def mygame_has_key(self, player: int):
        # Arguments above are free to choose
-        # it may make sense to use World as argument instead of MultiWorld
+        # MultiWorld can be accessed through self.world, explicitly passing in
+        # MyGameWorld instance for easy options access is also a valid approach
        return self.has("key", player)  # or whatever
 ```
 ```python
 # __init__.py

-from ..generic.Rules import set_rule
+from worlds.generic.Rules import set_rule
 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.world, self.player))
+                 lamda state: state.mygame_has_key(self.player))
 ```

 ### Generate Output
--- a/inno_setup.iss
+++ b/inno_setup.iss
@@ -196,7 +196,7 @@ begin
  begin
    // Is the installed version at least the packaged one ?
    Log('VC Redist x64 Version : found ' + strVersion);
-    Result := (CompareStr(strVersion, 'v14.29.30037') < 0);
+    Result := (CompareStr(strVersion, 'v14.32.31332') < 0);
  end
  else
  begin
--- a/test/general/TestNames.py
+++ b/test/general/TestNames.py
@@ -0,0 +1,20 @@
+import unittest
+from worlds.AutoWorld import AutoWorldRegister
+
+
+class TestNames(unittest.TestCase):
+    def testItemNamesFormat(self):
+        """Item names must not be all numeric in order to differentiate between ID and name in !hint"""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                for item_name in world_type.item_name_to_id:
+                    self.assertFalse(item_name.isnumeric(),
+                                     f"Item name \"{item_name}\" is invalid. It must not be numeric.")
+
+    def testLocationNameFormat(self):
+        """Location names must not be all numeric in order to differentiate between ID and name in !hint_location"""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                for location_name in world_type.location_name_to_id:
+                    self.assertFalse(location_name.isnumeric(),
+                                     f"Location name \"{location_name}\" is invalid. It must not be numeric.")
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -240,6 +240,11 @@ class World(metaclass=AutoWorldRegister):
        """Fill in the slot_data field in the Connected network package."""
        return {}

+    def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]):
+        """Fill in additional entrance information text into locations, which is displayed when hinted.
+        structure is {player_id: {location_id: text}} You will need to insert your own player_id."""
+        pass
+
    def modify_multidata(self, multidata: Dict[str, Any]) -> None:  # TODO: TypedDict for multidata?
        """For deeper modification of server multidata."""
        pass
--- a/worlds/init.py
+++ b/worlds/init.py
@@ -27,7 +27,8 @@ class WorldSource(typing.NamedTuple):
 world_sources: typing.List[WorldSource] = []
 file: os.DirEntry  # for me (Berserker) at least, PyCharm doesn't seem to infer the type correctly
 for file in os.scandir(folder):
-    if not file.name.startswith("_"):  # prevent explicitly loading __pycache__ and allow _* names for non-world folders
+    # prevent loading of __pycache__ and allow _* for non-world folders, disable files/folders starting with "."
+    if not file.name.startswith(("_", ".")):
        if file.is_dir():
            world_sources.append(WorldSource(file.name))
        elif file.is_file() and file.name.endswith(".apworld"):
--- a/worlds/alttp/Regions.py
+++ b/worlds/alttp/Regions.py
@@ -4,6 +4,10 @@ import typing
 from BaseClasses import Region, Entrance, RegionType


+def is_main_entrance(entrance: Entrance) -> bool:
+    return entrance.parent_region.type in {RegionType.DarkWorld, RegionType.LightWorld, RegionType.Generic}
+
+
 def create_regions(world, player):

    world.regions += [
--- a/worlds/alttp/init.py
+++ b/worlds/alttp/init.py
@@ -12,7 +12,8 @@ from .InvertedRegions import create_inverted_regions, mark_dark_world_regions
 from .ItemPool import generate_itempool, difficulties
 from .Items import item_init_table, item_name_groups, item_table, GetBeemizerItem
 from .Options import alttp_options, smallkey_shuffle
-from .Regions import lookup_name_to_id, create_regions, mark_light_world_regions
+from .Regions import lookup_name_to_id, create_regions, mark_light_world_regions, lookup_vanilla_location_to_entrance, \
+    is_main_entrance
 from .Rom import LocalRom, patch_rom, patch_race_rom, check_enemizer, patch_enemizer, apply_rom_settings, \
    get_hash_string, get_base_rom_path, LttPDeltaPatch
 from .Rules import set_rules
@@ -24,6 +25,7 @@ lttp_logger = logging.getLogger("A Link to the Past")

 extras_list = sum(difficulties['normal'].extras[0:5], [])

+
 class ALTTPWeb(WebWorld):
    setup_en = Tutorial(
        "Multiworld Setup Tutorial",
@@ -410,6 +412,20 @@ class ALTTPWorld(World):
        finally:
            self.rom_name_available_event.set() # make sure threading continues and errors are collected

+    @classmethod
+    def stage_extend_hint_information(cls, world, hint_data: typing.Dict[int, typing.Dict[int, str]]):
+        er_hint_data = {player: {} for player in world.get_game_players("A Link to the Past") if
+                        world.shuffle[player] != "vanilla" or world.retro_caves[player]}
+
+        for region in world.regions:
+            if region.player in er_hint_data and region.locations:
+                main_entrance = region.get_connecting_entrance(is_main_entrance)
+                for location in region.locations:
+                    if type(location.address) == int:  # skips events and crystals
+                        if lookup_vanilla_location_to_entrance[location.address] != main_entrance.name:
+                            er_hint_data[region.player][location.address] = main_entrance.name
+        hint_data.update(er_hint_data)
+
    def modify_multidata(self, multidata: dict):
        import base64
        # wait for self.rom_name to be available.
--- a/worlds/alttp/docs/multiworld_de.md
+++ b/worlds/alttp/docs/multiworld_de.md
@@ -6,7 +6,7 @@
 - [SNI](https://github.com/alttpo/sni/releases) (Integriert in Archipelago)
 - Hardware oder Software zum Laden und Abspielen von SNES Rom-Dateien fähig zu einer Internetverbindung
    - Ein Emulator, der mit SNI verbinden kann
-      ([snes9x Multitroid](https://drive.google.com/drive/folders/1_ej-pwWtCAHYXIrvs5Hro16A1s9Hi3Jz),
+      ([snes9x rr](https://github.com/gocha/snes9x-rr/releases),
      [BizHawk](http://tasvideos.org/BizHawk.html))
    - Ein SD2SNES, [FXPak Pro](https://krikzz.com/store/home/54-fxpak-pro.html), oder andere kompatible Hardware
 - Die Japanische Zelda 1.0 ROM-Datei, mit folgendem Namen: `Zelda no Densetsu - Kamigami no Triforce (Japan).sfc`
@@ -93,7 +93,7 @@ Wenn der client den Emulator automatisch gestartet hat, wird SNI ebenfalls im Hi
 Mal ist, wird möglicherweise ein Fenster angezeigt, wo man bestätigen muss, dass das Programm durch die Windows Firewall
 kommunizieren darf.

-##### snes9x Multitroid
+##### snes9x-rr

 1. Lade die Entsprechende ROM-Datei, wenn sie nicht schon automatisch geladen wurde.
 2. Klicke auf den Reiter "File" oben im Menü und wähle **Lua Scripting**
--- a/worlds/alttp/docs/multiworld_en.md
+++ b/worlds/alttp/docs/multiworld_en.md
@@ -75,7 +75,7 @@ client, and will also create your ROM in the same place as your patch file.
 When the client launched automatically, SNI should have also automatically launched in the background. If this is its
 first time launching, you may be prompted to allow it to communicate through the Windows Firewall.

-##### snes9x Multitroid
+##### snes9x-rr

 1. Load your ROM file if it hasn't already been loaded.
 2. Click on the File menu and hover on **Lua Scripting**
--- a/worlds/alttp/docs/multiworld_es.md
+++ b/worlds/alttp/docs/multiworld_es.md
@@ -12,7 +12,7 @@
 - [QUsb2Snes](https://github.com/Skarsnik/QUsb2snes/releases) (Incluido en Multiworld Utilities)
 - Hardware o software capaz de cargar y ejecutar archivos de ROM de SNES
    - Un emulador capaz de ejecutar scripts Lua
-      ([snes9x Multitroid](https://drive.google.com/drive/folders/1_ej-pwWtCAHYXIrvs5Hro16A1s9Hi3Jz),
+      ([snes9x rr](https://github.com/gocha/snes9x-rr/releases),
       [BizHawk](http://tasvideos.org/BizHawk.html), o
       [RetroArch](https://retroarch.com?page=platforms) 1.10.1 o más nuevo). O,
    - Un flashcart SD2SNES, [FXPak Pro](https://krikzz.com/store/home/54-fxpak-pro.html), o otro hardware compatible
@@ -111,13 +111,13 @@ automáticamente el cliente, y ademas creara la rom en el mismo directorio donde
 Cuando el cliente se lance automáticamente, QUsb2Snes debería haberse ejecutado también. Si es la primera vez que lo
 ejecutas, puedes ser que el firewall de Windows te pregunte si le permites la comunicación.

-##### snes9x Multitroid
+##### snes9x-rr

 1. Carga tu fichero de ROM, si no lo has hecho ya
 2. Abre el menu "File" y situa el raton en **Lua Scripting**
 3. Haz click en **New Lua Script Window...**
 4. En la nueva ventana, haz click en **Browse...**
-5. Navega hacia el directorio donde este situado snes9x Multitroid, entra en el directorio `lua`, y
+5. Navega hacia el directorio donde este situado snes9x-rr, entra en el directorio `lua`, y
   escoge `multibridge.lua`
 6. Observa que se ha asignado un nombre al dispositivo, y el cliente muestra "SNES Device: Connected", con el mismo
   nombre en la esquina superior izquierda.
--- a/worlds/alttp/docs/multiworld_fr.md
+++ b/worlds/alttp/docs/multiworld_fr.md
@@ -12,7 +12,7 @@
 - [QUsb2Snes](https://github.com/Skarsnik/QUsb2snes/releases) (Inclus dans les utilitaires précédents)
 - Une solution logicielle ou matérielle capable de charger et de lancer des fichiers ROM de SNES
    - Un émulateur capable d'éxécuter des scripts Lua
-      ([snes9x Multitroid](https://drive.google.com/drive/folders/1_ej-pwWtCAHYXIrvs5Hro16A1s9Hi3Jz),
+      ([snes9x rr](https://github.com/gocha/snes9x-rr/releases),
      [BizHawk](http://tasvideos.org/BizHawk.html))
    - Un SD2SNES, [FXPak Pro](https://krikzz.com/store/home/54-fxpak-pro.html), ou une autre solution matérielle
      compatible
@@ -112,13 +112,13 @@ Quand le client se lance automatiquement, QUsb2Snes devrait se lancer automatiqu
 c'est la première fois qu'il démarre, il vous sera peut-être demandé de l'autoriser à communiquer à travers le pare-feu
 Windows.

-##### snes9x Multitroid
+##### snes9x-rr

 1. Chargez votre ROM si ce n'est pas déjà fait.
 2. Cliquez sur le menu "File" et survolez l'option **Lua Scripting**
 3. Cliquez alors sur **New Lua Script Window...**
 4. Dans la nouvelle fenêtre, sélectionnez **Browse...**
-5. Dirigez vous vers le dossier où vous avez extrait snes9x Multitroid, allez dans le dossier `lua`, puis
+5. Dirigez vous vers le dossier où vous avez extrait snes9x-rr, allez dans le dossier `lua`, puis
   choisissez `multibridge.lua`
 6. Remarquez qu'un nom vous a été assigné, et que l'interface Web affiche "SNES Device: Connected", avec ce même nom
   dans le coin en haut à gauche.
--- a/worlds/dkc3/docs/setup_en.md
+++ b/worlds/dkc3/docs/setup_en.md
@@ -7,8 +7,7 @@

 - Hardware or software capable of loading and playing SNES ROM files
    - An emulator capable of connecting to SNI such as:
-        - snes9x Multitroid
-          from: [snes9x Multitroid Download](https://drive.google.com/drive/folders/1_ej-pwWtCAHYXIrvs5Hro16A1s9Hi3Jz),
+        - snes9x-rr from: [snes9x rr](https://github.com/gocha/snes9x-rr/releases),
        - BizHawk from: [BizHawk Website](http://tasvideos.org/BizHawk.html)
        - RetroArch 1.10.3 or newer from: [RetroArch Website](https://retroarch.com?page=platforms). Or,
    - An SD2SNES, FXPak Pro ([FXPak Pro Store Page](https://krikzz.com/store/home/54-fxpak-pro.html)), or other
@@ -81,7 +80,7 @@ client, and will also create your ROM in the same place as your patch file.
 When the client launched automatically, SNI should have also automatically launched in the background. If this is its
 first time launching, you may be prompted to allow it to communicate through the Windows Firewall.

-##### snes9x Multitroid
+##### snes9x-rr

 1. Load your ROM file if it hasn't already been loaded.
 2. Click on the File menu and hover on **Lua Scripting**
--- a/worlds/factorio/Mod.py
+++ b/worlds/factorio/Mod.py
@@ -34,7 +34,8 @@ base_info = {
    "factorio_version": "1.1",
    "dependencies": [
        "base >= 1.1.0",
-        "? science-not-invited"
+        "? science-not-invited",
+        "? factory-levels"
    ]
 }

--- a/worlds/factorio/data/mod/info.json
+++ b/worlds/factorio/data/mod/info.json
@@ -7,7 +7,8 @@
    "description": "Integration client for the Archipelago Randomizer",
    "factorio_version": "1.1",
    "dependencies": [
-	  "base >= 1.1.0",
-	  "? science-not-invited"
-	]
+      "base >= 1.1.0",
+      "? science-not-invited",
+      "? factory-levels"
+    ]
 }
--- a/worlds/factorio/data/mod_template/data-final-fixes.lua
+++ b/worlds/factorio/data/mod_template/data-final-fixes.lua
@@ -183,6 +183,18 @@ end
 data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories)
 data.raw["assembling-machine"]["assembling-machine-2"].crafting_categories = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories)
 data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes)
+if mods["factory-levels"] then
+    -- Factory-Levels allows the assembling machines to get faster (and depending on settings), more productive at crafting products, the more the
+    -- assembling machine crafts the product.  If the machine crafts enough, it may auto-upgrade to the next tier.
+    for i = 1, 25, 1 do
+        data.raw["assembling-machine"]["assembling-machine-1-level-" .. i].crafting_categories = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories)
+        data.raw["assembling-machine"]["assembling-machine-1-level-" .. i].fluid_boxes = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes)
+    end
+    for i = 1, 50, 1 do
+        data.raw["assembling-machine"]["assembling-machine-2-level-" .. i].crafting_categories = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories)
+    end
+end
+
 data.raw["ammo"]["artillery-shell"].stack_size = 10

 {# each randomized tech gets set to be invisible, with new nodes added that trigger those #}
--- a/worlds/sm/docs/multiworld_en.md
+++ b/worlds/sm/docs/multiworld_en.md
@@ -7,8 +7,7 @@
  
 - Hardware or software capable of loading and playing SNES ROM files
    - An emulator capable of connecting to SNI such as:
-        - snes9x Multitroid
-          from: [snes9x Multitroid Download](https://drive.google.com/drive/folders/1_ej-pwWtCAHYXIrvs5Hro16A1s9Hi3Jz),
+        - snes9x-rr from: [snes9x rr](https://github.com/gocha/snes9x-rr/releases),
        - BizHawk from: [BizHawk Website](http://tasvideos.org/BizHawk.html)
        - RetroArch 1.10.1 or newer from: [RetroArch Website](https://retroarch.com?page=platforms). Or,
    - An SD2SNES, FXPak Pro ([FXPak Pro Store Page](https://krikzz.com/store/home/54-fxpak-pro.html)), or other
@@ -81,7 +80,7 @@ client, and will also create your ROM in the same place as your patch file.
 When the client launched automatically, SNI should have also automatically launched in the background. If this is its
 first time launching, you may be prompted to allow it to communicate through the Windows Firewall.

-##### snes9x Multitroid
+##### snes9x-rr

 1. Load your ROM file if it hasn't already been loaded.
 2. Click on the File menu and hover on **Lua Scripting**
--- a/worlds/smz3/docs/multiworld_en.md
+++ b/worlds/smz3/docs/multiworld_en.md
@@ -8,8 +8,7 @@
  `SNI Client - A Link to the Past Patch Setup`
 - Hardware or software capable of loading and playing SNES ROM files
    - An emulator capable of connecting to SNI such as:
-        - snes9x Multitroid
-          from: [snes9x Multitroid Download](https://drive.google.com/drive/folders/1_ej-pwWtCAHYXIrvs5Hro16A1s9Hi3Jz),
+        - snes9x-rr from: [snes9x rr](https://github.com/gocha/snes9x-rr/releases),
        - BizHawk from: [BizHawk Website](http://tasvideos.org/BizHawk.html), or
        - RetroArch 1.10.3 or newer from: [RetroArch Website](https://retroarch.com?page=platforms). Or,
    - An SD2SNES, FXPak Pro ([FXPak Pro Store Page](https://krikzz.com/store/home/54-fxpak-pro.html)), or other
@@ -79,7 +78,7 @@ client, and will also create your ROM in the same place as your patch file.
 When the client launched automatically, SNI should have also automatically launched in the background. If this is its
 first time launching, you may be prompted to allow it to communicate through the Windows Firewall.

-##### snes9x Multitroid
+##### snes9x-rr

 1. Load your ROM file if it hasn't already been loaded.
 2. Click on the File menu and hover on **Lua Scripting**
--- a/worlds/soe/Logic.py
+++ b/worlds/soe/Logic.py
@@ -35,7 +35,7 @@ class SecretOfEvermoreLogic(LogicMixin):
                if pvd[1] == progress and pvd[0] > 0:
                    has = True
                    for req in rule.requires:
-                        if not self._soe_has(req[1], world, player, req[0]):
+                        if not self.soe_has(req[1], world, player, req[0]):
                            has = False
                            break
                    if has:
@@ -44,7 +44,7 @@ class SecretOfEvermoreLogic(LogicMixin):
                            return n
        return n

-    def _soe_has(self, progress: int, world: MultiWorld, player: int, count: int = 1) -> bool:
+    def soe_has(self, progress: int, world: MultiWorld, player: int, count: int = 1) -> bool:
        """
        Returns True if count of one of evermizer's progress steps is reached based on collected items. i.e. 2 * P_DE
        """
--- a/worlds/soe/init.py
+++ b/worlds/soe/init.py
@@ -283,7 +283,7 @@ class SoEWorld(World):
        self.world.completion_condition[self.player] = lambda state: state.has('Victory', self.player)
        # set Done from goal option once we have multiple goals
        set_rule(self.world.get_location('Done', self.player),
-                 lambda state: state._soe_has(pyevermizer.P_FINAL_BOSS, self.world, self.player))
+                 lambda state: state.soe_has(pyevermizer.P_FINAL_BOSS, self.world, self.player))
        set_rule(self.world.get_entrance('New Game', self.player), lambda state: True)
        for loc in _locations:
            location = self.world.get_location(loc.name, self.player)
@@ -292,7 +292,7 @@ class SoEWorld(World):
    def make_rule(self, requires: typing.List[typing.Tuple[int]]) -> typing.Callable[[typing.Any], bool]:
        def rule(state) -> bool:
            for count, progress in requires:
-                if not state._soe_has(progress, self.world, self.player, count):
+                if not state.soe_has(progress, self.world, self.player, count):
                    return False
            return True

--- a/worlds/witness/Options.py
+++ b/worlds/witness/Options.py
@@ -15,9 +15,9 @@ class DisableNonRandomizedPuzzles(DefaultOnToggle):


 class EarlySecretArea(Toggle):
-    """Opens the Mountainside shortcut to the Mountain Secret Area from the start.
+    """Opens the Mountainside shortcut to the Caves from the start.
    (Otherwise known as "UTM", "Caves" or the "Challenge Area")"""
-    display_name = "Early Secret Area"
+    display_name = "Early Caves"


 class ShuffleSymbols(DefaultOnToggle):
@@ -58,15 +58,9 @@ class ShuffleVaultBoxes(Toggle):
    display_name = "Shuffle Vault Boxes"


-class ShuffleUncommonLocations(Toggle):
-    """Adds some optional puzzles that are somewhat difficult or out of the way.
-    Examples: Mountaintop River Shape, Tutorial Patio Floor, Theater Videos"""
-    display_name = "Shuffle Uncommon Locations"
-
-
 class ShufflePostgame(Toggle):
-    """Adds locations into the pool that are guaranteed to be locked behind your goal. Use this if you don't play with
-    forfeit on victory."""
+    """Adds locations into the pool that are guaranteed to become accessible before or at the same time as your goal.
+    Use this if you don't play with forfeit on victory."""
    display_name = "Shuffle Postgame"


@@ -90,7 +84,7 @@ class MountainLasers(Range):


 class ChallengeLasers(Range):
-    """Sets the amount of beams required to enter the secret area through the Mountain Bottom Layer Discard."""
+    """Sets the amount of beams required to enter the Caves through the Mountain Bottom Floor Discard."""
    display_name = "Required Lasers for Challenge"
    range_start = 1
    range_end = 11
@@ -122,7 +116,6 @@ the_witness_options: Dict[str, type] = {
    "disable_non_randomized_puzzles": DisableNonRandomizedPuzzles,
    "shuffle_discarded_panels": ShuffleDiscardedPanels,
    "shuffle_vault_boxes": ShuffleVaultBoxes,
-    "shuffle_uncommon": ShuffleUncommonLocations,
    "shuffle_postgame": ShufflePostgame,
    "victory_condition": VictoryCondition,
    "mountain_lasers": MountainLasers,
--- a/worlds/witness/WitnessItems.txt
+++ b/worlds/witness/WitnessItems.txt
@@ -28,38 +28,38 @@ Traps:
 610 - Power Surge

 Doors:
-1100 - Glass Factory Entry Door (Panel) - 0x01A54
-1105 - Door to Symmetry Island Lower (Panel) - 0x000B0
-1107 - Door to Symmetry Island Upper (Panel) - 0x1C349
-1110 - Door to Desert Flood Light Room (Panel) - 0x0C339
-1111 - Desert Flood Room Flood Controls (Panel) - 0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B
-1119 - Quarry Door to Mill (Panel) - 0x01E5A,0x01E59
+1100 - Glass Factory Entry (Panel) - 0x01A54
+1105 - Symmetry Island Lower (Panel) - 0x000B0
+1107 - Symmetry Island Upper (Panel) - 0x1C349
+1110 - Desert Light Room Entry (Panel) - 0x0C339
+1111 - Desert Flood Controls (Panel) - 0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B
+1119 - Quarry Mill Entry (Panel) - 0x01E5A,0x01E59
 1120 - Quarry Mill Ramp Controls (Panel) - 0x03678,0x03676
-1122 - Quarry Mill Elevator Controls (Panel) - 0x03679,0x03675
+1122 - Quarry Mill Lift Controls (Panel) - 0x03679,0x03675
 1125 - Quarry Boathouse Ramp Height Control (Panel) - 0x03852
 1127 - Quarry Boathouse Ramp Horizontal Control (Panel) - 0x03858
 1131 - Shadows Door Timer (Panel) - 0x334DB,0x334DC
-1150 - Monastery Entry Door Left (Panel) - 0x00B10
-1151 - Monastery Entry Door Right (Panel) - 0x00C92
-1162 - Town Door to RGB House (Panel) - 0x28998
-1163 - Town Door to Church (Panel) - 0x28A0D
+1150 - Monastery Entry Left (Panel) - 0x00B10
+1151 - Monastery Entry Right (Panel) - 0x00C92
+1162 - Town Tinted Glass Door (Panel) - 0x28998
+1163 - Town Church Entry (Panel) - 0x28A0D
 1166 - Town Maze Panel (Drop-Down Staircase) (Panel) - 0x28A79
-1169 - Windmill Door (Panel) - 0x17F5F
+1169 - Windmill Entry (Panel) - 0x17F5F
 1200 - Treehouse First & Second Doors (Panel) - 0x0288C,0x02886
 1202 - Treehouse Third Door (Panel) - 0x0A182
 1205 - Treehouse Laser House Door Timer (Panel) - 0x2700B,0x334DC
-1208 - Treehouse Shortcut Drop-Down Bridge (Panel) - 0x17CBC
+1208 - Treehouse Drawbridge (Panel) - 0x17CBC
 1175 - Jungle Popup Wall (Panel) - 0x17CAB
-1180 - Bunker Entry Door (Panel) - 0x17C2E
-1183 - Inside Bunker Door to Bunker Proper (Panel) - 0x0A099
+1180 - Bunker Entry (Panel) - 0x17C2E
+1183 - Bunker Tinted Glass Door (Panel) - 0x0A099
 1186 - Bunker Elevator Control (Panel) - 0x0A079
-1190 - Swamp Entry Door (Panel) - 0x0056E
+1190 - Swamp Entry (Panel) - 0x0056E
 1192 - Swamp Sliding Bridge (Panel) - 0x00609,0x18488
 1195 - Swamp Rotating Bridge (Panel) - 0x181F5
 1197 - Swamp Maze Control (Panel) - 0x17C0A
 1310 - Boat - 0x17CDF,0x17CC8,0x17CA6,0x09DB8,0x17C95,0x0A054

-1400 - Caves Mountain Shortcut - 0x2D73F
+1400 - Caves Mountain Shortcut (Door) - 0x2D73F

 1500 - Symmetry Laser - 0x00509
 1501 - Desert Laser - 0x012FB,0x01317
@@ -73,101 +73,101 @@ Doors:
 1509 - Swamp Laser - 0x00BF6
 1510 - Treehouse Laser - 0x028A4

-1600 - Outside Tutorial Optional Door - 0x03BA2
-1603 - Outside Tutorial Outpost Entry Door - 0x0A170
-1606 - Outside Tutorial Outpost Exit Door - 0x04CA3
-1609 - Glass Factory Entry Door - 0x01A29
-1612 - Glass Factory Back Wall - 0x0D7ED
-1615 - Symmetry Island Lower Door - 0x17F3E
-1618 - Symmetry Island Upper Door - 0x18269
-1619 - Orchard Middle Gate - 0x03307
-1620 - Orchard Final Gate - 0x03313
-1621 - Desert Door to Flood Light Room - 0x09FEE
-1624 - Desert Door to Pond Room - 0x0C2C3
-1627 - Desert Door to Water Levels Room - 0x0A24B
-1630 - Desert Door to Elevator Room - 0x0C316
-1633 - Quarry Main Entry 1 - 0x09D6F
-1636 - Quarry Main Entry 2 - 0x17C07
-1639 - Quarry Door to Mill - 0x02010
-1642 - Quarry Mill Side Door - 0x275FF
-1645 - Quarry Mill Rooftop Shortcut - 0x17CE8
-1648 - Quarry Mill Stairs - 0x0368A
-1651 - Quarry Boathouse Boat Staircase - 0x2769B,0x27163
-1653 - Quarry Boathouse First Barrier - 0x17C50
-1654 - Quarry Boathouse Shortcut - 0x3865F
-1656 - Shadows Timed Door - 0x19B24
-1657 - Shadows Laser Room Right Door - 0x194B2
-1660 - Shadows Laser Room Left Door - 0x19665
-1663 - Shadows Barrier to Quarry - 0x19865,0x0A2DF
-1666 - Shadows Barrier to Ledge - 0x1855B,0x19ADE
-1669 - Keep Hedge Maze 1 Exit Door - 0x01954
-1672 - Keep Pressure Plates 1 Exit Door - 0x01BEC
-1675 - Keep Hedge Maze 2 Shortcut - 0x018CE
-1678 - Keep Hedge Maze 2 Exit Door - 0x019D8
-1681 - Keep Hedge Maze 3 Shortcut - 0x019B5
-1684 - Keep Hedge Maze 3 Exit Door - 0x019E6
-1687 - Keep Hedge Maze 4 Shortcut - 0x0199A
-1690 - Keep Hedge Maze 4 Exit Door - 0x01A0E
-1693 - Keep Pressure Plates 2 Exit Door - 0x01BEA
-1696 - Keep Pressure Plates 3 Exit Door - 0x01CD5
-1699 - Keep Pressure Plates 4 Exit Door - 0x01D40
-1702 - Keep Shortcut to Shadows - 0x09E3D
-1705 - Keep Tower Shortcut - 0x04F8F
-1708 - Monastery Shortcut - 0x0364E
-1711 - Monastery Inner Door - 0x0C128
-1714 - Monastery Outer Door - 0x0C153
-1717 - Monastery Door to Garden - 0x03750
-1718 - Town Cargo Box Door - 0x0A0C9
-1720 - Town Wooden Roof Staircase - 0x034F5
-1723 - Town Tinted Door to RGB House - 0x28A61
-1726 - Town Door to Church - 0x03BB0
-1729 - Town Maze Staircase - 0x28AA2
-1732 - Town Windmill Door - 0x1845B
-1735 - Town RGB House Staircase - 0x2897B
-1738 - Town Tower Blue Panels Door - 0x27798
-1741 - Town Tower Lattice Door - 0x27799
-1744 - Town Tower Environmental Set Door - 0x2779A
-1747 - Town Tower Wooden Roof Set Door - 0x2779C
-1750 - Theater Entry Door - 0x17F88
-1753 - Theater Exit Door Left - 0x0A16D
-1756 - Theater Exit Door Right - 0x3CCDF
-1759 - Jungle Bamboo Shortcut to River - 0x3873B
-1760 - Jungle Popup Wall - 0x1475B
-1762 - River Shortcut to Monastery Garden - 0x0CF2A
-1765 - Bunker Bunker Entry Door - 0x0C2A4
-1768 - Bunker Tinted Glass Door - 0x17C79
-1771 - Bunker Door to Ultraviolet Room - 0x0C2A3
-1774 - Bunker Door to Elevator - 0x0A08D
-1777 - Swamp Entry Door - 0x00C1C
-1780 - Swamp Door to Broken Shapers - 0x184B7
+1600 - Outside Tutorial Outpost Path (Door) - 0x03BA2
+1603 - Outside Tutorial Outpost Entry (Door) - 0x0A170
+1606 - Outside Tutorial Outpost Exit (Door) - 0x04CA3
+1609 - Glass Factory Entry (Door) - 0x01A29
+1612 - Glass Factory Back Wall (Door) - 0x0D7ED
+1615 - Symmetry Island Lower (Door) - 0x17F3E
+1618 - Symmetry Island Upper (Door) - 0x18269
+1619 - Orchard First Gate (Door) - 0x03307
+1620 - Orchard Second Gate (Door) - 0x03313
+1621 - Desert Light Room Entry (Door) - 0x09FEE
+1624 - Desert Pond Room Entry (Door) - 0x0C2C3
+1627 - Desert Flood Room Entry (Door) - 0x0A24B
+1630 - Desert Elevator Room Entry (Door) - 0x0C316
+1633 - Quarry Entry 1 (Door) - 0x09D6F
+1636 - Quarry Entry 2 (Door) - 0x17C07
+1639 - Quarry Mill Entry (Door) - 0x02010
+1642 - Quarry Mill Side Exit (Door) - 0x275FF
+1645 - Quarry Mill Roof Exit (Door) - 0x17CE8
+1648 - Quarry Mill Stairs (Door) - 0x0368A
+1651 - Quarry Boathouse Dock (Door) - 0x2769B,0x27163
+1653 - Quarry Boathouse First Barrier (Door) - 0x17C50
+1654 - Quarry Boathouse Second Barrier (Door) - 0x3865F
+1656 - Shadows Timed Door (Door) - 0x19B24
+1657 - Shadows Laser Entry Right (Door) - 0x194B2
+1660 - Shadows Laser Entry Left (Door) - 0x19665
+1663 - Shadows Quarry Barrier (Door) - 0x19865,0x0A2DF
+1666 - Shadows Ledge Barrier (Door) - 0x1855B,0x19ADE
+1669 - Keep Hedge Maze 1 Exit (Door) - 0x01954
+1672 - Keep Pressure Plates 1 Exit (Door) - 0x01BEC
+1675 - Keep Hedge Maze 2 Shortcut (Door) - 0x018CE
+1678 - Keep Hedge Maze 2 Exit (Door) - 0x019D8
+1681 - Keep Hedge Maze 3 Shortcut (Door) - 0x019B5
+1684 - Keep Hedge Maze 3 Exit (Door) - 0x019E6
+1687 - Keep Hedge Maze 4 Shortcut (Door) - 0x0199A
+1690 - Keep Hedge Maze 4 Exit (Door) - 0x01A0E
+1693 - Keep Pressure Plates 2 Exit (Door) - 0x01BEA
+1696 - Keep Pressure Plates 3 Exit (Door) - 0x01CD5
+1699 - Keep Pressure Plates 4 Exit (Door) - 0x01D40
+1702 - Keep Shadows Shortcut (Door) - 0x09E3D
+1705 - Keep Tower Shortcut (Door) - 0x04F8F
+1708 - Monastery Shortcut (Door) - 0x0364E
+1711 - Monastery Entry Inner (Door) - 0x0C128
+1714 - Monastery Entry Outer (Door) - 0x0C153
+1717 - Monastery Garden Entry (Door) - 0x03750
+1718 - Town Cargo Box Entry (Door) - 0x0A0C9
+1720 - Town Wooden Roof Stairs (Door) - 0x034F5
+1723 - Town Tinted Glass Door (Door) - 0x28A61
+1726 - Town Church Entry (Door) - 0x03BB0
+1729 - Town Maze Stairs (Door) - 0x28AA2
+1732 - Town Windmill Entry (Door) - 0x1845B
+1735 - Town RGB House Stairs (Door) - 0x2897B
+1738 - Town Tower First Door (Door) - 0x27798
+1741 - Town Tower Third Door (Door) - 0x27799
+1744 - Town Tower Fourth Door (Door) - 0x2779A
+1747 - Town Tower Second Door (Door) - 0x2779C
+1750 - Theater Entry (Door) - 0x17F88
+1753 - Theater Exit Left (Door) - 0x0A16D
+1756 - Theater Exit Right (Door) - 0x3CCDF
+1759 - Jungle Bamboo Laser Shortcut (Door) - 0x3873B
+1760 - Jungle Popup Wall (Door) - 0x1475B
+1762 - River Monastery Shortcut (Door) - 0x0CF2A
+1765 - Bunker Entry (Door) - 0x0C2A4
+1768 - Bunker Tinted Glass Door (Door) - 0x17C79
+1771 - Bunker UV Room Entry (Door) - 0x0C2A3
+1774 - Bunker Elevator Room Entry (Door) - 0x0A08D
+1777 - Swamp Entry (Door) - 0x00C1C
+1780 - Swamp Between Bridges First Door - 0x184B7
 1783 - Swamp Platform Shortcut Door - 0x38AE6
-1786 - Swamp Cyan Water Pump - 0x04B7F
-1789 - Swamp Door to Rotated Shapers - 0x18507
-1792 - Swamp Red Water Pump - 0x183F2
-1795 - Swamp Red Underwater Exit - 0x305D5
-1798 - Swamp Blue Water Pump - 0x18482
-1801 - Swamp Purple Water Pump - 0x0A1D6
-1804 - Swamp Near Laser Shortcut - 0x2D880
-1807 - Treehouse First Door - 0x0C309
-1810 - Treehouse Second Door - 0x0C310
-1813 - Treehouse Beyond Yellow Bridge Door - 0x0A181
-1816 - Treehouse Drawbridge - 0x0C32D
-1819 - Treehouse Timed Door to Laser House - 0x0C323
-1822 - Inside Mountain First Layer Exit Door - 0x09E54
-1825 - Inside Mountain Second Layer Staircase Near - 0x09FFB
-1828 - Inside Mountain Second Layer Exit Door - 0x09EDD
-1831 - Inside Mountain Second Layer Staircase Far - 0x09E07
-1834 - Inside Mountain Giant Puzzle Exit Door - 0x09F89
-1840 - Inside Mountain Door to Final Room - 0x0C141
-1843 - Inside Mountain Bottom Layer Rock - 0x17F33
-1846 - Inside Mountain Door to Secret Area - 0x2D77D
-1849 - Caves Pillar Door - 0x019A5
-1855 - Caves Swamp Shortcut - 0x2D859
-1858 - Challenge Entry Door - 0x0A19A
-1861 - Challenge Door to Theater Walkway - 0x0348A
-1864 - Theater Walkway Door to Windmill Interior - 0x27739
-1867 - Theater Walkway Door to Desert Elevator Room - 0x27263
-1870 - Theater Walkway Door to Town - 0x09E87
+1786 - Swamp Cyan Water Pump (Door) - 0x04B7F
+1789 - Swamp Between Bridges Second Door - 0x18507
+1792 - Swamp Red Water Pump (Door) - 0x183F2
+1795 - Swamp Red Underwater Exit (Door) - 0x305D5
+1798 - Swamp Blue Water Pump (Door) - 0x18482
+1801 - Swamp Purple Water Pump (Door) - 0x0A1D6
+1804 - Swamp Laser Shortcut (Door) - 0x2D880
+1807 - Treehouse First Door (Door) - 0x0C309
+1810 - Treehouse Second Door (Door) - 0x0C310
+1813 - Treehouse Third Door (Door) - 0x0A181
+1816 - Treehouse Drawbridge (Door) - 0x0C32D
+1819 - Treehouse Laser House Entry (Door) - 0x0C323
+1822 - Mountain Floor 1 Exit (Door) - 0x09E54
+1825 - Mountain Floor 2 Staircase Near (Door) - 0x09FFB
+1828 - Mountain Floor 2 Exit (Door) - 0x09EDD
+1831 - Mountain Floor 2 Staircase Far (Door) - 0x09E07
+1834 - Mountain Bottom Floor Giant Puzzle Exit (Door) - 0x09F89
+1840 - Mountain Bottom Floor Final Room Entry (Door) - 0x0C141
+1843 - Mountain Bottom Floor Rock (Door) - 0x17F33
+1846 - Caves Entry (Door) - 0x2D77D
+1849 - Caves Pillar Door (Door) - 0x019A5
+1855 - Caves Swamp Shortcut (Door) - 0x2D859
+1858 - Challenge Entry (Door) - 0x0A19A
+1861 - Challenge Tunnels Entry (Door) - 0x0348A
+1864 - Tunnels Theater Shortcut (Door) - 0x27739
+1867 - Tunnels Desert Shortcut (Door) - 0x27263
+1870 - Tunnels Town Shortcut (Door) - 0x09E87

 1903 - Outside Tutorial Outpost Doors - 0x03BA2,0x0A170,0x04CA3
 1906 - Symmetry Island Doors - 0x17F3E,0x18269
@@ -181,18 +181,18 @@ Doors:
 1930 - Keep Hedge Maze Doors - 0x01954,0x018CE,0x019D8,0x019B5,0x019E6,0x0199A,0x01A0E
 1933 - Keep Pressure Plates Doors - 0x01BEC,0x01BEA,0x01CD5,0x01D40
 1936 - Keep Shortcuts - 0x09E3D,0x04F8F
-1939 - Monastery Entry Door - 0x0C128,0x0C153
+1939 - Monastery Entry - 0x0C128,0x0C153
 1942 - Monastery Shortcuts - 0x0364E,0x03750
 1945 - Town Doors - 0x0A0C9,0x034F5,0x28A61,0x03BB0,0x28AA2,0x1845B,0x2897B
 1948 - Town Tower Doors - 0x27798,0x27799,0x2779A,0x2779C
-1951 - Theater Exit Door - 0x0A16D,0x3CCDF
+1951 - Theater Exit - 0x0A16D,0x3CCDF
 1954 - Jungle & River Shortcuts - 0x3873B,0x0CF2A
 1957 - Bunker Doors - 0x0C2A4,0x17C79,0x0C2A3,0x0A08D
 1960 - Swamp Doors - 0x00C1C,0x184B7,0x38AE6,0x18507
 1963 - Swamp Water Pumps - 0x04B7F,0x183F2,0x305D5,0x18482,0x0A1D6
 1966 - Treehouse Entry Doors - 0x0C309,0x0C310,0x0A181
-1975 - Inside Mountain Second Layer Stairs & Doors - 0x09FFB,0x09EDD,0x09E07
-1978 - Inside Mountain Bottom Layer Doors to Caves - 0x17F33,0x2D77D
+1975 - Mountain Floor 2 Stairs & Doors - 0x09FFB,0x09EDD,0x09E07
+1978 - Mountain Bottom Floor Doors to Caves - 0x17F33,0x2D77D
 1981 - Caves Doors to Challenge - 0x019A5,0x0A19A
 1984 - Caves Exits to Main Island - 0x2D859,0x2D73F
-1987 - Theater Walkway Doors - 0x27739,0x27263,0x09E87
+1987 - Tunnels Doors - 0x27739,0x27263,0x09E87
--- a/worlds/witness/WitnessLogic.txt
+++ b/worlds/witness/WitnessLogic.txt
--- a/worlds/witness/init.py
+++ b/worlds/witness/init.py
@@ -36,7 +36,7 @@ class WitnessWorld(World):
    """
    game = "The Witness"
    topology_present = False
-    data_version = 5
+    data_version = 7

    static_logic = StaticWitnessLogic()
    static_locat = StaticWitnessLocations()
--- a/worlds/witness/locations.py
+++ b/worlds/witness/locations.py
@@ -30,17 +30,17 @@ class StaticWitnessLocations:

        "Outside Tutorial Vault Box",
        "Outside Tutorial Discard",
-        "Outside Tutorial Dots Introduction 5",
-        "Outside Tutorial Squares Introduction 9",
+        "Outside Tutorial Shed Row 5",
+        "Outside Tutorial Tree Row 9",

        "Glass Factory Discard",
-        "Glass Factory Vertical Symmetry 5",
-        "Glass Factory Rotational Symmetry 3",
+        "Glass Factory Back Wall 5",
+        "Glass Factory Front 3",
        "Glass Factory Melting 3",

-        "Symmetry Island Black Dots 5",
-        "Symmetry Island Colored Dots 6",
-        "Symmetry Island Fading Lines 7",
+        "Symmetry Island Right 5",
+        "Symmetry Island Back 6",
+        "Symmetry Island Left 7",
        "Symmetry Island Scenery Outlines 5",
        "Symmetry Island Laser Panel",

@@ -48,26 +48,28 @@ class StaticWitnessLocations:

        "Desert Vault Box",
        "Desert Discard",
-        "Desert Sun Reflection 8",
-        "Desert Artificial Light Reflection 3",
-        "Desert Pond Reflection 5",
-        "Desert Flood Reflection 6",
+        "Desert Surface 8",
+        "Desert Light Room 3",
+        "Desert Pond Room 5",
+        "Desert Flood Room 6",
+        "Desert Final Bent 3",
+        "Desert Final Hexagonal",
        "Desert Laser Panel",

-        "Quarry Mill Eraser and Dots 6",
-        "Quarry Mill Eraser and Squares 8",
-        "Quarry Mill Small Squares & Dots & Eraser",
-        "Quarry Boathouse Intro Shapers",
-        "Quarry Boathouse Intro Stars",
-        "Quarry Boathouse Eraser and Shapers 5",
-        "Quarry Boathouse Stars & Eraser & Shapers 2",
-        "Quarry Boathouse Stars & Eraser & Shapers 5",
+        "Quarry Mill Lower Row 6",
+        "Quarry Mill Upper Row 8",
+        "Quarry Mill Control Room Right",
+        "Quarry Boathouse Intro Right",
+        "Quarry Boathouse Intro Left",
+        "Quarry Boathouse Front Row 5",
+        "Quarry Boathouse Back First Row 9",
+        "Quarry Boathouse Back Second Row 3",
        "Quarry Discard",
        "Quarry Laser Panel",

-        "Shadows Lower Avoid 8",
-        "Shadows Environmental Avoid 8",
-        "Shadows Follow 5",
+        "Shadows Intro 8",
+        "Shadows Far 8",
+        "Shadows Near 5",
        "Shadows Laser Panel",

        "Keep Hedge Maze 4",
@@ -79,44 +81,44 @@ class StaticWitnessLocations:
        "Shipwreck Vault Box",
        "Shipwreck Discard",

-        "Monastery Rhombic Avoid 3",
-        "Monastery Branch Follow 2",
+        "Monastery Outside 3",
+        "Monastery Inside 4",
        "Monastery Laser Panel",

        "Town Cargo Box Discard",
-        "Town Hexagonal Reflection",
+        "Town Tall Hexagonal",
        "Town Church Lattice",
        "Town Rooftop Discard",
-        "Town Symmetry Squares 5 + Dots",
-        "Town Full Dot Grid Shapers 5",
-        "Town Shapers & Dots & Eraser",
+        "Town Red Rooftop 5",
+        "Town Wooden Roof Lower Row 5",
+        "Town Wooden Rooftop",
        "Town Laser Panel",

        "Theater Discard",

        "Jungle Discard",
-        "Jungle Waves 3",
-        "Jungle Waves 7",
+        "Jungle First Row 3",
+        "Jungle Second Row 4",
        "Jungle Popup Wall 6",
        "Jungle Laser Panel",

        "River Vault Box",

-        "Bunker Drawn Squares 5",
-        "Bunker Drawn Squares 9",
-        "Bunker Drawn Squares through Tinted Glass 3",
-        "Bunker Drop-Down Door Squares 2",
+        "Bunker Intro Left 5",
+        "Bunker Intro Back 4",
+        "Bunker Glass Room 3",
+        "Bunker UV Room 2",
        "Bunker Laser Panel",

-        "Swamp Seperatable Shapers 6",
-        "Swamp Combinable Shapers 8",
-        "Swamp Broken Shapers 4",
-        "Swamp Cyan Underwater Negative Shapers 5",
-        "Swamp Platform Shapers 4",
-        "Swamp Rotated Shapers 4",
-        "Swamp Red Underwater Negative Shapers 4",
-        "Swamp More Rotated Shapers 4",
-        "Swamp Blue Underwater Negative Shapers 5",
+        "Swamp Intro Front 6",
+        "Swamp Intro Back 8",
+        "Swamp Between Bridges Near Row 4",
+        "Swamp Cyan Underwater 5",
+        "Swamp Platform Row 4",
+        "Swamp Between Bridges Far Row 4",
+        "Swamp Red Underwater 4",
+        "Swamp Beyond Rotating Bridge 4",
+        "Swamp Blue Underwater 5",
        "Swamp Laser Panel",

        "Treehouse Yellow Bridge 9",
@@ -125,73 +127,77 @@ class StaticWitnessLocations:
        "Treehouse Green Bridge 7",
        "Treehouse Green Bridge Discard",
        "Treehouse Left Orange Bridge 15",
-        "Treehouse Burnt House Discard",
+        "Treehouse Laser Discard",
        "Treehouse Right Orange Bridge 12",
        "Treehouse Laser Panel",

-        "Mountaintop Discard",
-        "Mountaintop Vault Box",
-    }
+        "Mountainside Discard",
+        "Mountainside Vault Box",

-    UNCOMMON_LOCATIONS = {
        "Mountaintop River Shape",
        "Tutorial Patio Floor",
-        "Quarry Mill Big Squares & Dots & Eraser",
+        "Quarry Mill Control Room Left",
        "Theater Tutorial Video",
        "Theater Desert Video",
        "Theater Jungle Video",
        "Theater Shipwreck Video",
        "Theater Mountain Video",
-        "Town RGB Squares",
-        "Town RGB Stars",
-        "Swamp Underwater Back Optional",
+        "Town RGB Room Left",
+        "Town RGB Room Right",
+        "Swamp Purple Underwater",
    }

    CAVES_LOCATIONS = {
-        "Inside Mountain Caves Dot Grid Triangles 4",
-        "Inside Mountain Caves Symmetry Triangles",
-        "Inside Mountain Caves Stars & Squares and Triangles 2",
-        "Inside Mountain Caves Shapers and Triangles 2",
-        "Inside Mountain Caves Symmetry Shapers",
-        "Inside Mountain Caves Broken and Negative Shapers",
-        "Inside Mountain Caves Broken Shapers",
+        "Caves Blue Tunnel Right First 4",
+        "Caves Blue Tunnel Left First 1",
+        "Caves Blue Tunnel Left Second 5",
+        "Caves Blue Tunnel Right Second 5",
+        "Caves Blue Tunnel Right Third 1",
+        "Caves Blue Tunnel Left Fourth 1",
+        "Caves Blue Tunnel Left Third 1",

-        "Inside Mountain Caves Rainbow Squares",
-        "Inside Mountain Caves Squares & Stars and Colored Eraser",
-        "Inside Mountain Caves Rotated Broken Shapers",
-        "Inside Mountain Caves Stars and Squares",
-        "Inside Mountain Caves Lone Pillar",
-        "Inside Mountain Caves Wooden Beam Shapers",
-        "Inside Mountain Caves Wooden Beam Squares and Shapers",
-        "Inside Mountain Caves Wooden Beam Stars and Squares",
-        "Inside Mountain Caves Wooden Beam Shapers and Stars",
-        "Inside Mountain Caves Upstairs Invisible Dots 8",
-        "Inside Mountain Caves Upstairs Invisible Dot Symmetry 3",
-        "Inside Mountain Caves Upstairs Dot Grid Negative Shapers",
-        "Inside Mountain Caves Upstairs Dot Grid Rotated Shapers",
+        "Caves First Floor Middle",
+        "Caves First Floor Right",
+        "Caves First Floor Left",
+        "Caves First Floor Grounded",
+        "Caves Lone Pillar",
+        "Caves First Wooden Beam",
+        "Caves Second Wooden Beam",
+        "Caves Third Wooden Beam",
+        "Caves Fourth Wooden Beam",
+        "Caves Right Upstairs Left Row 8",
+        "Caves Right Upstairs Right Row 3",
+        "Caves Left Upstairs Single",
+        "Caves Left Upstairs Left Row 5",

-        "Theater Walkway Vault Box",
-        "Inside Mountain Bottom Layer Discard",
+        "Tunnels Vault Box",
+        "Mountain Bottom Floor Discard",
        "Theater Challenge Video",
    }

    MOUNTAIN_UNREACHABLE_FROM_BEHIND = {
        "Mountaintop Trap Door Triple Exit",

-        "Inside Mountain Obscured Vision 5",
-        "Inside Mountain Moving Background 7",
-        "Inside Mountain Physically Obstructed 3",
-        "Inside Mountain Angled Inside Trash 2",
-        "Inside Mountain Color Cycle 5",
-        "Inside Mountain Same Solution 6",
+        "Mountain Floor 1 Right Row 5",
+        "Mountain Floor 1 Left Row 7",
+        "Mountain Floor 1 Back Row 3",
+        "Mountain Floor 1 Trash Pillar 2",
+        "Mountain Floor 2 Near Row 5",
+        "Mountain Floor 2 Far Row 6",
    }

    MOUNTAIN_REACHABLE_FROM_BEHIND = {
-        "Inside Mountain Elevator Discard",
-        "Inside Mountain Giant Puzzle",
+        "Mountain Floor 2 Elevator Discard",
+        "Mountain Bottom Floor Giant Puzzle",

-        "Inside Mountain Final Room Left Pillar 4",
-        "Inside Mountain Final Room Right Pillar 4",
+        "Mountain Final Room Left Pillar 4",
+        "Mountain Final Room Right Pillar 4",
+    }
+
+    MOUNTAIN_EXTRAS = {
+        "Challenge Vault Box",
+        "Theater Challenge Video",
+        "Mountain Bottom Floor Discard"
    }

    ALL_LOCATIONS_TO_ID = dict()
@@ -241,37 +247,44 @@ class WitnessPlayerLocations:
            StaticWitnessLocations.GENERAL_LOCATIONS
        )

-        doors = get_option_value(world, player, "shuffle_doors")
+        doors = get_option_value(world, player, "shuffle_doors") >= 2
        earlyutm = is_option_enabled(world, player, "early_secret_area")
        victory = get_option_value(world, player, "victory_condition")
-        lasers = get_option_value(world, player, "challenge_lasers")
+        mount_lasers = get_option_value(world, player, "mountain_lasers")
+        chal_lasers = get_option_value(world, player, "challenge_lasers")
        laser_shuffle = get_option_value(world, player, "shuffle_lasers")

        postgame = set()
        postgame = postgame | StaticWitnessLocations.CAVES_LOCATIONS
        postgame = postgame | StaticWitnessLocations.MOUNTAIN_REACHABLE_FROM_BEHIND
        postgame = postgame | StaticWitnessLocations.MOUNTAIN_UNREACHABLE_FROM_BEHIND
+        postgame = postgame | StaticWitnessLocations.MOUNTAIN_EXTRAS

        self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | postgame

-        if earlyutm or doors >= 2 or (victory == 1 and (lasers <= 11 or laser_shuffle)):
+        mountain_enterable_from_top = victory == 0 or victory == 1 or (victory == 3 and chal_lasers > mount_lasers)
+
+        if earlyutm or doors:  # in non-doors, there is no way to get symbol-locked by the final pillars (currently)
            postgame -= StaticWitnessLocations.CAVES_LOCATIONS

-        if doors >= 2:
+        if (doors or earlyutm) and (victory == 0 or (victory == 2 and mount_lasers > chal_lasers)):
+            postgame -= {"Challenge Vault Box", "Theater Challenge Video"}
+
+        if doors or mountain_enterable_from_top:
            postgame -= StaticWitnessLocations.MOUNTAIN_REACHABLE_FROM_BEHIND

-        if victory != 2:
+        if mountain_enterable_from_top:
            postgame -= StaticWitnessLocations.MOUNTAIN_UNREACHABLE_FROM_BEHIND

+        if (victory == 0 and doors) or victory == 1 or (victory == 2 and mount_lasers > chal_lasers and doors):
+            postgame -= {"Mountain Bottom Floor Discard"}
+
        if is_option_enabled(world, player, "shuffle_discarded_panels"):
            self.PANEL_TYPES_TO_SHUFFLE.add("Discard")

        if is_option_enabled(world, player, "shuffle_vault_boxes"):
            self.PANEL_TYPES_TO_SHUFFLE.add("Vault")

-        if is_option_enabled(world, player, "shuffle_uncommon"):
-            self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | StaticWitnessLocations.UNCOMMON_LOCATIONS
-
        self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | player_logic.ADDED_CHECKS

        if not is_option_enabled(world, player, "shuffle_postgame"):
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -60,7 +60,10 @@ class WitnessPlayerLogic:
                for dependentItem in door_items:
                    all_options.add(items_option.union(dependentItem))

-            return frozenset(all_options)
+            if panel_hex != "0x28A0D":
+                return frozenset(all_options)
+            else:  # 0x28A0D depends on another entity for *non-power* reasons -> This dependency needs to be preserved
+                these_items = all_options

        these_panels = self.DEPENDENT_REQUIREMENTS_BY_HEX[panel_hex]["panels"]

@@ -321,7 +324,7 @@ class WitnessPlayerLogic:
        self.VICTORY_LOCATION = "0x0356B"
        self.EVENT_ITEM_NAMES = {
            "0x01A0F": "Keep Laser Panel (Hedge Mazes) Activates",
-            "0x09D9B": "Monastery Overhead Doors Open",
+            "0x09D9B": "Monastery Shutters Open",
            "0x193A6": "Monastery Laser Panel Activates",
            "0x00037": "Monastery Branch Panels Activate",
            "0x0A079": "Access to Bunker Laser",
@@ -332,24 +335,24 @@ class WitnessPlayerLogic:
            "0x01D3F": "Keep Laser Panel (Pressure Plates) Activates",
            "0x09F7F": "Mountain Access",
            "0x0367C": "Quarry Laser Mill Requirement Met",
-            "0x009A1": "Swamp Rotated Shapers 1 Activates",
+            "0x009A1": "Swamp Between Bridges Far 1 Activates",
            "0x00006": "Swamp Cyan Water Drains",
-            "0x00990": "Swamp Broken Shapers 1 Activates",
-            "0x0A8DC": "Lower Avoid 6 Activates",
-            "0x0000A": "Swamp More Rotated Shapers 1 Access",
-            "0x09E86": "Inside Mountain Second Layer Blue Bridge Access",
-            "0x09ED8": "Inside Mountain Second Layer Yellow Bridge Access",
+            "0x00990": "Swamp Between Bridges Near Row 1 Activates",
+            "0x0A8DC": "Intro 6 Activates",
+            "0x0000A": "Swamp Beyond Rotating Bridge 1 Access",
+            "0x09E86": "Mountain Floor 2 Blue Bridge Access",
+            "0x09ED8": "Mountain Floor 2 Yellow Bridge Access",
            "0x0A3D0": "Quarry Laser Boathouse Requirement Met",
            "0x00596": "Swamp Red Water Drains",
            "0x00E3A": "Swamp Purple Water Drains",
            "0x0343A": "Door to Symmetry Island Powers On",
-            "0xFFF00": "Inside Mountain Bottom Layer Discard Turns On",
+            "0xFFF00": "Mountain Bottom Floor Discard Turns On",
            "0x17CA6": "All Boat Panels Turn On",
            "0x17CDF": "All Boat Panels Turn On",
            "0x09DB8": "All Boat Panels Turn On",
            "0x17C95": "All Boat Panels Turn On",
            "0x03BB0": "Town Church Lattice Vision From Outside",
-            "0x28AC1": "Town Shapers & Dots & Eraser Turns On",
+            "0x28AC1": "Town Wooden Rooftop Turns On",
            "0x28A69": "Town Tower 1st Door Opens",
            "0x28ACC": "Town Tower 2nd Door Opens",
            "0x28AD9": "Town Tower 3rd Door Opens",
@@ -357,9 +360,9 @@ class WitnessPlayerLogic:
            "0x03675": "Quarry Mill Ramp Activation From Above",
            "0x03679": "Quarry Mill Lift Lowering While Standing On It",
            "0x2FAF6": "Tutorial Gate Secret Solution Knowledge",
-            "0x079DF": "Town Hexagonal Reflection Turns On",
+            "0x079DF": "Town Tall Hexagonal Turns On",
            "0x17DA2": "Right Orange Bridge Fully Extended",
-            "0x19B24": "Shadows Lower Avoid Patterns Visible",
+            "0x19B24": "Shadows Intro Patterns Visible",
            "0x2700B": "Open Door to Treehouse Laser House",
            "0x00055": "Orchard Apple Trees 4 Turns On",
            "0x17DDB": "Left Orange Bridge Fully Extended",
@@ -369,6 +372,8 @@ class WitnessPlayerLogic:
            "0x03481": "Tutorial Video Pattern Knowledge",
            "0x03702": "Jungle Video Pattern Knowledge",
            "0x0356B": "Challenge Video Pattern Knowledge",
+            "0x0A15F": "Desert Laser Panel Shutters Open (1)",
+            "0x012D7": "Desert Laser Panel Shutters Open (2)",
        }

        self.ALWAYS_EVENT_NAMES_BY_HEX = {
--- a/worlds/witness/regions.py
+++ b/worlds/witness/regions.py
@@ -73,7 +73,7 @@ class WitnessRegions:
            all_locations = all_locations | set(locations_for_this_region)

            world.regions += [
-                create_region(world, player, region_name, self.locat,locations_for_this_region)
+                create_region(world, player, region_name, self.locat, locations_for_this_region)
            ]

        for region_name, region in StaticWitnessLogic.ALL_REGIONS_BY_NAME.items():
--- a/worlds/witness/settings/Disable_Unrandomized.txt
+++ b/worlds/witness/settings/Disable_Unrandomized.txt
@@ -25,84 +25,84 @@ Disabled Locations:
 0x00055 (Orchard Apple Tree 3)
 0x032F7 (Orchard Apple Tree 4)
 0x032FF (Orchard Apple Tree 5)
-0x198B5 (Shadows Lower Avoid 1)
-0x198BD (Shadows Lower Avoid 2)
-0x198BF (Shadows Lower Avoid 3)
-0x19771 (Shadows Lower Avoid 4)
-0x0A8DC (Shadows Lower Avoid 5)
-0x0AC74 (Shadows Lower Avoid 6)
-0x0AC7A (Shadows Lower Avoid 7)
-0x0A8E0 (Shadows Lower Avoid 8)
-0x386FA (Shadows Environmental Avoid 1)
-0x1C33F (Shadows Environmental Avoid 2)
-0x196E2 (Shadows Environmental Avoid 3)
-0x1972A (Shadows Environmental Avoid 4)
-0x19809 (Shadows Environmental Avoid 5)
-0x19806 (Shadows Environmental Avoid 6)
-0x196F8 (Shadows Environmental Avoid 7)
-0x1972F (Shadows Environmental Avoid 8)
-0x19797 (Shadows Follow 1)
-0x1979A (Shadows Follow 2)
-0x197E0 (Shadows Follow 3)
-0x197E8 (Shadows Follow 4)
-0x197E5 (Shadows Follow 5)
+0x198B5 (Shadows Intro 1)
+0x198BD (Shadows Intro 2)
+0x198BF (Shadows Intro 3)
+0x19771 (Shadows Intro 4)
+0x0A8DC (Shadows Intro 5)
+0x0AC74 (Shadows Intro 6)
+0x0AC7A (Shadows Intro 7)
+0x0A8E0 (Shadows Intro 8)
+0x386FA (Shadows Far 1)
+0x1C33F (Shadows Far 2)
+0x196E2 (Shadows Far 3)
+0x1972A (Shadows Far 4)
+0x19809 (Shadows Far 5)
+0x19806 (Shadows Far 6)
+0x196F8 (Shadows Far 7)
+0x1972F (Shadows Far 8)
+0x19797 (Shadows Near 1)
+0x1979A (Shadows Near 2)
+0x197E0 (Shadows Near 3)
+0x197E8 (Shadows Near 4)
+0x197E5 (Shadows Near 5)
 0x19650 (Shadows Laser)
 0x00139 (Keep Hedge Maze 1)
 0x019DC (Keep Hedge Maze 2)
 0x019E7 (Keep Hedge Maze 3)
 0x01A0F (Keep Hedge Maze 4)
 0x0360E (Laser Hedges)
-0x00B10 (Monastery Door Open Left)
-0x00C92 (Monastery Door Open Right)
-0x00290 (Monastery Rhombic Avoid 1)
-0x00038 (Monastery Rhombic Avoid 2)
-0x00037 (Monastery Rhombic Avoid 3)
-0x193A7 (Monastery Branch Avoid 1)
-0x193AA (Monastery Branch Avoid 2)
-0x193AB (Monastery Branch Follow 1)
-0x193A6 (Monastery Branch Follow 2)
+0x00B10 (Monastery Entry Left)
+0x00C92 (Monastery Entry Right)
+0x00290 (Monastery Outside 1)
+0x00038 (Monastery Outside 2)
+0x00037 (Monastery Outside 3)
+0x193A7 (Monastery Inside 1)
+0x193AA (Monastery Inside 2)
+0x193AB (Monastery Inside 3)
+0x193A6 (Monastery Inside 4)
 0x17CA4 (Monastery Laser)
-0x18590 (Tree Outlines) - True - Symmetry & Environment
-0x28AE3 (Vines Shadows Follow) - 0x18590 - Shadows Follow & Environment
-0x28938 (Four-way Apple Tree) - 0x28AE3 - Environment
-0x079DF (Triple Environmental Puzzle) - 0x28938 - Shadows Avoid & Environment & Reflection
-0x28B39 (Hexagonal Reflection) - 0x079DF & 0x2896A - Reflection
+0x18590 (Transparent) - True - Symmetry & Environment
+0x28AE3 (Vines) - 0x18590 - Shadows Follow & Environment
+0x28938 (Apple Tree) - 0x28AE3 - Environment
+0x079DF (Triple Exit) - 0x28938 - Shadows Avoid & Environment & Reflection
+0x28B39 (Tall Hexagonal) - 0x079DF & 0x2896A - Reflection
 0x03553 (Theater Tutorial Video)
 0x03552 (Theater Desert Video)
 0x0354E (Theater Jungle Video)
 0x03549 (Theater Challenge Video)
 0x0354F (Theater Shipwreck Video)
 0x03545 (Theater Mountain Video)
-0x002C4 (Waves 1)
-0x00767 (Waves 2)
-0x002C6 (Waves 3)
-0x0070E (Waves 4)
-0x0070F (Waves 5)
-0x0087D (Waves 6)
-0x002C7 (Waves 7)
-0x15ADD (River Rhombic Avoid Vault)
+0x002C4 (First Row 1)
+0x00767 (First Row 2)
+0x002C6 (First Row 3)
+0x0070E (Second Row 1)
+0x0070F (Second Row 2)
+0x0087D (Second Row 3)
+0x002C7 (Second Row 4)
+0x15ADD (River Outside Vault)
 0x03702 (River Vault Box)
-0x17CAA (Rhombic Avoid to Monastery Garden)
+0x17CAA (Monastery Shortcut Panel)
 0x17C2E (Door to Bunker)
-0x09F7D (Bunker Drawn Squares 1)
-0x09FDC (Bunker Drawn Squares 2)
-0x09FF7 (Bunker Drawn Squares 3)
-0x09F82 (Bunker Drawn Squares 4)
-0x09FF8 (Bunker Drawn Squares 5)
-0x09D9F (Bunker Drawn Squares 6)
-0x09DA1 (Bunker Drawn Squares 7)
-0x09DA2 (Bunker Drawn Squares 8)
-0x09DAF (Bunker Drawn Squares 9)
-0x0A010 (Bunker Drawn Squares through Tinted Glass 1)
-0x0A01B (Bunker Drawn Squares through Tinted Glass 2)
-0x0A01F (Bunker Drawn Squares through Tinted Glass 3)
-0x0A099 (Door to Bunker Proper)
+0x09F7D (Bunker Intro Left 1)
+0x09FDC (Bunker Intro Left 2)
+0x09FF7 (Bunker Intro Left 3)
+0x09F82 (Bunker Intro Left 4)
+0x09FF8 (Bunker Intro Left 5)
+0x09D9F (Bunker Intro Back 1)
+0x09DA1 (Bunker Intro Back 2)
+0x09DA2 (Bunker Intro Back 3)
+0x09DAF (Bunker Intro Back 4)
+0x0A010 (Bunker Glass Room 1)
+0x0A01B (Bunker Glass Room 2)
+0x0A01F (Bunker Glass Room 3)
+0x0A099 (Tinted Glass Door)
 0x34BC5 (Bunker Drop-Down Door Open)
 0x34BC6 (Bunker Drop-Down Door Close)
-0x17E63 (Bunker Drop-Down Door Squares 1)
-0x17E67 (Bunker Drop-Down Door Squares 2)
+0x17E63 (Bunker UV Room 1)
+0x17E67 (Bunker UV Room 2)
 0x09DE0 (Bunker Laser)
 0x0A079 (Bunker Elevator Control)
 0x0042D (Mountaintop River Shape)

-0x17CAA (River Door to Garden Panel)
+0x17CAA (River Garden Entry Panel)
--- a/worlds/witness/settings/Door_Panel_Shuffle.txt
+++ b/worlds/witness/settings/Door_Panel_Shuffle.txt
@@ -1,31 +1,31 @@
 Items:
-Glass Factory Entry Door (Panel)
-Door to Symmetry Island Lower (Panel)
-Door to Symmetry Island Upper (Panel)
-Door to Desert Flood Light Room (Panel)
-Desert Flood Room Flood Controls (Panel)
-Quarry Door to Mill (Panel)
+Glass Factory Entry (Panel)
+Symmetry Island Lower (Panel)
+Symmetry Island Upper (Panel)
+Desert Light Room Entry (Panel)
+Desert Flood Controls (Panel)
+Quarry Mill Entry (Panel)
 Quarry Mill Ramp Controls (Panel)
-Quarry Mill Elevator Controls (Panel)
+Quarry Mill Lift Controls (Panel)
 Quarry Boathouse Ramp Height Control (Panel)
 Quarry Boathouse Ramp Horizontal Control (Panel)
 Shadows Door Timer (Panel)
-Monastery Entry Door Left (Panel)
-Monastery Entry Door Right (Panel)
-Town Door to RGB House (Panel)
-Town Door to Church (Panel)
+Monastery Entry Left (Panel)
+Monastery Entry Right (Panel)
+Town Tinted Glass Door (Panel)
+Town Church Entry (Panel)
 Town Maze Panel (Drop-Down Staircase) (Panel)
-Windmill Door (Panel)
+Windmill Entry (Panel)
 Treehouse First & Second Doors (Panel)
 Treehouse Third Door (Panel)
 Treehouse Laser House Door Timer (Panel)
-Treehouse Shortcut Drop-Down Bridge (Panel)
+Treehouse Drawbridge (Panel)
 Jungle Popup Wall (Panel)
-Bunker Entry Door (Panel)
-Inside Bunker Door to Bunker Proper (Panel)
+Bunker Entry (Panel)
+Bunker Tinted Glass Door (Panel)
 Bunker Elevator Control (Panel)
-Swamp Entry Door (Panel)
+Swamp Entry (Panel)
 Swamp Sliding Bridge (Panel)
 Swamp Rotating Bridge (Panel)
 Swamp Maze Control (Panel)
-Boat
+Boat
--- a/worlds/witness/settings/Doors_Complex.txt
+++ b/worlds/witness/settings/Doors_Complex.txt
@@ -1,128 +1,128 @@
 Items:
-Outside Tutorial Optional Door
-Outside Tutorial Outpost Entry Door
-Outside Tutorial Outpost Exit Door
-Glass Factory Entry Door
-Glass Factory Back Wall
-Symmetry Island Lower Door
-Symmetry Island Upper Door
-Orchard Middle Gate
-Orchard Final Gate
-Desert Door to Flood Light Room
-Desert Door to Pond Room
-Desert Door to Water Levels Room
-Desert Door to Elevator Room
-Quarry Main Entry 1
-Quarry Main Entry 2
-Quarry Door to Mill
-Quarry Mill Side Door
-Quarry Mill Rooftop Shortcut
-Quarry Mill Stairs
-Quarry Boathouse Boat Staircase
-Quarry Boathouse First Barrier
-Quarry Boathouse Shortcut
-Shadows Timed Door
-Shadows Laser Room Right Door
-Shadows Laser Room Left Door
-Shadows Barrier to Quarry
-Shadows Barrier to Ledge
-Keep Hedge Maze 1 Exit Door
-Keep Pressure Plates 1 Exit Door
-Keep Hedge Maze 2 Shortcut
-Keep Hedge Maze 2 Exit Door
-Keep Hedge Maze 3 Shortcut
-Keep Hedge Maze 3 Exit Door
-Keep Hedge Maze 4 Shortcut
-Keep Hedge Maze 4 Exit Door
-Keep Pressure Plates 2 Exit Door
-Keep Pressure Plates 3 Exit Door
-Keep Pressure Plates 4 Exit Door
-Keep Shortcut to Shadows
-Keep Tower Shortcut
-Monastery Shortcut
-Monastery Inner Door
-Monastery Outer Door
-Monastery Door to Garden
-Town Cargo Box Door
-Town Wooden Roof Staircase
-Town Tinted Door to RGB House
-Town Door to Church
-Town Maze Staircase
-Town Windmill Door
-Town RGB House Staircase
-Town Tower Blue Panels Door
-Town Tower Lattice Door
-Town Tower Environmental Set Door
-Town Tower Wooden Roof Set Door
-Theater Entry Door
-Theater Exit Door Left
-Theater Exit Door Right
-Jungle Bamboo Shortcut to River
-Jungle Popup Wall
-River Shortcut to Monastery Garden
-Bunker Bunker Entry Door
-Bunker Tinted Glass Door
-Bunker Door to Ultraviolet Room
-Bunker Door to Elevator
-Swamp Entry Door
-Swamp Door to Broken Shapers
+Outside Tutorial Outpost Path (Door)
+Outside Tutorial Outpost Entry (Door)
+Outside Tutorial Outpost Exit (Door)
+Glass Factory Entry (Door)
+Glass Factory Back Wall (Door)
+Symmetry Island Lower (Door)
+Symmetry Island Upper (Door)
+Orchard First Gate (Door)
+Orchard Second Gate (Door)
+Desert Light Room Entry (Door)
+Desert Pond Room Entry (Door)
+Desert Flood Room Entry (Door)
+Desert Elevator Room Entry (Door)
+Quarry Entry 1 (Door)
+Quarry Entry 2 (Door)
+Quarry Mill Entry (Door)
+Quarry Mill Side Exit (Door)
+Quarry Mill Roof Exit (Door)
+Quarry Mill Stairs (Door)
+Quarry Boathouse Dock (Door)
+Quarry Boathouse First Barrier (Door)
+Quarry Boathouse Second Barrier (Door)
+Shadows Timed Door (Door)
+Shadows Laser Entry Right (Door)
+Shadows Laser Entry Left (Door)
+Shadows Quarry Barrier (Door)
+Shadows Ledge Barrier (Door)
+Keep Hedge Maze 1 Exit (Door)
+Keep Pressure Plates 1 Exit (Door)
+Keep Hedge Maze 2 Shortcut (Door)
+Keep Hedge Maze 2 Exit (Door)
+Keep Hedge Maze 3 Shortcut (Door)
+Keep Hedge Maze 3 Exit (Door)
+Keep Hedge Maze 4 Shortcut (Door)
+Keep Hedge Maze 4 Exit (Door)
+Keep Pressure Plates 2 Exit (Door)
+Keep Pressure Plates 3 Exit (Door)
+Keep Pressure Plates 4 Exit (Door)
+Keep Shadows Shortcut (Door)
+Keep Tower Shortcut (Door)
+Monastery Shortcut (Door)
+Monastery Entry Inner (Door)
+Monastery Entry Outer (Door)
+Monastery Garden Entry (Door)
+Town Cargo Box Entry (Door)
+Town Wooden Roof Stairs (Door)
+Town Tinted Glass Door (Door)
+Town Church Entry (Door)
+Town Maze Stairs (Door)
+Town Windmill Entry (Door)
+Town RGB House Stairs (Door)
+Town Tower First Door (Door)
+Town Tower Third Door (Door)
+Town Tower Fourth Door (Door)
+Town Tower Second Door (Door)
+Theater Entry (Door)
+Theater Exit Left (Door)
+Theater Exit Right (Door)
+Jungle Bamboo Laser Shortcut (Door)
+Jungle Popup Wall (Door)
+River Monastery Shortcut (Door)
+Bunker Entry (Door)
+Bunker Tinted Glass Door (Door)
+Bunker UV Room Entry (Door)
+Bunker Elevator Room Entry (Door)
+Swamp Entry (Door)
+Swamp Between Bridges First Door
 Swamp Platform Shortcut Door
-Swamp Cyan Water Pump
-Swamp Door to Rotated Shapers
-Swamp Red Water Pump
-Swamp Red Underwater Exit
-Swamp Blue Water Pump
-Swamp Purple Water Pump
-Swamp Near Laser Shortcut
-Treehouse First Door
-Treehouse Second Door
-Treehouse Beyond Yellow Bridge Door
-Treehouse Drawbridge
-Treehouse Timed Door to Laser House
-Inside Mountain First Layer Exit Door
-Inside Mountain Second Layer Staircase Near
-Inside Mountain Second Layer Exit Door
-Inside Mountain Second Layer Staircase Far
-Inside Mountain Giant Puzzle Exit Door
-Inside Mountain Door to Final Room
-Inside Mountain Bottom Layer Rock
-Inside Mountain Door to Secret Area
-Caves Pillar Door
-Caves Mountain Shortcut
-Caves Swamp Shortcut
-Challenge Entry Door
-Challenge Door to Theater Walkway
-Theater Walkway Door to Windmill Interior
-Theater Walkway Door to Desert Elevator Room
-Theater Walkway Door to Town
+Swamp Cyan Water Pump (Door)
+Swamp Between Bridges Second Door
+Swamp Red Water Pump (Door)
+Swamp Red Underwater Exit (Door)
+Swamp Blue Water Pump (Door)
+Swamp Purple Water Pump (Door)
+Swamp Laser Shortcut (Door)
+Treehouse First Door (Door)
+Treehouse Second Door (Door)
+Treehouse Third Door (Door)
+Treehouse Drawbridge (Door)
+Treehouse Laser House Entry (Door)
+Mountain Floor 1 Exit (Door)
+Mountain Floor 2 Staircase Near (Door)
+Mountain Floor 2 Exit (Door)
+Mountain Floor 2 Staircase Far (Door)
+Mountain Bottom Floor Giant Puzzle Exit (Door)
+Mountain Bottom Floor Final Room Entry (Door)
+Mountain Bottom Floor Rock (Door)
+Caves Entry (Door)
+Caves Pillar Door (Door)
+Caves Mountain Shortcut (Door)
+Caves Swamp Shortcut (Door)
+Challenge Entry (Door)
+Challenge Tunnels Entry (Door)
+Tunnels Theater Shortcut (Door)
+Tunnels Desert Shortcut (Door)
+Tunnels Town Shortcut (Door)

 Added Locations:
-Outside Tutorial Door to Outpost Panel
-Outside Tutorial Exit Door from Outpost Panel
-Glass Factory Entry Door Panel
-Glass Factory Vertical Symmetry 5
-Symmetry Island Door to Symmetry Island Lower Panel
-Symmetry Island Door to Symmetry Island Upper Panel
+Outside Tutorial Outpost Entry Panel
+Outside Tutorial Outpost Exit Panel
+Glass Factory Entry Panel
+Glass Factory Back Wall 5
+Symmetry Island Lower Panel
+Symmetry Island Upper Panel
 Orchard Apple Tree 3
 Orchard Apple Tree 5
-Desert Door to Desert Flood Light Room Panel
-Desert Artificial Light Reflection 3
-Desert Door to Water Levels Room Panel
-Desert Flood Reflection 6
-Quarry Door to Quarry 1 Panel
-Quarry Door to Quarry 2 Panel
-Quarry Door to Mill Right
-Quarry Door to Mill Left
-Quarry Mill Ground Floor Shortcut Door Panel
-Quarry Mill Door to Outside Quarry Stairs Panel
+Desert Light Room Entry Panel
+Desert Light Room 3
+Desert Flood Room Entry Panel
+Desert Flood Room 6
+Quarry Entry 1 Panel
+Quarry Entry 2 Panel
+Quarry Mill Entry Right Panel
+Quarry Mill Entry Left Panel
+Quarry Mill Side Exit Panel
+Quarry Mill Roof Exit Panel
 Quarry Mill Stair Control
-Quarry Boathouse Shortcut Door Panel
+Quarry Boathouse Second Barrier Panel
 Shadows Door Timer Inside
 Shadows Door Timer Outside
-Shadows Environmental Avoid 8
-Shadows Follow 5
-Shadows Lower Avoid 3
-Shadows Lower Avoid 5
+Shadows Far 8
+Shadows Near 5
+Shadows Intro 3
+Shadows Intro 5
 Keep Hedge Maze 1
 Keep Pressure Plates 1
 Keep Hedge Maze 2
@@ -131,71 +131,70 @@ Keep Hedge Maze 4
 Keep Pressure Plates 2
 Keep Pressure Plates 3
 Keep Pressure Plates 4
-Keep Shortcut to Shadows Panel
-Keep Tower Shortcut to Keep Panel
-Monastery Shortcut Door Panel
-Monastery Door Open Left
-Monastery Door Open Right
-Monastery Rhombic Avoid 3
-Town Cargo Box Panel
-Town Full Dot Grid Shapers 5
-Town Tinted Door Panel
-Town Door to Church Stars Panel
+Keep Shadows Shortcut Panel
+Keep Tower Shortcut Panel
+Monastery Shortcut Panel
+Monastery Entry Left
+Monastery Entry Right
+Monastery Outside 3
+Town Cargo Box Entry Panel
+Town Wooden Roof Lower Row 5
+Town Tinted Glass Door Panel
+Town Church Entry Panel
 Town Maze Stair Control
-Town Windmill Door Panel
-Town Sound Room Left
+Town Windmill Entry Panel
 Town Sound Room Right
-Town Symmetry Squares 5 + Dots
+Town Red Rooftop 5
 Town Church Lattice
-Town Hexagonal Reflection
-Town Shapers & Dots & Eraser
-Windmill Door to Front of Theater Panel
-Theater Door to Cargo Box Left Panel
-Theater Door to Cargo Box Right Panel
-Jungle Shortcut to River Panel
+Town Tall Hexagonal
+Town Wooden Rooftop
+Windmill Theater Entry Panel
+Theater Exit Left Panel
+Theater Exit Right Panel
+Jungle Laser Shortcut Panel
 Jungle Popup Wall Control
-River Rhombic Avoid to Monastery Garden
-Bunker Bunker Entry Panel
-Bunker Door to Bunker Proper Panel
-Bunker Drawn Squares through Tinted Glass 3
-Bunker Drop-Down Door Squares 2
+River Monastery Shortcut Panel
+Bunker Entry Panel
+Bunker Tinted Glass Door Panel
+Bunker Glass Room 3
+Bunker UV Room 2
 Swamp Entry Panel
-Swamp Platform Shapers 4
+Swamp Platform Row 4
 Swamp Platform Shortcut Right Panel
-Swamp Blue Underwater Negative Shapers 5
-Swamp Broken Shapers 4
-Swamp Cyan Underwater Negative Shapers 5
-Swamp Red Underwater Negative Shapers 4
-Swamp More Rotated Shapers 4
-Swamp More Rotated Shapers 4
-Swamp Near Laser Shortcut Right Panel
+Swamp Blue Underwater 5
+Swamp Between Bridges Near Row 4
+Swamp Cyan Underwater 5
+Swamp Red Underwater 4
+Swamp Beyond Rotating Bridge 4
+Swamp Beyond Rotating Bridge 4
+Swamp Laser Shortcut Right Panel
 Treehouse First Door Panel
 Treehouse Second Door Panel
-Treehouse Beyond Yellow Bridge Door Panel
+Treehouse Third Door Panel
 Treehouse Bridge Control
 Treehouse Left Orange Bridge 15
 Treehouse Right Orange Bridge 12
 Treehouse Laser House Door Timer Outside Control
-Treehouse Laser House Door Timer Inside Control
-Inside Mountain Moving Background 7
-Inside Mountain Obscured Vision 5
-Inside Mountain Physically Obstructed 3
-Inside Mountain Angled Inside Trash 2
-Inside Mountain Color Cycle 5
-Inside Mountain Light Bridge Controller 2
-Inside Mountain Light Bridge Controller 3
-Inside Mountain Same Solution 6
-Inside Mountain Giant Puzzle
-Inside Mountain Door to Final Room Left
-Inside Mountain Door to Final Room Right
-Inside Mountain Bottom Layer Discard
-Inside Mountain Rock Control
-Inside Mountain Secret Area Entry Panel
-Inside Mountain Caves Lone Pillar
-Inside Mountain Caves Shortcut to Mountain Panel
-Inside Mountain Caves Shortcut to Swamp Panel
-Inside Mountain Caves Challenge Entry Panel
-Challenge Door to Theater Walkway Panel
-Theater Walkway Theater Shortcut Panel
-Theater Walkway Desert Shortcut Panel
-Theater Walkway Town Shortcut Panel
+Treehouse Laser House Door Timer Inside
+Mountain Floor 1 Left Row 7
+Mountain Floor 1 Right Row 5
+Mountain Floor 1 Back Row 3
+Mountain Floor 1 Trash Pillar 2
+Mountain Floor 2 Near Row 5
+Mountain Floor 2 Light Bridge Controller Near
+Mountain Floor 2 Light Bridge Controller Far
+Mountain Floor 2 Far Row 6
+Mountain Bottom Floor Giant Puzzle
+Mountain Bottom Floor Final Room Entry Left
+Mountain Bottom Floor Final Room Entry Right
+Mountain Bottom Floor Discard
+Mountain Bottom Floor Rock Control
+Mountain Bottom Floor Caves Entry Panel
+Caves Lone Pillar
+Caves Mountain Shortcut Panel
+Caves Swamp Shortcut Panel
+Caves Challenge Entry Panel
+Challenge Tunnels Entry Panel
+Tunnels Theater Shortcut Panel
+Tunnels Desert Shortcut Panel
+Tunnels Town Shortcut Panel
--- a/worlds/witness/settings/Doors_Max.txt
+++ b/worlds/witness/settings/Doors_Max.txt
@@ -1,104 +1,104 @@
 Items:
-Outside Tutorial Optional Door
-Outside Tutorial Outpost Entry Door
-Outside Tutorial Outpost Exit Door
-Glass Factory Entry Door
-Glass Factory Back Wall
-Symmetry Island Lower Door
-Symmetry Island Upper Door
-Orchard Middle Gate
-Orchard Final Gate
-Desert Door to Flood Light Room
-Desert Door to Pond Room
-Desert Door to Water Levels Room
-Desert Door to Elevator Room
-Quarry Main Entry 1
-Quarry Main Entry 2
-Quarry Door to Mill
-Quarry Mill Side Door
-Quarry Mill Rooftop Shortcut
-Quarry Mill Stairs
-Quarry Boathouse Boat Staircase
-Quarry Boathouse First Barrier
-Quarry Boathouse Shortcut
-Shadows Timed Door
-Shadows Laser Room Right Door
-Shadows Laser Room Left Door
-Shadows Barrier to Quarry
-Shadows Barrier to Ledge
-Keep Hedge Maze 1 Exit Door
-Keep Pressure Plates 1 Exit Door
-Keep Hedge Maze 2 Shortcut
-Keep Hedge Maze 2 Exit Door
-Keep Hedge Maze 3 Shortcut
-Keep Hedge Maze 3 Exit Door
-Keep Hedge Maze 4 Shortcut
-Keep Hedge Maze 4 Exit Door
-Keep Pressure Plates 2 Exit Door
-Keep Pressure Plates 3 Exit Door
-Keep Pressure Plates 4 Exit Door
-Keep Shortcut to Shadows
-Keep Tower Shortcut
-Monastery Shortcut
-Monastery Inner Door
-Monastery Outer Door
-Monastery Door to Garden
-Town Cargo Box Door
-Town Wooden Roof Staircase
-Town Tinted Door to RGB House
-Town Door to Church
-Town Maze Staircase
-Town Windmill Door
-Town RGB House Staircase
-Town Tower Blue Panels Door
-Town Tower Lattice Door
-Town Tower Environmental Set Door
-Town Tower Wooden Roof Set Door
-Theater Entry Door
-Theater Exit Door Left
-Theater Exit Door Right
-Jungle Bamboo Shortcut to River
-Jungle Popup Wall
-River Shortcut to Monastery Garden
-Bunker Bunker Entry Door
-Bunker Tinted Glass Door
-Bunker Door to Ultraviolet Room
-Bunker Door to Elevator
-Swamp Entry Door
-Swamp Door to Broken Shapers
+Outside Tutorial Outpost Path (Door)
+Outside Tutorial Outpost Entry (Door)
+Outside Tutorial Outpost Exit (Door)
+Glass Factory Entry (Door)
+Glass Factory Back Wall (Door)
+Symmetry Island Lower (Door)
+Symmetry Island Upper (Door)
+Orchard First Gate (Door)
+Orchard Second Gate (Door)
+Desert Light Room Entry (Door)
+Desert Pond Room Entry (Door)
+Desert Flood Room Entry (Door)
+Desert Elevator Room Entry (Door)
+Quarry Entry 1 (Door)
+Quarry Entry 2 (Door)
+Quarry Mill Entry (Door)
+Quarry Mill Side Exit (Door)
+Quarry Mill Roof Exit (Door)
+Quarry Mill Stairs (Door)
+Quarry Boathouse Dock (Door)
+Quarry Boathouse First Barrier (Door)
+Quarry Boathouse Second Barrier (Door)
+Shadows Timed Door (Door)
+Shadows Laser Entry Right (Door)
+Shadows Laser Entry Left (Door)
+Shadows Quarry Barrier (Door)
+Shadows Ledge Barrier (Door)
+Keep Hedge Maze 1 Exit (Door)
+Keep Pressure Plates 1 Exit (Door)
+Keep Hedge Maze 2 Shortcut (Door)
+Keep Hedge Maze 2 Exit (Door)
+Keep Hedge Maze 3 Shortcut (Door)
+Keep Hedge Maze 3 Exit (Door)
+Keep Hedge Maze 4 Shortcut (Door)
+Keep Hedge Maze 4 Exit (Door)
+Keep Pressure Plates 2 Exit (Door)
+Keep Pressure Plates 3 Exit (Door)
+Keep Pressure Plates 4 Exit (Door)
+Keep Shadows Shortcut (Door)
+Keep Tower Shortcut (Door)
+Monastery Shortcut (Door)
+Monastery Entry Inner (Door)
+Monastery Entry Outer (Door)
+Monastery Garden Entry (Door)
+Town Cargo Box Entry (Door)
+Town Wooden Roof Stairs (Door)
+Town Tinted Glass Door (Door)
+Town Church Entry (Door)
+Town Maze Stairs (Door)
+Town Windmill Entry (Door)
+Town RGB House Stairs (Door)
+Town Tower First Door (Door)
+Town Tower Third Door (Door)
+Town Tower Fourth Door (Door)
+Town Tower Second Door (Door)
+Theater Entry (Door)
+Theater Exit Left (Door)
+Theater Exit Right (Door)
+Jungle Bamboo Laser Shortcut (Door)
+Jungle Popup Wall (Door)
+River Monastery Shortcut (Door)
+Bunker Entry (Door)
+Bunker Tinted Glass Door (Door)
+Bunker UV Room Entry (Door)
+Bunker Elevator Room Entry (Door)
+Swamp Entry (Door)
+Swamp Between Bridges First Door
 Swamp Platform Shortcut Door
-Swamp Cyan Water Pump
-Swamp Door to Rotated Shapers
-Swamp Red Water Pump
-Swamp Red Underwater Exit
-Swamp Blue Water Pump
-Swamp Purple Water Pump
-Swamp Near Laser Shortcut
-Treehouse First Door
-Treehouse Second Door
-Treehouse Beyond Yellow Bridge Door
-Treehouse Drawbridge
-Treehouse Timed Door to Laser House
-Inside Mountain First Layer Exit Door
-Inside Mountain Second Layer Staircase Near
-Inside Mountain Second Layer Exit Door
-Inside Mountain Second Layer Staircase Far
-Inside Mountain Giant Puzzle Exit Door
-Inside Mountain Door to Final Room
-Inside Mountain Bottom Layer Rock
-Inside Mountain Door to Secret Area
-Caves Pillar Door
-Caves Mountain Shortcut
-Caves Swamp Shortcut
-Challenge Entry Door
-Challenge Door to Theater Walkway
-Theater Walkway Door to Windmill Interior
-Theater Walkway Door to Desert Elevator Room
-Theater Walkway Door to Town
+Swamp Cyan Water Pump (Door)
+Swamp Between Bridges Second Door
+Swamp Red Water Pump (Door)
+Swamp Red Underwater Exit (Door)
+Swamp Blue Water Pump (Door)
+Swamp Purple Water Pump (Door)
+Swamp Laser Shortcut (Door)
+Treehouse First Door (Door)
+Treehouse Second Door (Door)
+Treehouse Third Door (Door)
+Treehouse Drawbridge (Door)
+Treehouse Laser House Entry (Door)
+Mountain Floor 1 Exit (Door)
+Mountain Floor 2 Staircase Near (Door)
+Mountain Floor 2 Exit (Door)
+Mountain Floor 2 Staircase Far (Door)
+Mountain Bottom Floor Giant Puzzle Exit (Door)
+Mountain Bottom Floor Final Room Entry (Door)
+Mountain Bottom Floor Rock (Door)
+Caves Entry (Door)
+Caves Pillar Door (Door)
+Caves Mountain Shortcut (Door)
+Caves Swamp Shortcut (Door)
+Challenge Entry (Door)
+Challenge Tunnels Entry (Door)
+Tunnels Theater Shortcut (Door)
+Tunnels Desert Shortcut (Door)
+Tunnels Town Shortcut (Door)

-Desert Flood Room Flood Controls (Panel)
+Desert Flood Controls (Panel)
 Quarry Mill Ramp Controls (Panel)
-Quarry Mill Elevator Controls (Panel)
+Quarry Mill Lift Controls (Panel)
 Quarry Boathouse Ramp Height Control (Panel)
 Quarry Boathouse Ramp Horizontal Control (Panel)
 Bunker Elevator Control (Panel)
@@ -108,32 +108,32 @@ Swamp Maze Control (Panel)
 Boat

 Added Locations:
-Outside Tutorial Door to Outpost Panel
-Outside Tutorial Exit Door from Outpost Panel
-Glass Factory Entry Door Panel
-Glass Factory Vertical Symmetry 5
-Symmetry Island Door to Symmetry Island Lower Panel
-Symmetry Island Door to Symmetry Island Upper Panel
+Outside Tutorial Outpost Entry Panel
+Outside Tutorial Outpost Exit Panel
+Glass Factory Entry Panel
+Glass Factory Back Wall 5
+Symmetry Island Lower Panel
+Symmetry Island Upper Panel
 Orchard Apple Tree 3
 Orchard Apple Tree 5
-Desert Door to Desert Flood Light Room Panel
-Desert Artificial Light Reflection 3
-Desert Door to Water Levels Room Panel
-Desert Flood Reflection 6
-Quarry Door to Quarry 1 Panel
-Quarry Door to Quarry 2 Panel
-Quarry Door to Mill Right
-Quarry Door to Mill Left
-Quarry Mill Ground Floor Shortcut Door Panel
-Quarry Mill Door to Outside Quarry Stairs Panel
+Desert Light Room Entry Panel
+Desert Light Room 3
+Desert Flood Room Entry Panel
+Desert Flood Room 6
+Quarry Entry 1 Panel
+Quarry Entry 2 Panel
+Quarry Mill Entry Right Panel
+Quarry Mill Entry Left Panel
+Quarry Mill Side Exit Panel
+Quarry Mill Roof Exit Panel
 Quarry Mill Stair Control
-Quarry Boathouse Shortcut Door Panel
+Quarry Boathouse Second Barrier Panel
 Shadows Door Timer Inside
 Shadows Door Timer Outside
-Shadows Environmental Avoid 8
-Shadows Follow 5
-Shadows Lower Avoid 3
-Shadows Lower Avoid 5
+Shadows Far 8
+Shadows Near 5
+Shadows Intro 3
+Shadows Intro 5
 Keep Hedge Maze 1
 Keep Pressure Plates 1
 Keep Hedge Maze 2
@@ -142,71 +142,70 @@ Keep Hedge Maze 4
 Keep Pressure Plates 2
 Keep Pressure Plates 3
 Keep Pressure Plates 4
-Keep Shortcut to Shadows Panel
-Keep Tower Shortcut to Keep Panel
-Monastery Shortcut Door Panel
-Monastery Door Open Left
-Monastery Door Open Right
-Monastery Rhombic Avoid 3
-Town Cargo Box Panel
-Town Full Dot Grid Shapers 5
-Town Tinted Door Panel
-Town Door to Church Stars Panel
+Keep Shadows Shortcut Panel
+Keep Tower Shortcut Panel
+Monastery Shortcut Panel
+Monastery Entry Left
+Monastery Entry Right
+Monastery Outside 3
+Town Cargo Box Entry Panel
+Town Wooden Roof Lower Row 5
+Town Tinted Glass Door Panel
+Town Church Entry Panel
 Town Maze Stair Control
-Town Windmill Door Panel
-Town Sound Room Left
+Town Windmill Entry Panel
 Town Sound Room Right
-Town Symmetry Squares 5 + Dots
+Town Red Rooftop 5
 Town Church Lattice
-Town Hexagonal Reflection
-Town Shapers & Dots & Eraser
-Windmill Door to Front of Theater Panel
-Theater Door to Cargo Box Left Panel
-Theater Door to Cargo Box Right Panel
-Jungle Shortcut to River Panel
+Town Tall Hexagonal
+Town Wooden Rooftop
+Windmill Theater Entry Panel
+Theater Exit Left Panel
+Theater Exit Right Panel
+Jungle Laser Shortcut Panel
 Jungle Popup Wall Control
-River Rhombic Avoid to Monastery Garden
-Bunker Bunker Entry Panel
-Bunker Door to Bunker Proper Panel
-Bunker Drawn Squares through Tinted Glass 3
-Bunker Drop-Down Door Squares 2
+River Monastery Shortcut Panel
+Bunker Entry Panel
+Bunker Tinted Glass Door Panel
+Bunker Glass Room 3
+Bunker UV Room 2
 Swamp Entry Panel
-Swamp Platform Shapers 4
+Swamp Platform Row 4
 Swamp Platform Shortcut Right Panel
-Swamp Blue Underwater Negative Shapers 5
-Swamp Broken Shapers 4
-Swamp Cyan Underwater Negative Shapers 5
-Swamp Red Underwater Negative Shapers 4
-Swamp More Rotated Shapers 4
-Swamp More Rotated Shapers 4
-Swamp Near Laser Shortcut Right Panel
+Swamp Blue Underwater 5
+Swamp Between Bridges Near Row 4
+Swamp Cyan Underwater 5
+Swamp Red Underwater 4
+Swamp Beyond Rotating Bridge 4
+Swamp Beyond Rotating Bridge 4
+Swamp Laser Shortcut Right Panel
 Treehouse First Door Panel
 Treehouse Second Door Panel
-Treehouse Beyond Yellow Bridge Door Panel
+Treehouse Third Door Panel
 Treehouse Bridge Control
 Treehouse Left Orange Bridge 15
 Treehouse Right Orange Bridge 12
 Treehouse Laser House Door Timer Outside Control
-Treehouse Laser House Door Timer Inside Control
-Inside Mountain Moving Background 7
-Inside Mountain Obscured Vision 5
-Inside Mountain Physically Obstructed 3
-Inside Mountain Angled Inside Trash 2
-Inside Mountain Color Cycle 5
-Inside Mountain Light Bridge Controller 2
-Inside Mountain Light Bridge Controller 3
-Inside Mountain Same Solution 6
-Inside Mountain Giant Puzzle
-Inside Mountain Door to Final Room Left
-Inside Mountain Door to Final Room Right
-Inside Mountain Bottom Layer Discard
-Inside Mountain Rock Control
-Inside Mountain Secret Area Entry Panel
-Inside Mountain Caves Lone Pillar
-Inside Mountain Caves Shortcut to Mountain Panel
-Inside Mountain Caves Shortcut to Swamp Panel
-Inside Mountain Caves Challenge Entry Panel
-Challenge Door to Theater Walkway Panel
-Theater Walkway Theater Shortcut Panel
-Theater Walkway Desert Shortcut Panel
-Theater Walkway Town Shortcut Panel
+Treehouse Laser House Door Timer Inside
+Mountain Floor 1 Left Row 7
+Mountain Floor 1 Right Row 5
+Mountain Floor 1 Back Row 3
+Mountain Floor 1 Trash Pillar 2
+Mountain Floor 2 Near Row 5
+Mountain Floor 2 Light Bridge Controller Near
+Mountain Floor 2 Light Bridge Controller Far
+Mountain Floor 2 Far Row 6
+Mountain Bottom Floor Giant Puzzle
+Mountain Bottom Floor Final Room Entry Left
+Mountain Bottom Floor Final Room Entry Right
+Mountain Bottom Floor Discard
+Mountain Bottom Floor Rock Control
+Mountain Bottom Floor Caves Entry Panel
+Caves Lone Pillar
+Caves Mountain Shortcut Panel
+Caves Swamp Shortcut Panel
+Caves Challenge Entry Panel
+Challenge Tunnels Entry Panel
+Tunnels Theater Shortcut Panel
+Tunnels Desert Shortcut Panel
+Tunnels Town Shortcut Panel
--- a/worlds/witness/settings/Doors_Simple.txt
+++ b/worlds/witness/settings/Doors_Simple.txt
@@ -1,73 +1,73 @@
 Items:
-Glass Factory Back Wall
-Quarry Boathouse Boat Staircase
+Glass Factory Back Wall (Door)
+Quarry Boathouse Dock (Door)
 Outside Tutorial Outpost Doors
-Glass Factory Entry Door
+Glass Factory Entry (Door)
 Symmetry Island Doors
 Orchard Gates
 Desert Doors
 Quarry Main Entry
-Quarry Door to Mill
+Quarry Mill Entry (Door)
 Quarry Mill Shortcuts
 Quarry Boathouse Barriers
-Shadows Timed Door
+Shadows Timed Door (Door)
 Shadows Laser Room Door
 Shadows Barriers
 Keep Hedge Maze Doors
 Keep Pressure Plates Doors
 Keep Shortcuts
-Monastery Entry Door
+Monastery Entry
 Monastery Shortcuts
 Town Doors
 Town Tower Doors
-Theater Entry Door
-Theater Exit Door
+Theater Entry (Door)
+Theater Exit
 Jungle & River Shortcuts
-Jungle Popup Wall
+Jungle Popup Wall (Door)
 Bunker Doors
 Swamp Doors
-Swamp Near Laser Shortcut
+Swamp Laser Shortcut (Door)
 Swamp Water Pumps
 Treehouse Entry Doors
-Treehouse Drawbridge
-Treehouse Timed Door to Laser House
-Inside Mountain First Layer Exit Door
-Inside Mountain Second Layer Stairs & Doors
-Inside Mountain Giant Puzzle Exit Door
-Inside Mountain Door to Final Room
-Inside Mountain Bottom Layer Doors to Caves
+Treehouse Drawbridge (Door)
+Treehouse Laser House Entry (Door)
+Mountain Floor 1 Exit (Door)
+Mountain Floor 2 Stairs & Doors
+Mountain Bottom Floor Giant Puzzle Exit (Door)
+Mountain Bottom Floor Final Room Entry (Door)
+Mountain Bottom Floor Doors to Caves
 Caves Doors to Challenge
 Caves Exits to Main Island
-Challenge Door to Theater Walkway
-Theater Walkway Doors
+Challenge Tunnels Entry (Door)
+Tunnels Doors

 Added Locations:
-Outside Tutorial Door to Outpost Panel
-Outside Tutorial Exit Door from Outpost Panel
-Glass Factory Entry Door Panel
-Glass Factory Vertical Symmetry 5
-Symmetry Island Door to Symmetry Island Lower Panel
-Symmetry Island Door to Symmetry Island Upper Panel
+Outside Tutorial Outpost Entry Panel
+Outside Tutorial Outpost Exit Panel
+Glass Factory Entry Panel
+Glass Factory Back Wall 5
+Symmetry Island Lower Panel
+Symmetry Island Upper Panel
 Orchard Apple Tree 3
 Orchard Apple Tree 5
-Desert Door to Desert Flood Light Room Panel
-Desert Artificial Light Reflection 3
-Desert Door to Water Levels Room Panel
-Desert Flood Reflection 6
-Quarry Door to Quarry 1 Panel
-Quarry Door to Quarry 2 Panel
-Quarry Door to Mill Right
-Quarry Door to Mill Left
-Quarry Mill Ground Floor Shortcut Door Panel
-Quarry Mill Door to Outside Quarry Stairs Panel
+Desert Light Room Entry Panel
+Desert Light Room 3
+Desert Flood Room Entry Panel
+Desert Flood Room 6
+Quarry Entry 1 Panel
+Quarry Entry 2 Panel
+Quarry Mill Entry Right Panel
+Quarry Mill Entry Left Panel
+Quarry Mill Side Exit Panel
+Quarry Mill Roof Exit Panel
 Quarry Mill Stair Control
-Quarry Boathouse Shortcut Door Panel
+Quarry Boathouse Second Barrier Panel
 Shadows Door Timer Inside
 Shadows Door Timer Outside
-Shadows Environmental Avoid 8
-Shadows Follow 5
-Shadows Lower Avoid 3
-Shadows Lower Avoid 5
+Shadows Far 8
+Shadows Near 5
+Shadows Intro 3
+Shadows Intro 5
 Keep Hedge Maze 1
 Keep Pressure Plates 1
 Keep Hedge Maze 2
@@ -76,71 +76,70 @@ Keep Hedge Maze 4
 Keep Pressure Plates 2
 Keep Pressure Plates 3
 Keep Pressure Plates 4
-Keep Shortcut to Shadows Panel
-Keep Tower Shortcut to Keep Panel
-Monastery Shortcut Door Panel
-Monastery Door Open Left
-Monastery Door Open Right
-Monastery Rhombic Avoid 3
-Town Cargo Box Panel
-Town Full Dot Grid Shapers 5
-Town Tinted Door Panel
-Town Door to Church Stars Panel
+Keep Shadows Shortcut Panel
+Keep Tower Shortcut Panel
+Monastery Shortcut Panel
+Monastery Entry Left
+Monastery Entry Right
+Monastery Outside 3
+Town Cargo Box Entry Panel
+Town Wooden Roof Lower Row 5
+Town Tinted Glass Door Panel
+Town Church Entry Panel
 Town Maze Stair Control
-Town Windmill Door Panel
-Town Sound Room Left
+Town Windmill Entry Panel
 Town Sound Room Right
-Town Symmetry Squares 5 + Dots
+Town Red Rooftop 5
 Town Church Lattice
-Town Hexagonal Reflection
-Town Shapers & Dots & Eraser
-Windmill Door to Front of Theater Panel
-Theater Door to Cargo Box Left Panel
-Theater Door to Cargo Box Right Panel
-Jungle Shortcut to River Panel
+Town Tall Hexagonal
+Town Wooden Rooftop
+Windmill Theater Entry Panel
+Theater Exit Left Panel
+Theater Exit Right Panel
+Jungle Laser Shortcut Panel
 Jungle Popup Wall Control
-River Rhombic Avoid to Monastery Garden
-Bunker Bunker Entry Panel
-Bunker Door to Bunker Proper Panel
-Bunker Drawn Squares through Tinted Glass 3
-Bunker Drop-Down Door Squares 2
+River Monastery Shortcut Panel
+Bunker Entry Panel
+Bunker Tinted Glass Door Panel
+Bunker Glass Room 3
+Bunker UV Room 2
 Swamp Entry Panel
-Swamp Platform Shapers 4
+Swamp Platform Row 4
 Swamp Platform Shortcut Right Panel
-Swamp Blue Underwater Negative Shapers 5
-Swamp Broken Shapers 4
-Swamp Cyan Underwater Negative Shapers 5
-Swamp Red Underwater Negative Shapers 4
-Swamp More Rotated Shapers 4
-Swamp More Rotated Shapers 4
-Swamp Near Laser Shortcut Right Panel
+Swamp Blue Underwater 5
+Swamp Between Bridges Near Row 4
+Swamp Cyan Underwater 5
+Swamp Red Underwater 4
+Swamp Beyond Rotating Bridge 4
+Swamp Beyond Rotating Bridge 4
+Swamp Laser Shortcut Right Panel
 Treehouse First Door Panel
 Treehouse Second Door Panel
-Treehouse Beyond Yellow Bridge Door Panel
+Treehouse Third Door Panel
 Treehouse Bridge Control
 Treehouse Left Orange Bridge 15
 Treehouse Right Orange Bridge 12
 Treehouse Laser House Door Timer Outside Control
-Treehouse Laser House Door Timer Inside Control
-Inside Mountain Moving Background 7
-Inside Mountain Obscured Vision 5
-Inside Mountain Physically Obstructed 3
-Inside Mountain Angled Inside Trash 2
-Inside Mountain Color Cycle 5
-Inside Mountain Light Bridge Controller 2
-Inside Mountain Light Bridge Controller 3
-Inside Mountain Same Solution 6
-Inside Mountain Giant Puzzle
-Inside Mountain Door to Final Room Left
-Inside Mountain Door to Final Room Right
-Inside Mountain Bottom Layer Discard
-Inside Mountain Rock Control
-Inside Mountain Secret Area Entry Panel
-Inside Mountain Caves Lone Pillar
-Inside Mountain Caves Shortcut to Mountain Panel
-Inside Mountain Caves Shortcut to Swamp Panel
-Inside Mountain Caves Challenge Entry Panel
-Challenge Door to Theater Walkway Panel
-Theater Walkway Theater Shortcut Panel
-Theater Walkway Desert Shortcut Panel
-Theater Walkway Town Shortcut Panel
+Treehouse Laser House Door Timer Inside
+Mountain Floor 1 Left Row 7
+Mountain Floor 1 Right Row 5
+Mountain Floor 1 Back Row 3
+Mountain Floor 1 Trash Pillar 2
+Mountain Floor 2 Near Row 5
+Mountain Floor 2 Light Bridge Controller Near
+Mountain Floor 2 Light Bridge Controller Far
+Mountain Floor 2 Far Row 6
+Mountain Bottom Floor Giant Puzzle
+Mountain Bottom Floor Final Room Entry Left
+Mountain Bottom Floor Final Room Entry Right
+Mountain Bottom Floor Discard
+Mountain Bottom Floor Rock Control
+Mountain Bottom Floor Caves Entry Panel
+Caves Lone Pillar
+Caves Mountain Shortcut Panel
+Caves Swamp Shortcut Panel
+Caves Challenge Entry Panel
+Challenge Tunnels Entry Panel
+Tunnels Theater Shortcut Panel
+Tunnels Desert Shortcut Panel
+Tunnels Town Shortcut Panel
--- a/worlds/witness/settings/Early_UTM.txt
+++ b/worlds/witness/settings/Early_UTM.txt
@@ -5,5 +5,5 @@ Starting Inventory:
 Caves Exits to Main Island

 Remove Items:
-Caves Mountain Shortcut
-Caves Swamp Shortcut
+Caves Mountain Shortcut (Door)
+Caves Swamp Shortcut (Door)