Improve fault tolerance of TeraRoller.

Author: Mysticial

SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp

@@ -37,14 +37,17 @@ const ImageMatch::ExactImageMatcher& GRADIENT_ARROW_VERTICAL(){
 
 bool is_gradient_arrow(
     GradientArrowType type,
+    const ImageViewRGB32& original_screen,
     const ImageViewRGB32& image,
     WaterfillObject& object,
     const WaterfillObject& yellow, const WaterfillObject& blue
 ){
     object = yellow;
     object.merge_assume_no_overlap(blue);
 
-    if (object.width() < 20){
+    size_t object_box_area = object.width() * object.height();
+    double min_area = original_screen.total_pixels() * (2000. / (1920*1080));
+    if (object_box_area < min_area){
         return false;
     }
 
@@ -66,6 +69,9 @@ bool is_gradient_arrow(
         }
         double rmsd = GRADIENT_ARROW_HORIZONTAL().rmsd(cropped);
 //        cout << "rmsd = " << rmsd << endl;
+//        if (rmsd <= THRESHOLD){
+//            cout << "object_box_area = " << object_box_area << endl;
+//        }
         return rmsd <= THRESHOLD;
     }
     case GradientArrowType::DOWN:{
@@ -223,7 +229,7 @@ bool GradientArrowDetector::detect(ImageFloatBox& box, const ImageViewRGB32& scr
     for (WaterfillObject& yellow : yellows){
         for (WaterfillObject& blue : blues){
             WaterfillObject object;
-            if (is_gradient_arrow(m_type, region, object, yellow, blue)){
+            if (is_gradient_arrow(m_type, screen, region, object, yellow, blue)){
 //                hits.emplace_back(translate_to_parent(screen, m_box, object));
 //                extract_box_reference(region, object).save("object.png");
                 box = translate_to_parent(screen, m_box, object);

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp

@@ -184,7 +184,7 @@ void TeraRoller::program(SingleSwitchProgramEnvironment& env, ProControllerConte
         env.console.overlay().add_log("Entering tera raid...", COLOR_WHITE);
 
         // Run away from the tera raid battle
-        run_from_tera_battle(env.program_info(), env.console, context);
+        run_from_tera_battle(env, env.console, context, &stats.m_errors);
         context.wait_for_all_requests();
 
         env.console.log("Checking if tera raid is shiny...");

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp

@@ -670,7 +670,12 @@ TeraResult run_tera_summary(
 }
 
 
-void run_from_tera_battle(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+void run_from_tera_battle(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::atomic<uint64_t>* stat_errors
+){
     stream.log("Running away from tera raid battle...");
 
     WallClock start = current_time();
@@ -688,9 +693,10 @@ void run_from_tera_battle(const ProgramInfo& info, VideoStream& stream, ProContr
         GradientArrowWatcher leave_confirm(
             COLOR_RED,
             GradientArrowType::RIGHT,
-            {0.557621, 0.471074, 0.388476, 0.247934}
+            {0.557621, 0.471074, 0.25, 0.247934}
         );
         OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        TeraCardWatcher tera_card(COLOR_BLUE);
         context.wait_for_all_requests();
 
         int ret = wait_until(
@@ -700,6 +706,7 @@ void run_from_tera_battle(const ProgramInfo& info, VideoStream& stream, ProContr
                 battle_menu,
                 leave_confirm,
                 overworld,
+                tera_card,
             }
         );
 
@@ -718,7 +725,19 @@ void run_from_tera_battle(const ProgramInfo& info, VideoStream& stream, ProContr
         case 2:
             stream.log("Detected overworld.");
             return;
+        case 3:
+            stream.log("Detected a raid. (unexpected)", COLOR_RED);
+            if (stat_errors){
+                (*stat_errors)++;
+                env.update_stats();
+            }
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
         default:
+            if (stat_errors){
+                (*stat_errors)++;
+                env.update_stats();
+            }
             OperationFailedException::fire(
                 ErrorReport::SEND_ERROR_REPORT,
                 "run_from_tera_battle(): No recognized state after 1 minutes.",

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h

@@ -112,7 +112,12 @@ TeraResult run_tera_summary(
 );
 
 //  Run away from tera battle.
-void run_from_tera_battle(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+void run_from_tera_battle(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::atomic<uint64_t>* stat_errors
+);
 
 bool is_sparkling_raid(VideoStream& stream, ProControllerContext& context);