From e016228d2b76fa367889c9d98d6eb9e783f98cb4 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Fri, 15 Mar 2024 04:26:00 -0400 Subject: Lingo: Pre-compile datafile to improve loading time (#2829) --- items.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'items.py') diff --git a/items.py b/items.py index 9f8bf56..623cd79 100644 --- a/items.py +++ b/items.py @@ -16,7 +16,7 @@ class ItemData(NamedTuple): code: int classification: ItemClassification mode: Optional[str] - door_ids: List[str] + has_doors: bool painting_ids: List[str] def should_include(self, world: "LingoWorld") -> bool: @@ -61,7 +61,7 @@ def load_item_data(): door_mode = "doors" else: door_mode = "complex door" - door_groups.setdefault(door.group, []).extend(door.door_ids) + door_groups.setdefault(door.group, []) if room_name in PROGRESSION_BY_ROOM and door_name in PROGRESSION_BY_ROOM[room_name]: door_mode = "special" @@ -69,11 +69,11 @@ def load_item_data(): ALL_ITEM_TABLE[door.item_name] = \ ItemData(get_door_item_id(room_name, door_name), ItemClassification.filler if door.junk_item else ItemClassification.progression, door_mode, - door.door_ids, door.painting_ids) + door.has_doors, door.painting_ids) for group, group_door_ids in door_groups.items(): ALL_ITEM_TABLE[group] = ItemData(get_door_group_item_id(group), - ItemClassification.progression, "door group", group_door_ids, []) + ItemClassification.progression, "door group", True, []) special_items: Dict[str, ItemClassification] = { ":)": ItemClassification.filler, @@ -88,11 +88,11 @@ def load_item_data(): for item_name, classification in special_items.items(): ALL_ITEM_TABLE[item_name] = ItemData(get_special_item_id(item_name), classification, - "special", [], []) + "special", False, []) for item_name in PROGRESSIVE_ITEMS: ALL_ITEM_TABLE[item_name] = ItemData(get_progressive_item_id(item_name), - ItemClassification.progression, "special", [], []) + ItemClassification.progression, "special", False, []) # Initialize the item data at module scope. -- cgit 1.4.1