1 files changed, 19 insertions, 20 deletions

@@ -1,8 +1,14 @@
-from typing import Dict, List, NamedTuple, Optional, TYPE_CHECKING
+from enum import Enum
+from typing import Dict, List, NamedTuple, Set
 
 from BaseClasses import Item, ItemClassification
-from .static_logic import DOORS_BY_ROOM, PROGRESSION_BY_ROOM, PROGRESSIVE_ITEMS, get_door_group_item_id, \
-    get_door_item_id, get_progressive_item_id, get_special_item_id
+from .static_logic import DOORS_BY_ROOM, PROGRESSIVE_ITEMS, get_door_group_item_id, get_door_item_id, \
+    get_progressive_item_id, get_special_item_id
+
+
+class ItemType(Enum):
+    NORMAL = 1
+    COLOR = 2
 
 
 class ItemData(NamedTuple):
@@ -11,7 +17,7 @@ class ItemData(NamedTuple):
     """
     code: int
     classification: ItemClassification
-    mode: Optional[str]
+    type: ItemType
     has_doors: bool
     painting_ids: List[str]
 
@@ -34,36 +40,29 @@ def load_item_data():
 
     for color in ["Black", "Red", "Blue", "Yellow", "Green", "Orange", "Gray", "Brown", "Purple"]:
         ALL_ITEM_TABLE[color] = ItemData(get_special_item_id(color), ItemClassification.progression,
-                                         "colors", [], [])
+                                         ItemType.COLOR, False, [])
         ITEMS_BY_GROUP.setdefault("Colors", []).append(color)
 
-    door_groups: Dict[str, List[str]] = {}
+    door_groups: Set[str] = set()
     for room_name, doors in DOORS_BY_ROOM.items():
         for door_name, door in doors.items():
             if door.skip_item is True or door.event is True:
                 continue
 
-            if door.door_group is None:
-                door_mode = "doors"
-            else:
-                door_mode = "complex door"
-                door_groups.setdefault(door.door_group, [])
-
-            if room_name in PROGRESSION_BY_ROOM and door_name in PROGRESSION_BY_ROOM[room_name]:
-                door_mode = "special"
+            if door.door_group is not None:
+                door_groups.add(door.door_group)
 
             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,
+                ItemData(get_door_item_id(room_name, door_name), ItemClassification.progression, ItemType.NORMAL,
                          door.has_doors, door.painting_ids)
             ITEMS_BY_GROUP.setdefault("Doors", []).append(door.item_name)
 
             if door.item_group is not None:
                 ITEMS_BY_GROUP.setdefault(door.item_group, []).append(door.item_name)
 
-    for group, group_door_ids in door_groups.items():
+    for group in door_groups:
         ALL_ITEM_TABLE[group] = ItemData(get_door_group_item_id(group),
-                                         ItemClassification.progression, "door group", True, [])
+                                         ItemClassification.progression, ItemType.NORMAL, True, [])
         ITEMS_BY_GROUP.setdefault("Doors", []).append(group)
 
     special_items: Dict[str, ItemClassification] = {
@@ -77,7 +76,7 @@ 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", False, [])
+                                             ItemType.NORMAL, False, [])
 
         if classification == ItemClassification.filler:
             ITEMS_BY_GROUP.setdefault("Junk", []).append(item_name)
@@ -86,7 +85,7 @@ def load_item_data():
 
     for item_name in PROGRESSIVE_ITEMS:
         ALL_ITEM_TABLE[item_name] = ItemData(get_progressive_item_id(item_name),
-                                             ItemClassification.progression, "special", False, [])
+                                             ItemClassification.progression, ItemType.NORMAL, False, [])
 
 
 # Initialize the item data at module scope.