Added Number of Battles to run and discord notifications.

Author: Dalton-V

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.cpp

@@ -71,14 +71,7 @@ RestaurantFarmer::RestaurantFarmer()
         100, 
         0
         )
-    , 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(
+    , 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.",
@@ -91,35 +84,14 @@ RestaurantFarmer::RestaurantFarmer()
           "However, this adds a 320ms delay which may cause the opponent attacks to land first.",
           LockMode::UNLOCK_WHILE_RUNNING,
           false
-          ) {
-    , 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 opponent attacks to land first.",
-        LockMode::UNLOCK_WHILE_RUNNING,
-        true
-    )
-    , USE_PLUS_MOVES(
-        "<b>Use Plus Moves:</b><br>"
-        "If enabled, it will attempt to use plus moves.<br>"
-        "However, this adds a 320ms delay which may cause opponent attacks to land first.",
-        LockMode::UNLOCK_WHILE_RUNNING,
-        false
-    )
-    , NUM_ROUNDS(
-        "<b>Number of Battles to run:</b><br>Zero will run until 'Stop after Current Battle' is pressed.</b>", 
-        LockMode::UNLOCK_WHILE_RUNNING, 
-        100, 
-        0
-        ),
-      GO_HOME_WHEN_DONE(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);
@@ -405,6 +377,7 @@ void RestaurantFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
 
 //    auto lobby = env.console.video().snapshot();
 
+    uint32_t current_round = 0;
     while (true){
         send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
         if (NUM_ROUNDS != 0 && stats.battles >= NUM_ROUNDS) {
@@ -415,6 +388,7 @@ void RestaurantFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
             break;
         }
         run_battle(env, context);
+        current_round++;
     }
 
     send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.h

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