7 files changed, 88 insertions, 12 deletions

@@ -67,8 +67,10 @@ struct APState {
   bool pilgrimage_allows_roof_access = false;
   bool pilgrimage_allows_paintings = false;
   SunwarpAccess sunwarp_access = kSUNWARP_ACCESS_NORMAL;
+  bool sunwarp_shuffle = false;
 
   std::map<std::string, std::string> painting_mapping;
+  std::map<int, SunwarpMapping> sunwarp_mapping;
 
   void Connect(std::string server, std::string player, std::string password) {
     if (!initialized) {
@@ -140,6 +142,8 @@ struct APState {
     pilgrimage_allows_roof_access = false;
     pilgrimage_allows_paintings = false;
     sunwarp_access = kSUNWARP_ACCESS_NORMAL;
+    sunwarp_shuffle = false;
+    sunwarp_mapping.clear();
 
     connected = false;
     has_connection_result = false;
@@ -251,6 +255,7 @@ struct APState {
           slot_data.contains("pilgrimage_allows_paintings") &&
           slot_data["pilgrimage_allows_paintings"].get<int>() == 1;
       sunwarp_access = slot_data["sunwarp_access"].get<SunwarpAccess>();
+      sunwarp_shuffle = slot_data["shuffle_sunwarps"].get<int>() == 1;
 
       if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
         painting_mapping.clear();
@@ -261,6 +266,18 @@ struct APState {
         }
       }
 
+      if (sunwarp_shuffle && slot_data.contains("sunwarp_permutation")) {
+        std::vector<int> inverted_sunwarps;
+        for (const auto& item : slot_data["sunwarp_permutation"]) {
+          inverted_sunwarps.push_back(item);
+        }
+
+        for (int i = 0; i < 6; i++) {
+          sunwarp_mapping[inverted_sunwarps[i]] = SunwarpMapping{
+              .dots = i + 1, .exit_index = inverted_sunwarps[i + 6]};
+        }
+      }
+
       connected = true;
       has_connection_result = true;
 
@@ -474,4 +491,10 @@ bool AP_DoesPilgrimageAllowPaintings() {
 
 SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; }
 
+bool AP_IsSunwarpShuffle() { return GetState().sunwarp_shuffle; }
+
+const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping() {
+  return GetState().sunwarp_mapping;
+}
+
 bool AP_HasReachedGoal() { return GetState().HasReachedGoal(); }
@@ -31,6 +31,11 @@ enum SunwarpAccess {
   kSUNWARP_ACCESS_PROGRESSIVE = 4
 };
 
+struct SunwarpMapping {
+  int dots;
+  int exit_index;
+};
+
 void AP_SetTrackerFrame(TrackerFrame* tracker_frame);
 
 void AP_Connect(std::string server, std::string player, std::string password);
@@ -69,6 +74,10 @@ bool AP_DoesPilgrimageAllowPaintings();
 
 SunwarpAccess AP_GetSunwarpAccess();
 
+bool AP_IsSunwarpShuffle();
+
+const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping();
+
 bool AP_HasReachedGoal();
 
 #endif /* end of include guard: AP_STATE_H_664A4180 */
@@ -4,10 +4,10 @@
 
 ConnectionDialog::ConnectionDialog()
     : wxDialog(nullptr, wxID_ANY, "Connect to Archipelago") {
-  server_box_ = new wxTextCtrl(this, -1, GetTrackerConfig().ap_server, wxDefaultPosition,
-                               {300, -1});
-  player_box_ = new wxTextCtrl(this, -1, GetTrackerConfig().ap_player, wxDefaultPosition,
-                               {300, -1});
+  server_box_ = new wxTextCtrl(this, -1, GetTrackerConfig().ap_server,
+                               wxDefaultPosition, {300, -1});
+  player_box_ = new wxTextCtrl(this, -1, GetTrackerConfig().ap_player,
+                               wxDefaultPosition, {300, -1});
   password_box_ = new wxTextCtrl(this, -1, GetTrackerConfig().ap_password,
                                  wxDefaultPosition, {300, -1});
 
@@ -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);
+}
@@ -94,6 +94,7 @@ struct Room {
   std::string name;
   std::vector<Exit> exits;
   std::vector<PaintingExit> paintings;
+  std::vector<int> sunwarps;
   std::vector<int> panels;
 };
 
@@ -129,5 +130,6 @@ 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 */
@@ -25,7 +25,7 @@ class TrackerPanel : public wxPanel {
     int real_y2 = 0;
     bool active = true;
   };
- 
+
   void OnPaint(wxPaintEvent &event);
   void OnMouseMove(wxMouseEvent &event);
 
@@ -85,10 +85,17 @@ class StateCalculator {
 
           const Room& room_obj = GD_GetRoom(room_exit.destination_room);
           for (const Exit& out_edge : room_obj.exits) {
-            if (out_edge.type != EntranceType::kPainting ||
-                !AP_IsPaintingShuffle()) {
-              new_boundary.push_back(out_edge);
+            if (out_edge.type == EntranceType::kPainting &&
+                AP_IsPaintingShuffle()) {
+              continue;
             }
+
+            if (out_edge.type == EntranceType::kSunwarp &&
+                AP_IsSunwarpShuffle()) {
+              continue;
+            }
+
+            new_boundary.push_back(out_edge);
           }
 
           if (AP_IsPaintingShuffle()) {
@@ -104,6 +111,21 @@ class StateCalculator {
             }
           }
 
+          if (AP_IsSunwarpShuffle()) {
+            for (int index : room_obj.sunwarps) {
+              if (AP_GetSunwarpMapping().count(index)) {
+                const SunwarpMapping& sm = AP_GetSunwarpMapping().at(index);
+
+                Exit sunwarp_exit;
+                sunwarp_exit.destination_room =
+                    GD_GetRoomForSunwarp(sm.exit_index);
+                sunwarp_exit.door = GD_GetSunwarpDoors().at(sm.dots - 1);
+
+                new_boundary.push_back(sunwarp_exit);
+              }
+            }
+          }
+
           if (AP_HasEarlyColorHallways() && room_obj.name == "Starting Room") {
             new_boundary.push_back(
                 {.destination_room = GD_GetRoomByName("Outside The Undeterred"),
@@ -139,12 +161,14 @@ class StateCalculator {
 
   const std::set<int>& GetReachableRooms() const { return reachable_rooms_; }
 
-  const std::map<int, Decision>& GetDoorDecisions() const { return door_decisions_; }
+  const std::map<int, Decision>& GetDoorDecisions() const {
+    return door_decisions_;
+  }
 
   const std::set<int>& GetSolveablePanels() const { return solveable_panels_; }
 
  private:
-   Decision IsNonGroupedDoorReachable(const Door& door_obj) {
+  Decision IsNonGroupedDoorReachable(const Door& door_obj) {
     bool has_item = AP_HasItem(door_obj.ap_item_id);
 
     if (!has_item) {
@@ -209,7 +233,7 @@ class StateCalculator {
     if (result != kMaybe) {
       door_decisions_[door_id] = result;
     }
-    
+
     return result;
   }