1 files changed, 17 insertions, 2 deletions

@@ -1,3 +1,4 @@
+from enum import Enum, Flag, auto
 from typing import List, NamedTuple, Optional
 
 
@@ -11,10 +12,18 @@ class RoomAndPanel(NamedTuple):
     panel: str
 
 
+class EntranceType(Flag):
+    NORMAL = auto()
+    PAINTING = auto()
+    SUNWARP = auto()
+    WARP = auto()
+    CROSSROADS_ROOF_ACCESS = auto()
+
+
 class RoomEntrance(NamedTuple):
     room: str  # source room
     door: Optional[RoomAndDoor]
-    painting: bool
+    type: EntranceType
 
 
 class Room(NamedTuple):
@@ -22,6 +31,12 @@ class Room(NamedTuple):
     entrances: List[RoomEntrance]
 
 
+class DoorType(Enum):
+    NORMAL = 1
+    SUNWARP = 2
+    SUN_PAINTING = 3
+
+
 class Door(NamedTuple):
     name: str
     item_name: str
@@ -34,7 +49,7 @@ class Door(NamedTuple):
     event: bool
     door_group: Optional[str]
     include_reduce: bool
-    junk_item: bool
+    type: DoorType
     item_group: Optional[str]