Merge branch 'main' into panels

1 files changed, 44 insertions, 4 deletions

@@ -1,5 +1,8 @@
 #include "tracker_state.h"
 
+#include <fmt/core.h>
+#include <hkutil/string.h>
+
 #include <list>
 #include <map>
 #include <mutex>
@@ -9,6 +12,7 @@
 
 #include "ap_state.h"
 #include "game_data.h"
+#include "logger.h"
 
 namespace {
 
@@ -231,7 +235,9 @@ class StateCalculator {
             PaintingExit target_painting =
                 GD_GetPaintingExit(GD_GetPaintingByName(
                     AP_GetPaintingMapping().at(cur_painting.internal_id)));
+            painting_exit.source_room = cur_painting.room;
             painting_exit.destination_room = target_painting.room;
+            painting_exit.type = EntranceType::kPainting;
 
             new_boundary.push_back(painting_exit);
           }
@@ -258,6 +264,12 @@ class StateCalculator {
           reachable_rooms_.insert(room_exit.destination_room);
           reachable_changed = true;
 
+#ifndef NDEBUG
+          std::list<int> room_path = paths_[room_exit.source_room];
+          room_path.push_back(room_exit.destination_room);
+          paths_[room_exit.destination_room] = room_path;
+#endif
+
           const Room& room_obj = GD_GetRoom(room_exit.destination_room);
           for (const Exit& out_edge : room_obj.exits) {
             if (out_edge.type == EntranceType::kPainting &&
@@ -296,20 +308,33 @@ class StateCalculator {
 
           if (AP_HasEarlyColorHallways() && room_obj.name == "Starting Room") {
             new_boundary.push_back(
-                {.destination_room = GD_GetRoomByName("Outside The Undeterred"),
+                {.source_room = room_exit.destination_room,
+                 .destination_room = GD_GetRoomByName("Outside The Undeterred"),
                  .type = EntranceType::kPainting});
           }
 
           if (AP_IsPilgrimageEnabled()) {
-            if (room_obj.name == "Hub Room") {
+            int pilgrimage_start_id = GD_GetRoomByName("Hub Room");
+            if (AP_IsSunwarpShuffle()) {
+              for (const auto& [start_index, mapping] :
+                   AP_GetSunwarpMapping()) {
+                if (mapping.dots == 1) {
+                  pilgrimage_start_id = GD_GetRoomForSunwarp(start_index);
+                }
+              }
+            }
+
+            if (room_exit.destination_room == pilgrimage_start_id) {
               new_boundary.push_back(
-                  {.destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
+                  {.source_room = room_exit.destination_room,
+                   .destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
                    .type = EntranceType::kPilgrimage});
             }
           } else {
             if (room_obj.name == "Starting Room") {
               new_boundary.push_back(
-                  {.destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
+                  {.source_room = room_exit.destination_room,
+                   .destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
                    .door =
                        GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"),
                    .type = EntranceType::kPainting});
@@ -350,6 +375,19 @@ class StateCalculator {
     return door_report_;
   }
 
+  std::string GetPathToRoom(int room_id) const {
+    if (!paths_.count(room_id)) {
+      return "";
+    }
+
+    const std::list<int>& path = paths_.at(room_id);
+    std::vector<std::string> room_names;
+    for (int room_id : path) {
+      room_names.push_back(GD_GetRoom(room_id).name);
+    }
+    return hatkirby::implode(room_names, " -> ");
+  }
+
  private:
   template <typename T>
   Decision IsNonGroupedDoorReachable(const T& door_obj) {
@@ -603,6 +641,8 @@ class StateCalculator {
   std::set<int> solveable_panels_;
   std::set<int> reachable_paintings_;
   std::map<int, std::map<std::string, bool>> door_report_;
+
+  std::map<int, std::list<int>> paths_;
 };
 
 }  // namespace