Improve reliability of LGPE battle arrow detector.

Author: Mysticial

SerialPrograms/Source/CommonTools/StartupChecks/StartProgramChecks.cpp

@@ -59,7 +59,8 @@ void check_performance_class_wired_or_wireless(AbstractController& controller){
         throw UserSetupError(
             controller.logger(),
             "Incompatible Controller:\n\n"
-            "This program requires a controller with performance class \"Wired\" or \"Wireless\"."
+            "This program requires a controller with performance class \"Wired\" or \"Wireless\".\n\n"
+            "If you are using sys-botbase 2, please upgrade to sys-botbase 3."
         );
     }
 }

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -143,6 +143,7 @@
 #include "PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
 #include "CommonTools/Images/SolidColorTest.h"
 #include "CommonTools/Async/InterruptableCommands.h"
+#include "PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h"
 
 
 #include <QPixmap>
@@ -176,7 +177,6 @@ TestProgram_Descriptor::TestProgram_Descriptor()
         ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::OPTIONAL_,
         AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        {},
         1, 4, 1
     )
 {}
@@ -264,6 +264,23 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     ProControllerContext context(scope, console.controller<ProController>());
     VideoOverlaySet overlays(overlay);
 
+
+
+
+//    auto screenshot = feed.snapshot();
+
+    PokemonLGPE::BattleArrowWatcher detector(COLOR_RED, {0.004251, 0.638941, 0.062699, 0.115312});
+    detector.make_overlays(overlays);
+
+    while (true){
+        cout << detector.process_frame(feed.snapshot()) << endl;
+        scope.wait_for(100ms);
+    }
+
+
+
+
+#if 0
     AsyncCommandSession<ProController> session(
         scope, logger, env.realtime_dispatcher(),
         console.controller<ProController>()
@@ -289,7 +306,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
         delay += 1ms;
     }
-
+#endif
 
 
 

SerialPrograms/Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp

@@ -53,7 +53,7 @@ bool BattleArrowDetector::detect(const ImageViewRGB32& screen){
         ImageViewRGB32 cropped = extract_box_reference(region, object);
         //cropped.save("test-object-" + std::to_string(c++) + ".png");
         double rmsd = matcher.rmsd(cropped);
-        //cout << rmsd << endl;
+//        cout << rmsd << endl;
         if (rmsd < 116){
             return true;
         }
@@ -63,6 +63,25 @@ bool BattleArrowDetector::detect(const ImageViewRGB32& screen){
 }
 
 
+bool BattleArrowWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    if (!detect(frame)){
+        return false;
+    }
+    m_detections.emplace_back(timestamp);
+
+    WallClock threshold = timestamp - std::chrono::seconds(5);
+    while (!m_detections.empty() && m_detections.front() < threshold){
+        m_detections.pop_front();
+    }
+
+//    cout << "m_detections = " << m_detections.size() << endl;
+
+    return m_detections.size() >= 3;
+}
+
+
+
+
 
 }
 }

SerialPrograms/Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h

@@ -8,7 +8,8 @@
 #define PokemonAutomation_PokemonLGPE_BattleArrowDetector_H
 
 #include <chrono>
-#include <atomic>
+//#include <atomic>
+#include <deque>
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
@@ -37,11 +38,28 @@ class BattleArrowDetector : public StaticScreenDetector{
     Color m_color;
     ImageFloatBox m_box;
 };
-class BattleArrowWatcher : public DetectorToFinder<BattleArrowDetector>{
+
+
+//
+//  We use a custom watcher because the arrow wiggles and thus is less likely to
+//  maintain consecutive detections.
+//
+class BattleArrowWatcher : public BattleArrowDetector, public VisualInferenceCallback{
 public:
     BattleArrowWatcher(Color color = COLOR_RED, ImageFloatBox box = {0.546, 0.863, 0.045, 0.068})
-         : DetectorToFinder("BattleArrowWatcher", std::chrono::milliseconds(100), color, box)
+         : BattleArrowDetector(color, box)
+         , VisualInferenceCallback("BattleArrowWatcher")
     {}
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        BattleArrowDetector::make_overlays(items);
+    }
+
+    using VisualInferenceCallback::process_frame;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    std::deque<WallClock> m_detections;
 };
 
 

SerialPrograms/Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.cpp

@@ -206,7 +206,7 @@ void LegendaryReset::program(SingleSwitchProgramEnvironment& env, CancellableSco
     }
     //Shiny found, complete the battle
     WallClock start = current_time();
-    BattleArrowWatcher catching_started(COLOR_RED, {0.005, 0.662, 0.049, 0.069});
+    BattleArrowWatcher catching_started(COLOR_RED, {0.004251, 0.638941, 0.062699, 0.115312});
     int res = run_until<JoyconContext>(
         env.console, context,
         [&](JoyconContext& context) {