From b23c1202582cbdf9a8e882d6b65cb580c5c5a382 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Wed, 24 Jul 2024 16:17:43 -0400
Subject: [PATCH 01/21] Subnautica: Fix deprecated option getting (#3685)

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

diff --git a/worlds/subnautica/rules.py b/worlds/subnautica/rules.py
index 3b6c5cd4dd..ea9ec6a805 100644
--- a/worlds/subnautica/rules.py
+++ b/worlds/subnautica/rules.py
@@ -150,7 +150,7 @@ def has_ultra_glide_fins(state: "CollectionState", player: int) -> bool:
 
 
 def get_max_swim_depth(state: "CollectionState", player: int) -> int:
-    swim_rule: SwimRule = state.multiworld.swim_rule[player]
+    swim_rule: SwimRule = state.multiworld.worlds[player].options.swim_rule
     depth: int = swim_rule.base_depth
     if swim_rule.consider_items:
         if has_seaglide(state, player):
@@ -296,7 +296,7 @@ def set_rules(subnautica_world: "SubnauticaWorld"):
         set_location_rule(multiworld, player, loc)
 
     if subnautica_world.creatures_to_scan:
-        option = multiworld.creature_scan_logic[player]
+        option = multiworld.worlds[player].options.creature_scan_logic
 
         for creature_name in subnautica_world.creatures_to_scan:
             location = set_creature_rule(multiworld, player, creature_name)

From 2307694012f3d49dbacbcdb059473f52c87aedea Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Wed, 24 Jul 2024 20:08:58 -0500
Subject: [PATCH 02/21] HK: fix remove issues failing collect/remove test
 (#3667)

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

diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index 78287305df..fbc6461f6a 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -554,7 +554,8 @@ class HKWorld(World):
             for effect_name, effect_value in item_effects.get(item.name, {}).items():
                 if state.prog_items[item.player][effect_name] == effect_value:
                     del state.prog_items[item.player][effect_name]
-                state.prog_items[item.player][effect_name] -= effect_value
+                else:
+                    state.prog_items[item.player][effect_name] -= effect_value
 
         return change
 

From 697f7495184bbc7791ab3ad93bd2d7f4fa468ea5 Mon Sep 17 00:00:00 2001
From: Silent <110704408+silent-destroyer@users.noreply.github.com>
Date: Thu, 25 Jul 2024 00:06:45 -0400
Subject: [PATCH 03/21] TUNIC: Missing slot data bugfix (#3628)

* Fix certain items not being added to slot data

* Change where items get added to slot data

From 94e6e978f330c25eeca37692f03b52cbfeb4c386 Mon Sep 17 00:00:00 2001
From: Alchav <59858495+Alchav@users.noreply.github.com>
Date: Thu, 25 Jul 2024 00:07:20 -0400
Subject: [PATCH 04/21] =?UTF-8?q?Pok=C3=A9mon=20R/B:=20Also=20fix=20Rt=204?=
 =?UTF-8?q?=20Hidden=20Item=20(#3668)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: alchav <alchav@jalchavware.com>
---
 worlds/pokemon_rb/locations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py
index 251beb59cc..6aee25df26 100644
--- a/worlds/pokemon_rb/locations.py
+++ b/worlds/pokemon_rb/locations.py
@@ -427,7 +427,7 @@ location_data = [
     LocationData("Seafoam Islands B3F", "Hidden Item Rock", "Max Elixir", rom_addresses['Hidden_Item_Seafoam_Islands_B3F'], Hidden(50), inclusion=hidden_items),
     LocationData("Vermilion City", "Hidden Item In Water Near Fan Club", "Max Ether", rom_addresses['Hidden_Item_Vermilion_City'], Hidden(51), inclusion=hidden_items),
     LocationData("Cerulean City-Badge House Backyard", "Hidden Item Gym Badge Guy's Backyard", "Rare Candy", rom_addresses['Hidden_Item_Cerulean_City'], Hidden(52), inclusion=hidden_items),
-    LocationData("Route 4-E", "Hidden Item Plateau East Of Mt Moon", "Great Ball", rom_addresses['Hidden_Item_Route_4'], Hidden(53), inclusion=hidden_items),
+    LocationData("Route 4-C", "Hidden Item Plateau East Of Mt Moon", "Great Ball", rom_addresses['Hidden_Item_Route_4'], Hidden(53), inclusion=hidden_items),
 
 
     LocationData("Oak's Lab", "Oak's Parcel Reward", "Pokedex", rom_addresses["Event_Pokedex"], EventFlag(0x38)),

From f34da74012ba0f69433b158a68e008dc36a258d7 Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Thu, 25 Jul 2024 00:13:16 -0400
Subject: [PATCH 05/21] Stardew Valley: Make Fairy Dust a Ginger Island only
 item and location (#3650)

---
 worlds/stardew_valley/data/items.csv     | 2 +-
 worlds/stardew_valley/data/locations.csv | 2 +-
 worlds/stardew_valley/items.py           | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/worlds/stardew_valley/data/items.csv b/worlds/stardew_valley/data/items.csv
index 2604ad2c46..e026090f86 100644
--- a/worlds/stardew_valley/data/items.csv
+++ b/worlds/stardew_valley/data/items.csv
@@ -307,7 +307,7 @@ id,name,classification,groups,mod_name
 322,Phoenix Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
 323,Immunity Band,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
 324,Glowstone Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE",
-325,Fairy Dust Recipe,progression,,
+325,Fairy Dust Recipe,progression,"GINGER_ISLAND",
 326,Heavy Tapper Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND",
 327,Hyper Speed-Gro Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND",
 328,Deluxe Fertilizer Recipe,progression,QI_CRAFTING_RECIPE,
diff --git a/worlds/stardew_valley/data/locations.csv b/worlds/stardew_valley/data/locations.csv
index 6e30d2b8c8..242d00b445 100644
--- a/worlds/stardew_valley/data/locations.csv
+++ b/worlds/stardew_valley/data/locations.csv
@@ -2088,7 +2088,7 @@ id,region,name,tags,mod_name
 3472,Farm,Craft Life Elixir,CRAFTSANITY,
 3473,Farm,Craft Oil of Garlic,CRAFTSANITY,
 3474,Farm,Craft Monster Musk,CRAFTSANITY,
-3475,Farm,Craft Fairy Dust,CRAFTSANITY,
+3475,Farm,Craft Fairy Dust,"CRAFTSANITY,GINGER_ISLAND",
 3476,Farm,Craft Warp Totem: Beach,CRAFTSANITY,
 3477,Farm,Craft Warp Totem: Mountains,CRAFTSANITY,
 3478,Farm,Craft Warp Totem: Farm,CRAFTSANITY,
diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py
index cb61020169..31c7da5e3a 100644
--- a/worlds/stardew_valley/items.py
+++ b/worlds/stardew_valley/items.py
@@ -409,8 +409,9 @@ def create_special_quest_rewards(item_factory: StardewItemFactory, options: Star
     else:
         items.append(item_factory(Wallet.bears_knowledge, ItemClassification.useful))  # Not necessary outside of SVE
     items.append(item_factory(Wallet.iridium_snake_milk))
-    items.append(item_factory("Fairy Dust Recipe"))
     items.append(item_factory("Dark Talisman"))
+    if options.exclude_ginger_island == ExcludeGingerIsland.option_false:
+        items.append(item_factory("Fairy Dust Recipe"))
 
 
 def create_help_wanted_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):

From 496f0e09afe7e863cf1bcce948d48bf591086274 Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Thu, 25 Jul 2024 01:21:51 -0500
Subject: [PATCH 06/21] CommonClient: forget password when disconnecting
 (#3641)

* makes the kivy connect button do the same username forgetting that /connect does to fix an issue where losing connection would make you unable to connect to a different server

* extract duplicate code

* per request, adds handling on any disconnect to forget the saved password as to not leak it to other servers

---------

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
---
 CommonClient.py | 2 ++
 kvui.py         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CommonClient.py b/CommonClient.py
index f8d1fcb7a2..09937e4b9a 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -61,6 +61,7 @@ class ClientCommandProcessor(CommandProcessor):
         if address:
             self.ctx.server_address = None
             self.ctx.username = None
+            self.ctx.password = None
         elif not self.ctx.server_address:
             self.output("Please specify an address.")
             return False
@@ -514,6 +515,7 @@ class CommonContext:
     async def shutdown(self):
         self.server_address = ""
         self.username = None
+        self.password = None
         self.cancel_autoreconnect()
         if self.server and not self.server.socket.closed:
             await self.server.socket.close()
diff --git a/kvui.py b/kvui.py
index a63d636960..f83590a819 100644
--- a/kvui.py
+++ b/kvui.py
@@ -596,6 +596,7 @@ class GameManager(App):
 
     def connect_button_action(self, button):
         self.ctx.username = None
+        self.ctx.password = None
         if self.ctx.server:
             async_start(self.ctx.disconnect())
         else:

From deae524e9ba9f1bab1c48642f11108799d7b3b3a Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Thu, 25 Jul 2024 02:05:04 -0500
Subject: [PATCH 07/21] Docs: add a living faq document for sharing dev
 solutions (#3156)

* adding one faq :)

* adding another faq that links to the relevant file

* add lined line breaks between questions and lower the heading size of the question so sub-divisions can be added later

* missed some newlines

* updating best practice filler method

* add note about get_filler_item_name()

* updates to wording from review

* add section to CODEOWNERS for maintainers of this doc

* use underscores to reference the file easier in CODEOWNERS

* update link to be direct and filter to function name
---
 docs/CODEOWNERS         | 14 +++++++++++---
 docs/apworld_dev_faq.md | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 docs/apworld_dev_faq.md

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index 3b40d7e77a..ab841e65ee 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -1,8 +1,8 @@
 # Archipelago World Code Owners / Maintainers Document
 #
-# This file is used to notate the current "owners" or "maintainers" of any currently merged world folder. For any pull
-# requests that modify these worlds, a code owner must approve the PR in addition to a core maintainer. This is not to
-# be used for files/folders outside the /worlds folder, those will always need sign off from a core maintainer.
+# This file is used to notate the current "owners" or "maintainers" of any currently merged world folder as well as
+# certain documentation. For any pull requests that modify these worlds/docs, a code owner must approve the PR in
+# addition to a core maintainer. All other files and folders are owned and maintained by core maintainers directly.
 #
 # All usernames must be GitHub usernames (and are case sensitive).
 
@@ -226,3 +226,11 @@
 
 # Ori and the Blind Forest
 # /worlds_disabled/oribf/
+
+###################
+## Documentation ##
+###################
+
+# Apworld Dev Faq
+/docs/apworld_dev_faq.md @qwint @ScipioWright
+
diff --git a/docs/apworld_dev_faq.md b/docs/apworld_dev_faq.md
new file mode 100644
index 0000000000..059c33844f
--- /dev/null
+++ b/docs/apworld_dev_faq.md
@@ -0,0 +1,32 @@
+# APWorld Dev FAQ
+
+This document is meant as a reference tool to show solutions to common problems when developing an apworld.
+
+---
+
+### My game has a restrictive start that leads to fill errors
+
+Hint to the Generator that an item needs to be in sphere one with local_early_items
+```py
+early_item_name = "Sword"
+self.multiworld.local_early_items[self.player][early_item_name] = 1
+```
+
+---
+
+### I have multiple settings that change the item/location pool counts and need to balance them out
+
+In an ideal situation your system for producing locations and items wouldn't leave any opportunity for them to be unbalanced. But in real, complex situations, that might be unfeasible.
+
+If that's the case, you can create extra filler based on the difference between your unfilled locations and your itempool by comparing [get_unfilled_locations](https://github.com/ArchipelagoMW/Archipelago/blob/main/BaseClasses.py#:~:text=get_unfilled_locations) to your list of items to submit
+
+Note: to use self.create_filler(), self.get_filler_item_name() should be defined to only return valid filler item names
+```py
+total_locations = len(self.multiworld.get_unfilled_locations(self.player))
+item_pool = self.create_non_filler_items()
+
+while len(item_pool) < total_locations:
+    item_pool.append(self.create_filler())
+
+self.multiworld.itempool += item_pool
+```

From 8949e215654c29f3e46e254bd28fa8572c0acdbc Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:10:36 +0200
Subject: [PATCH 08/21] settings: safer writing (#3644)

* settings: clean up imports

* settings: try to use atomic rename

* settings: flush, sync and validate new yaml

before replacing the old one

* settings: add test for Settings.save
---
 settings.py                    | 18 +++++++++++++-----
 test/general/test_host_yaml.py | 29 +++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/settings.py b/settings.py
index 7ab618c344..7927705214 100644
--- a/settings.py
+++ b/settings.py
@@ -3,6 +3,7 @@ Application settings / host.yaml interface using type hints.
 This is different from player options.
 """
 
+import os
 import os.path
 import shutil
 import sys
@@ -11,7 +12,6 @@ import warnings
 from enum import IntEnum
 from threading import Lock
 from typing import cast, Any, BinaryIO, ClassVar, Dict, Iterator, List, Optional, TextIO, Tuple, Union, TypeVar
-import os
 
 __all__ = [
     "get_settings", "fmt_doc", "no_gui",
@@ -798,6 +798,7 @@ class Settings(Group):
             atexit.register(autosave)
 
     def save(self, location: Optional[str] = None) -> None:  # as above
+        from Utils import parse_yaml
         location = location or self._filename
         assert location, "No file specified"
         temp_location = location + ".tmp"  # not using tempfile to test expected file access
@@ -807,10 +808,18 @@ class Settings(Group):
         # can't use utf-8-sig because it breaks backward compat: pyyaml on Windows with bytes does not strip the BOM
         with open(temp_location, "w", encoding="utf-8") as f:
             self.dump(f)
-        # replace old with new
-        if os.path.exists(location):
+            f.flush()
+            if hasattr(os, "fsync"):
+                os.fsync(f.fileno())
+        # validate new file is valid yaml
+        with open(temp_location, encoding="utf-8") as f:
+            parse_yaml(f.read())
+        # replace old with new, try atomic operation first
+        try:
+            os.rename(temp_location, location)
+        except (OSError, FileExistsError):
             os.unlink(location)
-        os.rename(temp_location, location)
+            os.rename(temp_location, location)
         self._filename = location
 
     def dump(self, f: TextIO, level: int = 0) -> None:
@@ -832,7 +841,6 @@ def get_settings() -> Settings:
     with _lock:  # make sure we only have one instance
         res = getattr(get_settings, "_cache", None)
         if not res:
-            import os
             from Utils import user_path, local_path
             filenames = ("options.yaml", "host.yaml")
             locations: List[str] = []
diff --git a/test/general/test_host_yaml.py b/test/general/test_host_yaml.py
index 7174befca4..3edbd34a51 100644
--- a/test/general/test_host_yaml.py
+++ b/test/general/test_host_yaml.py
@@ -1,11 +1,12 @@
 import os
+import os.path
 import unittest
 from io import StringIO
-from tempfile import TemporaryFile
+from tempfile import TemporaryDirectory, TemporaryFile
 from typing import Any, Dict, List, cast
 
 import Utils
-from settings import Settings, Group
+from settings import Group, Settings, ServerOptions
 
 
 class TestIDs(unittest.TestCase):
@@ -80,3 +81,27 @@ class TestSettingsDumper(unittest.TestCase):
                 self.assertEqual(value_spaces[2], value_spaces[0])  # start of sub-list
                 self.assertGreater(value_spaces[3], value_spaces[0],
                                    f"{value_lines[3]} should have more indentation than {value_lines[0]} in {lines}")
+
+
+class TestSettingsSave(unittest.TestCase):
+    def test_save(self) -> None:
+        """Test that saving and updating works"""
+        with TemporaryDirectory() as d:
+            filename = os.path.join(d, "host.yaml")
+            new_release_mode = ServerOptions.ReleaseMode("enabled")
+            # create default host.yaml
+            settings = Settings(None)
+            settings.save(filename)
+            self.assertTrue(os.path.exists(filename),
+                            "Default settings could not be saved")
+            self.assertNotEqual(settings.server_options.release_mode, new_release_mode,
+                                "Unexpected default release mode")
+            # update host.yaml
+            settings.server_options.release_mode = new_release_mode
+            settings.save(filename)
+            self.assertFalse(os.path.exists(filename + ".tmp"),
+                             "Temp file was not removed during save")
+            # read back host.yaml
+            settings = Settings(filename)
+            self.assertEqual(settings.server_options.release_mode, new_release_mode,
+                             "Settings were not overwritten")

From 205ca7fa37cbcfc1515eaace6239a1acbb34f6a2 Mon Sep 17 00:00:00 2001
From: Witchybun <96719127+Witchybun@users.noreply.github.com>
Date: Thu, 25 Jul 2024 02:22:46 -0500
Subject: [PATCH 09/21] Stardew Valley: Fix Daggerfish, Cropsanity; Move Some
 Rules to Content Packs; Add Missing Shipsanity Location (#3626)

* Fix logic bug on daggerfish

* Make new region for pond.

* Fix SVE logic for crops

* Fix Distant Lands Cropsanity

* Fix failing tests.

* Reverting removing these for now.

* Fix bugs, add combat requirement

* convert str into tuple directly

* add ginger island to mod tests

* Move a lot of mod item logic to content pack

* Gut the rules from DL while we're at it.

* Import nuke

* Fix alecto

* Move back some rules for now.

* Move archaeology rules

* Add some comments why its done.

* Clean up archaeology and fix sve

* Moved dulse to water item class

* Remove digging like worms for now

* fix

* Add missing shipsanity location

* Move background names around or something idk

* Revert ArchaeologyTrash for now

---------

Co-authored-by: Jouramie <jouramie@hotmail.com>
---
 worlds/stardew_valley/content/mods/alecto.py  |  33 +++++
 .../stardew_valley/content/mods/archeology.py |  36 ++++--
 .../content/mods/distant_lands.py             |  31 ++++-
 .../stardew_valley/content/mods/npc_mods.py   |   7 --
 worlds/stardew_valley/content/mods/sve.py     | 102 ++++++++++++++--
 .../content/vanilla/pelican_town.py           |   6 +-
 worlds/stardew_valley/data/fish_data.py       |   7 +-
 worlds/stardew_valley/data/locations.csv      |   3 +-
 worlds/stardew_valley/data/recipe_data.py     |   4 +-
 worlds/stardew_valley/data/requirement.py     |  21 ++++
 worlds/stardew_valley/data/shop.py            |   4 +-
 .../stardew_valley/logic/requirement_logic.py |  27 +++-
 .../stardew_valley/mods/logic/item_logic.py   | 115 +-----------------
 worlds/stardew_valley/mods/mod_regions.py     |   4 +-
 worlds/stardew_valley/rules.py                |   1 +
 worlds/stardew_valley/strings/book_names.py   |   4 -
 .../stardew_valley/strings/entrance_names.py  |   1 +
 worlds/stardew_valley/strings/fish_names.py   |   5 +-
 worlds/stardew_valley/strings/food_names.py   |   1 +
 worlds/stardew_valley/strings/region_names.py |   1 +
 worlds/stardew_valley/test/mods/TestMods.py   |   8 +-
 21 files changed, 258 insertions(+), 163 deletions(-)
 create mode 100644 worlds/stardew_valley/content/mods/alecto.py

diff --git a/worlds/stardew_valley/content/mods/alecto.py b/worlds/stardew_valley/content/mods/alecto.py
new file mode 100644
index 0000000000..c05c936de3
--- /dev/null
+++ b/worlds/stardew_valley/content/mods/alecto.py
@@ -0,0 +1,33 @@
+from ..game_content import ContentPack, StardewContent
+from ..mod_registry import register_mod_content_pack
+from ...data import villagers_data
+from ...data.harvest import ForagingSource
+from ...data.requirement import QuestRequirement
+from ...mods.mod_data import ModNames
+from ...strings.quest_names import ModQuest
+from ...strings.region_names import Region
+from ...strings.seed_names import DistantLandsSeed
+
+
+class AlectoContentPack(ContentPack):
+
+    def harvest_source_hook(self, content: StardewContent):
+        if ModNames.distant_lands in content.registered_packs:
+            content.game_items.pop(DistantLandsSeed.void_mint)
+            content.game_items.pop(DistantLandsSeed.vile_ancient_fruit)
+            content.source_item(DistantLandsSeed.void_mint,
+                                ForagingSource(regions=(Region.witch_swamp,), other_requirements=(QuestRequirement(ModQuest.WitchOrder),)),),
+            content.source_item(DistantLandsSeed.vile_ancient_fruit,
+                                ForagingSource(regions=(Region.witch_swamp,), other_requirements=(QuestRequirement(ModQuest.WitchOrder),)), ),
+
+
+register_mod_content_pack(ContentPack(
+    ModNames.alecto,
+    weak_dependencies=(
+        ModNames.distant_lands,  # For Witch's order
+    ),
+    villagers=(
+        villagers_data.alecto,
+    )
+
+))
diff --git a/worlds/stardew_valley/content/mods/archeology.py b/worlds/stardew_valley/content/mods/archeology.py
index 97d38085d3..5eb8af4cfc 100644
--- a/worlds/stardew_valley/content/mods/archeology.py
+++ b/worlds/stardew_valley/content/mods/archeology.py
@@ -1,20 +1,34 @@
-from ..game_content import ContentPack
+from ..game_content import ContentPack, StardewContent
 from ..mod_registry import register_mod_content_pack
-from ...data.game_item import ItemTag, Tag
-from ...data.shop import ShopSource
+from ...data.artisan import MachineSource
 from ...data.skill import Skill
 from ...mods.mod_data import ModNames
-from ...strings.book_names import ModBook
-from ...strings.region_names import LogicRegion
+from ...strings.craftable_names import ModMachine
+from ...strings.fish_names import ModTrash
+from ...strings.metal_names import all_artifacts, all_fossils
 from ...strings.skill_names import ModSkill
 
-register_mod_content_pack(ContentPack(
+
+class ArchaeologyContentPack(ContentPack):
+    def artisan_good_hook(self, content: StardewContent):
+        # Done as honestly there are too many display items to put into the initial registration traditionally.
+        display_items = all_artifacts + all_fossils
+        for item in display_items:
+            self.source_display_items(item, content)
+        content.source_item(ModTrash.rusty_scrap, *(MachineSource(item=artifact, machine=ModMachine.grinder) for artifact in all_artifacts))
+
+    def source_display_items(self, item: str, content: StardewContent):
+        wood_display = f"Wooden Display: {item}"
+        hardwood_display = f"Hardwood Display: {item}"
+        if item == "Trilobite":
+            wood_display = f"Wooden Display: Trilobite Fossil"
+            hardwood_display = f"Hardwood Display: Trilobite Fossil"
+        content.source_item(wood_display, MachineSource(item=str(item), machine=ModMachine.preservation_chamber))
+        content.source_item(hardwood_display, MachineSource(item=str(item), machine=ModMachine.hardwood_preservation_chamber))
+
+
+register_mod_content_pack(ArchaeologyContentPack(
     ModNames.archaeology,
-    shop_sources={
-        ModBook.digging_like_worms: (
-            Tag(ItemTag.BOOK, ItemTag.BOOK_SKILL),
-            ShopSource(money_price=500, shop_region=LogicRegion.bookseller_1),),
-    },
     skills=(Skill(name=ModSkill.archaeology, has_mastery=False),),
 
 ))
diff --git a/worlds/stardew_valley/content/mods/distant_lands.py b/worlds/stardew_valley/content/mods/distant_lands.py
index 19380d4ff5..c5614d1302 100644
--- a/worlds/stardew_valley/content/mods/distant_lands.py
+++ b/worlds/stardew_valley/content/mods/distant_lands.py
@@ -1,9 +1,26 @@
-from ..game_content import ContentPack
+from ..game_content import ContentPack, StardewContent
 from ..mod_registry import register_mod_content_pack
 from ...data import villagers_data, fish_data
+from ...data.game_item import ItemTag, Tag
+from ...data.harvest import ForagingSource, HarvestCropSource
+from ...data.requirement import QuestRequirement
 from ...mods.mod_data import ModNames
+from ...strings.crop_names import DistantLandsCrop
+from ...strings.forageable_names import DistantLandsForageable
+from ...strings.quest_names import ModQuest
+from ...strings.region_names import Region
+from ...strings.season_names import Season
+from ...strings.seed_names import DistantLandsSeed
 
-register_mod_content_pack(ContentPack(
+
+class DistantLandsContentPack(ContentPack):
+
+    def harvest_source_hook(self, content: StardewContent):
+        content.untag_item(DistantLandsSeed.void_mint, tag=ItemTag.CROPSANITY_SEED)
+        content.untag_item(DistantLandsSeed.vile_ancient_fruit, tag=ItemTag.CROPSANITY_SEED)
+
+
+register_mod_content_pack(DistantLandsContentPack(
     ModNames.distant_lands,
     fishes=(
         fish_data.void_minnow,
@@ -13,5 +30,13 @@ register_mod_content_pack(ContentPack(
     ),
     villagers=(
         villagers_data.zic,
-    )
+    ),
+    harvest_sources={
+        DistantLandsForageable.swamp_herb: (ForagingSource(regions=(Region.witch_swamp,)),),
+        DistantLandsForageable.brown_amanita: (ForagingSource(regions=(Region.witch_swamp,)),),
+        DistantLandsSeed.void_mint: (ForagingSource(regions=(Region.witch_swamp,), other_requirements=(QuestRequirement(ModQuest.CorruptedCropsTask),)),),
+        DistantLandsCrop.void_mint: (Tag(ItemTag.VEGETABLE), HarvestCropSource(seed=DistantLandsSeed.void_mint, seasons=(Season.spring, Season.summer, Season.fall)),),
+        DistantLandsSeed.vile_ancient_fruit: (ForagingSource(regions=(Region.witch_swamp,), other_requirements=(QuestRequirement(ModQuest.CorruptedCropsTask),)),),
+        DistantLandsCrop.vile_ancient_fruit: (Tag(ItemTag.FRUIT), HarvestCropSource(seed=DistantLandsSeed.vile_ancient_fruit, seasons=(Season.spring, Season.summer, Season.fall)),)
+    }
 ))
diff --git a/worlds/stardew_valley/content/mods/npc_mods.py b/worlds/stardew_valley/content/mods/npc_mods.py
index 3172a55dbf..52d97d5c52 100644
--- a/worlds/stardew_valley/content/mods/npc_mods.py
+++ b/worlds/stardew_valley/content/mods/npc_mods.py
@@ -73,13 +73,6 @@ register_mod_content_pack(ContentPack(
     )
 ))
 
-register_mod_content_pack(ContentPack(
-    ModNames.alecto,
-    villagers=(
-        villagers_data.alecto,
-    )
-))
-
 register_mod_content_pack(ContentPack(
     ModNames.lacey,
     villagers=(
diff --git a/worlds/stardew_valley/content/mods/sve.py b/worlds/stardew_valley/content/mods/sve.py
index f74b80948c..a68d4ae9c0 100644
--- a/worlds/stardew_valley/content/mods/sve.py
+++ b/worlds/stardew_valley/content/mods/sve.py
@@ -3,15 +3,27 @@ from ..mod_registry import register_mod_content_pack
 from ..override import override
 from ..vanilla.ginger_island import ginger_island_content_pack as ginger_island_content_pack
 from ...data import villagers_data, fish_data
-from ...data.harvest import ForagingSource
-from ...data.requirement import YearRequirement
+from ...data.game_item import ItemTag, Tag
+from ...data.harvest import ForagingSource, HarvestCropSource
+from ...data.requirement import YearRequirement, CombatRequirement, RelationshipRequirement, ToolRequirement, SkillRequirement, FishingRequirement
+from ...data.shop import ShopSource
 from ...mods.mod_data import ModNames
-from ...strings.crop_names import Fruit
-from ...strings.fish_names import WaterItem
+from ...strings.craftable_names import ModEdible
+from ...strings.crop_names import Fruit, SVEVegetable, SVEFruit
+from ...strings.fish_names import WaterItem, SVEFish, SVEWaterItem
 from ...strings.flower_names import Flower
-from ...strings.forageable_names import Mushroom, Forageable
-from ...strings.region_names import Region, SVERegion
+from ...strings.food_names import SVEMeal, SVEBeverage
+from ...strings.forageable_names import Mushroom, Forageable, SVEForage
+from ...strings.gift_names import SVEGift
+from ...strings.metal_names import Ore
+from ...strings.monster_drop_names import ModLoot, Loot
+from ...strings.performance_names import Performance
+from ...strings.region_names import Region, SVERegion, LogicRegion
 from ...strings.season_names import Season
+from ...strings.seed_names import SVESeed
+from ...strings.skill_names import Skill
+from ...strings.tool_names import Tool, ToolMaterial
+from ...strings.villager_names import ModNPC
 
 
 class SVEContentPack(ContentPack):
@@ -38,6 +50,24 @@ class SVEContentPack(ContentPack):
             # Remove Lance if Ginger Island is not in content since he is first encountered in Volcano Forge
             content.villagers.pop(villagers_data.lance.name)
 
+    def harvest_source_hook(self, content: StardewContent):
+        content.untag_item(SVESeed.shrub, tag=ItemTag.CROPSANITY_SEED)
+        content.untag_item(SVESeed.fungus, tag=ItemTag.CROPSANITY_SEED)
+        content.untag_item(SVESeed.slime, tag=ItemTag.CROPSANITY_SEED)
+        content.untag_item(SVESeed.stalk, tag=ItemTag.CROPSANITY_SEED)
+        content.untag_item(SVESeed.void, tag=ItemTag.CROPSANITY_SEED)
+        content.untag_item(SVESeed.ancient_fern, tag=ItemTag.CROPSANITY_SEED)
+        if ginger_island_content_pack.name not in content.registered_packs:
+            # Remove Highlands seeds as these are behind Lance existing.
+            content.game_items.pop(SVESeed.void)
+            content.game_items.pop(SVEVegetable.void_root)
+            content.game_items.pop(SVESeed.stalk)
+            content.game_items.pop(SVEFruit.monster_fruit)
+            content.game_items.pop(SVESeed.fungus)
+            content.game_items.pop(SVEVegetable.monster_mushroom)
+            content.game_items.pop(SVESeed.slime)
+            content.game_items.pop(SVEFruit.slime_berry)
+
 
 register_mod_content_pack(SVEContentPack(
     ModNames.sve,
@@ -45,12 +75,24 @@ register_mod_content_pack(SVEContentPack(
         ginger_island_content_pack.name,
         ModNames.jasper,  # To override Marlon and Gunther
     ),
+    shop_sources={
+        SVEGift.aged_blue_moon_wine: (ShopSource(money_price=28000, shop_region=SVERegion.blue_moon_vineyard),),
+        SVEGift.blue_moon_wine: (ShopSource(money_price=3000, shop_region=SVERegion.blue_moon_vineyard),),
+        ModEdible.lightning_elixir: (ShopSource(money_price=12000, shop_region=SVERegion.galmoran_outpost),),
+        ModEdible.barbarian_elixir: (ShopSource(money_price=22000, shop_region=SVERegion.galmoran_outpost),),
+        ModEdible.gravity_elixir: (ShopSource(money_price=4000, shop_region=SVERegion.galmoran_outpost),),
+        SVEMeal.grampleton_orange_chicken: (ShopSource(money_price=650, shop_region=Region.saloon, other_requirements=(RelationshipRequirement(ModNPC.sophia, 6),)),),
+        ModEdible.hero_elixir: (ShopSource(money_price=8000, shop_region=SVERegion.isaac_shop),),
+        ModEdible.aegis_elixir: (ShopSource(money_price=28000, shop_region=SVERegion.galmoran_outpost),),
+        SVEBeverage.sports_drink: (ShopSource(money_price=750, shop_region=Region.hospital),),
+        SVEMeal.stamina_capsule: (ShopSource(money_price=4000, shop_region=Region.hospital),),
+    },
     harvest_sources={
         Mushroom.red: (
             ForagingSource(regions=(SVERegion.forest_west,), seasons=(Season.summer, Season.fall)), ForagingSource(regions=(SVERegion.sprite_spring_cave,), )
         ),
         Mushroom.purple: (
-            ForagingSource(regions=(SVERegion.forest_west,), seasons=(Season.fall,)), ForagingSource(regions=(SVERegion.sprite_spring_cave,), )
+            ForagingSource(regions=(SVERegion.forest_west,), seasons=(Season.fall,)), ForagingSource(regions=(SVERegion.sprite_spring_cave, SVERegion.junimo_woods), )
         ),
         Mushroom.morel: (
             ForagingSource(regions=(SVERegion.forest_west,), seasons=(Season.fall,)), ForagingSource(regions=(SVERegion.sprite_spring_cave,), )
@@ -64,17 +106,59 @@ register_mod_content_pack(SVEContentPack(
         Flower.sunflower: (ForagingSource(regions=(SVERegion.sprite_spring,), seasons=(Season.summer,)),),
         Flower.fairy_rose: (ForagingSource(regions=(SVERegion.sprite_spring,), seasons=(Season.fall,)),),
         Fruit.ancient_fruit: (
-            ForagingSource(regions=(SVERegion.sprite_spring,), seasons=(Season.spring, Season.summer, Season.fall), other_requirements=(YearRequirement(3),)),
+            ForagingSource(regions=(SVERegion.sprite_spring,), seasons=Season.not_winter, other_requirements=(YearRequirement(3),)),
             ForagingSource(regions=(SVERegion.sprite_spring_cave,)),
         ),
         Fruit.sweet_gem_berry: (
-            ForagingSource(regions=(SVERegion.sprite_spring,), seasons=(Season.spring, Season.summer, Season.fall), other_requirements=(YearRequirement(3),)),
+            ForagingSource(regions=(SVERegion.sprite_spring,), seasons=Season.not_winter, other_requirements=(YearRequirement(3),)),
         ),
 
+        # New items
+
+        ModLoot.green_mushroom: (ForagingSource(regions=(SVERegion.highlands_pond,), seasons=Season.not_winter),),
+        ModLoot.ornate_treasure_chest: (ForagingSource(regions=(SVERegion.highlands_outside,),
+                                                       other_requirements=(CombatRequirement(Performance.galaxy), ToolRequirement(Tool.axe, ToolMaterial.iron))),),
+        ModLoot.swirl_stone: (ForagingSource(regions=(SVERegion.crimson_badlands,), other_requirements=(CombatRequirement(Performance.galaxy),)),),
+        ModLoot.void_soul: (ForagingSource(regions=(SVERegion.crimson_badlands,), other_requirements=(CombatRequirement(Performance.good),)),),
+        SVEForage.winter_star_rose: (ForagingSource(regions=(SVERegion.summit,), seasons=(Season.winter,)),),
+        SVEForage.bearberry: (ForagingSource(regions=(Region.secret_woods,), seasons=(Season.winter,)),),
+        SVEForage.poison_mushroom: (ForagingSource(regions=(Region.secret_woods,), seasons=(Season.summer, Season.fall)),),
+        SVEForage.red_baneberry: (ForagingSource(regions=(Region.secret_woods,), seasons=(Season.summer, Season.summer)),),
+        SVEForage.ferngill_primrose: (ForagingSource(regions=(SVERegion.summit,), seasons=(Season.spring,)),),
+        SVEForage.goldenrod: (ForagingSource(regions=(SVERegion.summit,), seasons=(Season.summer, Season.fall)),),
+        SVEForage.conch: (ForagingSource(regions=(Region.beach, SVERegion.fable_reef,)),),
+        SVEForage.dewdrop_berry: (ForagingSource(regions=(SVERegion.enchanted_grove,)),),
+        SVEForage.sand_dollar: (ForagingSource(regions=(Region.beach, SVERegion.fable_reef,), seasons=(Season.spring, Season.summer)),),
+        SVEForage.golden_ocean_flower: (ForagingSource(regions=(SVERegion.fable_reef,)),),
+        SVEForage.four_leaf_clover: (ForagingSource(regions=(Region.secret_woods, SVERegion.forest_west,), seasons=(Season.summer, Season.fall)),),
+        SVEForage.mushroom_colony: (ForagingSource(regions=(Region.secret_woods, SVERegion.junimo_woods, SVERegion.forest_west,), seasons=(Season.fall,)),),
+        SVEForage.rusty_blade: (ForagingSource(regions=(SVERegion.crimson_badlands,), other_requirements=(CombatRequirement(Performance.great),)),),
+        SVEForage.rafflesia: (ForagingSource(regions=(Region.secret_woods,), seasons=Season.not_winter),),
+        SVEForage.thistle: (ForagingSource(regions=(SVERegion.summit,)),),
+        ModLoot.void_pebble: (ForagingSource(regions=(SVERegion.crimson_badlands,), other_requirements=(CombatRequirement(Performance.great),)),),
+        ModLoot.void_shard: (ForagingSource(regions=(SVERegion.crimson_badlands,),
+                                            other_requirements=(CombatRequirement(Performance.galaxy), SkillRequirement(Skill.combat, 10), YearRequirement(3),)),),
+        SVEWaterItem.dulse_seaweed: (ForagingSource(regions=(Region.beach,), other_requirements=(FishingRequirement(Region.beach),)),),
+
         # Fable Reef
         WaterItem.coral: (ForagingSource(regions=(SVERegion.fable_reef,)),),
         Forageable.rainbow_shell: (ForagingSource(regions=(SVERegion.fable_reef,)),),
         WaterItem.sea_urchin: (ForagingSource(regions=(SVERegion.fable_reef,)),),
+
+        # Crops
+        SVESeed.shrub: (ForagingSource(regions=(Region.secret_woods,), other_requirements=(CombatRequirement(Performance.good),)),),
+        SVEFruit.salal_berry: (Tag(ItemTag.FRUIT), HarvestCropSource(seed=SVESeed.shrub, seasons=(Season.spring,)),),
+        SVESeed.slime: (ForagingSource(regions=(SVERegion.highlands_outside,), other_requirements=(CombatRequirement(Performance.good),)),),
+        SVEFruit.slime_berry: (Tag(ItemTag.FRUIT), HarvestCropSource(seed=SVESeed.slime, seasons=(Season.spring,)),),
+        SVESeed.ancient_fern: (ForagingSource(regions=(Region.secret_woods,)),),
+        SVEVegetable.ancient_fiber: (Tag(ItemTag.VEGETABLE), HarvestCropSource(seed=SVESeed.ancient_fern, seasons=(Season.summer,)),),
+        SVESeed.stalk: (ForagingSource(regions=(SVERegion.highlands_outside,), other_requirements=(CombatRequirement(Performance.good),)),),
+        SVEFruit.monster_fruit: (Tag(ItemTag.FRUIT), HarvestCropSource(seed=SVESeed.stalk, seasons=(Season.summer,)),),
+        SVESeed.fungus: (ForagingSource(regions=(SVERegion.highlands_pond,), other_requirements=(CombatRequirement(Performance.good),)),),
+        SVEVegetable.monster_mushroom: (Tag(ItemTag.VEGETABLE), HarvestCropSource(seed=SVESeed.fungus, seasons=(Season.fall,)),),
+        SVESeed.void: (ForagingSource(regions=(SVERegion.highlands_cavern,), other_requirements=(CombatRequirement(Performance.good),)),),
+        SVEVegetable.void_root: (Tag(ItemTag.VEGETABLE), HarvestCropSource(seed=SVESeed.void, seasons=(Season.winter,)),),
+
     },
     fishes=(
         fish_data.baby_lunaloo,  # Removed when no ginger island
diff --git a/worlds/stardew_valley/content/vanilla/pelican_town.py b/worlds/stardew_valley/content/vanilla/pelican_town.py
index 917e8cca22..220b46eae2 100644
--- a/worlds/stardew_valley/content/vanilla/pelican_town.py
+++ b/worlds/stardew_valley/content/vanilla/pelican_town.py
@@ -229,7 +229,7 @@ pelican_town = ContentPack(
             ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
         Book.mapping_cave_systems: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            GenericSource(regions=Region.adventurer_guild_bedroom),
+            GenericSource(regions=(Region.adventurer_guild_bedroom,)),
             ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
         Book.monster_compendium: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
@@ -243,12 +243,12 @@ pelican_town = ContentPack(
             ShopSource(money_price=3000, shop_region=LogicRegion.bookseller_2),),
         Book.the_alleyway_buffet: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            GenericSource(regions=Region.town,
+            GenericSource(regions=(Region.town,),
                           other_requirements=(ToolRequirement(Tool.axe, ToolMaterial.iron), ToolRequirement(Tool.pickaxe, ToolMaterial.iron))),
             ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
         Book.the_art_o_crabbing: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            GenericSource(regions=Region.beach,
+            GenericSource(regions=(Region.beach,),
                           other_requirements=(ToolRequirement(Tool.fishing_rod, ToolMaterial.iridium),
                                               SkillRequirement(Skill.fishing, 6),
                                               SeasonRequirement(Season.winter))),
diff --git a/worlds/stardew_valley/data/fish_data.py b/worlds/stardew_valley/data/fish_data.py
index c6f0c30d41..26b1a0d58a 100644
--- a/worlds/stardew_valley/data/fish_data.py
+++ b/worlds/stardew_valley/data/fish_data.py
@@ -46,7 +46,8 @@ pirate_cove = (Region.pirate_cove,)
 
 crimson_badlands = (SVERegion.crimson_badlands,)
 shearwater = (SVERegion.shearwater,)
-highlands = (SVERegion.highlands_outside,)
+highlands_pond = (SVERegion.highlands_pond,)
+highlands_cave = (SVERegion.highlands_cavern,)
 sprite_spring = (SVERegion.sprite_spring,)
 fable_reef = (SVERegion.fable_reef,)
 vineyard = (SVERegion.blue_moon_vineyard,)
@@ -133,9 +134,9 @@ bonefish = create_fish(SVEFish.bonefish, crimson_badlands, season.all_seasons, 7
 bull_trout = create_fish(SVEFish.bull_trout, forest_river, season.not_spring, 45, mod_name=ModNames.sve)
 butterfish = create_fish(SVEFish.butterfish, shearwater, season.not_winter, 75, mod_name=ModNames.sve)
 clownfish = create_fish(SVEFish.clownfish, ginger_island_ocean, season.all_seasons, 45, mod_name=ModNames.sve)
-daggerfish = create_fish(SVEFish.daggerfish, highlands, season.all_seasons, 50, mod_name=ModNames.sve)
+daggerfish = create_fish(SVEFish.daggerfish, highlands_pond, season.all_seasons, 50, mod_name=ModNames.sve)
 frog = create_fish(SVEFish.frog, mountain_lake, (season.spring, season.summer), 70, mod_name=ModNames.sve)
-gemfish = create_fish(SVEFish.gemfish, highlands, season.all_seasons, 100, mod_name=ModNames.sve)
+gemfish = create_fish(SVEFish.gemfish, highlands_cave, season.all_seasons, 100, mod_name=ModNames.sve)
 goldenfish = create_fish(SVEFish.goldenfish, sprite_spring, season.all_seasons, 60, mod_name=ModNames.sve)
 grass_carp = create_fish(SVEFish.grass_carp, secret_woods, (season.spring, season.summer), 85, mod_name=ModNames.sve)
 king_salmon = create_fish(SVEFish.king_salmon, forest_river, (season.spring, season.summer), 80, mod_name=ModNames.sve)
diff --git a/worlds/stardew_valley/data/locations.csv b/worlds/stardew_valley/data/locations.csv
index 242d00b445..0d7a10f954 100644
--- a/worlds/stardew_valley/data/locations.csv
+++ b/worlds/stardew_valley/data/locations.csv
@@ -2900,7 +2900,6 @@ id,region,name,tags,mod_name
 7055,Abandoned Mines - 3,Abandoned Treasure - Floor 3,MANDATORY,Boarding House and Bus Stop Extension
 7056,Abandoned Mines - 4,Abandoned Treasure - Floor 4,MANDATORY,Boarding House and Bus Stop Extension
 7057,Abandoned Mines - 5,Abandoned Treasure - Floor 5,MANDATORY,Boarding House and Bus Stop Extension
-7351,Farm,Read Digging Like Worms,"BOOKSANITY,BOOKSANITY_SKILL",Archaeology
 7401,Farm,Cook Magic Elixir,COOKSANITY,Magic
 7402,Farm,Craft Travel Core,CRAFTSANITY,Magic
 7403,Farm,Craft Haste Elixir,CRAFTSANITY,Stardew Valley Expanded
@@ -3280,10 +3279,10 @@ id,region,name,tags,mod_name
 8237,Shipping,Shipsanity: Pterodactyl R Wing Bone,SHIPSANITY,Boarding House and Bus Stop Extension
 8238,Shipping,Shipsanity: Scrap Rust,SHIPSANITY,Archaeology
 8239,Shipping,Shipsanity: Rusty Path,SHIPSANITY,Archaeology
-8240,Shipping,Shipsanity: Digging Like Worms,SHIPSANITY,Archaeology
 8241,Shipping,Shipsanity: Digger's Delight,SHIPSANITY,Archaeology
 8242,Shipping,Shipsanity: Rocky Root Coffee,SHIPSANITY,Archaeology
 8243,Shipping,Shipsanity: Ancient Jello,SHIPSANITY,Archaeology
 8244,Shipping,Shipsanity: Bone Fence,SHIPSANITY,Archaeology
 8245,Shipping,Shipsanity: Grilled Cheese,SHIPSANITY,Binning Skill
 8246,Shipping,Shipsanity: Fish Casserole,SHIPSANITY,Binning Skill
+8247,Shipping,Shipsanity: Snatcher Worm,SHIPSANITY,Stardew Valley Expanded
diff --git a/worlds/stardew_valley/data/recipe_data.py b/worlds/stardew_valley/data/recipe_data.py
index b482468762..3123bb9243 100644
--- a/worlds/stardew_valley/data/recipe_data.py
+++ b/worlds/stardew_valley/data/recipe_data.py
@@ -5,7 +5,7 @@ from ..strings.animal_product_names import AnimalProduct
 from ..strings.artisan_good_names import ArtisanGood
 from ..strings.craftable_names import ModEdible, Edible
 from ..strings.crop_names import Fruit, Vegetable, SVEFruit, DistantLandsCrop
-from ..strings.fish_names import Fish, SVEFish, WaterItem, DistantLandsFish
+from ..strings.fish_names import Fish, SVEFish, WaterItem, DistantLandsFish, SVEWaterItem
 from ..strings.flower_names import Flower
 from ..strings.forageable_names import Forageable, SVEForage, DistantLandsForageable, Mushroom
 from ..strings.ingredient_names import Ingredient
@@ -195,7 +195,7 @@ mixed_berry_pie = shop_recipe(SVEMeal.mixed_berry_pie, Region.saloon, 3500, {Fru
                               ModNames.sve)
 mushroom_berry_rice = friendship_and_shop_recipe(SVEMeal.mushroom_berry_rice, ModNPC.marlon, 6, Region.adventurer_guild, 1500, {SVEForage.poison_mushroom: 3, SVEForage.red_baneberry: 10,
                                                                                                Ingredient.rice: 1, Ingredient.sugar: 2}, ModNames.sve)
-seaweed_salad = shop_recipe(SVEMeal.seaweed_salad, Region.fish_shop, 1250, {SVEFish.dulse_seaweed: 2, WaterItem.seaweed: 2, Ingredient.oil: 1}, ModNames.sve)
+seaweed_salad = shop_recipe(SVEMeal.seaweed_salad, Region.fish_shop, 1250, {SVEWaterItem.dulse_seaweed: 2, WaterItem.seaweed: 2, Ingredient.oil: 1}, ModNames.sve)
 void_delight = friendship_and_shop_recipe(SVEMeal.void_delight, NPC.krobus, 10, Region.sewer, 5000,
                                           {SVEFish.void_eel: 1, Loot.void_essence: 50, Loot.solar_essence: 20}, ModNames.sve)
 void_salmon_sushi = friendship_and_shop_recipe(SVEMeal.void_salmon_sushi, NPC.krobus, 10, Region.sewer, 5000,
diff --git a/worlds/stardew_valley/data/requirement.py b/worlds/stardew_valley/data/requirement.py
index 4744f9dffd..b2416d8d0b 100644
--- a/worlds/stardew_valley/data/requirement.py
+++ b/worlds/stardew_valley/data/requirement.py
@@ -31,6 +31,27 @@ class YearRequirement(Requirement):
     year: int
 
 
+@dataclass(frozen=True)
+class CombatRequirement(Requirement):
+    level: str
+
+
+@dataclass(frozen=True)
+class QuestRequirement(Requirement):
+    quest: str
+
+
+@dataclass(frozen=True)
+class RelationshipRequirement(Requirement):
+    npc: str
+    hearts: int
+
+
+@dataclass(frozen=True)
+class FishingRequirement(Requirement):
+    region: str
+
+
 @dataclass(frozen=True)
 class WalnutRequirement(Requirement):
     amount: int
diff --git a/worlds/stardew_valley/data/shop.py b/worlds/stardew_valley/data/shop.py
index ca54d35e14..f14dbac821 100644
--- a/worlds/stardew_valley/data/shop.py
+++ b/worlds/stardew_valley/data/shop.py
@@ -16,8 +16,8 @@ class ShopSource(ItemSource):
     other_requirements: Tuple[Requirement, ...] = ()
 
     def __post_init__(self):
-        assert self.money_price or self.items_price, "At least money price or items price need to be defined."
-        assert self.items_price is None or all(type(p) == tuple for p in self.items_price), "Items price should be a tuple."
+        assert self.money_price is not None or self.items_price is not None, "At least money price or items price need to be defined."
+        assert self.items_price is None or all(isinstance(p, tuple) for p in self.items_price), "Items price should be a tuple."
 
 
 @dataclass(frozen=True, **kw_only)
diff --git a/worlds/stardew_valley/logic/requirement_logic.py b/worlds/stardew_valley/logic/requirement_logic.py
index 9356440ac6..6a5adf4890 100644
--- a/worlds/stardew_valley/logic/requirement_logic.py
+++ b/worlds/stardew_valley/logic/requirement_logic.py
@@ -3,15 +3,20 @@ from typing import Union, Iterable
 
 from .base_logic import BaseLogicMixin, BaseLogic
 from .book_logic import BookLogicMixin
+from .combat_logic import CombatLogicMixin
+from .fishing_logic import FishingLogicMixin
 from .has_logic import HasLogicMixin
+from .quest_logic import QuestLogicMixin
 from .received_logic import ReceivedLogicMixin
+from .relationship_logic import RelationshipLogicMixin
 from .season_logic import SeasonLogicMixin
 from .skill_logic import SkillLogicMixin
 from .time_logic import TimeLogicMixin
 from .tool_logic import ToolLogicMixin
 from .walnut_logic import WalnutLogicMixin
 from ..data.game_item import Requirement
-from ..data.requirement import ToolRequirement, BookRequirement, SkillRequirement, SeasonRequirement, YearRequirement, WalnutRequirement
+from ..data.requirement import ToolRequirement, BookRequirement, SkillRequirement, SeasonRequirement, YearRequirement, CombatRequirement, QuestRequirement, \
+    RelationshipRequirement, FishingRequirement, WalnutRequirement
 
 
 class RequirementLogicMixin(BaseLogicMixin):
@@ -21,7 +26,7 @@ class RequirementLogicMixin(BaseLogicMixin):
 
 
 class RequirementLogic(BaseLogic[Union[RequirementLogicMixin, HasLogicMixin, ReceivedLogicMixin, ToolLogicMixin, SkillLogicMixin, BookLogicMixin,
-SeasonLogicMixin, TimeLogicMixin, WalnutLogicMixin]]):
+SeasonLogicMixin, TimeLogicMixin, CombatLogicMixin, QuestLogicMixin, RelationshipLogicMixin, FishingLogicMixin, WalnutLogicMixin]]):
 
     def meet_all_requirements(self, requirements: Iterable[Requirement]):
         if not requirements:
@@ -55,3 +60,21 @@ SeasonLogicMixin, TimeLogicMixin, WalnutLogicMixin]]):
     @meet_requirement.register
     def _(self, requirement: WalnutRequirement):
         return self.logic.walnut.has_walnut(requirement.amount)
+
+    @meet_requirement.register
+    def _(self, requirement: CombatRequirement):
+        return self.logic.combat.can_fight_at_level(requirement.level)
+
+    @meet_requirement.register
+    def _(self, requirement: QuestRequirement):
+        return self.logic.quest.can_complete_quest(requirement.quest)
+
+    @meet_requirement.register
+    def _(self, requirement: RelationshipRequirement):
+        return self.logic.relationship.has_hearts(requirement.npc, requirement.hearts)
+
+    @meet_requirement.register
+    def _(self, requirement: FishingRequirement):
+        return self.logic.fishing.can_fish_at(requirement.region)
+
+
diff --git a/worlds/stardew_valley/mods/logic/item_logic.py b/worlds/stardew_valley/mods/logic/item_logic.py
index cfafc88e83..ef5eab0134 100644
--- a/worlds/stardew_valley/mods/logic/item_logic.py
+++ b/worlds/stardew_valley/mods/logic/item_logic.py
@@ -23,24 +23,15 @@ from ...logic.tool_logic import ToolLogicMixin
 from ...options import Cropsanity
 from ...stardew_rule import StardewRule, True_
 from ...strings.artisan_good_names import ModArtisanGood
-from ...strings.craftable_names import ModCraftable, ModEdible, ModMachine
-from ...strings.crop_names import SVEVegetable, SVEFruit, DistantLandsCrop
-from ...strings.fish_names import ModTrash, SVEFish
-from ...strings.food_names import SVEMeal, SVEBeverage
-from ...strings.forageable_names import SVEForage, DistantLandsForageable
-from ...strings.gift_names import SVEGift
+from ...strings.craftable_names import ModCraftable, ModMachine
+from ...strings.fish_names import ModTrash
 from ...strings.ingredient_names import Ingredient
 from ...strings.material_names import Material
 from ...strings.metal_names import all_fossils, all_artifacts, Ore, ModFossil
-from ...strings.monster_drop_names import ModLoot, Loot
+from ...strings.monster_drop_names import Loot
 from ...strings.performance_names import Performance
-from ...strings.quest_names import ModQuest
-from ...strings.region_names import Region, SVERegion, DeepWoodsRegion, BoardingHouseRegion
-from ...strings.season_names import Season
-from ...strings.seed_names import SVESeed, DistantLandsSeed
-from ...strings.skill_names import Skill
+from ...strings.region_names import SVERegion, DeepWoodsRegion, BoardingHouseRegion
 from ...strings.tool_names import Tool, ToolMaterial
-from ...strings.villager_names import ModNPC
 
 display_types = [ModCraftable.wooden_display, ModCraftable.hardwood_display]
 display_items = all_artifacts + all_fossils
@@ -58,12 +49,6 @@ FarmingLogicMixin]]):
 
     def get_modded_item_rules(self) -> Dict[str, StardewRule]:
         items = dict()
-        if ModNames.sve in self.options.mods:
-            items.update(self.get_sve_item_rules())
-        if ModNames.archaeology in self.options.mods:
-            items.update(self.get_archaeology_item_rules())
-        if ModNames.distant_lands in self.options.mods:
-            items.update(self.get_distant_lands_item_rules())
         if ModNames.boarding_house in self.options.mods:
             items.update(self.get_boarding_house_item_rules())
         return items
@@ -75,61 +60,6 @@ FarmingLogicMixin]]):
             item_rule.update(self.get_modified_item_rules_for_deep_woods(item_rule))
         return item_rule
 
-    def get_sve_item_rules(self):
-        return {SVEGift.aged_blue_moon_wine: self.logic.money.can_spend_at(SVERegion.sophias_house, 28000),
-                SVEGift.blue_moon_wine: self.logic.money.can_spend_at(SVERegion.sophias_house, 3000),
-                SVESeed.fungus: self.logic.region.can_reach(SVERegion.highlands_cavern) & self.logic.combat.has_good_weapon,
-                ModLoot.green_mushroom: self.logic.region.can_reach(SVERegion.highlands_outside) &
-                                        self.logic.tool.has_tool(Tool.axe, ToolMaterial.iron) & self.logic.season.has_any_not_winter(),
-                SVEFruit.monster_fruit: self.logic.season.has(Season.summer) & self.logic.has(SVESeed.stalk),
-                SVEVegetable.monster_mushroom: self.logic.season.has(Season.fall) & self.logic.has(SVESeed.fungus),
-                ModLoot.ornate_treasure_chest: self.logic.region.can_reach(SVERegion.highlands_outside) & self.logic.combat.has_galaxy_weapon &
-                                                 self.logic.tool.has_tool(Tool.axe, ToolMaterial.iron),
-                SVEFruit.slime_berry: self.logic.season.has(Season.spring) & self.logic.has(SVESeed.slime),
-                SVESeed.slime: self.logic.region.can_reach(SVERegion.highlands_outside) & self.logic.combat.has_good_weapon,
-                SVESeed.stalk: self.logic.region.can_reach(SVERegion.highlands_outside) & self.logic.combat.has_good_weapon,
-                ModLoot.swirl_stone: self.logic.region.can_reach(SVERegion.crimson_badlands) & self.logic.combat.has_great_weapon,
-                SVEVegetable.void_root: self.logic.season.has(Season.winter) & self.logic.has(SVESeed.void),
-                SVESeed.void: self.logic.region.can_reach(SVERegion.highlands_cavern) & self.logic.combat.has_good_weapon,
-                ModLoot.void_soul: self.logic.region.can_reach(
-                    SVERegion.crimson_badlands) & self.logic.combat.has_good_weapon & self.logic.cooking.can_cook(),
-                SVEForage.winter_star_rose: self.logic.region.can_reach(SVERegion.summit) & self.logic.season.has(Season.winter),
-                SVEForage.bearberry: self.logic.region.can_reach(Region.secret_woods) & self.logic.season.has(Season.winter),
-                SVEForage.poison_mushroom: self.logic.region.can_reach(Region.secret_woods) & self.logic.season.has_any([Season.summer, Season.fall]),
-                SVEForage.red_baneberry: self.logic.region.can_reach(Region.secret_woods) & self.logic.season.has(Season.summer),
-                SVEForage.ferngill_primrose: self.logic.region.can_reach(SVERegion.summit) & self.logic.season.has(Season.spring),
-                SVEForage.goldenrod: self.logic.region.can_reach(SVERegion.summit) & (
-                        self.logic.season.has(Season.summer) | self.logic.season.has(Season.fall)),
-                SVESeed.shrub: self.logic.region.can_reach(Region.secret_woods) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.basic),
-                SVEFruit.salal_berry: self.logic.farming.can_plant_and_grow_item((Season.spring, Season.summer)) & self.logic.has(SVESeed.shrub),
-                ModEdible.aegis_elixir: self.logic.money.can_spend_at(SVERegion.galmoran_outpost, 28000),
-                ModEdible.lightning_elixir: self.logic.money.can_spend_at(SVERegion.galmoran_outpost, 12000),
-                ModEdible.barbarian_elixir: self.logic.money.can_spend_at(SVERegion.galmoran_outpost, 22000),
-                ModEdible.gravity_elixir: self.logic.money.can_spend_at(SVERegion.galmoran_outpost, 4000),
-                SVESeed.ancient_fern: self.logic.region.can_reach(Region.secret_woods) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.basic),
-                SVEVegetable.ancient_fiber: self.logic.farming.can_plant_and_grow_item(Season.summer) & self.logic.has(SVESeed.ancient_fern),
-                SVEForage.conch: self.logic.region.can_reach_any((Region.beach, SVERegion.fable_reef)),
-                SVEForage.dewdrop_berry: self.logic.region.can_reach(SVERegion.enchanted_grove),
-                SVEForage.sand_dollar: self.logic.region.can_reach(SVERegion.fable_reef) | (self.logic.region.can_reach(Region.beach) &
-                                                                                            self.logic.season.has_any([Season.summer, Season.fall])),
-                SVEForage.golden_ocean_flower: self.logic.region.can_reach(SVERegion.fable_reef),
-                SVEMeal.grampleton_orange_chicken: self.logic.money.can_spend_at(Region.saloon, 650) & self.logic.relationship.has_hearts(ModNPC.sophia, 6),
-                ModEdible.hero_elixir: self.logic.money.can_spend_at(SVERegion.isaac_shop, 8000),
-                SVEForage.four_leaf_clover: self.logic.region.can_reach_any((Region.secret_woods, SVERegion.forest_west)) &
-                                            self.logic.season.has_any([Season.spring, Season.summer]),
-                SVEForage.mushroom_colony: self.logic.region.can_reach_any((Region.secret_woods, SVERegion.junimo_woods, SVERegion.forest_west)) &
-                                           self.logic.season.has(Season.fall),
-                SVEForage.rusty_blade: self.logic.region.can_reach(SVERegion.crimson_badlands) & self.logic.combat.has_great_weapon,
-                SVEForage.rafflesia: self.logic.region.can_reach(Region.secret_woods),
-                SVEBeverage.sports_drink: self.logic.money.can_spend_at(Region.hospital, 750),
-                "Stamina Capsule": self.logic.money.can_spend_at(Region.hospital, 4000),
-                SVEForage.thistle: self.logic.region.can_reach(SVERegion.summit),
-                ModLoot.void_pebble: self.logic.region.can_reach(SVERegion.crimson_badlands) & self.logic.combat.has_great_weapon,
-                ModLoot.void_shard: self.logic.region.can_reach(SVERegion.crimson_badlands) & self.logic.combat.has_galaxy_weapon &
-                                    self.logic.skill.has_level(Skill.combat, 10) & self.logic.region.can_reach(Region.saloon) & self.logic.time.has_year_three
-                }
-        # @formatter:on
-
     def get_modified_item_rules_for_sve(self, items: Dict[str, StardewRule]):
         return {
             Loot.void_essence: items[Loot.void_essence] | self.logic.region.can_reach(SVERegion.highlands_cavern) | self.logic.region.can_reach(
@@ -141,7 +71,7 @@ FarmingLogicMixin]]):
                                          self.logic.combat.can_fight_at_level(Performance.great)),
             Ore.iridium: items[Ore.iridium] | (self.logic.tool.can_use_tool_at(Tool.pickaxe, ToolMaterial.basic, SVERegion.crimson_badlands) &
                                                self.logic.combat.can_fight_at_level(Performance.maximum)),
-            SVEFish.dulse_seaweed: self.logic.fishing.can_fish_at(Region.beach) & self.logic.season.has_any([Season.spring, Season.summer, Season.winter])
+
         }
 
     def get_modified_item_rules_for_deep_woods(self, items: Dict[str, StardewRule]):
@@ -160,36 +90,6 @@ FarmingLogicMixin]]):
 
         return options_to_update
 
-    def get_archaeology_item_rules(self):
-        archaeology_item_rules = {}
-        preservation_chamber_rule = self.logic.has(ModMachine.preservation_chamber)
-        hardwood_preservation_chamber_rule = self.logic.has(ModMachine.hardwood_preservation_chamber)
-        for item in display_items:
-            for display_type in display_types:
-                if item == "Trilobite":
-                    location_name = f"{display_type}: Trilobite Fossil"
-                else:
-                    location_name = f"{display_type}: {item}"
-                display_item_rule = self.logic.crafting.can_craft(all_crafting_recipes_by_name[display_type]) & self.logic.has(item)
-                if "Wooden" in display_type:
-                    archaeology_item_rules[location_name] = display_item_rule & preservation_chamber_rule
-                else:
-                    archaeology_item_rules[location_name] = display_item_rule & hardwood_preservation_chamber_rule
-        archaeology_item_rules[ModTrash.rusty_scrap] = self.logic.has(ModMachine.grinder) & self.logic.has_any(*all_artifacts)
-        return archaeology_item_rules
-
-    def get_distant_lands_item_rules(self):
-        return {
-            DistantLandsForageable.swamp_herb: self.logic.region.can_reach(Region.witch_swamp),
-            DistantLandsForageable.brown_amanita: self.logic.region.can_reach(Region.witch_swamp),
-            DistantLandsSeed.vile_ancient_fruit: self.logic.quest.can_complete_quest(ModQuest.WitchOrder) | self.logic.quest.can_complete_quest(
-                ModQuest.CorruptedCropsTask),
-            DistantLandsSeed.void_mint: self.logic.quest.can_complete_quest(ModQuest.WitchOrder) | self.logic.quest.can_complete_quest(
-                ModQuest.CorruptedCropsTask),
-            DistantLandsCrop.void_mint: self.logic.season.has_any_not_winter() & self.logic.has(DistantLandsSeed.void_mint),
-            DistantLandsCrop.vile_ancient_fruit: self.logic.season.has_any_not_winter() & self.logic.has(DistantLandsSeed.vile_ancient_fruit),
-        }
-
     def get_boarding_house_item_rules(self):
         return {
             # Mob Drops from lost valley enemies
@@ -251,8 +151,3 @@ FarmingLogicMixin]]):
                                                                                BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level(
                 Performance.great),
         }
-
-    def has_seed_unlocked(self, seed_name: str):
-        if self.options.cropsanity == Cropsanity.option_disabled:
-            return True_()
-        return self.logic.received(seed_name)
diff --git a/worlds/stardew_valley/mods/mod_regions.py b/worlds/stardew_valley/mods/mod_regions.py
index c075bd4d10..a402ba6068 100644
--- a/worlds/stardew_valley/mods/mod_regions.py
+++ b/worlds/stardew_valley/mods/mod_regions.py
@@ -183,7 +183,8 @@ stardew_valley_expanded_regions = [
     RegionData(SVERegion.first_slash_guild, [SVEEntrance.first_slash_guild_to_hallway], is_ginger_island=True),
     RegionData(SVERegion.first_slash_hallway, [SVEEntrance.first_slash_hallway_to_room], is_ginger_island=True),
     RegionData(SVERegion.first_slash_spare_room, is_ginger_island=True),
-    RegionData(SVERegion.highlands_outside, [SVEEntrance.highlands_to_lance, SVEEntrance.highlands_to_cave], is_ginger_island=True),
+    RegionData(SVERegion.highlands_outside, [SVEEntrance.highlands_to_lance, SVEEntrance.highlands_to_cave, SVEEntrance.highlands_to_pond], is_ginger_island=True),
+    RegionData(SVERegion.highlands_pond, is_ginger_island=True),
     RegionData(SVERegion.highlands_cavern, [SVEEntrance.to_dwarf_prison], is_ginger_island=True),
     RegionData(SVERegion.dwarf_prison, is_ginger_island=True),
     RegionData(SVERegion.lances_house, [SVEEntrance.lance_to_ladder], is_ginger_island=True),
@@ -276,6 +277,7 @@ mandatory_sve_connections = [
     ConnectionData(SVEEntrance.sprite_spring_to_cave, SVERegion.sprite_spring_cave, flag=RandomizationFlag.BUILDINGS),
     ConnectionData(SVEEntrance.fish_shop_to_willy_bedroom, SVERegion.willy_bedroom, flag=RandomizationFlag.BUILDINGS),
     ConnectionData(SVEEntrance.museum_to_gunther_bedroom, SVERegion.gunther_bedroom, flag=RandomizationFlag.BUILDINGS),
+    ConnectionData(SVEEntrance.highlands_to_pond, SVERegion.highlands_pond),
 ]
 
 alecto_regions = [
diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py
index 7c1fdbda3c..89b1cf87c3 100644
--- a/worlds/stardew_valley/rules.py
+++ b/worlds/stardew_valley/rules.py
@@ -1031,6 +1031,7 @@ def set_sve_ginger_island_rules(logic: StardewLogic, multiworld: MultiWorld, pla
     set_entrance_rule(multiworld, player, SVEEntrance.wizard_to_fable_reef, logic.received(SVEQuestItem.fable_reef_portal))
     set_entrance_rule(multiworld, player, SVEEntrance.highlands_to_cave,
                       logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron) & logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
+    set_entrance_rule(multiworld, player, SVEEntrance.highlands_to_pond, logic.tool.has_tool(Tool.axe, ToolMaterial.iron))
 
 
 def set_boarding_house_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
diff --git a/worlds/stardew_valley/strings/book_names.py b/worlds/stardew_valley/strings/book_names.py
index 3c32cd81b3..6c271f42ae 100644
--- a/worlds/stardew_valley/strings/book_names.py
+++ b/worlds/stardew_valley/strings/book_names.py
@@ -27,10 +27,6 @@ class Book:
     the_diamond_hunter = "The Diamond Hunter"
 
 
-class ModBook:
-    digging_like_worms = "Digging Like Worms"
-
-
 ordered_lost_books = []
 all_lost_books = set()
 
diff --git a/worlds/stardew_valley/strings/entrance_names.py b/worlds/stardew_valley/strings/entrance_names.py
index 9b651f4276..58a919f2a8 100644
--- a/worlds/stardew_valley/strings/entrance_names.py
+++ b/worlds/stardew_valley/strings/entrance_names.py
@@ -358,6 +358,7 @@ class SVEEntrance:
     sprite_spring_to_cave = "Sprite Spring to Sprite Spring Cave"
     fish_shop_to_willy_bedroom = "Willy's Fish Shop to Willy's Bedroom"
     museum_to_gunther_bedroom = "Museum to Gunther's Bedroom"
+    highlands_to_pond = "Highlands to Highlands Pond"
 
 
 class AlectoEntrance:
diff --git a/worlds/stardew_valley/strings/fish_names.py b/worlds/stardew_valley/strings/fish_names.py
index d94f9e2fd4..d4ee81430e 100644
--- a/worlds/stardew_valley/strings/fish_names.py
+++ b/worlds/stardew_valley/strings/fish_names.py
@@ -137,7 +137,6 @@ class SVEFish:
     void_eel = "Void Eel"
     water_grub = "Water Grub"
     sea_sponge = "Sea Sponge"
-    dulse_seaweed = "Dulse Seaweed"
 
 
 class DistantLandsFish:
@@ -147,6 +146,10 @@ class DistantLandsFish:
     giant_horsehoe_crab = "Giant Horsehoe Crab"
 
 
+class SVEWaterItem:
+    dulse_seaweed = "Dulse Seaweed"
+
+
 class ModTrash:
     rusty_scrap = "Scrap Rust"
 
diff --git a/worlds/stardew_valley/strings/food_names.py b/worlds/stardew_valley/strings/food_names.py
index 5555316f83..03784336d1 100644
--- a/worlds/stardew_valley/strings/food_names.py
+++ b/worlds/stardew_valley/strings/food_names.py
@@ -102,6 +102,7 @@ class SVEMeal:
     void_delight = "Void Delight"
     void_salmon_sushi = "Void Salmon Sushi"
     grampleton_orange_chicken = "Grampleton Orange Chicken"
+    stamina_capsule = "Stamina Capsule"
 
 
 class TrashyMeal:
diff --git a/worlds/stardew_valley/strings/region_names.py b/worlds/stardew_valley/strings/region_names.py
index 9cedb6b8ef..58763b6fcb 100644
--- a/worlds/stardew_valley/strings/region_names.py
+++ b/worlds/stardew_valley/strings/region_names.py
@@ -296,6 +296,7 @@ class SVERegion:
     sprite_spring_cave = "Sprite Spring Cave"
     willy_bedroom = "Willy's Bedroom"
     gunther_bedroom = "Gunther's Bedroom"
+    highlands_pond = "Highlands Pond"
 
 
 class AlectoRegion:
diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index 5e7e9d4143..97184b1338 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -14,7 +14,8 @@ class TestGenerateModsOptions(WorldAssertMixin, ModAssertMixin, SVTestCase):
 
     def test_given_single_mods_when_generate_then_basic_checks(self):
         for mod in options.Mods.valid_keys:
-            with self.solo_world_sub_test(f"Mod: {mod}", {options.Mods: mod}) as (multi_world, _):
+            world_options = {options.Mods: mod, options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false}
+            with self.solo_world_sub_test(f"Mod: {mod}", world_options) as (multi_world, _):
                 self.assert_basic_checks(multi_world)
                 self.assert_stray_mod_items(mod, multi_world)
 
@@ -22,8 +23,9 @@ class TestGenerateModsOptions(WorldAssertMixin, ModAssertMixin, SVTestCase):
         for option in options.EntranceRandomization.options:
             for mod in options.Mods.valid_keys:
                 world_options = {
-                    options.EntranceRandomization.internal_name: options.EntranceRandomization.options[option],
-                    options.Mods: mod
+                    options.EntranceRandomization: options.EntranceRandomization.options[option],
+                    options.Mods: mod,
+                    options.ExcludeGingerIsland: options.ExcludeGingerIsland.option_false
                 }
                 with self.solo_world_sub_test(f"entrance_randomization: {option}, Mod: {mod}", world_options) as (multi_world, _):
                     self.assert_basic_checks(multi_world)

From b019485944543e8b1cb440c572f27b6a592a0dd8 Mon Sep 17 00:00:00 2001
From: CookieCat <81494827+CookieCat45@users.noreply.github.com>
Date: Thu, 25 Jul 2024 03:27:22 -0400
Subject: [PATCH 10/21] AHIT: Update Setup Guide (#3647)

---
 worlds/ahit/docs/setup_en.md | 61 +++++++-----------------------------
 1 file changed, 12 insertions(+), 49 deletions(-)

diff --git a/worlds/ahit/docs/setup_en.md b/worlds/ahit/docs/setup_en.md
index 509869fc25..23b3490707 100644
--- a/worlds/ahit/docs/setup_en.md
+++ b/worlds/ahit/docs/setup_en.md
@@ -12,41 +12,29 @@
 
 ## Instructions
 
-1. Have Steam running. Open the Steam console with this link: [steam://open/console](steam://open/console)   
-This may not work for some browsers. If that's the case, and you're on Windows, open the Run dialog using Win+R,
-paste the link into the box, and hit Enter.
+1. **BACK UP YOUR SAVE FILES IN YOUR MAIN INSTALL IF YOU CARE ABOUT THEM!!!**  
+   Go to `steamapps/common/HatinTime/HatinTimeGame/SaveData/` and copy everything inside that folder over to a safe place.
+   **This is important! Changing the game version CAN and WILL break your existing save files!!!**
 
 
-2. In the Steam console, enter the following command: 
-`download_depot 253230 253232 7770543545116491859`. ***Wait for the console to say the download is finished!***
-This can take a while to finish (30+ minutes) depending on your connection speed, so please be patient. Additionally,
-**try to prevent your connection from being interrupted or slowed while Steam is downloading the depot,**
-or else the download may potentially become corrupted (see first FAQ issue below).
+2. In your Steam library, right-click on **A Hat in Time** in the list of games and click on **Properties**.
 
 
-3. Once the download finishes, go to `steamapps/content/app_253230` in Steam's program folder.
+3. Click the **Betas** tab. In the **Beta Participation** dropdown, select `tcplink`.  
+   While it downloads, you can subscribe to the [Archipelago workshop mod.]((https://steamcommunity.com/sharedfiles/filedetails/?id=3026842601))
 
 
-4. There should be a folder named `depot_253232`. Rename it to HatinTime_AP and move it to your `steamapps/common` folder.
+4. Once the game finishes downloading, start it up.  
+   In Game Settings, make sure **Enable Developer Console** is checked.
 
 
-5. In the HatinTime_AP folder, navigate to `Binaries/Win64` and create a new file: `steam_appid.txt`. 
-In this new text file, input the number **253230** on the first line.
-
-
-6. Create a shortcut of `HatinTimeGame.exe` from that folder and move it to wherever you'd like. 
-You will use this shortcut to open the Archipelago-compatible version of A Hat in Time.
-
-
-7. Start up the game using your new shortcut. To confirm if you are on the correct version, 
-go to Settings -> Game Settings. If you don't see an option labelled ***Live Game Events*** you should be running 
-the correct version of the game. In Game Settings, make sure ***Enable Developer Console*** is checked.
+5. You should now be good to go. See below for more details on how to use the mod and connect to an Archipelago game.
 
 
 ## Connecting to the Archipelago server
 
-To connect to the multiworld server, simply run the **ArchipelagoAHITClient** 
-(or run it from the Launcher if you have the apworld installed) and connect it to the Archipelago server. 
+To connect to the multiworld server, simply run the **Archipelago AHIT Client** from the Launcher
+and connect it to the Archipelago server. 
 The game will connect to the client automatically when you create a new save file.
 
 
@@ -61,33 +49,8 @@ make sure ***Enable Developer Console*** is checked in Game Settings and press t
 
 
 ## FAQ/Common Issues
-### I followed the setup, but I receive an odd error message upon starting the game or creating a save file!
-If you receive an error message such as 
-**"Failed to find default engine .ini to retrieve My Documents subdirectory to use. Force quitting."** or
-**"Failed to load map "hub_spaceship"** after booting up the game or creating a save file respectively, then the depot
-download was likely corrupted. The only way to fix this is to start the entire download all over again.
-Unfortunately, this appears to be an underlying issue with Steam's depot downloader. The only way to really prevent this
-from happening is to ensure that your connection is not interrupted or slowed while downloading.
 
-### The game keeps crashing on startup after the splash screen!
-This issue is unfortunately very hard to fix, and the underlying cause is not known. If it does happen however,
-try the following:
-
-- Close Steam **entirely**.
-- Open the downpatched version of the game (with Steam closed) and allow it to load to the titlescreen.
-- Close the game, and then open Steam again. 
-- After launching the game, the issue should hopefully disappear. If not, repeat the above steps until it does.
-
-### I followed the setup, but "Live Game Events" still shows up in the options menu!
-The most common cause of this is the `steam_appid.txt` file. If you're on Windows 10, file extensions are hidden by 
-default (thanks Microsoft). You likely made the mistake of still naming the file `steam_appid.txt`, which, since file 
-extensions are hidden, would result in the file being named `steam_appid.txt.txt`, which is incorrect. 
-To show file extensions in Windows 10, open any folder, click the View tab at the top, and check
-"File name extensions". Then you can correct the name of the file. If the name of the file is correct, 
-and you're still running into the issue, re-read the setup guide again in case you missed a step. 
-If you still can't get it to work, ask for help in the Discord thread.
-
-### The game is running on the older version, but it's not connecting when starting a new save!
+### The game is not connecting when starting a new save!
 For unknown reasons, the mod will randomly disable itself in the mod menu. To fix this, go to the Mods menu 
 (rocket icon) in-game, and re-enable the mod.
 

From 5fb1ebdcfd4a9adaaf7d655492069649c9de0482 Mon Sep 17 00:00:00 2001
From: Tsukino <16899482+Tsukino-uwu@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:30:23 +0200
Subject: [PATCH 11/21] Docs: Add Swedish Guide for Pokemon Emerald (#3252)

* Docs: Add Swedish Guide for Pokemon Emerald

Swedish Translation

* v2

some proof reading & clarification changes

* v3

* v4

* v5

typo

* v6

* Update worlds/pokemon_emerald/docs/setup_sv.md

Co-authored-by: Bryce Wilson <gyroscope15@gmail.com>

* Update worlds/pokemon_emerald/docs/setup_sv.md

Co-authored-by: Bryce Wilson <gyroscope15@gmail.com>

* v7

Tried to reduce the length of lines, this should still convey the same message/meaning

* typo

* v8

Removed Leading/Trailing Spaces

* typo v2

* Added a couple of full stops.

* lowercase typos

* Update setup_sv.md

* Apply suggestions from code review

Co-authored-by: Bryce Wilson <gyroscope15@gmail.com>

---------

Co-authored-by: Bryce Wilson <gyroscope15@gmail.com>
Co-authored-by: bittersweetrin <chandraherbozo@gmail.com>
---
 worlds/pokemon_emerald/__init__.py      | 11 +++-
 worlds/pokemon_emerald/docs/setup_sv.md | 78 +++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 worlds/pokemon_emerald/docs/setup_sv.md

diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py
index aa4f6ccf75..abdee26f57 100644
--- a/worlds/pokemon_emerald/__init__.py
+++ b/worlds/pokemon_emerald/__init__.py
@@ -52,8 +52,17 @@ class PokemonEmeraldWebWorld(WebWorld):
         "setup/es",
         ["nachocua"]
     )
+    
+    setup_sv = Tutorial(
+        "Multivärld Installations Guide",
+        "En guide för att kunna spela Pokémon Emerald med Archipelago.",
+        "Svenska",
+        "setup_sv.md",
+        "setup/sv",
+        ["Tsukino"]
+    )
 
-    tutorials = [setup_en, setup_es]
+    tutorials = [setup_en, setup_es, setup_sv]
 
 
 class PokemonEmeraldSettings(settings.Group):
diff --git a/worlds/pokemon_emerald/docs/setup_sv.md b/worlds/pokemon_emerald/docs/setup_sv.md
new file mode 100644
index 0000000000..88b1d38409
--- /dev/null
+++ b/worlds/pokemon_emerald/docs/setup_sv.md
@@ -0,0 +1,78 @@
+# Pokémon Emerald Installationsguide
+
+## Programvara som behövs
+
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
+- Ett engelskt Pokémon Emerald ROM, Archipelago kan inte hjälpa dig med detta.
+- [BizHawk](https://tasvideos.org/BizHawk/ReleaseHistory) 2.7 eller senare
+
+### Konfigurera BizHawk
+
+När du har installerat BizHawk, öppna `EmuHawk.exe` och ändra följande inställningar:
+
+- Om du använder BizHawk 2.7 eller 2.8, gå till `Config > Customize`. På "Advanced Tab", byt Lua core från
+`NLua+KopiLua` till `Lua+LuaInterface`, starta om EmuHawk efteråt. (Använder du BizHawk 2.9, kan du skippa detta steg.)
+- Gå till `Config > Customize`. Markera "Run in background" inställningen för att förhindra bortkoppling från
+klienten om du alt-tabbar bort från EmuHawk.
+- Öppna en `.gba` fil i EmuHawk och gå till `Config > Controllers…` för att konfigurera dina inputs.
+Om du inte hittar `Controllers…`, starta ett valfritt `.gba` ROM först.
+- Överväg att rensa keybinds i `Config > Hotkeys…` som du inte tänkt använda. Välj en keybind och tryck på ESC
+för att rensa bort den.
+
+## Extra programvara
+
+- [Pokémon Emerald AP Tracker](https://github.com/seto10987/Archipelago-Emerald-AP-Tracker/releases/latest),
+används tillsammans med
+[PopTracker](https://github.com/black-sliver/PopTracker/releases)
+
+## Generera och patcha ett spel
+
+1. Skapa din konfigurationsfil (YAML). Du kan göra en via att använda
+[Pokémon Emerald options hemsida](../../../games/Pokemon%20Emerald/player-options).
+2. Följ de allmänna Archipelago instruktionerna för att
+[Generera ett spel](../../Archipelago/setup/en#generating-a-game).
+Detta kommer generera en fil för dig. Din patchfil kommer ha `.apemerald` som sitt filnamnstillägg.
+3. Öppna `ArchipelagoLauncher.exe`
+4. Välj "Open Patch" på vänstra sidan, och välj din patchfil.
+5. Om detta är första gången du patchar, så kommer du behöva välja var ditt ursprungliga ROM är.
+6. En patchad `.gba` fil kommer skapas på samma plats som patchfilen.
+7. Första gången du öppnar en patch med BizHawk-klienten, kommer du också behöva bekräfta var `EmuHawk.exe` filen är
+installerad i din BizHawk-mapp.
+
+Om du bara tänkt spela själv och du inte bryr dig om automatisk spårning eller ledtrådar, så kan du stanna här, stänga
+av klienten, och starta ditt patchade ROM med valfri emulator. Dock, för multvärldsfunktionen eller andra
+Archipelago-funktioner, fortsätt nedanför med BizHawk.
+
+## Anslut till en server
+
+Om du vanligtsvis öppnar en patchad fil så görs steg 1-5 automatiskt åt dig. Även om det är så, kom ihåg dessa steg
+ifall du till exempel behöver stänga ner och starta om något medans du spelar.
+
+1. Pokemon Emerald använder Archipelagos BizHawk-klient. Om klienten inte startat efter att du patchat ditt spel,
+så kan du bara öppna den igen från launchern.
+2. Dubbelkolla att EmuHawk faktiskt startat med den patchade ROM-filen.
+3. I EmuHawk, gå till `Tools > Lua Console`. Luakonsolen måste vara igång medans du spelar.
+4. I Luakonsolen, Tryck på `Script > Open Script…`.
+5. Leta reda på din Archipelago-mapp och i den öppna `data/lua/connector_bizhawk_generic.lua`.
+6. Emulatorn och klienten kommer så småningom ansluta till varandra. I BizHawk-klienten kommer du kunna see om allt är
+anslutet och att Pokemon Emerald är igenkänt.
+7. För att ansluta klienten till en server, skriv in din lobbyadress och port i textfältet t.ex.
+`archipelago.gg:38281`
+längst upp i din klient och tryck sen på "Connect".
+
+Du borde nu kunna ta emot och skicka föremål. Du behöver göra dom här stegen varje gång du vill ansluta igen. Det är
+helt okej att göra saker offline utan att behöva oroa sig; allt kommer att synkronisera när du ansluter till servern
+igen.
+
+## Automatisk Spårning
+
+Pokémon Emerald har en fullt fungerande spårare med stöd för automatisk spårning.
+
+1. Ladda ner [Pokémon Emerald AP Tracker](https://github.com/seto10987/Archipelago-Emerald-AP-Tracker/releases/latest)
+och
+[PopTracker](https://github.com/black-sliver/PopTracker/releases).
+2. Placera tracker pack zip-filen i packs/ där du har PopTracker installerat.
+3. Öppna PopTracker, och välj Pokemon Emerald.
+4. För att automatiskt spåra, tryck på "AP" symbolen längst upp.
+5. Skriv in Archipelago-serverns uppgifter (Samma som du använde för att ansluta med klienten), "Slot"-namn samt
+lösenord.

From 79843803cf3a2547390f6e139be9c229a77d370b Mon Sep 17 00:00:00 2001
From: qwint <qwint.42@gmail.com>
Date: Thu, 25 Jul 2024 16:01:22 -0500
Subject: [PATCH 12/21] Docs: Add header to FAQ doc referencing other relevant
 docs (#3692)

* Add header to FAQ doc referencing other relevant docs

* Update docs/apworld_dev_faq.md

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

* Update docs/apworld_dev_faq.md

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

---------

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

diff --git a/docs/apworld_dev_faq.md b/docs/apworld_dev_faq.md
index 059c33844f..71e2e4152e 100644
--- a/docs/apworld_dev_faq.md
+++ b/docs/apworld_dev_faq.md
@@ -1,6 +1,8 @@
 # APWorld Dev FAQ
 
 This document is meant as a reference tool to show solutions to common problems when developing an apworld.
+It is not intended to answer every question about Archipelago and it assumes you have read the other docs, 
+including [Contributing](contributing.md), [Adding Games](<adding games.md>), and [World API](<world api.md>).
 
 ---
 

From b6e5223aa27bd77217897bcad41645b6645a6969 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:02:25 -0400
Subject: [PATCH 13/21] Docs: Expanding on the answers in the FAQ (#3690)

* Expand on some existing answers

* Oops

* Sphere "one"

* Removing while

* Update docs/apworld_dev_faq.md

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

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---
 docs/apworld_dev_faq.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/apworld_dev_faq.md b/docs/apworld_dev_faq.md
index 71e2e4152e..8d9429afa3 100644
--- a/docs/apworld_dev_faq.md
+++ b/docs/apworld_dev_faq.md
@@ -8,12 +8,18 @@ including [Contributing](contributing.md), [Adding Games](<adding games.md>), an
 
 ### My game has a restrictive start that leads to fill errors
 
-Hint to the Generator that an item needs to be in sphere one with local_early_items
+Hint to the Generator that an item needs to be in sphere one with local_early_items. Here, `1` represents the number of "Sword" items to attempt to place in sphere one.
 ```py
 early_item_name = "Sword"
 self.multiworld.local_early_items[self.player][early_item_name] = 1
 ```
 
+Some alternative ways to try to fix this problem are:
+* Add more locations to sphere one of your world, potentially only when there would be a restrictive start
+* Pre-place items yourself, such as during `create_items`
+* Put items into the player's starting inventory using `push_precollected`
+* Raise an exception, such as an `OptionError` during `generate_early`, to disallow options that would lead to a restrictive start
+
 ---
 
 ### I have multiple settings that change the item/location pool counts and need to balance them out
@@ -27,8 +33,13 @@ Note: to use self.create_filler(), self.get_filler_item_name() should be defined
 total_locations = len(self.multiworld.get_unfilled_locations(self.player))
 item_pool = self.create_non_filler_items()
 
-while len(item_pool) < total_locations:
+for _ in range(total_locations - len(item_pool)):
     item_pool.append(self.create_filler())
 
 self.multiworld.itempool += item_pool
 ```
+
+A faster alternative to the `for` loop would be to use a [list comprehension](https://docs.python.org/3/tutorial/datastructures.html#list-comprehensions):
+```py
+item_pool += [self.create_filler() for _ in range(total_locations - len(item_pool))]
+```

From d030a698a6824ec960fdcba40383d38991f82812 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 25 Jul 2024 17:09:37 -0400
Subject: [PATCH 14/21] Lingo: Changed minimum progression requirement (#3672)

---
 worlds/lingo/__init__.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/worlds/lingo/__init__.py b/worlds/lingo/__init__.py
index 3b67617873..a1b8b7c1d4 100644
--- a/worlds/lingo/__init__.py
+++ b/worlds/lingo/__init__.py
@@ -9,7 +9,7 @@ from worlds.AutoWorld import WebWorld, World
 from .datatypes import Room, RoomEntrance
 from .items import ALL_ITEM_TABLE, ITEMS_BY_GROUP, TRAP_ITEMS, LingoItem
 from .locations import ALL_LOCATION_TABLE, LOCATIONS_BY_GROUP
-from .options import LingoOptions, lingo_option_groups
+from .options import LingoOptions, lingo_option_groups, SunwarpAccess, VictoryCondition
 from .player_logic import LingoPlayerLogic
 from .regions import create_regions
 
@@ -54,14 +54,17 @@ class LingoWorld(World):
     player_logic: LingoPlayerLogic
 
     def generate_early(self):
-        if not (self.options.shuffle_doors or self.options.shuffle_colors or self.options.shuffle_sunwarps):
+        if not (self.options.shuffle_doors or self.options.shuffle_colors or
+                (self.options.sunwarp_access >= SunwarpAccess.option_unlock and
+                 self.options.victory_condition == VictoryCondition.option_pilgrimage)):
             if self.multiworld.players == 1:
-                warning(f"{self.multiworld.get_player_name(self.player)}'s Lingo world doesn't have any progression"
-                        f" items. Please turn on Door Shuffle, Color Shuffle, or Sunwarp Shuffle if that doesn't seem"
-                        f" right.")
+                warning(f"{self.player_name}'s Lingo world doesn't have any progression items. Please turn on Door"
+                        f" Shuffle or Color Shuffle, or use item-blocked sunwarps with the Pilgrimage victory condition"
+                        f" if that doesn't seem right.")
             else:
-                raise OptionError(f"{self.multiworld.get_player_name(self.player)}'s Lingo world doesn't have any"
-                                  f" progression items. Please turn on Door Shuffle, Color Shuffle or Sunwarp Shuffle.")
+                raise OptionError(f"{self.player_name}'s Lingo world doesn't have any progression items. Please turn on"
+                                  f" Door Shuffle or Color Shuffle, or use item-blocked sunwarps with the Pilgrimage"
+                                  f" victory condition.")
 
         self.player_logic = LingoPlayerLogic(self)
 

From cc2216164489f89d78ac1e53aaa71b9dce04ac28 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 26 Jul 2024 04:53:11 -0400
Subject: [PATCH 15/21] Lingo: Add panels mode door shuffle (#3163)

* Created panels mode door shuffle

* Added some panel door item names

* Remove RUNT TURN panel door

Not really useful.

* Fix logic with First SIX related stuff

* Add group_doors to slot data

* Fix LEVEL 2 behavior with panels mode

* Fixed unit tests

* Fixed duplicate IDs from merge

* Just regenerated new IDs

* Fixed duplication of color and door group items

* Removed unnecessary unit test option

* Fix The Seeker being achievable without entrance door

* Fix The Observant being achievable without locked panels

* Added some more panel doors

* Added Progressive Suits Area

* Lingo: Fix Basement access with THE MASTER

* Added indirect conditions for MASTER-blocked entrances

* Fixed Incomparable achievement access

* Fix STAIRS panel logic

* Fix merge error with good items

* Is this clearer?

* DREAD and TURN LEARN

* Allow a weird edge case for reduced locations

Panels mode door shuffle + grouped doors + color shuffle + pilgrimage enabled is exactly the right number of items for reduced locations. Removing color shuffle also allows for disabling pilgrimage, adding sunwarp locking, or both, with a couple of locations left over.

* Prevent small sphere one on panels mode

* Added shuffle_doors aliases for old options

* Fixed a unit test

* Updated datafile

* Tweaked requirements for reduced locations

* Added player name to OptionError messages

* Update generated.dat
---
 worlds/lingo/__init__.py                 |   3 +-
 worlds/lingo/data/LL1.yaml               | 694 +++++++++++++++++++++--
 worlds/lingo/data/generated.dat          | Bin 136563 -> 148903 bytes
 worlds/lingo/data/ids.yaml               | 142 +++++
 worlds/lingo/datatypes.py                |  11 +
 worlds/lingo/items.py                    |  17 +-
 worlds/lingo/options.py                  |  29 +-
 worlds/lingo/player_logic.py             | 121 +++-
 worlds/lingo/rules.py                    |  10 +-
 worlds/lingo/static_logic.py             |  32 +-
 worlds/lingo/test/TestDoors.py           |  56 +-
 worlds/lingo/test/TestOptions.py         |  17 +-
 worlds/lingo/test/TestOrangeTower.py     |   2 +-
 worlds/lingo/test/TestPanelsanity.py     |   2 +-
 worlds/lingo/test/TestPilgrimage.py      |   8 +-
 worlds/lingo/test/TestProgressive.py     |   7 +-
 worlds/lingo/test/TestSunwarps.py        |  21 +-
 worlds/lingo/utils/assign_ids.rb         |  40 ++
 worlds/lingo/utils/pickle_static_data.py | 124 +++-
 worlds/lingo/utils/validate_config.rb    |  88 ++-
 20 files changed, 1274 insertions(+), 150 deletions(-)

diff --git a/worlds/lingo/__init__.py b/worlds/lingo/__init__.py
index a1b8b7c1d4..9853be73fa 100644
--- a/worlds/lingo/__init__.py
+++ b/worlds/lingo/__init__.py
@@ -170,7 +170,8 @@ class LingoWorld(World):
         slot_options = [
             "death_link", "victory_condition", "shuffle_colors", "shuffle_doors", "shuffle_paintings", "shuffle_panels",
             "enable_pilgrimage", "sunwarp_access", "mastery_achievements", "level_2_requirement", "location_checks",
-            "early_color_hallways", "pilgrimage_allows_roof_access", "pilgrimage_allows_paintings", "shuffle_sunwarps"
+            "early_color_hallways", "pilgrimage_allows_roof_access", "pilgrimage_allows_paintings", "shuffle_sunwarps",
+            "group_doors"
         ]
 
         slot_data = {
diff --git a/worlds/lingo/data/LL1.yaml b/worlds/lingo/data/LL1.yaml
index 3035446ef7..1c9f4e551d 100644
--- a/worlds/lingo/data/LL1.yaml
+++ b/worlds/lingo/data/LL1.yaml
@@ -1,6 +1,13 @@
 ---
   # This file is an associative array where the keys are region names. Rooms
-  # have four properties: entrances, panels, doors, and paintings.
+  # have a number of properties:
+  # - entrances
+  # - panels
+  # - doors
+  # - panel_doors
+  # - paintings
+  # - progression
+  # - sunwarps
   #
   # entrances is an array of regions from which this room can be accessed. The
   # key of each entry is the room that can access this one. The value is a list
@@ -13,7 +20,7 @@
   # room that the door is in. The room name may be omitted if the door is
   # located in the current room.
   #
-  # panels is an array of panels in the room. The key of the array is an
+  # panels is a named array of panels in the room. The key of the array is an
   # arbitrary name for the panel. Panels can have the following fields:
   # - id:            The internal ID of the panel in the LINGO map
   # - required_room: In addition to having access to this room, the player must
@@ -45,7 +52,7 @@
   # - hunt:          If True, the tracker will show this panel even when it is
   #                  not a check. Used for hunts like the Number Hunt.
   #
-  # doors is an array of doors associated with this room. When door
+  # doors is a named array of doors associated with this room. When door
   # randomization is enabled, each of these is an item. The key is a name that
   # will be displayed as part of the item's name. Doors can have the following
   # fields:
@@ -78,6 +85,18 @@
   # - event:          Denotes that the door is event only. This is similar to
   #                   setting both skip_location and skip_item.
   #
+  # panel_doors is a named array of "panel doors" associated with this room.
+  # When panel door shuffle is enabled, each of these becomes an item, and those
+  # items block access to the listed panels. The key is a name for internal
+  # reference only. Panel doors can have the following fields:
+  # - panels:       Required. This is the set of panels that are blocked by this
+  #                 panel door.
+  # - item_name:    Overrides the name of the item generated for this panel
+  #                 door. If not specified, the item name will be generated from
+  #                 the room name and the name(s) of the panel(s).
+  # - panel_group:  When region grouping is enabled, all panel doors with the
+  #                 same group will be covered by a single item.
+  #
   # paintings is an array of paintings in the room. This is used for painting
   # shuffling.
   # - id:             The internal painting ID from the LINGO map.
@@ -105,6 +124,14 @@
   #                   fine in door shuffle mode.
   # - move:           Denotes that the painting is able to move.
   #
+  # progression is a named array of items that define an ordered set of items.
+  # progression items do not have any true connection to the rooms that they
+  # are defined in, but it is best to place them in a thematically appropriate
+  # room. The key for a progression entry is the name of the item that will be
+  # created. A progression entry is a dictionary with one or both of a "doors"
+  # key and a "panel_doors" key. These fields should be lists of doors or
+  # panel doors that will be contained in this progressive item.
+  #
   # sunwarps is an array of sunwarps in the room. This is used for sunwarp
   # shuffling.
   # - dots:                   The number of dots on this sunwarp.
@@ -193,6 +220,10 @@
             panel: RACECAR (Black)
           - room: The Tenacious
             panel: SOLOS (Black)
+    panel_doors:
+      HIDDEN:
+        panels:
+          - HIDDEN
     paintings:
       - id: arrows_painting
         exit_only: True
@@ -303,6 +334,10 @@
             panel: SOLOS (Black)
           - room: Hub Room
             panel: RAT
+    panel_doors:
+      OPEN:
+        panels:
+          - OPEN
     paintings:
       - id: owl_painting
         orientation: north
@@ -317,7 +352,13 @@
     panels:
       Achievement:
         id: Countdown Panels/Panel_seeker_seeker
-        required_room: Hidden Room
+        # The Seeker uniquely has the property that 1) it can be entered (through the Pilgrim Room) without opening the
+        # front door in panels mode door shuffle, and 2) the front door panel is part of the CDP. This necessitates this
+        # required_panel clause, because the entrance panel needs to be solvable for the achievement even if an
+        # alternate entrance to the room is used.
+        required_panel:
+          room: Hidden Room
+          panel: OPEN
         tag: forbid
         check: True
         achievement: The Seeker
@@ -537,6 +578,23 @@
         item_group: Achievement Room Entrances
         panels:
           - OPEN
+    panel_doors:
+      ORDER:
+        panels:
+          - ORDER
+      SLAUGHTER:
+        panel_group: Tenacious Entrance Panels
+        panels:
+          - SLAUGHTER
+      TRACE:
+        panels:
+          - TRACE
+      RAT:
+        panels:
+          - RAT
+      OPEN:
+        panels:
+          - OPEN
     paintings:
       - id: maze_painting
         orientation: west
@@ -608,12 +666,13 @@
         item_name: "6 Sunwarp"
     progression:
       Progressive Pilgrimage:
-        - 1 Sunwarp
-        - 2 Sunwarp
-        - 3 Sunwarp
-        - 4 Sunwarp
-        - 5 Sunwarp
-        - 6 Sunwarp
+        doors:
+          - 1 Sunwarp
+          - 2 Sunwarp
+          - 3 Sunwarp
+          - 4 Sunwarp
+          - 5 Sunwarp
+          - 6 Sunwarp
   Pilgrim Antechamber:
     # The entrances to this room are special. When pilgrimage is enabled, we use a special access rule to determine
     # whether a pilgrimage can succeed. When pilgrimage is disabled, the sun painting will be added to the pool.
@@ -881,6 +940,24 @@
             panel: READS + RUST
           - room: Ending Area
             panel: THE END
+    panel_doors:
+      DECAY:
+        panel_group: Tenacious Entrance Panels
+        panels:
+          - DECAY
+      NOPE:
+        panels:
+          - NOPE
+      WE ROT:
+        panels:
+          - WE ROT
+      WORDS SWORD:
+        panels:
+          - WORDS
+          - SWORD
+      BEND HI:
+        panels:
+          - BEND HI
     paintings:
       - id: eye_painting
         disable: True
@@ -895,6 +972,14 @@
         direction: exit
         entrance_indicator_pos: [ -17, 2.5, -41.01 ]
         orientation: north
+    progression:
+      Progressive Suits Area:
+        panel_doors:
+          - WORDS SWORD
+          - room: Lost Area
+            panel_door: LOST
+          - room: Amen Name Area
+            panel_door: AMEN NAME
   Lost Area:
     entrances:
       Outside The Agreeable:
@@ -920,6 +1005,11 @@
         panels:
           - LOST (1)
           - LOST (2)
+    panel_doors:
+      LOST:
+        panels:
+          - LOST (1)
+          - LOST (2)
   Amen Name Area:
     entrances:
       Crossroads:
@@ -953,6 +1043,11 @@
         panels:
           - AMEN
           - NAME
+    panel_doors:
+      AMEN NAME:
+        panels:
+          - AMEN
+          - NAME
   Suits Area:
     entrances:
       Amen Name Area:
@@ -1056,6 +1151,13 @@
           - LEVEL (White)
           - RACECAR (White)
           - SOLOS (White)
+    panel_doors:
+      Black Palindromes:
+        item_name: The Tenacious - Black Palindromes (Panels)
+        panels:
+          - LEVEL (Black)
+          - RACECAR (Black)
+          - SOLOS (Black)
   Near Far Area:
     entrances:
       Hub Room: True
@@ -1081,6 +1183,21 @@
         panels:
           - NEAR
           - FAR
+    panel_doors:
+      NEAR FAR:
+        item_name: Symmetry Room - NEAR, FAR (Panels)
+        panel_group: Symmetry Room Panels
+        panels:
+          - NEAR
+          - FAR
+    progression:
+      Progressive Symmetry Room:
+        panel_doors:
+          - NEAR FAR
+          - room: Warts Straw Area
+            panel_door: WARTS STRAW
+          - room: Leaf Feel Area
+            panel_door: LEAF FEEL
   Warts Straw Area:
     entrances:
       Near Far Area:
@@ -1108,6 +1225,13 @@
         panels:
           - WARTS
           - STRAW
+    panel_doors:
+      WARTS STRAW:
+        item_name: Symmetry Room - WARTS, STRAW (Panels)
+        panel_group: Symmetry Room Panels
+        panels:
+          - WARTS
+          - STRAW
   Leaf Feel Area:
     entrances:
       Warts Straw Area:
@@ -1135,6 +1259,13 @@
         panels:
           - LEAF
           - FEEL
+    panel_doors:
+      LEAF FEEL:
+        item_name: Symmetry Room - LEAF, FEEL (Panels)
+        panel_group: Symmetry Room Panels
+        panels:
+          - LEAF
+          - FEEL
   Outside The Agreeable:
     entrances:
       Crossroads:
@@ -1243,6 +1374,20 @@
         panels:
           - room: Color Hunt
             panel: PURPLE
+    panel_doors:
+      MASSACRED:
+        panel_group: Tenacious Entrance Panels
+        panels:
+          - MASSACRED
+      BLACK:
+        panels:
+          - BLACK
+      CLOSE:
+        panels:
+          - CLOSE
+      RIGHT:
+        panels:
+          - RIGHT
     paintings:
       - id: eyes_yellow_painting
         orientation: east
@@ -1294,6 +1439,14 @@
           - WINTER
           - DIAMONDS
           - FIRE
+    panel_doors:
+      Lookout:
+        item_name: Compass Room Panels
+        panels:
+          - NORTH
+          - WINTER
+          - DIAMONDS
+          - FIRE
     paintings:
       - id: pencil_painting7
         orientation: north
@@ -1510,6 +1663,10 @@
           - HIDE (3)
           - room: Outside The Agreeable
             panel: HIDE
+    panel_doors:
+      DOWN:
+        panels:
+          - DOWN
   The Perceptive:
     entrances:
       Starting Room:
@@ -1531,6 +1688,10 @@
         check: True
         exclude_reduce: True
         tag: botwhite
+    panel_doors:
+      GAZE:
+        panels:
+          - GAZE
     paintings:
       - id: garden_painting_tower
         orientation: north
@@ -1572,9 +1733,10 @@
           - EAT
     progression:
       Progressive Fearless:
-        - Second Floor
-        - room: The Fearless (Second Floor)
-          door: Third Floor
+        doors:
+          - Second Floor
+          - room: The Fearless (Second Floor)
+            door: Third Floor
   The Fearless (Second Floor):
     entrances:
       The Fearless (First Floor):
@@ -1669,6 +1831,10 @@
         tag: forbid
         required_door:
           door: Stairs
+        required_panel:
+          - panel: FOUR (1)
+          - panel: FOUR (2)
+          - panel: SIX
         achievement: The Observant
       FOUR (1):
         id: Look Room/Panel_four_back
@@ -1782,6 +1948,16 @@
         door_group: Observant Doors
         panels:
           - SIX
+    panel_doors:
+      BACKSIDE:
+        item_name: The Observant - Backside Entrance Panels
+        panel_group: Backside Entrance Panels
+        panels:
+          - FOUR (1)
+          - FOUR (2)
+      STAIRS:
+        panels:
+          - SIX
   The Incomparable:
     entrances:
       The Observant:
@@ -1798,9 +1974,12 @@
         check: True
         tag: forbid
         required_room:
-          - Elements Area
-          - Courtyard
           - Eight Room
+        required_panel:
+          - room: Courtyard
+            panel: I
+          - room: Elements Area
+            panel: A
         achievement: The Incomparable
       A (One):
         id: Strand Room/Panel_blank_a
@@ -1865,6 +2044,15 @@
             panel: I
           - room: Elements Area
             panel: A
+    panel_doors:
+      Giant Sevens:
+        item_name: Giant Seven Panels
+        panels:
+          - I (Seven)
+          - room: Courtyard
+            panel: I
+          - room: Elements Area
+            panel: A
     paintings:
       - id: crown_painting
         orientation: east
@@ -1972,14 +2160,31 @@
             panel: DRAWL + RUNS
           - room: Owl Hallway
             panel: READS + RUST
+    panel_doors:
+      Access:
+        item_name: Orange Tower Panels
+        panels:
+          - room: Orange Tower First Floor
+            panel: DADS + ALE
+          - room: Outside The Undeterred
+            panel: ART + ART
+          - room: Orange Tower Third Floor
+            panel: DEER + WREN
+          - room: Orange Tower Fourth Floor
+            panel: LEARNS + UNSEW
+          - room: Orange Tower Fifth Floor
+            panel: DRAWL + RUNS
+          - room: Owl Hallway
+            panel: READS + RUST
     progression:
       Progressive Orange Tower:
-        - Second Floor
-        - Third Floor
-        - Fourth Floor
-        - Fifth Floor
-        - Sixth Floor
-        - Seventh Floor
+        doors:
+          - Second Floor
+          - Third Floor
+          - Fourth Floor
+          - Fifth Floor
+          - Sixth Floor
+          - Seventh Floor
   Orange Tower First Floor:
     entrances:
       Hub Room:
@@ -2022,6 +2227,10 @@
           - SALT
           - room: Directional Gallery
             panel: PEPPER
+    panel_doors:
+      SECRET:
+        panels:
+          - SECRET
     sunwarps:
       - dots: 4
         direction: enter
@@ -2174,6 +2383,10 @@
         id: Shuffle Room Area Doors/Door_hotcrust_shortcuts
         panels:
           - HOT CRUSTS
+    panel_doors:
+      HOT CRUSTS:
+        panels:
+          - HOT CRUSTS
     sunwarps:
       - dots: 5
         direction: enter
@@ -2288,6 +2501,12 @@
         panels:
           - SIZE (Small)
           - SIZE (Big)
+    panel_doors:
+      SIZE:
+        item_name: Orange Tower Fifth Floor - SIZE Panels
+        panels:
+          - SIZE (Small)
+          - SIZE (Big)
     paintings:
       - id: hi_solved_painting3
         orientation: south
@@ -2631,6 +2850,15 @@
           - SECOND
           - THIRD
           - FOURTH
+    panel_doors:
+      FIRST SECOND THIRD FOURTH:
+        item_name: Courtyard - Ordinal Panels
+        panel_group: Backside Entrance Panels
+        panels:
+          - FIRST
+          - SECOND
+          - THIRD
+          - FOURTH
   The Colorful (White):
     entrances:
       Courtyard: True
@@ -2648,6 +2876,12 @@
         location_name: The Colorful - White
         panels:
           - BEGIN
+    panel_doors:
+      BEGIN:
+        item_name: The Colorful - BEGIN (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - BEGIN
   The Colorful (Black):
     entrances:
       The Colorful (White):
@@ -2668,6 +2902,12 @@
         door_group: Colorful Doors
         panels:
           - FOUND
+    panel_doors:
+      FOUND:
+        item_name: The Colorful - FOUND (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - FOUND
   The Colorful (Red):
     entrances:
       The Colorful (Black):
@@ -2688,6 +2928,12 @@
         door_group: Colorful Doors
         panels:
           - LOAF
+    panel_doors:
+      LOAF:
+        item_name: The Colorful - LOAF (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - LOAF
   The Colorful (Yellow):
     entrances:
       The Colorful (Red):
@@ -2708,6 +2954,12 @@
         door_group: Colorful Doors
         panels:
           - CREAM
+    panel_doors:
+      CREAM:
+        item_name: The Colorful - CREAM (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - CREAM
   The Colorful (Blue):
     entrances:
       The Colorful (Yellow):
@@ -2728,6 +2980,12 @@
         door_group: Colorful Doors
         panels:
           - SUN
+    panel_doors:
+      SUN:
+        item_name: The Colorful - SUN (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - SUN
   The Colorful (Purple):
     entrances:
       The Colorful (Blue):
@@ -2748,6 +3006,12 @@
         door_group: Colorful Doors
         panels:
           - SPOON
+    panel_doors:
+      SPOON:
+        item_name: The Colorful - SPOON (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - SPOON
   The Colorful (Orange):
     entrances:
       The Colorful (Purple):
@@ -2768,6 +3032,12 @@
         door_group: Colorful Doors
         panels:
           - LETTERS
+    panel_doors:
+      LETTERS:
+        item_name: The Colorful - LETTERS (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - LETTERS
   The Colorful (Green):
     entrances:
       The Colorful (Orange):
@@ -2788,6 +3058,12 @@
         door_group: Colorful Doors
         panels:
           - WALLS
+    panel_doors:
+      WALLS:
+        item_name: The Colorful - WALLS (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - WALLS
   The Colorful (Brown):
     entrances:
       The Colorful (Green):
@@ -2808,6 +3084,12 @@
         door_group: Colorful Doors
         panels:
           - IRON
+    panel_doors:
+      IRON:
+        item_name: The Colorful - IRON (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - IRON
   The Colorful (Gray):
     entrances:
       The Colorful (Brown):
@@ -2828,6 +3110,12 @@
         door_group: Colorful Doors
         panels:
           - OBSTACLE
+    panel_doors:
+      OBSTACLE:
+        item_name: The Colorful - OBSTACLE (Panel)
+        panel_group: Colorful Panels
+        panels:
+          - OBSTACLE
   The Colorful:
     entrances:
       The Colorful (Gray):
@@ -2866,26 +3154,48 @@
         orientation: north
     progression:
       Progressive Colorful:
-        - room: The Colorful (White)
-          door: Progress Door
-        - room: The Colorful (Black)
-          door: Progress Door
-        - room: The Colorful (Red)
-          door: Progress Door
-        - room: The Colorful (Yellow)
-          door: Progress Door
-        - room: The Colorful (Blue)
-          door: Progress Door
-        - room: The Colorful (Purple)
-          door: Progress Door
-        - room: The Colorful (Orange)
-          door: Progress Door
-        - room: The Colorful (Green)
-          door: Progress Door
-        - room: The Colorful (Brown)
-          door: Progress Door
-        - room: The Colorful (Gray)
-          door: Progress Door
+        doors:
+          - room: The Colorful (White)
+            door: Progress Door
+          - room: The Colorful (Black)
+            door: Progress Door
+          - room: The Colorful (Red)
+            door: Progress Door
+          - room: The Colorful (Yellow)
+            door: Progress Door
+          - room: The Colorful (Blue)
+            door: Progress Door
+          - room: The Colorful (Purple)
+            door: Progress Door
+          - room: The Colorful (Orange)
+            door: Progress Door
+          - room: The Colorful (Green)
+            door: Progress Door
+          - room: The Colorful (Brown)
+            door: Progress Door
+          - room: The Colorful (Gray)
+            door: Progress Door
+        panel_doors:
+          - room: The Colorful (White)
+            panel_door: BEGIN
+          - room: The Colorful (Black)
+            panel_door: FOUND
+          - room: The Colorful (Red)
+            panel_door: LOAF
+          - room: The Colorful (Yellow)
+            panel_door: CREAM
+          - room: The Colorful (Blue)
+            panel_door: SUN
+          - room: The Colorful (Purple)
+            panel_door: SPOON
+          - room: The Colorful (Orange)
+            panel_door: LETTERS
+          - room: The Colorful (Green)
+            panel_door: WALLS
+          - room: The Colorful (Brown)
+            panel_door: IRON
+          - room: The Colorful (Gray)
+            panel_door: OBSTACLE
   Welcome Back Area:
     entrances:
       Starting Room:
@@ -2958,6 +3268,10 @@
         door_group: Hedge Maze Doors
         panels:
           - STRAYS
+    panel_doors:
+      STRAYS:
+        panels:
+          - STRAYS
     paintings:
       - id: arrows_painting_8
         orientation: south
@@ -3155,6 +3469,13 @@
             panel: I
           - room: Elements Area
             panel: A
+    panel_doors:
+      UNCOVER:
+        panels:
+          - UNCOVER
+      OXEN:
+        panels:
+          - OXEN
     paintings:
       - id: clock_painting_5
         orientation: east
@@ -3524,6 +3845,13 @@
           - RISE (Sunrise)
           - ZEN
           - SON
+    panel_doors:
+      UNOPEN:
+        panels:
+          - UNOPEN
+      BEGIN:
+        panels:
+          - BEGIN
     paintings:
       - id: pencil_painting2
         orientation: west
@@ -3819,6 +4147,34 @@
         item_group: Achievement Room Entrances
         panels:
           - ZERO
+    panel_doors:
+      ZERO:
+        panels:
+          - ZERO
+      PEN:
+        panels:
+          - PEN
+      TWO:
+        item_name: Two Panels
+        panels:
+          - TWO (1)
+          - TWO (2)
+      THREE:
+        item_name: Three Panels
+        panels:
+          - THREE (1)
+          - THREE (2)
+          - THREE (3)
+      FOUR:
+        item_name: Four Panels
+        panels:
+          - FOUR
+          - room: Hub Room
+            panel: FOUR
+          - room: Dead End Area
+            panel: FOUR
+          - room: The Traveled
+            panel: FOUR
     paintings:
       - id: maze_painting_3
         enter_only: True
@@ -3994,6 +4350,10 @@
             panel: FIVE (1)
           - room: Directional Gallery
             panel: FIVE (2)
+      First Six:
+        event: True
+        panels:
+          - SIX
       Sevens:
         id:
           - Count Up Room Area Doors/Door_seven_hider
@@ -4102,12 +4462,109 @@
             panel: NINE
           - room: Elements Area
             panel: NINE
+    panel_doors:
+      FIVE:
+        item_name: Five Panels
+        panels:
+          - FIVE
+          - room: Outside The Agreeable
+            panel: FIVE (1)
+          - room: Outside The Agreeable
+            panel: FIVE (2)
+          - room: Directional Gallery
+            panel: FIVE (1)
+          - room: Directional Gallery
+            panel: FIVE (2)
+      SIX:
+        item_name: Six Panels
+        panels:
+          - SIX
+          - room: Outside The Bold
+            panel: SIX
+          - room: Directional Gallery
+            panel: SIX (1)
+          - room: Directional Gallery
+            panel: SIX (2)
+          - room: The Bearer (East)
+            panel: SIX
+          - room: The Bearer (South)
+            panel: SIX
+      SEVEN:
+        item_name: Seven Panels
+        panels:
+          - SEVEN
+          - room: Directional Gallery
+            panel: SEVEN
+          - room: Knight Night Exit
+            panel: SEVEN (1)
+          - room: Knight Night Exit
+            panel: SEVEN (2)
+          - room: Knight Night Exit
+            panel: SEVEN (3)
+          - room: Outside The Initiated
+            panel: SEVEN (1)
+          - room: Outside The Initiated
+            panel: SEVEN (2)
+      EIGHT:
+        item_name: Eight Panels
+        panels:
+          - EIGHT
+          - room: Directional Gallery
+            panel: EIGHT
+          - room: The Eyes They See
+            panel: EIGHT
+          - room: Dead End Area
+            panel: EIGHT
+          - room: Crossroads
+            panel: EIGHT
+          - room: Hot Crusts Area
+            panel: EIGHT
+          - room: Art Gallery
+            panel: EIGHT
+          - room: Outside The Initiated
+            panel: EIGHT
+      NINE:
+        item_name: Nine Panels
+        panels:
+          - NINE
+          - room: Directional Gallery
+            panel: NINE
+          - room: Amen Name Area
+            panel: NINE
+          - room: Yellow Backside Area
+            panel: NINE
+          - room: Outside The Initiated
+            panel: NINE
+          - room: Outside The Bold
+            panel: NINE
+          - room: Rhyme Room (Cross)
+            panel: NINE
+          - room: Orange Tower Fifth Floor
+            panel: NINE
+          - room: Elements Area
+            panel: NINE
     paintings:
       - id: smile_painting_5
         enter_only: True
         orientation: east
         required_door:
           door: Eights
+    progression:
+      Progressive Number Hunt:
+        panel_doors:
+          - room: Outside The Undeterred
+            panel_door: TWO
+          - room: Outside The Undeterred
+            panel_door: THREE
+          - room: Outside The Undeterred
+            panel_door: FOUR
+          - FIVE
+          - SIX
+          - SEVEN
+          - EIGHT
+          - NINE
+          - room: Outside The Undeterred
+            panel_door: ZERO
   Directional Gallery:
     entrances:
       Outside The Agreeable:
@@ -4195,7 +4652,7 @@
         tag: midorange
         required_door:
           room: Number Hunt
-          door: Sixes
+          door: First Six
       PARANOID:
         id: Backside Room/Panel_paranoid_paranoid
         tag: midwhite
@@ -4203,7 +4660,7 @@
         exclude_reduce: True
         required_door:
           room: Number Hunt
-          door: Sixes
+          door: First Six
       YELLOW:
         id: Color Arrow Room/Panel_yellow_afar
         tag: midwhite
@@ -4266,6 +4723,11 @@
         panels:
           - room: Color Hunt
             panel: YELLOW
+    panel_doors:
+      TURN LEARN:
+        panels:
+          - TURN
+          - LEARN
     paintings:
       - id: smile_painting_7
         orientation: south
@@ -4277,7 +4739,7 @@
         move: True
         required_door:
           room: Number Hunt
-          door: Sixes
+          door: First Six
       - id: boxes_painting
         orientation: south
       - id: cherry_painting
@@ -4344,6 +4806,34 @@
         id: Rock Room Doors/Door_hint
         panels:
           - EXIT
+    panel_doors:
+      EXIT:
+        panels:
+          - EXIT
+      RED:
+        panel_group: Color Hunt Panels
+        panels:
+          - RED
+      BLUE:
+        panel_group: Color Hunt Panels
+        panels:
+          - BLUE
+      YELLOW:
+        panel_group: Color Hunt Panels
+        panels:
+          - YELLOW
+      ORANGE:
+        panel_group: Color Hunt Panels
+        panels:
+          - ORANGE
+      PURPLE:
+        panel_group: Color Hunt Panels
+        panels:
+          - PURPLE
+      GREEN:
+        panel_group: Color Hunt Panels
+        panels:
+          - GREEN
     paintings:
       - id: arrows_painting_7
         orientation: east
@@ -4481,6 +4971,14 @@
         event: True
         panels:
           - HEART
+    panel_doors:
+      FARTHER:
+        panel_group: Backside Entrance Panels
+        panels:
+          - FARTHER
+      MIDDLE:
+        panels:
+          - MIDDLE
   The Bearer (East):
     entrances:
       Cross Tower (East): True
@@ -5333,6 +5831,11 @@
         item_name: Knight Night Room - Exit
         panels:
           - TRUSTED
+    panel_doors:
+      TRUSTED:
+        item_name: Knight Night Room - TRUSTED (Panel)
+        panels:
+          - TRUSTED
   Knight Night Exit:
     entrances:
       Knight Night (Outer Ring):
@@ -6017,6 +6520,10 @@
         item_group: Achievement Room Entrances
         panels:
           - SHRINK
+    panel_doors:
+      SHRINK:
+        panels:
+          - SHRINK
   The Wondrous (Doorknob):
     entrances:
       Outside The Wondrous:
@@ -6228,18 +6735,36 @@
           - KEEP
           - BAILEY
           - TOWER
+    panel_doors:
+      CASTLE:
+        item_name: Hallway Room - First Room Panels
+        panel_group: Hallway Room Panels
+        panels:
+          - WALL
+          - KEEP
+          - BAILEY
+          - TOWER
     paintings:
       - id: panda_painting
         orientation: south
     progression:
       Progressive Hallway Room:
-        - Exit
-        - room: Hallway Room (2)
-          door: Exit
-        - room: Hallway Room (3)
-          door: Exit
-        - room: Hallway Room (4)
-          door: Exit
+        doors:
+          - Exit
+          - room: Hallway Room (2)
+            door: Exit
+          - room: Hallway Room (3)
+            door: Exit
+          - room: Hallway Room (4)
+            door: Exit
+        panel_doors:
+          - CASTLE
+          - room: Hallway Room (2)
+            panel_door: COUNTERCLOCKWISE
+          - room: Hallway Room (3)
+            panel_door: TRANSFORMATION
+          - room: Hallway Room (4)
+            panel_door: WHEELBARROW
   Hallway Room (2):
     entrances:
       Hallway Room (1):
@@ -6278,6 +6803,15 @@
           - CLOCK
           - ER
           - COUNT
+    panel_doors:
+      COUNTERCLOCKWISE:
+        item_name: Hallway Room - Second Room Panels
+        panel_group: Hallway Room Panels
+        panels:
+          - WISE
+          - CLOCK
+          - ER
+          - COUNT
   Hallway Room (3):
     entrances:
       Hallway Room (2):
@@ -6316,6 +6850,15 @@
           - FORM
           - A
           - SHUN
+    panel_doors:
+      TRANSFORMATION:
+        item_name: Hallway Room - Third Room Panels
+        panel_group: Hallway Room Panels
+        panels:
+          - TRANCE
+          - FORM
+          - A
+          - SHUN
   Hallway Room (4):
     entrances:
       Hallway Room (3):
@@ -6338,6 +6881,12 @@
         panels:
           - WHEEL
         include_reduce: True
+    panel_doors:
+      WHEELBARROW:
+        item_name: Hallway Room - WHEEL
+        panel_group: Hallway Room Panels
+        panels:
+          - WHEEL
   Elements Area:
     entrances:
       Roof: True
@@ -6412,6 +6961,10 @@
         panels:
           - room: The Wanderer
             panel: Achievement
+    panel_doors:
+      WANDERLUST:
+        panels:
+          - WANDERLUST
   The Wanderer:
     entrances:
       Outside The Wanderer:
@@ -6553,6 +7106,10 @@
         item_group: Achievement Room Entrances
         panels:
           - ORDER
+    panel_doors:
+      ORDER:
+        panels:
+          - ORDER
     paintings:
       - id: smile_painting_3
         orientation: west
@@ -6566,10 +7123,11 @@
         orientation: south
     progression:
       Progressive Art Gallery:
-        - Second Floor
-        - Third Floor
-        - Fourth Floor
-        - Fifth Floor
+        doors:
+          - Second Floor
+          - Third Floor
+          - Fourth Floor
+          - Fifth Floor
   Art Gallery (Second Floor):
     entrances:
       Art Gallery:
@@ -7281,8 +7839,8 @@
         id: Panel Room/Panel_broomed_bedroom
         colors: yellow
         tag: midyellow
-        required_door:
-          door: Excavation
+        required_panel:
+          panel: WALL (1)
       LAYS:
         id: Panel Room/Panel_lays_maze
         colors: purple
@@ -7309,13 +7867,24 @@
       Excavation:
         event: True
         panels:
-          - WALL (1)
+          - STAIRS
       Cellar Exit:
         id:
           - Tower Room Area Doors/Door_panel_basement
           - Tower Room Area Doors/Door_panel_basement2
         panels:
           - BASE
+    panel_doors:
+      STAIRS:
+        panel_group: Room Room Panels
+        panels:
+          - STAIRS
+      Colors:
+        panel_group: Room Room Panels
+        panels:
+          - BROOMED
+          - LAYS
+          - BASE
   Cellar:
     entrances:
       Room Room:
@@ -7354,6 +7923,11 @@
         panels:
           - KITTEN
           - CAT
+    panel_doors:
+      KITTEN CAT:
+        panels:
+          - KITTEN
+          - CAT
     paintings:
       - id: arrows_painting_2
         orientation: east
@@ -7608,6 +8182,10 @@
         item_group: Achievement Room Entrances
         panels:
           - OPEN
+    panel_doors:
+      OPEN:
+        panels:
+          - OPEN
   The Scientific:
     entrances:
       Outside The Scientific:
diff --git a/worlds/lingo/data/generated.dat b/worlds/lingo/data/generated.dat
index 4a751b25ec5f143b6b055fd2043a6543754ef5b1..d221b8168d9164576b3f1c5b2fc57c604da5f100 100644
GIT binary patch
delta 33771
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
C4N!Cd

delta 22989
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
S+u(A!<h23U56Uu`HU9_faYNGp

diff --git a/worlds/lingo/data/ids.yaml b/worlds/lingo/data/ids.yaml
index c49a8df363..b46f1d36ec 100644
--- a/worlds/lingo/data/ids.yaml
+++ b/worlds/lingo/data/ids.yaml
@@ -1478,3 +1478,145 @@ progression:
   Progressive Art Gallery: 444563
   Progressive Colorful: 444580
   Progressive Pilgrimage: 444583
+  Progressive Suits Area: 444602
+  Progressive Symmetry Room: 444608
+  Progressive Number Hunt: 444654
+panel_doors:
+  Starting Room:
+    HIDDEN: 444589
+  Hidden Room:
+    OPEN: 444590
+  Hub Room:
+    ORDER: 444591
+    SLAUGHTER: 444592
+    TRACE: 444594
+    RAT: 444595
+    OPEN: 444596
+  Crossroads:
+    DECAY: 444597
+    NOPE: 444598
+    WE ROT: 444599
+    WORDS SWORD: 444600
+    BEND HI: 444601
+  Lost Area:
+    LOST: 444603
+  Amen Name Area:
+    AMEN NAME: 444604
+  The Tenacious:
+    Black Palindromes: 444605
+  Near Far Area:
+    NEAR FAR: 444606
+  Warts Straw Area:
+    WARTS STRAW: 444609
+  Leaf Feel Area:
+    LEAF FEEL: 444610
+  Outside The Agreeable:
+    MASSACRED: 444611
+    BLACK: 444612
+    CLOSE: 444613
+    RIGHT: 444614
+  Compass Room:
+    Lookout: 444615
+  Hedge Maze:
+    DOWN: 444617
+  The Perceptive:
+    GAZE: 444618
+  The Observant:
+    BACKSIDE: 444619
+    STAIRS: 444621
+  The Incomparable:
+    Giant Sevens: 444622
+  Orange Tower:
+    Access: 444623
+  Orange Tower First Floor:
+    SECRET: 444624
+  Orange Tower Fourth Floor:
+    HOT CRUSTS: 444625
+  Orange Tower Fifth Floor:
+    SIZE: 444626
+  First Second Third Fourth:
+    FIRST SECOND THIRD FOURTH: 444627
+  The Colorful (White):
+    BEGIN: 444628
+  The Colorful (Black):
+    FOUND: 444630
+  The Colorful (Red):
+    LOAF: 444631
+  The Colorful (Yellow):
+    CREAM: 444632
+  The Colorful (Blue):
+    SUN: 444633
+  The Colorful (Purple):
+    SPOON: 444634
+  The Colorful (Orange):
+    LETTERS: 444635
+  The Colorful (Green):
+    WALLS: 444636
+  The Colorful (Brown):
+    IRON: 444637
+  The Colorful (Gray):
+    OBSTACLE: 444638
+  Owl Hallway:
+    STRAYS: 444639
+  Outside The Initiated:
+    UNCOVER: 444640
+    OXEN: 444641
+  Outside The Bold:
+    UNOPEN: 444642
+    BEGIN: 444643
+  Outside The Undeterred:
+    ZERO: 444644
+    PEN: 444645
+    TWO: 444646
+    THREE: 444647
+    FOUR: 444648
+  Number Hunt:
+    FIVE: 444649
+    SIX: 444650
+    SEVEN: 444651
+    EIGHT: 444652
+    NINE: 444653
+  Color Hunt:
+    EXIT: 444655
+    RED: 444656
+    BLUE: 444658
+    YELLOW: 444659
+    ORANGE: 444660
+    PURPLE: 444661
+    GREEN: 444662
+  The Bearer:
+    FARTHER: 444663
+    MIDDLE: 444664
+  Knight Night (Final):
+    TRUSTED: 444665
+  Outside The Wondrous:
+    SHRINK: 444666
+  Hallway Room (1):
+    CASTLE: 444667
+  Hallway Room (2):
+    COUNTERCLOCKWISE: 444669
+  Hallway Room (3):
+    TRANSFORMATION: 444670
+  Hallway Room (4):
+    WHEELBARROW: 444671
+  Outside The Wanderer:
+    WANDERLUST: 444672
+  Art Gallery:
+    ORDER: 444673
+  Room Room:
+    STAIRS: 444674
+    Colors: 444676
+  Outside The Wise:
+    KITTEN CAT: 444677
+  Outside The Scientific:
+    OPEN: 444678
+  Directional Gallery:
+    TURN LEARN: 444679
+panel_groups:
+  Tenacious Entrance Panels: 444593
+  Symmetry Room Panels: 444607
+  Backside Entrance Panels: 444620
+  Colorful Panels: 444629
+  Color Hunt Panels: 444657
+  Hallway Room Panels: 444668
+  Room Room Panels: 444675
diff --git a/worlds/lingo/datatypes.py b/worlds/lingo/datatypes.py
index 36141daa41..9521422ab1 100644
--- a/worlds/lingo/datatypes.py
+++ b/worlds/lingo/datatypes.py
@@ -12,6 +12,11 @@ class RoomAndPanel(NamedTuple):
     panel: str
 
 
+class RoomAndPanelDoor(NamedTuple):
+    room: Optional[str]
+    panel_door: str
+
+
 class EntranceType(Flag):
     NORMAL = auto()
     PAINTING = auto()
@@ -63,9 +68,15 @@ class Panel(NamedTuple):
     exclude_reduce: bool
     achievement: bool
     non_counting: bool
+    panel_door: Optional[RoomAndPanelDoor]  # This will always be fully specified.
     location_name: Optional[str]
 
 
+class PanelDoor(NamedTuple):
+    item_name: str
+    panel_group: Optional[str]
+
+
 class Painting(NamedTuple):
     id: str
     room: str
diff --git a/worlds/lingo/items.py b/worlds/lingo/items.py
index 67eaceab10..78b288e7c2 100644
--- a/worlds/lingo/items.py
+++ b/worlds/lingo/items.py
@@ -3,7 +3,7 @@ from typing import Dict, List, NamedTuple, Set
 
 from BaseClasses import Item, ItemClassification
 from .static_logic import DOORS_BY_ROOM, PROGRESSIVE_ITEMS, get_door_group_item_id, get_door_item_id, \
-    get_progressive_item_id, get_special_item_id
+    get_progressive_item_id, get_special_item_id, PANEL_DOORS_BY_ROOM, get_panel_door_item_id, get_panel_group_item_id
 
 
 class ItemType(Enum):
@@ -65,6 +65,21 @@ def load_item_data():
                                          ItemClassification.progression, ItemType.NORMAL, True, [])
         ITEMS_BY_GROUP.setdefault("Doors", []).append(group)
 
+    panel_groups: Set[str] = set()
+    for room_name, panel_doors in PANEL_DOORS_BY_ROOM.items():
+        for panel_door_name, panel_door in panel_doors.items():
+            if panel_door.panel_group is not None:
+                panel_groups.add(panel_door.panel_group)
+
+            ALL_ITEM_TABLE[panel_door.item_name] = ItemData(get_panel_door_item_id(room_name, panel_door_name),
+                                                            ItemClassification.progression, ItemType.NORMAL, False, [])
+            ITEMS_BY_GROUP.setdefault("Panels", []).append(panel_door.item_name)
+
+    for group in panel_groups:
+        ALL_ITEM_TABLE[group] = ItemData(get_panel_group_item_id(group), ItemClassification.progression,
+                                         ItemType.NORMAL, False, [])
+        ITEMS_BY_GROUP.setdefault("Panels", []).append(group)
+
     special_items: Dict[str, ItemClassification] = {
         ":)":                        ItemClassification.filler,
         "The Feeling of Being Lost": ItemClassification.filler,
diff --git a/worlds/lingo/options.py b/worlds/lingo/options.py
index 5a076e527d..2fd57ff5ed 100644
--- a/worlds/lingo/options.py
+++ b/worlds/lingo/options.py
@@ -8,21 +8,31 @@ from .items import TRAP_ITEMS
 
 
 class ShuffleDoors(Choice):
-    """If on, opening doors will require their respective "keys".
+    """This option specifies how doors open.
 
-    - **Simple:** Doors are sorted into logical groups, which are all opened by
-      receiving an item.
-    - **Complex:** The items are much more granular, and will usually only open
-      a single door each.
+    - **None:** Doors in the game will open the way they do in vanilla.
+    - **Panels:** Doors still open as in vanilla, but the panels that open the
+      doors will be locked, and an item will be required to unlock the panels.
+    - **Doors:** the doors themselves are locked behind items, and will open
+      automatically without needing to solve a panel once the key is obtained.
     """
     display_name = "Shuffle Doors"
     option_none = 0
-    option_simple = 1
-    option_complex = 2
+    option_panels = 1
+    option_doors = 2
+    alias_simple = 2
+    alias_complex = 2
+
+
+class GroupDoors(Toggle):
+    """By default, door shuffle in either panels or doors mode will create individual keys for every panel or door to be locked.
+    
+    When group doors is on, some panels and doors are sorted into logical groups, which are opened together by receiving an item."""
+    display_name = "Group Doors"
 
 
 class ProgressiveOrangeTower(DefaultOnToggle):
-    """When "Shuffle Doors" is on, this setting governs the manner in which the Orange Tower floors open up.
+    """When "Shuffle Doors" is on doors mode, this setting governs the manner in which the Orange Tower floors open up.
 
     - **Off:** There is an item for each floor of the tower, and each floor's
       item is the only one needed to access that floor.
@@ -33,7 +43,7 @@ class ProgressiveOrangeTower(DefaultOnToggle):
 
 
 class ProgressiveColorful(DefaultOnToggle):
-    """When "Shuffle Doors" is on "complex", this setting governs the manner in which The Colorful opens up.
+    """When "Shuffle Doors" is on either panels or doors mode and "Group Doors" is off, this setting governs the manner in which The Colorful opens up.
 
     - **Off:** There is an item for each room of The Colorful, meaning that
       random rooms in the middle of the sequence can open up without giving you
@@ -253,6 +263,7 @@ lingo_option_groups = [
 @dataclass
 class LingoOptions(PerGameCommonOptions):
     shuffle_doors: ShuffleDoors
+    group_doors: GroupDoors
     progressive_orange_tower: ProgressiveOrangeTower
     progressive_colorful: ProgressiveColorful
     location_checks: LocationChecks
diff --git a/worlds/lingo/player_logic.py b/worlds/lingo/player_logic.py
index 35080acf3a..b21735c1f5 100644
--- a/worlds/lingo/player_logic.py
+++ b/worlds/lingo/player_logic.py
@@ -7,8 +7,8 @@ from .items import ALL_ITEM_TABLE, ItemType
 from .locations import ALL_LOCATION_TABLE, LocationClassification
 from .options import LocationChecks, ShuffleDoors, SunwarpAccess, VictoryCondition
 from .static_logic import DOORS_BY_ROOM, PAINTINGS, PAINTING_ENTRANCES, PAINTING_EXITS, \
-    PANELS_BY_ROOM, PROGRESSION_BY_ROOM, REQUIRED_PAINTING_ROOMS, REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS, \
-    SUNWARP_ENTRANCES, SUNWARP_EXITS
+    PANELS_BY_ROOM, REQUIRED_PAINTING_ROOMS, REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS, PROGRESSIVE_DOORS_BY_ROOM, \
+    PANEL_DOORS_BY_ROOM, PROGRESSIVE_PANELS_BY_ROOM, SUNWARP_ENTRANCES, SUNWARP_EXITS
 
 if TYPE_CHECKING:
     from . import LingoWorld
@@ -18,6 +18,8 @@ class AccessRequirements:
     rooms: Set[str]
     doors: Set[RoomAndDoor]
     colors: Set[str]
+    items: Set[str]
+    progression: Dict[str, int]
     the_master: bool
     postgame: bool
 
@@ -25,6 +27,8 @@ class AccessRequirements:
         self.rooms = set()
         self.doors = set()
         self.colors = set()
+        self.items = set()
+        self.progression = dict()
         self.the_master = False
         self.postgame = False
 
@@ -32,12 +36,17 @@ class AccessRequirements:
         self.rooms |= other.rooms
         self.doors |= other.doors
         self.colors |= other.colors
+        self.items |= other.items
         self.the_master |= other.the_master
         self.postgame |= other.postgame
 
+        for progression, index in other.progression.items():
+            if progression not in self.progression or index > self.progression[progression]:
+                self.progression[progression] = index
+
     def __str__(self):
-        return f"AccessRequirements(rooms={self.rooms}, doors={self.doors}, colors={self.colors}," \
-               f" the_master={self.the_master}, postgame={self.postgame})"
+        return f"AccessRequirements(rooms={self.rooms}, doors={self.doors}, colors={self.colors}, items={self.items}," \
+               f" progression={self.progression}), the_master={self.the_master}, postgame={self.postgame}"
 
 
 class PlayerLocation(NamedTuple):
@@ -117,15 +126,15 @@ class LingoPlayerLogic:
         self.item_by_door.setdefault(room, {})[door] = item
 
     def handle_non_grouped_door(self, room_name: str, door_data: Door, world: "LingoWorld"):
-        if room_name in PROGRESSION_BY_ROOM and door_data.name in PROGRESSION_BY_ROOM[room_name]:
-            progression_name = PROGRESSION_BY_ROOM[room_name][door_data.name].item_name
+        if room_name in PROGRESSIVE_DOORS_BY_ROOM and door_data.name in PROGRESSIVE_DOORS_BY_ROOM[room_name]:
+            progression_name = PROGRESSIVE_DOORS_BY_ROOM[room_name][door_data.name].item_name
             progression_handling = should_split_progression(progression_name, world)
 
             if progression_handling == ProgressiveItemBehavior.SPLIT:
                 self.set_door_item(room_name, door_data.name, door_data.item_name)
                 self.real_items.append(door_data.item_name)
             elif progression_handling == ProgressiveItemBehavior.PROGRESSIVE:
-                progressive_item_name = PROGRESSION_BY_ROOM[room_name][door_data.name].item_name
+                progressive_item_name = PROGRESSIVE_DOORS_BY_ROOM[room_name][door_data.name].item_name
                 self.set_door_item(room_name, door_data.name, progressive_item_name)
                 self.real_items.append(progressive_item_name)
         else:
@@ -156,17 +165,31 @@ class LingoPlayerLogic:
         victory_condition = world.options.victory_condition
         early_color_hallways = world.options.early_color_hallways
 
-        if location_checks == LocationChecks.option_reduced and door_shuffle != ShuffleDoors.option_none:
-            raise OptionError("You cannot have reduced location checks when door shuffle is on, because there would not"
-                              " be enough locations for all of the door items.")
+        if location_checks == LocationChecks.option_reduced:
+            if door_shuffle == ShuffleDoors.option_doors:
+                raise OptionError(f"Slot \"{world.player_name}\" cannot have reduced location checks when door shuffle"
+                                  f" is on, because there would not be enough locations for all of the door items.")
+            if door_shuffle == ShuffleDoors.option_panels:
+                if not world.options.group_doors:
+                    raise OptionError(f"Slot \"{world.player_name}\" cannot have reduced location checks when ungrouped"
+                                      f" panels mode door shuffle is on, because there would not be enough locations for"
+                                      f" all of the panel items.")
+                if color_shuffle:
+                    raise OptionError(f"Slot \"{world.player_name}\" cannot have reduced location checks with both"
+                                      f" panels mode door shuffle and color shuffle because there would not be enough"
+                                      f" locations for all of the items.")
+                if world.options.sunwarp_access >= SunwarpAccess.option_individual:
+                    raise OptionError(f"Slot \"{world.player_name}\" cannot have reduced location checks with both"
+                                      f" panels mode door shuffle and individual or progressive sunwarp access because"
+                                      f" there would not be enough locations for all of the items.")
 
         # Create door items, where needed.
         door_groups: Set[str] = set()
         for room_name, room_data in DOORS_BY_ROOM.items():
             for door_name, door_data in room_data.items():
                 if door_data.skip_item is False and door_data.event is False:
-                    if door_data.type == DoorType.NORMAL and door_shuffle != ShuffleDoors.option_none:
-                        if door_data.door_group is not None and door_shuffle == ShuffleDoors.option_simple:
+                    if door_data.type == DoorType.NORMAL and door_shuffle == ShuffleDoors.option_doors:
+                        if door_data.door_group is not None and world.options.group_doors:
                             # Grouped doors are handled differently if shuffle doors is on simple.
                             self.set_door_item(room_name, door_name, door_data.door_group)
                             door_groups.add(door_data.door_group)
@@ -188,7 +211,29 @@ class LingoPlayerLogic:
                             self.real_items.append(door_data.item_name)
 
         self.real_items += door_groups
-        
+
+        # Create panel items, where needed.
+        if world.options.shuffle_doors == ShuffleDoors.option_panels:
+            panel_groups: Set[str] = set()
+
+            for room_name, room_data in PANEL_DOORS_BY_ROOM.items():
+                for panel_door_name, panel_door_data in room_data.items():
+                    if panel_door_data.panel_group is not None and world.options.group_doors:
+                        panel_groups.add(panel_door_data.panel_group)
+                    elif room_name in PROGRESSIVE_PANELS_BY_ROOM \
+                            and panel_door_name in PROGRESSIVE_PANELS_BY_ROOM[room_name]:
+                        progression_obj = PROGRESSIVE_PANELS_BY_ROOM[room_name][panel_door_name]
+                        progression_handling = should_split_progression(progression_obj.item_name, world)
+
+                        if progression_handling == ProgressiveItemBehavior.SPLIT:
+                            self.real_items.append(panel_door_data.item_name)
+                        elif progression_handling == ProgressiveItemBehavior.PROGRESSIVE:
+                            self.real_items.append(progression_obj.item_name)
+                    else:
+                        self.real_items.append(panel_door_data.item_name)
+
+            self.real_items += panel_groups
+
         # Create color items, if needed.
         if color_shuffle:
             self.real_items += [name for name, item in ALL_ITEM_TABLE.items() if item.type == ItemType.COLOR]
@@ -244,7 +289,7 @@ class LingoPlayerLogic:
         elif location_checks == LocationChecks.option_insanity:
             location_classification = LocationClassification.insanity
 
-        if door_shuffle != ShuffleDoors.option_none and not early_color_hallways:
+        if door_shuffle == ShuffleDoors.option_doors and not early_color_hallways:
             location_classification |= LocationClassification.small_sphere_one
 
         for location_name, location_data in ALL_LOCATION_TABLE.items():
@@ -286,7 +331,7 @@ class LingoPlayerLogic:
                                 "iterations. This is very unlikely to happen on its own, and probably indicates some "
                                 "kind of logic error.")
 
-        if door_shuffle != ShuffleDoors.option_none and location_checks != LocationChecks.option_insanity \
+        if door_shuffle == ShuffleDoors.option_doors and location_checks != LocationChecks.option_insanity \
                 and not early_color_hallways and world.multiworld.players > 1:
             # Under the combination of door shuffle, normal location checks, and no early color hallways, sphere 1 is
             # only three checks. In a multiplayer situation, this can be frustrating for the player because they are
@@ -301,19 +346,19 @@ class LingoPlayerLogic:
             # Starting Room - Exit Door gives access to OPEN and TRACE.
             good_item_options: List[str] = ["Starting Room - Back Right Door", "Second Room - Exit Door"]
 
-            if not color_shuffle and not world.options.enable_pilgrimage:
-                # HOT CRUST and THIS.
-                good_item_options.append("Pilgrim Room - Sun Painting")
-
             if not color_shuffle:
-                if door_shuffle == ShuffleDoors.option_simple:
+                if not world.options.enable_pilgrimage:
+                    # HOT CRUST and THIS.
+                    good_item_options.append("Pilgrim Room - Sun Painting")
+
+                if world.options.group_doors:
                     # WELCOME BACK, CLOCKWISE, and DRAWL + RUNS.
                     good_item_options.append("Welcome Back Doors")
                 else:
                     # WELCOME BACK and CLOCKWISE.
                     good_item_options.append("Welcome Back Area - Shortcut to Starting Room")
 
-            if door_shuffle == ShuffleDoors.option_simple:
+            if world.options.group_doors:
                 # Color hallways access (NOTE: reconsider when sunwarp shuffling exists).
                 good_item_options.append("Rhyme Room Doors")
 
@@ -359,13 +404,11 @@ class LingoPlayerLogic:
     def randomize_paintings(self, world: "LingoWorld") -> bool:
         self.painting_mapping.clear()
 
-        door_shuffle = world.options.shuffle_doors
-
         # First, assign mappings to the required-exit paintings. We ensure that req-blocked paintings do not lead to
         # required paintings.
         req_exits = []
         required_painting_rooms = REQUIRED_PAINTING_ROOMS
-        if door_shuffle == ShuffleDoors.option_none:
+        if world.options.shuffle_doors != ShuffleDoors.option_doors:
             required_painting_rooms += REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS
             req_exits = [painting_id for painting_id, painting in PAINTINGS.items() if painting.required_when_no_doors]
 
@@ -432,7 +475,7 @@ class LingoPlayerLogic:
         for painting_id, painting in PAINTINGS.items():
             if painting_id not in self.painting_mapping.values() \
                     and (painting.required or (painting.required_when_no_doors and
-                                               door_shuffle == ShuffleDoors.option_none)):
+                                               world.options.shuffle_doors != ShuffleDoors.option_doors)):
                 return False
 
         return True
@@ -447,12 +490,31 @@ class LingoPlayerLogic:
             access_reqs = AccessRequirements()
             panel_object = PANELS_BY_ROOM[room][panel]
 
+            if world.options.shuffle_doors == ShuffleDoors.option_panels and panel_object.panel_door is not None:
+                panel_door_room = panel_object.panel_door.room
+                panel_door_name = panel_object.panel_door.panel_door
+                panel_door = PANEL_DOORS_BY_ROOM[panel_door_room][panel_door_name]
+
+                if panel_door.panel_group is not None and world.options.group_doors:
+                    access_reqs.items.add(panel_door.panel_group)
+                elif panel_door_room in PROGRESSIVE_PANELS_BY_ROOM\
+                        and panel_door_name in PROGRESSIVE_PANELS_BY_ROOM[panel_door_room]:
+                    progression_obj = PROGRESSIVE_PANELS_BY_ROOM[panel_door_room][panel_door_name]
+                    progression_handling = should_split_progression(progression_obj.item_name, world)
+
+                    if progression_handling == ProgressiveItemBehavior.SPLIT:
+                        access_reqs.items.add(panel_door.item_name)
+                    elif progression_handling == ProgressiveItemBehavior.PROGRESSIVE:
+                        access_reqs.progression[progression_obj.item_name] = progression_obj.index
+                else:
+                    access_reqs.items.add(panel_door.item_name)
+
             for req_room in panel_object.required_rooms:
                 access_reqs.rooms.add(req_room)
 
             for req_door in panel_object.required_doors:
                 door_object = DOORS_BY_ROOM[room if req_door.room is None else req_door.room][req_door.door]
-                if door_object.event or world.options.shuffle_doors == ShuffleDoors.option_none:
+                if door_object.event or world.options.shuffle_doors != ShuffleDoors.option_doors:
                     sub_access_reqs = self.calculate_door_requirements(
                         room if req_door.room is None else req_door.room, req_door.door, world)
                     access_reqs.merge(sub_access_reqs)
@@ -522,11 +584,14 @@ class LingoPlayerLogic:
                     continue
 
                 # We won't coalesce any panels that have requirements beyond colors. To simplify things for now, we will
-                # only coalesce single-color panels. Chains/stacks/combo puzzles will be separate. THE MASTER has
-                # special access rules and is handled separately.
+                # only coalesce single-color panels. Chains/stacks/combo puzzles will be separate. Panel door locked
+                # puzzles will be separate if panels mode is on. THE MASTER has special access rules and is handled
+                # separately.
                 if len(panel_data.required_panels) > 0 or len(panel_data.required_doors) > 0\
                         or len(panel_data.required_rooms) > 0\
                         or (world.options.shuffle_colors and len(panel_data.colors) > 1)\
+                        or (world.options.shuffle_doors == ShuffleDoors.option_panels
+                            and panel_data.panel_door is not None)\
                         or panel_name == "THE MASTER":
                     self.counting_panel_reqs.setdefault(room_name, []).append(
                         (self.calculate_panel_requirements(room_name, panel_name, world), 1))
diff --git a/worlds/lingo/rules.py b/worlds/lingo/rules.py
index ed84c56e28..e0bb08fa1f 100644
--- a/worlds/lingo/rules.py
+++ b/worlds/lingo/rules.py
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 from BaseClasses import CollectionState
 from .datatypes import RoomAndDoor
 from .player_logic import AccessRequirements, PlayerLocation
-from .static_logic import PROGRESSION_BY_ROOM, PROGRESSIVE_ITEMS
+from .static_logic import PROGRESSIVE_DOORS_BY_ROOM, PROGRESSIVE_ITEMS
 
 if TYPE_CHECKING:
     from . import LingoWorld
@@ -59,6 +59,12 @@ def _lingo_can_satisfy_requirements(state: CollectionState, access: AccessRequir
             if not state.has(color.capitalize(), world.player):
                 return False
 
+    if not all(state.has(item, world.player) for item in access.items):
+        return False
+
+    if not all(state.has(item, world.player, index) for item, index in access.progression.items()):
+        return False
+
     if access.the_master and not lingo_can_use_mastery_location(state, world):
         return False
 
@@ -77,7 +83,7 @@ def _lingo_can_open_door(state: CollectionState, room: str, door: str, world: "L
 
     item_name = world.player_logic.item_by_door[room][door]
     if item_name in PROGRESSIVE_ITEMS:
-        progression = PROGRESSION_BY_ROOM[room][door]
+        progression = PROGRESSIVE_DOORS_BY_ROOM[room][door]
         return state.has(item_name, world.player, progression.index)
 
     return state.has(item_name, world.player)
diff --git a/worlds/lingo/static_logic.py b/worlds/lingo/static_logic.py
index ff820dd0cb..74eea449f2 100644
--- a/worlds/lingo/static_logic.py
+++ b/worlds/lingo/static_logic.py
@@ -4,15 +4,17 @@ import pickle
 from io import BytesIO
 from typing import Dict, List, Set
 
-from .datatypes import Door, Painting, Panel, Progression, Room
+from .datatypes import Door, Painting, Panel, PanelDoor, Progression, Room
 
 ALL_ROOMS: List[Room] = []
 DOORS_BY_ROOM: Dict[str, Dict[str, Door]] = {}
 PANELS_BY_ROOM: Dict[str, Dict[str, Panel]] = {}
+PANEL_DOORS_BY_ROOM: Dict[str, Dict[str, PanelDoor]] = {}
 PAINTINGS: Dict[str, Painting] = {}
 
-PROGRESSIVE_ITEMS: List[str] = []
-PROGRESSION_BY_ROOM: Dict[str, Dict[str, Progression]] = {}
+PROGRESSIVE_ITEMS: Set[str] = set()
+PROGRESSIVE_DOORS_BY_ROOM: Dict[str, Dict[str, Progression]] = {}
+PROGRESSIVE_PANELS_BY_ROOM: Dict[str, Dict[str, Progression]] = {}
 
 PAINTING_ENTRANCES: int = 0
 PAINTING_EXIT_ROOMS: Set[str] = set()
@@ -28,6 +30,8 @@ PANEL_LOCATION_IDS: Dict[str, Dict[str, int]] = {}
 DOOR_LOCATION_IDS: Dict[str, Dict[str, int]] = {}
 DOOR_ITEM_IDS: Dict[str, Dict[str, int]] = {}
 DOOR_GROUP_ITEM_IDS: Dict[str, int] = {}
+PANEL_DOOR_ITEM_IDS: Dict[str, Dict[str, int]] = {}
+PANEL_GROUP_ITEM_IDS: Dict[str, int] = {}
 PROGRESSIVE_ITEM_IDS: Dict[str, int] = {}
 
 HASHES: Dict[str, str] = {}
@@ -68,6 +72,20 @@ def get_door_group_item_id(name: str):
     return DOOR_GROUP_ITEM_IDS[name]
 
 
+def get_panel_door_item_id(room: str, name: str):
+    if room not in PANEL_DOOR_ITEM_IDS or name not in PANEL_DOOR_ITEM_IDS[room]:
+        raise Exception(f"Item ID for panel door {room} - {name} not found in ids.yaml.")
+
+    return PANEL_DOOR_ITEM_IDS[room][name]
+
+
+def get_panel_group_item_id(name: str):
+    if name not in PANEL_GROUP_ITEM_IDS:
+        raise Exception(f"Item ID for panel group {name} not found in ids.yaml.")
+
+    return PANEL_GROUP_ITEM_IDS[name]
+
+
 def get_progressive_item_id(name: str):
     if name not in PROGRESSIVE_ITEM_IDS:
         raise Exception(f"Item ID for progressive item {name} not found in ids.yaml.")
@@ -97,8 +115,10 @@ def load_static_data_from_file():
     ALL_ROOMS.extend(pickdata["ALL_ROOMS"])
     DOORS_BY_ROOM.update(pickdata["DOORS_BY_ROOM"])
     PANELS_BY_ROOM.update(pickdata["PANELS_BY_ROOM"])
-    PROGRESSIVE_ITEMS.extend(pickdata["PROGRESSIVE_ITEMS"])
-    PROGRESSION_BY_ROOM.update(pickdata["PROGRESSION_BY_ROOM"])
+    PANEL_DOORS_BY_ROOM.update(pickdata["PANEL_DOORS_BY_ROOM"])
+    PROGRESSIVE_ITEMS.update(pickdata["PROGRESSIVE_ITEMS"])
+    PROGRESSIVE_DOORS_BY_ROOM.update(pickdata["PROGRESSIVE_DOORS_BY_ROOM"])
+    PROGRESSIVE_PANELS_BY_ROOM.update(pickdata["PROGRESSIVE_PANELS_BY_ROOM"])
     PAINTING_ENTRANCES = pickdata["PAINTING_ENTRANCES"]
     PAINTING_EXIT_ROOMS.update(pickdata["PAINTING_EXIT_ROOMS"])
     PAINTING_EXITS = pickdata["PAINTING_EXITS"]
@@ -111,6 +131,8 @@ def load_static_data_from_file():
     DOOR_LOCATION_IDS.update(pickdata["DOOR_LOCATION_IDS"])
     DOOR_ITEM_IDS.update(pickdata["DOOR_ITEM_IDS"])
     DOOR_GROUP_ITEM_IDS.update(pickdata["DOOR_GROUP_ITEM_IDS"])
+    PANEL_DOOR_ITEM_IDS.update(pickdata["PANEL_DOOR_ITEM_IDS"])
+    PANEL_GROUP_ITEM_IDS.update(pickdata["PANEL_GROUP_ITEM_IDS"])
     PROGRESSIVE_ITEM_IDS.update(pickdata["PROGRESSIVE_ITEM_IDS"])
 
 
diff --git a/worlds/lingo/test/TestDoors.py b/worlds/lingo/test/TestDoors.py
index f496c5f578..cfbd7f3027 100644
--- a/worlds/lingo/test/TestDoors.py
+++ b/worlds/lingo/test/TestDoors.py
@@ -3,7 +3,7 @@ from . import LingoTestBase
 
 class TestRequiredRoomLogic(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "shuffle_colors": "false",
     }
 
@@ -50,7 +50,7 @@ class TestRequiredRoomLogic(LingoTestBase):
 
 class TestRequiredDoorLogic(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "shuffle_colors": "false",
     }
 
@@ -78,7 +78,8 @@ class TestRequiredDoorLogic(LingoTestBase):
 
 class TestSimpleDoors(LingoTestBase):
     options = {
-        "shuffle_doors": "simple",
+        "shuffle_doors": "doors",
+        "group_doors": "true",
         "shuffle_colors": "false",
     }
 
@@ -90,3 +91,52 @@ class TestSimpleDoors(LingoTestBase):
         self.assertTrue(self.multiworld.state.can_reach("Outside The Wanderer", "Region", self.player))
         self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
 
+
+class TestPanels(LingoTestBase):
+    options = {
+        "shuffle_doors": "panels"
+    }
+
+    def test_requirement(self):
+        self.assertFalse(self.can_reach_location("Starting Room - HIDDEN"))
+        self.assertFalse(self.can_reach_location("Hidden Room - OPEN"))
+        self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
+
+        self.collect_by_name("Starting Room - HIDDEN (Panel)")
+        self.assertTrue(self.can_reach_location("Starting Room - HIDDEN"))
+        self.assertFalse(self.can_reach_location("Hidden Room - OPEN"))
+        self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
+
+        self.collect_by_name("Hidden Room - OPEN (Panel)")
+        self.assertTrue(self.can_reach_location("Starting Room - HIDDEN"))
+        self.assertTrue(self.can_reach_location("Hidden Room - OPEN"))
+        self.assertTrue(self.can_reach_location("The Seeker - Achievement"))
+
+
+class TestGroupedPanels(LingoTestBase):
+    options = {
+        "shuffle_doors": "panels",
+        "group_doors": "true",
+        "shuffle_colors": "false",
+    }
+
+    def test_requirement(self):
+        self.assertFalse(self.can_reach_location("Hub Room - SLAUGHTER"))
+        self.assertFalse(self.can_reach_location("Dread Hallway - DREAD"))
+        self.assertFalse(self.can_reach_location("The Tenacious - Achievement"))
+
+        self.collect_by_name("Tenacious Entrance Panels")
+        self.assertTrue(self.can_reach_location("Hub Room - SLAUGHTER"))
+        self.assertFalse(self.can_reach_location("Dread Hallway - DREAD"))
+        self.assertFalse(self.can_reach_location("The Tenacious - Achievement"))
+
+        self.collect_by_name("Outside The Agreeable - BLACK (Panel)")
+        self.assertTrue(self.can_reach_location("Hub Room - SLAUGHTER"))
+        self.assertTrue(self.can_reach_location("Dread Hallway - DREAD"))
+        self.assertFalse(self.can_reach_location("The Tenacious - Achievement"))
+
+        self.collect_by_name("The Tenacious - Black Palindromes (Panels)")
+        self.assertTrue(self.can_reach_location("Hub Room - SLAUGHTER"))
+        self.assertTrue(self.can_reach_location("Dread Hallway - DREAD"))
+        self.assertTrue(self.can_reach_location("The Tenacious - Achievement"))
+
diff --git a/worlds/lingo/test/TestOptions.py b/worlds/lingo/test/TestOptions.py
index fce0743116..bd8ed81d7a 100644
--- a/worlds/lingo/test/TestOptions.py
+++ b/worlds/lingo/test/TestOptions.py
@@ -3,7 +3,7 @@ from . import LingoTestBase
 
 class TestMultiShuffleOptions(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "progressive_orange_tower": "true",
         "shuffle_colors": "true",
         "shuffle_paintings": "true",
@@ -13,7 +13,7 @@ class TestMultiShuffleOptions(LingoTestBase):
 
 class TestPanelsanity(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "progressive_orange_tower": "true",
         "location_checks": "insanity",
         "shuffle_colors": "true"
@@ -22,7 +22,18 @@ class TestPanelsanity(LingoTestBase):
 
 class TestAllPanelHunt(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
+        "progressive_orange_tower": "true",
+        "shuffle_colors": "true",
+        "victory_condition": "level_2",
+        "level_2_requirement": "800",
+        "early_color_hallways": "true"
+    }
+
+
+class TestAllPanelHuntPanelsMode(LingoTestBase):
+    options = {
+        "shuffle_doors": "panels",
         "progressive_orange_tower": "true",
         "shuffle_colors": "true",
         "victory_condition": "level_2",
diff --git a/worlds/lingo/test/TestOrangeTower.py b/worlds/lingo/test/TestOrangeTower.py
index 7b0c3bb525..444264a589 100644
--- a/worlds/lingo/test/TestOrangeTower.py
+++ b/worlds/lingo/test/TestOrangeTower.py
@@ -3,7 +3,7 @@ from . import LingoTestBase
 
 class TestProgressiveOrangeTower(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "progressive_orange_tower": "true"
     }
 
diff --git a/worlds/lingo/test/TestPanelsanity.py b/worlds/lingo/test/TestPanelsanity.py
index 34c1b3815a..f8330ae782 100644
--- a/worlds/lingo/test/TestPanelsanity.py
+++ b/worlds/lingo/test/TestPanelsanity.py
@@ -3,7 +3,7 @@ from . import LingoTestBase
 
 class TestPanelHunt(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "location_checks": "insanity",
         "victory_condition": "level_2",
         "level_2_requirement": "15"
diff --git a/worlds/lingo/test/TestPilgrimage.py b/worlds/lingo/test/TestPilgrimage.py
index 4c5e259cd5..328156da2d 100644
--- a/worlds/lingo/test/TestPilgrimage.py
+++ b/worlds/lingo/test/TestPilgrimage.py
@@ -18,7 +18,7 @@ class TestPilgrimageWithRoofAndPaintings(LingoTestBase):
     options = {
         "enable_pilgrimage": "true",
         "shuffle_colors": "false",
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "pilgrimage_allows_roof_access": "true",
         "pilgrimage_allows_paintings": "true",
         "early_color_hallways": "false"
@@ -39,7 +39,7 @@ class TestPilgrimageNoRoofYesPaintings(LingoTestBase):
     options = {
         "enable_pilgrimage": "true",
         "shuffle_colors": "false",
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "pilgrimage_allows_roof_access": "false",
         "pilgrimage_allows_paintings": "true",
         "early_color_hallways": "false"
@@ -62,7 +62,7 @@ class TestPilgrimageNoRoofNoPaintings(LingoTestBase):
     options = {
         "enable_pilgrimage": "true",
         "shuffle_colors": "false",
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "pilgrimage_allows_roof_access": "false",
         "pilgrimage_allows_paintings": "false",
         "early_color_hallways": "false"
@@ -117,7 +117,7 @@ class TestPilgrimageYesRoofNoPaintings(LingoTestBase):
     options = {
         "enable_pilgrimage": "true",
         "shuffle_colors": "false",
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "pilgrimage_allows_roof_access": "true",
         "pilgrimage_allows_paintings": "false",
         "early_color_hallways": "false"
diff --git a/worlds/lingo/test/TestProgressive.py b/worlds/lingo/test/TestProgressive.py
index e79fd6bc90..2c837f53f3 100644
--- a/worlds/lingo/test/TestProgressive.py
+++ b/worlds/lingo/test/TestProgressive.py
@@ -3,7 +3,7 @@ from . import LingoTestBase
 
 class TestComplexProgressiveHallwayRoom(LingoTestBase):
     options = {
-        "shuffle_doors": "complex"
+        "shuffle_doors": "doors"
     }
 
     def test_item(self):
@@ -54,7 +54,8 @@ class TestComplexProgressiveHallwayRoom(LingoTestBase):
 
 class TestSimpleHallwayRoom(LingoTestBase):
     options = {
-        "shuffle_doors": "simple"
+        "shuffle_doors": "doors",
+        "group_doors": "true",
     }
 
     def test_item(self):
@@ -81,7 +82,7 @@ class TestSimpleHallwayRoom(LingoTestBase):
 
 class TestProgressiveArtGallery(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
         "shuffle_colors": "false",
     }
 
diff --git a/worlds/lingo/test/TestSunwarps.py b/worlds/lingo/test/TestSunwarps.py
index e8e913c4f4..66ba3afd6e 100644
--- a/worlds/lingo/test/TestSunwarps.py
+++ b/worlds/lingo/test/TestSunwarps.py
@@ -19,7 +19,8 @@ class TestVanillaDoorsNormalSunwarps(LingoTestBase):
 
 class TestSimpleDoorsNormalSunwarps(LingoTestBase):
     options = {
-        "shuffle_doors": "simple",
+        "shuffle_doors": "doors",
+        "group_doors": "true",
         "sunwarp_access": "normal"
     }
 
@@ -37,7 +38,8 @@ class TestSimpleDoorsNormalSunwarps(LingoTestBase):
 
 class TestSimpleDoorsDisabledSunwarps(LingoTestBase):
     options = {
-        "shuffle_doors": "simple",
+        "shuffle_doors": "doors",
+        "group_doors": "true",
         "sunwarp_access": "disabled"
     }
 
@@ -56,7 +58,8 @@ class TestSimpleDoorsDisabledSunwarps(LingoTestBase):
 
 class TestSimpleDoorsUnlockSunwarps(LingoTestBase):
     options = {
-        "shuffle_doors": "simple",
+        "shuffle_doors": "doors",
+        "group_doors": "true",
         "sunwarp_access": "unlock"
     }
 
@@ -78,7 +81,8 @@ class TestSimpleDoorsUnlockSunwarps(LingoTestBase):
 
 class TestComplexDoorsNormalSunwarps(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
+        "group_doors": "false",
         "sunwarp_access": "normal"
     }
 
@@ -96,7 +100,8 @@ class TestComplexDoorsNormalSunwarps(LingoTestBase):
 
 class TestComplexDoorsDisabledSunwarps(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
+        "group_doors": "false",
         "sunwarp_access": "disabled"
     }
 
@@ -115,7 +120,8 @@ class TestComplexDoorsDisabledSunwarps(LingoTestBase):
 
 class TestComplexDoorsIndividualSunwarps(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
+        "group_doors": "false",
         "sunwarp_access": "individual"
     }
 
@@ -142,7 +148,8 @@ class TestComplexDoorsIndividualSunwarps(LingoTestBase):
 
 class TestComplexDoorsProgressiveSunwarps(LingoTestBase):
     options = {
-        "shuffle_doors": "complex",
+        "shuffle_doors": "doors",
+        "group_doors": "false",
         "sunwarp_access": "progressive"
     }
 
diff --git a/worlds/lingo/utils/assign_ids.rb b/worlds/lingo/utils/assign_ids.rb
index 9e1ce67bd2..f7de3d03f5 100644
--- a/worlds/lingo/utils/assign_ids.rb
+++ b/worlds/lingo/utils/assign_ids.rb
@@ -73,6 +73,22 @@ if old_generated.include? "door_groups" then
     end
   end
 end
+if old_generated.include? "panel_doors" then
+  old_generated["panel_doors"].each do |room, panel_doors|
+    panel_doors.each do |name, id|
+      if id >= next_item_id then
+        next_item_id = id + 1
+      end
+    end
+  end
+end
+if old_generated.include? "panel_groups" then
+  old_generated["panel_groups"].each do |name, id|
+    if id >= next_item_id then
+      next_item_id = id + 1
+    end
+  end
+end
 if old_generated.include? "progression" then
   old_generated["progression"].each do |name, id|
     if id >= next_item_id then
@@ -82,6 +98,7 @@ if old_generated.include? "progression" then
 end
 
 door_groups = Set[]
+panel_groups = Set[]
 
 config = YAML.load_file(configpath)
 config.each do |room_name, room_data|
@@ -163,6 +180,29 @@ config.each do |room_name, room_data|
     end
   end
 
+  if room_data.include? "panel_doors"
+    room_data["panel_doors"].each do |panel_door_name, panel_door|
+      unless old_generated.include? "panel_doors" and old_generated["panel_doors"].include? room_name and old_generated["panel_doors"][room_name].include? panel_door_name then
+        old_generated["panel_doors"] ||= {}
+        old_generated["panel_doors"][room_name] ||= {}
+        old_generated["panel_doors"][room_name][panel_door_name] = next_item_id
+
+        next_item_id += 1
+      end
+
+      if panel_door.include? "panel_group" and not panel_groups.include? panel_door["panel_group"] then
+        panel_groups.add(panel_door["panel_group"])
+
+        unless old_generated.include? "panel_groups" and old_generated["panel_groups"].include? panel_door["panel_group"] then
+          old_generated["panel_groups"] ||= {}
+          old_generated["panel_groups"][panel_door["panel_group"]] = next_item_id
+
+          next_item_id += 1
+        end
+      end
+    end
+  end
+
   if room_data.include? "progression"
     room_data["progression"].each do |progression_name, pdata|
       unless old_generated.include? "progression" and old_generated["progression"].include? progression_name then
diff --git a/worlds/lingo/utils/pickle_static_data.py b/worlds/lingo/utils/pickle_static_data.py
index e40c21ce3e..92bcb7a859 100644
--- a/worlds/lingo/utils/pickle_static_data.py
+++ b/worlds/lingo/utils/pickle_static_data.py
@@ -6,8 +6,8 @@ import sys
 sys.path.append(os.path.join("worlds", "lingo"))
 sys.path.append(".")
 sys.path.append("..")
-from datatypes import Door, DoorType, EntranceType, Painting, Panel, Progression, Room, RoomAndDoor, RoomAndPanel,\
-    RoomEntrance
+from datatypes import Door, DoorType, EntranceType, Painting, Panel, PanelDoor, Progression, Room, RoomAndDoor,\
+    RoomAndPanel, RoomAndPanelDoor, RoomEntrance
 
 import hashlib
 import pickle
@@ -18,10 +18,12 @@ import Utils
 ALL_ROOMS: List[Room] = []
 DOORS_BY_ROOM: Dict[str, Dict[str, Door]] = {}
 PANELS_BY_ROOM: Dict[str, Dict[str, Panel]] = {}
+PANEL_DOORS_BY_ROOM: Dict[str, Dict[str, PanelDoor]] = {}
 PAINTINGS: Dict[str, Painting] = {}
 
-PROGRESSIVE_ITEMS: List[str] = []
-PROGRESSION_BY_ROOM: Dict[str, Dict[str, Progression]] = {}
+PROGRESSIVE_ITEMS: Set[str] = set()
+PROGRESSIVE_DOORS_BY_ROOM: Dict[str, Dict[str, Progression]] = {}
+PROGRESSIVE_PANELS_BY_ROOM: Dict[str, Dict[str, Progression]] = {}
 
 PAINTING_ENTRANCES: int = 0
 PAINTING_EXIT_ROOMS: Set[str] = set()
@@ -37,8 +39,13 @@ PANEL_LOCATION_IDS: Dict[str, Dict[str, int]] = {}
 DOOR_LOCATION_IDS: Dict[str, Dict[str, int]] = {}
 DOOR_ITEM_IDS: Dict[str, Dict[str, int]] = {}
 DOOR_GROUP_ITEM_IDS: Dict[str, int] = {}
+PANEL_DOOR_ITEM_IDS: Dict[str, Dict[str, int]] = {}
+PANEL_GROUP_ITEM_IDS: Dict[str, int] = {}
 PROGRESSIVE_ITEM_IDS: Dict[str, int] = {}
 
+# This doesn't need to be stored in the datafile.
+PANEL_DOOR_BY_PANEL_BY_ROOM: Dict[str, Dict[str, str]] = {}
+
 
 def hash_file(path):
     md5 = hashlib.md5()
@@ -53,7 +60,7 @@ def hash_file(path):
 
 def load_static_data(ll1_path, ids_path):
     global PAINTING_EXITS, SPECIAL_ITEM_IDS, PANEL_LOCATION_IDS, DOOR_LOCATION_IDS, DOOR_ITEM_IDS, \
-        DOOR_GROUP_ITEM_IDS, PROGRESSIVE_ITEM_IDS
+        DOOR_GROUP_ITEM_IDS, PROGRESSIVE_ITEM_IDS, PANEL_DOOR_ITEM_IDS, PANEL_GROUP_ITEM_IDS
 
     # Load in all item and location IDs. These are broken up into groups based on the type of item/location.
     with open(ids_path, "r") as file:
@@ -86,6 +93,17 @@ def load_static_data(ll1_path, ids_path):
             for item_name, item_id in config["door_groups"].items():
                 DOOR_GROUP_ITEM_IDS[item_name] = item_id
 
+        if "panel_doors" in config:
+            for room_name, panel_doors in config["panel_doors"].items():
+                PANEL_DOOR_ITEM_IDS[room_name] = {}
+
+                for panel_door, item_id in panel_doors.items():
+                    PANEL_DOOR_ITEM_IDS[room_name][panel_door] = item_id
+
+        if "panel_groups" in config:
+            for item_name, item_id in config["panel_groups"].items():
+                PANEL_GROUP_ITEM_IDS[item_name] = item_id
+
         if "progression" in config:
             for item_name, item_id in config["progression"].items():
                 PROGRESSIVE_ITEM_IDS[item_name] = item_id
@@ -147,6 +165,46 @@ def process_entrance(source_room, doors, room_obj):
             room_obj.entrances.append(RoomEntrance(source_room, door, entrance_type))
 
 
+def process_panel_door(room_name, panel_door_name, panel_door_data):
+    global PANEL_DOORS_BY_ROOM, PANEL_DOOR_BY_PANEL_BY_ROOM
+
+    panels: List[RoomAndPanel] = list()
+    for panel in panel_door_data["panels"]:
+        if isinstance(panel, dict):
+            panels.append(RoomAndPanel(panel["room"], panel["panel"]))
+        else:
+            panels.append(RoomAndPanel(room_name, panel))
+
+    for panel in panels:
+        PANEL_DOOR_BY_PANEL_BY_ROOM.setdefault(panel.room, {})[panel.panel] = RoomAndPanelDoor(room_name,
+                                                                                               panel_door_name)
+
+    if "item_name" in panel_door_data:
+        item_name = panel_door_data["item_name"]
+    else:
+        panel_per_room = dict()
+        for panel in panels:
+            panel_room_name = room_name if panel.room is None else panel.room
+            panel_per_room.setdefault(panel_room_name, []).append(panel.panel)
+
+        room_strs = list()
+        for door_room_str, door_panels_str in panel_per_room.items():
+            room_strs.append(door_room_str + " - " + ", ".join(door_panels_str))
+
+        if len(panels) == 1:
+            item_name = f"{room_strs[0]} (Panel)"
+        else:
+            item_name = " and ".join(room_strs) + " (Panels)"
+
+    if "panel_group" in panel_door_data:
+        panel_group = panel_door_data["panel_group"]
+    else:
+        panel_group = None
+
+    panel_door_obj = PanelDoor(item_name, panel_group)
+    PANEL_DOORS_BY_ROOM[room_name][panel_door_name] = panel_door_obj
+
+
 def process_panel(room_name, panel_name, panel_data):
     global PANELS_BY_ROOM
 
@@ -227,13 +285,18 @@ def process_panel(room_name, panel_name, panel_data):
     else:
         non_counting = False
 
+    if room_name in PANEL_DOOR_BY_PANEL_BY_ROOM and panel_name in PANEL_DOOR_BY_PANEL_BY_ROOM[room_name]:
+        panel_door = PANEL_DOOR_BY_PANEL_BY_ROOM[room_name][panel_name]
+    else:
+        panel_door = None
+
     if "location_name" in panel_data:
         location_name = panel_data["location_name"]
     else:
         location_name = None
 
     panel_obj = Panel(required_rooms, required_doors, required_panels, colors, check, event, exclude_reduce,
-                      achievement, non_counting, location_name)
+                      achievement, non_counting, panel_door, location_name)
     PANELS_BY_ROOM[room_name][panel_name] = panel_obj
 
 
@@ -325,7 +388,7 @@ def process_door(room_name, door_name, door_data):
         painting_ids = []
 
     door_type = DoorType.NORMAL
-    if door_name.endswith(" Sunwarp"):
+    if room_name == "Sunwarps":
         door_type = DoorType.SUNWARP
     elif room_name == "Pilgrim Antechamber" and door_name == "Sun Painting":
         door_type = DoorType.SUN_PAINTING
@@ -404,11 +467,11 @@ def process_sunwarp(room_name, sunwarp_data):
         SUNWARP_EXITS[sunwarp_data["dots"] - 1] = room_name
 
 
-def process_progression(room_name, progression_name, progression_doors):
-    global PROGRESSIVE_ITEMS, PROGRESSION_BY_ROOM
+def process_progressive_door(room_name, progression_name, progression_doors):
+    global PROGRESSIVE_ITEMS, PROGRESSIVE_DOORS_BY_ROOM
 
     # Progressive items are configured as a list of doors.
-    PROGRESSIVE_ITEMS.append(progression_name)
+    PROGRESSIVE_ITEMS.add(progression_name)
 
     progression_index = 1
     for door in progression_doors:
@@ -419,11 +482,31 @@ def process_progression(room_name, progression_name, progression_doors):
             door_room = room_name
             door_door = door
 
-        room_progressions = PROGRESSION_BY_ROOM.setdefault(door_room, {})
+        room_progressions = PROGRESSIVE_DOORS_BY_ROOM.setdefault(door_room, {})
         room_progressions[door_door] = Progression(progression_name, progression_index)
         progression_index += 1
 
 
+def process_progressive_panel(room_name, progression_name, progression_panel_doors):
+    global PROGRESSIVE_ITEMS, PROGRESSIVE_PANELS_BY_ROOM
+
+    # Progressive items are configured as a list of panel doors.
+    PROGRESSIVE_ITEMS.add(progression_name)
+
+    progression_index = 1
+    for panel_door in progression_panel_doors:
+        if isinstance(panel_door, Dict):
+            panel_door_room = panel_door["room"]
+            panel_door_door = panel_door["panel_door"]
+        else:
+            panel_door_room = room_name
+            panel_door_door = panel_door
+
+        room_progressions = PROGRESSIVE_PANELS_BY_ROOM.setdefault(panel_door_room, {})
+        room_progressions[panel_door_door] = Progression(progression_name, progression_index)
+        progression_index += 1
+
+
 def process_room(room_name, room_data):
     global ALL_ROOMS
 
@@ -433,6 +516,12 @@ def process_room(room_name, room_data):
         for source_room, doors in room_data["entrances"].items():
             process_entrance(source_room, doors, room_obj)
 
+    if "panel_doors" in room_data:
+        PANEL_DOORS_BY_ROOM[room_name] = dict()
+
+        for panel_door_name, panel_door_data in room_data["panel_doors"].items():
+            process_panel_door(room_name, panel_door_name, panel_door_data)
+
     if "panels" in room_data:
         PANELS_BY_ROOM[room_name] = dict()
 
@@ -454,8 +543,11 @@ def process_room(room_name, room_data):
             process_sunwarp(room_name, sunwarp_data)
 
     if "progression" in room_data:
-        for progression_name, progression_doors in room_data["progression"].items():
-            process_progression(room_name, progression_name, progression_doors)
+        for progression_name, pdata in room_data["progression"].items():
+            if "doors" in pdata:
+                process_progressive_door(room_name, progression_name, pdata["doors"])
+            if "panel_doors" in pdata:
+                process_progressive_panel(room_name, progression_name, pdata["panel_doors"])
 
     ALL_ROOMS.append(room_obj)
 
@@ -492,8 +584,10 @@ if __name__ == '__main__':
         "ALL_ROOMS": ALL_ROOMS,
         "DOORS_BY_ROOM": DOORS_BY_ROOM,
         "PANELS_BY_ROOM": PANELS_BY_ROOM,
+        "PANEL_DOORS_BY_ROOM": PANEL_DOORS_BY_ROOM,
         "PROGRESSIVE_ITEMS": PROGRESSIVE_ITEMS,
-        "PROGRESSION_BY_ROOM": PROGRESSION_BY_ROOM,
+        "PROGRESSIVE_DOORS_BY_ROOM": PROGRESSIVE_DOORS_BY_ROOM,
+        "PROGRESSIVE_PANELS_BY_ROOM": PROGRESSIVE_PANELS_BY_ROOM,
         "PAINTING_ENTRANCES": PAINTING_ENTRANCES,
         "PAINTING_EXIT_ROOMS": PAINTING_EXIT_ROOMS,
         "PAINTING_EXITS": PAINTING_EXITS,
@@ -506,6 +600,8 @@ if __name__ == '__main__':
         "DOOR_LOCATION_IDS": DOOR_LOCATION_IDS,
         "DOOR_ITEM_IDS": DOOR_ITEM_IDS,
         "DOOR_GROUP_ITEM_IDS": DOOR_GROUP_ITEM_IDS,
+        "PANEL_DOOR_ITEM_IDS": PANEL_DOOR_ITEM_IDS,
+        "PANEL_GROUP_ITEM_IDS": PANEL_GROUP_ITEM_IDS,
         "PROGRESSIVE_ITEM_IDS": PROGRESSIVE_ITEM_IDS,
     }
     
diff --git a/worlds/lingo/utils/validate_config.rb b/worlds/lingo/utils/validate_config.rb
index 498980bb71..70f7fc2cf6 100644
--- a/worlds/lingo/utils/validate_config.rb
+++ b/worlds/lingo/utils/validate_config.rb
@@ -33,19 +33,23 @@ end
 configured_rooms = Set["Menu"]
 configured_doors = Set[]
 configured_panels = Set[]
+configured_panel_doors = Set[]
 
 mentioned_rooms = Set[]
 mentioned_doors = Set[]
 mentioned_panels = Set[]
+mentioned_panel_doors = Set[]
 mentioned_sunwarp_entrances = Set[]
 mentioned_sunwarp_exits = Set[]
 mentioned_paintings = Set[]
 
 door_groups = {}
+panel_groups = {}
 
-directives = Set["entrances", "panels", "doors", "paintings", "sunwarps", "progression"]
+directives = Set["entrances", "panels", "doors", "panel_doors", "paintings", "sunwarps", "progression"]
 panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting", "hunt", "location_name"]
 door_directives = Set["id", "painting_id", "panels", "item_name", "item_group", "location_name", "skip_location", "skip_item", "door_group", "include_reduce", "event", "warp_id"]
+panel_door_directives = Set["panels", "item_name", "panel_group"]
 painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move", "req_blocked", "req_blocked_when_no_doors"]
 
 non_counting = 0
@@ -253,6 +257,43 @@ config.each do |room_name, room|
     end
   end
 
+  (room["panel_doors"] || {}).each do |panel_door_name, panel_door|
+    configured_panel_doors.add("#{room_name} - #{panel_door_name}")
+
+    if panel_door.include?("panels")
+      panel_door["panels"].each do |panel|
+        if panel.kind_of? Hash then
+          other_room = panel.include?("room") ? panel["room"] : room_name
+          mentioned_panels.add("#{other_room} - #{panel["panel"]}")
+        else
+          other_room = panel.include?("room") ? panel["room"] : room_name
+          mentioned_panels.add("#{room_name} - #{panel}")
+        end
+      end
+    else
+      puts "#{room_name} - #{panel_door_name} :::: Missing panels field"
+    end
+
+    if panel_door.include?("panel_group")
+      panel_groups[panel_door["panel_group"]] ||= 0
+      panel_groups[panel_door["panel_group"]] += 1
+    end
+
+    bad_subdirectives = []
+    panel_door.keys.each do |key|
+      unless panel_door_directives.include?(key) then
+        bad_subdirectives << key
+      end
+    end
+    unless bad_subdirectives.empty? then
+      puts "#{room_name} - #{panel_door_name} :::: Panel door has the following invalid subdirectives: #{bad_subdirectives.join(", ")}"
+    end
+
+    unless ids.include?("panel_doors") and ids["panel_doors"].include?(room_name) and ids["panel_doors"][room_name].include?(panel_door_name)
+      puts "#{room_name} - #{panel_door_name} :::: Panel door is missing an item ID"
+    end
+  end
+
   (room["paintings"] || []).each do |painting|
     if painting.include?("id") and painting["id"].kind_of? String then
       unless paintings.include? painting["id"] then
@@ -327,12 +368,24 @@ config.each do |room_name, room|
     end
   end
 
-  (room["progression"] || {}).each do |progression_name, door_list|
-    door_list.each do |door|
-      if door.kind_of? Hash then
-        mentioned_doors.add("#{door["room"]} - #{door["door"]}")
-      else
-        mentioned_doors.add("#{room_name} - #{door}")
+  (room["progression"] || {}).each do |progression_name, pdata|
+    if pdata.include? "doors" then
+      pdata["doors"].each do |door|
+        if door.kind_of? Hash then
+          mentioned_doors.add("#{door["room"]} - #{door["door"]}")
+        else
+          mentioned_doors.add("#{room_name} - #{door}")
+        end
+      end
+    end
+
+    if pdata.include? "panel_doors" then
+      pdata["panel_doors"].each do |panel_door|
+        if panel_door.kind_of? Hash then
+          mentioned_panel_doors.add("#{panel_door["room"]} - #{panel_door["panel_door"]}")
+        else
+          mentioned_panel_doors.add("#{room_name} - #{panel_door}")
+        end
       end
     end
 
@@ -344,17 +397,22 @@ end
 
 errored_rooms = mentioned_rooms - configured_rooms
 unless errored_rooms.empty? then
-  puts "The folloring rooms are mentioned but do not exist: " + errored_rooms.to_s
+  puts "The following rooms are mentioned but do not exist: " + errored_rooms.to_s
 end
 
 errored_panels = mentioned_panels - configured_panels
 unless errored_panels.empty? then
-  puts "The folloring panels are mentioned but do not exist: " + errored_panels.to_s
+  puts "The following panels are mentioned but do not exist: " + errored_panels.to_s
 end
 
 errored_doors = mentioned_doors - configured_doors
 unless errored_doors.empty? then
-  puts "The folloring doors are mentioned but do not exist: " + errored_doors.to_s
+  puts "The following doors are mentioned but do not exist: " + errored_doors.to_s
+end
+
+errored_panel_doors = mentioned_panel_doors - configured_panel_doors
+unless errored_panel_doors.empty? then
+  puts "The following panel doors are mentioned but do not exist: " + errored_panel_doors.to_s
 end
 
 door_groups.each do |group,num|
@@ -367,6 +425,16 @@ door_groups.each do |group,num|
   end
 end
 
+panel_groups.each do |group,num|
+  if num == 1 then
+    puts "Panel group \"#{group}\" only has one panel in it"
+  end
+
+  unless ids.include?("panel_groups") and ids["panel_groups"].include?(group)
+    puts "#{group} :::: Panel group is missing an item ID"
+  end
+end
+
 slashed_rooms = configured_rooms.select do |room|
   room.include? "/"
 end

From 9d36ad0df27d2e22ff99f9349311c44a1d09fd2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bolduc?=
 <16137441+Jouramie@users.noreply.github.com>
Date: Fri, 26 Jul 2024 05:33:14 -0400
Subject: [PATCH 16/21] Stardew Valley: Properly support Universal Tracker
 (#3630)

* save the seed in slot data to reuse it in UT

* add logging when seed is missing

* add UT test and fix bundle test

* self review

* run UT test on allsanity+mod so it's more meaningfull
---
 worlds/stardew_valley/__init__.py             | 28 ++++++++--
 worlds/stardew_valley/regions.py              | 11 ++--
 worlds/stardew_valley/test/__init__.py        | 17 +++---
 .../stardew_valley/test/rules/TestBundles.py  |  2 +-
 .../test/stability/StabilityOutputScript.py   | 15 +++---
 .../test/stability/TestStability.py           |  6 ++-
 .../test/stability/TestUniversalTracker.py    | 52 +++++++++++++++++++
 7 files changed, 105 insertions(+), 26 deletions(-)
 create mode 100644 worlds/stardew_valley/test/stability/TestUniversalTracker.py

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 1aba9af7ab..f9df8c292e 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -1,4 +1,5 @@
 import logging
+from random import Random
 from typing import Dict, Any, Iterable, Optional, Union, List, TextIO
 
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification, MultiWorld, CollectionState
@@ -27,15 +28,20 @@ from .strings.goal_names import Goal as GoalName
 from .strings.metal_names import Ore
 from .strings.region_names import Region as RegionName, LogicRegion
 
+logger = logging.getLogger(__name__)
+
+STARDEW_VALLEY = "Stardew Valley"
+UNIVERSAL_TRACKER_SEED_PROPERTY = "ut_seed"
+
 client_version = 0
 
 
 class StardewLocation(Location):
-    game: str = "Stardew Valley"
+    game: str = STARDEW_VALLEY
 
 
 class StardewItem(Item):
-    game: str = "Stardew Valley"
+    game: str = STARDEW_VALLEY
 
 
 class StardewWebWorld(WebWorld):
@@ -60,7 +66,7 @@ class StardewValleyWorld(World):
     Stardew Valley is an open-ended country-life RPG. You can farm, fish, mine, fight, complete quests,
     befriend villagers, and uncover dark secrets.
     """
-    game = "Stardew Valley"
+    game = STARDEW_VALLEY
     topology_present = False
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
@@ -95,6 +101,17 @@ class StardewValleyWorld(World):
         self.total_progression_items = 0
         # self.all_progression_items = dict()
 
+        # Taking the seed specified in slot data for UT, otherwise just generating the seed.
+        self.seed = getattr(multiworld, "re_gen_passthrough", {}).get(STARDEW_VALLEY, self.random.getrandbits(64))
+        self.random = Random(self.seed)
+
+    def interpret_slot_data(self, slot_data: Dict[str, Any]) -> Optional[int]:
+        # If the seed is not specified in the slot data, this mean the world was generated before Universal Tracker support.
+        seed = slot_data.get(UNIVERSAL_TRACKER_SEED_PROPERTY)
+        if seed is None:
+            logger.warning(f"World was generated before Universal Tracker support. Tracker might not be accurate.")
+        return seed
+
     def generate_early(self):
         self.force_change_options_if_incompatible()
         self.content = create_content(self.options)
@@ -108,12 +125,12 @@ class StardewValleyWorld(World):
             self.options.exclude_ginger_island.value = ExcludeGingerIsland.option_false
             goal_name = self.options.goal.current_key
             player_name = self.multiworld.player_name[self.player]
-            logging.warning(
+            logger.warning(
                 f"Goal '{goal_name}' requires Ginger Island. Exclude Ginger Island setting forced to 'False' for player {self.player} ({player_name})")
         if exclude_ginger_island and self.options.walnutsanity != Walnutsanity.preset_none:
             self.options.walnutsanity.value = Walnutsanity.preset_none
             player_name = self.multiworld.player_name[self.player]
-            logging.warning(
+            logger.warning(
                 f"Walnutsanity requires Ginger Island. Ginger Island was excluded from {self.player} ({player_name})'s world, so walnutsanity was force disabled")
 
     def create_regions(self):
@@ -413,6 +430,7 @@ class StardewValleyWorld(World):
         included_option_names: List[str] = [option_name for option_name in self.options_dataclass.type_hints if option_name not in excluded_option_names]
         slot_data = self.options.as_dict(*included_option_names)
         slot_data.update({
+            UNIVERSAL_TRACKER_SEED_PROPERTY: self.seed,
             "seed": self.random.randrange(1000000000),  # Seed should be max 9 digits
             "randomized_entrances": self.randomized_entrances,
             "modified_bundles": bundles,
diff --git a/worlds/stardew_valley/regions.py b/worlds/stardew_valley/regions.py
index 2aca2d3f4d..b0fc7fa0ea 100644
--- a/worlds/stardew_valley/regions.py
+++ b/worlds/stardew_valley/regions.py
@@ -137,7 +137,8 @@ vanilla_regions = [
                [Entrance.island_west_to_islandfarmhouse, Entrance.island_west_to_gourmand_cave, Entrance.island_west_to_crystals_cave,
                 Entrance.island_west_to_shipwreck, Entrance.island_west_to_qi_walnut_room, Entrance.use_farm_obelisk, Entrance.parrot_express_jungle_to_docks,
                 Entrance.parrot_express_jungle_to_dig_site, Entrance.parrot_express_jungle_to_volcano, LogicEntrance.grow_spring_crops_on_island,
-                LogicEntrance.grow_summer_crops_on_island, LogicEntrance.grow_fall_crops_on_island, LogicEntrance.grow_winter_crops_on_island, LogicEntrance.grow_indoor_crops_on_island],
+                LogicEntrance.grow_summer_crops_on_island, LogicEntrance.grow_fall_crops_on_island, LogicEntrance.grow_winter_crops_on_island,
+                LogicEntrance.grow_indoor_crops_on_island],
                is_ginger_island=True),
     RegionData(Region.island_east, [Entrance.island_east_to_leo_hut, Entrance.island_east_to_island_shrine], is_ginger_island=True),
     RegionData(Region.island_shrine, is_ginger_island=True),
@@ -536,7 +537,7 @@ def create_final_regions(world_options) -> List[RegionData]:
 def create_final_connections_and_regions(world_options) -> Tuple[Dict[str, ConnectionData], Dict[str, RegionData]]:
     regions_data: Dict[str, RegionData] = {region.name: region for region in create_final_regions(world_options)}
     connections = {connection.name: connection for connection in vanilla_connections}
-    connections = modify_connections_for_mods(connections, world_options.mods)
+    connections = modify_connections_for_mods(connections, sorted(world_options.mods.value))
     include_island = world_options.exclude_ginger_island == ExcludeGingerIsland.option_false
     return remove_ginger_island_regions_and_connections(regions_data, connections, include_island)
 
@@ -563,10 +564,8 @@ def remove_ginger_island_regions_and_connections(regions_by_name: Dict[str, Regi
     return connections, regions_by_name
 
 
-def modify_connections_for_mods(connections: Dict[str, ConnectionData], mods) -> Dict[str, ConnectionData]:
-    if mods is None:
-        return connections
-    for mod in mods.value:
+def modify_connections_for_mods(connections: Dict[str, ConnectionData], mods: Iterable) -> Dict[str, ConnectionData]:
+    for mod in mods:
         if mod not in ModDataList:
             continue
         if mod in vanilla_connections_to_remove_by_mod:
diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py
index bee02f3c3d..d077432e24 100644
--- a/worlds/stardew_valley/test/__init__.py
+++ b/worlds/stardew_valley/test/__init__.py
@@ -441,6 +441,16 @@ def setup_multiworld(test_options: Iterable[Dict[str, int]] = None, seed=None) -
     for i in range(1, len(test_options) + 1):
         multiworld.game[i] = StardewValleyWorld.game
         multiworld.player_name.update({i: f"Tester{i}"})
+    args = create_args(test_options)
+    multiworld.set_options(args)
+
+    for step in gen_steps:
+        call_all(multiworld, step)
+
+    return multiworld
+
+
+def create_args(test_options):
     args = Namespace()
     for name, option in StardewValleyWorld.options_dataclass.type_hints.items():
         options = {}
@@ -449,9 +459,4 @@ def setup_multiworld(test_options: Iterable[Dict[str, int]] = None, seed=None) -
             value = option(player_options[name]) if name in player_options else option.from_any(option.default)
             options.update({i: value})
         setattr(args, name, options)
-    multiworld.set_options(args)
-
-    for step in gen_steps:
-        call_all(multiworld, step)
-
-    return multiworld
+    return args
diff --git a/worlds/stardew_valley/test/rules/TestBundles.py b/worlds/stardew_valley/test/rules/TestBundles.py
index 25d4c70b2a..ab376c90d4 100644
--- a/worlds/stardew_valley/test/rules/TestBundles.py
+++ b/worlds/stardew_valley/test/rules/TestBundles.py
@@ -37,7 +37,7 @@ class TestRaccoonBundlesLogic(SVTestBase):
         options.BundlePrice: options.BundlePrice.option_normal,
         options.Craftsanity: options.Craftsanity.option_all,
     }
-    seed = 1234  # Magic seed that does what I want. Might need to get changed if we change the randomness behavior of raccoon bundles
+    seed = 2  # Magic seed that does what I want. Might need to get changed if we change the randomness behavior of raccoon bundles
 
     def test_raccoon_bundles_rely_on_previous_ones(self):
         # The first raccoon bundle is a fishing one
diff --git a/worlds/stardew_valley/test/stability/StabilityOutputScript.py b/worlds/stardew_valley/test/stability/StabilityOutputScript.py
index 4b31011d9f..c8918d6cf2 100644
--- a/worlds/stardew_valley/test/stability/StabilityOutputScript.py
+++ b/worlds/stardew_valley/test/stability/StabilityOutputScript.py
@@ -1,6 +1,7 @@
 import argparse
 import json
 
+from ...options import FarmType, EntranceRandomization
 from ...test import setup_solo_multiworld, allsanity_mods_6_x_x
 
 if __name__ == "__main__":
@@ -10,21 +11,23 @@ if __name__ == "__main__":
     args = parser.parse_args()
     seed = args.seed
 
-    multi_world = setup_solo_multiworld(
-        allsanity_mods_6_x_x(),
-        seed=seed
-    )
+    options = allsanity_mods_6_x_x()
+    options[FarmType.internal_name] = FarmType.option_standard
+    options[EntranceRandomization.internal_name] = EntranceRandomization.option_buildings
+    multi_world = setup_solo_multiworld(options, seed=seed)
 
+    world = multi_world.worlds[1]
     output = {
         "bundles": {
             bundle_room.name: {
                 bundle.name: str(bundle.items)
                 for bundle in bundle_room.bundles
             }
-            for bundle_room in multi_world.worlds[1].modified_bundles
+            for bundle_room in world.modified_bundles
         },
         "items": [item.name for item in multi_world.get_items()],
-        "location_rules": {location.name: repr(location.access_rule) for location in multi_world.get_locations(1)}
+        "location_rules": {location.name: repr(location.access_rule) for location in multi_world.get_locations(1)},
+        "slot_data": world.fill_slot_data()
     }
 
     print(json.dumps(output))
diff --git a/worlds/stardew_valley/test/stability/TestStability.py b/worlds/stardew_valley/test/stability/TestStability.py
index aaa8b33184..8bb904a56e 100644
--- a/worlds/stardew_valley/test/stability/TestStability.py
+++ b/worlds/stardew_valley/test/stability/TestStability.py
@@ -24,8 +24,7 @@ class TestGenerationIsStable(SVTestCase):
         if self.skip_long_tests:
             raise unittest.SkipTest("Long tests disabled")
 
-        # seed = get_seed(33778671150797368040) # troubleshooting seed
-        seed = get_seed(74716545478307145559)
+        seed = get_seed()
 
         output_a = subprocess.check_output([sys.executable, '-m', 'worlds.stardew_valley.test.stability.StabilityOutputScript', '--seed', str(seed)])
         output_b = subprocess.check_output([sys.executable, '-m', 'worlds.stardew_valley.test.stability.StabilityOutputScript', '--seed', str(seed)])
@@ -54,3 +53,6 @@ class TestGenerationIsStable(SVTestCase):
             # We check that the actual rule has the same order to make sure it is evaluated in the same order,
             #  so performance tests are repeatable as much as possible.
             self.assertEqual(rule_a, rule_b, f"Location rule of {location_a} at index {i} is different between both executions. Seed={seed}")
+
+        for key, value in result_a["slot_data"].items():
+            self.assertEqual(value, result_b["slot_data"][key], f"Slot data {key} is different between both executions. Seed={seed}")
diff --git a/worlds/stardew_valley/test/stability/TestUniversalTracker.py b/worlds/stardew_valley/test/stability/TestUniversalTracker.py
new file mode 100644
index 0000000000..3e33409834
--- /dev/null
+++ b/worlds/stardew_valley/test/stability/TestUniversalTracker.py
@@ -0,0 +1,52 @@
+import unittest
+from unittest.mock import Mock
+
+from .. import SVTestBase, create_args, allsanity_mods_6_x_x
+from ... import STARDEW_VALLEY, FarmType, BundleRandomization, EntranceRandomization
+
+
+class TestUniversalTrackerGenerationIsStable(SVTestBase):
+    options = allsanity_mods_6_x_x()
+    options.update({
+        EntranceRandomization.internal_name: EntranceRandomization.option_buildings,
+        BundleRandomization.internal_name: BundleRandomization.option_shuffled,
+        FarmType.internal_name: FarmType.option_standard,  # Need to choose one  otherwise it's random
+    })
+
+    def test_all_locations_and_items_are_the_same_between_two_generations(self):
+        # This might open a kivy window temporarily, but it's the only way to test this...
+        if self.skip_long_tests:
+            raise unittest.SkipTest("Long tests disabled")
+
+        try:
+            # This test only run if UT is present, so no risk of running in the CI.
+            from worlds.tracker.TrackerClient import TrackerGameContext  # noqa
+        except ImportError:
+            raise unittest.SkipTest("UT not loaded, skipping test")
+
+        slot_data = self.world.fill_slot_data()
+        ut_data = self.world.interpret_slot_data(slot_data)
+
+        fake_context = Mock()
+        fake_context.re_gen_passthrough = {STARDEW_VALLEY: ut_data}
+        args = create_args({0: self.options})
+        args.outputpath = None
+        args.outputname = None
+        args.multi = 1
+        args.race = None
+        args.plando_options = self.multiworld.plando_options
+        args.plando_items = self.multiworld.plando_items
+        args.plando_texts = self.multiworld.plando_texts
+        args.plando_connections = self.multiworld.plando_connections
+        args.game = self.multiworld.game
+        args.name = self.multiworld.player_name
+        args.sprite = {}
+        args.sprite_pool = {}
+        args.skip_output = True
+
+        generated_multi_world = TrackerGameContext.TMain(fake_context, args, self.multiworld.seed)
+        generated_slot_data = generated_multi_world.worlds[1].fill_slot_data()
+
+        # Just checking slot data should prove that UT generates the same result as AP generation.
+        self.maxDiff = None
+        self.assertEqual(slot_data, generated_slot_data)

From 6994f863e5917076b753d6d0ff771bd22e375732 Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:51:55 -0400
Subject: [PATCH 17/21] Core: Make excluded locations and priority locations
 excluded and remove unreachable code (#3424)

* Make excluded and priority locations excluded

* Only pass on KeyError

* Alternative/Clearer format
---
 Main.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Main.py b/Main.py
index de6b467f93..56b3a6545d 100644
--- a/Main.py
+++ b/Main.py
@@ -124,14 +124,19 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
     for player in multiworld.player_ids:
         exclusion_rules(multiworld, player, multiworld.worlds[player].options.exclude_locations.value)
         multiworld.worlds[player].options.priority_locations.value -= multiworld.worlds[player].options.exclude_locations.value
+        world_excluded_locations = set()
         for location_name in multiworld.worlds[player].options.priority_locations.value:
             try:
                 location = multiworld.get_location(location_name, player)
-            except KeyError as e:  # failed to find the given location. Check if it's a legitimate location
-                if location_name not in multiworld.worlds[player].location_name_to_id:
-                    raise Exception(f"Unable to prioritize location {location_name} in player {player}'s world.") from e
-            else:
+            except KeyError:
+                continue
+
+            if location.progress_type != LocationProgressType.EXCLUDED:
                 location.progress_type = LocationProgressType.PRIORITY
+            else:
+                logger.warning(f"Unable to prioritize location \"{location_name}\" in player {player}'s world because the world excluded it.")
+                world_excluded_locations.add(location_name)
+        multiworld.worlds[player].options.priority_locations.value -= world_excluded_locations
 
     # Set local and non-local item rules.
     if multiworld.players > 1:

From e5c9b8ad0c8f6d6866dfb3be78952c77b666cffd Mon Sep 17 00:00:00 2001
From: CookieCat <81494827+CookieCat45@users.noreply.github.com>
Date: Sat, 27 Jul 2024 13:16:52 -0400
Subject: [PATCH 18/21] AHIT: Generation error fixes and some other bug fixes
 (#3663)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* duh

* Fuck it

* Major fixes

* a

* b

* Even more fixes

* New option - NoFreeRoamFinale

* a

* Hat Logic Fix

* Just to be safe

* multiworld.random to world.random

* KeyError fix

* Update .gitignore

* Update __init__.py

* Zoinks Scoob

* ffs

* Ruh Roh Raggy, more r-r-r-random bugs!

* 0.9b - cleanup + expanded logic difficulty

* Update Rules.py

* Update Regions.py

* AttributeError fix

* 0.10b - New Options

* 1.0 Preparations

* Docs

* Docs 2

* Fixes

* Update __init__.py

* Fixes

* variable capture my beloathed

* Fixes

* a

* 10 Seconds logic fix

* 1.1

* 1.2

* a

* New client

* More client changes

* 1.3

* Final touch-ups for 1.3

* 1.3.1

* 1.3.3

* Zero Jumps gen error fix

* more fixes

* Formatting improvements

* typo

* Update __init__.py

* Revert "Update __init__.py"

This reverts commit e178a7c0a6904ace803241cab3021d7b97177e90.

* init

* Update to new options API

* Missed some

* Snatcher Coins fix

* Missed some more

* some slight touch ups

* rewind

* a

* fix things

* Revert "Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit"

This reverts commit a2360fe197e77a723bb70006c5eb5725c7ed3826, reversing
changes made to b8948bc4958855c6e342e18bdb8dc81cfcf09455.

* Update .gitignore

* 1.3.6

* Final touch-ups

* Fix client and leftover old options api

* Delete setup-ahitclient.py

* Update .gitignore

* old python version fix

* proper warnings for invalid act plandos

* Update worlds/ahit/docs/en_A Hat in Time.md

Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com>

* Update worlds/ahit/docs/setup_en.md

Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com>

* 120 char per line

* "settings" to "options"

* Update DeathWishRules.py

* Update worlds/ahit/docs/en_A Hat in Time.md

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

* No more loading the data package

* cleanup + act plando fixes

* almost forgot

* Update Rules.py

* a

* Update worlds/ahit/Options.py

Co-authored-by: Ixrec <ericrhitchcock@gmail.com>

* Options stuff

* oop

* no unnecessary type hints

* warn about depot download length in setup guide

* Update worlds/ahit/Options.py

Co-authored-by: Ixrec <ericrhitchcock@gmail.com>

* typo

Co-authored-by: Ixrec <ericrhitchcock@gmail.com>

* Update worlds/ahit/Rules.py

Co-authored-by: Ixrec <ericrhitchcock@gmail.com>

* review stuff

* More stuff from review

* comment

* 1.5 Update

* link fix?

* link fix 2

* Update setup_en.md

* Update setup_en.md

* Update setup_en.md

* Evil

* Good fucking lord

* Review stuff again + Logic fixes

* More review stuff

* Even more review stuff - we're almost done

* DW review stuff

* Finish up review stuff

* remove leftover stuff

* a

* assert item

* add A Hat in Time to readme/codeowners files

* Fix range options not being corrected properly

* 120 chars per line in docs

* Update worlds/ahit/Regions.py

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

* Update worlds/ahit/DeathWishLocations.py

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

* Remove some unnecessary option.class.value

* Remove data_version and more option.class.value

* Update worlds/ahit/Items.py

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

* Remove the rest of option.class.value

* Update worlds/ahit/DeathWishLocations.py

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

* review stuff

* Replace connect_regions with Region.connect

* review stuff

* Remove unnecessary Optional from LocData

* Remove HatType.NONE

* Update worlds/ahit/test/TestActs.py

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

* fix so default tests actually don't run

* Improve performance for death wish rules

* rename test file

* change test imports

* 1000 is probably unnecessary

* a

* change state.count to state.has

* stuff

* starting inventory hats fix

* shouldn't have done this lol

* make ship shape task goal equal to number of tasksanity checks if set to 0

* a

* change act shuffle starting acts + logic updates

* dumb

* option groups + lambda capture cringe + typo

* a

* b

* missing option in groups

* c

* Fix Your Contract Has Expired being placed on first level when it shouldn't

* yche fix

* formatting

* major logic bug fix for death wish

* Update Regions.py

* Add missing indirect connections

* Fix generation error from chapter 2 start with act shuffle off

* a

* Revert "a"

This reverts commit df58bbcd998585760cc6ac9ea54b6fdf142b4fd1.

* Revert "Fix generation error from chapter 2 start with act shuffle off"

This reverts commit 0f4d441824af34bf7a7cff19f5f14161752d8661.

* bunch of fixes

* Update Regions.py

* Update __init__.py

* Update __init__.py

* Update __init__.py

* Update Regions.py

* Update worlds/ahit/__init__.py

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

* Update __init__.py

* Update __init__.py

---------

Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
---
 worlds/ahit/Items.py    |  2 +-
 worlds/ahit/Regions.py  | 12 +++++++++--
 worlds/ahit/Rules.py    | 16 ++++++---------
 worlds/ahit/__init__.py | 44 ++++++++++++++++++++++++++---------------
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/worlds/ahit/Items.py b/worlds/ahit/Items.py
index 3ef83fe81e..54c6e6b5d3 100644
--- a/worlds/ahit/Items.py
+++ b/worlds/ahit/Items.py
@@ -39,7 +39,7 @@ def create_itempool(world: "HatInTimeWorld") -> List[Item]:
                 continue
         else:
             if name == "Scooter Badge":
-                if world.options.CTRLogic is CTRLogic.option_scooter or get_difficulty(world) >= Difficulty.MODERATE:
+                if world.options.CTRLogic == CTRLogic.option_scooter or get_difficulty(world) >= Difficulty.MODERATE:
                     item_type = ItemClassification.progression
             elif name == "No Bonk Badge" and world.is_dw():
                 item_type = ItemClassification.progression
diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py
index c6aeaa3577..8cb3782bde 100644
--- a/worlds/ahit/Regions.py
+++ b/worlds/ahit/Regions.py
@@ -659,6 +659,10 @@ def is_valid_act_combo(world: "HatInTimeWorld", entrance_act: Region,
             if exit_act.name not in chapter_finales:
                 return False
 
+    exit_chapter: str = act_chapters.get(exit_act.name)
+    # make sure that certain time rift combinations never happen
+    always_block: bool = exit_chapter != "Mafia Town" and exit_chapter != "Subcon Forest"
+    if not ignore_certain_rules or always_block:
         if entrance_act.name in rift_access_regions and exit_act.name in rift_access_regions[entrance_act.name]:
             return False
 
@@ -684,9 +688,12 @@ def is_valid_first_act(world: "HatInTimeWorld", act: Region) -> bool:
     if act.name not in guaranteed_first_acts:
         return False
 
+    if world.options.ActRandomizer == ActRandomizer.option_light and "Time Rift" in act.name:
+        return False
+
     # If there's only a single level in the starting chapter, only allow Mafia Town or Subcon Forest levels
     start_chapter = world.options.StartingChapter
-    if start_chapter is ChapterIndex.ALPINE or start_chapter is ChapterIndex.SUBCON:
+    if start_chapter == ChapterIndex.ALPINE or start_chapter == ChapterIndex.SUBCON:
         if "Time Rift" in act.name:
             return False
 
@@ -723,7 +730,8 @@ def is_valid_first_act(world: "HatInTimeWorld", act: Region) -> bool:
     elif act.name == "Contractual Obligations" and world.options.ShuffleSubconPaintings:
         return False
 
-    if world.options.ShuffleSubconPaintings and act_chapters.get(act.name, "") == "Subcon Forest":
+    if world.options.ShuffleSubconPaintings and "Time Rift" not in act.name \
+       and act_chapters.get(act.name, "") == "Subcon Forest":
         # Only allow Subcon levels if painting skips are allowed
         if diff < Difficulty.MODERATE or world.options.NoPaintingSkips:
             return False
diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py
index b0513c4332..b716b793a7 100644
--- a/worlds/ahit/Rules.py
+++ b/worlds/ahit/Rules.py
@@ -1,7 +1,6 @@
 from worlds.AutoWorld import CollectionState
 from worlds.generic.Rules import add_rule, set_rule
-from .Locations import location_table, zipline_unlocks, is_location_valid, contract_locations, \
-    shop_locations, event_locs
+from .Locations import location_table, zipline_unlocks, is_location_valid, shop_locations, event_locs
 from .Types import HatType, ChapterIndex, hat_type_to_item, Difficulty, HitType
 from BaseClasses import Location, Entrance, Region
 from typing import TYPE_CHECKING, List, Callable, Union, Dict
@@ -148,14 +147,14 @@ def set_rules(world: "HatInTimeWorld"):
     if world.is_dlc1():
         chapter_list.append(ChapterIndex.CRUISE)
 
-    if world.is_dlc2() and final_chapter is not ChapterIndex.METRO:
+    if world.is_dlc2() and final_chapter != ChapterIndex.METRO:
         chapter_list.append(ChapterIndex.METRO)
 
     chapter_list.remove(starting_chapter)
     world.random.shuffle(chapter_list)
 
     # Make sure Alpine is unlocked before any DLC chapters are, as the Alpine door needs to be open to access them
-    if starting_chapter is not ChapterIndex.ALPINE and (world.is_dlc1() or world.is_dlc2()):
+    if starting_chapter != ChapterIndex.ALPINE and (world.is_dlc1() or world.is_dlc2()):
         index1 = 69
         index2 = 69
         pos: int
@@ -165,7 +164,7 @@ def set_rules(world: "HatInTimeWorld"):
         if world.is_dlc1():
             index1 = chapter_list.index(ChapterIndex.CRUISE)
 
-        if world.is_dlc2() and final_chapter is not ChapterIndex.METRO:
+        if world.is_dlc2() and final_chapter != ChapterIndex.METRO:
             index2 = chapter_list.index(ChapterIndex.METRO)
 
         lowest_index = min(index1, index2)
@@ -242,9 +241,6 @@ def set_rules(world: "HatInTimeWorld"):
         if not is_location_valid(world, key):
             continue
 
-        if key in contract_locations.keys():
-            continue
-
         loc = world.multiworld.get_location(key, world.player)
 
         for hat in data.required_hats:
@@ -256,7 +252,7 @@ def set_rules(world: "HatInTimeWorld"):
         if data.paintings > 0 and world.options.ShuffleSubconPaintings:
             add_rule(loc, lambda state, paintings=data.paintings: has_paintings(state, world, paintings))
 
-        if data.hit_type is not HitType.none and world.options.UmbrellaLogic:
+        if data.hit_type != HitType.none and world.options.UmbrellaLogic:
             if data.hit_type == HitType.umbrella:
                 add_rule(loc, lambda state: state.has("Umbrella", world.player))
 
@@ -518,7 +514,7 @@ def set_hard_rules(world: "HatInTimeWorld"):
                  lambda state: can_use_hat(state, world, HatType.ICE))
 
         # Hard: clear Rush Hour with Brewing Hat only
-        if world.options.NoTicketSkips is not NoTicketSkips.option_true:
+        if world.options.NoTicketSkips != NoTicketSkips.option_true:
             set_rule(world.multiworld.get_location("Act Completion (Rush Hour)", world.player),
                      lambda state: can_use_hat(state, world, HatType.BREWING))
         else:
diff --git a/worlds/ahit/__init__.py b/worlds/ahit/__init__.py
index 15140379b9..dd5e88abbc 100644
--- a/worlds/ahit/__init__.py
+++ b/worlds/ahit/__init__.py
@@ -1,15 +1,16 @@
 from BaseClasses import Item, ItemClassification, Tutorial, Location, MultiWorld
 from .Items import item_table, create_item, relic_groups, act_contracts, create_itempool, get_shop_trap_name, \
-    calculate_yarn_costs
+    calculate_yarn_costs, alps_hooks
 from .Regions import create_regions, randomize_act_entrances, chapter_act_info, create_events, get_shuffled_region
 from .Locations import location_table, contract_locations, is_location_valid, get_location_names, TASKSANITY_START_ID, \
     get_total_locations
-from .Rules import set_rules
+from .Rules import set_rules, has_paintings
 from .Options import AHITOptions, slot_data_options, adjust_options, RandomizeHatOrder, EndGoal, create_option_groups
-from .Types import HatType, ChapterIndex, HatInTimeItem, hat_type_to_item
+from .Types import HatType, ChapterIndex, HatInTimeItem, hat_type_to_item, Difficulty
 from .DeathWishLocations import create_dw_regions, dw_classes, death_wishes
 from .DeathWishRules import set_dw_rules, create_enemy_events, hit_list, bosses
 from worlds.AutoWorld import World, WebWorld, CollectionState
+from worlds.generic.Rules import add_rule
 from typing import List, Dict, TextIO
 from worlds.LauncherComponents import Component, components, icon_paths, launch_subprocess, Type
 from Utils import local_path
@@ -86,19 +87,27 @@ class HatInTimeWorld(World):
         if self.is_dw_only():
             return
 
-        # If our starting chapter is 4 and act rando isn't on, force hookshot into inventory
-        # If starting chapter is 3 and painting shuffle is enabled, and act rando isn't, give one free painting unlock
-        start_chapter: ChapterIndex = ChapterIndex(self.options.StartingChapter)
+        # Take care of some extremely restrictive starts in other chapters with act shuffle off
+        if not self.options.ActRandomizer:
+            start_chapter = self.options.StartingChapter
+            if start_chapter == ChapterIndex.ALPINE:
+                self.multiworld.push_precollected(self.create_item("Hookshot Badge"))
+                if self.options.UmbrellaLogic:
+                    self.multiworld.push_precollected(self.create_item("Umbrella"))
 
-        if start_chapter == ChapterIndex.ALPINE or start_chapter == ChapterIndex.SUBCON:
-            if not self.options.ActRandomizer:
-                if start_chapter == ChapterIndex.ALPINE:
-                    self.multiworld.push_precollected(self.create_item("Hookshot Badge"))
-                    if self.options.UmbrellaLogic:
-                        self.multiworld.push_precollected(self.create_item("Umbrella"))
-
-                if start_chapter == ChapterIndex.SUBCON and self.options.ShuffleSubconPaintings:
+                if self.options.ShuffleAlpineZiplines:
+                    ziplines = list(alps_hooks.keys())
+                    ziplines.remove("Zipline Unlock - The Twilight Bell Path")  # not enough checks from this one
+                    self.multiworld.push_precollected(self.create_item(self.random.choice(ziplines)))
+            elif start_chapter == ChapterIndex.SUBCON:
+                if self.options.ShuffleSubconPaintings:
                     self.multiworld.push_precollected(self.create_item("Progressive Painting Unlock"))
+            elif start_chapter == ChapterIndex.BIRDS:
+                if self.options.UmbrellaLogic:
+                    if self.options.LogicDifficulty < Difficulty.EXPERT:
+                        self.multiworld.push_precollected(self.create_item("Umbrella"))
+                elif self.options.LogicDifficulty < Difficulty.MODERATE:
+                    self.multiworld.push_precollected(self.create_item("Umbrella"))
 
     def create_regions(self):
         # noinspection PyClassVar
@@ -119,7 +128,10 @@ class HatInTimeWorld(World):
         # place vanilla contract locations if contract shuffle is off
         if not self.options.ShuffleActContracts:
             for name in contract_locations.keys():
-                self.multiworld.get_location(name, self.player).place_locked_item(create_item(self, name))
+                loc = self.get_location(name)
+                loc.place_locked_item(create_item(self, name))
+                if self.options.ShuffleSubconPaintings and loc.name != "Snatcher's Contract - The Subcon Well":
+                    add_rule(loc, lambda state: has_paintings(state, self, 1))
 
     def create_items(self):
         if self.has_yarn():
@@ -317,7 +329,7 @@ class HatInTimeWorld(World):
 
     def remove(self, state: "CollectionState", item: "Item") -> bool:
         old_count: int = state.count(item.name, self.player)
-        change = super().collect(state, item)
+        change = super().remove(state, item)
         if change and old_count == 1:
             if "Stamp" in item.name:
                 if "2 Stamp" in item.name:

From 35ed0d4e19791281523dcab5901ff8785823badb Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 27 Jul 2024 17:17:34 -0400
Subject: [PATCH 19/21] Lingo: Fix Rhyme Room LEAP panel logic (#3699)

---
 worlds/lingo/data/LL1.yaml      |   2 ++
 worlds/lingo/data/generated.dat | Bin 148903 -> 148927 bytes
 2 files changed, 2 insertions(+)

diff --git a/worlds/lingo/data/LL1.yaml b/worlds/lingo/data/LL1.yaml
index 1c9f4e551d..5d10f07747 100644
--- a/worlds/lingo/data/LL1.yaml
+++ b/worlds/lingo/data/LL1.yaml
@@ -7649,6 +7649,8 @@
       LEAP:
         id: Double Room/Panel_leap_leap
         tag: midwhite
+        required_door:
+          door: Door to Cross
     doors:
       Door to Cross:
         id: Double Room Area Doors/Door_room_4a
diff --git a/worlds/lingo/data/generated.dat b/worlds/lingo/data/generated.dat
index d221b8168d9164576b3f1c5b2fc57c604da5f100..ad412fc352541d2dee982829f5484a85b9d2b446 100644
GIT binary patch
delta 3860
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
ZimIZDvPI=pdXuiSN?*{vGe-#z{vZ0lg7g3Y

delta 3797
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
RrqfE!sB*StUxsG%`!6G{Tt5H+


From e38f5d0a6132797c49a27b1d9cce9350270ce182 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Sat, 27 Jul 2024 17:17:59 -0400
Subject: [PATCH 20/21] TUNIC: Update plando connection option call to use
 options API #3695

---
 worlds/tunic/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index b3aa1e6a34..5253e99514 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -121,7 +121,7 @@ class TunicWorld(World):
                 cls.seed_groups[group] = SeedGroup(logic_rules=tunic.options.logic_rules.value,
                                                    laurels_at_10_fairies=tunic.options.laurels_location == 3,
                                                    fixed_shop=bool(tunic.options.fixed_shop),
-                                                   plando=multiworld.plando_connections[tunic.player])
+                                                   plando=tunic.options.plando_connections)
                 continue
                 
             # lower value is more restrictive
@@ -134,9 +134,9 @@ class TunicWorld(World):
             if tunic.options.fixed_shop:
                 cls.seed_groups[group]["fixed_shop"] = True
 
-            if multiworld.plando_connections[tunic.player]:
+            if tunic.options.plando_connections:
                 # loop through the connections in the player's yaml
-                for cxn in multiworld.plando_connections[tunic.player]:
+                for cxn in tunic.options.plando_connections:
                     new_cxn = True
                     for group_cxn in cls.seed_groups[group]["plando"]:
                         # if neither entrance nor exit match anything in the group, add to group

From 34141f8de0d2274cc66da9c3ed8045a64bad31fa Mon Sep 17 00:00:00 2001
From: lilDavid <1337lilDavid@gmail.com>
Date: Sat, 27 Jul 2024 16:19:09 -0500
Subject: [PATCH 21/21] SMZ3: Classify "nice" items as useful (#3683)

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

diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index 6056a171d3..d78c9f7d82 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -215,7 +215,6 @@ class SMZ3World(World):
 
         niceItems = TotalSMZ3Item.Item.CreateNicePool(self.smz3World)
         junkItems = TotalSMZ3Item.Item.CreateJunkPool(self.smz3World)
-        allJunkItems = niceItems + junkItems
         self.junkItemsNames = [item.Type.name for item in junkItems]
 
         if (self.smz3World.Config.Keysanity):
@@ -228,7 +227,8 @@ class SMZ3World(World):
                 self.multiworld.push_precollected(SMZ3Item(item.Type.name, ItemClassification.filler, item.Type, self.item_name_to_id[item.Type.name], self.player, item))
 
         itemPool = [SMZ3Item(item.Type.name, ItemClassification.progression, item.Type, self.item_name_to_id[item.Type.name], self.player, item) for item in progressionItems] + \
-                    [SMZ3Item(item.Type.name, ItemClassification.filler, item.Type, self.item_name_to_id[item.Type.name], self.player, item) for item in allJunkItems]
+                    [SMZ3Item(item.Type.name, ItemClassification.useful, item.Type, self.item_name_to_id[item.Type.name], self.player, item) for item in niceItems] + \
+                    [SMZ3Item(item.Type.name, ItemClassification.filler, item.Type, self.item_name_to_id[item.Type.name], self.player, item) for item in junkItems]
         self.smz3DungeonItems = [SMZ3Item(item.Type.name, ItemClassification.progression, item.Type, self.item_name_to_id[item.Type.name], self.player, item) for item in self.dungeon]
         self.multiworld.itempool += itemPool