Merge branch 'main' into panels

1 files changed, 38 insertions, 3 deletions

@@ -50,6 +50,7 @@ struct Panel {
   bool exclude_reduce = false;
   bool achievement = false;
   std::string achievement_name;
+  std::string location_name;
   bool non_counting = false;
   int ap_location_id = -1;
   bool hunt = false;
@@ -63,6 +64,7 @@ struct ProgressiveRequirement {
 };
 
 struct Door {
+  int id;
   int room;
   std::string name;
   std::string location_name;
@@ -93,14 +95,17 @@ struct Exit {
 };
 
 struct PaintingExit {
-  std::string id;
+  int id;
+  int room;
+  std::string internal_id;
   std::optional<int> door;
+  bool entrance = false;
 };
 
 struct Room {
   std::string name;
   std::vector<Exit> exits;
-  std::vector<PaintingExit> paintings;
+  std::vector<int> paintings;
   std::vector<int> sunwarps;
   std::vector<int> panels;
 };
@@ -119,12 +124,37 @@ struct MapArea {
   int id;
   std::string name;
   std::vector<Location> locations;
+  std::vector<int> paintings;
   int map_x;
   int map_y;
   int classification = 0;
   bool hunt = false;
 };
 
+enum class SubwaySunwarpType {
+  kEnter,
+  kExit,
+  kFinal
+};
+
+struct SubwaySunwarp {
+  int dots;
+  SubwaySunwarpType type;
+
+  bool operator<(const SubwaySunwarp& rhs) const;
+};
+
+struct SubwayItem {
+  int id;
+  int x;
+  int y;
+  std::optional<int> door;
+  std::vector<std::string> paintings;
+  std::vector<std::string> tags;
+  std::optional<SubwaySunwarp> sunwarp;
+  std::optional<std::string> special;
+};
+
 const std::vector<MapArea>& GD_GetMapAreas();
 const MapArea& GD_GetMapArea(int id);
 int GD_GetRoomByName(const std::string& name);
@@ -134,10 +164,15 @@ const Door& GD_GetDoor(int door_id);
 int GD_GetDoorByName(const std::string& name);
 const Panel& GD_GetPanel(int panel_id);
 const PanelDoor& GD_GetPanelDoor(int panel_door_id);
-int GD_GetRoomForPainting(const std::string& painting_id);
+const PaintingExit& GD_GetPaintingExit(int painting_id);
+int GD_GetPaintingByName(const std::string& name);
 const std::vector<int>& GD_GetAchievementPanels();
 int GD_GetItemIdForColor(LingoColor color);
 const std::vector<int>& GD_GetSunwarpDoors();
 int GD_GetRoomForSunwarp(int index);
+const std::vector<SubwayItem>& GD_GetSubwayItems();
+const SubwayItem& GD_GetSubwayItem(int id);
+int GD_GetSubwayItemForPainting(const std::string& painting_id);
+int GD_GetSubwayItemForSunwarp(const SubwaySunwarp& sunwarp);
 
 #endif /* end of include guard: GAME_DATA_H_9C42AC51 */