Skip to content

Added Number of Battles to run and Discord Notifications. #773

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
pifopi merged 2 commits into from
Oct 30, 2025
Merged

Added Number of Battles to run and Discord Notifications. #773

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
dd3fc77
Added Number of Battles to run and discord notifications.
Dalton-V Oct 28, 2025
b36da10
Use stats.battles to track current round
Dalton-V Oct 29, 2025
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
28 changes: 26 additions & 2 deletions SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
#include "PokemonLZA/Inference/PokemonLZA_MoveEffectivenessSymbol.h"
#include "PokemonLZA_RestaurantFarmer.h"
#include "CommonFramework/Notifications/ProgramNotifications.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
Expand Down Expand Up @@ -64,6 +65,19 @@ RestaurantFarmer::~RestaurantFarmer(){

RestaurantFarmer::RestaurantFarmer()
: m_stop_after_current(false)
, NUM_ROUNDS(
"<b>Number of Battles to run:</b><br>Zero will run until 'Stop after Current Battle' is pressed.</b>",
LockMode::UNLOCK_WHILE_RUNNING,
100,
0
),
GO_HOME_WHEN_DONE(false),
NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600)),
NOTIFICATIONS({
&NOTIFICATION_STATUS_UPDATE,
&NOTIFICATION_PROGRAM_FINISH,
&NOTIFICATION_ERROR_FATAL,
})
, MOVE_AI(
"<b>Move Selection AI:</b><br>"
"If enabled, it will be smarter with move selection.<br>"
Expand All @@ -83,6 +97,10 @@ RestaurantFarmer::RestaurantFarmer()
PA_ADD_OPTION(MOVE_AI);
PA_ADD_OPTION(USE_PLUS_MOVES);

PA_ADD_OPTION(NUM_ROUNDS);
PA_ADD_OPTION(GO_HOME_WHEN_DONE);
PA_ADD_OPTION(NOTIFICATIONS);

STOP_AFTER_CURRENT.set_idle();
STOP_AFTER_CURRENT.add_listener(*this);
}
Expand Down Expand Up @@ -354,7 +372,7 @@ void RestaurantFarmer::on_press(){
}

void RestaurantFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){

RestaurantFarmer_Descriptor::Stats& stats = env.current_stats<RestaurantFarmer_Descriptor::Stats>();
m_stop_after_current.store(false, std::memory_order_relaxed);
STOP_AFTER_CURRENT.set_ready();
ResetOnExit reset_button_on_exit(STOP_AFTER_CURRENT);
Expand All @@ -363,13 +381,19 @@ void RestaurantFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
// auto lobby = env.console.video().snapshot();

while (true){
send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
if (NUM_ROUNDS != 0 && stats.battles >= NUM_ROUNDS) {
m_stop_after_current.store(true, std::memory_order_relaxed);
STOP_AFTER_CURRENT.set_pressed();
}
if (run_lobby(env, context)){
break;
}
run_battle(env, context);
}


send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
GO_HOME_WHEN_DONE.run_end_of_program(context);
}


Expand Down
7 changes: 7 additions & 0 deletions SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@

#include <atomic>
#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
#include <Common/Cpp/Options/SimpleIntegerOption.h>
#include "Common/Cpp/Options/ButtonOption.h"
#include "CommonFramework/Notifications/EventNotificationsTable.h"
#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
Expand Down Expand Up @@ -57,6 +60,10 @@ class RestaurantFarmer : public SingleSwitchProgramInstance, public ButtonListen

std::atomic<bool> m_stop_after_current;
StopButton STOP_AFTER_CURRENT;
SimpleIntegerOption<uint32_t> NUM_ROUNDS;
GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
EventNotificationOption NOTIFICATION_STATUS_UPDATE;
EventNotificationsOption NOTIFICATIONS;

BooleanCheckBoxOption MOVE_AI;
BooleanCheckBoxOption USE_PLUS_MOVES;
Expand Down