Migrate BDSP programs to TimeDurationOption.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h

@@ -62,7 +62,7 @@ void ssf_press_left_joystick(
 void ssf_press_left_joystick(
     SwitchControllerContext& context,
     uint8_t x, uint8_t y,
-    Milliseconds delay, Milliseconds hold = 5*8ms, Milliseconds cool = 3*8ms
+    Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms
 );
 void ssf_press_right_joystick(
     SwitchControllerContext& context,
@@ -72,7 +72,7 @@ void ssf_press_right_joystick(
 void ssf_press_right_joystick(
     SwitchControllerContext& context,
     uint8_t x, uint8_t y,
-    Milliseconds delay, Milliseconds hold = 5*8ms, Milliseconds cool = 3*8ms
+    Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms
 );
 
 

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp

@@ -57,11 +57,10 @@ EggAutonomous::EggAutonomous()
         LockMode::LOCK_WHILE_RUNNING,
         10, 1, 30
     )
-    , TRAVEL_TIME_PER_FETCH(
+    , TRAVEL_TIME_PER_FETCH0(
         "<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
+        "20s"
     )
     , NUM_EGGS_IN_COLUMN(
         "<b>Num Eggs in Column:</b><br>How many eggs already deposited in the first column in Box 1.",
@@ -121,25 +120,24 @@ EggAutonomous::EggAutonomous()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , SCROLL_TO_READ_DELAY(
+    , SCROLL_TO_READ_DELAY0(
         "<b>Scroll to Read Delay:</b><br>Wait this long after scrolling in the box to read the " + STRING_POKEMON + "'s stats. "
         "Increase this if your video has high latency.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "125"
+        "1000ms"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(LANGUAGE);
     PA_ADD_OPTION(SHORTCUT);
     PA_ADD_OPTION(MAX_KEEPERS);
-    PA_ADD_OPTION(TRAVEL_TIME_PER_FETCH);
+    PA_ADD_OPTION(TRAVEL_TIME_PER_FETCH0);
     PA_ADD_OPTION(NUM_EGGS_IN_COLUMN);
     PA_ADD_OPTION(AUTO_SAVING);
     PA_ADD_OPTION(FILTERS0);
     PA_ADD_OPTION(NOTIFICATIONS);
     PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SCROLL_TO_READ_DELAY);
+    PA_ADD_OPTION(SCROLL_TO_READ_DELAY0);
 }
 
 
@@ -192,10 +190,10 @@ void EggAutonomous::program(SingleSwitchProgramEnvironment& env, SwitchControlle
         stats,
         NOTIFICATION_NONSHINY_KEEP,
         NOTIFICATION_SHINY,
-        SCROLL_TO_READ_DELAY,
+        SCROLL_TO_READ_DELAY0,
         LANGUAGE,
         SHORTCUT,
-        TRAVEL_TIME_PER_FETCH,
+        TRAVEL_TIME_PER_FETCH0,
         FILTERS0,
         MAX_KEEPERS,
         static_cast<uint8_t>(NUM_EGGS_IN_COLUMN.current_value())

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.h

@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Options/StaticTextOption.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 "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
@@ -50,7 +50,7 @@ class EggAutonomous : public SingleSwitchProgramInstance{
 
     ShortcutDirectionOption SHORTCUT;
     SimpleIntegerOption<uint8_t> MAX_KEEPERS;
-    TimeExpressionOption<uint16_t> TRAVEL_TIME_PER_FETCH;
+    MillisecondsOption TRAVEL_TIME_PER_FETCH0;
     IntegerEnumDropdownOption NUM_EGGS_IN_COLUMN;
 
     enum class AutoSave{
@@ -68,7 +68,7 @@ class EggAutonomous : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> SCROLL_TO_READ_DELAY;
+    MillisecondsOption SCROLL_TO_READ_DELAY0;
 };
 
 

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp

@@ -98,10 +98,10 @@ EggAutonomousState::EggAutonomousState(
     EggAutonomousStats& stats,
     EventNotificationOption& notification_nonshiny_keep,
     EventNotificationOption& notification_shiny,
-    uint16_t scroll_to_read_delay,
+    Milliseconds scroll_to_read_delay,
     Language language,
     ShortcutDirectionOption& shortcut,
-    uint16_t travel_time_per_fetch,
+    Milliseconds travel_time_per_fetch,
     const StatsHuntIvJudgeFilterTable& filters,
     uint8_t max_keepers,
     uint8_t existing_eggs_in_columns
@@ -454,8 +454,7 @@ void EggAutonomousState::hatch_rest_of_party(){
         int ret = run_until<SwitchControllerContext>(
             m_stream, m_context,
             [&](SwitchControllerContext& context){
-                egg_spin(context, 480 * TICKS_PER_SECOND);
-//                egg_spin(context, 5 * TICKS_PER_SECOND);
+                egg_spin(context, 8min);
             },
             {
                 {dialog},

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.h

@@ -40,10 +40,10 @@ class EggAutonomousState{
         EggAutonomousStats& stats,
         EventNotificationOption& notification_nonshiny_keep,
         EventNotificationOption& notification_shiny,
-        uint16_t scroll_to_read_delay,
+        Milliseconds scroll_to_read_delay,
         Language language,
         ShortcutDirectionOption& shortcut,
-        uint16_t travel_time_per_fetch,
+        Milliseconds travel_time_per_fetch,
         const Pokemon::StatsHuntIvJudgeFilterTable& filters,
         uint8_t max_keepers,
         uint8_t existing_eggs_in_columns
@@ -85,10 +85,10 @@ class EggAutonomousState{
     static EventNotificationOption m_notification_noop;
     EventNotificationOption& m_notification_nonshiny_keep;
     EventNotificationOption& m_notification_shiny;
-    uint16_t m_scroll_to_read_delay;
+    Milliseconds m_scroll_to_read_delay;
     Language m_language;
     ShortcutDirectionOption& m_shortcut;
-    uint16_t m_travel_time_per_fetch;
+    Milliseconds m_travel_time_per_fetch;
     const Pokemon::StatsHuntIvJudgeFilterTable& m_filters;
     uint8_t m_max_keepers;
 

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp

@@ -35,7 +35,7 @@ void hatch_egg(VideoStream& stream, SwitchControllerContext& context){
         int ret = run_until<SwitchControllerContext>(
             stream, context,
             [](SwitchControllerContext& context){
-                egg_spin(context, 480 * TICKS_PER_SECOND);
+                egg_spin(context, 8min);
             },
             {
                 {dialog},

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp

@@ -51,11 +51,10 @@ EggFetcher::EggFetcher()
         LockMode::LOCK_WHILE_RUNNING,
         2000
     )
-    , TRAVEL_TIME_PER_FETCH(
+    , TRAVEL_TIME_PER_FETCH0(
         "<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "15 * TICKS_PER_SECOND"
+        "15s"
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
@@ -67,7 +66,7 @@ EggFetcher::EggFetcher()
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(SHORTCUT);
     PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
-    PA_ADD_OPTION(TRAVEL_TIME_PER_FETCH);
+    PA_ADD_OPTION(TRAVEL_TIME_PER_FETCH0);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
@@ -86,7 +85,7 @@ void EggFetcher::program(SingleSwitchProgramEnvironment& env, SwitchControllerCo
         env.update_stats();
         send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
 
-        egg_spin_with_A(context, TRAVEL_TIME_PER_FETCH);
+        egg_spin_with_A(context, TRAVEL_TIME_PER_FETCH0);
         SHORTCUT.run(context, 100);
 
         //  Move to man.

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.h

@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonBDSP_EggFetcher_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/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -42,7 +42,7 @@ class EggFetcher : public SingleSwitchProgramInstance{
 
     ShortcutDirectionOption SHORTCUT;
     SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
-    TimeExpressionOption<uint16_t> TRAVEL_TIME_PER_FETCH;
+    MillisecondsOption TRAVEL_TIME_PER_FETCH0;
 
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp

@@ -67,17 +67,15 @@ EggHatcher::EggHatcher()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , SAFETY_TIME0(
+    , SAFETY_TIME1(
         "<b>Safety Time:</b><br>Additional time added to the spinning.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
+        "10000ms"
     )
-    , HATCH_DELAY(
+    , HATCH_DELAY0(
         "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "105 * TICKS_PER_SECOND"
+        "105s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
@@ -86,8 +84,8 @@ EggHatcher::EggHatcher()
     PA_ADD_OPTION(STEPS_TO_HATCH);
     PA_ADD_OPTION(SAVE_AND_RESET);
     PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SAFETY_TIME0);
-    PA_ADD_OPTION(HATCH_DELAY);
+    PA_ADD_OPTION(SAFETY_TIME1);
+    PA_ADD_OPTION(HATCH_DELAY0);
 }
 
 
@@ -96,8 +94,8 @@ EggHatcher::EggHatcher()
 void EggHatcher::program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context){
     EggHatcher_Descriptor::Stats& stats = env.current_stats<EggHatcher_Descriptor::Stats>();
 
-    uint16_t INCUBATION_TIME = (uint16_t)((1258.5 + 4.05 * STEPS_TO_HATCH) * 1.05);
-    uint16_t TOTAL_DELAY = INCUBATION_TIME + SAFETY_TIME0 + HATCH_DELAY;
+    Milliseconds INCUBATION_TIME = (uint16_t)((1258.5 + 4.05 * STEPS_TO_HATCH) * 1.05) * 8ms;
+    Milliseconds TOTAL_DELAY = INCUBATION_TIME + SAFETY_TIME1.get() + HATCH_DELAY0.get();
 
     //  Connect the controller.
     pbf_move_right_joystick(context, 0, 255, 10, 0);

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.h

@@ -10,7 +10,7 @@
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.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/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -51,8 +51,8 @@ class EggHatcher : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> SAFETY_TIME0;
-    TimeExpressionOption<uint16_t> HATCH_DELAY;
+    MillisecondsOption SAFETY_TIME1;
+    MillisecondsOption HATCH_DELAY0;
 };