SV eggs, detect getting attacked and break out early for fast recovery.

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 = 16;
+const int PROGRAM_VERSION_PATCH = 17;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp

@@ -211,7 +211,7 @@ void EggAutonomous::program(SingleSwitchProgramEnvironment& env, ProControllerCo
     m_num_sandwich_spent = 0;
     m_num_kept = 0;
     size_t consecutive_failures = 0;
-    while(true){
+    while (true){
         m_saved_after_fetched_eggs = false;
         m_in_critical_to_save_stage = false;
 
@@ -227,7 +227,7 @@ void EggAutonomous::program(SingleSwitchProgramEnvironment& env, ProControllerCo
 
         // Recoverable loop to fetch eggs:
         int num_party_eggs = -1;
-        while(true){
+        while (true){
             try{
                 num_party_eggs = fetch_eggs_full_routine(env, context);
                 break;
@@ -238,7 +238,7 @@ void EggAutonomous::program(SingleSwitchProgramEnvironment& env, ProControllerCo
 
         // Recoverable loop to hatch eggs
         bool game_already_resetted = false;
-        while(true){
+        while (true){
             try{
                 hatch_eggs_full_routine(env, context, num_party_eggs);
                 consecutive_failures = 0;

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
@@ -22,6 +23,7 @@
 #include "PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h"
 #include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
 #include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
 #include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
 #include "PokemonSV/Programs/PokemonSV_MenuNavigation.h"
 #include "PokemonSV/Programs/PokemonSV_WorldNavigation.h"
@@ -122,6 +124,7 @@ void do_egg_cycle_motion(
     VideoStream& stream, ProControllerContext& context
 ){
     AdvanceDialogWatcher dialog(COLOR_RED);
+    NormalBattleMenuWatcher battle_menu(COLOR_GREEN);
     int ret = run_until<ProControllerContext>(
         stream, context,
         [&](ProControllerContext& context){
@@ -132,9 +135,22 @@ void do_egg_cycle_motion(
             ssf_press_right_joystick(context, 255, 128, 0ms, std::chrono::minutes(10));
             pbf_press_button(context, BUTTON_LCLICK, std::chrono::minutes(10), 0ms);
         },
-        {dialog}
+        {
+            dialog,
+            battle_menu,
+        }
     );
-    if (ret < 0){
+    switch (ret){
+    case 0:
+        break;
+    case 1:
+        OperationFailedException::fire(
+            ErrorReport::NO_ERROR_REPORT,
+            "Detected battle menu. You got attacked!",
+            stream
+        );
+        break;
+    case 2:
         dump_image_and_throw_recoverable_exception(
             info, stream, "NoEggToHatch",
             "hatch_eggs_at_zero_gate(): No more egg hatch after 10 minutes."