Fixes

PokemonAutomation · Sep 19, 2023 · f15970a · f15970a
1 parent a9d65fb
commit f15970a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.cpp
@@ -12,8 +12,8 @@ namespace PokemonSV{
 
 
 
-TeraFarmerCatchOnWin::TeraFarmerCatchOnWin()
-    : GroupOption("Catch on Win", LockWhileRunning::UNLOCKED, true)
+TeraFarmerCatchOnWin::TeraFarmerCatchOnWin(bool enabled)
+    : GroupOption("Catch on Win", LockWhileRunning::UNLOCKED, enabled)
     , BALL_SELECT(
         "<b>Ball Select:</b>",
         LockWhileRunning::UNLOCKED,

diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h
@@ -19,7 +19,7 @@ namespace PokemonSV{
 
 class TeraFarmerCatchOnWin : public GroupOption{
 public:
-    TeraFarmerCatchOnWin();
+    TeraFarmerCatchOnWin(bool enabled);
 
 public:
     PokemonSwSh::PokemonBallSelectOption BALL_SELECT;

diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp
@@ -213,7 +213,7 @@ void enter_tera_search(
         context.wait_for_all_requests();
         int ret = wait_until(
             console, context,
-            std::chrono::seconds(60),
+            std::chrono::seconds(30),
             {
                 overworld,
                 main_menu,
@@ -262,7 +262,7 @@ void enter_tera_search(
         default:
             dump_image_and_throw_recoverable_exception(
                 info, console, "EnterTeraSearchFailed",
-                "enter_tera_search(): No recognized state after 60 seconds."
+                "enter_tera_search(): No recognized state after 30 seconds."
             );
         }
     }

diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp
@@ -128,6 +128,7 @@ TeraSelfFarmer::TeraSelfFarmer()
         LockWhileRunning::UNLOCKED,
         20
     )
+    , CATCH_ON_WIN(true)
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATION_NONSHINY(
         "Non-Shiny Encounter",