Add periodic reset to LP farmer.

PokemonAutomation · Sep 15, 2023 · f7dc7f0 · f7dc7f0
1 parent 617451c
commit f7dc7f0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.cpp
@@ -10,6 +10,8 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSV/PokemonSV_Settings.h"
+#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
 #include "PokemonSV/Programs/PokemonSV_Navigation.h"
 #include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
 #include "PokemonSV_LPFarmer.h"
@@ -59,6 +61,11 @@ LPFarmer::LPFarmer()
         LockWhileRunning::UNLOCKED,
         10000, 1
     )
+    , PERIODIC_RESET(
+        "<b>Periodic Game Reset:</b><br>Reset the game after this many skips. This clears up the framerate bug.",
+        LockWhileRunning::UNLOCKED,
+        20
+    )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
         &NOTIFICATION_STATUS_UPDATE,
@@ -69,6 +76,7 @@ LPFarmer::LPFarmer()
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(FETCHES);
+    PA_ADD_OPTION(PERIODIC_RESET);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
@@ -80,9 +88,11 @@ void LPFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& cont
     LPFarmer_Descriptor::Stats& stats = env.current_stats<LPFarmer_Descriptor::Stats>();
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 10);
+    pbf_press_button(context, BUTTON_L, 10, 10);
 
     bool first = true;
+    uint32_t skip_counter = 0;
+
     for (size_t fetches = 0; fetches < FETCHES;){
         env.update_stats();
         send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
@@ -92,9 +102,19 @@ void LPFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& cont
             pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY);
             context.wait_for_all_requests();
             stats.m_skips++;
+            skip_counter++;
+            env.update_stats();
         }
         first = false;
 
+        uint8_t reset_period = PERIODIC_RESET;
+        if (reset_period != 0 && skip_counter >= reset_period){
+            env.log("Resetting game to clear framerate.");
+            save_game_from_overworld(env.program_info(), env.console, context);
+            reset_game(env.program_info(), env.console, context);
+            skip_counter = 0;
+        }
+
         if (!open_raid(env.console, context)){
             continue;
         }

diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.h
@@ -33,6 +33,7 @@ class LPFarmer : public SingleSwitchProgramInstance {
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
     SimpleIntegerOption<uint32_t> FETCHES;
+    SimpleIntegerOption<uint8_t> PERIODIC_RESET;
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;
 };