morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

The Messenger: Fix some transition plando issues (#4720)

Browse Source 
* don't allow one-way and two-way entrances to be connected to each other

* add special handling for the tower hq nodes since they share the same parent region
This commit is contained in:
Aaron Wagener
2025-03-10 21:13:49 -05:00
committed by GitHub
parent 06111ac6cf
commit 2c8dded52f
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/messenger/options.py
View File

@@ -51,6 +51,12 @@ class TransitionPlando(PlandoConnections):
entrances = frozenset(RANDOMIZED_CONNECTIONS.keys())
exits = frozenset(RANDOMIZED_CONNECTIONS.values())
@classmethod
def can_connect(cls, entrance: str, exit: str) -> bool:
if entrance != "Glacial Peak - Left" and entrance.lower() in cls.exits:
return exit.lower() in cls.entrances
return exit.lower() not in cls.entrances
class Logic(Choice):
"""

15
worlds/messenger/transitions.py
View File

@@ -30,10 +30,19 @@ def connect_plando(world: "MessengerWorld", plando_connections: TransitionPlando
for plando_connection in plando_connections:
# get the connecting regions
reg1 = world.get_region(plando_connection.entrance)
reg2 = world.get_region(plando_connection.exit)
# need to handle these special because the names are unique but have the same parent region
if plando_connection.entrance in ("Artificer", "Tower HQ"):
reg1 = world.get_region("Tower HQ")
if plando_connection.entrance == "Artificer":
dangling_exit = world.get_entrance("Artificer's Portal")
else:
dangling_exit = world.get_entrance("Artificer's Challenge")
reg1.exits.remove(dangling_exit)
else:
reg1 = world.get_region(plando_connection.entrance)
remove_dangling_exit(reg1)
remove_dangling_exit(reg1)
reg2 = world.get_region(plando_connection.exit)
remove_dangling_entrance(reg2)
# connect the regions
reg1.connect(reg2)