Improve sequence to navigate to the egg basket.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 56;
-const int PROGRAM_VERSION_PATCH = 1;
+const int PROGRAM_VERSION_PATCH = 2;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp

@@ -102,12 +102,13 @@ void EggFetcher::program(SingleSwitchProgramEnvironment& env, ProControllerConte
             picnic_at_zero_gate(env.program_info(), env.console, context);
             // Now we are at picnic. We are at one end of picnic table while the egg basket is at the other end
 
+#if 1
             bool can_make_sandwich = eat_egg_sandwich_at_picnic(env, env.console, context,
                 EGG_SANDWICH.EGG_SANDWICH_TYPE, LANGUAGE);
             if (can_make_sandwich == false){
                 throw UserSetupError(env.console, "No sandwich recipe or ingredients. Cannot open and select the sandwich recipe.");
             }
-
+#endif
             stats.m_sandwiches++;
             env.update_stats();
 
@@ -119,8 +120,14 @@ void EggFetcher::program(SingleSwitchProgramEnvironment& env, ProControllerConte
             };
 
             const size_t basket_wait_seconds = (EGG_SANDWICH.EGG_SANDWICH_TYPE == EggSandwichType::GREAT_PEANUT_BUTTER ? 180 : 120);
-            collect_eggs_after_sandwich(env.program_info(), env.console, context, basket_wait_seconds,
-                EGGS_TO_FETCH, num_eggs_collected, basket_check_callback);
+            collect_eggs_after_sandwich(
+                env.program_info(),
+                env.console, context,
+                basket_wait_seconds,
+                EGGS_TO_FETCH,
+                num_eggs_collected,
+                basket_check_callback
+            );
 
             leave_picnic(env.program_info(), env.console, context);
 

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp

@@ -351,6 +351,27 @@ void collect_eggs_after_sandwich(
     //  Recall your ride to reduce obstacles.
     pbf_press_button(context, BUTTON_PLUS, 20, 105);
 
+#if 1
+    //  Move left
+    pbf_move_left_joystick(context, 0, 128, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 120ms);
+    pbf_move_left_joystick(context, 128, 0, 320ms, 480ms);
+
+    //  Move forward to pass table
+    pbf_move_left_joystick(context, 255, 128, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 120ms);
+    pbf_move_left_joystick(context, 128, 0, 640ms, 320ms);
+
+    //  Move right
+    pbf_move_left_joystick(context, 255, 128, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 120ms);
+    pbf_move_left_joystick(context, 128, 0, 320ms, 320ms);
+
+    //  Move back to face basket
+    pbf_move_left_joystick(context, 255, 128, 80ms, 320ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 120ms);
+    pbf_move_left_joystick(context, 128, 0, 160ms, 320ms);
+#else
     //  Move left
     pbf_move_left_joystick(context, 0, 128, 40, 40);
     //  Move forward to pass table
@@ -363,6 +384,7 @@ void collect_eggs_after_sandwich(
     //  Move closer to the basket.
     pbf_press_button(context, BUTTON_L, 20, 105);
     pbf_move_left_joystick(context, 128, 0, 10, 40);
+#endif
 
 
     context.wait_for_all_requests();

SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp

@@ -148,12 +148,14 @@ void DaySkipperUS::run_switch1(SingleSwitchProgramEnvironment& env, ProControlle
 void DaySkipperUS::run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     using namespace DateSkippers::Switch2;
 
+#if 1
     if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
         throw UserSetupError(
             env.logger(),
             "This program requires a tick precise wired controller."
         );
     }
+#endif
 
     SkipperStats& stats = env.current_stats<SkipperStats>();
     stats.total_skips = SKIPS;