Added color indicators to subway map HEAD main

6 files changed, 72 insertions, 29 deletions

@@ -1042,3 +1042,21 @@
 - pos: [815, 1002]
   room: Challenge Room
   door: Welcome Door
+- pos: [104, 1208]
+  special: color_black
+- pos: [104, 1249]
+  special: color_red
+- pos: [104, 1290]
+  special: color_yellow
+- pos: [104, 1330]
+  special: color_blue
+- pos: [104, 1371]
+  special: color_purple
+- pos: [104, 1411]
+  special: color_orange
+- pos: [104, 1451]
+  special: color_green
+- pos: [104, 1491]
+  special: color_brown
+- pos: [104, 1531]
+  special: color_gray
@@ -228,6 +228,11 @@ struct APState {
     return inventory.count(item_id) && inventory.at(item_id) >= quantity;
   }
 
+  bool HasItemSafe(int item_id, int quantity) {
+    std::lock_guard state_guard(state_mutex);
+    return HasItem(item_id, quantity);
+  }
+
   bool HasAchievement(const std::string& name) {
     std::lock_guard state_guard(state_mutex);
 
@@ -723,6 +728,10 @@ bool AP_HasItem(int item_id, int quantity) {
   return GetState().HasItem(item_id, quantity);
 }
 
+bool AP_HasItemSafe(int item_id, int quantity) {
+  return GetState().HasItemSafe(item_id, quantity);
+}
+
 std::string AP_GetItemName(int item_id) {
   return GetState().GetItemName(item_id);
 }
@@ -63,6 +63,8 @@ bool AP_HasCheckedHuntPanel(int location_id);
 // RecalculateReachability, which is only called from the APState thread anyway.
 bool AP_HasItem(int item_id, int quantity = 1);
 
+bool AP_HasItemSafe(int item_id, int quantity = 1);
+
 // This doesn't lock the client mutex because it is ONLY to be called from
 // RecalculateReachability, which is only called from within a client callback
 // anyway.
@@ -12,32 +12,6 @@
 
 namespace {
 
-LingoColor GetColorForString(const std::string &str) {
-  if (str == "black") {
-    return LingoColor::kBlack;
-  } else if (str == "red") {
-    return LingoColor::kRed;
-  } else if (str == "blue") {
-    return LingoColor::kBlue;
-  } else if (str == "yellow") {
-    return LingoColor::kYellow;
-  } else if (str == "orange") {
-    return LingoColor::kOrange;
-  } else if (str == "green") {
-    return LingoColor::kGreen;
-  } else if (str == "gray") {
-    return LingoColor::kGray;
-  } else if (str == "brown") {
-    return LingoColor::kBrown;
-  } else if (str == "purple") {
-    return LingoColor::kPurple;
-  } else {
-    TrackerLog(fmt::format("Invalid color: {}", str));
-
-    return LingoColor::kNone;
-  }
-}
-
 struct GameData {
   std::vector<Room> rooms_;
   std::vector<Door> doors_;
@@ -84,7 +58,7 @@ struct GameData {
           ids_config["special_items"][color_name]) {
         std::string input_name = color_name;
         input_name[0] = std::tolower(input_name[0]);
-        ap_id_by_color_[GetColorForString(input_name)] =
+        ap_id_by_color_[GetLingoColorForString(input_name)] =
             ids_config["special_items"][color_name].as<int>();
       } else {
         TrackerLog(fmt::format("Missing AP item ID for color {}", color_name));
@@ -181,12 +155,12 @@ struct GameData {
 
           if (panel_it.second["colors"]) {
             if (panel_it.second["colors"].IsScalar()) {
-              panels_[panel_id].colors.push_back(GetColorForString(
+              panels_[panel_id].colors.push_back(GetLingoColorForString(
                   panel_it.second["colors"].as<std::string>()));
             } else {
               for (const auto &color_node : panel_it.second["colors"]) {
                 panels_[panel_id].colors.push_back(
-                    GetColorForString(color_node.as<std::string>()));
+                    GetLingoColorForString(color_node.as<std::string>()));
               }
             }
           }
@@ -1010,3 +984,29 @@ std::optional<int> GD_GetSubwayItemForPainting(const std::string &painting_id) {
 int GD_GetSubwayItemForSunwarp(const SubwaySunwarp &sunwarp) {
   return GetState().subway_item_by_sunwarp_.at(sunwarp);
 }
+
+LingoColor GetLingoColorForString(const std::string &str) {
+  if (str == "black") {
+    return LingoColor::kBlack;
+  } else if (str == "red") {
+    return LingoColor::kRed;
+  } else if (str == "blue") {
+    return LingoColor::kBlue;
+  } else if (str == "yellow") {
+    return LingoColor::kYellow;
+  } else if (str == "orange") {
+    return LingoColor::kOrange;
+  } else if (str == "green") {
+    return LingoColor::kGreen;
+  } else if (str == "gray") {
+    return LingoColor::kGray;
+  } else if (str == "brown") {
+    return LingoColor::kBrown;
+  } else if (str == "purple") {
+    return LingoColor::kPurple;
+  } else {
+    TrackerLog(fmt::format("Invalid color: {}", str));
+
+    return LingoColor::kNone;
+  }
+}
@@ -189,4 +189,6 @@ const SubwayItem& GD_GetSubwayItem(int id);
 std::optional<int> GD_GetSubwayItemForPainting(const std::string& painting_id);
 int GD_GetSubwayItemForSunwarp(const SubwaySunwarp& sunwarp);
 
+LingoColor GetLingoColorForString(const std::string& str);
+
 #endif /* end of include guard: GAME_DATA_H_9C42AC51 */
@@ -551,6 +551,18 @@ void SubwayMap::Redraw() {
       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;