mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-29 17:03:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make seed groups in decoupled with overlapping but not fully overlapped plando connections interact nicely without messing with what the entrances look like in the spoiler log

Browse Source
This commit is contained in:
Scipio Wright
2024-08-09 20:59:03 -04:00
parent df0aa3c181
commit b559422450
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
worlds/tunic/__init__.py
View File

@@ -57,7 +57,7 @@ class SeedGroup(TypedDict):
laurels_at_10_fairies: bool # laurels location value
entrance_layout: int # entrance layout value
has_decoupled_enabled: bool # for checking that players don't have conflicting options
plando: TunicPlandoConnections # consolidated plando connections for the seed group
plando: List[PlandoConnection] # consolidated plando connections for the seed group
class TunicWorld(World):
@@ -90,7 +90,7 @@ class TunicWorld(World):
self.er_regions = tunic_er_regions.copy()
if self.options.plando_connections:
for index, cxn in enumerate(self.options.plando_connections):
# flip any that are pointing to exit to point to entrance so I don't have to deal with it
# flip any that are pointing to exit to point to entrance so that I don't have to deal with it
if self.options.decoupled and cxn.direction == "exit":
replacement = PlandoConnection(entrance=cxn.exit, exit=cxn.entrance, direction="entrance", percentage=cxn.percentage)
self.options.plando_connections.value.remove(cxn)
@@ -155,11 +155,12 @@ class TunicWorld(World):
laurels_at_10_fairies=tunic.options.laurels_location == LaurelsLocation.option_10_fairies,
entrance_layout=tunic.options.entrance_layout.value,
has_decoupled_enabled=bool(tunic.options.decoupled),
plando=tunic.options.plando_connections)
plando=tunic.options.plando_connections.value.copy())
continue
# I feel that syncing this one is worse than erroring out
if bool(tunic.options.decoupled) != cls.seed_groups[group]["has_decoupled_enabled"]:
raise OptionError(f"TUNIC: All players in the seed group {group} must have Decoupled either enabled or disabled.")
raise OptionError(f"TUNIC: All players in the seed group {group} must "
f"have Decoupled either enabled or disabled.")
# off is more restrictive
if not tunic.options.laurels_zips:
cls.seed_groups[group]["laurels_zips"] = False
@@ -197,8 +198,8 @@ class TunicWorld(World):
new_cxn = False
# if the group's was one-way and the player's was two-way, we replace the group's now
if player_cxn.direction == "both" and group_cxn.direction == "entrance":
cls.seed_groups[group]["plando"].value.remove(group_cxn)
cls.seed_groups[group]["plando"].value.insert(index, player_cxn)
cls.seed_groups[group]["plando"].remove(group_cxn)
cls.seed_groups[group]["plando"].insert(index, player_cxn)
break
is_mismatched = (
player_cxn.entrance == group_cxn.entrance and player_cxn.exit != group_cxn.exit
@@ -217,7 +218,7 @@ class TunicWorld(World):
f"{tunic.multiworld.get_player_name(tunic.player)}'s plando "
f"connection {player_cxn.entrance} {player_dir} {player_cxn.exit}")
if new_cxn:
cls.seed_groups[group]["plando"].value.append(player_cxn)
cls.seed_groups[group]["plando"].append(player_cxn)
def create_item(self, name: str, classification: ItemClassification = None) -> TunicItem:
item_data = item_table[name]

17
worlds/tunic/er_scripts.py
View File

@@ -352,9 +352,22 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
two_plus2 = two_plus
if plando_connections:
if decoupled:
modified_plando_connections = plando_connections.copy()
for index, cxn in enumerate(modified_plando_connections):
# it's much easier if we split both-direction portals into two one-ways in decoupled
if cxn.direction == "both":
replacement1 = PlandoConnection(cxn.entrance, cxn.exit, "entrance")
replacement2 = PlandoConnection(cxn.exit, cxn.entrance, "entrance")
modified_plando_connections.remove(cxn)
modified_plando_connections.insert(index, replacement1)
modified_plando_connections.append(replacement2)
else:
modified_plando_connections = plando_connections
connected_shop_portal1s: Set[int] = set()
connected_shop_portal2s: Set[int] = set()
for connection in plando_connections:
for connection in modified_plando_connections:
p_entrance = connection.entrance
p_exit = connection.exit
# if you plando secret gathering place, need to know that during portal pairing
@@ -457,8 +470,6 @@ def pair_portals(world: "TunicWorld", regions: Dict[str, Region]) -> Dict[Portal
if decoupled:
# we turn any plando that uses "exit" to use "entrance" instead
traversal_reqs.setdefault(portal1.region, dict())[get_portal_outlet_region(portal2, world)] = []
if connection.direction == "both":
traversal_reqs.setdefault(portal2.region, dict())[get_portal_outlet_region(portal1, world)] = []
# outside decoupled, we want to use what we were doing before decoupled got added
else:
# update the traversal chart to say you can get from portal1's region to portal2's and vice versa

2
worlds/tunic/options.py
View File

@@ -337,7 +337,7 @@ tunic_option_groups = [
EntranceRando,
EntranceLayout,
Decoupled,
PlandoConnections,
TunicPlandoConnections,
]),
]