Fix build. Add untested loss recovery.

PokemonAutomation · Dec 29, 2023 · 88c6fee · 88c6fee
1 parent 8212db2
commit 88c6fee
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SinglesMoveTable.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SinglesMoveTable.cpp
@@ -102,7 +102,6 @@ SinglesMoveTable::SinglesMoveTable(std::string label, bool trainer_battle)
         LockMode::UNLOCK_WHILE_RUNNING,
         make_defaults(trainer_battle)
     )
-    , m_trainer_battle(trainer_battle)
 {}
 
 std::vector<SinglesMoveEntry> SinglesMoveTable::snapshot(){

diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SinglesMoveTable.h b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SinglesMoveTable.h
@@ -64,9 +64,6 @@ class SinglesMoveTable : public EditableTableOption_t<SinglesMoveTableRow>{
     virtual std::vector<std::string> make_header() const;
 
     static std::vector<std::unique_ptr<EditableTableRow>> make_defaults(bool trainer_battle);
-
-private:
-    bool m_trainer_battle;
 };
 
 

diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp
@@ -557,7 +557,7 @@ void TournamentFarmer::handle_end_of_tournament(SingleSwitchProgramEnvironment&
 
 
 //Fly to academy from west pokemon center after losing.
-void TournamentFarmer::return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
+void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
     env.log("Tournament lost! Navigating back to academy.");
     open_map_from_overworld(env.program_info(), env.console, context);
     pbf_press_button(context, BUTTON_ZR, 50, 40);

diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h
@@ -21,6 +21,10 @@ namespace NintendoSwitch{
 namespace PokemonSV{
 
 
+void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
+
+
+
 class TournamentFarmer_Descriptor : public SingleSwitchProgramDescriptor{
 public:
     TournamentFarmer_Descriptor();
@@ -64,7 +68,6 @@ class TournamentFarmer : public SingleSwitchProgramInstance, public ButtonListen
     void run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
     void check_prize(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
     void handle_end_of_tournament(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
 };
 
 }

diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp
@@ -17,6 +17,7 @@
 #include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
 #include "PokemonSV/Programs/PokemonSV_SaveGame.h"
 #include "PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h"
+#include "PokemonSV_TournamentFarmer.h"
 #include "PokemonSV_TournamentFarmer2.h"
 
 namespace PokemonAutomation{
@@ -146,6 +147,7 @@ class TournamentFarmer2::ResetOnExit{
 };
 
 
+
 void TournamentFarmer2::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
     assert_16_9_720p_min(env.logger(), env.console);
     TournamentFarmer2_Descriptor::Stats& stats = env.current_stats<TournamentFarmer2_Descriptor::Stats>();
@@ -265,6 +267,10 @@ void TournamentFarmer2::program(SingleSwitchProgramEnvironment& env, BotBaseCont
             }
 
 
+            if (battle_lost){
+                return_to_academy_after_loss(env, context);
+                break;
+            }
         }
 
         //  Tournament won