fixes

Author: Mysticial

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.cpp

@@ -4,6 +4,7 @@
  *
  */
 
+#include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "CommonTools/Async/InferenceRoutines.h"
 #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
@@ -53,7 +54,17 @@ std::unique_ptr<StatsTracker> MegaShardFarmer_Descriptor::make_stats() const{
 
 
 
-MegaShardFarmer::MegaShardFarmer(){}
+MegaShardFarmer::MegaShardFarmer()
+    : SKIP_SHARDS(
+        "<b>Skip getting Shards (for testing purposes):</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+{
+    if (PreloadSettings::instance().DEVELOPER_MODE){
+        PA_ADD_OPTION(SKIP_SHARDS);
+    }
+}
 
 void MegaShardFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     MegaShardFarmer_Descriptor::Stats& stats = env.current_stats<MegaShardFarmer_Descriptor::Stats>();
@@ -95,15 +106,15 @@ void MegaShardFarmer::program(SingleSwitchProgramEnvironment& env, ProController
                 //  Bring out a Pokemon.
                 pbf_press_dpad(context, DPAD_UP, 1000ms, 0ms);
 
-#if 1
-                //  Break all the shards.
-                uint8_t x = stats.rounds % 2 == 0 ? 128 - 32 : 128 + 32;
-                ssf_press_right_joystick(context, x, 128, 0ms, 40000ms, 0ms);
-                for (int c = 0; c < 40; c++){
-                    ssf_press_button(context, BUTTON_ZL, 240ms, 400ms, 80ms);
-                    pbf_press_button(context, BUTTON_B, 160ms, 520ms);
+                if (!SKIP_SHARDS){
+                    //  Break all the shards.
+                    uint8_t x = stats.rounds % 2 == 0 ? 128 - 32 : 128 + 32;
+                    ssf_press_right_joystick(context, x, 128, 0ms, 40000ms, 0ms);
+                    for (int c = 0; c < 40; c++){
+                        ssf_press_button(context, BUTTON_ZL, 240ms, 400ms, 80ms);
+                        pbf_press_button(context, BUTTON_B, 160ms, 520ms);
+                    }
                 }
-#endif
             },
             {{black_screen}}
         );
@@ -128,8 +139,8 @@ void MegaShardFarmer::fly_back(SingleSwitchProgramEnvironment& env, ProControlle
         pbf_move_right_joystick(context, 128, 255, 80ms, 80ms);
 
         //  Tap the stick to lock on to Le Yeah if you're already on top of it.
-        pbf_move_left_joystick(context, 32, 128, 40ms, 500ms);
-    //    pbf_move_left_joystick(context, 128, 255, 80ms, 500ms);
+        pbf_move_left_joystick(context, 128, 192, 40ms, 120ms);
+        pbf_move_left_joystick(context, 128, 64, 40ms, 500ms);
 
         BlackScreenOverWatcher black_screen(COLOR_BLUE, {0.1, 0.1, 0.8, 0.2});
 

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.h

@@ -7,6 +7,7 @@
 #ifndef PokemonAutomation_PokemonLZA_MegaShardFarmer_H
 #define PokemonAutomation_PokemonLZA_MegaShardFarmer_H
 
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -32,7 +33,7 @@ class MegaShardFarmer : public SingleSwitchProgramInstance{
 private:
     void fly_back(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
-
+    BooleanCheckBoxOption SKIP_SHARDS;
 };
 
 

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp

@@ -125,13 +125,13 @@ void enter_wild_zone_entrance(
     );
     if (ret == 0){
         env.console.log("[WildZoneEntrance] Detected day/night change after entering.");
+        ShinyHunt_WildZoneEntrance_Descriptor::Stats& stats =
+            env.current_stats<ShinyHunt_WildZoneEntrance_Descriptor::Stats>();
+        stats.day_changes++;
         context.wait_for(std::chrono::milliseconds(2000));
         pbf_mash_button(context, BUTTON_B, 200ms);             // dismiss menu if any
         pbf_press_button(context, BUTTON_PLUS, 100ms, 100ms);  // open map again
     }else{
-        ShinyHunt_WildZoneEntrance_Descriptor::Stats& stats =
-            env.current_stats<ShinyHunt_WildZoneEntrance_Descriptor::Stats>();
-        stats.day_changes++;
     }
     pbf_mash_button(context, BUTTON_A, 800ms);  // teleporting or just mashing button
     pbf_mash_button(context, BUTTON_B, 200ms);  // in case need to dismiss map