Merge branch 'main' into subway

1 files changed, 21 insertions, 1 deletions

@@ -23,6 +23,21 @@ constexpr int kLOCATION_NORMAL = 1;
 constexpr int kLOCATION_REDUCED = 2;
 constexpr int kLOCATION_INSANITY = 4;
 
+enum class EntranceType {
+  kNormal,
+  kPainting,
+  kSunwarp,
+  kWarp,
+  kPilgrimage,
+  kCrossroadsRoofAccess,
+};
+
+enum class DoorType {
+  kNormal,
+  kSunwarp,
+  kSunPainting,
+};
+
 struct Panel {
   int id;
   int room;
@@ -61,12 +76,13 @@ struct Door {
   int ap_item_id = -1;
   int group_ap_item_id = -1;
   int ap_location_id = -1;
+  DoorType type = DoorType::kNormal;
 };
 
 struct Exit {
   int destination_room;
   std::optional<int> door;
-  bool painting = false;
+  EntranceType type = EntranceType::kNormal;
 };
 
 struct PaintingExit {
@@ -78,6 +94,7 @@ struct Room {
   std::string name;
   std::vector<Exit> exits;
   std::vector<PaintingExit> paintings;
+  std::vector<int> sunwarps;
   std::vector<int> panels;
 };
 
@@ -107,9 +124,12 @@ int GD_GetRoomByName(const std::string& name);
 const Room& GD_GetRoom(int room_id);
 const std::vector<Door>& GD_GetDoors();
 const Door& GD_GetDoor(int door_id);
+int GD_GetDoorByName(const std::string& name);
 const Panel& GD_GetPanel(int panel_id);
 int GD_GetRoomForPainting(const std::string& painting_id);
 const std::vector<int>& GD_GetAchievementPanels();
 int GD_GetItemIdForColor(LingoColor color);
+const std::vector<int>& GD_GetSunwarpDoors();
+int GD_GetRoomForSunwarp(int index);
 
 #endif /* end of include guard: GAME_DATA_H_9C42AC51 */