Make Y-COMM detector work both offline and online.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -335,9 +335,12 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
     auto snapshot = feed.snapshot();
 
-    WhiteDialogBoxDetector detector;
-    detector.make_overlays(overlays);
-    cout << detector.detect(snapshot) << endl;
+    YCommIconWatcher detector;
+    cout << detector.process_frame(snapshot, current_time()) << endl;
+
+//    WhiteDialogBoxDetector detector;
+//    detector.make_overlays(overlays);
+//    cout << detector.detect(snapshot) << endl;
 
 
 #if 0

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp

@@ -54,11 +54,6 @@ bool YCommMenuDetector::process_frame(const ImageViewRGB32& frame, WallClock tim
 }
 
 
-namespace{
-
-ImageFloatBox YCOMM_ICON_BOX{0.007, 0.944, 0.032, 0.054};
-
-}
 
 class YCommIconMatcher : public ImageMatch::WaterfillTemplateMatcher{
 public:
@@ -85,36 +80,52 @@ const YCommIconMatcher& YCommIconMatcher::instance(){
 }
 
 
-YCommIconDetector::YCommIconDetector(bool is_on)
-    : VisualInferenceCallback("YCommIconDetector")
+YCommIconDetector::YCommIconDetector(Color color, bool is_on)
+    : m_color(color)
+    , m_icon(0.007, 0.944, 0.032, 0.054)
+    , m_left(0.004362, 0.961165, 0.007634, 0.025243)
+    , m_right(0.038000, 0.961165, 0.007634, 0.025243)
     , m_is_on(is_on)
 {}
 
 void YCommIconDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, YCOMM_ICON_BOX);
+    items.add(COLOR_RED, m_icon);
+    items.add(COLOR_RED, m_left);
+    items.add(COLOR_RED, m_right);
 }
 
-bool YCommIconDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+bool YCommIconDetector::detect(const ImageViewRGB32& screen){
 
     const std::vector<std::pair<uint32_t, uint32_t>> filters = {
         {combine_rgb(0, 0, 150), combine_rgb(100, 100, 255)},
         {combine_rgb(0, 0, 150), combine_rgb(127, 127, 255)},
         {combine_rgb(0, 0, 150), combine_rgb(191, 191, 255)},
     };
 
-    const size_t min_size = (size_t)(350. * frame.total_pixels() / (1920 * 1080.));
+    const size_t min_size = (size_t)(350. * screen.total_pixels() / (1920 * 1080.));
 
-    const bool detected = match_template_by_waterfill(
-        frame.size(),
-        extract_box_reference(frame, YCOMM_ICON_BOX), 
+    if (match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_icon),
         YCommIconMatcher::instance(),
         filters,
         {min_size, SIZE_MAX},
         120,
         [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
+    )){
+        return m_is_on;
+    }
+
+    ImageStats left = image_stats(extract_box_reference(screen, m_left));
+    if (!is_solid(left, {0.0410557, 0.211144, 0.747801}, 0.20)){
+        return !m_is_on;
+    }
+    ImageStats right = image_stats(extract_box_reference(screen, m_right));
+    if (!is_solid(right, {0.0410557, 0.211144, 0.747801}, 0.20)){
+        return !m_is_on;
+    }
 
-    return m_is_on ? detected : !detected;
+    return m_is_on;
 }
 
 

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h

@@ -7,7 +7,9 @@
 #ifndef PokemonAutomation_PokemonSwSh_YCommDetector_H
 #define PokemonAutomation_PokemonSwSh_YCommDetector_H
 
+#include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
 #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
@@ -35,19 +37,29 @@ class YCommMenuDetector : public VisualInferenceCallback{
 
 // Detect the blue Y letter as the Y Comm symbol in the lower left corner of the screen on the
 // overworld, when Y Comm is active.
-class YCommIconDetector : public VisualInferenceCallback{
+class YCommIconDetector : public StaticScreenDetector{
 public:
     // If `is_on` is true, `process_frame()` returns true if it finds the Y letter.
     // Otherwise, `process_frame()` returns true if the Y letter is not found.
-    YCommIconDetector(bool is_on);
+    YCommIconDetector(Color color, bool is_on);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
+    Color m_color;
+    ImageFloatBox m_icon;
+    ImageFloatBox m_left;
+    ImageFloatBox m_right;
+
     bool m_is_on;
 };
+class YCommIconWatcher : public DetectorToFinder<YCommIconDetector>{
+public:
+    YCommIconWatcher(Color color = COLOR_RED, bool is_on = true)
+         : DetectorToFinder("YCommIconWatcher", std::chrono::milliseconds(250), color, is_on)
+    {}
+};
 
 
 

SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp

@@ -320,7 +320,7 @@ bool EggAutonomous::run_batch(
     while (num_eggs_hatched < 5 || m_num_eggs_retrieved < 5){
         // Detect when Y-Comm icon disappears. This is the time an egg is hatching
         const bool y_comm_visible_when_egg_hatching = false;
-        YCommIconDetector egg_hatching_detector(y_comm_visible_when_egg_hatching);
+        YCommIconWatcher egg_hatching_detector(COLOR_RED, y_comm_visible_when_egg_hatching);
 
         bool restart_bike_loop = false;
         for (size_t i_bike_loop = 0; i_bike_loop < this->LOOPS_PER_FETCH && bike_loop_count < MAX_BIKE_LOOP_COUNT;){
@@ -493,7 +493,7 @@ void EggAutonomous::wait_for_egg_hatched(
 ){
     env.console.overlay().add_log("Egg hatching " + std::to_string(num_hatched_eggs) + "/5", COLOR_GREEN);
     const bool y_comm_visible_at_end_of_egg_hatching = true;
-    YCommIconDetector end_egg_hatching_detector(y_comm_visible_at_end_of_egg_hatching);
+    YCommIconWatcher end_egg_hatching_detector(COLOR_RED, y_comm_visible_at_end_of_egg_hatching);
     const int ret = run_until<ProControllerContext>(
         env.console, context,
         [](ProControllerContext& context){
@@ -538,7 +538,7 @@ size_t EggAutonomous::talk_to_lady_to_fetch_egg(
     );
 
     const bool y_comm_visible_at_end_of_dialog = true;
-    YCommIconDetector dialog_over_detector(y_comm_visible_at_end_of_dialog);
+    YCommIconWatcher dialog_over_detector(COLOR_RED, y_comm_visible_at_end_of_dialog);
     switch (ret){
     case 0:
         ++num_eggs_retrieved;
@@ -846,7 +846,7 @@ bool EggAutonomous::process_hatched_pokemon(
     }else{
         // Leave menu, go back to overworld
         const bool y_comm_visible = true;
-        YCommIconDetector y_comm_detector(y_comm_visible);
+        YCommIconWatcher y_comm_detector(COLOR_RED, y_comm_visible);
         const int ret = run_until<ProControllerContext>(
             env.console, context,
             [](ProControllerContext& context){
@@ -873,7 +873,7 @@ void EggAutonomous::mash_B_until_y_comm_icon(
 ){
     context.wait_for_all_requests();
     const bool y_comm_visible = true;
-    YCommIconDetector y_comm_detector(y_comm_visible);
+    YCommIconWatcher y_comm_detector(COLOR_RED, y_comm_visible);
     int ret = run_until<ProControllerContext>(
         env.console, context,
         [](ProControllerContext& context){

SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp

@@ -180,7 +180,7 @@ void DailyHighlightRNG::interact_with_trader(SingleSwitchProgramEnvironment& env
     VideoOverlaySet boxes(env.console);
     SelectionArrowFinder arrow_detector(env.console, ImageFloatBox(0.5, 0.58, 0.2, 0.08));
     arrow_detector.make_overlays(boxes);
-    YCommIconDetector y_comm_icon_detector(true);
+    YCommIconWatcher y_comm_icon_detector;
     size_t tries = 0;
 
     while (true){
@@ -387,7 +387,7 @@ void DailyHighlightRNG::prepare_game_state(SingleSwitchProgramEnvironment& env,
 void DailyHighlightRNG::return_to_overworld(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool wait_after_detection){
     context.wait_for_all_requests();
     env.console.log("Returning to the overworld.");
-    YCommIconDetector y_comm_icon_detector(true);
+    YCommIconWatcher y_comm_icon_detector;
     int ret = run_until<ProControllerContext>(
         env.console, context,
         [](ProControllerContext& context){

SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp

@@ -81,7 +81,7 @@ bool ShinyHuntAutonomousRegigigas2::kill_and_return(VideoStream& stream, ProCont
 
     while (true){
         RaidCatchWatcher detector(stream.overlay());
-        YCommIconDetector overworld(true);
+        YCommIconWatcher overworld;
         context.wait_for_all_requests();
         int result = wait_until(
             stream, context,

SerialPrograms/Source/Tests/PokemonSwSh_Tests.cpp

@@ -89,8 +89,7 @@ int test_pokemonSwSh_CheckNurseryArrowFinder(const ImageViewRGB32& image, bool t
 }
 
 int test_pokemonSwSh_YCommIconDetector(const ImageViewRGB32& image, bool target){
-    const bool is_on = true;
-    YCommIconDetector detector(is_on);
+    YCommIconWatcher detector;
     bool result = detector.process_frame(image, current_time());
     TEST_RESULT_EQUAL(result, target);
     return 0;