1 files changed, 157 insertions, 136 deletions

@@ -9,12 +9,28 @@
 #include "ap_state.h"
 #include "game_data.h"
 #include "global.h"
+#include "report_popup.h"
 #include "tracker_state.h"
 
 constexpr int AREA_ACTUAL_SIZE = 21;
 constexpr int OWL_ACTUAL_SIZE = 32;
+constexpr int PAINTING_RADIUS = 9; // the actual circles on the map are radius 11
+constexpr int PAINTING_EXIT_RADIUS = 6;
 
-enum class ItemDrawType { kNone, kBox, kOwl };
+enum class ItemDrawType { kNone, kBox, kOwl, kOwlExit };
+
+namespace {
+
+wxPoint GetSubwayItemMapCenter(const SubwayItem &subway_item) {
+  if (subway_item.painting) {
+    return {subway_item.x, subway_item.y};
+  } else {
+    return {subway_item.x + AREA_ACTUAL_SIZE / 2,
+            subway_item.y + AREA_ACTUAL_SIZE / 2};
+  }
+}
+
+}  // namespace
 
 SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
   SetBackgroundStyle(wxBG_STYLE_PAINT);
@@ -31,14 +47,6 @@ SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
     return;
   }
 
-  unchecked_eye_ =
-      wxBitmap(wxImage(GetAbsolutePath("assets/unchecked.png").c_str(),
-                       wxBITMAP_TYPE_PNG)
-                   .Scale(32, 32));
-  checked_eye_ = wxBitmap(
-      wxImage(GetAbsolutePath("assets/checked.png").c_str(), wxBITMAP_TYPE_PNG)
-          .Scale(32, 32));
-
   tree_ = std::make_unique<quadtree::Quadtree<int, GetItemBox>>(
       quadtree::Box<float>{0, 0, static_cast<float>(map_image_.GetWidth()),
                            static_cast<float>(map_image_.GetHeight())});
@@ -57,12 +65,14 @@ SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
   Bind(wxEVT_LEFT_DOWN, &SubwayMap::OnMouseClick, this);
   Bind(wxEVT_TIMER, &SubwayMap::OnTimer, this);
 
-  zoom_slider_ = new wxSlider(this, wxID_ANY, 0, 0, 8, {15, 15});
+  zoom_slider_ = new wxSlider(this, wxID_ANY, 0, 0, 8, FromDIP(wxPoint{15, 15}));
   zoom_slider_->Bind(wxEVT_SLIDER, &SubwayMap::OnZoomSlide, this);
 
   help_button_ = new wxButton(this, wxID_ANY, "Help");
   help_button_->Bind(wxEVT_BUTTON, &SubwayMap::OnClickHelp, this);
   SetUpHelpButton();
+
+  report_popup_ = new ReportPopup(this);
 }
 
 void SubwayMap::OnConnect() {
@@ -73,11 +83,11 @@ void SubwayMap::OnConnect() {
   std::map<std::string, std::vector<int>> exits;
   for (const SubwayItem &subway_item : GD_GetSubwayItems()) {
     if (AP_HasEarlyColorHallways() &&
-        subway_item.special == "starting_room_paintings") {
+        subway_item.special == "early_color_hallways") {
       entrances["early_ch"].push_back(subway_item.id);
     }
 
-    if (AP_IsPaintingShuffle() && !subway_item.paintings.empty()) {
+    if (AP_IsPaintingShuffle() && subway_item.painting) {
       continue;
     }
 
@@ -174,6 +184,8 @@ void SubwayMap::OnConnect() {
   }
 
   checked_paintings_.clear();
+
+  UpdateIndicators();
 }
 
 void SubwayMap::UpdateIndicators() {
@@ -202,6 +214,8 @@ void SubwayMap::UpdateIndicators() {
     }
   }
 
+  report_popup_->UpdateIndicators();
+
   Redraw();
 }
 
@@ -255,6 +269,9 @@ void SubwayMap::OnPaint(wxPaintEvent &event) {
     SetZoomPos({zoom_x_, zoom_y_});
 
     SetUpHelpButton();
+
+    zoom_slider_->SetSize(FromDIP(15), FromDIP(15), wxDefaultCoord,
+                          wxDefaultCoord, wxSIZE_AUTO);
   }
 
   wxBufferedPaintDC dc(this);
@@ -310,67 +327,6 @@ void SubwayMap::OnPaint(wxPaintEvent &event) {
   }
 
   if (hovered_item_) {
-    // Note that these requirements are duplicated on OnMouseClick so that it
-    // knows when an item has a hover effect.
-    const SubwayItem &subway_item = GD_GetSubwayItem(*hovered_item_);
-    std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
-
-    if (subway_door && !GetDoorRequirements(*subway_door).empty()) {
-      const std::map<std::string, bool> &report =
-          GetDoorRequirements(*subway_door);
-
-      int acc_height = 10;
-      int col_width = 0;
-
-      for (const auto &[text, obtained] : report) {
-        wxSize item_extent = dc.GetTextExtent(text);
-        int item_height = std::max(32, item_extent.GetHeight()) + 10;
-        acc_height += item_height;
-
-        if (item_extent.GetWidth() > col_width) {
-          col_width = item_extent.GetWidth();
-        }
-      }
-
-      int item_width = col_width + 10 + 32;
-      int full_width = item_width + 20;
-
-      wxPoint popup_pos =
-          MapPosToRenderPos({subway_item.x + AREA_ACTUAL_SIZE / 2,
-                             subway_item.y + AREA_ACTUAL_SIZE / 2});
-
-      if (popup_pos.x + full_width > GetSize().GetWidth()) {
-        popup_pos.x = GetSize().GetWidth() - full_width;
-      }
-      if (popup_pos.y + acc_height > GetSize().GetHeight()) {
-        popup_pos.y = GetSize().GetHeight() - acc_height;
-      }
-
-      dc.SetPen(*wxTRANSPARENT_PEN);
-      dc.SetBrush(*wxBLACK_BRUSH);
-      dc.DrawRectangle(popup_pos, {full_width, acc_height});
-
-      dc.SetFont(GetFont());
-
-      int cur_height = 10;
-
-      for (const auto &[text, obtained] : report) {
-        wxBitmap *eye_ptr = obtained ? &checked_eye_ : &unchecked_eye_;
-
-        dc.DrawBitmap(*eye_ptr, popup_pos + wxPoint{10, cur_height});
-
-        dc.SetTextForeground(obtained ? *wxWHITE : *wxRED);
-        wxSize item_extent = dc.GetTextExtent(text);
-        dc.DrawText(
-            text,
-            popup_pos +
-                wxPoint{10 + 32 + 10,
-                        cur_height + (32 - dc.GetFontMetrics().height) / 2});
-
-        cur_height += 10 + 32;
-      }
-    }
-
     if (networks_.IsItemInNetwork(*hovered_item_)) {
       dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
@@ -378,10 +334,8 @@ void SubwayMap::OnPaint(wxPaintEvent &event) {
         const SubwayItem &item1 = GD_GetSubwayItem(node.entry);
         const SubwayItem &item2 = GD_GetSubwayItem(node.exit);
 
-        wxPoint item1_pos = MapPosToRenderPos(
-            {item1.x + AREA_ACTUAL_SIZE / 2, item1.y + AREA_ACTUAL_SIZE / 2});
-        wxPoint item2_pos = MapPosToRenderPos(
-            {item2.x + AREA_ACTUAL_SIZE / 2, item2.y + AREA_ACTUAL_SIZE / 2});
+        wxPoint item1_pos = MapPosToRenderPos(GetSubwayItemMapCenter(item1));
+        wxPoint item2_pos = MapPosToRenderPos(GetSubwayItemMapCenter(item2));
 
         int left = std::min(item1_pos.x, item2_pos.x);
         int top = std::min(item1_pos.y, item2_pos.y);
@@ -470,9 +424,7 @@ void SubwayMap::OnMouseMove(wxMouseEvent &event) {
   }
 
   if (!sticky_hover_ && actual_hover_ != hovered_item_) {
-    hovered_item_ = actual_hover_;
-
-    Refresh();
+    EvaluateHover();
   }
 
   if (scroll_mode_) {
@@ -514,13 +466,11 @@ void SubwayMap::OnMouseClick(wxMouseEvent &event) {
     if ((subway_door && !GetDoorRequirements(*subway_door).empty()) ||
         networks_.IsItemInNetwork(*hovered_item_)) {
       if (actual_hover_ != hovered_item_) {
-        hovered_item_ = actual_hover_;
+        EvaluateHover();
 
         if (!hovered_item_) {
           sticky_hover_ = false;
         }
-
-        Refresh();
       } else {
         sticky_hover_ = !sticky_hover_;
       }
@@ -571,11 +521,12 @@ void SubwayMap::OnClickHelp(wxCommandEvent &event) {
       "your mouse. Click again to stop.\nHover over a door to see the "
       "requirements to open it.\nHover over a warp or active painting to see "
       "what it is connected to.\nFor one-way connections, there will be a "
-      "circle at the exit.\nIn painting shuffle, paintings that have not "
-      "yet been checked will not show their connections.\nA green shaded owl "
-      "means that there is a painting entrance there.\nA red shaded owl means "
-      "that there are only painting exits there.\nClick on a door or "
-      "warp to make the popup stick until you click again.",
+      "circle at the exit.\nCircles represent paintings.\nA red circle means "
+      "that the painting is locked by a door.\nA blue circle means painting "
+      "shuffle is enabled and the painting has not been checked yet.\nA black "
+      "circle means the painting is not a warp.\nA green circle means that the "
+      "painting is a warp.\nPainting exits will be indicated with an X.\nClick "
+      "on a door or warp to make the popup stick until you click again.",
       "Subway Map Help");
 }
 
@@ -592,20 +543,32 @@ void SubwayMap::Redraw() {
   for (const SubwayItem &subway_item : GD_GetSubwayItems()) {
     ItemDrawType draw_type = ItemDrawType::kNone;
     const wxBrush *brush_color = wxGREY_BRUSH;
-    std::optional<wxColour> shade_color;
     std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
 
     if (AP_HasEarlyColorHallways() &&
-        subway_item.special == "starting_room_paintings") {
+        subway_item.special == "early_color_hallways") {
       draw_type = ItemDrawType::kOwl;
-      shade_color = wxColour(0, 255, 0, 128);
+      brush_color = wxGREEN_BRUSH;
+    } else if (subway_item.special == "starting_room_overhead") {
+      // Do not draw.
+    } else if (AP_IsColorShuffle() && subway_item.special &&
+               subway_item.special->starts_with("color_")) {
+      std::string color_name = subway_item.special->substr(6);
+      LingoColor lingo_color = GetLingoColorForString(color_name);
+      int color_item_id = GD_GetItemIdForColor(lingo_color);
+
+      draw_type = ItemDrawType::kBox;
+      if (AP_HasItemSafe(color_item_id)) {
+        brush_color = wxGREEN_BRUSH;
+      } else {
+        brush_color = wxRED_BRUSH;
+      }
     } else if (subway_item.special == "sun_painting") {
       if (!AP_IsPilgrimageEnabled()) {
+        draw_type = ItemDrawType::kOwl;
         if (IsDoorOpen(*subway_item.door)) {
-          draw_type = ItemDrawType::kOwl;
-          shade_color = wxColour(0, 255, 0, 128);
+          brush_color = wxGREEN_BRUSH;
         } else {
-          draw_type = ItemDrawType::kBox;
           brush_color = wxRED_BRUSH;
         }
       }
@@ -619,41 +582,28 @@ void SubwayMap::Redraw() {
       } else {
         brush_color = wxRED_BRUSH;
       }
-    } else if (!subway_item.paintings.empty()) {
-      if (AP_IsPaintingShuffle()) {
-        bool has_checked_painting = false;
-        bool has_unchecked_painting = false;
-        bool has_mapped_painting = false;
-        bool has_codomain_painting = false;
-
-        for (const std::string &painting_id : subway_item.paintings) {
-          if (checked_paintings_.count(painting_id)) {
-            has_checked_painting = true;
-
-            if (painting_mapping.count(painting_id)) {
-              has_mapped_painting = true;
-            } else if (AP_IsPaintingMappedTo(painting_id)) {
-              has_codomain_painting = true;
-            }
-          } else {
-            has_unchecked_painting = true;
-          }
-        }
-
-        if (has_unchecked_painting || has_mapped_painting ||
-            has_codomain_painting) {
+    } else if (subway_item.painting) {
+      if (subway_door && !IsDoorOpen(*subway_door)) {
+        draw_type = ItemDrawType::kOwl;
+        brush_color = wxRED_BRUSH;
+      } else if (AP_IsPaintingShuffle()) {
+        if (!checked_paintings_.count(*subway_item.painting)) {
           draw_type = ItemDrawType::kOwl;
-
-          if (has_checked_painting) {
-            if (has_mapped_painting) {
-              shade_color = wxColour(0, 255, 0, 128);
-            } else {
-              shade_color = wxColour(255, 0, 0, 128);
-            }
-          }
+          brush_color = wxBLUE_BRUSH;
+        } else if (painting_mapping.count(*subway_item.painting)) {
+          draw_type = ItemDrawType::kOwl;
+          brush_color = wxGREEN_BRUSH;
+        } else if (AP_IsPaintingMappedTo(*subway_item.painting)) {
+          draw_type = ItemDrawType::kOwlExit;
+          brush_color = wxGREEN_BRUSH;
         }
       } else if (subway_item.HasWarps()) {
-        draw_type = ItemDrawType::kOwl;
+        brush_color = wxGREEN_BRUSH;
+        if (!subway_item.exits.empty()) {
+          draw_type = ItemDrawType::kOwlExit;
+        } else {
+          draw_type = ItemDrawType::kOwl;
+        }
       }
     } else if (subway_door) {
       draw_type = ItemDrawType::kBox;
@@ -673,21 +623,40 @@ void SubwayMap::Redraw() {
     if (draw_type == ItemDrawType::kBox) {
       gcdc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1));
       gcdc.SetBrush(*brush_color);
-      gcdc.DrawRectangle(real_area_pos, {real_area_size, real_area_size});
-    } else if (draw_type == ItemDrawType::kOwl) {
-      wxBitmap owl_bitmap = wxBitmap(owl_image_.Scale(
-          real_area_size, real_area_size, wxIMAGE_QUALITY_BILINEAR));
-      gcdc.DrawBitmap(owl_bitmap, real_area_pos);
-
-      if (shade_color) {
-        gcdc.SetBrush(wxBrush(*shade_color));
+
+      if (subway_item.tilted) {
+        constexpr int AREA_TILTED_SIDE =
+            static_cast<int>(AREA_ACTUAL_SIZE / 1.41421356237);
+        const wxPoint poly_points[] = {{AREA_TILTED_SIDE, 0},
+                                       {2 * AREA_TILTED_SIDE, AREA_TILTED_SIDE},
+                                       {AREA_TILTED_SIDE, 2 * AREA_TILTED_SIDE},
+                                       {0, AREA_TILTED_SIDE}};
+        gcdc.DrawPolygon(4, poly_points, subway_item.x, subway_item.y);
+      } else {
         gcdc.DrawRectangle(real_area_pos, {real_area_size, real_area_size});
       }
+    } else if (draw_type == ItemDrawType::kOwl || draw_type == ItemDrawType::kOwlExit) {
+      gcdc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1));
+      gcdc.SetBrush(*brush_color);
+      gcdc.DrawCircle(real_area_pos, PAINTING_RADIUS);
+
+      if (draw_type == ItemDrawType::kOwlExit) {
+        gcdc.DrawLine(subway_item.x - PAINTING_EXIT_RADIUS,
+                      subway_item.y - PAINTING_EXIT_RADIUS,
+                      subway_item.x + PAINTING_EXIT_RADIUS,
+                      subway_item.y + PAINTING_EXIT_RADIUS);
+        gcdc.DrawLine(subway_item.x + PAINTING_EXIT_RADIUS,
+                      subway_item.y - PAINTING_EXIT_RADIUS,
+                      subway_item.x - PAINTING_EXIT_RADIUS,
+                      subway_item.y + PAINTING_EXIT_RADIUS);
+      }
     }
   }
 }
 
 void SubwayMap::SetUpHelpButton() {
+  help_button_->SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
+                        wxDefaultCoord, wxSIZE_AUTO);
   help_button_->SetPosition({
       GetSize().GetWidth() - help_button_->GetSize().GetWidth() - 15,
       15,
@@ -723,6 +692,51 @@ void SubwayMap::EvaluateScroll(wxPoint pos) {
   SetScrollSpeed(scroll_x, scroll_y);
 }
 
+void SubwayMap::EvaluateHover() {
+  hovered_item_ = actual_hover_;
+
+  if (hovered_item_) {
+    // Note that these requirements are duplicated on OnMouseClick so that it
+    // knows when an item has a hover effect.
+    const SubwayItem &subway_item = GD_GetSubwayItem(*hovered_item_);
+    std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
+
+    if (subway_door && !GetDoorRequirements(*subway_door).empty()) {
+      report_popup_->SetDoorId(*subway_door);
+
+      wxPoint popupPos =
+          MapPosToRenderPos({subway_item.x + AREA_ACTUAL_SIZE / 2,
+                             subway_item.y + AREA_ACTUAL_SIZE / 2});
+
+      report_popup_->SetClientSize(
+          report_popup_->GetVirtualSize().GetWidth(),
+          std::min(GetSize().GetHeight(),
+                   report_popup_->GetVirtualSize().GetHeight()));
+
+      if (popupPos.x + report_popup_->GetSize().GetWidth() >
+          GetSize().GetWidth()) {
+        popupPos.x = GetSize().GetWidth() - report_popup_->GetSize().GetWidth();
+      }
+      if (popupPos.y + report_popup_->GetSize().GetHeight() >
+          GetSize().GetHeight()) {
+        popupPos.y =
+            GetSize().GetHeight() - report_popup_->GetSize().GetHeight();
+      }
+      report_popup_->SetPosition(popupPos);
+
+      report_popup_->Show();
+    } else {
+      report_popup_->Reset();
+      report_popup_->Hide();
+    }
+  } else {
+    report_popup_->Reset();
+    report_popup_->Hide();
+  }
+
+  Refresh();
+}
+
 wxPoint SubwayMap::MapPosToRenderPos(wxPoint pos) const {
   return {static_cast<int>(pos.x * render_width_ * zoom_ /
                                map_image_.GetSize().GetWidth() +
@@ -812,6 +826,13 @@ std::optional<int> SubwayMap::GetRealSubwayDoor(const SubwayItem subway_item) {
 
 quadtree::Box<float> SubwayMap::GetItemBox::operator()(const int &id) const {
   const SubwayItem &subway_item = GD_GetSubwayItem(id);
-  return {static_cast<float>(subway_item.x), static_cast<float>(subway_item.y),
-          AREA_ACTUAL_SIZE, AREA_ACTUAL_SIZE};
+  if (subway_item.painting) {
+    return {static_cast<float>(subway_item.x) - PAINTING_RADIUS,
+            static_cast<float>(subway_item.y) - PAINTING_RADIUS,
+            PAINTING_RADIUS * 2, PAINTING_RADIUS * 2};
+  } else {
+    return {static_cast<float>(subway_item.x),
+            static_cast<float>(subway_item.y), AREA_ACTUAL_SIZE,
+            AREA_ACTUAL_SIZE};
+  }
 }