7 files changed, 55 insertions, 3 deletions

@@ -56,6 +56,7 @@ struct APState {
   bool color_shuffle = false;
   bool painting_shuffle = false;
   int mastery_requirement = 21;
+  bool reduce_checks = false;
 
   std::map<std::string, std::string> painting_mapping;
 
@@ -102,6 +103,7 @@ struct APState {
     painting_shuffle = false;
     painting_mapping.clear();
     mastery_requirement = 21;
+    reduce_checks = false;
 
     connected = false;
     has_connection_result = false;
@@ -154,6 +156,8 @@ struct APState {
       color_shuffle = slot_data["shuffle_colors"].get<bool>();
       painting_shuffle = slot_data["shuffle_paintings"].get<bool>();
       mastery_requirement = slot_data["mastery_achievements"].get<int>();
+      reduce_checks = (door_shuffle_mode == kNO_DOORS) &&
+                      slot_data["reduce_checks"].get<bool>();
 
       if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
         painting_mapping.clear();
@@ -361,3 +365,5 @@ const std::map<std::string, std::string> AP_GetPaintingMapping() {
 }
 
 int AP_GetMasteryRequirement() { return GetState().mastery_requirement; }
+
+bool AP_IsReduceChecks() { return GetState().reduce_checks; }
@@ -30,4 +30,6 @@ const std::map<std::string, std::string> AP_GetPaintingMapping();
 
 int AP_GetMasteryRequirement();
 
+bool AP_IsReduceChecks();
+
 #endif /* end of include guard: AP_STATE_H_664A4180 */
@@ -43,6 +43,21 @@ void AreaPopup::UpdateIndicators() {
   const MapArea& map_area = GD_GetMapArea(area_id_);
   for (int section_id = 0; section_id < map_area.locations.size();
        section_id++) {
+    const Location& location = map_area.locations.at(section_id);
+    if (location.exclude_reduce) {
+      wxSizer* container_sizer =
+          section_labels_[section_id]->GetContainingSizer();
+
+      if (AP_IsReduceChecks()) {
+        container_sizer->Hide(section_labels_[section_id]);
+        container_sizer->Hide(eye_indicators_[section_id]);
+        continue;
+      } else {
+        container_sizer->Show(section_labels_[section_id]);
+        container_sizer->Show(eye_indicators_[section_id]);
+      }
+    }
+
     bool checked = AP_HasCheckedGameLocation(area_id_, section_id);
     bool reachable = IsLocationReachable(area_id_, section_id);
     const wxColour* text_color = reachable ? wxWHITE : wxRED;
@@ -50,4 +65,7 @@ void AreaPopup::UpdateIndicators() {
     section_labels_[section_id]->SetForegroundColour(*text_color);
     eye_indicators_[section_id]->SetChecked(checked);
   }
+
+  section_labels_[0]->GetContainingSizer()->Layout();
+  GetSizer()->Fit(this);
 }
@@ -343,7 +343,8 @@ struct GameData {
             {.name = panel.name,
              .ap_location_name = room_name + " - " + panel.name,
              .room = panel.room,
-             .panels = {panel.id}});
+             .panels = {panel.id},
+             .exclude_reduce = panel.exclude_reduce});
       }
     }
 
@@ -372,7 +373,21 @@ struct GameData {
         map_area.locations.push_back({.name = section_name,
                                       .ap_location_name = door.location_name,
                                       .room = door.room,
-                                      .panels = door.panels});
+                                      .panels = door.panels,
+                                      .exclude_reduce = door.exclude_reduce});
+      }
+    }
+
+    for (MapArea &map_area : map_areas_) {
+      bool all_exclude_reduce = true;
+      for (const Location &location : map_area.locations) {
+        if (!location.exclude_reduce) {
+          all_exclude_reduce = false;
+          break;
+        }
+      }
+      if (all_exclude_reduce) {
+        map_area.exclude_reduce = true;
       }
     }
 
@@ -71,6 +71,7 @@ struct Location {
   std::string ap_location_name;
   int room;
   std::vector<int> panels;
+  bool exclude_reduce = false;
 };
 
 struct MapArea {
@@ -79,6 +80,7 @@ struct MapArea {
   std::vector<Location> locations;
   int map_x;
   int map_y;
+  bool exclude_reduce = false;
 };
 
 const std::vector<MapArea>& GD_GetMapAreas();
@@ -52,7 +52,8 @@ void TrackerPanel::OnPaint(wxPaintEvent &event) {
 
 void TrackerPanel::OnMouseMove(wxMouseEvent &event) {
   for (AreaIndicator &area : areas_) {
-    if (area.real_x1 <= event.GetX() && event.GetX() < area.real_x2 &&
+    if (area.active &&
+        area.real_x1 <= event.GetX() && event.GetX() < area.real_x2 &&
         area.real_y1 <= event.GetY() && event.GetY() < area.real_y2) {
       area.popup->Show();
     } else {
@@ -94,6 +95,13 @@ void TrackerPanel::Redraw() {
     const wxBrush *brush_color = wxGREY_BRUSH;
 
     const MapArea &map_area = GD_GetMapArea(area.area_id);
+    if (map_area.exclude_reduce && AP_IsReduceChecks()) {
+      area.active = false;
+      continue;
+    } else {
+      area.active = true;
+    }
+
     bool has_reachable_unchecked = false;
     bool has_unreachable_unchecked = false;
     for (int section_id = 0; section_id < map_area.locations.size();
@@ -23,6 +23,7 @@ class TrackerPanel : public wxPanel {
     int real_y1 = 0;
     int real_x2 = 0;
     int real_y2 = 0;
+    bool active = true;
   };
  
   void OnPaint(wxPaintEvent &event);