rename file, timing fixes

Author: kichithewolf

SerialPrograms/CMakeLists.txt

@@ -1376,8 +1376,8 @@ file(GLOB MAIN_SOURCES
     Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h
     Source/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp
     Source/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h
-    Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.cpp
-    Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.h
+    Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp
+    Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h
     Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.cpp
     Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.h
     Source/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp

SerialPrograms/SerialPrograms.pro

@@ -674,7 +674,7 @@ SOURCES += \
     Source/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp \
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp \
     Source/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp \
-    Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.cpp \
+    Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp \
     Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.cpp \
     Source/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp \
     Source/PokemonLGPE/PokemonLGPE_Panels.cpp \
@@ -1865,7 +1865,7 @@ HEADERS += \
     Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h \
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h \
     Source/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h \
-    Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.h \
+    Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h \
     Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.h \
     Source/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h \
     Source/PokemonLGPE/PokemonLGPE_Panels.h \

SerialPrograms/Source/PokemonLGPE/PokemonLGPE_Panels.cpp

@@ -9,7 +9,7 @@
 #include "PokemonLGPE_Panels.h"
 #include "PokemonLGPE_Settings.h"
 
-#include "Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.h"
+#include "Programs/Farming/PokemonLGPE_DailyItemFarmer.h"
 #include "Programs/ShinyHunting/PokemonLGPE_AlolanTrade.h"
 
 namespace PokemonAutomation{
@@ -27,7 +27,7 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
 
     ret.emplace_back("---- General ----");
-    ret.emplace_back(make_single_switch_program<DailyItemRespawnFarmer_Descriptor, DailyItemRespawnFarmer>());
+    ret.emplace_back(make_single_switch_program<DailyItemFarmer_Descriptor, DailyItemFarmer>());
 
     ret.emplace_back("---- Shiny Hunting ----");
     ret.emplace_back(make_single_switch_program<AlolanTrade_Descriptor, AlolanTrade>());

…g/PokemonLGPE_DailyItemRespawnFarmer.cpp …/Farming/PokemonLGPE_DailyItemFarmer.cppSerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.cpp renamed to SerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp SerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.cpp renamed to SerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp

@@ -1,4 +1,4 @@
-/*  LGPE Daily Item Respawn Farmer
+/*  LGPE Daily Item Farmer
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -21,16 +21,16 @@
 #include "PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h"
 #include "PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
 #include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonLGPE_DailyItemRespawnFarmer.h"
+#include "PokemonLGPE_DailyItemFarmer.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonLGPE{
 
-DailyItemRespawnFarmer_Descriptor::DailyItemRespawnFarmer_Descriptor()
+DailyItemFarmer_Descriptor::DailyItemFarmer_Descriptor()
     : SingleSwitchProgramDescriptor(
-        "PokemonLGPE:DailyItemRespawnFarmer",
-        Pokemon::STRING_POKEMON + " LGPE", "Daily Item Respawn Farmer",
+        "PokemonLGPE:DailyItemFarmer",
+        Pokemon::STRING_POKEMON + " LGPE", "Daily Item Farmer",
         "",
         "Farm daily item respawns (ex. fossils) by date-skipping.",
         FeedbackType::NONE,
@@ -40,19 +40,19 @@ DailyItemRespawnFarmer_Descriptor::DailyItemRespawnFarmer_Descriptor()
     )
 {}
 
-struct DailyItemRespawnFarmer_Descriptor::Stats : public StatsTracker{
+struct DailyItemFarmer_Descriptor::Stats : public StatsTracker{
     Stats()
         : skips(m_stats["Skips"])
     {
         m_display_order.emplace_back("Skips");
     }
     std::atomic<uint64_t>& skips;
 };
-std::unique_ptr<StatsTracker> DailyItemRespawnFarmer_Descriptor::make_stats() const{
+std::unique_ptr<StatsTracker> DailyItemFarmer_Descriptor::make_stats() const{
     return std::unique_ptr<StatsTracker>(new Stats());
 }
 
-DailyItemRespawnFarmer::DailyItemRespawnFarmer()
+DailyItemFarmer::DailyItemFarmer()
     : ATTEMPTS(
         "<b>Number of attempts:</b>",
         LockMode::LOCK_WHILE_RUNNING,
@@ -93,10 +93,10 @@ DailyItemRespawnFarmer::DailyItemRespawnFarmer()
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
-void DailyItemRespawnFarmer::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+void DailyItemFarmer::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     JoyconContext context(scope, env.console.controller<JoyconController>());
     assert_16_9_720p_min(env.logger(), env.console);
-    DailyItemRespawnFarmer_Descriptor::Stats& stats = env.current_stats<DailyItemRespawnFarmer_Descriptor::Stats>();
+    DailyItemFarmer_Descriptor::Stats& stats = env.current_stats<DailyItemFarmer_Descriptor::Stats>();
 
     /* Stand in front of the fossil spawn near Mewtwo.
     *  Use a repel to keep wild encounters away.
@@ -197,9 +197,9 @@ void DailyItemRespawnFarmer::program(SingleSwitchProgramEnvironment& env, Cancel
     if (FIX_TIME_WHEN_DONE){
         pbf_press_button(context, BUTTON_HOME, 80ms, 1000ms);
         home_to_date_time(context, false);
-        pbf_press_button(context, BUTTON_A, 30ms, 50ms);
-        context.wait_for_all_requests();
-        pbf_press_button(context, BUTTON_A, 30ms, 50ms);
+        pbf_press_button(context, BUTTON_A, 50ms, 500ms);
+        pbf_press_button(context, BUTTON_A, 50ms, 500ms);
+        pbf_wait(context, 100ms);
         context.wait_for_all_requests();
         pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
         resume_game_from_home(env.console, context);

…ing/PokemonLGPE_DailyItemRespawnFarmer.h …ms/Farming/PokemonLGPE_DailyItemFarmer.hSerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.h renamed to SerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h SerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.h renamed to SerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h

@@ -1,11 +1,11 @@
-/*  LGPE Daily Item Respawn Farmer
+/*  LGPE Daily Item Farmer
  *
  *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_PokemonLGPE_DailyItemRespawnFarmer_H
-#define PokemonAutomation_PokemonLGPE_DailyItemRespawnFarmer_H
+#ifndef PokemonAutomation_PokemonLGPE_DailyItemFarmer_H
+#define PokemonAutomation_PokemonLGPE_DailyItemFarmer_H
 
 #include "NintendoSwitch/Controllers/NintendoSwitch_Joycon.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -17,16 +17,16 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonLGPE{
 
-class DailyItemRespawnFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+class DailyItemFarmer_Descriptor : public SingleSwitchProgramDescriptor{
 public:
-    DailyItemRespawnFarmer_Descriptor();
+    DailyItemFarmer_Descriptor();
     struct Stats;
     virtual std::unique_ptr<StatsTracker> make_stats() const override;
 };
 
-class DailyItemRespawnFarmer : public SingleSwitchProgramInstance{
+class DailyItemFarmer : public SingleSwitchProgramInstance{
 public:
-    DailyItemRespawnFarmer();
+    DailyItemFarmer();
     virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private: