Attacked while trying to fly.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.cpp

@@ -73,13 +73,16 @@ void ScreenshotException::add_stream_if_needed(VideoStream& stream){
     }
 }
 
-ImageViewRGB32 ScreenshotException::screenshot() const{
+ImageViewRGB32 ScreenshotException::screenshot_view() const{
     if (m_screenshot){
         return *m_screenshot;
     }else{
         return ImageViewRGB32();
     }
 }
+std::shared_ptr<const ImageRGB32> ScreenshotException::screenshot() const{
+    return m_screenshot;
+}
 
 
 void ScreenshotException::send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const{
@@ -94,7 +97,7 @@ void ScreenshotException::send_notification(ProgramEnvironment& env, EventNotifi
             env.program_info(),
             name(),
             embeds,
-            screenshot(),
+            screenshot_view(),
             m_stream ? &m_stream->history() : nullptr
         );
     }
@@ -104,7 +107,7 @@ void ScreenshotException::send_notification(ProgramEnvironment& env, EventNotifi
         color(),
         name(),
         std::move(embeds), "",
-        screenshot()
+        screenshot_view()
     );
 }
 

SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.h

@@ -67,7 +67,8 @@ class ScreenshotException : public Exception{
 public:
 //    virtual const char* name() const override{ return "ScreenshotException"; }
     virtual std::string message() const override{ return m_message; }
-    ImageViewRGB32 screenshot() const;
+    ImageViewRGB32 screenshot_view() const;
+    std::shared_ptr<const ImageRGB32> screenshot() const;
 
     virtual Color color() const{ return COLOR_RED; }
     virtual void send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const;

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

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

@@ -9,6 +9,7 @@
 #include "CommonFramework/Exceptions/ProgramFinishedException.h"
 #include "CommonFramework/Exceptions/FatalProgramException.h"
 #include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "CommonFramework/ProgramStats/StatsTracking.h"
@@ -231,6 +232,18 @@ void EggAutonomous::program(SingleSwitchProgramEnvironment& env, ProControllerCo
             try{
                 num_party_eggs = fetch_eggs_full_routine(env, context);
                 break;
+            }catch (UnexpectedBattleException& e){
+                handle_recoverable_error(
+                    env, context,
+                    NOTIFICATION_ERROR_RECOVERABLE,
+                    OperationFailedException(
+                        ErrorReport::NO_ERROR_REPORT,
+                        e.message(),
+                        nullptr,
+                        e.screenshot()
+                    ),
+                    consecutive_failures
+                );
             }catch (OperationFailedException& e){
                 handle_recoverable_error(env, context, NOTIFICATION_ERROR_RECOVERABLE, e, consecutive_failures);
             } // end try catch
@@ -692,7 +705,7 @@ void EggAutonomous::save_game(SingleSwitchProgramEnvironment& env, ProController
 void EggAutonomous::handle_recoverable_error(
     SingleSwitchProgramEnvironment& env, ProControllerContext& context,
     EventNotificationOption& notification,
-    OperationFailedException& e,
+    const OperationFailedException& e,
     size_t& consecutive_failures
 ){
     auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();

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

@@ -61,7 +61,7 @@ class EggAutonomous : public SingleSwitchProgramInstance{
     void handle_recoverable_error(
         SingleSwitchProgramEnvironment& env, ProControllerContext& context,
         EventNotificationOption& notification,
-        OperationFailedException& e,
+        const OperationFailedException& e,
         size_t& consecutive_failures
     );
 

SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp

@@ -507,7 +507,12 @@ void CramomaticRNG::program(SingleSwitchProgramEnvironment& env, ProControllerCo
                 env.console
                 );
             }
-            send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, e.message(), e.screenshot());
+            send_program_recoverable_error_notification(
+                env,
+                NOTIFICATION_ERROR_RECOVERABLE,
+                e.message(),
+                e.screenshot_view()
+            );
             is_state_valid = false;
             recover_from_wrong_state(env, context);
             continue;

SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp

@@ -535,7 +535,12 @@ void DailyHighlightRNG::program(SingleSwitchProgramEnvironment& env, ProControll
                 num_npcs = calibrate_num_npc_from_party(env, context, rng);
             }
             catch (OperationFailedException& exception) {
-                send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, exception.message(), exception.screenshot());
+                send_program_recoverable_error_notification(
+                    env,
+                    NOTIFICATION_ERROR_RECOVERABLE,
+                    exception.message(),
+                    exception.screenshot_view()
+                );
                 assumed_successful_iterations = 0;
                 stats.errors++;
                 continue;