From 7ac0211cf04bdea70690e17a54a47fe0acbef688 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Thu, 8 Aug 2024 21:59:21 -0400
Subject: [PATCH] Make seed groups not sync decoupled

---
 worlds/tunic/__init__.py   | 16 +++++++---------
 worlds/tunic/er_scripts.py |  3 +--
 worlds/tunic/options.py    |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 0f72548cf5..0f50d79327 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -56,7 +56,7 @@ class SeedGroup(TypedDict):
     ladder_storage: int  # ls value
     laurels_at_10_fairies: bool  # laurels location value
     entrance_layout: int  # entrance layout value
-    decoupled: bool
+    has_decoupled_enabled: bool  # for checking that players don't have conflicting options
     plando: TunicPlandoConnections  # consolidated plando connections for the seed group
 
 
@@ -144,10 +144,11 @@ class TunicWorld(World):
                               ladder_storage=tunic.options.ladder_storage.value,
                               laurels_at_10_fairies=tunic.options.laurels_location == LaurelsLocation.option_10_fairies,
                               entrance_layout=tunic.options.entrance_layout.value,
-                              decoupled=bool(tunic.options.decoupled),
+                              has_decoupled_enabled=bool(tunic.options.decoupled),
                               plando=tunic.options.plando_connections)
                 continue
-
+            if bool(tunic.options.decoupled) != cls.seed_groups[group]["has_decoupled_enabled"]:
+                raise OptionError("TUNIC: All players in a seed group must have Decoupled either enabled or disabled.")
             # off is more restrictive
             if not tunic.options.laurels_zips:
                 cls.seed_groups[group]["laurels_zips"] = False
@@ -167,15 +168,12 @@ class TunicWorld(World):
                 elif cls.seed_groups[group]["entrance_layout"] != tunic.options.entrance_layout.value:
                     raise OptionError(f"TUNIC: Conflict between seed group {group}'s Entrance Layout options. "
                                       f"Seed group cannot have both Fixed Shop and Direction Pairs enabled.")
-            # decoupled loses to coupled, I could instead make this fail but eh
-            if not tunic.options.decoupled:
-                cls.seed_groups[group]["decoupled"] = False
             if tunic.options.plando_connections:
                 # loop through the connections in the player's yaml
                 for cxn in tunic.options.plando_connections:
                     new_cxn = True
-                    # if they used the entrance direction, just swap it around so we don't have to deal with it
-                    if cxn.direction == "exit" and cls.seed_groups[group]["decoupled"]:
+                    # if they used the entrance direction, just swap it around so that we don't have to deal with it
+                    if cxn.direction == "exit" and tunic.options.decoupled:
                         player_cxn = PlandoConnection(entrance=cxn.exit, exit=cxn.entrance, direction="entrance", percentage=cxn.percentage)
                     else:
                         player_cxn = cxn
@@ -184,7 +182,7 @@ class TunicWorld(World):
                         if ((player_cxn.entrance == group_cxn.entrance and player_cxn.exit == group_cxn.exit)
                                 # if decoupled is off, the entrance and exit can be swapped
                                 or (player_cxn.exit == group_cxn.entrance and player_cxn.entrance == group_cxn.exit
-                                    and not cls.seed_groups[group]["decoupled"])):
+                                    and not tunic.options.decoupled)):
                             new_cxn = False
                             break
 
diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py
index 5a823cae10..6a39aeab31 100644
--- a/worlds/tunic/er_scripts.py
+++ b/worlds/tunic/er_scripts.py
@@ -194,7 +194,6 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
         ladder_storage = seed_group["ladder_storage"]
         entrance_layout = seed_group["entrance_layout"]
         laurels_location = "10_fairies" if seed_group["laurels_at_10_fairies"] is True else False
-        decoupled = seed_group["decoupled"]
 
     logic_tricks: Tuple[bool, int, int] = (laurels_zips, ice_grappling, ladder_storage)
 
@@ -377,7 +376,7 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
                 two_plus.remove(portal1)
             else:
                 # if not both, they're both dead ends
-                if not portal2:
+                if not portal2 and not decoupled:
                     if world.options.entrance_rando.value not in EntranceRando.options.values():
                         raise Exception(f"Tunic ER seed group {world.options.entrance_rando.value} paired a dead "
                                         "end to a dead end in their plando connections.")
diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py
index e3193a393c..94413b37ee 100644
--- a/worlds/tunic/options.py
+++ b/worlds/tunic/options.py
@@ -149,7 +149,7 @@ class EntranceLayout(Choice):
 class Decoupled(Toggle):
     """
     Decouple the entrances, so that when you go from one entrance to another, the return trip won't necessarily bring you back to the same place.
-    Note: For seed groups, if any player in a seed group does not have Decoupled enabled, no one in the seed group will have Decoupled entrances.
+    Note: For seed groups, all players in the group must have this option enabled or disabled.
     """
     internal_name = "decoupled"
     display_name = "Decoupled Entrances"