Migrate RSE and Zelda programs to TimeDurationOption.

Author: Mysticial

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.cpp

@@ -10,7 +10,6 @@
 #include "CommonTools/Async/InferenceRoutines.h"
 #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
 #include "PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h"
 #include "PokemonRSE/PokemonRSE_Settings.h"
@@ -25,7 +24,7 @@ void soft_reset(const ProgramInfo& info, VideoStream& stream, SwitchControllerCo
     // 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,8 +33,8 @@ 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)),
-        {{detector}}
+        GameSettings::instance().ENTER_GAME_WAIT0,
+        {detector}
     );
     if (ret == 0){
         stream.log("Entered game!");

SerialPrograms/Source/PokemonRSE/PokemonRSE_Settings.cpp

@@ -24,17 +24,15 @@ GameSettings& GameSettings::instance(){
 GameSettings::GameSettings()
     : BatchOption(LockMode::LOCK_WHILE_RUNNING)
     , m_soft_reset_timings("<font size=4><b>Soft Reset Timings:</b></font>")
-    , START_BUTTON_MASH(
+    , START_BUTTON_MASH0(
         "<b>Start Button Mash:</b><br>Mash Start for this long after a soft reset to get to the main menu.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
+        "5000ms"
     )
-    , ENTER_GAME_WAIT(
+    , ENTER_GAME_WAIT0(
         "<b>Enter Game Wait:</b><br>Wait this long for the game to load.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
+        "3000ms"
     )
     , m_shiny_audio_settings("<font size=4><b>Shiny Audio Settings:</b></font>")
     , SHINY_SOUND_THRESHOLD(
@@ -49,8 +47,8 @@ GameSettings::GameSettings()
     )
 {
     PA_ADD_STATIC(m_soft_reset_timings);
-    PA_ADD_OPTION(START_BUTTON_MASH);
-    PA_ADD_OPTION(ENTER_GAME_WAIT);
+    PA_ADD_OPTION(START_BUTTON_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
     PA_ADD_STATIC(m_shiny_audio_settings);
     PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
     PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);

SerialPrograms/Source/PokemonRSE/PokemonRSE_Settings.h

@@ -8,9 +8,8 @@
 #define PokemonAutomation_PokemonRSE_Settings_H
 
 #include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Panels/SettingsPanel.h"
 
 namespace PokemonAutomation{
@@ -24,8 +23,8 @@ class GameSettings : public BatchOption{
     static GameSettings& instance();
 
     SectionDividerOption m_soft_reset_timings;
-    TimeExpressionOption<uint16_t> START_BUTTON_MASH;
-    TimeExpressionOption<uint16_t> ENTER_GAME_WAIT;
+    MillisecondsOption START_BUTTON_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
 
     SectionDividerOption m_shiny_audio_settings;
     FloatingPointOption SHINY_SOUND_THRESHOLD;

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h

@@ -7,8 +7,6 @@
 #ifndef PokemonAutomation_PokemonRSE_AudioStarterReset_H
 #define PokemonAutomation_PokemonRSE_AudioStarterReset_H
 
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 

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

@@ -50,11 +50,10 @@ std::unique_ptr<StatsTracker> ShinyHuntDeoxys_Descriptor::make_stats() const{
 }
 
 ShinyHuntDeoxys::ShinyHuntDeoxys()
-    : 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"
+        "3520ms"
     )
     , NOTIFICATION_SHINY(
         "Shiny Found",
@@ -68,7 +67,7 @@ ShinyHuntDeoxys::ShinyHuntDeoxys()
         &NOTIFICATION_PROGRAM_FINISH,
         })
 {
-    PA_ADD_OPTION(WALK_UP_DOWN_TIME);
+    PA_ADD_OPTION(WALK_UP_DOWN_TIME0);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
@@ -199,8 +198,8 @@ void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, SwitchControl
     while (true) {
         env.log("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();
 
         solve_puzzle(env, context);
@@ -223,8 +222,8 @@ void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, SwitchControl
         context.wait_for_all_requests();
 
         //Walk down from the triangle rock to the 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();
 
         stats.resets++;

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

@@ -7,8 +7,7 @@
 #ifndef PokemonAutomation_PokemonRSE_ShinyHuntDeoxys_H
 #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"
 
@@ -29,7 +28,7 @@ class ShinyHuntDeoxys : public SingleSwitchProgramInstance{
     virtual void program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) override;
 
 private:
-    TimeExpressionOption<uint16_t> WALK_UP_DOWN_TIME;
+    MillisecondsOption WALK_UP_DOWN_TIME0;
 
     EventNotificationOption NOTIFICATION_SHINY;
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp

@@ -60,12 +60,11 @@ StarterReset::StarterReset()
         LockMode::LOCK_WHILE_RUNNING,
         Target::treecko
     )
-    , STARTER_WAIT(
-        "<b>Send out starter wait:</b><br>After pressing A to send out your selected starter, wait this long for the animation. Make sure to add extra time in case it is shiny.",
-        LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "6 * TICKS_PER_SECOND"
-    )
+//    , STARTER_WAIT0(
+//        "<b>Send out starter wait:</b><br>After pressing A to send out your selected starter, wait this long for the animation. Make sure to add extra time in case it is shiny.",
+//        LockMode::LOCK_WHILE_RUNNING,
+//        "6000ms"
+//    )
     , NOTIFICATION_SHINY_STARTER(
         "Shiny Starter",
         true, true, ImageAttachmentMode::JPG,
@@ -76,7 +75,7 @@ StarterReset::StarterReset()
         &NOTIFICATION_SHINY_STARTER,
         &NOTIFICATION_STATUS_UPDATE,
         &NOTIFICATION_PROGRAM_FINISH,
-        })
+    })
 {
     PA_ADD_OPTION(TARGET);
     PA_ADD_OPTION(NOTIFICATIONS);

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h

@@ -7,8 +7,7 @@
 #ifndef PokemonAutomation_PokemonRSE_StarterReset_H
 #define PokemonAutomation_PokemonRSE_StarterReset_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"
 
@@ -36,7 +35,7 @@ class StarterReset : public SingleSwitchProgramInstance{
     };
     EnumDropdownOption<Target> TARGET;
 
-    TimeExpressionOption<uint16_t> STARTER_WAIT;
+//    MillisecondsOption STARTER_WAIT0;
 
     EventNotificationOption NOTIFICATION_SHINY_STARTER;
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;

SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp

@@ -46,25 +46,24 @@ BowItemDuper::BowItemDuper()
         LockMode::UNLOCK_WHILE_RUNNING,
         100
     )
-    , TICK_DELAY(
+    , TICK_DELAY0(
         "<b>Menu Delay:</b><br>Adjustable delay for exiting and reentering the menu. "
         "This should not typically be lower than 5 nor exceed 25 for successful results. "
         "Too low and the game will eat inputs and put the program in an irrecoverable state."
         "Too high and the dupes will not be successful.",
         LockMode::UNLOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "15"
+        "120ms"
     )
     , GO_HOME_WHEN_DONE(false)
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
         &NOTIFICATION_STATUS_UPDATE,
         &NOTIFICATION_PROGRAM_FINISH,
         // &NOTIFICATION_ERROR_FATAL,
-        })
+    })
 {
     PA_ADD_OPTION(ATTEMPTS);
-    PA_ADD_OPTION(TICK_DELAY);
+    PA_ADD_OPTION(TICK_DELAY0);
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
@@ -101,7 +100,7 @@ void BowItemDuper::program(SingleSwitchProgramEnvironment& env, SwitchController
         pbf_press_button(context, BUTTON_A, 10, 15);
 
         // NOW WE HAVE TO PRESS PLUS AS FAST AS POSSIBLE
-        pbf_press_button(context, BUTTON_PLUS, 3, TICK_DELAY);
+        pbf_press_button(context, BUTTON_PLUS, 24ms, TICK_DELAY0);
         pbf_press_button(context, BUTTON_PLUS, 3, 3);
 
         // navigate back to the "current" bow, then drop it

SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h

@@ -8,7 +8,7 @@
 #define PokemonAutomation_ZeldaTotK_BowItemDuper_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"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
@@ -31,7 +31,7 @@ class BowItemDuper : public SingleSwitchProgramInstance{
 
 private:
     SimpleIntegerOption<uint32_t> ATTEMPTS;
-    TimeExpressionOption<uint16_t> TICK_DELAY;
+    MillisecondsOption TICK_DELAY0;
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;