Migrate SV, and PLA programs to TimeDurationOption.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_SerialPABotBase.cpp

@@ -70,7 +70,7 @@ std::string SwitchController_SerialPABotBase_Descriptor::display_name() const{
         return "";
     }
     return m_port.portName().toStdString() + " - " + m_port.description().toStdString();
-//    return "Serial (PABotBase): " + m_port.portName().toStdString() + " - " + m_port.description().toStdString();;
+//    return "Wired Controller - Serial (PABotBase): " + m_port.portName().toStdString() + " - " + m_port.description().toStdString();;
 }
 void SwitchController_SerialPABotBase_Descriptor::load_json(const JsonValue& json){
     const std::string* name = json.to_string();

SerialPrograms/Source/PokemonHome/PokemonHome_Settings.cpp

@@ -22,33 +22,7 @@ GameSettings& GameSettings::instance(){
 }
 GameSettings::GameSettings()
     : BatchOption(LockMode::LOCK_WHILE_RUNNING)
-    // : m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
-    // // , START_GAME_MASH(
-    // //     "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-    // //     TICKS_PER_SECOND,
-    // //     "2 * TICKS_PER_SECOND"
-    // // )
-    // // , START_GAME_WAIT(
-    // //     "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-    // //     TICKS_PER_SECOND,
-    // //     "40 * TICKS_PER_SECOND"
-    // // )
-    // // , ENTER_GAME_MASH(
-    // //     "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-    // //     TICKS_PER_SECOND,
-    // //     "5 * TICKS_PER_SECOND"
-    // // )
-    // // , ENTER_GAME_WAIT(
-    // //     "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-    // //     TICKS_PER_SECOND,
-    // //     "40 * TICKS_PER_SECOND"
-    // // )
 {
-    // PA_ADD_STATIC(m_start_game_timings);
-    // PA_ADD_OPTION(START_GAME_MASH);
-    // PA_ADD_OPTION(START_GAME_WAIT);
-    // PA_ADD_OPTION(ENTER_GAME_MASH);
-    // PA_ADD_OPTION(ENTER_GAME_WAIT);
 }
 
 

SerialPrograms/Source/PokemonHome/PokemonHome_Settings.h

@@ -7,10 +7,6 @@
 #ifndef PokemonAutomation_PokemonHome_Settings_H
 #define PokemonAutomation_PokemonHome_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 "CommonFramework/Panels/SettingsPanel.h"
 
 namespace PokemonAutomation{
@@ -23,11 +19,6 @@ class GameSettings : public BatchOption{
 public:
     static GameSettings& instance();
 
-    // SectionDividerOption m_start_game_timings;
-    // TimeExpressionOption<uint16_t> START_GAME_MASH;
-    // TimeExpressionOption<uint16_t> START_GAME_WAIT;
-    // TimeExpressionOption<uint16_t> ENTER_GAME_MASH;
-    // TimeExpressionOption<uint16_t> ENTER_GAME_WAIT;
 };
 
 

SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp

@@ -42,15 +42,14 @@ GenerateNameOCRData::GenerateNameOCRData()
         PokemonNameReader::instance().languages(),
         LockMode::LOCK_WHILE_RUNNING
     )
-    , DELAY(
+    , DELAY0(
         "<b>Delay Between Each Iteration:</b>",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "30"
+        "240ms"
     )
 {
     PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(DELAY);
+    PA_ADD_OPTION(DELAY0);
 
 }
 
@@ -91,7 +90,7 @@ void GenerateNameOCRData::program(SingleSwitchProgramEnvironment& env, SwitchCon
         path += ".png";
         image.save(path);
 
-        pbf_press_dpad(context, DPAD_RIGHT, 10, DELAY);
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, DELAY0);
 
         OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
             env.console, LANGUAGE, image,

SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h

@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_PokemonHome_GenerateNameOCR_H
 #define PokemonAutomation_PokemonHome_GenerateNameOCR_H
 
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
@@ -32,7 +32,7 @@ class GenerateNameOCRData : public SingleSwitchProgramInstance{
 
 private:
     OCR::LanguageOCROption LANGUAGE;
-    TimeExpressionOption<uint16_t> DELAY;
+    MillisecondsOption DELAY0;
 };
 
 

SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp

@@ -34,7 +34,7 @@ ShinyRequiresAudioText::ShinyRequiresAudioText()
 
 ShinyDetectedActionOption::ShinyDetectedActionOption(
     std::string label, std::string description,
-    std::string default_delay_ticks,
+    std::string default_delay,
     ShinyDetectedAction default_action
 )
     : GroupOption(std::move(label), LockMode::LOCK_WHILE_RUNNING)
@@ -51,13 +51,12 @@ ShinyDetectedActionOption::ShinyDetectedActionOption(
     )
 //    , STOP_PROGRAM("<b>Stop Program:</b><br>Stop program and go Home if it hears a shiny.", true)
 //    , TAKE_VIDEO("<b>Take Video:</b><br>Take a video if a shiny is heard.", true)
-    , SCREENSHOT_DELAY(
+    , SCREENSHOT_DELAY0(
         "<b>Screenshot Delay:</b><br>"
         "Align the camera, then wait this long before taking a screenshot + video of the shiny.<br>"
         "Set to zero to skip this. Don't set this too large or the shiny may run away!",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        std::move(default_delay_ticks)
+        std::move(default_delay)
     )
     , NOTIFICATIONS(this->label(), true, true, ImageAttachmentMode::JPG, {"Notifs", "Showcase"})
 {
@@ -67,7 +66,7 @@ ShinyDetectedActionOption::ShinyDetectedActionOption(
     PA_ADD_OPTION(ACTION);
 //    PA_ADD_OPTION(STOP_PROGRAM);
 //    PA_ADD_OPTION(TAKE_VIDEO);
-    PA_ADD_OPTION(SCREENSHOT_DELAY);
+    PA_ADD_OPTION(SCREENSHOT_DELAY0);
 }
 bool ShinyDetectedActionOption::stop_on_shiny() const{
     return ACTION != ShinyDetectedAction::IGNORE;
@@ -127,7 +126,7 @@ void on_shiny_sound(
     embeds.emplace_back("Detection Results:", ss.str());
 
 //    pbf_press_button(context, BUTTON_ZL, 20, options.SCREENSHOT_DELAY);
-    pbf_mash_button(context, BUTTON_ZL, options.SCREENSHOT_DELAY);
+    pbf_mash_button(context, BUTTON_ZL, options.SCREENSHOT_DELAY0);
     context.wait_for_all_requests();
 
     send_program_notification(
@@ -154,7 +153,7 @@ void on_match_found(
 ){
     std::vector<std::pair<std::string, std::string>> embeds;
 
-    pbf_mash_button(context, BUTTON_ZL, options.SCREENSHOT_DELAY);
+    pbf_mash_button(context, BUTTON_ZL, options.SCREENSHOT_DELAY0);
     context.wait_for_all_requests();
 
     send_program_notification(

SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h

@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "Common/Cpp/Options/GroupOption.h"
 #include "CommonFramework/Notifications/EventNotificationOption.h"
 #include "CommonFramework/Tools/VideoStream.h"
@@ -52,7 +52,7 @@ class ShinyDetectedActionOption : public GroupOption{
 public:
     ShinyDetectedActionOption(
         std::string label, std::string description,
-        std::string default_delay_ticks,
+        std::string default_delay,
         ShinyDetectedAction default_action = ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM
     );
 
@@ -62,7 +62,7 @@ class ShinyDetectedActionOption : public GroupOption{
     EnumDropdownOption<ShinyDetectedAction> ACTION;
 //    BooleanCheckBoxOption STOP_PROGRAM;
 //    BooleanCheckBoxOption TAKE_VIDEO;
-    TimeExpressionOption<uint16_t> SCREENSHOT_DELAY;
+    MillisecondsOption SCREENSHOT_DELAY0;
     EventNotificationOption NOTIFICATIONS;
 };
 

SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp

@@ -112,12 +112,12 @@ LeapGrinder::LeapGrinder()
     , SHINY_DETECTED_ENROUTE(
         "Enroute Shiny Action",
         "This applies if a shiny is detected while enroute to destination.",
-        "0 * TICKS_PER_SECOND"
+        "0ms"
     )
     , MATCH_DETECTED_OPTIONS(
         "Match Action",
         "What to do when the leaping Pokemon matches the *Stop On*.",
-        "0 * TICKS_PER_SECOND"
+        "0ms"
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({

SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp

@@ -74,7 +74,7 @@ std::unique_ptr<StatsTracker> NuggetFarmerHighlands_Descriptor::make_stats() con
 
 
 NuggetFarmerHighlands::NuggetFarmerHighlands()
-    : SHINY_DETECTED("Shiny Detected Action", "", "2 * TICKS_PER_SECOND")
+    : SHINY_DETECTED("Shiny Detected Action", "", "2000ms")
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
         &NOTIFICATION_STATUS,

SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp

@@ -84,7 +84,7 @@ RamanasCombeeFinder:: RamanasCombeeFinder()
     , SHINY_DETECTED_ENROUTE(
         "Enroute Shiny Action",
         "This applies if a shiny is detected while traveling in the overworld.",
-        "0 * TICKS_PER_SECOND"
+        "0ms"
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp

@@ -99,12 +99,13 @@ BurmyFinder::BurmyFinder()
     , SHINY_DETECTED_ENROUTE(
         "Enroute Shiny Action",
         "This applies if a shiny is detected while traveling in the overworld.",
-        "0 * TICKS_PER_SECOND"
+        "0ms"
     )
     , MATCH_DETECTED_OPTIONS(
-      "Match Action",
-      "What to do when a Burmy is found that matches the \"Stop On\" parameter.",
-      "0 * TICKS_PER_SECOND")
+        "Match Action",
+        "What to do when a Burmy is found that matches the \"Stop On\" parameter.",
+        "0ms"
+    )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
         &NOTIFICATION_STATUS,

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp

@@ -64,12 +64,12 @@ CrobatFinder::CrobatFinder()
     : SHINY_DETECTED_ENROUTE(
         "Enroute Shiny Action",
         "This applies if you are still traveling to the Crobat.",
-        "2 * TICKS_PER_SECOND"
+        "2000ms"
     )
     , SHINY_DETECTED_DESTINATION(
         "Destination Shiny Action",
         "This applies if you are near the Crobat.",
-        "2 * TICKS_PER_SECOND"
+        "2000ms"
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp

@@ -63,22 +63,21 @@ std::unique_ptr<StatsTracker> FroslassFinder_Descriptor::make_stats() const{
 
 
 FroslassFinder::FroslassFinder()
-    : DASH_DURATION(
+    : DASH_DURATION0(
         "<b>Braviary dash duration:</b><br>"
         "How many ticks for Braviary to dash to reach the hole.",
         LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "986"
+        "7888"
     )
     , SHINY_DETECTED_ENROUTE(
         "Enroute Shiny Action",
         "This applies if a shiny is detected while enroute to the cave. (Does not ignore Misdreavus and Glalie)",
-        "0 * TICKS_PER_SECOND"
+        "0ms"
     )
     , SHINY_DETECTED_DESTINATION(
         "Destination Shiny Action",
         "This applies if a shiny is detected at or near Froslass.",
-        "0 * TICKS_PER_SECOND"
+        "0ms"
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
@@ -91,7 +90,7 @@ FroslassFinder::FroslassFinder()
     })
 {
     PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(DASH_DURATION);
+    PA_ADD_OPTION(DASH_DURATION0);
     PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
     PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
     PA_ADD_OPTION(NOTIFICATIONS);
@@ -133,7 +132,7 @@ void FroslassFinder::run_iteration(SingleSwitchProgramEnvironment& env, SwitchCo
                 //  Route to cave entrance
                 pbf_press_button(context, BUTTON_B, (uint16_t)(2 * TICKS_PER_SECOND), 10);  //Get some distance from the moutain
                 pbf_press_button(context, BUTTON_Y, (uint16_t)(4 * TICKS_PER_SECOND), 10);  //Descend
-                pbf_press_button(context, BUTTON_B, DASH_DURATION, 10); //Reach to the cave entrance
+                pbf_press_button(context, BUTTON_B, DASH_DURATION0, 80ms);  //Reach to the cave entrance
                 pbf_wait(context, (uint16_t)(0.5 * TICKS_PER_SECOND));
                 pbf_press_button(context, BUTTON_PLUS, 10,10);
                 pbf_wait(context, (uint16_t)(1.1 * TICKS_PER_SECOND));

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h

@@ -7,12 +7,10 @@
 #ifndef PokemonAutomation_PokemonLA_FroslassFinder_H
 #define PokemonAutomation_PokemonLA_FroslassFinder_H
 
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 #include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Inference/PokemonLA_UnderAttackDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -39,7 +37,7 @@ class FroslassFinder : public SingleSwitchProgramInstance{
 
     ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
 
-    TimeExpressionOption<uint16_t> DASH_DURATION;
+    MillisecondsOption DASH_DURATION0;
 
     ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
     ShinyDetectedActionOption SHINY_DETECTED_DESTINATION;

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp

@@ -62,12 +62,12 @@ GalladeFinder::GalladeFinder()
     : SHINY_DETECTED_ENROUTE(
         "Enroute Shiny Action",
         "This applies if you are still traveling to the Gallade.",
-        "0 * TICKS_PER_SECOND"
+        "0ms"
     )
     , SHINY_DETECTED_DESTINATION(
         "Destination Shiny Action",
         "This applies if you are near the Gallade.",
-        "0 * TICKS_PER_SECOND"
+        "0ms"
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({