1 files changed, 19 insertions, 2 deletions

@@ -58,6 +58,7 @@ struct APState {
   std::optional<std::tuple<int, int>> player_pos;
 
   DoorShuffleMode door_shuffle_mode = kNO_DOORS;
+  bool group_doors = false;
   bool color_shuffle = false;
   bool painting_shuffle = false;
   int mastery_requirement = 21;
@@ -137,6 +138,7 @@ struct APState {
     player_pos = std::nullopt;
     victory_data_storage_key.clear();
     door_shuffle_mode = kNO_DOORS;
+    group_doors = false;
     color_shuffle = false;
     painting_shuffle = false;
     painting_mapping.clear();
@@ -221,14 +223,27 @@ struct APState {
       RefreshTracker(false);
     });
 
-    apclient->set_slot_connected_handler([this, &connection_mutex](
+    apclient->set_slot_connected_handler([this, player, server,
+                                          &connection_mutex](
                                              const nlohmann::json& slot_data) {
-      tracker_frame->SetStatusMessage("Connected to Archipelago!");
+      tracker_frame->SetStatusMessage(
+          fmt::format("Connected to Archipelago! ({}@{})", player, server));
       TrackerLog("Connected to Archipelago!");
 
       data_storage_prefix =
           fmt::format("Lingo_{}_", apclient->get_player_number());
       door_shuffle_mode = slot_data["shuffle_doors"].get<DoorShuffleMode>();
+      if (slot_data.contains("group_doors")) {
+        group_doors = slot_data.contains("group_doors") &&
+                      slot_data["group_doors"].get<int>() == 1;
+      } else {
+        // If group_doors doesn't exist yet, that means kPANELS_MODE is actually
+        // kSIMPLE_DOORS.
+        if (door_shuffle_mode == kPANELS_MODE) {
+          door_shuffle_mode = kDOORS_MODE;
+          group_doors = true;
+        }
+      }
       color_shuffle = slot_data["shuffle_colors"].get<int>() == 1;
       painting_shuffle = slot_data["shuffle_paintings"].get<int>() == 1;
       mastery_requirement = slot_data["mastery_achievements"].get<int>();
@@ -525,6 +540,8 @@ std::string AP_GetItemName(int item_id) {
 
 DoorShuffleMode AP_GetDoorShuffleMode() { return GetState().door_shuffle_mode; }
 
+bool AP_AreDoorsGrouped() { return GetState().group_doors; }
+
 bool AP_IsColorShuffle() { return GetState().color_shuffle; }
 
 bool AP_IsPaintingShuffle() { return GetState().painting_shuffle; }