6 files changed, 95 insertions, 1 deletions

@@ -723,7 +723,8 @@ struct GameData {
         MapArea &map_area = map_areas_[area_id];
 
         for (int painting_id : room.paintings) {
-          const PaintingExit &painting_obj = paintings_.at(painting_id);
+          PaintingExit &painting_obj = paintings_.at(painting_id);
+          painting_obj.map_area = area_id;
           if (painting_obj.entrance) {
             map_area.paintings.push_back(painting_id);
           }
@@ -105,6 +105,7 @@ struct PaintingExit {
   std::string display_name;
   std::optional<int> door;
   bool entrance = false;
+  int map_area;
 };
 
 struct Room {
@@ -0,0 +1,61 @@
+#include "paintings_pane.h"
+
+#include <map>
+#include <set>
+
+#include <fmt/core.h>
+#include <wx/dataview.h>
+
+#include "ap_state.h"
+#include "game_data.h"
+#include "tracker_state.h"
+
+namespace {
+
+std::string GetPaintingDisplayName(const std::string& id) {
+  const PaintingExit& painting = GD_GetPaintingExit(GD_GetPaintingByName(id));
+  const MapArea& map_area = GD_GetMapArea(painting.map_area);
+
+  return fmt::format("{} - {}", map_area.name, painting.display_name);
+}
+
+}  // namespace
+
+PaintingsPane::PaintingsPane(wxWindow* parent)
+    : wxPanel(parent, wxID_ANY) {
+  wxStaticText* label = new wxStaticText(this, wxID_ANY, "Shuffled paintings grouped by destination:");
+  tree_ctrl_ = new wxDataViewTreeCtrl(this, wxID_ANY);
+
+  wxBoxSizer* top_sizer = new wxBoxSizer(wxVERTICAL);
+  top_sizer->Add(label, wxSizerFlags().Border());
+  top_sizer->Add(tree_ctrl_, wxSizerFlags().Expand().Proportion(1));
+
+  SetSizerAndFit(top_sizer);
+}
+
+void PaintingsPane::UpdateIndicators() {
+  tree_ctrl_->DeleteAllItems();
+
+  if (!AP_IsPaintingShuffle()) {
+    return;
+  }
+
+  std::map<std::string, std::set<std::string>> grouped_paintings;
+
+  for (const auto& [from, to] : AP_GetPaintingMapping()) {
+    if (IsPaintingReachable(GD_GetPaintingByName(from)) &&
+        AP_IsPaintingChecked(from)) {
+      grouped_paintings[GetPaintingDisplayName(to)].insert(
+          GetPaintingDisplayName(from));
+    }
+  }
+
+  for (const auto& [to, froms] : grouped_paintings) {
+    wxDataViewItem tree_branch =
+        tree_ctrl_->AppendContainer(wxDataViewItem(0), to);
+
+    for (const std::string& from : froms) {
+      tree_ctrl_->AppendItem(tree_branch, from);
+    }
+  }
+}
@@ -0,0 +1,22 @@
+#ifndef PAINTINGS_PANE_H_815370D2
+#define PAINTINGS_PANE_H_815370D2
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+class wxDataViewTreeCtrl;
+
+class PaintingsPane : public wxPanel {
+ public:
+  explicit PaintingsPane(wxWindow* parent);
+
+  void UpdateIndicators();
+
+ private:
+  wxDataViewTreeCtrl* tree_ctrl_;
+};
+
+#endif /* end of include guard: PAINTINGS_PANE_H_815370D2 */
@@ -17,6 +17,7 @@
 #include "connection_dialog.h"
 #include "ipc_dialog.h"
 #include "ipc_state.h"
+#include "paintings_pane.h"
 #include "settings_dialog.h"
 #include "subway_map.h"
 #include "tracker_config.h"
@@ -120,9 +121,13 @@ TrackerFrame::TrackerFrame()
   splitter_window_->SetMinimumPaneSize(logicalSize.x / 5);
 
   wxChoicebook *choicebook = new wxChoicebook(splitter_window_, wxID_ANY);
+
   achievements_pane_ = new AchievementsPane(choicebook);
   choicebook->AddPage(achievements_pane_, "Achievements");
 
+  paintings_pane_ = new PaintingsPane(choicebook);
+  choicebook->AddPage(paintings_pane_, "Paintings");
+
   notebook_ = new wxNotebook(splitter_window_, wxID_ANY);
   tracker_panel_ = new TrackerPanel(notebook_);
   subway_map_ = new SubwayMap(notebook_);
@@ -299,6 +304,7 @@ void TrackerFrame::OnSashPositionChanged(wxSplitterEvent& event) {
 void TrackerFrame::OnStateReset(wxCommandEvent &event) {
   tracker_panel_->UpdateIndicators();
   achievements_pane_->UpdateIndicators();
+  paintings_pane_->UpdateIndicators();
   subway_map_->OnConnect();
   if (panels_panel_ != nullptr) {
     notebook_->DeletePage(notebook_->FindPage(panels_panel_));
@@ -313,6 +319,7 @@ void TrackerFrame::OnStateChanged(wxCommandEvent &event) {
   if (mode == kUPDATE_ALL_INDICATORS) {
     tracker_panel_->UpdateIndicators();
     achievements_pane_->UpdateIndicators();
+    paintings_pane_->UpdateIndicators();
     subway_map_->UpdateIndicators();
     if (panels_panel_ != nullptr) {
       panels_panel_->UpdateIndicators();
@@ -13,6 +13,7 @@
 #include "updater.h"
 
 class AchievementsPane;
+class PaintingsPane;
 class SubwayMap;
 class TrackerPanel;
 class wxBookCtrlEvent;
@@ -90,6 +91,7 @@ class TrackerFrame : public wxFrame {
   wxNotebook *notebook_;
   TrackerPanel *tracker_panel_;
   AchievementsPane *achievements_pane_;
+  PaintingsPane *paintings_pane_;
   SubwayMap *subway_map_;
   TrackerPanel *panels_panel_ = nullptr;