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

Lingo: Fix number hunt issues on panels mode (#4342)

This commit is contained in:
Star Rauchenberger 2024-12-10 14:36:38 -05:00 committed by GitHub
parent 5dd19fccd0
commit 925fb967d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
worlds/lingo/data/generated.dat
View File

Binary file not shown.

7
worlds/lingo/test/TestDatafile.py
View File

@ -1,7 +1,7 @@
import os
import unittest
from ..static_logic import HASHES
from ..static_logic import HASHES, PANELS_BY_ROOM
from ..utils.pickle_static_data import hash_file
@ -14,3 +14,8 @@ class TestDatafile(unittest.TestCase):
"LL1.yaml hash does not match generated.dat. Please regenerate using 'python worlds/lingo/utils/pickle_static_data.py'")
self.assertEqual(ids_file_hash, HASHES["ids.yaml"],
"ids.yaml hash does not match generated.dat. Please regenerate using 'python worlds/lingo/utils/pickle_static_data.py'")
def test_panel_doors_are_set(self) -> None:
# This panel is defined earlier in the file than the panel door, so we want to check that the panel door is
# correctly applied.
self.assertNotEqual(PANELS_BY_ROOM["Outside The Agreeable"]["FIVE (1)"].panel_door, None)

16
worlds/lingo/utils/pickle_static_data.py
View File

@ -111,6 +111,16 @@ def load_static_data(ll1_path, ids_path):
with open(ll1_path, "r") as file:
config = Utils.parse_yaml(file)
# We have to process all panel doors first so that panels can see what panel doors they're in even if they're
# defined earlier in the file than the panel door.
for room_name, room_data in config.items():
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)
# Process the rest of the room.
for room_name, room_data in config.items():
process_room(room_name, room_data)
@ -515,12 +525,6 @@ 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()