Enforce X and Y buttons for MapDetector.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -152,6 +152,7 @@
 #include "PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h"
 #include "PokemonLZA/Inference/PokemonLZA_MoveEffectivenessSymbol.h"
 #include "PokemonLZA/Inference/PokemonLZA_MapIconDetector.h"
+#include "PokemonLZA/Inference/PokemonLZA_MapDetector.h"
 
 
 
@@ -293,7 +294,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 //    MoveEffectivenessSymbolMatcher::NoEffect();
 
-#if 1
+#if 0
     MapIconDetector detector0(COLOR_RED, MapIconType::PokemonCenter, {0, 0, 1, 1}, &overlay);
     MapIconDetector detector1(COLOR_RED, MapIconType::Building, {0, 0, 1, 1}, &overlay);
     MapIconDetector detector2(COLOR_RED, MapIconType::BuildingFlyable, {0, 0, 1, 1}, &overlay);
@@ -315,11 +316,11 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
 
-#if 0
+#if 1
 
     auto snapshot = feed.snapshot();
 
-    MoveEffectivenessSymbolDetector detector(COLOR_RED, &overlay);
+    MapDetector detector(COLOR_RED, &overlay);
     cout << detector.detect(snapshot) << endl;
 #endif
 

SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp

@@ -27,39 +27,39 @@ class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
     // - min_height: candidate image min height if video stream is 4k
     ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd);
     static const ButtonMatcher& A(){
-        static ButtonMatcher matcher(ButtonType::ButtonA, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonA, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& B(){
-        static ButtonMatcher matcher(ButtonType::ButtonB, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonB, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& X(){
-        static ButtonMatcher matcher(ButtonType::ButtonX, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonX, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& Y(){
-        static ButtonMatcher matcher(ButtonType::ButtonY, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonY, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& L(){
-        static ButtonMatcher matcher(ButtonType::ButtonL, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonL, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& R(){
-        static ButtonMatcher matcher(ButtonType::ButtonR, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonR, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& Plus(){
-        static ButtonMatcher matcher(ButtonType::ButtonPlus, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonPlus, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& Minus(){
-        static ButtonMatcher matcher(ButtonType::ButtonMinus, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonMinus, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& Right(){
-        static ButtonMatcher matcher(ButtonType::ButtonRight, 60, 60, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonRight, 50, 50, 70);
         return matcher;
     }
     static const ButtonMatcher& RightStickUpDown(){

SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_MapDetector.cpp

@@ -19,14 +19,30 @@ MapDetector::MapDetector(Color color, VideoOverlay* overlay)
         {0.760730, 0.937023, 0.241416, 0.064885},
         overlay
     )
+    , m_x_button(
+        color,
+        ButtonType::ButtonX,
+        {0.004292, 0.208015, 0.028970, 0.049618},
+        overlay
+    )
+    , m_y_button(
+        color,
+        ButtonType::ButtonY,
+        {0.004292, 0.276718, 0.028970, 0.047710},
+        overlay
+    )
 {}
 
 void MapDetector::make_overlays(VideoOverlaySet& items) const{
     m_b_button.make_overlays(items);
+    m_x_button.make_overlays(items);
+    m_y_button.make_overlays(items);
 }
 
 bool MapDetector::detect(const ImageViewRGB32& screen){
-    return m_b_button.detect(screen);
+    return m_b_button.detect(screen)
+        && m_x_button.detect(screen)
+        && m_y_button.detect(screen);
 }
 
 

SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_MapDetector.h

@@ -27,6 +27,8 @@ class MapDetector : public StaticScreenDetector{
 
 private:
     ButtonDetector m_b_button;
+    ButtonDetector m_x_button;
+    ButtonDetector m_y_button;
 };
 
 class MapWatcher : public DetectorToFinder<MapDetector>{