Skip to content

Cram o matic: improved default table and fix double notification #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mysticial merged 2 commits into from
Dec 31, 2024
Merged

Cram o matic: improved default table and fix double notification #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b30995
send "could not detect bag" notification only once
fyex Dec 30, 2024
5f98c24
Add default priority selection to SwSh Cram-o-matic RNG
fyex Dec 30, 2024
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
12 changes: 11 additions & 1 deletion SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ CramomaticRow::CramomaticRow(EditableTableOption& parent_table)
PA_ADD_OPTION(is_bonus);
PA_ADD_OPTION(priority);
}

CramomaticRow::CramomaticRow(EditableTableOption& parent_table, CramomaticBallType p_ball_type, bool p_is_bonus, uint16_t p_priority)
: CramomaticRow(parent_table)
{
ball_type.set(p_ball_type);
is_bonus = p_is_bonus;
priority.set(p_priority);
}

std::unique_ptr<EditableTableRow> CramomaticRow::clone() const{
std::unique_ptr<CramomaticRow> ret(new CramomaticRow(parent()));
ret->ball_type.set_value(ball_type.current_value());
Expand Down Expand Up @@ -79,7 +88,8 @@ std::vector<std::string> CramomaticTable::make_header() const{

std::vector<std::unique_ptr<EditableTableRow>> CramomaticTable::make_defaults(){
std::vector<std::unique_ptr<EditableTableRow>> ret;
ret.emplace_back(std::make_unique<CramomaticRow>(*this));
ret.emplace_back(std::make_unique<CramomaticRow>(*this, CramomaticBallType::Apricorn, true, 1));
ret.emplace_back(std::make_unique<CramomaticRow>(*this, CramomaticBallType::Apricorn, false, 0));
return ret;
}

Expand Down
1 change: 1 addition & 0 deletions SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ struct CramomaticSelection
class CramomaticRow : public EditableTableRow{
public:
CramomaticRow(EditableTableOption& parent_table);
CramomaticRow(EditableTableOption& parent_table, CramomaticBallType p_ball_type, bool p_is_bonus, uint16_t p_priority);
virtual std::unique_ptr<EditableTableRow> clone() const;

public:
Expand Down
4 changes: 1 addition & 3 deletions SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,6 @@ void CramomaticRNG::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
}catch (OperationFailedException& e){
stats.errors++;
env.update_stats();
e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);

apricorn_selection_errors++;
if (apricorn_selection_errors >= 3){
Expand All @@ -497,8 +496,7 @@ void CramomaticRNG::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
"Could not detect the bag three times on a row."
);
}
VideoSnapshot screen = env.console.video().snapshot();
send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, "Could not detect the bag.", screen);
send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, e.message(), e.screenshot());
is_state_valid = false;
recover_from_wrong_state(env, context);
continue;
Expand Down