diff --git a/Common/Cpp/Options/ConfigOption.cpp b/Common/Cpp/Options/ConfigOption.cpp index 575d2db7a..b1d43541d 100644 --- a/Common/Cpp/Options/ConfigOption.cpp +++ b/Common/Cpp/Options/ConfigOption.cpp @@ -53,13 +53,13 @@ ConfigOption::ConfigOption(const ConfigOption& x) {} ConfigOption::ConfigOption() - : m_data(CONSTRUCT_TOKEN, LockWhileRunning::LOCKED, ConfigOptionState::ENABLED) + : m_data(CONSTRUCT_TOKEN, LockWhileRunning::LOCK_WHILE_RUNNING, ConfigOptionState::ENABLED) {} ConfigOption::ConfigOption(LockWhileRunning lock_mode) : m_data(CONSTRUCT_TOKEN, lock_mode, ConfigOptionState::ENABLED) {} ConfigOption::ConfigOption(ConfigOptionState visibility) - : m_data(CONSTRUCT_TOKEN, LockWhileRunning::LOCKED, visibility) + : m_data(CONSTRUCT_TOKEN, LockWhileRunning::LOCK_WHILE_RUNNING, visibility) {} void ConfigOption::add_listener(Listener& listener){ diff --git a/Common/Cpp/Options/ConfigOption.h b/Common/Cpp/Options/ConfigOption.h index e2ff146df..fcad73a4a 100644 --- a/Common/Cpp/Options/ConfigOption.h +++ b/Common/Cpp/Options/ConfigOption.h @@ -22,7 +22,7 @@ class ConfigWidget; enum class LockWhileRunning{ UNLOCKED, - LOCKED, + LOCK_WHILE_RUNNING, READ_ONLY, }; enum class ConfigOptionState{ diff --git a/Common/PokemonSwSh/PokemonSwSh_FossilTable.h b/Common/PokemonSwSh/PokemonSwSh_FossilTable.h index 2b96a8532..d4acb0e04 100644 --- a/Common/PokemonSwSh/PokemonSwSh_FossilTable.h +++ b/Common/PokemonSwSh/PokemonSwSh_FossilTable.h @@ -39,10 +39,10 @@ class FossilGame : public EditableTableRow{ public: FossilGame() - : game_slot(GameSlot_Database(), LockWhileRunning::LOCKED, 1) - , user_slot(UserSlot_Database(), LockWhileRunning::LOCKED, 1) - , fossil(Fossil_Database(), LockWhileRunning::LOCKED, Fossil::Dracovish) - , revives(LockWhileRunning::LOCKED, 960, 0, 965) + : game_slot(GameSlot_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, 1) + , user_slot(UserSlot_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, 1) + , fossil(Fossil_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, Fossil::Dracovish) + , revives(LockWhileRunning::LOCK_WHILE_RUNNING, 960, 0, 965) { PA_ADD_OPTION(game_slot); PA_ADD_OPTION(user_slot); @@ -79,7 +79,7 @@ class FossilTable : public EditableTableOption_t{ FossilTable() : EditableTableOption_t( "Game List:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h b/Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h index 798c6c72a..8c05ce5f6 100644 --- a/Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h +++ b/Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h @@ -24,16 +24,16 @@ class MultiHostSlot : public EditableTableRow{ public: MultiHostSlot(bool raid_code_option) : m_raid_code_option(raid_code_option) - , game_slot(GameSlot_Database(), LockWhileRunning::LOCKED, 1) - , user_slot(UserSlot_Database(), LockWhileRunning::LOCKED, 1) - , skips(LockWhileRunning::LOCKED, 3, 0, 7) - , backup_save(LockWhileRunning::LOCKED, false) - , always_catchable(LockWhileRunning::LOCKED, true) - , use_raid_code(LockWhileRunning::LOCKED, true) - , accept_FRs(LockWhileRunning::LOCKED, true) - , move_slot(LockWhileRunning::LOCKED, 0, 0, 4) - , dynamax(LockWhileRunning::LOCKED, true) - , post_raid_delay(LockWhileRunning::LOCKED, TICKS_PER_SECOND, "0 * TICKS_PER_SECOND") + , game_slot(GameSlot_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, 1) + , user_slot(UserSlot_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, 1) + , skips(LockWhileRunning::LOCK_WHILE_RUNNING, 3, 0, 7) + , backup_save(LockWhileRunning::LOCK_WHILE_RUNNING, false) + , always_catchable(LockWhileRunning::LOCK_WHILE_RUNNING, true) + , use_raid_code(LockWhileRunning::LOCK_WHILE_RUNNING, true) + , accept_FRs(LockWhileRunning::LOCK_WHILE_RUNNING, true) + , move_slot(LockWhileRunning::LOCK_WHILE_RUNNING, 0, 0, 4) + , dynamax(LockWhileRunning::LOCK_WHILE_RUNNING, true) + , post_raid_delay(LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "0 * TICKS_PER_SECOND") { PA_ADD_OPTION(game_slot); PA_ADD_OPTION(user_slot); @@ -86,7 +86,7 @@ class MultiHostSlot : public EditableTableRow{ class MultiHostTable : public EditableTableOption{ public: MultiHostTable(bool raid_code_option) - : EditableTableOption("Game List:", LockWhileRunning::LOCKED) + : EditableTableOption("Game List:", LockWhileRunning::LOCK_WHILE_RUNNING) , m_raid_code_option(raid_code_option) {} std::vector> copy_snapshot() const{ diff --git a/Common/Qt/Options/ConfigWidget.cpp b/Common/Qt/Options/ConfigWidget.cpp index ce33f1333..a8473951c 100644 --- a/Common/Qt/Options/ConfigWidget.cpp +++ b/Common/Qt/Options/ConfigWidget.cpp @@ -45,7 +45,7 @@ void ConfigWidget::update_visibility(){ // cout << "ConfigWidget::update_visibility(): " << (int)m_value.visibility() << endl; switch (m_value.visibility()){ case ConfigOptionState::ENABLED: - m_widget->setEnabled(m_value.lock_mode() != LockWhileRunning::LOCKED || !m_program_is_running); + m_widget->setEnabled(m_value.lock_mode() != LockWhileRunning::LOCK_WHILE_RUNNING || !m_program_is_running); m_widget->setVisible(true); break; case ConfigOptionState::DISABLED: diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index 165469bd1..2dc001c3b 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -40,10 +40,10 @@ ResolutionOption::ResolutionOption( std::string label, std::string description, int default_width, int default_height ) - : GroupOption(std::move(label), LockWhileRunning::LOCKED) + : GroupOption(std::move(label), LockWhileRunning::LOCK_WHILE_RUNNING) , DESCRIPTION(std::move(description)) - , WIDTH("Width:", LockWhileRunning::LOCKED, scale_dpi_width(default_width)) - , HEIGHT("Height:", LockWhileRunning::LOCKED, scale_dpi_height(default_height)) + , WIDTH("Width:", LockWhileRunning::LOCK_WHILE_RUNNING, scale_dpi_width(default_width)) + , HEIGHT("Height:", LockWhileRunning::LOCK_WHILE_RUNNING, scale_dpi_height(default_height)) { PA_ADD_STATIC(DESCRIPTION); PA_ADD_OPTION(WIDTH); @@ -98,17 +98,17 @@ GlobalSettings::~GlobalSettings(){ ENABLE_LIFETIME_SANITIZER.remove_listener(*this); } GlobalSettings::GlobalSettings() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , SEND_ERROR_REPORTS( "Send Error Reports:
" "Send error reports to the " + PROGRAM_NAME + " server to help them resolve issues and improve the program.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, IS_BETA_VERSION ) , STATS_FILE( false, "Stats File:
Use the stats file here. Multiple instances of the program can use the same file.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "UserSettings/PA-Stats.txt", "UserSettings/PA-Stats.txt" ) @@ -146,7 +146,7 @@ GlobalSettings::GlobalSettings() , SAVE_DEBUG_IMAGES( "Save Debug Images:
" "If the program fails to read something when it should succeed, save the image for debugging purposes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) // , NAUGHTY_MODE_OPTION("Naughty Mode:", false) @@ -219,7 +219,7 @@ GlobalSettings::GlobalSettings() , DEVELOPER_TOKEN( true, "Developer Token:
Restart application to take full effect after changing this.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "" ) { diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessPriorityOption.h b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessPriorityOption.h index 87b499aa9..7f945ade4 100644 --- a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessPriorityOption.h +++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessPriorityOption.h @@ -21,7 +21,7 @@ class ThreadPriorityOption : public EnumDropdownOption{ : EnumDropdownOption( std::move(label), PRIORITY_DATABASE(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_priority ) {} diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp index f2d20eac7..6207a5454 100644 --- a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp @@ -33,7 +33,7 @@ ProcessorLevelOption::ProcessorLevelOption() "Processor Specific Optimization:
" "Note that this only applies to this binary. External dependencies may ignore this and use higher instructions anyway.", CAPABILITIES_DATABASE(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, get_default_ProcessorLevel_index() ) { diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp index 519e04452..845164dba 100644 --- a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp @@ -51,7 +51,7 @@ ThemeSelectorOption::ThemeSelectorOption() {0, "default", "Default"}, {1, "dark", "Dark Mode"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) {} diff --git a/SerialPrograms/Source/CommonFramework/Options/StringSelectTableOption.h b/SerialPrograms/Source/CommonFramework/Options/StringSelectTableOption.h index 3a185d357..c6c11b88a 100644 --- a/SerialPrograms/Source/CommonFramework/Options/StringSelectTableOption.h +++ b/SerialPrograms/Source/CommonFramework/Options/StringSelectTableOption.h @@ -18,7 +18,7 @@ namespace PokemonAutomation{ class StringSelectTableRow : public EditableTableRow{ public: StringSelectTableRow(const StringSelectDatabase& database, const std::string& default_slug) - : cell(database, LockWhileRunning::LOCKED, default_slug) + : cell(database, LockWhileRunning::LOCK_WHILE_RUNNING, default_slug) { PA_ADD_OPTION(cell); } @@ -39,7 +39,7 @@ class StringSelectTableOption : public EditableTableOption{ std::string label, std::string header, const StringSelectDatabase& database, std::string default_slug ) - : EditableTableOption(std::move(label), LockWhileRunning::LOCKED) + : EditableTableOption(std::move(label), LockWhileRunning::LOCK_WHILE_RUNNING) , m_header(std::move(header)) , m_database(database) , m_default_slug(std::move(default_slug)) diff --git a/SerialPrograms/Source/CommonFramework/Options/TrainOCRModeOption.h b/SerialPrograms/Source/CommonFramework/Options/TrainOCRModeOption.h index d9670e45a..6b35424db 100644 --- a/SerialPrograms/Source/CommonFramework/Options/TrainOCRModeOption.h +++ b/SerialPrograms/Source/CommonFramework/Options/TrainOCRModeOption.h @@ -27,7 +27,7 @@ class TrainOCRModeOption : public EnumDropdownOption{ {TrainOCRMode::START_FRESH, "start-fresh", "Start Fresh: Use only baseline strings. (1st candidate of each entry in above path)"}, {TrainOCRMode::INCREMENTAL, "incremental", "Incremental: Build off of the existing training data in the above path."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TrainOCRMode::GENERATE_BASELINE ) {} diff --git a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.cpp index 7ae586d98..e902fcae3 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.cpp @@ -13,7 +13,7 @@ namespace PokemonAutomation{ SettingsPanelInstance::SettingsPanelInstance(const PanelDescriptor& descriptor) : PanelInstance(descriptor) - , m_options(LockWhileRunning::LOCKED) + , m_options(LockWhileRunning::LOCK_WHILE_RUNNING) {} void SettingsPanelInstance::from_json(const JsonValue& json){ diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp index 88b2161f9..9c15dd9fd 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp @@ -88,7 +88,7 @@ VideoBackendOption::VideoBackendOption() : IntegerEnumDropdownOption( "Video Pipeline Backend:", CameraBackends::instance().m_database, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, #if QT_VERSION_MAJOR == 5 0 #elif QT_VERSION_MAJOR == 6 diff --git a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp index a6164b5a0..e8fc72e15 100644 --- a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp +++ b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp @@ -34,7 +34,7 @@ std::unique_ptr ComputerProgramDescriptor::make_panel() const{ ComputerProgramInstance::ComputerProgramInstance() - : m_options(LockWhileRunning::LOCKED) + : m_options(LockWhileRunning::LOCK_WHILE_RUNNING) , NOTIFICATION_PROGRAM_FINISH( "Program Finished", true, true, diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp index 97b7b0c66..272d09d9b 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp @@ -28,11 +28,11 @@ DiscordIntegrationSettingsOption::~DiscordIntegrationSettingsOption(){ this->remove_listener(*this); } DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption() - : GroupOption("Discord Integration Settings", LockWhileRunning::LOCKED, true, false) + : GroupOption("Discord Integration Settings", LockWhileRunning::LOCK_WHILE_RUNNING, true, false) // , m_integration_enabled(integration_enabled) , run_on_start( "Run Discord Integration on Launch:
Automatically connect to Discord as soon as the program is launched.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , library0( @@ -41,7 +41,7 @@ DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption() {Library::SleepyDiscord, "sleepy", "Sleepy Discord (normal commands, deprecated)"}, {Library::DPP, "dpp", "D++ (slash commands and normal commands)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Library::DPP ) , command_type( @@ -50,48 +50,48 @@ DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption() {CommandType::SlashCommands, "slash", "Slash commands"}, {CommandType::MessageCommands, "message", "Message (prefix) commands"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, CommandType::SlashCommands ) , token( true, "Discord Token:
Enter your Discord bot's token. Keep it safe and don't share it with anyone.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "0123456789abcdefghijklmnopqrstuvwxyzABCDEGFHIJKLMNOPQRSTUVWXYZ" ) , command_prefix( false, "Discord Command Prefix:
Enter a command prefix for your bot.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "^", "^" ) , use_suffix( "Use Suffix (Sleepy):
Use a suffix instead of a prefix for commands.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , game_status( false, "Discord Game Status:
Enter a status message your bot would display.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "Controlling your Switch. :)" ) , hello_message( false, "Discord Hello Message:
Enter a message you'd like the bot to respond with to the \"$hi\" command.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "Automation at your service!" ) , sudo( false, "Discord Sudo (Sleepy):
Enter user ID(s) to grant sudo access to.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "123456789012345678" ) , owner( false, "Discord Owner (Sleepy):
Enter the bot owner's ID (your own ID).", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "123456789012345678" ) { diff --git a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp index e240007a8..f74e7889b 100644 --- a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp +++ b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp @@ -20,25 +20,25 @@ namespace Integration{ DiscordMessageSettingsOption::DiscordMessageSettingsOption() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , instance_name( false, "Instance Name:
If you are running multiple instances of this program, give it a name to distinguish them in notifications.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "(e.g. Living Room Switch)" ) , user_id( false, "Discord User ID:
Set this to your discord user ID to receive pings. Your ID is a number.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "123456789012345678" ) , message( false, "Discord Message:
Message to put on every discord notification.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "(e.g. Kim's Shiny Hunt)" ) @@ -66,7 +66,7 @@ ConfigWidget* DiscordMessageSettingsOption::make_QtWidget(QWidget& parent){ DiscordSettingsOption::DiscordSettingsOption() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) { PA_ADD_OPTION(message); PA_ADD_OPTION(webhooks); diff --git a/SerialPrograms/Source/Integrations/DiscordWebhookSettings.cpp b/SerialPrograms/Source/Integrations/DiscordWebhookSettings.cpp index 240b36bf6..10e525f59 100644 --- a/SerialPrograms/Source/Integrations/DiscordWebhookSettings.cpp +++ b/SerialPrograms/Source/Integrations/DiscordWebhookSettings.cpp @@ -16,12 +16,12 @@ namespace Integration{ DiscordWebhookUrl::DiscordWebhookUrl() - : enabled(LockWhileRunning::LOCKED, true) - , label(false, LockWhileRunning::LOCKED, "", "My test server") - , ping(LockWhileRunning::LOCKED, true) - , tags_text(false, LockWhileRunning::LOCKED, "Notifs, Showcase, LiveHost", "") - , delay(LockWhileRunning::LOCKED, 0, 0, 10) - , url(true, LockWhileRunning::LOCKED, "", "https://discord.com/api/webhooks/123456789012345678/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") + : enabled(LockWhileRunning::LOCK_WHILE_RUNNING, true) + , label(false, LockWhileRunning::LOCK_WHILE_RUNNING, "", "My test server") + , ping(LockWhileRunning::LOCK_WHILE_RUNNING, true) + , tags_text(false, LockWhileRunning::LOCK_WHILE_RUNNING, "Notifs, Showcase, LiveHost", "") + , delay(LockWhileRunning::LOCK_WHILE_RUNNING, 0, 0, 10) + , url(true, LockWhileRunning::LOCK_WHILE_RUNNING, "", "https://discord.com/api/webhooks/123456789012345678/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") { // Keep the old JSON tags for backwards compatibility. add_option(enabled, "Enabled"); @@ -74,7 +74,7 @@ void DiscordWebhookUrl::load_json(const JsonValue& json){ DiscordWebhookSettingsTable::DiscordWebhookSettingsTable() : EditableTableOption_t( "Discord Webhook URLs: Notifications are sent to all enabled URLs that share a tag with the event.", - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) {} std::vector DiscordWebhookSettingsTable::make_header() const{ @@ -92,10 +92,10 @@ std::vector DiscordWebhookSettingsTable::make_header() const{ DiscordWebhookSettingsOption::DiscordWebhookSettingsOption() - : GroupOption("Discord Webhook Settings", LockWhileRunning::LOCKED, true, false) + : GroupOption("Discord Webhook Settings", LockWhileRunning::LOCK_WHILE_RUNNING, true, false) , sends_per_second( "Rate Limit:
Maximum number of sends per second.", - LockWhileRunning::LOCKED, 2 + LockWhileRunning::LOCK_WHILE_RUNNING, 2 ) { PA_ADD_OPTION(urls); diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp index e42c55c7e..df6a61ceb 100644 --- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp +++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp @@ -173,11 +173,11 @@ TestProgram::TestProgram() , LANGUAGE( "OCR Language:", { Language::English }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , STATIC_TEXT("Test text...") - , SELECT("String Select", test_database(), LockWhileRunning::LOCKED, 0) + , SELECT("String Select", test_database(), LockWhileRunning::LOCK_WHILE_RUNNING, 0) , PLAYER_LIST("Test Table", LockWhileRunning::UNLOCKED, "Notes") , NOTIFICATION_TEST("Test", true, true, ImageAttachmentMode::JPG) , NOTIFICATIONS({ diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp index 7e300e6fb..00b30c465 100644 --- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp +++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp @@ -23,16 +23,16 @@ ConsoleSettings& ConsoleSettings::instance(){ return settings; } ConsoleSettings::ConsoleSettings() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , CONNECT_CONTROLLER_DELAY( "Connection Controller Delay:
Wait this long before starting the program. The LEDs normally flash during this time.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , SETTINGS_TO_HOME_DELAY( "Settings to Home Delay:
Delay from pressing home anywhere in the settings to return to the home menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "120" ) @@ -40,27 +40,27 @@ ConsoleSettings::ConsoleSettings() "Start Game Requires Internet:
" "Set this to true if starting the game requires checking the internet. " "Otherwise, programs that require soft-resetting may not work properly.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , START_GAME_INTERNET_CHECK_DELAY( "Start Game Internet Check Delay:
" "If starting the game requires checking the internet, wait this long for it.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , TOLERATE_SYSTEM_UPDATE_MENU_FAST( "Tolerate System Update Menu (fast):
" "Some programs can bypass the system update menu at little performance cost. Setting this to true enables this.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , TOLERATE_SYSTEM_UPDATE_MENU_SLOW( "Tolerate System Update Menu (slow):Some programs can bypass the system update menu, but will take a noticeable performance hit. " "Setting this to true enables this.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h index 3db038c6d..51d99149a 100644 --- a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h +++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h @@ -23,7 +23,7 @@ class StartInGripOrGameOption : public IntegerEnumDropdownOption{ {0, "in-game", "Start in game."}, {1, "grip-menu", "Start in grip menu."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, grip_menu ? 1 : 0 ) {} @@ -44,7 +44,7 @@ class StartInGripOrClosedOption : public IntegerEnumDropdownOption{ {0, "home", "Start in Switch Home with game closed."}, {1, "grip-menu", "Start in grip menu."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, grip_menu ? 1 : 0 ) {} diff --git a/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp b/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp index 0ab216c45..a861aad3d 100644 --- a/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp @@ -68,13 +68,13 @@ void TurboMacroCell::operator=(const TurboMacroCell& x){ wait_ticks.set(x.wait_ticks); } TurboMacroCell::TurboMacroCell(EnumDropdownCell& action) - : BatchOption(LockWhileRunning::LOCKED, true) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING, true) , m_action(action) - , x_axis("X:", LockWhileRunning::LOCKED, 128) - , y_axis("Y:", LockWhileRunning::LOCKED, 128) - , button_hold_ticks("Ticks to Hold:", LockWhileRunning::LOCKED, 250) - , button_release_ticks("Ticks to Release:", LockWhileRunning::LOCKED, 250) - , wait_ticks("Ticks to Wait:", LockWhileRunning::LOCKED, 125) + , x_axis("X:", LockWhileRunning::LOCK_WHILE_RUNNING, 128) + , y_axis("Y:", LockWhileRunning::LOCK_WHILE_RUNNING, 128) + , button_hold_ticks("Ticks to Hold:", LockWhileRunning::LOCK_WHILE_RUNNING, 250) + , button_release_ticks("Ticks to Release:", LockWhileRunning::LOCK_WHILE_RUNNING, 250) + , wait_ticks("Ticks to Wait:", LockWhileRunning::LOCK_WHILE_RUNNING, 125) { PA_ADD_OPTION(x_axis); PA_ADD_OPTION(y_axis); @@ -127,7 +127,7 @@ void TurboMacroCell::value_changed(){ TurboMacroRow::TurboMacroRow() - : action(TurboMacroAction_Database(), LockWhileRunning::LOCKED, TurboMacroAction::NO_ACTION) + : action(TurboMacroAction_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, TurboMacroAction::NO_ACTION) , parameters(action) { PA_ADD_OPTION(action); @@ -248,7 +248,7 @@ TurboMacroTable::TurboMacroTable() "Custom Macro Table:
" "Set a list of button press to create a macro. 125 ticks = 1 second. Joystick direction is specified by (x, y).
" "x = 0 is left, x = 255 is right. y = 0 is up, y = 255 is down. 128 is neutral for both. Ex. Move joystick fully left would be (0, 128). Move joystick up-right would be (255, 0).", - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) {} std::vector TurboMacroTable::make_header() const{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp index 885b56e9d..8b5bcec18 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp @@ -31,7 +31,7 @@ FastCodeEntrySettingsOption::FastCodeEntrySettingsOption(LockWhileRunning lock_w {KeyboardLayout::QWERTY, "qwerty", "QWERTY"}, {KeyboardLayout::AZERTY, "azerty", "AZERTY"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, KeyboardLayout::QWERTY ) , SKIP_PLUS( diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp index 566036be9..90792fa9e 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp @@ -31,7 +31,7 @@ FriendCodeAdder_Descriptor::FriendCodeAdder_Descriptor() FriendCodeAdder::FriendCodeAdder() : USER_SLOT( "User Slot:
Send friend requests for this profile.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, 8 ) , FRIEND_CODES( @@ -46,19 +46,19 @@ FriendCodeAdder::FriendCodeAdder() ) , OPEN_CODE_PAD_DELAY( "Open Code Pad Delay", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1 * TICKS_PER_SECOND" ) , SEARCH_TIME( "Search Time:
Wait this long after initiating search.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , TOGGLE_BEST_STATUS_DELAY( "Toggle Best Delay:
Time needed to toggle the best friend status.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp index 4417d2852..3c6ce4e91 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp @@ -28,29 +28,29 @@ FriendDelete_Descriptor::FriendDelete_Descriptor() FriendDelete::FriendDelete() : FRIENDS_TO_DELETE( "Number of Friends to Delete:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 3, 0, 300 ) , BLOCK_FRIENDS( "Block Friends:
Block instead of delete!", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , VIEW_FRIEND_DELAY( "View Friend Delay:
Delay from opening a friend to when you can press buttons.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) , DELETE_FRIEND_DELAY( "Delete Friend Delay:
Delay to delete the friend.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) , FINISH_DELETE_DELAY( "Finish Delete Delay:
Delay after deleting a friend.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp index b704f9f3f..d6195bca1 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp @@ -35,22 +35,22 @@ PushJoySticks_Descriptor::PushJoySticks_Descriptor() PushJoySticks::PushJoySticks() : LEFT_X( "Left Joy Stick X direction:
Range: 0-255. 0: left, 128: neutral, 255: right.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 128, 0, 255 ) , LEFT_Y( "Left Joy Stick Y direction:
Range: 0-255. 0: up, 128: neutral, 255: down.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 128, 0, 255 ) , RIGHT_X( "Right Joy Stick X direction:
Range: 0-255. 0: left, 128: neutral, 255: right.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 128, 0, 255 ) , RIGHT_Y( "Right Joy Stick Y direction:
Range: 0-255. 0: up, 128: neutral, 255: down.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 128, 0, 255 ) { diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp index 970756d28..dc032a873 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp @@ -45,24 +45,24 @@ TurboButton::TurboButton() {BUTTON_HOME, "HOME", "Home"}, {BUTTON_CAPTURE, "CAPTURE", "Capture"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, BUTTON_A ) , PRESS_DURATION( "Press Duration:
Hold the button down for this long.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, 5, "5" ) , RELEASE_DURATION( "Release Duration:
After releasing the button, wait this long before pressing it again.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, 3, "3" ) , TOTAL_PRESSES( "Total Presses:
Stop the program after this many presses. If zero, run forever.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) { diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp index 94555041e..1cfb15849 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp @@ -31,13 +31,13 @@ TrainIVCheckerOCR::TrainIVCheckerOCR() : DIRECTORY( false, "Training Data Directory: (Relative to \"TrainingData/\")", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "IVCheckerOCR/", "IVCheckerOCR/" ) , THREADS( "Worker Threads:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, std::thread::hardware_concurrency() ) { diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp index 139ccb955..20f5addd1 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp @@ -35,13 +35,13 @@ TrainPokemonOCR::TrainPokemonOCR() : DIRECTORY( false, "Training Data Directory: (Relative to \"TrainingData/\")", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "PokemonNameOCR/", "PokemonNameOCR/" ) , THREADS( "Worker Threads:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, std::thread::hardware_concurrency() ) { diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_EncounterBotOptions.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_EncounterBotOptions.h index c964dc6b3..1e120989e 100644 --- a/SerialPrograms/Source/Pokemon/Options/Pokemon_EncounterBotOptions.h +++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_EncounterBotOptions.h @@ -21,7 +21,7 @@ class EncounterBotLanguage : public OCR::LanguageOCROption{ : LanguageOCROption( "Game Language:
Attempt to read and log the encountered " + STRING_POKEMON + " in this language.
Set to \"None\" to disable this feature.", PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, required ) {} diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp index df98ef5a2..0612c73c4 100644 --- a/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp +++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp @@ -16,7 +16,7 @@ namespace Pokemon{ IVJudgeFilterCell::IVJudgeFilterCell(IvJudgeFilter default_value) : EnumDropdownCell( IvJudgeFilter_Database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_value ) {} @@ -28,7 +28,7 @@ IVJudgeFilterOption::IVJudgeFilterOption(std::string label, IvJudgeFilter defaul : EnumDropdownOption( std::move(label), IvJudgeFilter_Database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_value ) {} diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.cpp index 55c0e9007..d8e1a261c 100644 --- a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.cpp +++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.cpp @@ -74,7 +74,7 @@ PokemonNameSelectCell::PokemonNameSelectCell( : PokemonNameSelectData(slugs) , StringSelectCell( PokemonNameSelectData::m_database, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} @@ -85,7 +85,7 @@ PokemonNameSelectCell::PokemonNameSelectCell( : PokemonNameSelectData(json_file_slugs) , StringSelectCell( PokemonNameSelectData::m_database, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} @@ -102,7 +102,7 @@ PokemonNameSelectOption::PokemonNameSelectOption( , StringSelectOption( std::move(label), PokemonNameSelectData::m_database, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} @@ -115,7 +115,7 @@ PokemonNameSelectOption::PokemonNameSelectOption( , StringSelectOption( std::move(label), PokemonNameSelectData::m_database, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp index 8d6bf3a81..632165053 100644 --- a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp +++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp @@ -74,10 +74,10 @@ const char* StatsHuntIvJudgeFilterTable_Label_Regular = StatsHuntRowMisc::StatsHuntRowMisc(const StatsHuntMiscFeatureFlags& p_feature_flags) : feature_flags(p_feature_flags) - , action(EggHatchAction_Database(), LockWhileRunning::LOCKED, StatsHuntAction::Keep) - , shiny(EggHatchShinyFilter_Database(), LockWhileRunning::LOCKED, StatsHuntShinyFilter::Anything) - , gender(EggHatchGenderFilter_Database(), LockWhileRunning::LOCKED, StatsHuntGenderFilter::Any) - , nature(NatureCheckerFilter_Database(), LockWhileRunning::LOCKED, NatureCheckerFilter::Any) + , action(EggHatchAction_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, StatsHuntAction::Keep) + , shiny(EggHatchShinyFilter_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, StatsHuntShinyFilter::Anything) + , gender(EggHatchGenderFilter_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, StatsHuntGenderFilter::Any) + , nature(NatureCheckerFilter_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, NatureCheckerFilter::Any) {} void StatsHuntRowMisc::set(const StatsHuntRowMisc& x){ action.set(x.action); @@ -172,7 +172,7 @@ StatsHuntIvJudgeFilterTable::StatsHuntIvJudgeFilterTable( const std::string& label, const StatsHuntMiscFeatureFlags& p_feature_flags ) - : EditableTableOption_t(label, LockWhileRunning::LOCKED) + : EditableTableOption_t(label, LockWhileRunning::LOCK_WHILE_RUNNING) , feature_flags(p_feature_flags) { set_default(make_defaults()); @@ -282,7 +282,7 @@ StatsHuntIvRangeFilterTable::StatsHuntIvRangeFilterTable( const std::string& label, const StatsHuntMiscFeatureFlags& p_feature_flags ) - : EditableTableOption_t(label, LockWhileRunning::LOCKED) + : EditableTableOption_t(label, LockWhileRunning::LOCK_WHILE_RUNNING) , feature_flags(p_feature_flags) { // set_default(make_defaults()); diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h index a90fe43e5..4b69a4693 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h +++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h @@ -40,7 +40,7 @@ class ShinyFilterCell : public EnumDropdownCell{ ShinyFilterCell() : EnumDropdownCell( ShinyFilter_Database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, ShinyFilter::ANYTHING ) {} diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp index 749230cd8..2de41179b 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp @@ -56,7 +56,7 @@ EncounterFilterOverride::~EncounterFilterOverride(){ action.remove_listener(*this); } EncounterFilterOverride::EncounterFilterOverride() - : pokemon(ALL_POKEMON_NAMES(), LockWhileRunning::LOCKED, "starly") + : pokemon(ALL_POKEMON_NAMES(), LockWhileRunning::LOCK_WHILE_RUNNING, "starly") { PA_ADD_OPTION(action); PA_ADD_OPTION(pokeball); @@ -122,7 +122,7 @@ EncounterFilterTable::EncounterFilterTable() "The game language must be properly set to read " + STRING_POKEMON + " names. " "If multiple overrides apply and are conflicting, the program will stop." + "
Auto-catching only applies in single battles. The program will stop if asked to auto-catch in a double-battle.", - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) {} std::vector EncounterFilterTable::make_header() const{ diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp index 55691b21f..ab49cb804 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp @@ -43,7 +43,7 @@ BerrySelectCell::BerrySelectCell( ) : StringSelectCell( ALL_BERRYS_SELECT_DATABASE(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp index d24b4f145..48e6b8b0a 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp @@ -33,7 +33,7 @@ std::unique_ptr BerrySelectorRow2::clone() const{ BerryTable::BerryTable(std::string label) : EditableTableOption_t( std::move(label), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.cpp index ee7f95b50..6bbaedb47 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.cpp @@ -27,7 +27,7 @@ EggStepCountOption::EggStepCountOption() : StringSelectOption( "Step Count:", EGGSTEP_DATABASE().database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "turtwig" ) {} diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h index 20a8d2ca7..71cbb9855 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h +++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h @@ -22,17 +22,17 @@ namespace PokemonBDSP{ class EncounterBotCommonOptions : public BatchOption{ public: EncounterBotCommonOptions(bool enable_overrides) - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , USE_SOUND_DETECTION( "Use Sound Detection:
Use sound to improve shiny detection.
" "Make sure you have correct audio input set.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , FILTER(enable_overrides) , VIDEO_ON_SHINY( "Video Capture:
Take a video of the encounter if it is shiny.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_NONSHINY( diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h index 920490acf..8fe4f11e9 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h +++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h @@ -28,7 +28,7 @@ class OnLearnMoveOption : public EnumDropdownOption{ {OnLearnMove::DONT_LEARN, "skip", "Don't learn moves."}, {OnLearnMove::STOP_PROGRAM, "stop-program", "Stop Program"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, OnLearnMove::DONT_LEARN ) {} diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp index 021bc7878..f302211d7 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp @@ -39,7 +39,7 @@ ShortcutDirectionOption::ShortcutDirectionOption(std::string label) : EnumDropdownOption( std::move(label), ShortcutDirection_Nullable(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, ShortcutDirection::NONE ) {} diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp index 6e5bb13ac..b2e729f28 100644 --- a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp +++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp @@ -21,91 +21,91 @@ GameSettings& GameSettings::instance(){ return settings; } GameSettings::GameSettings() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , m_menu_navigation("Menu Navigation Timings:") , OVERWORLD_TO_MENU_DELAY( "Overworld to Menu Delay:
Delay to bring up the menu when pressing X in the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "250" ) , MENU_TO_OVERWORLD_DELAY( "Menu to Overworld Delay:
Delay to go from menu back to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "250" ) , GAME_TO_HOME_DELAY( "Game to Home Delay:
Delay from pressing home to entering the the Switch home menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "125" ) , m_start_game_timings("Start Game Timings:") , START_GAME_MASH( "1. Start Game Mash:
Mash A for this long to start the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) , START_GAME_WAIT( "2. Start Game Wait:
Wait this long for the game to load.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "40 * TICKS_PER_SECOND" ) , ENTER_GAME_MASH( "3. Enter Game Mash:
Mash A for this long to enter the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , ENTER_GAME_WAIT( "4. Enter Game Wait:
Wait this long for the game to enter the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "40 * TICKS_PER_SECOND" ) , m_box_timings("Box Timings: (for egg programs)") , BOX_SCROLL_DELAY_0( "Box Scroll Delay:
Delay to move the cursor.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30" ) , BOX_CHANGE_DELAY_0( "Box Change Delay:
Delay to change boxes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "200" ) , BOX_PICKUP_DROP_DELAY( "Box Pickup/Drop Delay:
Delay to pickup/drop " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "50" ) , MENU_TO_POKEMON_DELAY( "Menu To " + STRING_POKEMON + " Delay:
Delay to enter " + STRING_POKEMON + " menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "300" ) , POKEMON_TO_BOX_DELAY0( "" + STRING_POKEMON + " to Box Delay:
Delay to enter box system.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "320" ) , BOX_TO_POKEMON_DELAY( "Box to " + STRING_POKEMON + " Delay:
Delay to exit box system.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "250" ) , POKEMON_TO_MENU_DELAY( "" + STRING_POKEMON + " to Menu Delay:
Delay to return to menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "250" ) @@ -114,42 +114,42 @@ GameSettings::GameSettings() ) , SHINY_ALPHA_OVERALL_THRESHOLD( "Shiny Threshold (overall):
Threshold to detect a shiny encounter.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 4.0, 0 ) , SHINY_ALPHA_SIDE_THRESHOLD( "Shiny Threshold (left/right):
Threshold to detect a left/right shiny.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 3.0, 0 ) , BALL_SPARKLE_ALPHA( "Ball Sparkle Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1.0, 0 ) , STAR_SPARKLE_ALPHA( "Star Sparkle Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1.0, 0 ) , SHINY_DIALOG_ALPHA( "Shiny Dialog Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 3.5, 0 ) , SHINY_SOUND_THRESHOLD( "Shiny Sound Threshold:
Maximum error coefficient to trigger a shiny detection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.87, 0, 1.0 ) , SHINY_SOUND_LOW_FREQUENCY( "Shiny Sound Low Frequency (Hz):
High pass filter frequency for shiny sound.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 5000, 0, 48000 ) , SHINY_SOUND_ALPHA( "Shiny Sound Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 5.0, 0 ) // , m_experimental("Experimental/Beta Features:") diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp index 01f8de2c8..eb4fbfc59 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp @@ -46,7 +46,7 @@ EggAutonomous::EggAutonomous() , LANGUAGE( "Game Language:
Required to read IVs.", PokemonSwSh::IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , SHORTCUT("Bike Shortcut:") @@ -54,12 +54,12 @@ EggAutonomous::EggAutonomous() "Max Keepers:
Stop the program after keeping this many " + STRING_POKEMON + ". " "This number plus the number of " + STRING_POKEMON + " in your last box must not exceed 30. " "Otherwise, the program will break when that box is full.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10, 1, 30 ) , TRAVEL_TIME_PER_FETCH( "Travel Time per Fetch:
Fetch an egg after traveling for this long.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20 * TICKS_PER_SECOND" ) @@ -73,7 +73,7 @@ EggAutonomous::EggAutonomous() {4, "4", "4"}, {5, "5", "5"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , AUTO_SAVING( @@ -87,7 +87,7 @@ EggAutonomous::EggAutonomous() {AutoSave::AfterStartAndKeep, "start-and-keep", "Save at beginning and after obtaining each baby that is kept. (Allows for error/crash recovery.)"}, {AutoSave::EveryBatch, "every-batch", "Save before every batch. (Allows you to unhatch eggs.)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, AutoSave::AfterStartAndKeep ) , FILTERS( @@ -124,7 +124,7 @@ EggAutonomous::EggAutonomous() , SCROLL_TO_READ_DELAY( "Scroll to Read Delay:
Wait this long after scrolling in the box to read the " + STRING_POKEMON + "'s stats. " "Increase this if your video has high latency.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "125" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp index a9105952a..a864ba3e9 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp @@ -48,12 +48,12 @@ EggFetcher::EggFetcher() , SHORTCUT("Bike Shortcut:") , MAX_FETCH_ATTEMPTS( "Fetch this many times:
This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2000 ) , TRAVEL_TIME_PER_FETCH( "Travel Time per Fetch:
Fetch an egg after traveling for this long.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "15 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp index 02d928931..ab3629176 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp @@ -50,12 +50,12 @@ EggHatcher::EggHatcher() // , SHORTCUT("Bike Shortcut:") , BOXES_TO_HATCH( "Boxes to Hatch:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 3 ) , SAVE_AND_RESET( "Save and Reset:
After hatching a box, save the game and reset. This will recover from game crashes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) @@ -69,13 +69,13 @@ EggHatcher::EggHatcher() ) , SAFETY_TIME0( "Safety Time:
Additional time added to the spinning.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , HATCH_DELAY( "Hatch Delay:
Total animation time for hatching 5 eggs when there are no shinies.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "105 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp index b99ef8ecf..d1bd5d1cb 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp @@ -45,23 +45,23 @@ AmitySquarePickUpFarmer::AmitySquarePickUpFarmer() : GO_HOME_WHEN_DONE(false) , MAX_FETCH_ATTEMPTS( "Fetch this many times:
This puts a limit on how many items you can get.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 100 ) , ONE_WAY_MOVING_TIME( "One Way walking Time:
Walk this amount of time in one direction before going back to finish one round of walking.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , ROUNDS_PER_FETCH( "Rounds per fetch:
How many rounds of walking before doing a berry fetch attempt.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 3 ) , WAIT_TIME_FOR_POKEMON( "Wait Time for Pokemon:
Wait this time for pokemon to catch up to you before you ask for a berry.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp index 22d3205c6..328a37d35 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp @@ -64,7 +64,7 @@ DoublesLeveling::DoublesLeveling() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp index a15432657..6a3bc88f2 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp @@ -79,7 +79,7 @@ GiftBerryReset::GiftBerryReset() , LANGUAGE( "Game Language:
This is needed to read the berry name.", Pokemon::BerryNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , TARGET_BERRIES( diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp index e9def6f34..206505c63 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp @@ -66,7 +66,7 @@ MoneyFarmerRoute210::MoneyFarmerRoute210() {StartLocation::CelesticTown, "celestic", "In front of the Celestic Town " + STRING_POKEMON + " center."}, {StartLocation::AceTrainerPair, "trainer-pair", "Lower-most row of the platform the Ace Trainer pair in Route 210 is on."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, StartLocation::CelesticTown ) , HEALING_METHOD( @@ -75,17 +75,17 @@ MoneyFarmerRoute210::MoneyFarmerRoute210() {HealMethod::CelesticTown, "celestic", "Celestic Town " + STRING_POKEMON + " center."}, {HealMethod::GlobalRoom, "global-room", "Use Global Room. (will force update your game)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, HealMethod::CelesticTown ) - , MON0_MOVE1_PP("Lead " + STRING_POKEMON + " Move 1 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MON0_MOVE2_PP("Lead " + STRING_POKEMON + " Move 2 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MON0_MOVE3_PP("Lead " + STRING_POKEMON + " Move 3 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MON0_MOVE4_PP("Lead " + STRING_POKEMON + " Move 4 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MON1_MOVE1_PP("2nd " + STRING_POKEMON + " Move 1 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MON1_MOVE2_PP("2nd " + STRING_POKEMON + " Move 2 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MON1_MOVE3_PP("2nd " + STRING_POKEMON + " Move 3 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MON1_MOVE4_PP("2nd " + STRING_POKEMON + " Move 4 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) + , MON0_MOVE1_PP("Lead " + STRING_POKEMON + " Move 1 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MON0_MOVE2_PP("Lead " + STRING_POKEMON + " Move 2 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MON0_MOVE3_PP("Lead " + STRING_POKEMON + " Move 3 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MON0_MOVE4_PP("Lead " + STRING_POKEMON + " Move 4 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MON1_MOVE1_PP("2nd " + STRING_POKEMON + " Move 1 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MON1_MOVE2_PP("2nd " + STRING_POKEMON + " Move 2 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MON1_MOVE3_PP("2nd " + STRING_POKEMON + " Move 3 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MON1_MOVE4_PP("2nd " + STRING_POKEMON + " Move 4 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) , NOTIFICATIONS({ &NOTIFICATION_STATUS_UPDATE, diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp index a9834282a..1ded4083f 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp @@ -71,7 +71,7 @@ MoneyFarmerRoute212::MoneyFarmerRoute212() {StartLocation::Hearthome, "hearthome", "In front of the Hearthome City " + STRING_POKEMON + " center."}, {StartLocation::OldCouple, "old-couple", "In the row above the rich couple in Route 212."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, StartLocation::Hearthome ) , HEALING_METHOD( @@ -80,13 +80,13 @@ MoneyFarmerRoute212::MoneyFarmerRoute212() {HealMethod::Hearthome, "hearthome", "Hearthome City " + STRING_POKEMON + " center."}, {HealMethod::GlobalRoom, "global-room", "Use Global Room. (will force update your game)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, HealMethod::Hearthome ) - , MOVE1_PP("Move 1 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MOVE2_PP("Move 2 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MOVE3_PP("Move 3 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) - , MOVE4_PP("Move 4 PP:
Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64) + , MOVE1_PP("Move 1 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MOVE2_PP("Move 2 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MOVE3_PP("Move 3 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) + , MOVE4_PP("Move 4 PP:
Set to zero to not use this move.", LockWhileRunning::LOCK_WHILE_RUNNING, 5, 0, 64) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) , NOTIFICATIONS({ &NOTIFICATION_STATUS_UPDATE, diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp index 884836af7..4356b0bc8 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp @@ -48,7 +48,7 @@ PoffinCooker::PoffinCooker() : GO_HOME_WHEN_DONE(false) , MAX_COOK_ATTEMPTS( "Cook this many times:
This puts a limit on how many poffins you get. Don't forget that each cooking session gets you 4 poffins, and your bag cannot have more than 100 poffins. Thus you should never input more than 25 here.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, 25 diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp index af2952f14..95cdadeee 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp @@ -68,7 +68,7 @@ AutonomousBallThrower::AutonomousBallThrower() : GO_HOME_WHEN_DONE(false) , BALL_SELECT( "Ball Select:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "master-ball" ) , LANGUAGE( @@ -84,7 +84,7 @@ AutonomousBallThrower::AutonomousBallThrower() Language::ChineseSimplified, Language::ChineseTraditional, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp index a70805d08..07afaffd9 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp @@ -47,7 +47,7 @@ MassRelease::MassRelease() : GO_HOME_WHEN_DONE(false) , BOXES_TO_RELEASE( "Number of Boxes to Release:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 0, 40 ) , NOTIFICATIONS({ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp index e61c64be1..45ec0f9bf 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp @@ -39,7 +39,7 @@ ActivateMenuGlitch112::ActivateMenuGlitch112() : FLY_A_TO_X_DELAY( "Fly Menu A-to-X Delay:
The delay between the A and X presses to overlap the menu with the fly option.
" "(German players may need to increase this to 90.)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, 20, "50" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp index e6c39f088..2a27f0370 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp @@ -36,7 +36,7 @@ ActivateMenuGlitch113::ActivateMenuGlitch113() : FLY_A_TO_X_DELAY( "Fly Menu A-to-X Delay:
The delay between the A and X presses to overlap the menu with the fly option.
" "(German players may need to increase this to 90.)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, 20, "50" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp index 97ac42d72..b7f39d8bf 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp @@ -58,13 +58,13 @@ CloneItemsBoxCopy2::CloneItemsBoxCopy2() : GO_HOME_WHEN_DONE(false) , BOXES( "Boxes to Clone:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 999, 0, 999 ) , RELEASE( "Release the pokemon after cloning them:" "Beware, if set to false, the pokemons will be stored in the subsequent boxes. Make sure you have enough empty boxes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp index 45f9f8455..43ee6345a 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp @@ -22,7 +22,7 @@ namespace PokemonBDSP{ OverworldTrigger::OverworldTrigger() - : GroupOption("Trigger Method", LockWhileRunning::LOCKED) + : GroupOption("Trigger Method", LockWhileRunning::LOCK_WHILE_RUNNING) , TRIGGER_METHOD( "Maneuver:
How to trigger an encounter", { @@ -34,12 +34,12 @@ OverworldTrigger::OverworldTrigger() {TriggerMethod::VERTICAL_BIAS_DOWN, "vertical-down", "Move up/down. (bias down)"}, {TriggerMethod::SWEET_SCENT, "sweet-scent", "Sweet scent"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TriggerMethod::HORIZONTAL_NO_BIAS ) , MOVE_DURATION( "Move Duration:
Move in each direction for this long before turning around.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1 * TICKS_PER_SECOND" ) @@ -53,7 +53,7 @@ OverworldTrigger::OverworldTrigger() {4, "slot5", "2nd last"}, {5, "slot6", "Last"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) { diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp index 41e030ce1..1da4ace74 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp @@ -43,7 +43,7 @@ LegendaryReset::LegendaryReset() : GO_HOME_WHEN_DONE(false) , WALK_UP( "Walk Up:
Walk up while mashing A to trigger encounter.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , ENCOUNTER_BOT_OPTIONS(false) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp index 714d3763a..a622f0149 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp @@ -68,7 +68,7 @@ ShinyHuntFishing::ShinyHuntFishing() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp index 9f8b96310..f7e95da14 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp @@ -54,7 +54,7 @@ ShinyHuntOverworld::ShinyHuntOverworld() "Reset Game in Case of Error:
" "When the program encounters an error, whether to reset the game to fix it.
" "Make sure you have set \"Throw balls. Save if caught.\" in Option Overrides if you don't stop when finding a shiny.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , NOTIFICATIONS({ @@ -71,7 +71,7 @@ ShinyHuntOverworld::ShinyHuntOverworld() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp index 3464e6e26..be60d62db 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp @@ -55,7 +55,7 @@ ShinyHuntShaymin::ShinyHuntShaymin() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp index 84b600a4a..c5b7b89a2 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp @@ -57,18 +57,18 @@ StarterReset::StarterReset() , STARTER( "Starter:", STARTER_DATABASE, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "turtwig" ) , USE_SOUND_DETECTION( "Use Sound Detection:
Use sound to improve shiny detection.
" "Make sure you have correct audio input set.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , VIDEO_ON_SHINY( "Video Capture:
Take a video of the encounter if it is shiny.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_NONSHINY( diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp index 8af3858dc..476e49f09 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp @@ -34,13 +34,13 @@ ShinyEncounterTester::ShinyEncounterTester() {BattleType::STARTER, "starter", "Starter Battle"}, {BattleType::STANDARD, "standard", "Wild Encounter"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, BattleType::STANDARD ) , USE_SOUND_DETECTION( "Use Sound Detection:
Use sound to improve shiny detection.
" "Make sure you have correct audio input set.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATIONS({ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp index cd3ed2d56..57e21dc07 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp @@ -50,12 +50,12 @@ SoundListener::SoundListener() { {SoundType::SHINY, "shiny", "Shiny Sound"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, SoundType::SHINY ) , STOP_ON_DETECTED_SOUND( "Stop on the detected sound
Stop program when the sound is detected.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp index a5c7fa642..caecdab96 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp @@ -38,7 +38,7 @@ std::unique_ptr SelfBoxTrade_Descriptor::make_stats() const{ SelfBoxTrade::SelfBoxTrade() : BOXES_TO_TRADE( "Number of Boxes to Trade:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 0, 40 ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp index 03a9df58d..03278dd18 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp @@ -41,12 +41,12 @@ SelfTouchTrade::SelfTouchTrade() {HostingSwitch::Switch0, "switch0", "Switch 0 (Left)"}, {HostingSwitch::Switch1, "switch1", "Switch 1 (Right)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, HostingSwitch::Switch0 ) , BOXES_TO_TRADE( "Number of Boxes to Touch-Trade:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 0, 40 ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp b/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp index 1f1f410c9..c0d9c4410 100644 --- a/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp +++ b/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp @@ -25,8 +25,8 @@ const EnumDatabase& BallType_Database() { BoxSortingRow::BoxSortingRow() - : sort_type(BallType_Database(), LockWhileRunning::LOCKED, BoxSortingSortType::NationalDexNo) - , reverse(LockWhileRunning::LOCKED, false) + : sort_type(BallType_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, BoxSortingSortType::NationalDexNo) + , reverse(LockWhileRunning::LOCK_WHILE_RUNNING, false) { PA_ADD_OPTION(sort_type); PA_ADD_OPTION(reverse); @@ -42,7 +42,7 @@ std::unique_ptr BoxSortingRow::clone() const{ BoxSortingTable::BoxSortingTable(std::string label) : EditableTableOption_t( std::move(label), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.cpp b/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.cpp index 625033172..16febed8b 100644 --- a/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.cpp +++ b/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.cpp @@ -21,7 +21,7 @@ GameSettings& GameSettings::instance(){ return settings; } GameSettings::GameSettings() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) // : m_start_game_timings("Start Game Timings:") // // , START_GAME_MASH( // // "1. Start Game Mash:
Mash A for this long to start the game.", diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp index 031dbfffc..b44e5dcc5 100644 --- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp +++ b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp @@ -94,17 +94,17 @@ std::unique_ptr BoxSorting_Descriptor::make_stats() const{ BoxSorting::BoxSorting() : BOX_NUMBER( "Number of boxes to order:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, MAX_BOXES ) , VIDEO_DELAY( "Delay of your capture card (you probably have to increase this):", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 20 ) , GAME_DELAY( "Delay of your Pokemon Home app (default value should be fine):", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) , SORT_TABLE( @@ -113,13 +113,13 @@ BoxSorting::BoxSorting() , OUTPUT_FILE( false, "Output File:
JSON file for output of storage boxes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "box_order", "box_order" ) , DRY_RUN( "Dry Run:
Catalogue and make sort plan without executing. (Will output to OUTPUT_FILE and OUTPUT_FILE.sortplan)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , NOTIFICATIONS({ diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp index 4b752c0ff..3626d4c2e 100644 --- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp +++ b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp @@ -40,11 +40,11 @@ GenerateNameOCRData::GenerateNameOCRData() : LANGUAGE( "Game Language:", PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) , DELAY( "Delay Between Each Iteration:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30" ) diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp index 833fbc6f8..09e1600ee 100644 --- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp +++ b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp @@ -33,7 +33,7 @@ PageSwap_Descriptor::PageSwap_Descriptor() PageSwap::PageSwap() : DODGE_SYSTEM_UPDATE_WINDOW( "Dodge System Update Window:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.h b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.h index 27c9c759f..6ac7ad3ed 100644 --- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.h +++ b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.h @@ -52,7 +52,7 @@ class MountDetectorLoggingOption : public EnumDropdownOption& MoveStyle_Database(){ BattlePokemonActionRow::BattlePokemonActionRow() - : switch_pokemon(LockWhileRunning::LOCKED, false) - , num_turns_to_switch(LockWhileRunning::LOCKED, 1) - , stop_after_num_moves(LockWhileRunning::LOCKED, false) - , num_moves_to_stop(LockWhileRunning::LOCKED, 25, 0) + : switch_pokemon(LockWhileRunning::LOCK_WHILE_RUNNING, false) + , num_turns_to_switch(LockWhileRunning::LOCK_WHILE_RUNNING, 1) + , stop_after_num_moves(LockWhileRunning::LOCK_WHILE_RUNNING, false) + , num_moves_to_stop(LockWhileRunning::LOCK_WHILE_RUNNING, 25, 0) { PA_ADD_OPTION(style[0]); PA_ADD_OPTION(style[1]); @@ -79,7 +79,7 @@ BattlePokemonActionTable::BattlePokemonActionTable() "Note: if your second last " + STRING_POKEMON + " faints, the game will send your last " + STRING_POKEMON + " automatically for you.
" "The program cannot detect this switch as there is no switch selection screen. " "Therefore the program will treat it as the same " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} @@ -153,7 +153,7 @@ OneMoveBattlePokemonActionTable::OneMoveBattlePokemonActionTable() "Set what move style to use for each " + STRING_POKEMON + " to grind against a Magikarp. " "Each row is the action for one " + STRING_POKEMON + ". " "The table follows the order that " + STRING_POKEMON + " are sent to battle.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} @@ -199,9 +199,9 @@ const IntegerEnumDatabase& MoveIndex_Database(){ MoveGrinderActionRow::MoveGrinderActionRow() - : pokemon_index(PokemonIndex_Database(), LockWhileRunning::LOCKED, 0) - , move_index(MoveIndex_Database(), LockWhileRunning::LOCKED, 0) - , attempts(LockWhileRunning::LOCKED, 1, 1) + : pokemon_index(PokemonIndex_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, 0) + , move_index(MoveIndex_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, 0) + , attempts(LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1) { PA_ADD_OPTION(pokemon_index); PA_ADD_OPTION(move_index); @@ -220,7 +220,7 @@ std::unique_ptr MoveGrinderActionRow::clone() const{ MoveGrinderActionTable::MoveGrinderActionTable() : EditableTableOption_t( "For every move you want to perform, input the style and the number of attemps you want to achieve.", - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) {} Move MoveGrinderActionTable::get_move(size_t pokemon, size_t move) const{ diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h index 042739005..12c713d2b 100644 --- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h +++ b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h @@ -33,7 +33,7 @@ class MoveStyleCell : public EnumDropdownCell{ MoveStyleCell() : EnumDropdownCell( MoveStyle_Database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, MoveStyle::NoStyle ) {} diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp index 42f667886..6af8458d7 100644 --- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp +++ b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp @@ -86,16 +86,16 @@ void CustomPathCell::operator=(const CustomPathCell& x){ wait_ticks.set(x.wait_ticks); } CustomPathCell::CustomPathCell(EnumDropdownCell& action) - : BatchOption(LockWhileRunning::LOCKED, true) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING, true) , m_action(action) , text("", false) - , mount(PathMount_Database(), LockWhileRunning::LOCKED, PathMount::NO_MOUNT) - , move_forward_ticks("Ticks to Move:", LockWhileRunning::LOCKED, 0) - , move_speed(PathSpeed_Database(), LockWhileRunning::LOCKED,PathSpeed::NORMAL_SPEED) - , left_x("x: [left: -1.0, right: 1.0]", LockWhileRunning::LOCKED, 0, -1.0, 1.0) - , left_y("y: [backward: -1.0, forward: 1.0]", LockWhileRunning::LOCKED, 0, -1.0, 1.0) - , jump_wait_ticks("Ticks after jump:", LockWhileRunning::LOCKED, 0) - , wait_ticks("Ticks:", LockWhileRunning::LOCKED, 0) + , mount(PathMount_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, PathMount::NO_MOUNT) + , move_forward_ticks("Ticks to Move:", LockWhileRunning::LOCK_WHILE_RUNNING, 0) + , move_speed(PathSpeed_Database(), LockWhileRunning::LOCK_WHILE_RUNNING,PathSpeed::NORMAL_SPEED) + , left_x("x: [left: -1.0, right: 1.0]", LockWhileRunning::LOCK_WHILE_RUNNING, 0, -1.0, 1.0) + , left_y("y: [backward: -1.0, forward: 1.0]", LockWhileRunning::LOCK_WHILE_RUNNING, 0, -1.0, 1.0) + , jump_wait_ticks("Ticks after jump:", LockWhileRunning::LOCK_WHILE_RUNNING, 0) + , wait_ticks("Ticks:", LockWhileRunning::LOCK_WHILE_RUNNING, 0) { PA_ADD_STATIC(text); PA_ADD_OPTION(mount); @@ -160,7 +160,7 @@ void CustomPathCell::value_changed(){ CustomPathTableRow2::CustomPathTableRow2() - : action(PathAction_Database(), LockWhileRunning::LOCKED, PathAction::NO_ACTION) + : action(PathAction_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, PathAction::NO_ACTION) , parameters(action) { PA_ADD_OPTION(action); @@ -269,7 +269,7 @@ CustomPathTable2::CustomPathTable2() "Custom Path Table:
" "Set a sequence of actions to navigate the map. By default, the shiny detected behavior is \"Enroute Shiny Action\".
" "If you wish to ignore enroute shinies, make sure you set \"Enroute Shiny Action\" to ignore shinies.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false, // Disable the save/load buttons since we have our own. make_defaults() ) @@ -320,7 +320,7 @@ std::vector> CustomPathTable2::make_defaults() CustomPathTable::CustomPathTable() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) // : PATH( // "Custom Path Table:
" // "Set a sequence of actions to navigate the map. By default, the shiny detected behavior is \"Enroute Shiny Action\".
" diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp index 2c5e8ae49..f888bc293 100644 --- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp +++ b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp @@ -72,7 +72,7 @@ IngoOpponentOption::IngoOpponentOption() {IngoOpponents::Ress, "ress", "Ress"}, {IngoOpponents::Ingo_Alphas, "ingo-alphas", "Ingo - but using alphas"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, IngoOpponents::Wenton ) {} diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_MiscOptions.h b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_MiscOptions.h index 44a7c3a80..faeda9721 100644 --- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_MiscOptions.h +++ b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_MiscOptions.h @@ -29,7 +29,7 @@ class ResetMethodOption : public EnumDropdownOption{ {ResetMethod::SoftReset, "reset", "Soft Reset"}, {ResetMethod::GoBackToVillage, "return-to-village", "Go back to village"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, ResetMethod::SoftReset ) {} @@ -57,7 +57,7 @@ class StopOnOption : public EnumDropdownOption{ {StopOn::ShinyOrAlpha, "shiny-or-alpha", "Shiny or Alpha"}, {StopOn::ShinyAndAlpha, "shiny-and-alpha", "Shiny and Alpha"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, StopOn::ShinyOrAlpha ) {} @@ -79,7 +79,7 @@ class ExitBattleMethodOption : public EnumDropdownOption{ {ExitBattleMethod::RunAway, "run", "Run Away"}, {ExitBattleMethod::MashAToKill, "mash-a-to-kill", "Mash A to Kill"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, ExitBattleMethod::RunAway ) {} @@ -98,7 +98,7 @@ class TimeOfDayOption : public EnumDropdownOption{ {TimeOfDay::EVENING, TIME_OF_DAY_NAMES[int(TimeOfDay::EVENING)], "Evening"}, {TimeOfDay::MIDNIGHT, TIME_OF_DAY_NAMES[int(TimeOfDay::MIDNIGHT)], "Midnight"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TimeOfDay::NONE ) {} diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp index 21cc9093e..765f54a13 100644 --- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp +++ b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp @@ -38,7 +38,7 @@ ShinyDetectedActionOption::ShinyDetectedActionOption( std::string default_delay_ticks, ShinyDetectedAction default_action ) - : GroupOption(std::move(label), LockWhileRunning::LOCKED) + : GroupOption(std::move(label), LockWhileRunning::LOCK_WHILE_RUNNING) , DESCRIPTION(std::move(description)) , ACTION( "Shiny Detected Action:", @@ -47,7 +47,7 @@ ShinyDetectedActionOption::ShinyDetectedActionOption( {ShinyDetectedAction::STOP_PROGRAM, "stop", "Stop program. Align camera for a screenshot. Then go Home."}, {ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM, "video+stop", "Stop program. Align camera for a screenshot + video. Then go Home."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_action ) // , STOP_PROGRAM("Stop Program:
Stop program and go Home if it hears a shiny.", true) @@ -56,7 +56,7 @@ ShinyDetectedActionOption::ShinyDetectedActionOption( "Screenshot Delay:
" "Align the camera, then wait this long before taking a screenshot + video of the shiny.
" "Set to zero to skip this. Don't set this too large or the shiny may run away!", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, std::move(default_delay_ticks) ) diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp index ebd5cad8b..9befaa9e5 100644 --- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp +++ b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp @@ -48,9 +48,9 @@ uint8_t research_catch_count(const std::string& slug){ TradeCountTableRow::TradeCountTableRow(const std::string& slug, const ImageViewRGB32& icon) : StaticTableRow(slug) , default_value(research_catch_count(slug)) - , pokemon(LockWhileRunning::LOCKED, Pokemon::get_pokemon_name(slug).display_name(), icon, 40) - , count(LockWhileRunning::LOCKED, default_value, 0, default_value) - , default_label(LockWhileRunning::LOCKED, std::to_string(default_value), ImageViewRGB32()) + , pokemon(LockWhileRunning::LOCK_WHILE_RUNNING, Pokemon::get_pokemon_name(slug).display_name(), icon, 40) + , count(LockWhileRunning::LOCK_WHILE_RUNNING, default_value, 0, default_value) + , default_label(LockWhileRunning::LOCK_WHILE_RUNNING, std::to_string(default_value), ImageViewRGB32()) { PA_ADD_STATIC(pokemon); add_option(count, "Count"); @@ -64,7 +64,7 @@ TradeCountTable::TradeCountTable() "The defaults here are the # of catches needed to max out research. " "Maxing out catches is sufficient to reach level 10 for everything except Unown, Spritomb, and legendaries. " "Note that gen1 trade evolutions cannot be touch traded. The program will skip them. This applies to Kadabra, Haunter, Graveler, and Machoke.", - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) { for (const std::string& slug : HISUI_DEX_SLUGS()){ diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp index bff49aa3f..9d013bacb 100644 --- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp +++ b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp @@ -16,7 +16,7 @@ TravelLocationOption::TravelLocationOption() : IntegerEnumDropdownOption( "Start Location:
Travel from this location.", TravelLocations::instance().database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) {} diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.cpp b/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.cpp index 261bfab67..107acf72c 100644 --- a/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.cpp +++ b/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.cpp @@ -21,11 +21,11 @@ GameSettings& GameSettings::instance(){ return settings; } GameSettings::GameSettings() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , m_general("General Settings:") , POST_WARP_DELAY( "Post-Warp Delay:
After warping, wait this many seconds before continuing.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1.0, 0, 100 ) , m_menu_navigation("Menu Navigation Timings:") @@ -39,38 +39,38 @@ GameSettings::GameSettings() // ) , GAME_TO_HOME_DELAY( "Game to Home Delay:
Delay from pressing home to entering the the Switch home menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "125" ) , LOAD_REGION_TIMEOUT( "Load Region Timeout:
Wait at most this long to enter a region before giving up.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30 * TICKS_PER_SECOND" ) , m_start_game_timings("Start Game Timings:") , START_GAME_MASH( "1. Start Game Mash:
Mash A for this long to start the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) , START_GAME_WAIT0( "2. Start Game Wait:
Wait this long for the game to load.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "40 * TICKS_PER_SECOND" ) , ENTER_GAME_MASH( "3. Enter Game Mash:
Mash A for this long to enter the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , ENTER_GAME_WAIT( "4. Enter Game Wait:
Wait this long for the game to enter the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "15 * TICKS_PER_SECOND" ) @@ -79,32 +79,32 @@ GameSettings::GameSettings() ) , SHINY_SOUND_THRESHOLD( "Shiny Sound Threshold:
Maximum error coefficient to trigger a shiny detection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.87, 0, 1.0 ) , SHINY_SOUND_LOW_FREQUENCY( "Shiny Sound Low Frequency (Hz):
High pass filter frequency for shiny sound.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 5000, 0, 48000 ) , ALPHA_ROAR_THRESHOLD( "Alpha Roar Threshold:
Maximum error coefficient to trigger an alpha roar detection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.65, 0, 1.0 ) , ALPHA_MUSIC_THRESHOLD( "Alpha Music Threshold:
Maximum error coefficient to trigger an alpha music detection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.81, 0, 1.0 ) , ITEM_DROP_SOUND_THRESHOLD( "Item Drop Sound Threshold:
Maximum error coefficient to trigger an item drop sound detection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.9, 0, 1.0 ) , ITEM_DROP_SOUND_LOW_FREQUENCY( "Item Drop Sound Low Frequency (Hz):
High pass filter frequency for item drop sound.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 5000, 0, 48000 ) { diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp index ef47037d6..dd1d0fafb 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp @@ -77,7 +77,7 @@ LeapGrinder::LeapGrinder() : LANGUAGE( "Game Language", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , POKEMON_DATABASE(make_name_database({ @@ -100,12 +100,12 @@ LeapGrinder::LeapGrinder() , POKEMON( "Pokemon Species", POKEMON_DATABASE, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "cherubi" ) , LEAPS( "Leaps
How many leaps before stopping the program
", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, 100 ) , SHINY_DETECTED_ENROUTE( diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp index 081dd9761..7ecd10346 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp @@ -65,7 +65,7 @@ MagikarpMoveGrinder::MagikarpMoveGrinder() "Special Case, Mimic:
Grind Mimic move usages by switching between first two " + STRING_POKEMON + ". Set the first move as Mimic on the first two " + STRING_POKEMON + ".
" "After switching, the retreated " + STRING_POKEMON + " will forget the move learned by Mimic, allowing efficient Mimic grinding.
" "Choosing this will ignore the content in " + STRING_POKEMON + " Action Table.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp index b2248e724..670db38ad 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp @@ -72,12 +72,12 @@ TenacityCandyFarmer::TenacityCandyFarmer() {FourthMoveOn::Mamoswine, "mamoswine", "Mamoswine (fourth move needs to be set to Flamethrower)"}, {FourthMoveOn::Avalugg, "avalugg", "Avalugg (fourth move needs to be set to Rock Smash)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, FourthMoveOn::None ) , SAVE_EVERY_FEW_BATTLES( "Save every few battles:
After every this number of battles, save the game. Enter zero to never save the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp index b5538271a..5976e7bdb 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp @@ -49,7 +49,7 @@ ApplyGrits::ApplyGrits() {5, "5", "5"}, {6, "6", "6"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1 ) , NOTIFICATIONS({ diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp index 87835f3f6..7f254cb5c 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp @@ -30,7 +30,7 @@ ClothingBuyer_Descriptor::ClothingBuyer_Descriptor() ClothingBuyer::ClothingBuyer() : CATEGORY_ROTATION( "Rotate Categories:
This slows down the program, but ensures it will cover all categories.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) { diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp index c2116bffb..b79798e10 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp @@ -61,7 +61,7 @@ DistortionWaiter::DistortionWaiter() : LANGUAGE( "Game Language:", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_DISTORTION( diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp index c65b5be0f..0af8da600 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp @@ -183,7 +183,7 @@ OutbreakFinder::OutbreakFinder() , LANGUAGE( "Game Language:", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , DESIRED_MO_SLUGS( @@ -200,7 +200,7 @@ OutbreakFinder::OutbreakFinder() ) , DEBUG_MODE( "Debug Mode:
Save MMO Sprite to debug folder.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp index 40fe46a5b..5389c2745 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp @@ -79,7 +79,7 @@ RamanasCombeeFinder:: RamanasCombeeFinder() : LANGUAGE( "Game Language", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , SHINY_DETECTED_ENROUTE( @@ -97,7 +97,7 @@ RamanasCombeeFinder:: RamanasCombeeFinder() }) , SAVE_DEBUG_VIDEO( "Save debug videos to Switch:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp index 1d9f637cc..5485df376 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp @@ -211,7 +211,7 @@ AutoMultiSpawn::AutoMultiSpawn() : LANGUAGE( "Game Language", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , SPAWN( @@ -219,13 +219,13 @@ AutoMultiSpawn::AutoMultiSpawn() { {MultiSpawn::MirelandsHippopotas, "mirelands-hippopotas", "Mirelands - Hippopotas"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, MultiSpawn::MirelandsHippopotas ) , PATH( false, "Multi-Spawn Path:
e.g. \"A1|A1|A2|A2|A1|A1|A1|A2\".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "" ) , NOTIFICATIONS({ diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp index 5ca185671..983070746 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp @@ -88,7 +88,7 @@ BurmyFinder::BurmyFinder() : LANGUAGE( "Game Language", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , SHINY_DETECTED_ENROUTE( @@ -111,7 +111,7 @@ BurmyFinder::BurmyFinder() }) , SAVE_DEBUG_VIDEO( "Save debug videos to Switch:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp index 09d9b89bf..5ae921a8d 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp @@ -66,7 +66,7 @@ FroslassFinder::FroslassFinder() : DASH_DURATION( "Braviary dash duration:
" "How many ticks for Braviary to dash to reach the hole.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "986" ) diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp index d96e72b5e..045668d22 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp @@ -61,19 +61,19 @@ std::unique_ptr PostMMOSpawnReset_Descriptor::make_stats() const{ PostMMOSpawnReset::PostMMOSpawnReset() : TURN_DURATION( "Camera Turn:
How many ticks to turn the camera.
Positive values for right turns. Negative values for left turns.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "0" ) , FORWARD_DURATION( "Move Forward:
After turning the camera, how many ticks to move forward.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "0" ) , WAIT_DURATION( "Wait Time:
Wait time after movement.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp index c72fd5140..cea7cb532 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp @@ -71,12 +71,12 @@ ShinyHuntCustomPath::ShinyHuntCustomPath() ) , RUNS_PER_TIME_RESET( "How Many Runs Before Resetting Time of Day:
To avoid too much time spent on resetting time of day, reset only every several runs.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 5, 1 ) , TEST_PATH( "Test Path:
Run the path immediately on the map to test it.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , SHINY_DETECTED_ENROUTE( diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp index 999b0bd63..d4aa73ad4 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp @@ -67,7 +67,7 @@ ShinyHuntFlagPin::ShinyHuntFlagPin() "If you wish to ignore enroute shinies, scroll down to " "\"Enroute Shiny Action\" and set it to ignore shinies. " "Keep in mind that the shiny sound radius is 30 and you will need some headroom.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 60 ) , SHINY_DETECTED_ENROUTE( @@ -96,18 +96,18 @@ ShinyHuntFlagPin::ShinyHuntFlagPin() "Stop Distance:
" "Reset the game when you come within this distance of the flag. " "Don't set this too small. The navigation is not precise enough to land directly on the flag.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 20 ) , FLAG_REACHED_DELAY( "Target Reached Delay:
" "Once you have reached the flag, wait this many seconds to ensure everything loads and that any shinies are heard before resetting.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1.0, 0, 60 ) , NAVIGATION_TIMEOUT( "Navigation Timeout:
Give up and reset if flag is not reached after this many seconds.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 180, 0 ) { diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp index ba175aee8..c6039ec17 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp @@ -47,7 +47,7 @@ std::unique_ptr ShinyHuntLakeTrio_Descriptor::make_stats() const{ ShinyHuntLakeTrio::ShinyHuntLakeTrio() : VIDEO_ON_SHINY( "Video Capture:
Take a video of the encounter if it is shiny.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_NONSHINY( diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp index 6e8d1e242..0de4cef2c 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp @@ -33,18 +33,18 @@ FlagNavigationTest::FlagNavigationTest() "Stop Distance:
" "You have reached the flag when you come within this distance of it. " "Don't set this too small. The navigation is not precise enough to land directly on the flag.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 20 ) , FLAG_REACHED_DELAY( "Target Reached Delay:
" "Once you have reached the flag, wait this many seconds to ensure everything loads and that any shinies are heard before resetting.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1.0, 0, 60 ) , NAVIGATION_TIMEOUT( "Navigation Timeout:
Give up if flag is not reached after this many seconds.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 180, 0 ) { diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp index 6e4c925f6..fadfef051 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp @@ -55,12 +55,12 @@ SoundListener::SoundListener() {SoundType::AlphaMusic, "alpha-music", "Alpha Music"}, {SoundType::ItemDrop, "item-drop", "Item Drop Sound"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, SoundType::Shiny ) , STOP_ON_DETECTED_SOUND( "Stop on the detected sound
Stop program when the sound is detected.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp index c4e94fabc..32b9b3176 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp @@ -44,18 +44,18 @@ SelfBoxTrade::SelfBoxTrade() : LANGUAGE_LEFT( "Game Language of Left Switch:", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , LANGUAGE_RIGHT( "Game Language of Right Switch:", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , BOXES_TO_TRADE( "Number of Boxes to Trade:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 0, 32 ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp index 443666bfd..79caccade 100644 --- a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp +++ b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp @@ -46,7 +46,7 @@ SelfTouchTrade::SelfTouchTrade() : LANGUAGE( "Game Language of the Hosting Switch:", Pokemon::PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , HOSTING_SWITCH( @@ -55,12 +55,12 @@ SelfTouchTrade::SelfTouchTrade() {HostingSwitch::Switch0, "switch0", "Switch 0 (Left)"}, {HostingSwitch::Switch1, "switch1", "Switch 1 (Right)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, HostingSwitch::Switch0 ) , BOXES_TO_TRADE( "Number of Boxes to Touch-Trade:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 0, 32 ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp index affa23435..2aa6d1760 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp @@ -41,7 +41,7 @@ AuctionItemSelectCell::AuctionItemSelectCell( ) : StringSelectCell( AUCTION_ITEM_SELECT_DATABASE(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp index e96849c98..0d1814fff 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp @@ -29,7 +29,7 @@ std::unique_ptr AuctionItemSelectorRow::clone() const{ AuctionItemTable::AuctionItemTable(std::string label) : EditableTableOption_t( std::move(label), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp index 031eee09c..05fb49c6a 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp @@ -40,7 +40,7 @@ BattleMoveTable::BattleMoveTable() "Move Table:
" "Run this sequence of moves for your lead Pokemon only. " "If your lead faints or the end of the table is reached, the program will switch to throwing the selected ball. ", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp index 76cfa1295..494b36158 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp @@ -48,7 +48,7 @@ SandwichIngredientsTableCell::SandwichIngredientsTableCell( ) : StringSelectCell( SANDWICH_INGREDIENT_DATABASE(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp index aa9f6289f..9688f6e08 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp @@ -27,7 +27,7 @@ std::unique_ptr SandwichIngredientsTableRow::clone() const { SandwichIngredientsTable::SandwichIngredientsTable(std::string label) : EditableTableOption_t( std::move(label), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp index ce0bfc2df..0a8213c6c 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp @@ -293,14 +293,14 @@ SandwichMakerOption::~SandwichMakerOption() { SandwichMakerOption::SandwichMakerOption(OCR::LanguageOCROption* language_option) : GroupOption( "Sandwich Maker", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false, true ) , m_language_owner(language_option == nullptr ? new OCR::LanguageOCROption( "Game Language:
Required to read ingredients.", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) : nullptr @@ -316,7 +316,7 @@ SandwichMakerOption::SandwichMakerOption(OCR::LanguageOCROption* language_option {BaseRecipe::paradox, "paradox", "Title + Encounter + Humungo/Teensy: Paradox-specific"}, {BaseRecipe::custom, "custom", "Custom Sandwich"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, BaseRecipe::shiny ) , TYPE( @@ -341,7 +341,7 @@ SandwichMakerOption::SandwichMakerOption(OCR::LanguageOCROption* language_option {PokemonType::steel, "steel", "Steel"}, {PokemonType::fairy, "fairy", "Fairy"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, PokemonType::normal ) , PARADOX( @@ -395,7 +395,7 @@ SandwichMakerOption::SandwichMakerOption(OCR::LanguageOCROption* language_option {ParadoxRecipe::teensy2_ironvaliant_1, "teensy2_ironvaliant_1", "Iron Valiant - Teensy #1"}, {ParadoxRecipe::teensy2_ironvaliant_2, "teensy2_ironvaliant_2", "Iron Vailant - Teensy #2"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, ParadoxRecipe::humungo3_greattusk_1 ) , HERBA_ONE( @@ -407,7 +407,7 @@ SandwichMakerOption::SandwichMakerOption(OCR::LanguageOCROption* language_option {HerbaSelection::bitter_herba_mystica, "bitter-herba-mystica", "Bitter Herba Mystica"}, {HerbaSelection::spicy_herba_mystica, "spicy-herba-mystica", "Spicy Herba Mystica"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, HerbaSelection::salty_herba_mystica ) , HERBA_TWO( @@ -419,7 +419,7 @@ SandwichMakerOption::SandwichMakerOption(OCR::LanguageOCROption* language_option {HerbaSelection::bitter_herba_mystica, "bitter-herba-mystica", "Bitter Herba Mystica"}, {HerbaSelection::spicy_herba_mystica, "spicy-herba-mystica", "Spicy Herba Mystica"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, HerbaSelection::salty_herba_mystica ) , HERB_INCOMPATIBILITY_WARNING("") diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp index 91e0328f0..104219d43 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp @@ -41,7 +41,7 @@ TournamentPrizeSelectCell::TournamentPrizeSelectCell( ) : StringSelectCell( TOURNAMENT_PRIZE_SELECT_DATABASE(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp index a8fac612e..35ae072a9 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp @@ -25,7 +25,7 @@ std::unique_ptr TournamentPrizeSelectorRow::clone() const{ TournamentPrizeTable::TournamentPrizeTable(std::string label) : EditableTableOption_t( std::move(label), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.cpp b/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.cpp index fee94fe2a..2fc02c1c7 100644 --- a/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.cpp +++ b/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.cpp @@ -22,36 +22,36 @@ GameSettings& GameSettings::instance(){ return settings; } GameSettings::GameSettings() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , m_menu_navigation("Menu Navigation Timings:") , GAME_TO_HOME_DELAY( "Game to Home Delay:
Delay from pressing home to entering the the Switch home menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "125" ) , m_start_game_timings("Start Game Timings:") , START_GAME_MASH( "1. Start Game Mash:
Mash A for this long to start the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) , START_GAME_WAIT( "2. Start Game Wait:
Wait this long for the game to load.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "60 * TICKS_PER_SECOND" ) , ENTER_GAME_MASH( "3. Enter Game Mash:
Mash A for this long to enter the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , ENTER_GAME_WAIT( "4. Enter Game Wait:
Wait this long for the game to enter the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "60 * TICKS_PER_SECOND" ) @@ -66,22 +66,22 @@ GameSettings::GameSettings() ) , SHINY_SOUND_THRESHOLD2( "Shiny Sound Threshold:
Maximum error coefficient to trigger a shiny detection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.96, 0, 1.0 ) , SHINY_SOUND_LOW_FREQUENCY( "Shiny Sound Low Frequency (Hz):
High pass filter frequency for shiny sound.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1000, 0, 48000 ) , LETS_GO_KILL_SOUND_THRESHOLD( "Let's Go Kill Sound Threshold:
Maximum error coefficient to trigger a Let's Go Kill detection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.93, 0, 1.0 ) , LETS_GO_KILL_SOUND_LOW_FREQUENCY( "Let's Go Kill Sound Low Frequency (Hz):
High pass filter frequency for Let's Go Kill sound.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1000, 0, 48000 ) { diff --git a/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp b/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp index 6b41a66b8..6fec152f7 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp @@ -79,7 +79,7 @@ MassAttachItems::MassAttachItems() {ItemCategory::TMs, "tms", "TMs"}, {ItemCategory::Treasures, "treasures", "Treasures"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, ItemCategory::PokeBalls ) , BOXES( diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp index fe8545c17..07e4ab203 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp @@ -86,7 +86,7 @@ EggAutonomous::EggAutonomous() , LANGUAGE( "Game Language:
Required to read IVs.", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , MAX_KEEPERS( @@ -107,7 +107,7 @@ EggAutonomous::EggAutonomous() {AutoSave::EveryBatch, "every-batch", "Save before every batch of 4 or 5 eggs."}, {AutoSave::AfterFetchComplete, "after-fetch", "Save after all eggs have been fetched from picnic."} }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, AutoSave::AfterStartAndKeep ) , HAS_CLONE_RIDE_POKEMON( @@ -116,7 +116,7 @@ EggAutonomous::EggAutonomous() "place it as second in party before starting the program." "The program will skip the first row of the current box when storing and hatching eggs, so you will need " "to fill the first row with " + STRING_POKEMON + " before running this program.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false) , KEEP_BOX_LOCATION( "Location of the Keep Box:
Which box to keep the shiny " + STRING_POKEMON + " and others that match the filters.", @@ -139,7 +139,7 @@ EggAutonomous::EggAutonomous() , SAVE_DEBUG_VIDEO( "Save debug videos to Switch:
" "Set this on to save a Switch video everytime an error occurs. You can send the video to developers to help them debug later.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp index 4a31abe37..b41f3ce94 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp @@ -61,12 +61,12 @@ EggFetcher::EggFetcher() , LANGUAGE( "Game Language:
Required to read IVs.", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , EGGS_TO_FETCH( "Fetch this many eggs:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 900 ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp index c4a4f6df0..1972e4f0a 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp @@ -64,7 +64,7 @@ EggHatcher::EggHatcher() {StartLocation::AnywhereOnRide, "anywhere-on-ride", "Anywhere safe, on ride."}, {StartLocation::AnywhereOffRide, "anywhere-off-ride", "Anywhere safe, on foot."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, StartLocation::ZeroGateFlyingSpot ) , BOXES( @@ -77,7 +77,7 @@ EggHatcher::EggHatcher() "Ride legendary cannot be cloned after patch 1.0.1. To preserve the existing clone while hatching eggs, " "place it as second in party before starting the program." "The program will skip the first row of eggs in the box as a result.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) , NOTIFICATIONS({ diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp index 8ed57c106..20c68a31c 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp @@ -79,7 +79,7 @@ AuctionFarmer::AuctionFarmer() : LANGUAGE( "Game Language:
The language is needed to read which items are offered.", AuctionItemNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , TARGET_ITEMS("Items:
Multiple Items can be selected. The program will bid on any selected item which is offered.") @@ -93,7 +93,7 @@ AuctionFarmer::AuctionFarmer() &NOTIFICATION_ERROR_FATAL, }) , m_advanced_options("Advanced Options: (developer only)") - , ONE_NPC("One NPC:
Check only the NPC you're standing in front of. (Multiple NPCs in development)", LockWhileRunning::LOCKED, true) + , ONE_NPC("One NPC:
Check only the NPC you're standing in front of. (Multiple NPCs in development)", LockWhileRunning::LOCK_WHILE_RUNNING, true) { PA_ADD_OPTION(LANGUAGE); PA_ADD_OPTION(TARGET_ITEMS); diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.cpp index 3cb742544..73a57ad81 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.cpp @@ -66,7 +66,7 @@ std::unique_ptr GimmighoulChestFarmer_Descriptor::make_stats() con GimmighoulChestFarmer::GimmighoulChestFarmer() : PP( "First Attack PP:
The amount of PP remaining on your lead's first attack.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 15 ) , START_LOCATION( @@ -75,7 +75,7 @@ GimmighoulChestFarmer::GimmighoulChestFarmer() {StartLocation::FlyPoint, "fly-point", "Fly Point - East Province (Area One) Watchtower"}, {StartLocation::InFrontOfChest, "in-front-of-chest", "In front of chest"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, StartLocation::FlyPoint ) , GO_HOME_WHEN_DONE(false) diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp index 9acd85a08..59421754d 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp @@ -120,14 +120,14 @@ TournamentFarmer::TournamentFarmer() ) , HHH_ZOROARK( "Happy Hour H-Zoroark:
Check this if you have an event Hisuian Zoroark with Happy Hour and Memento as your lead.
Happy Hour must be in its first move slot and Memento must be in its second.
", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , GO_HOME_WHEN_DONE(false) , LANGUAGE( "Game Language:
The language is needed to read the prizes.", TournamentPrizeNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , TARGET_ITEMS("Items:") diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp index ff388472f..69a660a4a 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp @@ -35,7 +35,7 @@ ClipboardFastCodeEntry_Descriptor::ClipboardFastCodeEntry_Descriptor() {} ClipboardFastCodeEntry::ClipboardFastCodeEntry() - : SETTINGS(LockWhileRunning::LOCKED) + : SETTINGS(LockWhileRunning::LOCK_WHILE_RUNNING) { PA_ADD_OPTION(SETTINGS); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp index e18aa5473..da28e2e4f 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp @@ -46,7 +46,7 @@ FastCodeEntry::FastCodeEntry() {Mode::ENTER_ON_PASTE, "on-paste", "Start the program first. Code is entered when you paste into the code box."}, {Mode::MYSTERY_GIFT, "mystery", "Enter Mystery Gift Code when clicking Start Program."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Mode::NORMAL ) , CODE( @@ -56,7 +56,7 @@ FastCodeEntry::FastCodeEntry() "0123", "0123", true ) - , SETTINGS(LockWhileRunning::LOCKED) + , SETTINGS(LockWhileRunning::LOCK_WHILE_RUNNING) { PA_ADD_OPTION(MODE); PA_ADD_OPTION(CODE); diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp index a21361225..3d59ccfa8 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp @@ -140,16 +140,16 @@ VideoFastCodeEntry::VideoFastCodeEntry() {Mode::MANUAL, "manual", "Manual - Enter code when you start the program."}, {Mode::AUTOMATIC, "auto", "Automatic - Monitor the region. Automatically enter code when it appears."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Mode::MANUAL ) , SKIP_CONNECT_TO_CONTROLLER( "Skip Connect to Controller:
" "If you know your controllers are already connected, you can skip this to save 64 milliseconds. (only applies to manual mode)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) - , FCE_SETTINGS(LockWhileRunning::LOCKED) + , FCE_SETTINGS(LockWhileRunning::LOCK_WHILE_RUNNING) , NOTIFICATIONS({ &NOTIFICATION_PROGRAM_FINISH, }) diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp index eea86fcaa..36ea4dbf7 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp @@ -46,7 +46,7 @@ ClothingBuyer::ClothingBuyer() ) , NUM_CATEGORY( "Number of Categories:
The number of categories of clothing the shop has.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, 5 ) , GO_HOME_WHEN_DONE(false) diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp index 84e01e9d7..1588dcee3 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp @@ -55,12 +55,12 @@ std::unique_ptr MassPurchase_Descriptor::make_stats() const { MassPurchase::MassPurchase() : ITEMS( "Items to Buy:
The amount of Items to buy from the postion of the cursor.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 50 ) , QUANTITY( "Quantity to Buy:
The amount of each item to buy. If a clothing store, set to 1.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, 999 ) , GO_HOME_WHEN_DONE(false) diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp index 48190a746..15bcf4d45 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp @@ -64,7 +64,7 @@ SizeChecker::SizeChecker() : GO_HOME_WHEN_DONE(false) , BOXES_TO_CHECK( "Number of Boxes to Check:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 1, 32 ) , NOTIFICATIONS({ diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp index 17c25ee91..4b203e295 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp @@ -77,13 +77,13 @@ StatsReset::StatsReset() {Target::LoyalThree, "loyal-three", "Loyal Three"}, {Target::Generic, "generic", "Gimmighoul"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Target::TreasuresOfRuin ) , LANGUAGE( "Game Language:
This field is required so we can read IVs.", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , BALL_SELECT( @@ -93,7 +93,7 @@ StatsReset::StatsReset() ) , QUICKBALL( "Throw Quick Ball:
Use a Quick Ball on the first turn. If there are moves in the Move Table, they will run after the Quick Ball is thrown.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , FILTERS( diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsResetBloodmoon.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsResetBloodmoon.cpp index f4b3552c3..0ab9ab635 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsResetBloodmoon.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsResetBloodmoon.cpp @@ -67,7 +67,7 @@ StatsResetBloodmoon::StatsResetBloodmoon() : LANGUAGE( "Game Language:
This field is required so we can read IVs.", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , BALL_SELECT( @@ -138,7 +138,7 @@ StatsResetBloodmoon::StatsResetBloodmoon() PA_ADD_OPTION(BALL_SELECT); PA_ADD_OPTION(TRY_TO_TERASTILLIZE); PA_ADD_OPTION(FILTERS); -// PA_ADD_OPTION(FILTERS0); + PA_ADD_OPTION(FILTERS0); PA_ADD_OPTION(GO_HOME_WHEN_DONE); PA_ADD_OPTION(NOTIFICATIONS); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp b/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp index 66549c2e1..866603272 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp @@ -102,7 +102,7 @@ RideCloner101::RideCloner101() {Mode::CLONE_ONLY, "clone-only", "Clone only. Don't stop on a shiny raid."}, {Mode::SHINY_HUNT, "shiny-hunt", "Shiny Hunt: Save before each raid and catch. Stop if shiny."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Mode::SHINY_HUNT ) , RIDES_TO_CLONE( diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp index 6a64a0028..be4d2d678 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp @@ -89,7 +89,7 @@ ShinyHuntAreaZeroPlatform::ShinyHuntAreaZeroPlatform() : LANGUAGE( "Game Language:
Required to read " + STRING_POKEMON + " names.", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , MODE( @@ -102,7 +102,7 @@ ShinyHuntAreaZeroPlatform::ShinyHuntAreaZeroPlatform() {Mode::START_IN_ZERO_GATE, "zerogate", "Start inside Zero Gate."}, {Mode::MAKE_SANDWICH, "sandwich", "Make a sandwich."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Mode::START_ON_PLATFORM ) , PATH0( diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp index 165a0a4d5..587d16ff8 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp @@ -97,13 +97,13 @@ ShinyHuntScatterbug::ShinyHuntScatterbug() , SAVE_DEBUG_VIDEO( "Save debug videos to Switch:
" "Set this on to save a Switch video everytime an error occurs. You can send the video to developers to help them debug later.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , DEBUG_WARP_TO_POKECENTER( "Whether to change the program to just warping to closest PokeCenter and stopping:
" "This is for debugging the PokeCenter warping function.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , SKIP_SANDWICH( diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp index 405fc8394..f013d0b8f 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp @@ -60,7 +60,7 @@ TeraFarmerPerConsoleOptions::~TeraFarmerPerConsoleOptions(){ TeraFarmerPerConsoleOptions::TeraFarmerPerConsoleOptions(std::string label, const LanguageSet& languages, bool host) : GroupOption(std::move(label), LockWhileRunning::UNLOCKED) , is_host_label("This is the host Switch.") - , language("Game Language:", languages, LockWhileRunning::LOCKED, true) + , language("Game Language:", languages, LockWhileRunning::LOCK_WHILE_RUNNING, true) , catch_on_win( "Catch the " + STRING_POKEMON + ":", LockWhileRunning::UNLOCKED, @@ -159,7 +159,7 @@ TeraMultiFarmer::TeraMultiFarmer() {2, "switch2", "Switch 2 (Bottom Left)"}, {3, "switch3", "Switch 3 (Bottom Right)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , MAX_WINS( @@ -174,7 +174,7 @@ TeraMultiFarmer::TeraMultiFarmer() {Mode::HOST_LOCALLY, "host-locally", "Host remaining slots locally."}, {Mode::HOST_ONLINE, "host-online", "Host remaining slots online."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Mode::FARM_ALONE ) , RECOVERY_MODE( @@ -183,7 +183,7 @@ TeraMultiFarmer::TeraMultiFarmer() {RecoveryMode::STOP_ON_ERROR, "stop-on-error", "Stop on any error."}, {RecoveryMode::SAVE_AND_RESET, "save-and-reset", "Save before each raid. Reset on errors."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, RecoveryMode::SAVE_AND_RESET ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp b/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp index 03ee28afe..2e456e44e 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp @@ -45,12 +45,12 @@ SoundListener::SoundListener() {SoundType::Shiny, "shiny", "Shiny Sound"}, {SoundType::LetsGoKill, "lets-go-kill", "Let's Go Kill"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, SoundType::Shiny ) , STOP_ON_DETECTED_SOUND( "Stop on the detected sound
Stop program when the sound is detected.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp b/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp index 1392091cd..a79afd6dd 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp @@ -39,17 +39,17 @@ std::unique_ptr SelfBoxTrade_Descriptor::make_stats() const{ SelfBoxTrade::SelfBoxTrade() : BOXES_TO_TRADE( "Number of Boxes to Trade:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 0, 32 ) , START_ROW( "Starting Row of 1st Box:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, 5 ) , START_COL( "Starting Column of 1st Box:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, 6 ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp index 9e4f6889e..9b6d9682a 100644 --- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp @@ -119,7 +119,7 @@ DenMonSelectOption::DenMonSelectOption(std::string label) : StringSelectOption( std::move(label), DenMonSelectData::m_database, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "" ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp index c0079905a..7fcbaa4c5 100644 --- a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp +++ b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp @@ -45,7 +45,7 @@ GenerateIVCheckerOCR::GenerateIVCheckerOCR() : LANGUAGE( "Game Language:", IV_READER().languages(), - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) , HP("HP:", IvJudgeValue::Best) , ATTACK("Attack:", IvJudgeValue::Best) diff --git a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h index 10a7bf177..2204df70b 100644 --- a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h +++ b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h @@ -26,7 +26,7 @@ class IVCheckerOptionOCR : public EnumDropdownOption{ : EnumDropdownOption( std::move(label), IvJudgeValue_Database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_value ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp index e480ad2de..e68cc8472 100644 --- a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp +++ b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp @@ -45,7 +45,7 @@ GenerateNameOCRDataPokedex::GenerateNameOCRDataPokedex() : LANGUAGE( "Game Language:", PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) , POKEDEX( "" + STRING_POKEDEX + ":", @@ -54,7 +54,7 @@ GenerateNameOCRDataPokedex::GenerateNameOCRDataPokedex() {Pokedex::IsleOfArmor, "isle-of-armor", "Isle of Armor"}, {Pokedex::CrownTundra, "crown-tundra", "Crown Tundra"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Pokedex::Galar ) , MODE( @@ -63,7 +63,7 @@ GenerateNameOCRDataPokedex::GenerateNameOCRDataPokedex() {Mode::SaveToJson, "save-to-json", "Read names and save to JSON."}, {Mode::GenerateTrainingData, "generate-training-data", "Generate training data."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Mode::GenerateTrainingData ) { diff --git a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.cpp b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.cpp index 00910bbd5..c5415fcd4 100644 --- a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.cpp +++ b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.cpp @@ -41,16 +41,16 @@ GeneratePokedexSprites::GeneratePokedexSprites() : LANGUAGE( "Game Language:", PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) , HORIZONTAL_FRAMES( "Frames per 360 Degree Horizontal Rotation:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) , ANIMATION_FRAMES( "Animation Frames per Camera Angle:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp index 97ed5180d..7dd546003 100644 --- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp +++ b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp @@ -28,7 +28,7 @@ HostingSwitch::HostingSwitch() {2, "switch2", "Switch 2 (Bottom Left)"}, {3, "switch3", "Switch 3 (Bottom Right)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) {} @@ -49,7 +49,7 @@ BossSlotOption::BossSlotOption() {2, "slot2", "Slot 2"}, {3, "slot3", "Slot 3"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp index 04e684e51..a712d6180 100644 --- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp +++ b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp @@ -38,8 +38,8 @@ const EnumDatabase& BossAction_Database(){ BossActionRow::BossActionRow(std::string slug, const std::string& name_slug, const std::string& sprite_slug) : StaticTableRow(std::move(slug)) - , pokemon(LockWhileRunning::LOCKED, get_pokemon_name(name_slug).display_name(), ALL_POKEMON_SPRITES().get_throw(sprite_slug).icon) - , action(BossAction_Database(), LockWhileRunning::LOCKED, BossAction::CATCH_AND_STOP_IF_SHINY) + , pokemon(LockWhileRunning::LOCK_WHILE_RUNNING, get_pokemon_name(name_slug).display_name(), ALL_POKEMON_SPRITES().get_throw(sprite_slug).icon) + , action(BossAction_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, BossAction::CATCH_AND_STOP_IF_SHINY) , ball("poke-ball") { PA_ADD_STATIC(pokemon); @@ -49,7 +49,7 @@ BossActionRow::BossActionRow(std::string slug, const std::string& name_slug, con BossActionTable::BossActionTable() - : StaticTableOption("Boss Actions:", LockWhileRunning::LOCKED) + : StaticTableOption("Boss Actions:", LockWhileRunning::LOCK_WHILE_RUNNING) { for (const auto& item : all_bosses_by_dex()){ // cout << item.second << endl; diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp index ac914528b..462b0c9dc 100644 --- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp +++ b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp @@ -41,7 +41,7 @@ CaughtScreenActionOption::CaughtScreenActionOption( : "Reset Game if win-rate is above the threshold. Otherwise continue running." }, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_action ) {} @@ -52,7 +52,7 @@ CaughtScreenActionsOption::CaughtScreenActionsOption( CaughtScreenAction default_shiny_nonboss, CaughtScreenAction default_shiny_boss ) - : GroupOption("End Adventure Actions", LockWhileRunning::LOCKED) + : GroupOption("End Adventure Actions", LockWhileRunning::LOCK_WHILE_RUNNING) , no_shinies(false, winrate_reset_tooltip, "No Shinies:", default_no_shinies) , shiny_nonboss( true, winrate_reset_tooltip, @@ -87,9 +87,9 @@ CaughtScreenActionsOption::CaughtScreenActionsOption( ConsoleSpecificOptions::ConsoleSpecificOptions(std::string label, const LanguageSet& languages, bool host) - : GroupOption(std::move(label), LockWhileRunning::LOCKED) + : GroupOption(std::move(label), LockWhileRunning::LOCK_WHILE_RUNNING) , is_host_label("This is the host Switch.") - , language("Game Language:", languages, LockWhileRunning::LOCKED, true) + , language("Game Language:", languages, LockWhileRunning::LOCK_WHILE_RUNNING, true) { ConsoleSpecificOptions::set_host(host); PA_ADD_STATIC(is_host_label); @@ -108,7 +108,7 @@ Consoles::~Consoles(){ HOST.remove_listener(*this); } Consoles::Consoles(const ConsoleSpecificOptionsFactory& factory) - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , m_languages(PokemonNameReader::instance().languages()) { PLAYERS[0] = factory.make("Switch 0 (Top Left)", m_languages, true); diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp index da80a70f4..a5a5ddb2e 100644 --- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp +++ b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp @@ -18,7 +18,7 @@ HostingSettings::~HostingSettings(){ MODE.remove_listener(*this); } HostingSettings::HostingSettings() - : GroupOption("Hosting Options", LockWhileRunning::LOCKED) + : GroupOption("Hosting Options", LockWhileRunning::LOCK_WHILE_RUNNING) , MODE( "Mode:", { @@ -26,7 +26,7 @@ HostingSettings::HostingSettings() {HostingMode::HOST_LOCALLY, "local", "Host Locally: Allow other local Switches to join."}, {HostingMode::HOST_ONLINE, "online", "Host Online: Allow other people online to join."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, HostingMode::NOT_HOSTING ) , RAID_CODE( @@ -36,7 +36,7 @@ HostingSettings::HostingSettings() ) , CONNECT_TO_INTERNET_DELAY( "Connect to Internet Delay:
Time from \"Connect to Internet\" to when you're ready to start adventure.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20 * TICKS_PER_SECOND" ) @@ -46,13 +46,13 @@ HostingSettings::HostingSettings() "thus fail to join each other. If you are joining someone else's auto-host, you " "will want to set this to 3 seconds or more to make sure that the host opens the " "lobby before everyone else tries to join.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "0 * TICKS_PER_SECOND" ) , LOBBY_WAIT_DELAY( "Lobby Wait Delay:
Wait this long before starting raid. Start time is 3 minutes minus this number.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "60 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp index e9f11a4af..32ed0e88a 100644 --- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp +++ b/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp @@ -46,7 +46,7 @@ class MaxLairBossFinder_ConsoleOptions : public ConsoleSpecificOptions{ : ConsoleSpecificOptions(std::move(label), languages, host) , normal_ball( "Normal Ball: Ball for catching non-boss " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "poke-ball" ) { diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp index e08f4ae6e..857694c80 100644 --- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp +++ b/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp @@ -55,12 +55,12 @@ class MaxLairStandard_ConsoleOptions : public ConsoleSpecificOptions{ : ConsoleSpecificOptions(std::move(label), languages, host) , normal_ball( "Normal Ball: Ball for catching non-boss " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "poke-ball" ) , boss_ball( "Boss Ball: Ball for catching the boss/legendary " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "poke-ball" ) , actions(true, false) diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp index 114ff7f48..ab579d6d7 100644 --- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp +++ b/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp @@ -50,12 +50,12 @@ class MaxLairStrongBoss_ConsoleOptions : public ConsoleSpecificOptions{ : ConsoleSpecificOptions(std::move(label), languages, host) , normal_ball( "Normal Ball: Ball for catching non-boss " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "poke-ball" ) , boss_ball( "Boss Ball: Ball for catching the boss/legendary " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "poke-ball" ) , actions_non_host(false, false) @@ -110,7 +110,7 @@ MaxLairStrongBoss::MaxLairStrongBoss() , MIN_WIN_RATE( "Minimum Win Rate:
" "Keep the path if the win rate stays above this ratio. This is done by resetting the host.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.75, 0, 1.0 ) , CONSOLES(MaxLairStrongBoss_ConsoleFactory()) diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h index 8fcfffbb7..cdcc1e372 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h +++ b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h @@ -32,7 +32,7 @@ class EncounterActionCell : public EnumDropdownCell{ EncounterActionCell() : EnumDropdownCell( EncounterAction_Database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, EncounterAction::StopProgram ) {} @@ -56,7 +56,7 @@ class ShinyFilterCell : public EnumDropdownCell{ ShinyFilterCell(bool rare_stars) : EnumDropdownCell( rare_stars ? ShinyFilter_RareStars_Database() : ShinyFilter_Normal_Database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, ShinyFilter::NOT_SHINY ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp index a60ef3bfa..3af1055af 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp @@ -28,7 +28,7 @@ EncounterFilterOverride::~EncounterFilterOverride(){ } EncounterFilterOverride::EncounterFilterOverride(bool rare_stars) : m_rare_stars(rare_stars) - , pokemon(COMBINED_DEX_NAMES(), LockWhileRunning::LOCKED, "rookidee") + , pokemon(COMBINED_DEX_NAMES(), LockWhileRunning::LOCK_WHILE_RUNNING, "rookidee") , shininess(rare_stars) { PA_ADD_OPTION(action); @@ -100,7 +100,7 @@ EncounterFilterTable::EncounterFilterTable(bool rare_stars) "Overrides:
" "The game language must be properly set to read " + STRING_POKEMON + " names.
" "If more than one override applies, the last one will be chosen.", - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) {} std::vector> EncounterFilterTable::copy_snapshot() const{ diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp index 948b81c85..a7ba2e789 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp @@ -12,10 +12,10 @@ namespace PokemonSwSh{ AutoHostNotificationOption::AutoHostNotificationOption(std::string label, bool max_lair) - : GroupOption(std::move(label), LockWhileRunning::LOCKED, true, false) + : GroupOption(std::move(label), LockWhileRunning::LOCK_WHILE_RUNNING, true, false) , DESCRIPTION( "Description:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", max_lair ? "Auto-Hosting Lugia\nCode: Random" @@ -23,7 +23,7 @@ AutoHostNotificationOption::AutoHostNotificationOption(std::string label, bool m ) , SHOW_STATS( "Show Stats: Show program stats for this session.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) // , SCREENSHOT("Notification Screenshot:
Attach screenshot of the den to notifications.") diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp index 56fb11efc..29d04a0f0 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp @@ -48,7 +48,7 @@ PokemonBallSelectCell::PokemonBallSelectCell( ) : StringSelectCell( ALL_BALLS_SELECT_DATABASE(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, default_slug ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h index 8869b7f0c..86c34d823 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h +++ b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h @@ -33,7 +33,7 @@ class CatchabilitySelectorOption : public EnumDropdownOption{ {Catchability::MAYBE_UNCATCHABLE, "maybe", "Maybe Uncatchable"}, {Catchability::ALWAYS_UNCATCHABLE, "never", "Never Catchable"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, Catchability::ALWAYS_CATCHABLE ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp index b0014d0c8..46636c771 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp @@ -27,9 +27,9 @@ const EnumDatabase& BallType_Database() { CramomaticRow::CramomaticRow() - : ball_type(BallType_Database(), LockWhileRunning::LOCKED, CramomaticBallType::Apricorn) - , is_bonus(LockWhileRunning::LOCKED, false) - , priority(LockWhileRunning::LOCKED, 0) + : ball_type(BallType_Database(), LockWhileRunning::LOCK_WHILE_RUNNING, CramomaticBallType::Apricorn) + , is_bonus(LockWhileRunning::LOCK_WHILE_RUNNING, false) + , priority(LockWhileRunning::LOCK_WHILE_RUNNING, 0) { PA_ADD_OPTION(ball_type); PA_ADD_OPTION(is_bonus); @@ -47,7 +47,7 @@ std::unique_ptr CramomaticRow::clone() const{ CramomaticTable::CramomaticTable(std::string label) : EditableTableOption_t( std::move(label), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, make_defaults() ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp index 066f6f243..750a0d183 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp @@ -17,7 +17,7 @@ namespace PokemonSwSh{ TimeRollbackHoursOption::TimeRollbackHoursOption() : SimpleIntegerOption( "Time Rollback (in hours):
Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 0, 11 ) {} @@ -29,7 +29,7 @@ TimeRollbackHoursOption::TimeRollbackHoursOption() TouchDateIntervalOption::TouchDateIntervalOption() : m_hours( "Rollover Prevention:
Prevent a date-skip by touching the date every this many hours. If set to zero, this feature is disabled.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 4, 0, 11 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EggStepOption.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EggStepOption.cpp index 6541f8dfa..18dd69851 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EggStepOption.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EggStepOption.cpp @@ -25,7 +25,7 @@ EggStepCountOption::EggStepCountOption() : StringSelectOption( "Step Count:", EGGSTEP_DATABASE().database(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "grookey" ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h index 0754016a6..369523899 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h +++ b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h @@ -21,11 +21,11 @@ namespace PokemonSwSh{ class EncounterBotCommonOptions : public BatchOption{ public: EncounterBotCommonOptions(bool rare_stars, bool enable_overrides) - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , FILTER(rare_stars, enable_overrides) , VIDEO_ON_SHINY( "Video Capture:
Take a video of the encounter if it is shiny.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_NONSHINY( diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h index 841f66995..6a0309144 100644 --- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h +++ b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h @@ -34,7 +34,7 @@ class RegiSelectorOption : public EnumDropdownOption{ {RegiGolem::Regieleki, "regieleki", "Regieleki"}, {RegiGolem::Regidrago, "regidrago", "Regidrago"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, RegiGolem::Registeel ) {} diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp index afb03e74a..fc8a1526c 100644 --- a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp +++ b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp @@ -21,235 +21,235 @@ GameSettings& GameSettings::instance(){ return settings; } GameSettings::GameSettings() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , m_egg_options("Egg Options:") , AUTO_DEPOSIT( "Auto-Deposit:
true = Send " + STRING_POKEMON + " to boxes is \"Automatic\".
false = Send " + STRING_POKEMON + " to boxes is \"Manual\".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , EGG_FETCH_EXTRA_LINE( "Egg Fetch Extra Line:
true = The daycare lady has an extra line of text in Japanese. Set this to true if you are running any of the egg programs in a Japanese game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , FETCH_EGG_MASH_DELAY( "Fetch Egg Mash Delay:
Time needed to mash B to fetch an egg and return to overworld when auto-deposit is on.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "800" ) , m_den_options("Den Options:") , DODGE_UNCATCHABLE_PROMPT_FAST( "Dodge Uncatchable Prompt Fast:
Which method to use to bypass the uncatchable " + STRING_POKEMON + " prompt?
true = Use a fast (but potentially unreliable) method.
false = Use a slower (by about 5 seconds) method.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , m_advanced_options("Advanced Options: You shouldn't need to touch anything below here.") , m_general_options("General Timings:") , AUTO_FR_DURATION( "Auto-FR Duration:
Time to accept FRs before returning to den lobby.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) , m_menu_navigation("Menu Navigation Timings:") , OVERWORLD_TO_MENU_DELAY( "Overworld to Menu Delay:
Delay to bring up the menu when pressing X in the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "120" ) , MENU_TO_OVERWORLD_DELAY( "Menu to Overworld Delay:
Delay to go from menu back to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "250" ) , GAME_TO_HOME_DELAY_FAST( "Game to Home Delay (fast):
" "Delay from pressing home to entering the the Switch home menu. This affects the speed of date-spamming programs.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "100" ) , GAME_TO_HOME_DELAY_SAFE( "Game to Home Delay (safe):
" "Delay from pressing home to entering the the Switch home menu. This affects the speed of date-spamming programs.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "125" ) , HOME_TO_GAME_DELAY( "Home to Game Delay:
Delay to enter game from home menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , OPEN_YCOMM_DELAY( "Open Y-COMM Delay:
Time needed to open Y-COMM.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "200" ) , ENTER_PROFILE_DELAY( "Enter Profile Delay:
Delay to enter your Switch profile.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) , m_start_game_timings("Start Game Timings:") , START_GAME_MASH( "1. Start Game Mash:
Mash A for this long to start the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) , START_GAME_WAIT( "2. Start Game Wait:
Wait this long for the game to load.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20 * TICKS_PER_SECOND" ) , ENTER_GAME_MASH( "3. Enter Game Mash:
Mash A for this long to enter the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , ENTER_GAME_WAIT( "4. Enter Game Wait:
Wait this long for the game to enter the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "11 * TICKS_PER_SECOND" ) , m_den_timings("Den Timings:") , ENTER_OFFLINE_DEN_DELAY( "Enter Offline Game Delay:
Time needed to enter a den on final button press.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "125" ) , REENTER_DEN_DELAY( "Re-enter Den Delay:
Time from exiting den after a day-skip to when you can collect watts and re-enter it.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , COLLECT_WATTS_OFFLINE_DELAY( "Collect Watts Delay (offline):", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "80" ) , COLLECT_WATTS_ONLINE_DELAY( "Collect Watts Delay (online):", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , UNCATCHABLE_PROMPT_DELAY( "Uncatchable Prompt Delay:
Time needed to bypass uncatchable pokemon prompt.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "110" ) , OPEN_LOCAL_DEN_LOBBY_DELAY( "Open Local Den Lobby Delay:
Time needed to open a den lobby on local connection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , ENTER_SWITCH_POKEMON( "Enter Switch " + STRING_POKEMON + ":
Time needed to enter Switch " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "4 * TICKS_PER_SECOND" ) , EXIT_SWITCH_POKEMON( "Exit Switch " + STRING_POKEMON + ":
Time needed to exit Switch " + STRING_POKEMON + " back to den lobby.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , FULL_LOBBY_TIMER( "Full Lobby Timer:
Always 3 minutes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "180 * TICKS_PER_SECOND" ) , m_box_timings("Box Timings: (for egg programs)") , BOX_SCROLL_DELAY( "Box Scroll Delay:
Delay to move the cursor.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20" ) , BOX_CHANGE_DELAY( "Box Change Delay:
Delay to change boxes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "80" ) , BOX_PICKUP_DROP_DELAY( "Box Pickup/Drop Delay:
Delay to pickup/drop " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "90" ) , MENU_TO_POKEMON_DELAY( "Menu To " + STRING_POKEMON + " Delay:
Delay to enter " + STRING_POKEMON + " menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "300" ) , POKEMON_TO_BOX_DELAY( "" + STRING_POKEMON + " to Box Delay:
Delay to enter box system.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "300" ) , BOX_TO_POKEMON_DELAY( "Box to " + STRING_POKEMON + " Delay:
Delay to exit box system.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "250" ) , POKEMON_TO_MENU_DELAY( "" + STRING_POKEMON + " to Menu Delay:
Delay to return to menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "250" ) , m_shiny_detection("Shiny Detection:") , SHINY_ALPHA_THRESHOLD( "Shiny Threshold:
Threshold to detect a shiny encounter.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2.0, 0 ) , BALL_SPARKLE_ALPHA( "Ball Sparkle Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.4, 0 ) , STAR_SPARKLE_ALPHA( "Star Sparkle Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.5, 0 ) , SQUARE_SPARKLE_ALPHA( "Ball Sparkle Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.3, 0 ) , LINE_SPARKLE_ALPHA( "Star Sparkle Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.3, 0 ) , SHINY_DIALOG_ALPHA( "Shiny Dialog Alpha:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1.2, 0 ) // , m_experimental("Experimental/Beta Features:") diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp index 565f2e1e9..32a25f07f 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp @@ -35,12 +35,12 @@ BerryFarmer_Descriptor::BerryFarmer_Descriptor() BerryFarmer::BerryFarmer() : SKIPS( "Number of Fetch Attempts:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 100000 ) , SAVE_ITERATIONS( "Save Every this Many Fetches:
(zero disables saving): ", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp index af384ed51..d974c37c2 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp @@ -68,12 +68,12 @@ BerryFarmer2::BerryFarmer2() ) , FETCH_ATTEMPTS( "Number of Fetch Attempts:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 100000 ) , SAVE_ITERATIONS( "Save Every this Many Fetches:
(zero disables saving): ", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , ENCOUNTER_BOT_OPTIONS(false, true) @@ -90,35 +90,35 @@ BerryFarmer2::BerryFarmer2() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , START_BATTLE_TIMEOUT( "Start Battle Timeout:
After a battle is detected, wait this long to flee in seconds.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 15 ) , RUSTLING_INTERVAL( "Rustling Interval:
How much time between two rustling sounds has to pass to be considered slow rustling in ms.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1350 ) , RUSTLING_TIMEOUT( "Rustling Timeout:
Wait this many ticks to detect rustling.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "400" ) , SECONDARY_ATTEMPT_MASH_TIME( "Secondary attempt mash time:
Mash ZL this many ticks for secondary fetch attempts.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "240" ) , SOUND_THRESHOLD( "Maximum Sound Error Coefficient", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.68, 0, 1.0 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp index 005f767d3..8e0a5eeee 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp @@ -35,12 +35,12 @@ DailyHighlightFarmer_Descriptor::DailyHighlightFarmer_Descriptor() DailyHighlightFarmer::DailyHighlightFarmer() : SKIPS( "Number of Purchase Attempts:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 100000 ) , SAVE_ITERATIONS( "Save Every this Many Fetches:
(zero disables saving): ", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp index 6972076dd..412299a20 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp @@ -35,12 +35,12 @@ LotoFarmer_Descriptor::LotoFarmer_Descriptor() LotoFarmer::LotoFarmer() : SKIPS( "Number of Loto Attempts:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 100000 ) , MASH_B_DURATION( "Mash B for this long to exit the dialog:
(Some languages like German need to increase this.)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "9 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp index 4aeb6ce2b..397aeddbb 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp @@ -35,17 +35,17 @@ PokeJobsFarmer_Descriptor::PokeJobsFarmer_Descriptor() PokeJobsFarmer::PokeJobsFarmer() : SKIPS( "Number of days:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 200 ) , CONCURRENCY( "Number of concurrent " + STRING_POKEJOB + "s per day:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2 ) , MENU_INDEX( "Index of " + STRING_POKEJOB + "s in Rotom menu:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 3 ) , m_advanced_options( @@ -53,7 +53,7 @@ PokeJobsFarmer::PokeJobsFarmer() ) , MASH_B_DURATION( "Mash B for this long upon completion of " + STRING_POKEJOB + ":", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp index 46b105254..c1afe5947 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp @@ -35,12 +35,12 @@ StowOnSideFarmer_Descriptor::StowOnSideFarmer_Descriptor() StowOnSideFarmer::StowOnSideFarmer() : SKIPS( "Number of Purchase Attempts:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 100000 ) , SAVE_ITERATIONS( "Save Every this Many Fetches:
(zero disables saving): ", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0, 0 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp index 96ab3a84c..f22c2d652 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp @@ -37,18 +37,18 @@ WattFarmer::WattFarmer() : GRIP_MENU_WAIT( "Exit Grip Menu Delay: " "Wait this long after leaving the grip menu to allow for the Switch to reestablish local connection.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , SKIPS( "Number of Fetch Attempts:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 33334 ) , SAVE_ITERATIONS( "Save Every this Many Fetches:
(zero disables saving): ", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0, 0 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp index 152b7aed3..756aac0ad 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp @@ -34,13 +34,13 @@ BeamReset_Descriptor::BeamReset_Descriptor() BeamReset::BeamReset() : DELAY_BEFORE_RESET( "Delay before Reset:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , EXTRA_LINE( "Extra Line:
(German has an extra line of text.)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp index 5826dcb0d..8987a25ae 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp @@ -40,12 +40,12 @@ std::unique_ptr DaySkipperEU_Descriptor::make_stats() const{ DaySkipperEU::DaySkipperEU() : SKIPS( "Number of Frame Skips:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) , REAL_LIFE_YEAR( "Real Life Year:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2023, 2000, 2060 ) , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600)) @@ -60,7 +60,7 @@ DaySkipperEU::DaySkipperEU() ) , CORRECTION_SKIPS( "Auto-Correct Interval:
Run auto-recovery every this # of skips. Zero disables the auto-corrections.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1000 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp index 25401caf4..e847b0471 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp @@ -39,7 +39,7 @@ std::unique_ptr DaySkipperJPN7p8k_Descriptor::make_stats() const{ DaySkipperJPN7p8k::DaySkipperJPN7p8k() : SKIPS( "Number of Frame Skips:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) , START_DATE( @@ -58,7 +58,7 @@ DaySkipperJPN7p8k::DaySkipperJPN7p8k() ) , CORRECTION_SKIPS( "Auto-Correct Interval:
Run auto-recovery every this # of skips. Zero disables the auto-corrections.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1000 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp index 1ce8a0d8c..873337fed 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp @@ -41,7 +41,7 @@ std::unique_ptr DaySkipperJPN_Descriptor::make_stats() const{ DaySkipperJPN::DaySkipperJPN() : SKIPS( "Number of Frame Skips:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600)) @@ -55,7 +55,7 @@ DaySkipperJPN::DaySkipperJPN() ) , CORRECTION_SKIPS( "Auto-Correct Interval:
Run auto-recovery every this # of skips. Zero disables the auto-corrections.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1000 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp index 4a7a06d0f..7d572a2ed 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp @@ -40,12 +40,12 @@ std::unique_ptr DaySkipperUS_Descriptor::make_stats() const{ DaySkipperUS::DaySkipperUS() : SKIPS( "Number of Frame Skips:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) , REAL_LIFE_YEAR( "Real Life Year:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2023, 2000, 2060 ) , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600)) @@ -59,7 +59,7 @@ DaySkipperUS::DaySkipperUS() ) , CORRECTION_SKIPS( "Auto-Correct Interval:
Run auto-recovery every this # of skips. Zero disables the auto-corrections.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1000 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp index 32a7a9ddf..513dd92b4 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp @@ -34,7 +34,7 @@ EventBeamFinder_Descriptor::EventBeamFinder_Descriptor() EventBeamFinder::EventBeamFinder() : WAIT_TIME_IN_DEN( "Wait time in Den:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp index 1dbc91e3b..9cbfb8275 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp @@ -85,12 +85,12 @@ PurpleBeamFinder::PurpleBeamFinder() ) , SAVE_SCREENSHOT( "Screenshot Purple Beams: (for debugging purposes)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , TIMEOUT_DELAY( "Timeout Delay:
Reset if no beam is detected after this long.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) @@ -100,22 +100,22 @@ PurpleBeamFinder::PurpleBeamFinder() // ) , MIN_BRIGHTNESS( "Minimum Brightness:
Range: 0 - 768", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 500, 0, 768 ) , MIN_EUCLIDEAN( "Minimum Euclidean Distance:
Range: 0 - 443", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 15, 0, 443 ) , MIN_DELTA_STDDEV_RATIO( "Minimum Delta/Stddev Ratio:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 5.0, 0 ) , MIN_SIGMA_STDDEV_RATIO( "Minimum Sigma/Stddev Ratio:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 5.0, 0 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp index 80e251277..80ffbe838 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp @@ -92,19 +92,19 @@ EggAutonomous::EggAutonomous() , LANGUAGE( "Game Language:
Required to read IVs.", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , MAX_KEEPERS( "Max Keepers:
Stop the program after keeping this many " + STRING_POKEMON + ". " "This number plus the number of " + STRING_POKEMON + " in the box left to your current box must not exceed 30. " "Otherwise, the program will break when that box is full.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10, 1, 30 ) , LOOPS_PER_FETCH( "Bike Loops Per Fetch:
Fetch an egg after doing this many bike loops on Route 5.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1 ) , NUM_EGGS_IN_COLUMN( @@ -117,7 +117,7 @@ EggAutonomous::EggAutonomous() {4, "4", "4"}, {5, "5", "5"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , AUTO_SAVING( @@ -131,7 +131,7 @@ EggAutonomous::EggAutonomous() {AutoSave::AfterStartAndKeep, "start-and-keep", "Save at beginning and after obtaining each baby that is kept. (Allows for error/crash recovery.)"}, {AutoSave::EveryBatch, "every-batch", "Save before every batch. (Allows you to unhatch eggs.)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, AutoSave::AfterStartAndKeep ) , FILTERS( @@ -145,12 +145,12 @@ EggAutonomous::EggAutonomous() ) , DEBUG_PROCESSING_HATCHED( "Debug the part of program after all eggs hatched", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , SAVE_DEBUG_VIDEO( "Save debug videos to Switch:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp index 9b45b6ac0..8f0870a22 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp @@ -32,12 +32,12 @@ EggCombined2_Descriptor::EggCombined2_Descriptor() EggCombined2::EggCombined2() : BOXES_TO_HATCH( "Boxes to Hatch:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 32, 0, 32 ) , FETCHES_PER_BATCH( "Fetches per Batch:
For each batch of eggs, attempt this many egg fetches.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 6.0, 0, 7 ) , m_advanced_options( @@ -45,19 +45,19 @@ EggCombined2::EggCombined2() ) , SAFETY_TIME( "Safety Time:
Additional time added to the spinning.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "12 * TICKS_PER_SECOND" ) , EARLY_HATCH_SAFETY( "Early Hatch Safety:
Eggs will not hatch early by more than this period.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , HATCH_DELAY( "Hatch Delay:
Total animation time for hatching 5 eggs when there are no shinies.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "88 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp index 0e07bcd39..b148e5654 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp @@ -35,7 +35,7 @@ EggFetcher2_Descriptor::EggFetcher2_Descriptor() EggFetcher2::EggFetcher2() : MAX_FETCH_ATTEMPTS( "Fetch this many times:
This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2000 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp index 67ccc4aea..bf6424c4e 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp @@ -45,12 +45,12 @@ EggFetcherMultiple_Descriptor::EggFetcherMultiple_Descriptor() EggFetcherMultiple::EggFetcherMultiple() : POKEMON_SPECIES_COUNT( "Breed this many species:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 30 ) , MAX_FETCH_ATTEMPTS_PER_SPECIES( "Fetch this many times per species:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp index da3c315e6..d8fc19b49 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp @@ -85,7 +85,7 @@ uint8_t swap_party(BotBaseContext& context, uint8_t column){ EggHatcher::EggHatcher() : BOXES_TO_HATCH( "Boxes to Hatch:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 3 ) , m_advanced_options( @@ -93,13 +93,13 @@ EggHatcher::EggHatcher() ) , SAFETY_TIME0( "Safety Time:
Additional time added to the spinning.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "12 * TICKS_PER_SECOND" ) , HATCH_DELAY( "Hatch Delay:
Total animation time for hatching 5 eggs when there are no shinies.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "88 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp index 603b156ca..86d243c3a 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp @@ -34,22 +34,22 @@ EggSuperCombined2_Descriptor::EggSuperCombined2_Descriptor() EggSuperCombined2::EggSuperCombined2() : BOXES_TO_RELEASE( "Boxes to Release:
Start by releasing this many boxes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 0, 32 ) , BOXES_TO_SKIP( "Boxes to Skip:
Then skip this many boxes.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 0, 32 ) , BOXES_TO_HATCH( "Boxes to Hatch:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 31, 0, 32 ) , FETCHES_PER_BATCH( "Fetches per Batch:
For each batch of eggs, attempt this many egg fetches.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 6.0, 0, 7 ) , m_advanced_options( @@ -57,19 +57,19 @@ EggSuperCombined2::EggSuperCombined2() ) , SAFETY_TIME( "Safety Time:
Additional time added to the spinning.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "12 * TICKS_PER_SECOND" ) , EARLY_HATCH_SAFETY( "Early Hatch Time:
Eggs should not hatch more than this much early.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , HATCH_DELAY( "Hatch Delay:
Total animation time for hatching 5 eggs when there are no shinies.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "88 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp index 85aa15e8b..bb1e104cc 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp @@ -34,12 +34,12 @@ GodEggDuplication_Descriptor::GodEggDuplication_Descriptor() GodEggDuplication::GodEggDuplication() : MAX_FETCH_ATTEMPTS( "Fetch this many times:
This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2000 ) , PARTY_ROUND_ROBIN( "Party Round Robin:
Cycle through this many party members.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 6, 1, 6 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp index 68c3f113d..bfc193f64 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp @@ -36,17 +36,17 @@ GodEggItemDupe_Descriptor::GodEggItemDupe_Descriptor() GodEggItemDupe::GodEggItemDupe() : MAX_FETCH_ATTEMPTS( "Fetch this many times:
This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2000 ) , PARTY_ROUND_ROBIN( "Party Round Robin:
Cycle through this many party members.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 6, 1, 6 ) , DETACH_BEFORE_RELEASE( "Detach before Release:
Needed for items like Rusted Sword/Shield.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp index ddc4e6b41..d42bf741b 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp @@ -66,7 +66,7 @@ AutonomousBallThrower::AutonomousBallThrower() : GO_HOME_WHEN_DONE(false) , BALL_SELECT( "Ball Select:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "master-ball" ) , LANGUAGE( @@ -82,7 +82,7 @@ AutonomousBallThrower::AutonomousBallThrower() Language::ChineseSimplified, Language::ChineseTraditional, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, false, std::chrono::seconds(3600)) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp index 284de9626..9c0d963f0 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp @@ -142,17 +142,17 @@ BoxReorderNationalDex::BoxReorderNationalDex() : LANGUAGE( "Game Language:
This needs to be set correctly for " + STRING_POKEMON + " to be identified correctly.", PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , POKEMON_COUNT( "Number of " + STRING_POKEMON + " to order:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 30 ) , DODGE_SYSTEM_UPDATE_WINDOW( "Dodge System Update Window:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp index 4e250ff88..4eeace183 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp @@ -33,7 +33,7 @@ ClothingBuyer_Descriptor::ClothingBuyer_Descriptor() ClothingBuyer::ClothingBuyer() : CATEGORY_ROTATION( "Rotate Categories:
This slows down the program, but ensures it will cover all categories.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp index 9de9b5b74..669134faf 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp @@ -60,17 +60,17 @@ std::unique_ptr DexRecFinder_Descriptor::make_stats() const{ DexRecFilters::DexRecFilters() - : GroupOption("Stop Automatically (requires video feedback)", LockWhileRunning::LOCKED, true, true) + : GroupOption("Stop Automatically (requires video feedback)", LockWhileRunning::LOCK_WHILE_RUNNING, true, true) , LANGUAGE( "Game Language:
This needs to be set correctly for stop filters to work correctly.", PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , DESIRED( "Desired " + STRING_POKEMON + ":
Stop when it finds this " + STRING_POKEMON + ". Requires the language be set.", COMBINED_DEX_NAMES(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "ralts" ) , EXCLUSIONS( @@ -90,7 +90,7 @@ DexRecFinder::DexRecFinder() : GO_HOME_WHEN_DONE(false) , VIEW_TIME( "View Time:
View the " + STRING_POKEDEX + " for this long before continuing.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) @@ -104,13 +104,13 @@ DexRecFinder::DexRecFinder() ) , ENTER_POKEDEX_TIME( "Enter " + STRING_POKEDEX + " Time:
Wait this long for the " + STRING_POKEDEX + " to open.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , BACK_OUT_TIME( "Back Out Time:
Mash B for this long to return to the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp index a6a881a85..fd1734205 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp @@ -33,12 +33,12 @@ MassRelease_Descriptor::MassRelease_Descriptor() MassRelease::MassRelease() : BOXES_TO_RELEASE( "Number of Boxes to Release:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2, 0, 32 ) , DODGE_SYSTEM_UPDATE_WINDOW( "Dodge System Update Window:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp index 1a83dfa63..20179851b 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp @@ -34,12 +34,12 @@ SurpriseTrade_Descriptor::SurpriseTrade_Descriptor() SurpriseTrade::SurpriseTrade() : BOXES_TO_TRADE( "Number of Boxes to Trade:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2 ) , INITIAL_WAIT( "Time to wait for a Trade Partner:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30 * TICKS_PER_SECOND" ) @@ -48,13 +48,13 @@ SurpriseTrade::SurpriseTrade() ) , TRADE_ANIMATION( "Trade Animation Time:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "23 * TICKS_PER_SECOND" ) , EVOLVE_DELAY( "Evolve Delay:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp index 800d49333..7aacb9737 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp @@ -40,35 +40,35 @@ TradeBot::TradeBot() ) , BOXES_TO_TRADE( "Number of Boxes to Trade:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 2 ) , LINK_TRADE_EXTRA_LINE( "Link Trade Extra Line:
Set this if you are playing in German.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , SEARCH_DELAY( "Time to wait for a Trade Partner:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20 * TICKS_PER_SECOND" ) , CONFIRM_DELAY( "Time to wait for Partner to Confirm:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , TRADE_START( "Time for Trade to Start:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , TRADE_COMMUNICATION( "Communication Window:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20 * TICKS_PER_SECOND" ) @@ -77,13 +77,13 @@ TradeBot::TradeBot() ) , TRADE_ANIMATION( "Trade Animation Time:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "23 * TICKS_PER_SECOND" ) , EVOLVE_DELAY( "Evolve Delay:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp index 673007919..a85db9893 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp @@ -45,17 +45,17 @@ std::unique_ptr AutoHostMultiGame_Descriptor::make_stats() const{ AutoHostMultiGame::AutoHostMultiGame() : SingleSwitchProgramInstance({"Notifs", "LiveHost"}) , RAID_CODE(8) - , HOST_ONLINE("Host Online:", LockWhileRunning::LOCKED, true) + , HOST_ONLINE("Host Online:", LockWhileRunning::LOCK_WHILE_RUNNING, true) , LOBBY_WAIT_DELAY( "Lobby Wait Delay:
Wait this long before starting raid. Start time is 3 minutes minus this number.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "60 * TICKS_PER_SECOND" ) , GAME_LIST(true) , FR_FORWARD_ACCEPT( "Forward Friend Accept:
Accept FRs this many raids in the future.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1 ) , HOSTING_NOTIFICATIONS("Live-Hosting Announcements", false) @@ -68,31 +68,31 @@ AutoHostMultiGame::AutoHostMultiGame() ) , CONNECT_TO_INTERNET_DELAY( "Connect to Internet Delay:
Time from \"Connect to Internet\" to when you're ready to enter den.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20 * TICKS_PER_SECOND" ) , ENTER_ONLINE_DEN_DELAY( "Enter Online Den Delay:
\"Communicating\" when entering den while online.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) , OPEN_ONLINE_DEN_LOBBY_DELAY( "Open Online Den Delay:
Delay from \"Invite Others\" to when the clock starts ticking.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) , RAID_START_TO_EXIT_DELAY( "Raid Start to Exit Delay:
Time from start raid to reset. (when not selecting move)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "15 * TICKS_PER_SECOND" ) , DELAY_TO_SELECT_MOVE( "Delay to Select Move:
This + above = time from start raid to select move.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "32 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp index 897c6648e..208b054b2 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp @@ -47,48 +47,48 @@ std::unique_ptr AutoHostRolling_Descriptor::make_stats() const{ AutoHostRolling::AutoHostRolling() : SingleSwitchProgramInstance({"Notifs", "LiveHost"}) , RAID_CODE(8) - , SKIPS("Day Skips:", LockWhileRunning::LOCKED, 3) + , SKIPS("Day Skips:", LockWhileRunning::LOCK_WHILE_RUNNING, 3) , BACKUP_SAVE( "Load Backup Save:
For backup save soft-locking method.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) - , HOST_ONLINE("Host Online:", LockWhileRunning::LOCKED, true) + , HOST_ONLINE("Host Online:", LockWhileRunning::LOCK_WHILE_RUNNING, true) , LOBBY_WAIT_DELAY( "Lobby Wait Delay:
Wait this long before starting raid. Start time is 3 minutes minus this number.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "60 * TICKS_PER_SECOND" ) , FRIEND_ACCEPT_USER_SLOT( "Friend Request Accept Slot:
Zero disables friend accepts.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0, 0, 8 ) , EXTRA_DELAY_BETWEEN_RAIDS( "Extra Delay Between Raids:
May aid in farming.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "0 * TICKS_PER_SECOND" ) , MOVE_SLOT( "1st Move Select Slot:
Zero disables 1st move select.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0, 0, 4 ) , DYNAMAX( "1st Move Dynamax:
Dynamax on first move. (only applies if above option is non-zero)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , TROLL_HOSTING( "Troll Hosting: (requires 1st move select)
0 disables the troll hosting option, 1 attacks the first ally, 2 attacks the second one, 3 attacks the third one. Dynamaxing will disable this option.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0, 0, 3 ) , ALTERNATE_GAMES( "Alternate Games:
Alternate hosting between 1st and 2nd games. Host from both Sword and Shield.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , HOSTING_NOTIFICATIONS("Live-Hosting Announcements", false) @@ -101,31 +101,31 @@ AutoHostRolling::AutoHostRolling() ) , CONNECT_TO_INTERNET_DELAY( "Connect to Internet Delay:
Time from \"Connect to Internet\" to when you're ready to enter den.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20 * TICKS_PER_SECOND" ) , ENTER_ONLINE_DEN_DELAY( "Enter Online Den Delay:
\"Communicating\" when entering den while online.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) , OPEN_ONLINE_DEN_LOBBY_DELAY( "Open Online Den Delay:
Delay from \"Invite Others\" to when the clock starts ticking.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) , RAID_START_TO_EXIT_DELAY( "Raid Start to Exit Delay:
Time from start raid to reset. (when not selecting move)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "15 * TICKS_PER_SECOND" ) , DELAY_TO_SELECT_MOVE( "Delay to Select Move:
This + above = time from start raid to select move.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "32 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp index 5f3860049..3830e1f13 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp @@ -63,7 +63,7 @@ std::unique_ptr DenRoller_Descriptor::make_stats() const{ DenRoller::DenRoller() : SKIPS( "Number of Skips:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 3, 0, 60 ) , FILTER( @@ -73,7 +73,7 @@ DenRoller::DenRoller() , VIEW_TIME( "View Time:
Wait this long before restting. This wait is skipped if the desired " + STRING_POKEMON + " is set since the program will be watching it for you.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) @@ -88,7 +88,7 @@ DenRoller::DenRoller() , READ_DELAY( "Read Delay:
Wait this long before attempting to " + STRING_POKEMON + ". This needs to be long enough for the silhouette to load.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp index c500bdf53..4fdae08aa 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp @@ -70,18 +70,18 @@ StatsResetCalyrex::StatsResetCalyrex() : GO_HOME_WHEN_DONE(false) , BALL_SELECT( "Ball Select:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "master-ball" ) , LANGUAGE( "Game Language:", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , CHECK_CALYREX_STATS( "Check Calyrex stats", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , CALYREX_HP("Calyrex HP:") @@ -92,7 +92,7 @@ StatsResetCalyrex::StatsResetCalyrex() , CALYREX_SPEED("Calyrex Speed:") , CHECK_HORSE_STATS( "Check Horse stats", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , HORSE_HP("Horse HP:") diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp index dc114b23c..101c018e7 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp @@ -64,7 +64,7 @@ StatsResetMoltres::StatsResetMoltres() , LANGUAGE( "Game Language:", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , HP("HP:") diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp index 9df0e40d8..45f54c0f3 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp @@ -70,13 +70,13 @@ StatsResetRegi::StatsResetRegi() : GO_HOME_WHEN_DONE(false) , BALL_SELECT( "Ball Select:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "master-ball" ) , LANGUAGE( "Game Language:", IV_READER().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , HP("HP:") diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp index a244d4e2e..87e79edaf 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp @@ -58,7 +58,7 @@ StatsReset::StatsReset() , LANGUAGE( "Game Language:", IV_READER().languages(), - LockWhileRunning::LOCKED + LockWhileRunning::LOCK_WHILE_RUNNING ) , POKEMON( "Gift " + STRING_POKEMON + ":", @@ -67,7 +67,7 @@ StatsReset::StatsReset() {GiftPokemon::Cosmog, "cosmog", "Cosmog"}, {GiftPokemon::Poipole, "poipole", "Poipole"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, GiftPokemon::TypeNull ) , HP("HP:") diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp index 95fc70f2b..af6c1d7c9 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp @@ -59,13 +59,13 @@ ShinyHuntAutonomousOverworld::ShinyHuntAutonomousOverworld() : GO_HOME_WHEN_DONE(false) , TIME_ROLLBACK_HOURS( "Time Rollback (in hours):
Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 0, 11 ) , MARK_OFFSET( "Mark Offset:
Aim this far below the bottom of the exclamation/question mark. 1.0 is the height of the mark. " "Increase this value when the " + STRING_POKEMON + " are large.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0.5, 0, 20 ) , MARK_PRIORITY( @@ -77,7 +77,7 @@ ShinyHuntAutonomousOverworld::ShinyHuntAutonomousOverworld() {MarkPriority::PRIORITIZE_QUESTION, "prioritize-question", "Prioritize Question Marks"}, {MarkPriority::QUESTION_ONLY, "question-only", "Question Marks Only (Ignore Exclamation Marks)"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, MarkPriority::PRIORITIZE_EXCLAMATION ) , TRIGGER_METHOD( @@ -94,19 +94,19 @@ ShinyHuntAutonomousOverworld::ShinyHuntAutonomousOverworld() {TriggerMethod::Whistle3Vertical1, "whistle3-vertical1", "Whistle 3 times, then do vertical line once."}, {TriggerMethod::Vertical3Whistle3, "vertical3-whistle3", "Do vertical line 3 times, then whistle 3 times."}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TriggerMethod::Whistle3Circle1 ) , MAX_MOVE_DURATION( "Maximum Move Duration:
Do not move in the same direction for more than this long." " If you set this too high, you may wander too far from the grassy area.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "200" ) , MAX_TARGET_ALPHA( "Max Target Alpha:
Ignore all targets with alpha larger than this. Set to zero to ignore all marks.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 70000, 0 ) , ENCOUNTER_BOT_OPTIONS(true, true) @@ -123,20 +123,20 @@ ShinyHuntAutonomousOverworld::ShinyHuntAutonomousOverworld() ) , WATCHDOG_TIMER( "Watchdog Timer:
Reset the game if you go this long without any encounters.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "60 * TICKS_PER_SECOND" ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , TARGET_CIRCLING( "Target Circling:
After moving towards a " + STRING_POKEMON + ", make a circle." " This increases the chance of encountering the " + STRING_POKEMON + " if it has moved or if the trajectory missed.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp index 82ed1f557..5b7f9e59b 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp @@ -40,7 +40,7 @@ RaidItemFarmerOHKO_Descriptor::RaidItemFarmerOHKO_Descriptor() RaidItemFarmerOHKO::RaidItemFarmerOHKO() : BACKUP_SAVE( "Load Backup Save:
For backup save soft-locking method.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) // , m_advanced_options( @@ -48,45 +48,45 @@ RaidItemFarmerOHKO::RaidItemFarmerOHKO() // ) , WAIT_FOR_STAMP_DELAY( "Wait for Stamp Delay:
Wait this long for the stamp to show up.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3 * TICKS_PER_SECOND" ) , ENTER_STAMP_MASH_DURATION( "Enter Stamp Mash Duration:
Mash A this long to enter a raid from its stamp.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , RAID_START_MASH_DURATION( "Raid Start Mash Duration:
Mash A this long to start raid.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , RAID_START_TO_ATTACK_DELAY( "Raid Start to Attack Delay:
Time from start raid to when the raiders attack.
" "Do not over-optimize this timing unless you are running with 4 Switches. The Wishiwashi NPC will break the program.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30 * TICKS_PER_SECOND" ) , ATTACK_TO_CATCH_DELAY( "Attack to Catch Delay:
Time from when you attack to when the catch selection appears.
" "Do not over-optimize this timing unless you are running with 4 Switches. The Clefairy NPC's Follow Me will break the program.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "18 * TICKS_PER_SECOND" ) , RETURN_TO_OVERWORLD_DELAY( "Return to Overworld Delay:
Time from when you don't catch to when you return to the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "18 * TICKS_PER_SECOND" ) , TOUCH_DATE_INTERVAL( "Rollover Prevention:
Prevent the den from rolling over by periodically touching the date. If set to zero, this feature is disabled.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "4 * 3600 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp index cb1f53559..85d09ce8b 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp @@ -39,7 +39,7 @@ FastCodeEntry::FastCodeEntry() ) , INITIAL_DELAY( "Initial Delay:
Wait this long before entering the code.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "0 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp index a21d4c3ad..322faeb5b 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp @@ -34,7 +34,7 @@ FriendSearchDisconnect_Descriptor::FriendSearchDisconnect_Descriptor() FriendSearchDisconnect::FriendSearchDisconnect() : USER_SLOT( "User Slot:
Use this profile to disconnect.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 1, 1, 8 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp index c805f7f84..cb6db390a 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp @@ -89,22 +89,22 @@ CramomaticRNG::CramomaticRNG() : LANGUAGE( "Game Language:
Required to read the ball received.", PokemonNameReader::instance().languages(), - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NUM_APRICORN_ONE( "Primary Apricorns:
Number of Apricorns in the selected slot.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , NUM_APRICORN_TWO( "Secondary Apricorns:
Number of Apricorns in the slot below the selected one.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , NUM_NPCS( "NPCs:
Number of NPCs in the dojo, including " + STRING_POKEMON + ".", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 21 ) , BALL_TABLE( @@ -122,32 +122,32 @@ CramomaticRNG::CramomaticRNG() ) , MAX_PRIORITY_ADVANCES( "Priority Advances:
How many advances to check when checking for higher priority selections.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 300 ) , MAX_UNKNOWN_ADVANCES( "Max Unknown advances:
How many advances to check when updating the rng state.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 300 ) , ADVANCE_PRESS_DURATION( "Advance Press Duration:
Hold the button down for this long to advance once.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) , ADVANCE_RELEASE_DURATION( "Advance Release Duration:
After releasing the button, wait this long before pressing it again.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10 ) , SAVE_SCREENSHOTS( "Save Debug Screenshots:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , LOG_VALUES( "Log Animation Values:
", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp index 114c1200b..df58ee16a 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp @@ -36,30 +36,30 @@ SeedFinder::SeedFinder() : STATE_0( false, "state[0]:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "" ) , STATE_1( false, "state[1]:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, "", "" ) , UPDATE_STATE( "Update State:
Use the last known state to update the rng state.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , MIN_ADVANCES( "Min Advances:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , MAX_ADVANCES( "Max Advances:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 10000 ) , m_advanced_options( @@ -67,12 +67,12 @@ SeedFinder::SeedFinder() ) , SAVE_SCREENSHOTS( "Save Debug Screenshots:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , LOG_VALUES( "Log Animation Values:
", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp index c771280a8..50cad72d0 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp @@ -55,7 +55,7 @@ ShinyHuntAutonomousBerryTree::ShinyHuntAutonomousBerryTree() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp index 0790b5d81..12a3dd82f 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp @@ -69,13 +69,13 @@ ShinyHuntAutonomousFishing::ShinyHuntAutonomousFishing() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld and for the fish to reappear.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , FISH_RESPAWN_TIME( "Fish Respawn Time:
Wait this long for fish to respawn.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp index 750b104fb..568f16eb3 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp @@ -42,7 +42,7 @@ ShinyHuntAutonomousIoATrade::ShinyHuntAutonomousIoATrade() : GO_HOME_WHEN_DONE(false) , VIDEO_ON_SHINY( "Video Capture:
Take a video of the encounter if it is shiny.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, true ) , NOTIFICATION_NONSHINY( @@ -68,13 +68,13 @@ ShinyHuntAutonomousIoATrade::ShinyHuntAutonomousIoATrade() ) , MASH_TO_TRADE_DELAY( "Mash to Trade Delay:
Time to perform the trade.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30 * TICKS_PER_SECOND" ) , RUN_FROM_EVERYTHING( "Run from Everything:
Run from everything - even if it is shiny. (For testing only.)", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp index 6122142d6..f725ca996 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp @@ -56,19 +56,19 @@ ShinyHuntAutonomousRegi::ShinyHuntAutonomousRegi() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , POST_BATTLE_MASH_TIME( "Post-Battle Mash:
After each battle, mash B for this long to clear the dialogs.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1 * TICKS_PER_SECOND" ) , TRANSITION_DELAY( "Transition Delay:
Time to enter/exit the building.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp index 7147d63dc..584b1fdb4 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp @@ -48,7 +48,7 @@ ShinyHuntAutonomousRegigigas2::ShinyHuntAutonomousRegigigas2() : GO_HOME_WHEN_DONE(false) , REVERSAL_PP( "Reversal PP:
The amount of Reversal PP you are saved with.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 24 ) , ENCOUNTER_BOT_OPTIONS(false, false) @@ -63,7 +63,7 @@ ShinyHuntAutonomousRegigigas2::ShinyHuntAutonomousRegigigas2() ) , CATCH_TO_OVERWORLD_DELAY( "Catch to Overworld Delay:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp index c6e0f0178..74361c70e 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp @@ -50,7 +50,7 @@ ShinyHuntAutonomousSwordsOfJustice::ShinyHuntAutonomousSwordsOfJustice() : GO_HOME_WHEN_DONE(false) , AIRPLANE_MODE( "Airplane Mode:
Enable if airplane mode is on.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , ENCOUNTER_BOT_OPTIONS(true, false) @@ -65,19 +65,19 @@ ShinyHuntAutonomousSwordsOfJustice::ShinyHuntAutonomousSwordsOfJustice() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) , POST_BATTLE_MASH_TIME( "Post-Battle Mash:
After each battle, mash B for this long before entering the camp.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1 * TICKS_PER_SECOND" ) , ENTER_CAMP_DELAY( "Enter Camp Delay:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp index a9260809b..25ffac031 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp @@ -66,7 +66,7 @@ ShinyHuntAutonomousWhistling::ShinyHuntAutonomousWhistling() ) , EXIT_BATTLE_TIMEOUT( "Exit Battle Timeout:
After running, wait this long to return to overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "10 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp index 7f97199b4..236495e74 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp @@ -53,23 +53,23 @@ std::unique_ptr CurryHunter_Descriptor::make_stats() const{ CurryHunter::CurryHunter() : WALK_UP_DELAY( "Walk up Delay:
Wait this long for the " + STRING_POKEMON + " to walk up to you.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) , SMALL_POKEMON( "Small " + STRING_POKEMON + ":
If there are small " + STRING_POKEMON + ", increase this number by 30. You may have to adjust the number and check what works best for your area.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 0 ) , TAKE_VIDEO( "Take Videos:
Take a video after each cooking iteration. This will spam your album with videos.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , ITERATIONS( "Iterations:
# of cooking attempts.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 999 ) { diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp index 9a7ca3d96..55c024242 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp @@ -37,7 +37,7 @@ ShinyHuntUnattendedIoATrade_Descriptor::ShinyHuntUnattendedIoATrade_Descriptor() ShinyHuntUnattendedIoATrade::ShinyHuntUnattendedIoATrade() : START_TO_RUN_DELAY( "Start to Run Delay:
This needs to be carefully calibrated.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1260" ) @@ -46,19 +46,19 @@ ShinyHuntUnattendedIoATrade::ShinyHuntUnattendedIoATrade() ) , FLY_DURATION( "Fly Duration:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "800" ) , MOVE_DURATION( "Move to Beartic Duration:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "300" ) , MASH_TO_TRADE_DELAY( "Mash to Trade Delay:
Time to perform the trade.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "30 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp index cdc1a3273..c3979cb1d 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp @@ -37,7 +37,7 @@ ShinyHuntUnattendedRegi_Descriptor::ShinyHuntUnattendedRegi_Descriptor() ShinyHuntUnattendedRegi::ShinyHuntUnattendedRegi() : START_TO_RUN_DELAY( "Start to Run Delay:
This needs to be carefully calibrated.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1990" ) @@ -46,12 +46,12 @@ ShinyHuntUnattendedRegi::ShinyHuntUnattendedRegi() ) , CORRECTION_INTERVAL( "Correction Interval:
Periodically leave the building to fix broken lights. Zero disables these corrections.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 20 ) , TRANSITION_DELAY( "Transition Delay:
Time to enter/exit the building.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp index 3b8851cdc..65e084c5a 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp @@ -37,12 +37,12 @@ ShinyHuntUnattendedRegigigas2_Descriptor::ShinyHuntUnattendedRegigigas2_Descript ShinyHuntUnattendedRegigigas2::ShinyHuntUnattendedRegigigas2() : REVERSAL_PP( "Reversal PP:
The amount of Reversal PP you are saved with.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 24 ) , START_TO_ATTACK_DELAY( "Start to Attack Delay:
This needs to be carefully calibrated.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "3750" ) @@ -51,13 +51,13 @@ ShinyHuntUnattendedRegigigas2::ShinyHuntUnattendedRegigigas2() ) , ATTACK_TO_CATCH_DELAY( "Attack to Catch Delay:
Increase this if you seem to be catching Regigigas very often.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "9 * TICKS_PER_SECOND" ) , CATCH_TO_OVERWORLD_DELAY( "Catch to Overworld Delay:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp index 0870f1dff..ad5148ce8 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp @@ -36,13 +36,13 @@ ShinyHuntUnattendedStrongSpawn_Descriptor::ShinyHuntUnattendedStrongSpawn_Descri ShinyHuntUnattendedStrongSpawn::ShinyHuntUnattendedStrongSpawn() : ENTER_GAME_TO_RUN_DELAY( "Enter Game to Run Delay:
This needs to be carefully calibrated.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2280" ) , START_GAME_WAIT_DELAY( "Start Game Wait Delay:
Decrease this if your game starts quickly.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "20 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp index a6e6e0dff..86b35801c 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp @@ -37,13 +37,13 @@ ShinyHuntUnattendedSwordsOfJustice_Descriptor::ShinyHuntUnattendedSwordsOfJustic ShinyHuntUnattendedSwordsOfJustice::ShinyHuntUnattendedSwordsOfJustice() : EXIT_CAMP_TO_RUN_DELAY( "Exit Camp to Run Delay:
This needs to be carefully calibrated.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "1890" ) , AIRPLANE_MODE( "Airplane Mode:
Enable if airplane mode is on.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , m_advanced_options( @@ -51,7 +51,7 @@ ShinyHuntUnattendedSwordsOfJustice::ShinyHuntUnattendedSwordsOfJustice() ) , ENTER_CAMP_DELAY( "Enter Camp Delay:", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "8 * TICKS_PER_SECOND" ) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp index 6d5d60167..a1dcd6c4a 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp @@ -34,7 +34,7 @@ ShinyEncounterTester::ShinyEncounterTester() {EncounterType::Wild, "wild", "Wild Encounter"}, {EncounterType::Raid, "raid", "Raid Den"}, }, - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, EncounterType::Wild ) { diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp index d1189f5ba..22d7ffee8 100644 --- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp +++ b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp @@ -42,12 +42,12 @@ std::unique_ptr MineruItemDuper_Descriptor::make_stats() const { MineruItemDuper::MineruItemDuper() : AMOUNT( "Duplication Amount:
The number of items you wish to duplicate.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, 900 ) , IS_ZONAI_DEVICE( "Is Zonai Device:
Whether or not you are duplicating a Zonai device, or just a normal material.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, false ) , GO_HOME_WHEN_DONE(false) diff --git a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.cpp b/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.cpp index 5608160c3..837e8ddec 100644 --- a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.cpp +++ b/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.cpp @@ -20,36 +20,36 @@ GameSettings& GameSettings::instance(){ return settings; } GameSettings::GameSettings() - : BatchOption(LockWhileRunning::LOCKED) + : BatchOption(LockWhileRunning::LOCK_WHILE_RUNNING) , m_menu_navigation("Menu Navigation Timings:") , GAME_TO_HOME_DELAY( "Game to Home Delay:
Delay from pressing home to entering the the Switch home menu.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "125" ) , m_start_game_timings("Start Game Timings:") , START_GAME_MASH( "1. Start Game Mash:
Mash A for this long to start the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "2 * TICKS_PER_SECOND" ) , START_GAME_WAIT( "2. Start Game Wait:
Wait this long for the game to load.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "60 * TICKS_PER_SECOND" ) , ENTER_GAME_MASH( "3. Enter Game Mash:
Mash A for this long to enter the game.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "5 * TICKS_PER_SECOND" ) , ENTER_GAME_WAIT( "4. Enter Game Wait:
Wait this long for the game to enter the overworld.", - LockWhileRunning::LOCKED, + LockWhileRunning::LOCK_WHILE_RUNNING, TICKS_PER_SECOND, "60 * TICKS_PER_SECOND" )