Fix event raid filter.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Inference/FrozenImageDetector.cpp

@@ -42,7 +42,10 @@ bool FrozenImageDetector::process_frame(const VideoSnapshot& frame){
         return false;
     }
 
-    double rmsd = ImageMatch::pixel_RMSD(m_previous, frame);
+    double rmsd = ImageMatch::pixel_RMSD(
+        extract_box_reference(m_previous, m_box),
+        extract_box_reference(frame, m_box)
+    );
 //    cout << "rmsd = " << rmsd << endl;
     if (rmsd > m_rmsd_threshold){
         m_previous = frame;

SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp

@@ -130,7 +130,7 @@ std::pair<double, double> OverworldDetector::locate_ball(const ImageViewRGB32& s
 
 
 
-OverworldWatcher::OverworldWatcher(Logger& logger, Color color, bool detect_event)
+OverworldWatcher::OverworldWatcher(Logger& logger, Color color)
      : OverworldDetector(color)
      , VisualInferenceCallback("OverworldWatcher")
      , m_logger(logger)
@@ -139,7 +139,6 @@ OverworldWatcher::OverworldWatcher(Logger& logger, Color color, bool detect_even
      , m_north_hold_duration(std::chrono::milliseconds(1000))
      , m_last_ball(WallClock::min())
      , m_last_north(WallClock::min())
-     , m_detect_event(detect_event)
 {
     m_direction_detector = DirectionDetector(COLOR_RED);
 }
@@ -176,7 +175,7 @@ bool OverworldWatcher::process_frame(const VideoSnapshot& frame){
     }
 
     //  Ball held for long enough. (5 seconds)
-    if (!m_detect_event && (frame.timestamp - m_last_ball >= m_ball_hold_duration)){
+    if (frame.timestamp - m_last_ball >= m_ball_hold_duration){
         return true;
     }
 
@@ -197,8 +196,8 @@ bool OverworldWatcher::process_frame(const VideoSnapshot& frame){
     // Check if radar map stays still for 1 second.
 
     //  Mismatching image sizes.
-    ImageViewRGB32 start = extract_box_reference(m_start_of_detection, m_detect_event ? m_ball : m_radar_inside);
-    ImageViewRGB32 current = extract_box_reference(frame, m_detect_event ? m_ball : m_radar_inside);
+    ImageViewRGB32 start = extract_box_reference(m_start_of_detection, m_radar_inside);
+    ImageViewRGB32 current = extract_box_reference(frame, m_radar_inside);
     if (start.width() != current.width() || start.height() != current.height()){
         m_start_of_detection = frame;
         return false;

SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h

@@ -40,7 +40,7 @@ class OverworldDetector : public StaticScreenDetector{
 
 class OverworldWatcher : public OverworldDetector, public VisualInferenceCallback{
 public:
-    OverworldWatcher(Logger& logger, Color color = COLOR_RED, bool detect_event = false);
+    OverworldWatcher(Logger& logger, Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool process_frame(const VideoSnapshot& frame) override;
@@ -54,7 +54,6 @@ class OverworldWatcher : public OverworldDetector, public VisualInferenceCallbac
     WallClock m_last_ball;
     WallClock m_last_north;
     VideoSnapshot m_start_of_detection;
-    bool m_detect_event;
     DirectionDetector m_direction_detector;
 };
 

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp

@@ -13,6 +13,7 @@
 #include "CommonFramework/InferenceInfra/InferenceRoutines.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Inference/FrozenImageDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "Pokemon/Pokemon_Notification.h"
@@ -30,6 +31,10 @@
 #include "PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
 #include "PokemonSV_TeraRoutines.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSV{
@@ -709,8 +714,17 @@ void run_from_tera_battle(const ProgramInfo& info, ConsoleHandle& console, BotBa
 }
 
 
+
+
 bool is_sparkling_raid(ConsoleHandle& console, BotBaseContext& context){
-    OverworldWatcher static_map(console, COLOR_CYAN, true);
+//    cout << "is_sparkling_raid()" << endl;
+
+    FrozenImageDetector static_map(
+        COLOR_RED,
+        {0.890, 0.800, 0.030, 0.060},
+        std::chrono::seconds(1), 20
+    );
+
     context.wait_for_all_requests();
 
     int ret = wait_until(