Space between number and unit.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp

@@ -48,7 +48,7 @@ std::string download_file(Logger& logger, const std::string& url){
     timer.singleShot(
         5000, [&downloaded_data, &url](){
         if (downloaded_data.isEmpty()){
-            throw ConnectionException(nullptr, "Couldn't retrieved file from url : " + url + " after 5s");
+            throw ConnectionException(nullptr, "Couldn't retrieved file from url : " + url + " after 5 seconds.");
         }
     });
     timer.stop();

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp

@@ -26,7 +26,7 @@ ConsoleSettings::ConsoleSettings()
     , SETTINGS_TO_HOME_DELAY0(
         "<b>Settings to Home Delay:</b><br>Delay from pressing home anywhere in the settings to return to the home menu.",
         LockMode::LOCK_WHILE_RUNNING,
-        "960ms"
+        "960 ms"
     )
     , START_GAME_REQUIRES_INTERNET(
         "<b>Start Game Requires Internet:</b><br>"
@@ -39,7 +39,7 @@ ConsoleSettings::ConsoleSettings()
         "<b>Start Game Internet Check Delay:</b><br>"
         "If starting the game requires checking the internet, wait this long for it.",
         LockMode::LOCK_WHILE_RUNNING,
-        "3000ms"
+        "3000 ms"
     )
     , TOLERATE_SYSTEM_UPDATE_MENU_FAST(
         "<b>Tolerate System Update Menu (fast):</b><br>"

SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp

@@ -25,74 +25,74 @@ GameSettings::GameSettings()
     , OVERWORLD_TO_MENU_DELAY0(
         "<b>Overworld to Menu Delay:</b><br>Delay to bring up the menu when pressing X in the overworld.",
         LockMode::LOCK_WHILE_RUNNING,
-        "2000ms"
+        "2000 ms"
     )
     , MENU_TO_OVERWORLD_DELAY0(
         "<b>Menu to Overworld Delay:</b><br>Delay to go from menu back to overworld.",
         LockMode::LOCK_WHILE_RUNNING,
-        "2000ms"
+        "2000 ms"
     )
     , GAME_TO_HOME_DELAY0(
         "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
         LockMode::LOCK_WHILE_RUNNING,
-        "1000ms"
+        "1000 ms"
     )
     , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
     , START_GAME_MASH0(
         "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
         LockMode::LOCK_WHILE_RUNNING,
-        "2000ms"
+        "2000 ms"
     )
     , START_GAME_WAIT0(
         "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
         LockMode::LOCK_WHILE_RUNNING,
-        "300s"
+        "300 s"
     )
     , ENTER_GAME_MASH0(
         "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
         LockMode::LOCK_WHILE_RUNNING,
-        "5000ms"
+        "5000 ms"
     )
     , ENTER_GAME_WAIT0(
         "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
         LockMode::LOCK_WHILE_RUNNING,
-        "300s"
+        "300 s"
     )
     , m_box_timings("<font size=4><b>Box Timings:</b></font> (for egg programs)")
     , BOX_SCROLL_DELAY0(
         "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
         LockMode::LOCK_WHILE_RUNNING,
-        "240ms"
+        "240 ms"
     )
     , BOX_CHANGE_DELAY0(
         "<b>Box Change Delay:</b><br>Delay to change boxes.",
         LockMode::LOCK_WHILE_RUNNING,
-        "1600ms"
+        "1600 ms"
     )
     , BOX_PICKUP_DROP_DELAY0(
         "<b>Box Pickup/Drop Delay:</b><br>Delay to pickup/drop " + STRING_POKEMON + ".",
         LockMode::LOCK_WHILE_RUNNING,
-        "400ms"
+        "400 ms"
     )
     , MENU_TO_POKEMON_DELAY0(
         "<b>Menu To " + STRING_POKEMON + " Delay:</b><br>Delay to enter " + STRING_POKEMON + " menu.",
         LockMode::LOCK_WHILE_RUNNING,
-        "2400ms"
+        "2400 ms"
     )
     , POKEMON_TO_BOX_DELAY1(
         "<b>" + STRING_POKEMON + " to Box Delay:</b><br>Delay to enter box system.",
         LockMode::LOCK_WHILE_RUNNING,
-        "2560ms"
+        "2560 ms"
     )
     , BOX_TO_POKEMON_DELAY0(
         "<b>Box to " + STRING_POKEMON + " Delay:</b><br>Delay to exit box system.",
         LockMode::LOCK_WHILE_RUNNING,
-        "2000ms"
+        "2000 ms"
     )
     , POKEMON_TO_MENU_DELAY0(
         "<b>" + STRING_POKEMON + " to Menu Delay:</b><br>Delay to return to menu.",
         LockMode::LOCK_WHILE_RUNNING,
-        "2000ms"
+        "2000 ms"
     )
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"

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

@@ -60,7 +60,7 @@ EggAutonomous::EggAutonomous()
     , TRAVEL_TIME_PER_FETCH0(
         "<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
         LockMode::LOCK_WHILE_RUNNING,
-        "20s"
+        "20 s"
     )
     , NUM_EGGS_IN_COLUMN(
         "<b>Num Eggs in Column:</b><br>How many eggs already deposited in the first column in Box 1.",
@@ -124,7 +124,7 @@ EggAutonomous::EggAutonomous()
         "<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,
-        "1000ms"
+        "1000 ms"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);

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

@@ -54,7 +54,7 @@ EggFetcher::EggFetcher()
     , TRAVEL_TIME_PER_FETCH0(
         "<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
         LockMode::LOCK_WHILE_RUNNING,
-        "15s"
+        "15 s"
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({

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

@@ -70,12 +70,12 @@ EggHatcher::EggHatcher()
     , SAFETY_TIME1(
         "<b>Safety Time:</b><br>Additional time added to the spinning.",
         LockMode::LOCK_WHILE_RUNNING,
-        "10000ms"
+        "10000 ms"
     )
     , HATCH_DELAY0(
         "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
         LockMode::LOCK_WHILE_RUNNING,
-        "105s"
+        "105 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp

@@ -51,7 +51,7 @@ AmitySquarePickUpFarmer::AmitySquarePickUpFarmer()
     , ONE_WAY_MOVING_TIME0(
         "<b>One Way walking Time:</b><br>Walk this amount of time in one direction before going back to finish one round of walking.",
         LockMode::LOCK_WHILE_RUNNING,
-        "5000ms"
+        "5000 ms"
     )
     , ROUNDS_PER_FETCH(
         "<b>Rounds per fetch:</b><br>How many rounds of walking before doing a berry fetch attempt.",
@@ -61,7 +61,7 @@ AmitySquarePickUpFarmer::AmitySquarePickUpFarmer()
     , WAIT_TIME_FOR_POKEMON0(
         "<b>Wait Time for Pokemon:</b><br>Wait this time for pokemon to catch up to you before you ask for a berry.",
         LockMode::LOCK_WHILE_RUNNING,
-        "3000ms"
+        "3000 ms"
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp

@@ -66,7 +66,7 @@ DoublesLeveling::DoublesLeveling()
     , EXIT_BATTLE_TIMEOUT0(
         "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
         LockMode::LOCK_WHILE_RUNNING,
-        "10s"
+        "10 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);

SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp

@@ -40,7 +40,7 @@ ActivateMenuGlitch112::ActivateMenuGlitch112()
         "<b>Fly Menu A-to-X Delay:</b><br>The delay between the A and X presses to overlap the menu with the fly option.<br>"
         "(German players may need to increase this to 90.)",
         LockMode::LOCK_WHILE_RUNNING,
-        160ms, "400ms"
+        160ms, "400 ms"
     )
 {
     PA_ADD_OPTION(FLY_A_TO_X_DELAY0);

SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp

@@ -39,7 +39,7 @@ ActivateMenuGlitch113::ActivateMenuGlitch113()
         "<b>Fly Menu A-to-X Delay:</b><br>The delay between the A and X presses to overlap the menu with the fly option.<br>"
         "(German players may need to increase this to 90.)",
         LockMode::LOCK_WHILE_RUNNING,
-        160ms, "400ms"
+        160ms, "400 ms"
     )
 {
     PA_ADD_OPTION(FLY_A_TO_X_DELAY0);

SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp

@@ -39,7 +39,7 @@ OverworldTrigger::OverworldTrigger()
     , MOVE_DURATION0(
         "<b>Move Duration:</b><br>Move in each direction for this long before turning around.",
         LockMode::LOCK_WHILE_RUNNING,
-        "1000ms"
+        "1000 ms"
     )
     , SWEET_SCENT_POKEMON_LOCATION(
         "<b>Sweet Scent Pokemon Location:</b><br>Which Pokemon in the party knows Sweet Scent.",

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp

@@ -68,7 +68,7 @@ ShinyHuntFishing::ShinyHuntFishing()
     , EXIT_BATTLE_TIMEOUT0(
         "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
         LockMode::LOCK_WHILE_RUNNING,
-        "10s"
+        "10 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp

@@ -72,7 +72,7 @@ ShinyHuntOverworld::ShinyHuntOverworld()
     , EXIT_BATTLE_TIMEOUT0(
         "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
         LockMode::LOCK_WHILE_RUNNING,
-        "10s"
+        "10 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp

@@ -54,7 +54,7 @@ ShinyHuntShaymin::ShinyHuntShaymin()
     , EXIT_BATTLE_TIMEOUT0(
         "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
         LockMode::LOCK_WHILE_RUNNING,
-        "10s"
+        "10 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);

SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp

@@ -45,7 +45,7 @@ GenerateNameOCRData::GenerateNameOCRData()
     , DELAY0(
         "<b>Delay Between Each Iteration:</b>",
         LockMode::LOCK_WHILE_RUNNING,
-        "240ms"
+        "240 ms"
     )
 {
     PA_ADD_OPTION(LANGUAGE);

SerialPrograms/Source/PokemonLA/PokemonLA_Settings.cpp

@@ -21,42 +21,42 @@ GameSettings& GameSettings::instance(){
 GameSettings::GameSettings()
     : BatchOption(LockMode::LOCK_WHILE_RUNNING)
     , m_general("<font size=4><b>General Settings:</b></font>")
-    , POST_WARP_DELAY(
+    , POST_WARP_DELAY0(
         "<b>Post-Warp Delay:</b><br>After warping, wait this many seconds before continuing.",
         LockMode::LOCK_WHILE_RUNNING,
-        1.0, 0, 100
+        "1000 ms"
     )
     , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
     , GAME_TO_HOME_DELAY0(
         "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
         LockMode::LOCK_WHILE_RUNNING,
-        "1000ms"
+        "1000 ms"
     )
     , LOAD_REGION_TIMEOUT0(
         "<b>Load Region Timeout:</b><br>Wait at most this long to enter a region before giving up.",
         LockMode::LOCK_WHILE_RUNNING,
-        "30s"
+        "30 s"
     )
     , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
     , START_GAME_MASH0(
         "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
         LockMode::LOCK_WHILE_RUNNING,
-        "2000ms"
+        "2000 ms"
     )
     , START_GAME_WAIT1(
         "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
         LockMode::LOCK_WHILE_RUNNING,
-        "40s"
+        "40 s"
     )
     , ENTER_GAME_MASH0(
         "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
         LockMode::LOCK_WHILE_RUNNING,
-        "5000ms"
+        "5000 ms"
     )
     , ENTER_GAME_WAIT0(
         "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
         LockMode::LOCK_WHILE_RUNNING,
-        "15s"
+        "15 s"
     )
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
@@ -93,7 +93,7 @@ GameSettings::GameSettings()
     )
 {
     PA_ADD_STATIC(m_general);
-    PA_ADD_OPTION(POST_WARP_DELAY);
+    PA_ADD_OPTION(POST_WARP_DELAY0);
 
     PA_ADD_STATIC(m_menu_navigation);
     PA_ADD_OPTION(GAME_TO_HOME_DELAY0);

SerialPrograms/Source/PokemonLA/PokemonLA_Settings.h

@@ -23,7 +23,7 @@ class GameSettings : public BatchOption{
     static GameSettings& instance();
 
     SectionDividerOption m_general;
-    FloatingPointOption POST_WARP_DELAY;
+    MillisecondsOption POST_WARP_DELAY0;
 
     SectionDividerOption m_menu_navigation;
     MillisecondsOption GAME_TO_HOME_DELAY0;

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.",
-        "0ms"
+        "0 ms"
     )
     , MATCH_DETECTED_OPTIONS(
         "Match Action",
         "What to do when the leaping Pokemon matches the *Stop On*.",
-        "0ms"
+        "0 ms"
     )
     , 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", "", "2000ms")
+    : SHINY_DETECTED("Shiny Detected Action", "", "2000 ms")
     , 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.",
-        "0ms"
+        "0 ms"
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({

SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp

@@ -213,7 +213,7 @@ void mash_A_to_change_region(
     }
 
     stream.log("Loaded into map...");
-    context.wait_for(std::chrono::milliseconds((uint64_t)(GameSettings::instance().POST_WARP_DELAY * 1000)));
+    context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
 }
 
 
@@ -353,7 +353,7 @@ void goto_camp_from_jubilife(
         );
     }
     stream.log("Arrived at sub-camp...");
-    context.wait_for(std::chrono::milliseconds((uint64_t)(GameSettings::instance().POST_WARP_DELAY * 1000)));
+    context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
 
     if (location.post_arrival_maneuver == nullptr){
         return;
@@ -449,7 +449,7 @@ void goto_camp_from_overworld(
         );
     }
     stream.log("Arrived at camp...");
-    context.wait_for(std::chrono::milliseconds((uint64_t)(GameSettings::instance().POST_WARP_DELAY * 1000)));
+    context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
 }
 
 void goto_any_camp_from_overworld(
@@ -544,7 +544,7 @@ void goto_any_camp_from_overworld(
         );
     }
     stream.log("Arrived at camp...");
-    context.wait_for(std::chrono::milliseconds((uint64_t)(GameSettings::instance().POST_WARP_DELAY * 1000)));
+    context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
     context.wait_for_all_requests();
 }