From 902bad34643b10880704dbc41f3b1253bac2f542 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Mon, 10 Jun 2024 19:32:49 -0400
Subject: Update ECH painting location

---
 assets/subway.yaml |  3 +--
 src/subway_map.cpp | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/assets/subway.yaml b/assets/subway.yaml
index 266b722..8ef3aee 100644
--- a/assets/subway.yaml
+++ b/assets/subway.yaml
@@ -630,6 +630,7 @@
     - blue_ch
     - yellow_ch
     - green_ch
+    - early_ch
 - pos: [1567, 1264]
   tags:
     - red_ch
@@ -686,8 +687,6 @@
   tags:
     - blueman_courtyard
     - blueman_starting
-- pos: [60, 970]
-  special: early_color_hallways
 - pos: [402, 1012]
   room: Outside The Undeterred
   door: Green Painting
diff --git a/src/subway_map.cpp b/src/subway_map.cpp
index c7b2c8a..e3b844d 100644
--- a/src/subway_map.cpp
+++ b/src/subway_map.cpp
@@ -1,9 +1,9 @@
 #include "subway_map.h"
 
+#include <fmt/core.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcgraph.h>
 
-#include <fmt/core.h>
 #include <sstream>
 
 #include "ap_state.h"
@@ -71,9 +71,8 @@ void SubwayMap::OnConnect() {
   std::map<std::string, std::vector<int>> tagged;
   for (const SubwayItem &subway_item : GD_GetSubwayItems()) {
     if (AP_HasEarlyColorHallways() &&
-        (subway_item.special == "starting_room_paintings" ||
-         subway_item.special == "early_color_hallways")) {
-      tagged["early_color_hallways"].push_back(subway_item.id);
+        subway_item.special == "starting_room_paintings") {
+      tagged["early_ch"].push_back(subway_item.id);
     }
 
     if (AP_IsPaintingShuffle() && !subway_item.paintings.empty()) {
@@ -406,7 +405,7 @@ void SubwayMap::OnMouseMove(wxMouseEvent &event) {
   std::vector<int> hovered = tree_->query(
       {static_cast<float>(mouse_pos.x), static_cast<float>(mouse_pos.y), 2, 2});
   if (!hovered.empty()) {
-    actual_hover_= hovered[0];
+    actual_hover_ = hovered[0];
   } else {
     actual_hover_ = std::nullopt;
   }
@@ -532,15 +531,9 @@ void SubwayMap::Redraw() {
     std::optional<wxColour> shade_color;
 
     if (AP_HasEarlyColorHallways() &&
-        (subway_item.special == "starting_room_paintings" ||
-         subway_item.special == "early_color_hallways")) {
+        subway_item.special == "starting_room_paintings") {
       draw_type = ItemDrawType::kOwl;
-
-      if (subway_item.special == "starting_room_paintings") {
-        shade_color = wxColour(0, 255, 0, 128);
-      } else {
-        shade_color = wxColour(255, 0, 0, 128);
-      }
+      shade_color = wxColour(0, 255, 0, 128);
     } else if (subway_item.special == "sun_painting") {
       if (!AP_IsPilgrimageEnabled()) {
         if (IsDoorOpen(*subway_item.door)) {
@@ -572,7 +565,8 @@ void SubwayMap::Redraw() {
           }
         }
 
-        if (has_unchecked_painting || has_mapped_painting || has_codomain_painting) {
+        if (has_unchecked_painting || has_mapped_painting ||
+            has_codomain_painting) {
           draw_type = ItemDrawType::kOwl;
 
           if (has_checked_painting) {
-- 
cgit 1.4.1