More programs authorized without TickPrecise.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -117,6 +117,7 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
 #include "PokemonSV/Programs/PokemonSV_Navigation.h"
 #include "PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h"
+#include "PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h"
 
 
 #include <QPixmap>
@@ -281,7 +282,12 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
-    fly_from_paldea_to_blueberry_entrance(env.program_info(), console, context);
+    return_to_academy_after_loss(env, console, context);
+
+
+
+
+//    fly_from_paldea_to_blueberry_entrance(env.program_info(), console, context);
 
 
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp

@@ -19,7 +19,7 @@ PreventSleep_Descriptor::PreventSleep_Descriptor()
         "Press B every 15 seconds to keep the Switch from sleeping.",
         FeedbackType::NONE,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController}
     )
 {}
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp

@@ -20,7 +20,7 @@ PushJoySticks_Descriptor::PushJoySticks_Descriptor()
         "Push Joy Sticks continously.",
         FeedbackType::NONE,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController}
     )
 {}
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.cpp

@@ -22,7 +22,7 @@ TurboA_Descriptor::TurboA_Descriptor()
         "Endlessly mash A.",
         FeedbackType::NONE,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController}
     )
 {}
 

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp

@@ -38,7 +38,7 @@ TournamentFarmer_Descriptor::TournamentFarmer_Descriptor()
         "Farm the Academy Ace Tournament for money and prizes.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController}
     )
 {}
 
@@ -552,9 +552,13 @@ void TournamentFarmer::handle_end_of_tournament(SingleSwitchProgramEnvironment&
 
 
 //Fly to academy from west pokemon center after losing.
-void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void return_to_academy_after_loss(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context
+){
     env.log("Tournament lost! Navigating back to academy.");
-    go_to_academy_fly_point(env, context);
+    go_to_academy_fly_point(env, stream, context);
 
 
     pbf_wait(context, 100);
@@ -572,7 +576,7 @@ void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, ProContro
 
     BlackScreenOverWatcher black_screen(COLOR_RED, { 0.2, 0.2, 0.6, 0.6 });
     int ret_black_lost = run_until<ProControllerContext>(
-        env.console, context,
+        stream, context,
         [](ProControllerContext& context){
             pbf_move_left_joystick(context, 128, 0, 5000, 0);
         },
@@ -584,8 +588,8 @@ void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, ProContro
     }
 
     //Wait for academy to load.
-    OverworldWatcher overworld(env.console, COLOR_CYAN);
-    int ret_academy = wait_until(env.console, context, Milliseconds(4000), { overworld });
+    OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+    int ret_academy = wait_until(stream, context, Milliseconds(4000), { overworld });
     if (ret_academy == 0){
         env.log("Entered academy. Walking to tournament entry.");
     }
@@ -598,19 +602,19 @@ void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, ProContro
     context.wait_for_all_requests();
 }
 
-void go_to_academy_fly_point(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void go_to_academy_fly_point(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context){
     int numAttempts = 0;
     int maxAttempts = 5;
 
     bool isFlySuccessful = false;
 
     while (!isFlySuccessful && numAttempts < maxAttempts ){
-        open_map_from_overworld(env.program_info(), env.console, context);
+        open_map_from_overworld(env.program_info(), stream, context);
         pbf_press_button(context, BUTTON_ZR, 50, 40);
         pbf_move_left_joystick(context, 200, 0, 47, 25);  
         // pbf_move_left_joystick(context, 187, 0, 50, 0);
         numAttempts++;
-        isFlySuccessful = fly_to_overworld_from_map(env.program_info(), env.console, context, true);
+        isFlySuccessful = fly_to_overworld_from_map(env.program_info(), stream, context, true);
         if (!isFlySuccessful){
             env.log("Unsuccessful fly attempt.");
         }
@@ -621,7 +625,7 @@ void go_to_academy_fly_point(SingleSwitchProgramEnvironment& env, ProControllerC
         OperationFailedException::fire(
             ErrorReport::SEND_ERROR_REPORT,
             "Failed to fly back to academy!",
-            env.console
+            stream
         );
     }
 
@@ -766,7 +770,7 @@ void TournamentFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
             }
 
             if (battle_lost){
-                return_to_academy_after_loss(env, context);
+                return_to_academy_after_loss(env, env.console, context);
                 break;
             }
         }

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h

@@ -21,10 +21,18 @@ namespace NintendoSwitch{
 namespace PokemonSV{
 
 
-void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+void return_to_academy_after_loss(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context
+);
 
 // attempt to fly back to academy fly point from the West Mesogoza Pokecenter. Will attempt maxAttempts times.
-void go_to_academy_fly_point(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+void go_to_academy_fly_point(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context
+);
 
 class TournamentFarmer_Descriptor : public SingleSwitchProgramDescriptor{
 public:

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp

@@ -35,7 +35,7 @@ TournamentFarmer2_Descriptor::TournamentFarmer2_Descriptor()
         "Farm the Academy Ace Tournament for money and prizes. (version 2)",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController}
     )
 {}
 
@@ -295,7 +295,7 @@ void TournamentFarmer2::program(SingleSwitchProgramEnvironment& env, ProControll
 
 
             if (battle_lost){
-                return_to_academy_after_loss(env, context);
+                return_to_academy_after_loss(env, env.console, context);
                 break;
             }
         }