Merge

Author: Dalton-V

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.cpp

@@ -71,7 +71,14 @@ RestaurantFarmer::RestaurantFarmer()
         100, 
         0
         )
-    , MOVE_AI(
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)),
+      NOTIFICATIONS({
+          &NOTIFICATION_STATUS_UPDATE,
+          &NOTIFICATION_PROGRAM_FINISH,
+          &NOTIFICATION_ERROR_FATAL,
+      }),
+      MOVE_AI(
           "<b>Move Selection AI:</b><br>"
           "If enabled, it will be smarter with move selection.<br>"
           "However, this adds a split-second delay which may cause the opponent attacks to land first.",
@@ -84,14 +91,7 @@ RestaurantFarmer::RestaurantFarmer()
           "However, this adds a 320ms delay which may cause the opponent attacks to land first.",
           LockMode::UNLOCK_WHILE_RUNNING,
           false
-          ) 
-    , GO_HOME_WHEN_DONE(false),
-      NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)),
-      NOTIFICATIONS({
-          &NOTIFICATION_STATUS_UPDATE,
-          &NOTIFICATION_PROGRAM_FINISH,
-          &NOTIFICATION_ERROR_FATAL,
-      }) {
+          ) {
     PA_ADD_OPTION(STOP_AFTER_CURRENT);
     PA_ADD_OPTION(MOVE_AI);
     PA_ADD_OPTION(USE_PLUS_MOVES);

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.h

@@ -61,6 +61,10 @@ class RestaurantFarmer : public SingleSwitchProgramInstance, public ButtonListen
     std::atomic<bool> m_stop_after_current;
     StopButton STOP_AFTER_CURRENT;
     SimpleIntegerOption<uint32_t> NUM_ROUNDS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
     BooleanCheckBoxOption MOVE_AI;
     BooleanCheckBoxOption USE_PLUS_MOVES;
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;