fixes for nav and deoxys

Author: kichithewolf

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.cpp

@@ -21,11 +21,11 @@ namespace NintendoSwitch{
 namespace PokemonRSE{
 
 
-void soft_reset(const ProgramInfo& info, VideoStream& stream, SwitchControllerContext& context){
+void soft_reset(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
     // A + B + Select + Start
     pbf_press_button(context, BUTTON_B | BUTTON_Y | BUTTON_MINUS | BUTTON_PLUS, 10, 180);
 
-    pbf_mash_button(context, BUTTON_PLUS, GameSettings::instance().START_BUTTON_MASH);
+    pbf_mash_button(context, BUTTON_PLUS, GameSettings::instance().START_BUTTON_MASH0);
     context.wait_for_all_requests();
 
     pbf_press_button(context, BUTTON_A, 20, 40);
@@ -34,7 +34,7 @@ void soft_reset(const ProgramInfo& info, VideoStream& stream, SwitchControllerCo
     BlackScreenOverWatcher detector(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
     int ret = wait_until(
         stream, context,
-        std::chrono::milliseconds(GameSettings::instance().ENTER_GAME_WAIT * (1000 / TICKS_PER_SECOND)),
+        GameSettings::instance().ENTER_GAME_WAIT0,
         {{detector}}
     );
     if (ret == 0){
@@ -50,7 +50,7 @@ void soft_reset(const ProgramInfo& info, VideoStream& stream, SwitchControllerCo
     context.wait_for_all_requests();
 }
 
-void flee_battle(VideoStream& stream, SwitchControllerContext& context) {
+void flee_battle(VideoStream& stream, ProControllerContext& context) {
     stream.log("Navigate to Run.");
     pbf_press_dpad(context, DPAD_RIGHT, 20, 20);
     pbf_press_dpad(context, DPAD_DOWN, 20, 20);
@@ -90,7 +90,7 @@ void flee_battle(VideoStream& stream, SwitchControllerContext& context) {
     }
 }
 
-bool handle_encounter(VideoStream& stream, SwitchControllerContext& context, bool send_out_lead) {
+bool handle_encounter(VideoStream& stream, ProControllerContext& context, bool send_out_lead) {
     float shiny_coefficient = 1.0;
     ShinySoundDetector shiny_detector(stream.logger(), [&](float error_coefficient) -> bool{
         shiny_coefficient = error_coefficient;
@@ -102,9 +102,9 @@ bool handle_encounter(VideoStream& stream, SwitchControllerContext& context, boo
     pbf_mash_button(context, BUTTON_A, 540);
     context.wait_for_all_requests();
 
-    int res = run_until<SwitchControllerContext>(
+    int res = run_until<ProControllerContext>(
         stream, context,
-        [&](SwitchControllerContext& context) {
+        [&](ProControllerContext& context) {
             int ret = wait_until(
                 stream, context,
                 std::chrono::seconds(30),

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.h

@@ -11,7 +11,7 @@
 
 #include "CommonFramework/Tools/VideoStream.h"
 #include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "NintendoSwitch/Controllers/NintendoSwitch_Controller.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
     struct ProgramInfo;
@@ -20,15 +20,15 @@ namespace PokemonRSE{
 
 // Press A+B+Select+Start at the same time to soft reset, then re-enters the game.
 // For now this assumes no dry battery.
-void soft_reset(const ProgramInfo& info, VideoStream& stream, SwitchControllerContext &context);
+void soft_reset(const ProgramInfo& info, VideoStream& stream, ProControllerContext &context);
 
 // Run from battle. Cursor must start on the FIGHT button. Assumes fleeing will always work. (Smoke Ball)
-void flee_battle(VideoStream& stream, SwitchControllerContext& context);
+void flee_battle(VideoStream& stream, ProControllerContext& context);
 
 // After press A/walking up to enter a battle, run this handle the battle start and to check if opponent is shiny.
 // Set send_out_lead to true and then use flee_battle() after if game is Emerald.
 // For R/S, send_out_lead as false and then soft_reset() to save time.
-bool handle_encounter(VideoStream& stream, SwitchControllerContext& context, bool send_out_lead);
+bool handle_encounter(VideoStream& stream, ProControllerContext& context, bool send_out_lead);
 
 
 }

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp

@@ -60,11 +60,10 @@ ShinyHuntDeoxys::ShinyHuntDeoxys()
         LockMode::LOCK_WHILE_RUNNING,
         StartPos::rock_unsolved
     )
-    , WALK_UP_DOWN_TIME(
+    , WALK_UP_DOWN_TIME0(
         "<b>Walk up/down time</b><br>Spend this long to run up to the triangle rock.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "440"
+        "3520 ms"
     )
     , NOTIFICATION_SHINY(
         "Shiny Found",
@@ -79,11 +78,11 @@ ShinyHuntDeoxys::ShinyHuntDeoxys()
         })
 {
     PA_ADD_OPTION(STARTPOS);
-    PA_ADD_OPTION(WALK_UP_DOWN_TIME);
+    PA_ADD_OPTION(WALK_UP_DOWN_TIME0);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
-void ShinyHuntDeoxys::solve_puzzle(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) {
+void ShinyHuntDeoxys::solve_puzzle(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
     env.log("Step 1: Press A from below.");
     pbf_press_button(context, BUTTON_A, 20, 40);
 
@@ -187,7 +186,7 @@ void ShinyHuntDeoxys::solve_puzzle(SingleSwitchProgramEnvironment& env, SwitchCo
     context.wait_for_all_requests();
 }
 
-void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context){
+void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     ShinyHuntDeoxys_Descriptor::Stats& stats = env.current_stats<ShinyHuntDeoxys_Descriptor::Stats>();
 
     /*
@@ -218,8 +217,8 @@ void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, SwitchControl
             case StartPos::boat:
                 env.log("StartPos: Walking up to Deoxys.");
                 //Walk up to the triangle rock from the ship. No bike allowed.
-                ssf_press_button(context, BUTTON_B, 0, WALK_UP_DOWN_TIME);
-                pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME, 20);
+                ssf_press_button(context, BUTTON_B, 0ms, WALK_UP_DOWN_TIME0);
+                pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME0, 160ms);
                 context.wait_for_all_requests();
             case StartPos::rock_unsolved:
                 env.log("StartPos: Solving puzzle.");
@@ -253,14 +252,14 @@ void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, SwitchControl
 
         //Walk down from the triangle rock to the ship.
         env.log("Walking down to ship.");
-        ssf_press_button(context, BUTTON_B, 0, WALK_UP_DOWN_TIME);
-        pbf_press_dpad(context, DPAD_DOWN, WALK_UP_DOWN_TIME, 20);
+        ssf_press_button(context, BUTTON_B, 0ms, WALK_UP_DOWN_TIME0);
+        pbf_press_dpad(context, DPAD_DOWN, WALK_UP_DOWN_TIME0, 160ms);
         context.wait_for_all_requests();
 
         env.log("Walking up to Deoxys rock.");
         //Walk up to the triangle rock from the ship. Bike is not allowed on Birth Island.
-        ssf_press_button(context, BUTTON_B, 0, WALK_UP_DOWN_TIME);
-        pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME, 20);
+        ssf_press_button(context, BUTTON_B, 0ms, WALK_UP_DOWN_TIME0);
+        pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME0, 160ms);
         context.wait_for_all_requests();
 
         env.log("Solving puzzle.");

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.h

@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonRSE_ShinyHuntDeoxys_H
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
@@ -26,7 +26,7 @@ class ShinyHuntDeoxys_Descriptor : public SingleSwitchProgramDescriptor{
 class ShinyHuntDeoxys : public SingleSwitchProgramInstance{
 public:
     ShinyHuntDeoxys();
-    virtual void program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     enum class StartPos{
@@ -36,13 +36,13 @@ class ShinyHuntDeoxys : public SingleSwitchProgramInstance{
     };
     EnumDropdownOption<StartPos> STARTPOS;
 
-    TimeExpressionOption<uint16_t> WALK_UP_DOWN_TIME;
+    MillisecondsOption WALK_UP_DOWN_TIME0;
 
     EventNotificationOption NOTIFICATION_SHINY;
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;
 
-    void solve_puzzle(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context);
+    void solve_puzzle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 };
 
 }