Finish overworld party selection detector

Gin · Gin · commit 5ccce652a8a3 · 2025-11-09T10:59:51.000-08:00
diff --git a/SerialPrograms/Scripts/check_detector_regions.py b/SerialPrograms/Scripts/check_detector_regions.py
@@ -36,14 +36,16 @@
 # LZA overworld party selection buttons
 for i in range(6):
 	# loctions for the dpad up buttons to send party pokemon from ball to outside
-	add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.954, 0.017, 0.030, image)
+	# add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.954, 0.017, 0.030, image)
 	# locations for the dpad down buttons to retrieve outside pokemon back to ball while
 	# current party selection is on another in-ball pokemon
-	add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.926, 0.017, 0.030, image)
+	# add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.926, 0.017, 0.030, image)
 	# locations for the dpad down buttons to retrieve outside pokemon back to ball while
 	# current party selection is this outside pokemon. In this case, dpad up button is not
 	# present.
-	add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.939, 0.017, 0.030, image)
+	# add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.939, 0.017, 0.030, image)
+
+	add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.926, 0.017, 0.058, image)
 
 
 # ==================================================================
diff --git a/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp
@@ -83,13 +83,14 @@ bool match_template_by_waterfill(
     std::function<bool(Kernels::Waterfill::WaterfillObject& object)> check_matched_object)
 {
     if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
+        std::cout << "============ match_template_by_waterfill ============" << std::endl;
         dump_debug_image(
             global_logger_command_line(), 
             "CommonFramework/WaterfillTemplateMatcher", 
             "match_template_by_waterfill_input_image", 
             image
         );
-        std::cout << "Match template by waterfill, " << filters.size() << " filter(s), size range ("
+        std::cout << "Use " << filters.size() << " filter(s), size range ("
                   << area_thresholds.first << ", ";
         if (area_thresholds.second == SIZE_MAX){
             std::cout << "SIZE_MAX";
@@ -131,7 +132,7 @@ bool match_template_by_waterfill(
 
 //            cout << "object.area = " << object.area << endl;
             if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-                std::cout << "------------" << std::endl;
+                std::cout << "------------ Matching One WaterfillObject ------------" << std::endl;
                 std::cout << "Object area: " << object.area << std::endl;
             }
 
@@ -140,7 +141,8 @@ bool match_template_by_waterfill(
             }
             double rmsd = matcher.rmsd_original(input_resolution, image, object);
             if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-                std::cout << "Object rmsd: " << rmsd << std::endl;
+                std::cout << "Final rmsd: " << rmsd << " vs " << rmsd_threshold << std::endl;
+                std::cout << "------------ End of Matching one WaterfillObject ------------" << std::endl;
             }
 
 //            std::cout << "Object rmsd: " << rmsd << std::endl;
@@ -166,7 +168,7 @@ bool match_template_by_waterfill(
         }
     }
     if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        std::cout << "End match template by waterfill" << std::endl;
+        std::cout << "============ End of match_template_by_waterfill ============" << std::endl;
     }
     return detected;
 }
diff --git a/SerialPrograms/Source/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp b/SerialPrograms/Source/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp
@@ -188,7 +188,7 @@ bool BoxDetector::detect(const ImageViewRGB32& screen){
                 if (arrow_found && m_debug_mode){
                     cout << "Multiple box selection arrows detected! First detection (" << int(m_found_row) << ", " << int(m_found_col) << ")"
                          << " second detection (" << int(row) << ", " << int(col) << ")" << endl;
-                    throw FatalProgramException(ErrorReport::SEND_ERROR_REPORT,
+                    throw FatalProgramException(ErrorReport::NO_ERROR_REPORT,
                         "Multiple box selection arrows detected!", nullptr, screen.copy());
                 }
                 arrow_found = true;
diff --git a/SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp b/SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp
@@ -10,9 +10,9 @@
 #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
 #include "PokemonLZA_ButtonDetector.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -67,17 +67,19 @@ class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
         return matcher;
     }
     static const ButtonMatcher& DpadUp(){
-        static ButtonMatcher matcher(ButtonType::ButtonDpadUp, 50, 50, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonDpadUp, 30, 30, 80);
         return matcher;
     }
     static const ButtonMatcher& DpadDown(){
-        static ButtonMatcher matcher(ButtonType::ButtonDpadDown, 50, 50, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonDpadDown, 30, 30, 80);
         return matcher;
     }
 
     virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
         size_t min_width = m_min_width * input_resolution.width / 3840;
         size_t min_height = m_min_height * input_resolution.height / 2160;
+        // cout << "???? check_image() ???? min size " << min_width << " x " << min_height
+        //      << " got " << image.width() << " x " << image.height() << endl;
         return image.width() >= min_width && image.height() >= min_height;
     };
 
diff --git a/SerialPrograms/Source/Tests/PokemonLZA_Tests.cpp b/SerialPrograms/Source/Tests/PokemonLZA_Tests.cpp
@@ -15,6 +15,7 @@
 #include "PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
 #include "PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_MapIconDetector.h"
+#include "PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include <iostream>
 #include <fstream>
@@ -393,5 +394,72 @@ int test_pokemonLZA_MapIconDetector(const std::string& filepath){
     return 0;
 }
 
+int test_pokemonLZA_OverworldPartySelectionDetector(const ImageViewRGB32& image, const std::vector<std::string>& words){
+    // Expected filename format: <...>_<dpad_up_idx>_<dpad_down_idx>.png
+    // Where indices are 0-5 for party positions, or 6 for INVALID_PARTY_IDX
+    // Examples:
+    //   test_0_1.png -> dpad_up_idx = 0, dpad_down_idx = 1
+    //   test_6_2.png -> dpad_up_idx = 6 (INVALID), dpad_down_idx = 2
+    //   test_1_6.png -> dpad_up_idx = 1, dpad_down_idx = 6 (INVALID)
+
+    if (words.size() < 2){
+        cerr << "Error: filename must have at least 2 words (dpad_up_idx, dpad_down_idx)." << endl;
+        return 1;
+    }
+
+    // Parse dpad_up_idx from second-to-last word
+    int expected_up_idx;
+    if (parse_int(words[words.size() - 2], expected_up_idx) == false){
+        cerr << "Error: second-to-last word in filename should be dpad_up_idx (0-6)." << endl;
+        return 1;
+    }
+    if (expected_up_idx < 0 || expected_up_idx > 6){
+        cerr << "Error: dpad_up_idx must be between 0 and 6, got " << expected_up_idx << "." << endl;
+        return 1;
+    }
+
+    // Parse dpad_down_idx from last word
+    int expected_down_idx;
+    if (parse_int(words[words.size() - 1], expected_down_idx) == false){
+        cerr << "Error: last word in filename should be dpad_down_idx (0-6)." << endl;
+        return 1;
+    }
+    if (expected_down_idx < 0 || expected_down_idx > 6){
+        cerr << "Error: dpad_down_idx must be between 0 and 6, got " << expected_down_idx << "." << endl;
+        return 1;
+    }
+
+    // Run detector
+    auto overlay = DummyVideoOverlay();
+    OverworldPartySelectionDetector detector(COLOR_RED, &overlay);
+    detector.set_debug_mode(true);
+    bool detected = detector.detect(image);
+
+    // Check if detection matches expectations
+    uint8_t detected_up_idx = detector.dpad_up_idx();
+    uint8_t detected_down_idx = detector.dpad_down_idx();
+
+    // If both expected indices are INVALID_PARTY_IDX (6), detection should fail
+    if (expected_up_idx == 6 && expected_down_idx == 6){
+        if (detected){
+            cerr << "Error: detector should not detect anything when both indices are INVALID." << endl;
+            return 1;
+        }
+        TEST_RESULT_EQUAL(detected, false);
+        return 0;
+    }
+
+    // Otherwise, detection should succeed
+    if (!detected){
+        cerr << "Error: detector failed to detect party selection screen." << endl;
+        return 1;
+    }
+
+    TEST_RESULT_COMPONENT_EQUAL((int)detected_up_idx, expected_up_idx, "dpad_up_idx");
+    TEST_RESULT_COMPONENT_EQUAL((int)detected_down_idx, expected_down_idx, "dpad_down_idx");
+
+    return 0;
+}
+
 
 }
diff --git a/SerialPrograms/Source/Tests/PokemonLZA_Tests.h b/SerialPrograms/Source/Tests/PokemonLZA_Tests.h
@@ -39,6 +39,8 @@
 
  int test_pokemonLZA_MapIconDetector(const std::string& filepath);
 
+ int test_pokemonLZA_OverworldPartySelectionDetector(const ImageViewRGB32& image, const std::vector<std::string>& words);
+
  }
 
  #endif
diff --git a/SerialPrograms/Source/Tests/TestMap.cpp b/SerialPrograms/Source/Tests/TestMap.cpp
@@ -298,6 +298,7 @@ const std::map<std::string, TestFunction> TEST_MAP = {
     {"PokemonLZA_BoxCellInfoDetector", std::bind(image_words_detector_helper, test_pokemonLZA_BoxCellInfoDetector, _1)},
     {"PokemonLZA_SelectionArrowDetector", std::bind(image_words_detector_helper, test_pokemonLZA_SelectionArrowDetector, _1)},
     {"PokemonLZA_MapIconDetector", test_pokemonLZA_MapIconDetector},
+    {"PokemonLZA_OverworldPartySelectionDetector", std::bind(image_words_detector_helper, test_pokemonLZA_OverworldPartySelectionDetector, _1)},
 };
 
 TestFunction find_test_function(const std::string& test_space, const std::string& test_name){
diff --git a/SerialPrograms/SourceFiles.cmake b/SerialPrograms/SourceFiles.cmake
@@ -1039,6 +1039,7 @@ file(GLOB LIBRARY_SOURCES
     Source/NintendoSwitch/Options/TurboMacroTable.h
     Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.cpp
     Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.h
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp
     Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp
     Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h
     Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipBase.h
@@ -1050,7 +1051,6 @@ file(GLOB LIBRARY_SOURCES
     Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.h
     Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp
     Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h
-    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp
     Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp
     Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp
     Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp
@@ -1570,6 +1570,8 @@ file(GLOB LIBRARY_SOURCES
     Source/PokemonLZA/Inference/PokemonLZA_MapIconDetector.h
     Source/PokemonLZA/Inference/PokemonLZA_MoveEffectivenessSymbol.cpp
     Source/PokemonLZA/Inference/PokemonLZA_MoveEffectivenessSymbol.h
+    Source/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp
+    Source/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h
     Source/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp
     Source/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h
     Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,14 @@ bool match_template_by_waterfill(`
`83`	`83`	`std::function<bool(Kernels::Waterfill::WaterfillObject& object)> check_matched_object)`
`84`	`84`	`{`
`85`	`85`	`if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){`
	`86`	`+ std::cout << "============ match_template_by_waterfill ============" << std::endl;`
`86`	`87`	`dump_debug_image(`
`87`	`88`	`global_logger_command_line(),`
`88`	`89`	`"CommonFramework/WaterfillTemplateMatcher",`
`89`	`90`	`"match_template_by_waterfill_input_image",`
`90`	`91`	`image`
`91`	`92`	`);`
`92`		`- std::cout << "Match template by waterfill, " << filters.size() << " filter(s), size range ("`
	`93`	`+ std::cout << "Use " << filters.size() << " filter(s), size range ("`
`93`	`94`	`<< area_thresholds.first << ", ";`
`94`	`95`	`if (area_thresholds.second == SIZE_MAX){`
`95`	`96`	`std::cout << "SIZE_MAX";`
`@@ -131,7 +132,7 @@ bool match_template_by_waterfill(`
`131`	`132`
`132`	`133`	`// cout << "object.area = " << object.area << endl;`
`133`	`134`	`if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){`
`134`		`- std::cout << "------------" << std::endl;`
	`135`	`+ std::cout << "------------ Matching One WaterfillObject ------------" << std::endl;`
`135`	`136`	`std::cout << "Object area: " << object.area << std::endl;`
`136`	`137`	`}`
`137`	`138`
`@@ -140,7 +141,8 @@ bool match_template_by_waterfill(`
`140`	`141`	`}`
`141`	`142`	`double rmsd = matcher.rmsd_original(input_resolution, image, object);`
`142`	`143`	`if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){`
`143`		`- std::cout << "Object rmsd: " << rmsd << std::endl;`
	`144`	`+ std::cout << "Final rmsd: " << rmsd << " vs " << rmsd_threshold << std::endl;`
	`145`	`+ std::cout << "------------ End of Matching one WaterfillObject ------------" << std::endl;`
`144`	`146`	`}`
`145`	`147`
`146`	`148`	`// std::cout << "Object rmsd: " << rmsd << std::endl;`
`@@ -166,7 +168,7 @@ bool match_template_by_waterfill(`
`166`	`168`	`}`
`167`	`169`	`}`
`168`	`170`	`if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){`
`169`		`- std::cout << "End match template by waterfill" << std::endl;`
	`171`	`+ std::cout << "============ End of match_template_by_waterfill ============" << std::endl;`
`170`	`172`	`}`
`171`	`173`	`return detected;`
`172`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ bool BoxDetector::detect(const ImageViewRGB32& screen){`
`188`	`188`	`if (arrow_found && m_debug_mode){`
`189`	`189`	`cout << "Multiple box selection arrows detected! First detection (" << int(m_found_row) << ", " << int(m_found_col) << ")"`
`190`	`190`	`<< " second detection (" << int(row) << ", " << int(col) << ")" << endl;`
`191`		`- throw FatalProgramException(ErrorReport::SEND_ERROR_REPORT,`
	`191`	`+ throw FatalProgramException(ErrorReport::NO_ERROR_REPORT,`
`192`	`192`	`"Multiple box selection arrows detected!", nullptr, screen.copy());`
`193`	`193`	`}`
`194`	`194`	`arrow_found = true;`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@`
`39`	`39`
`40`	`40`	`int test_pokemonLZA_MapIconDetector(const std::string& filepath);`
`41`	`41`
	`42`	`+ int test_pokemonLZA_OverworldPartySelectionDetector(const ImageViewRGB32& image, const std::vector<std::string>& words);`
	`43`	`+`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`#endif`