Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ GameSettings::GameSettings()
LockMode::LOCK_WHILE_RUNNING,
"3000 ms"
)
, m_rng_settings("<font size=4><b>RNG Settings:</b></font>")
, HANDLE_ONLINE_LICENSE_CHECK(
"<b>Handle Online License Check:</b><br>"
"Turn this on if your console checks the game's license online when it starts the game: "
Expand All @@ -73,6 +74,12 @@ GameSettings::GameSettings()
LockMode::LOCK_WHILE_RUNNING,
false // default
)
, RUN_RNG_START_CHECKS(
"<b>Run Start Checks:</b><br>"
"Run pre-program validation checks, e.g. that your party has enough free slots.",
LockMode::LOCK_WHILE_RUNNING,
true // default
)
, m_shiny_audio_settings("<font size=4><b>Shiny Audio Settings:</b></font>")
, SHINY_SOUND_THRESHOLD(
"<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
Expand All @@ -98,7 +105,9 @@ GameSettings::GameSettings()
PA_ADD_OPTION(SELECT_BUTTON_MASH0);
PA_ADD_OPTION(ENTER_GAME_WAIT0);
PA_ADD_OPTION(ENTER_GAME_MASH0);
PA_ADD_STATIC(m_rng_settings);
PA_ADD_OPTION(HANDLE_ONLINE_LICENSE_CHECK);
PA_ADD_OPTION(RUN_RNG_START_CHECKS);
PA_ADD_STATIC(m_shiny_audio_settings);
PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ class GameSettings : public BatchOption, private ConfigOption::Listener{
MillisecondsOption SELECT_BUTTON_MASH0;
MillisecondsOption ENTER_GAME_WAIT0;
MillisecondsOption ENTER_GAME_MASH0;

SectionDividerOption m_rng_settings;
BooleanCheckBoxOption HANDLE_ONLINE_LICENSE_CHECK;
BooleanCheckBoxOption RUN_RNG_START_CHECKS;

SectionDividerOption m_shiny_audio_settings;
FloatingPointOption SHINY_SOUND_THRESHOLD;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "Pokemon/Pokemon_Strings.h"
#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartySlot.h"
#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
#include "PokemonFRLG_RngProgram.h"

namespace PokemonAutomation{
Expand Down Expand Up @@ -66,6 +67,10 @@ void RngProgramInstance::run_precheck(
ProControllerContext& context
){
home_black_border_check(env.console, context);
if (!GameSettings::instance().RUN_RNG_START_CHECKS){
env.console.log("Start checks are off in the FRLG Game Settings. Skipping them.");
return;
}
check_free_party_slots(env, context);
}

Expand Down
Loading