Skip to content

Fixed Global Donut Limit Duplicate Count #1075

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 1 commit into from
Jan 30, 2026
Merged

Fixed Global Donut Limit Duplicate Count #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,14 +579,12 @@ void save_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& conte
}

// Check if all user defined limits are reached or the global max keepers limit is reached
bool DonutMaker::should_stop(SingleSwitchProgramEnvironment& env, ProControllerContext& context, const std::vector<uint16_t>& kept_counts){
int total_kept = 0;
bool DonutMaker::should_stop(SingleSwitchProgramEnvironment& env, ProControllerContext& context, const std::vector<uint16_t>& kept_counts, uint16_t total_kept) {
bool limit_reached = true;
for (size_t i = 0; i < kept_counts.size(); i++){
if (kept_counts[i] < FLAVOR_POWERS.snapshot()[i].limit){
limit_reached = false;
}
total_kept += kept_counts[i];
}
if (total_kept >= MAX_KEEPERS){
return true;
Expand Down Expand Up @@ -650,14 +648,16 @@ void DonutMaker::program(SingleSwitchProgramEnvironment& env, ProControllerConte
reset_map_filter_state(env, context);

std::vector<uint16_t> kept_counts(FLAVOR_POWERS.snapshot().size(), 0);
uint16_t total_kept = 0;
while(true){
const bool should_keep = donut_iteration(env, context, kept_counts);
stats.resets++;
env.update_stats();
send_program_status_notification(env, NOTIFICATION_STATUS);

if (should_keep){
if (should_stop(env, context, kept_counts)){
total_kept++;
if (should_stop(env, context, kept_counts, total_kept)){
break;
}
save_donut(env, context);
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class DonutMaker : public SingleSwitchProgramInstance{

private:
bool match_powers(SingleSwitchProgramEnvironment& env, ProControllerContext& context, std::vector<uint16_t>& kept_counts);
bool should_stop(SingleSwitchProgramEnvironment& env, ProControllerContext& context, const std::vector<uint16_t>& kept_counts);
bool should_stop(SingleSwitchProgramEnvironment& env, ProControllerContext& context, const std::vector<uint16_t>& kept_counts, uint16_t total_kept);
void animation_to_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
void add_berries_and_make_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
void open_berry_menu_from_ansha(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
Expand Down
Loading