monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lingo: Made entrance names unique (#2454)

This commit is contained in:
Star Rauchenberger 2023-11-12 20:22:05 -05:00 committed by GitHub
parent 4d711a0aa5
commit cc0ea6a9e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worlds/lingo/regions.py
View File

@ -43,7 +43,7 @@ def connect_painting(regions: Dict[str, Region], warp_enter: str, warp_exit: str
source_region = regions[source_painting.room] source_region = regions[source_painting.room]
source_region.connect( source_region.connect(
target_region, target_region,
f"{source_painting.room} to {target_painting.room} (Painting)", f"{source_painting.room} to {target_painting.room} ({source_painting.id} Painting)",
lambda state: lingo_can_use_entrance(state, target_painting.room, source_painting.required_door, world.player, lambda state: lingo_can_use_entrance(state, target_painting.room, source_painting.required_door, world.player,
player_logic)) player_logic))
@ -67,10 +67,17 @@ def create_regions(world: "LingoWorld", player_logic: LingoPlayerLogic) -> None:
if entrance.painting and painting_shuffle: if entrance.painting and painting_shuffle:
continue continue
entrance_name = f"{entrance.room} to {room.name}"
if entrance.door is not None:
if entrance.door.room is not None:
entrance_name += f" (through {entrance.door.room} - {entrance.door.door})"
else:
entrance_name += f" (through {room.name} - {entrance.door.door})"
regions[entrance.room].connect( regions[entrance.room].connect(
regions[room.name], regions[room.name], entrance_name,
f"{entrance.room} to {room.name}", lambda state, r=room, e=entrance: lingo_can_use_entrance(state, r.name, e.door, world.player,
lambda state, r=room, e=entrance: lingo_can_use_entrance(state, r.name, e.door, world.player, player_logic)) player_logic))
handle_pilgrim_room(regions, world, player_logic) handle_pilgrim_room(regions, world, player_logic)