Refactor platform bot and scatterbug to properly count and detect shinies in chain attacks.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -1543,6 +1543,8 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h
     Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp
     Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h
+    Source/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.cpp
+    Source/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h
     Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp
     Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h
     Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp
@@ -1597,6 +1599,8 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.h
     Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp
     Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h
+    Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.cpp
+    Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h
     Source/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp
     Source/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.h
     Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp

SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp

@@ -38,6 +38,9 @@ AudioPerSpectrumDetectorBase::AudioPerSpectrumDetectorBase(
     , m_start_timestamp(current_time())
     , m_spectrums_processed(0)
 {}
+void AudioPerSpectrumDetectorBase::set_detected_callback(DetectedCallback detected_callback){
+    m_detected_callback = std::move(detected_callback);
+}
 AudioPerSpectrumDetectorBase::~AudioPerSpectrumDetectorBase(){
     try{
         log_results();

SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.h

@@ -47,6 +47,8 @@ class SpectrogramMatcher;
 // - std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate)
 class AudioPerSpectrumDetectorBase : public AudioInferenceCallback{
 public:
+    virtual ~AudioPerSpectrumDetectorBase();
+
     using DetectedCallback = std::function<bool(float error_coefficient)>;
     // label: a name for this detector. Used for logging and profiling.
     // audio_name: the name of the audio to be detected (shiny sound etc). Capitalize first letter.
@@ -61,10 +63,10 @@ class AudioPerSpectrumDetectorBase : public AudioInferenceCallback{
         std::string label,
         std::string audio_name,
         Color detection_color,
-        DetectedCallback detected_callback
+        DetectedCallback detected_callback = nullptr
     );
 
-    virtual ~AudioPerSpectrumDetectorBase();
+    void set_detected_callback(DetectedCallback detected_callback);
 
     WallClock last_detection() const{
         return m_last_timestamp;

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -133,6 +133,7 @@
 #include "NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
 #include "PokemonSwSh/PokemonSwSh_Settings.h"
+#include "PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h"
 
 #include <QPixmap>
 #include <QVideoFrame>
@@ -286,9 +287,25 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+    auto screenshot = feed.snapshot();
 
 
-#if 1
+
+    StartBattleYellowBarDetector detector(COLOR_RED);
+    cout << detector.detect(screenshot) << endl;
+
+
+
+
+//    cout << "asdf" << endl;
+//    cout << (int)settings_detect_console_type(console, context) << endl;
+
+
+
+//    DateReader_Switch2_US reader(COLOR_RED);
+//    reader.read_date(logger, screenshot);
+
+#if 0
     HomeMenuDetector detector0(console);
     StartGameUserSelectDetector detector1(console);
     UpdatePopupDetector detector2(console);

SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h

@@ -18,7 +18,9 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSV{
 
-
+//
+//  This class is now deprecated.
+//
 class EncounterWatcher : public VisualInferenceCallback, public AudioInferenceCallback{
 public:
     EncounterWatcher(VideoStream& stream, Color color = COLOR_RED);

SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.cpp

@@ -0,0 +1,84 @@
+/*  Start Battle Yellow Bar
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonSV_StartBattleYellowBar.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+StartBattleYellowBarDetector::StartBattleYellowBarDetector(Color color)
+    : m_color(color)
+    , m_top(0.100000, 0.001000, 0.800000, 0.004000)
+    , m_bot(0.100000, 0.995000, 0.800000, 0.004000)
+    , m_mid(0.1, 0.1, 0.8, 0.8)
+{}
+void StartBattleYellowBarDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top);
+    items.add(m_color, m_bot);
+}
+
+bool StartBattleYellowBarDetector::detect(const ImageViewRGB32& screen){
+    ImageStats top = image_stats(extract_box_reference(screen, m_top));
+    ImageStats bot = image_stats(extract_box_reference(screen, m_bot));
+//    cout << "top = " << top.average << top.stddev << endl;
+//    cout << "bot = " << bot.average << top.stddev << endl;
+    if (!is_solid(top, {0.554825, 0.445175, 0.})){
+        return false;
+    }
+    if (!is_solid(bot, {0.554825, 0.445175, 0.})){
+        return false;
+    }
+
+    if (euclidean_distance(top.average, bot.average) > 10){
+        return false;
+    }
+
+    ImageStats mid = image_stats(extract_box_reference(screen, m_mid));
+//    cout << "mid = " << mid.average << mid.stddev << endl;
+    if (mid.stddev.sum() < 10){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+void StartBattleYellowBarWatcher::make_overlays(VideoOverlaySet& items) const{
+    StartBattleYellowBarDetector::make_overlays(items);
+}
+bool StartBattleYellowBarWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    if (!detect(frame)){
+        m_start_detection = WallClock::min();
+        return false;
+    }
+
+    //  Not long enough.
+    if (m_start_detection + std::chrono::milliseconds(100) > timestamp){
+        return false;
+    }
+
+    m_last_detected = timestamp;
+//    cout << "Detected yellow bar." << endl;
+    return false;
+}
+
+
+
+
+}
+}
+}

SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h

@@ -0,0 +1,61 @@
+/*  Start Battle Yellow Bar
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_StartBattleYellowBar_H
+#define PokemonAutomation_PokemonSV_StartBattleYellowBar_H
+
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class StartBattleYellowBarDetector : public StaticScreenDetector{
+public:
+    StartBattleYellowBarDetector(Color color);
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_top;
+    ImageFloatBox m_bot;
+    ImageFloatBox m_mid;
+};
+class StartBattleYellowBarWatcher : public StartBattleYellowBarDetector, public VisualInferenceCallback{
+public:
+    StartBattleYellowBarWatcher(Color color)
+        : StartBattleYellowBarDetector(color)
+        , VisualInferenceCallback("StartBattleYellowBarWatcher")
+        , m_start_detection(WallClock::min())
+        , m_last_detected(WallClock::min())
+    {}
+
+    WallClock last_detected() const{
+        return m_last_detected.load(std::memory_order_relaxed);
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    WallClock m_start_detection;
+    std::atomic<WallClock> m_last_detected;
+};
+
+
+
+
+}
+}
+}
+#endif

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

@@ -62,7 +62,7 @@ class LetsGoKillWatcher : public DetectorToFinder<LetsGoKillDetector>{
 
 class LetsGoKillSoundDetector : public AudioPerSpectrumDetectorBase{
 public:
-    LetsGoKillSoundDetector(Logger& logger, DetectedCallback detected_callback);
+    LetsGoKillSoundDetector(Logger& logger, DetectedCallback detected_callback = nullptr);
 
     virtual float get_score_threshold() const override;