Fix AutoDA Path Select false positives. Minor cleanup.

Author: Mysticial

SerialPrograms/Source/CommonTools/InferenceCallbacks/InferenceCallback.h

@@ -17,8 +17,8 @@ enum class InferenceType{
     AUDIO,
 };
 
-// Base class for an inference object to be called perioridically by
-// inference routines in InferenceRoutines.h.
+//  Base class for an inference object to be called perioridically by
+//  inference routines in InferenceRoutines.h.
 class InferenceCallback{
     //  Disable these to prevent accidental copying/slicing.
     InferenceCallback(const InferenceCallback&) = delete;
@@ -27,9 +27,9 @@ class InferenceCallback{
 public:
     virtual ~InferenceCallback() = default;
 
-    // Is it a visual or audio inference.
+    //  Is it a visual or audio inference.
     InferenceType type() const{ return m_type; }
-    // Name of the inference object.
+    //  Name of the inference object.
     const std::string& label() const{ return m_label; }
 
 
@@ -47,15 +47,14 @@ class InferenceCallback{
 
 
 
-// Used by inference routines in InferenceRoutines.h.
-// The struct contains an inference callback and its inference period: how
-// long should an inference routine wait before calling the callback object
-// again.
+//  Used by inference routines in InferenceRoutines.h.
+//  The struct contains an inference callback and its inference period: how long
+//  should an inference routine wait before calling the callback object again.
 struct PeriodicInferenceCallback{
     InferenceCallback* callback;
-    // inference period. 0 value means the inference routine should use the 
-    // default inference period, which is set as a parameter to the inference
-    // routine.
+    //  Inference period. 0 value means the inference routine should use the
+    //  default inference period, which is set as a parameter to the inference
+    //  routine.
     std::chrono::milliseconds period;
 
     PeriodicInferenceCallback()

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -134,6 +134,9 @@
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
 #include "PokemonSwSh/PokemonSwSh_Settings.h"
 #include "PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h"
+#include "PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h"
+#include "PokemonHome/Inference/PokemonHome_BallReader.h"
+#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h"
 
 #include <QPixmap>
 #include <QVideoFrame>
@@ -193,32 +196,6 @@ TestProgram::TestProgram()
     , IMAGE_PATH(false, "Path to image for testing", LockMode::UNLOCK_WHILE_RUNNING, "default.png", "default.png")
     , STATIC_TEXT("Test text...")
 //    , PLAYER_LIST("Test Table", LockMode::UNLOCK_WHILE_RUNNING, "Notes")
-    , DATE0(
-        "Date",
-        LockMode::UNLOCK_WHILE_RUNNING,
-        DateTimeOption::DATE_HOUR_MIN,
-        DateTime{2000, 1, 1, 0, 0, 0},
-        DateTime{2060, 12, 31, 23, 59, 59},
-        DateTime{2024, 4, 12, 2, 16, 30}
-    )
-    , DATE1(
-        "Date",
-        LockMode::UNLOCK_WHILE_RUNNING,
-        DateTimeOption::DATE_HOUR_MIN,
-        DateTime{2000, 1, 1, 0, 0, 0},
-        DateTime{2060, 12, 31, 23, 59, 59},
-        DateTime{2048, 1, 13, 20, 48}
-    )
-    , DURATION(
-        "Duration",
-        LockMode::UNLOCK_WHILE_RUNNING,
-        "100"
-    )
-    , COLOR(
-        LockMode::UNLOCK_WHILE_RUNNING,
-        false,
-        0x000000, 0x000000
-    )
     , NOTIFICATION_TEST("Test", true, true, ImageAttachmentMode::JPG)
     , NOTIFICATIONS({
         &NOTIFICATION_TEST,
@@ -234,11 +211,6 @@ TestProgram::TestProgram()
     PA_ADD_OPTION(STATIC_TEXT);
 //    PA_ADD_OPTION(PLAYER_LIST);
 //    PA_ADD_OPTION(battle_AI);
-    PA_ADD_OPTION(DATE0);
-    PA_ADD_OPTION(DATE1);
-    PA_ADD_OPTION(DURATION);
-    PA_ADD_OPTION(COLOR);
-    PA_ADD_OPTION(CONTROLLER_TABLE);
     PA_ADD_OPTION(NOTIFICATIONS);
     BUTTON0.add_listener(*this);
     BUTTON1.add_listener(*this);
@@ -263,10 +235,6 @@ void TestProgram::on_press(){
 
 
 
-
-
-
-
 void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
     using namespace Kernels;
     using namespace Kernels::Waterfill;
@@ -286,14 +254,59 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     ProControllerContext context(scope, console.pro_controller());
     VideoOverlaySet overlays(overlay);
 
+    auto screenshot = feed.snapshot();
+
+    PokemonSwSh::MaxLairInternal::PathSelectDetector detector;
+    detector.detect(screenshot);
+
+//    int ret = PokemonSwSh::MaxLairInternal::read_side(screenshot);
+//    cout << "ret = " << ret << endl;
 
+
+
+
+#if 0
+    ImageRGB32 image("20250717-121112090631.png");
+
+    AdvanceDialogDetector detector;
+    detector.make_overlays(overlays);
+    cout << detector.detect(image) << endl;
+#endif
+
+#if 0
+    ImageRGB32 image(RESOURCE_PATH() + "PokemonHome/PokeballSprites.png");
+    image = remove_white_border(image);
+    image.save("test.png");
+#endif
+
+
+#if 0
     auto screenshot = feed.snapshot();
 
+    PokemonHome::BallReader reader(console);
+
+    reader.read_ball(screenshot);
+#endif
+
+
+
+//    pbf_press_button(context, );
+
+
+
+
+//    PokemonLA::detect_selected_region(console, scope);
+
+
+
+
+#if 0
+    auto screenshot = feed.snapshot();
 
 
     StartBattleYellowBarDetector detector(COLOR_RED);
     cout << detector.detect(screenshot) << endl;
-
+#endif
 
 
 
@@ -307,14 +320,14 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 #if 0
     HomeMenuDetector detector0(console);
-    StartGameUserSelectDetector detector1(console);
-    UpdatePopupDetector detector2(console);
+//    StartGameUserSelectDetector detector1(console);
+//    UpdatePopupDetector detector2(console);
     detector0.make_overlays(overlays);
-    detector1.make_overlays(overlays);
-    detector2.make_overlays(overlays);
+//    detector1.make_overlays(overlays);
+//    detector2.make_overlays(overlays);
     cout << detector0.detect(feed.snapshot()) << endl;
-    cout << detector1.detect(feed.snapshot()) << endl;
-    cout << detector2.detect(feed.snapshot()) << endl;
+//    cout << detector1.detect(feed.snapshot()) << endl;
+//    cout << detector2.detect(feed.snapshot()) << endl;
 #endif
 
 
@@ -336,7 +349,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     auto screenshot = feed.snapshot();
 
 
-    BinarySliderDetector detector(COLOR_RED, {0.831784, 0.140496, 0.088290, 0.671074});
+    BinarySliderDetector detector(COLOR_RED, {0.836431, 0.097521, 0.069703, 0.796694});
     auto sliders = detector.detect(screenshot);
 
     for (auto& item : sliders){

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h

@@ -73,15 +73,6 @@ class TestProgram : public MultiSwitchProgramInstance, public ButtonListener{
 
     StaticTextOption STATIC_TEXT;
 
-//    PokemonSV::PlayerListTable PLAYER_LIST;
-    DateTimeOption DATE0;
-    DateTimeOption DATE1;
-//    ConsoleModelOption CONSOLE_MODEL;
-
-    MillisecondsOption DURATION;
-    ColorCell COLOR;
-    ControllerSettingsTable CONTROLLER_TABLE;
-
 
 //    PokemonSV::SinglesAIOption battle_AI;
 

SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp

@@ -98,6 +98,7 @@ PathSelectDetector::PathSelectDetector()
     , m_dialog_middle(0.500, 0.880, 0.180, 0.050)
 //    , m_dialog_right(0.710, 0.880, 0.030, 0.050)
     , m_left(0.050, 0.100, 0.200, 0.700)
+    , m_path_box(0.150, 0.020, 0.800, 0.780)
 {}
 void PathSelectDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(COLOR_CYAN, m_bottom_right);
@@ -147,6 +148,14 @@ bool PathSelectDetector::detect(const ImageViewRGB32& screen) const{
 //    if (dialog_right.average.sum() > dialog_middle.average.sum()){
 //        return false;
 //    }
+
+    ImageViewRGB32 path_box = extract_box_reference(screen, m_path_box);
+    if (read_side(path_box) < 0){
+//        cout << "PathSelectDetector(): read_side(screen) < 0" << endl;
+        return false;
+    }
+
+//    cout << "PathSelectDetector(): Passed" << endl;
     return true;
 }
 bool PathSelectDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){

SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h

@@ -56,6 +56,7 @@ class PathSelectDetector : public PathScreenDetector{
     ImageFloatBox m_dialog_middle;
 //    ImageFloatBox m_dialog_right;
     ImageFloatBox m_left;
+    ImageFloatBox m_path_box;
 };
 
 
@@ -99,8 +100,6 @@ class PathReader{
     void read_sprites(Logger& logger, const ImageViewRGB32& screen, std::string slugs[4]) const;
     void read_hp(Logger& logger, const ImageViewRGB32& screen, double hp[4]) const;
 
-    static int8_t read_side(const ImageViewRGB32& image, int p_min_rgb_sum);
-
 private:
     size_t m_player_index;
     OverlayBoxScope m_path;

SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp

@@ -325,15 +325,19 @@ int8_t read_side(WaterfillSession& session, const ImageViewRGB32& image, uint8_t
 //    cout << "pixel_threshold = " << (int)pixel_threshold << endl;
     session.set_source(matrix);
 
-    auto finder = session.make_iterator(300);
+    size_t min_area = image.total_pixels();
+    min_area = (size_t)((double)300 * min_area / 1293312);
+
+    auto finder = session.make_iterator(min_area);
     WaterfillObject arrow;
     WaterfillObject object;
     size_t count = 0;
     while (finder->find_next(object, true)){
-        if (is_arrow(image, object)){
-            count++;
-            arrow = object;
+        if (!is_arrow(image, object)){
+            continue;
         }
+        count++;
+        arrow = object;
     }
 //    cout << "count = " << count << endl;
     if (count != 1){
@@ -348,6 +352,7 @@ int8_t read_side(WaterfillSession& session, const ImageViewRGB32& image, uint8_t
 }
 
 int8_t read_side(const ImageViewRGB32& image){
+//    cout << image.width() * image.height() << endl;
     auto session = make_WaterfillSession();
     int8_t ret;
     if ((ret = read_side(*session, image, 160)) != -1) return ret;

SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp

@@ -65,7 +65,8 @@ CaughtScreenActionsOption::CaughtScreenActionsOption(
         "<b>Boss/Legendary is Shiny:</b><br>If there are multiple shinies where one is the boss, this option still applies.<br><br>"
         "<font color=\"red\">For safety reasons, this program will <i>NEVER</i> automatically take a boss. "
         "Likewise, the settings here are intentionally worded so that it's impossible to ask the program to take a boss. "
-        "Because taking a boss is irreversible, we refuse to automate it and require you to do it manually to avoid any mistakes.</font>",
+        "Taking a boss is irreversible, therefore we refuse to automate it. We require you to do it manually to avoid any mistakes.<br><br>"
+        "<b>Please DO NOT ask us to implement the ability to automatically take a boss. Thank you.</b></font>",
         default_shiny_boss
     )
     , description(