Show hunt panels option

11 files changed, 54 insertions, 6 deletions

@@ -85,6 +85,13 @@ struct APState {
             "Achievement|" + GD_GetPanel(panel_id).achievement_name);
       }
 
+      for (const MapArea& map_area : GD_GetMapAreas()) {
+        for (const Location& location : map_area.locations) {
+          tracked_data_storage_keys.push_back(
+              "Hunt|" + std::to_string(location.ap_location_id));
+        }
+      }
+
       initialized = true;
     }
 
@@ -311,6 +318,12 @@ struct APState {
     return checked_locations.count(location_id);
   }
 
+  bool HasCheckedHuntPanel(int location_id) {
+    std::string key =
+        data_storage_prefix + "Hunt|" + std::to_string(location_id);
+    return data_storage.count(key) && data_storage.at(key);
+  }
+
   bool HasItem(int item_id, int quantity) {
     return inventory.count(item_id) && inventory.at(item_id) >= quantity;
   }
@@ -360,6 +373,10 @@ bool AP_HasCheckedGameLocation(int location_id) {
   return GetState().HasCheckedGameLocation(location_id);
 }
 
+bool AP_HasCheckedHuntPanel(int location_id) {
+  return GetState().HasCheckedHuntPanel(location_id);
+}
+
 bool AP_HasItem(int item_id, int quantity) {
   return GetState().HasItem(item_id, quantity);
 }
@@ -20,6 +20,8 @@ void AP_Connect(std::string server, std::string player, std::string password);
 
 bool AP_HasCheckedGameLocation(int location_id);
 
+bool AP_HasCheckedHuntPanel(int location_id);
+
 bool AP_HasItem(int item_id, int quantity = 1);
 
 DoorShuffleMode AP_GetDoorShuffleMode();
@@ -2,6 +2,7 @@
 
 #include "ap_state.h"
 #include "game_data.h"
+#include "tracker_config.h"
 #include "tracker_state.h"
 
 AreaPopup::AreaPopup(wxWindow* parent, int area_id)
@@ -48,7 +49,8 @@ void AreaPopup::UpdateIndicators() {
     wxSizer* container_sizer =
         section_labels_[section_id]->GetContainingSizer();
 
-    if (!AP_IsLocationVisible(location.classification)) {
+    if (!AP_IsLocationVisible(location.classification) &&
+        !(location.hunt && GetTrackerConfig().show_hunt_panels)) {
       container_sizer->Hide(section_labels_[section_id]);
       container_sizer->Hide(eye_indicators_[section_id]);
       continue;
@@ -57,7 +59,9 @@ void AreaPopup::UpdateIndicators() {
       container_sizer->Show(eye_indicators_[section_id]);
     }
 
-    bool checked = AP_HasCheckedGameLocation(location.ap_location_id);
+    bool checked =
+        AP_HasCheckedGameLocation(location.ap_location_id) ||
+        (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id));
     bool reachable = IsLocationReachable(location.ap_location_id);
     const wxColour* text_color = reachable ? wxWHITE : wxRED;
 
@@ -247,6 +247,10 @@ struct GameData {
             achievement_panels_.push_back(panel_id);
           }
 
+          if (panel_it.second["hunt"]) {
+            panel_obj.hunt = panel_it.second["hunt"].as<bool>();
+          }
+
           if (panel_it.second["exclude_reduce"]) {
             panel_obj.exclude_reduce =
                 panel_it.second["exclude_reduce"].as<bool>();
@@ -493,7 +497,8 @@ struct GameData {
            .ap_location_id = panel.ap_location_id,
            .room = panel.room,
            .panels = {panel.id},
-           .classification = classification});
+           .classification = classification,
+           .hunt = panel.hunt});
       locations_by_name[map_area.locations.back().ap_location_name] = {
           area_id, map_area.locations.size() - 1};
     }
@@ -37,6 +37,7 @@ struct Panel {
   std::string achievement_name;
   bool non_counting = false;
   int ap_location_id = -1;
+  bool hunt = false;
 };
 
 struct ProgressiveRequirement {
@@ -87,6 +88,7 @@ struct Location {
   int room;
   std::vector<int> panels;
   int classification = 0;
+  bool hunt = false;
 };
 
 struct MapArea {
@@ -8,10 +8,12 @@ SettingsDialog::SettingsDialog() : wxDialog(nullptr, wxID_ANY, "Settings") {
   hybrid_areas_box_ = new wxCheckBox(
       this, wxID_ANY,
       "Use two colors to show that an area has partial availability");
+  show_hunt_panels_box_ = new wxCheckBox(this, wxID_ANY, "Show hunt panels");
 
   should_check_for_updates_box_->SetValue(
       GetTrackerConfig().should_check_for_updates);
   hybrid_areas_box_->SetValue(GetTrackerConfig().hybrid_areas);
+  show_hunt_panels_box_->SetValue(GetTrackerConfig().show_hunt_panels);
 
   wxBoxSizer* form_sizer = new wxBoxSizer(wxVERTICAL);
 
@@ -21,6 +23,9 @@ SettingsDialog::SettingsDialog() : wxDialog(nullptr, wxID_ANY, "Settings") {
   form_sizer->Add(hybrid_areas_box_, wxSizerFlags().HorzBorder());
   form_sizer->AddSpacer(2);
 
+  form_sizer->Add(show_hunt_panels_box_, wxSizerFlags().HorzBorder());
+  form_sizer->AddSpacer(2);
+
   form_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Center());
 
   SetSizerAndFit(form_sizer);
@@ -15,10 +15,12 @@ class SettingsDialog : public wxDialog {
     return should_check_for_updates_box_->GetValue();
   }
   bool GetHybridAreas() const { return hybrid_areas_box_->GetValue(); }
+  bool GetShowHuntPanels() const { return show_hunt_panels_box_->GetValue(); }
 
  private:
   wxCheckBox* should_check_for_updates_box_;
   wxCheckBox* hybrid_areas_box_;
+  wxCheckBox* show_hunt_panels_box_;
 };
 
 #endif /* end of include guard: SETTINGS_DIALOG_H_D8635719 */
@@ -1,8 +1,9 @@
 #include "tracker_config.h"
 
-#include <fstream>
 #include <yaml-cpp/yaml.h>
 
+#include <fstream>
+
 constexpr const char* CONFIG_FILE_NAME = "config.yaml";
 
 void TrackerConfig::Load() {
@@ -15,6 +16,7 @@ void TrackerConfig::Load() {
     asked_to_check_for_updates = file["asked_to_check_for_updates"].as<bool>();
     should_check_for_updates = file["should_check_for_updates"].as<bool>();
     hybrid_areas = file["hybrid_areas"].as<bool>();
+    show_hunt_panels = file["show_hunt_panels"].as<bool>();
   } catch (const std::exception&) {
     // It's fine if the file can't be loaded.
   }
@@ -28,6 +30,7 @@ void TrackerConfig::Save() {
   output["asked_to_check_for_updates"] = asked_to_check_for_updates;
   output["should_check_for_updates"] = should_check_for_updates;
   output["hybrid_areas"] = hybrid_areas;
+  output["show_hunt_panels"] = show_hunt_panels;
 
   std::ofstream filewriter(CONFIG_FILE_NAME);
   filewriter << output;
@@ -15,6 +15,7 @@ class TrackerConfig {
   bool asked_to_check_for_updates = false;
   bool should_check_for_updates = false;
   bool hybrid_areas = false;
+  bool show_hunt_panels = false;
 };
 
 TrackerConfig& GetTrackerConfig();
@@ -133,6 +133,7 @@ void TrackerFrame::OnSettings(wxCommandEvent &event) {
     GetTrackerConfig().should_check_for_updates =
         dlg.GetShouldCheckForUpdates();
     GetTrackerConfig().hybrid_areas = dlg.GetHybridAreas();
+    GetTrackerConfig().show_hunt_panels = dlg.GetShowHuntPanels();
     GetTrackerConfig().Save();
 
     UpdateIndicators();
@@ -114,8 +114,14 @@ void TrackerPanel::Redraw() {
     bool has_reachable_unchecked = false;
     bool has_unreachable_unchecked = false;
     for (const Location &section : map_area.locations) {
-      if (AP_IsLocationVisible(section.classification) &&
-          !AP_HasCheckedGameLocation(section.ap_location_id)) {
+      bool has_unchecked = false;
+      if (AP_IsLocationVisible(section.classification)) {
+        has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
+      } else if (section.hunt && GetTrackerConfig().show_hunt_panels) {
+        has_unchecked = !AP_HasCheckedHuntPanel(section.ap_location_id);
+      }
+
+      if (has_unchecked) {
         if (IsLocationReachable(section.ap_location_id)) {
           has_reachable_unchecked = true;
         } else {