1 files changed, 19 insertions, 1 deletions

@@ -53,6 +53,7 @@ struct GameData {
   std::vector<int> door_definition_order_;
 
   std::map<std::string, int> room_by_painting_;
+  std::map<int, int> room_by_sunwarp_;
 
   std::vector<int> achievement_panels_;
 
@@ -112,7 +113,8 @@ struct GameData {
                 if (option["room"]) {
                   door_room = option["room"].as<std::string>();
                 }
-                exit_obj.door = AddOrGetDoor(door_room, option["door"].as<std::string>());
+                exit_obj.door =
+                    AddOrGetDoor(door_room, option["door"].as<std::string>());
               }
 
               if (option["painting"] && option["painting"].as<bool>()) {
@@ -443,6 +445,18 @@ struct GameData {
         }
       }
 
+      if (room_it.second["sunwarps"]) {
+        for (const auto &sunwarp : room_it.second["sunwarps"]) {
+          int index = sunwarp["dots"].as<int>() - 1;
+          if (sunwarp["direction"].as<std::string>() == "exit") {
+            index += 6;
+          }
+
+          rooms_[room_id].sunwarps.push_back(index);
+          room_by_sunwarp_[index] = room_id;
+        }
+      }
+
       if (room_it.second["progression"]) {
         for (const auto &progression_it : room_it.second["progression"]) {
           std::string progressive_item_name =
@@ -686,3 +700,7 @@ int GD_GetItemIdForColor(LingoColor color) {
 const std::vector<int> &GD_GetSunwarpDoors() {
   return GetState().sunwarp_doors_;
 }
+
+int GD_GetRoomForSunwarp(int index) {
+  return GetState().room_by_sunwarp_.at(index);
+}