Merge branch 'future' into tinysphere

1 files changed, 71 insertions, 61 deletions

@@ -53,11 +53,14 @@ 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_;
 
   std::map<LingoColor, int> ap_id_by_color_;
 
+  std::vector<int> sunwarp_doors_;
+
   bool loaded_area_data_ = false;
   std::set<std::string> malconfigured_areas_;
 
@@ -66,8 +69,6 @@ struct GameData {
         YAML::LoadFile(GetAbsolutePath("assets/LL1.yaml"));
     YAML::Node areas_config =
         YAML::LoadFile(GetAbsolutePath("assets/areas.yaml"));
-    YAML::Node pilgrimage_config =
-        YAML::LoadFile(GetAbsolutePath("assets/pilgrimage.yaml"));
     YAML::Node ids_config = YAML::LoadFile(GetAbsolutePath("assets/ids.yaml"));
 
     auto init_color_id = [this, &ids_config](const std::string &color_name) {
@@ -102,6 +103,40 @@ struct GameData {
       for (const auto &entrance_it : room_it.second["entrances"]) {
         int from_room_id = AddOrGetRoom(entrance_it.first.as<std::string>());
 
+        auto process_single_entrance =
+            [this, room_id, from_room_id](const YAML::Node &option) {
+              Exit exit_obj;
+              exit_obj.destination_room = room_id;
+
+              if (option["door"]) {
+                std::string door_room = rooms_[room_id].name;
+                if (option["room"]) {
+                  door_room = option["room"].as<std::string>();
+                }
+                exit_obj.door =
+                    AddOrGetDoor(door_room, option["door"].as<std::string>());
+              }
+
+              if (option["painting"] && option["painting"].as<bool>()) {
+                exit_obj.type = EntranceType::kPainting;
+              }
+
+              if (option["sunwarp"] && option["sunwarp"].as<bool>()) {
+                exit_obj.type = EntranceType::kSunwarp;
+              }
+
+              if (option["warp"] && option["warp"].as<bool>()) {
+                exit_obj.type = EntranceType::kWarp;
+              }
+
+              if (rooms_[from_room_id].name == "Crossroads" &&
+                  rooms_[room_id].name == "Roof") {
+                exit_obj.type = EntranceType::kCrossroadsRoofAccess;
+              }
+
+              rooms_[from_room_id].exits.push_back(exit_obj);
+            };
+
         switch (entrance_it.second.Type()) {
           case YAML::NodeType::Scalar: {
             // This is just "true".
@@ -109,42 +144,12 @@ struct GameData {
             break;
           }
           case YAML::NodeType::Map: {
-            Exit exit_obj;
-            exit_obj.destination_room = room_id;
-
-            if (entrance_it.second["door"]) {
-              std::string door_room = rooms_[room_id].name;
-              if (entrance_it.second["room"]) {
-                door_room = entrance_it.second["room"].as<std::string>();
-              }
-              exit_obj.door = AddOrGetDoor(
-                  door_room, entrance_it.second["door"].as<std::string>());
-            }
-
-            if (entrance_it.second["painting"]) {
-              exit_obj.painting = entrance_it.second["painting"].as<bool>();
-            }
-
-            rooms_[from_room_id].exits.push_back(exit_obj);
+            process_single_entrance(entrance_it.second);
             break;
           }
           case YAML::NodeType::Sequence: {
             for (const auto &option : entrance_it.second) {
-              Exit exit_obj;
-              exit_obj.destination_room = room_id;
-
-              std::string door_room = rooms_[room_id].name;
-              if (option["room"]) {
-                door_room = option["room"].as<std::string>();
-              }
-              exit_obj.door =
-                  AddOrGetDoor(door_room, option["door"].as<std::string>());
-
-              if (option["painting"]) {
-                exit_obj.painting = option["painting"].as<bool>();
-              }
-
-              rooms_[from_room_id].exits.push_back(exit_obj);
+              process_single_entrance(option);
             }
 
             break;
@@ -405,6 +410,14 @@ struct GameData {
             doors_[door_id].exclude_reduce =
                 !door_it.second["include_reduce"].as<bool>();
           }
+
+          if (doors_[door_id].name.ends_with(" Sunwarp")) {
+            sunwarp_doors_.push_back(door_id);
+            doors_[door_id].type = DoorType::kSunwarp;
+          } else if (doors_[door_id].item_name ==
+                     "Pilgrim Room - Sun Painting") {
+            doors_[door_id].type = DoorType::kSunPainting;
+          }
         }
       }
 
@@ -432,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 =
@@ -575,33 +600,6 @@ struct GameData {
       }
     }
 
-    // Set up fake pilgrimage.
-    int fake_pilgrim_panel_id =
-        AddOrGetPanel("Starting Room", "!! Fake Pilgrimage Panel");
-    Panel &fake_pilgrim_panel_obj = panels_[fake_pilgrim_panel_id];
-    fake_pilgrim_panel_obj.non_counting = true;
-
-    for (const auto &config_node : pilgrimage_config) {
-      fake_pilgrim_panel_obj.required_doors.push_back(
-          AddOrGetDoor(config_node["room"].as<std::string>(),
-                       config_node["door"].as<std::string>()));
-    }
-
-    int fake_pilgrim_door_id =
-        AddOrGetDoor("Starting Room", "!! Fake Pilgrimage Door");
-    Door &fake_pilgrim_door_obj = doors_[fake_pilgrim_door_id];
-    fake_pilgrim_door_obj.panels.push_back(fake_pilgrim_panel_id);
-    fake_pilgrim_door_obj.skip_location = true;
-    fake_pilgrim_door_obj.skip_item = true;
-    fake_pilgrim_door_obj.is_event = true;
-
-    int starting_room_id = AddOrGetRoom("Starting Room");
-    Room &starting_room_obj = rooms_[starting_room_id];
-    starting_room_obj.panels.push_back(fake_pilgrim_panel_id);
-    starting_room_obj.exits.push_back(
-        Exit{.destination_room = AddOrGetRoom("Pilgrim Antechamber"),
-             .door = fake_pilgrim_door_id});
-
     // Report errors.
     for (const std::string &area : malconfigured_areas_) {
       std::ostringstream errstr;
@@ -679,6 +677,10 @@ const std::vector<Door> &GD_GetDoors() { return GetState().doors_; }
 
 const Door &GD_GetDoor(int door_id) { return GetState().doors_.at(door_id); }
 
+int GD_GetDoorByName(const std::string &name) {
+  return GetState().door_by_id_.at(name);
+}
+
 const Panel &GD_GetPanel(int panel_id) {
   return GetState().panels_.at(panel_id);
 }
@@ -694,3 +696,11 @@ const std::vector<int> &GD_GetAchievementPanels() {
 int GD_GetItemIdForColor(LingoColor color) {
   return GetState().ap_id_by_color_.at(color);
 }
+
+const std::vector<int> &GD_GetSunwarpDoors() {
+  return GetState().sunwarp_doors_;
+}
+
+int GD_GetRoomForSunwarp(int index) {
+  return GetState().room_by_sunwarp_.at(index);
+}