Fix update menu detection. Fix unrecoverable exception when failing to run away.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 54;
-const int PROGRAM_VERSION_PATCH = 4;
+const int PROGRAM_VERSION_PATCH = 5;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -287,16 +287,28 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
 
+#if 1
+//    HomeMenuDetector detector0(console);
+//    StartGameUserSelectDetector detector1(console);
+    UpdatePopupDetector detector2(console);
+//    detector0.make_overlays(overlays);
+//    detector1.make_overlays(overlays);
+    detector2.make_overlays(overlays);
+    cout << detector2.detect(feed.snapshot()) << endl;
+#endif
+
+
+
 //    ImageRGB32 image0("menu-light.png");
 //    ImageRGB32 image1("menu-dark.png");
 //    ImageRGB32 image2("menu-jpn.png");
 
-
+#if 0
     env.log("Touching date to prevent rollover.");
     pbf_press_button(context, BUTTON_HOME, 160ms, PokemonSwSh::GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
     touch_date_from_home(console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
     resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-
+#endif
 
 
 
@@ -426,15 +438,6 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 #endif
 
 
-#if 0
-    HomeMenuDetector detector0(console);
-    StartGameUserSelectDetector detector1(console);
-    UpdatePopupDetector detector2(console);
-//    detector0.make_overlays(overlays);
-//    detector1.make_overlays(overlays);
-    detector2.make_overlays(overlays);
-    cout << detector2.detect(feed.snapshot()) << endl;
-#endif
 
 
 #if 0

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp

@@ -149,7 +149,7 @@ bool UpdatePopupDetector_Switch1::detect(const ImageViewRGB32& screen){
 UpdatePopupDetector_Switch2::UpdatePopupDetector_Switch2(Color color)
     : m_color(color)
     , m_box_top(0.25, 0.31, 0.50, 0.02)
-    , m_box_mid(0.25, 0.482, 0.50, 0.02)
+//    , m_box_mid(0.25, 0.482, 0.50, 0.02)
     , m_top(0.10, 0.17, 0.80, 0.03)
     , m_left(0.08, 0.25, 0.10, 0.38)
     , m_bottom_solid(0.10, 0.86, 0.80, 0.04)
@@ -158,7 +158,7 @@ UpdatePopupDetector_Switch2::UpdatePopupDetector_Switch2(Color color)
 
 void UpdatePopupDetector_Switch2::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box_top);
-    items.add(m_color, m_box_mid);
+//    items.add(m_color, m_box_mid);
     items.add(m_color, m_top);
     items.add(m_color, m_left);
     items.add(m_color, m_bottom_solid);
@@ -181,13 +181,15 @@ bool UpdatePopupDetector_Switch2::detect(const ImageViewRGB32& screen){
 
 //    cout << "white: " << white << endl;
 
+#if 0
     ImageStats stats_box_mid = image_stats(extract_box_reference(screen, m_box_mid));
     if (stats_box_mid.stddev.sum() > 10){
         return false;
     }
     if (euclidean_distance(stats_box_top.average, stats_box_mid.average) > 10){
         return false;
     }
+#endif
 
     ImageStats stats_left = image_stats(extract_box_reference(screen, m_left));
 //    cout << stats_left.stddev << endl;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h

@@ -44,7 +44,7 @@ class UpdatePopupDetector_Switch2 : public StaticScreenDetector{
 private:
     Color m_color;
     ImageFloatBox m_box_top;
-    ImageFloatBox m_box_mid;
+//    ImageFloatBox m_box_mid;
     ImageFloatBox m_top;
     ImageFloatBox m_left;
     ImageFloatBox m_bottom_solid;

SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp

@@ -60,11 +60,15 @@ void run_away(
             pbf_press_button(context, BUTTON_A, 80ms, 0ms);
             continue;
         default:
+            context->logger().log("Unable to detect end of battle. Assume successful run away.", COLOR_ORANGE);
+            return;
+#if 0
             throw OperationFailedException(
                 ErrorReport::SEND_ERROR_REPORT,
                 "Unable to run away. Are you stuck in the battle?",
                 stream
             );
+#endif
         }
     }
 }

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

@@ -143,9 +143,7 @@ void ShinyHuntAutonomousRegi::program(SingleSwitchProgramEnvironment& env, ProCo
         if (result.shiny_type == ShinyType::UNKNOWN){
             stats.add_error();
             pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-            try{
-                run_away(env.console, context, EXIT_BATTLE_TIMEOUT0);
-            }catch (OperationFailedException&){}
+            run_away(env.console, context, EXIT_BATTLE_TIMEOUT0);
             error = true;
             continue;
         }