From 297854df0e8f3768bcdec8f96c5a4909e2fb4c31 Mon Sep 17 00:00:00 2001
From: Mysticial <a-yee@u.northwestern.edu>
Date: Mon, 11 Sep 2023 13:33:32 -0700
Subject: [PATCH] Fixups.

---
 .../Source/PokemonBDSP/PokemonBDSP_Panels.cpp |  5 ++++-
 .../Source/PokemonLA/PokemonLA_Panels.cpp     |  3 ++-
 .../Source/PokemonSV/PokemonSV_Panels.cpp     | 13 ++++++-------
 .../PokemonSV_AutonomousBallThrower.cpp       |  1 +
 .../General/PokemonSV_TournamentFarmer.cpp    |  5 ++++-
 .../Source/PokemonSwSh/PokemonSwSh_Panels.cpp | 19 ++++++++-----------
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp
index 922b38773..c764089a3 100644
--- a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp
@@ -70,7 +70,6 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     ret.emplace_back(make_single_switch_program<MoneyFarmerRoute210_Descriptor, MoneyFarmerRoute210>());
     ret.emplace_back(make_single_switch_program<DoublesLeveling_Descriptor, DoublesLeveling>());
     ret.emplace_back(make_single_switch_program<AmitySquarePickUpFarmer_Descriptor, AmitySquarePickUpFarmer>());
-    ret.emplace_back(make_single_switch_program<PoffinCooker_Descriptor, PoffinCooker>());
     ret.emplace_back(make_single_switch_program<GiftBerryReset_Descriptor, GiftBerryReset>());
 
     ret.emplace_back("---- Shiny Hunting ----");
@@ -92,6 +91,10 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     ret.emplace_back("---- Glitches (v1.1.2) ----");
     ret.emplace_back(make_single_switch_program<ActivateMenuGlitch112_Descriptor, ActivateMenuGlitch112>());
 
+    if (PreloadSettings::instance().DEVELOPER_MODE){
+        ret.emplace_back("---- Untested/Beta/WIP ----");
+        ret.emplace_back(make_single_switch_program<PoffinCooker_Descriptor, PoffinCooker>());
+    }
     if (PreloadSettings::instance().DEVELOPER_MODE){
         ret.emplace_back("---- Developer Tools ----");
         ret.emplace_back(make_single_switch_program<ShinyEncounterTester_Descriptor, ShinyEncounterTester>());
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.cpp b/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.cpp
index f0f76cad4..9e87d55ec 100644
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.cpp
+++ b/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.cpp
@@ -93,10 +93,11 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     ret.emplace_back(make_single_switch_program<ShinyHuntFlagPin_Descriptor, ShinyHuntFlagPin>());
     ret.emplace_back(make_single_switch_program<PostMMOSpawnReset_Descriptor, PostMMOSpawnReset>());
     ret.emplace_back(make_single_switch_program<ShinyHuntCustomPath_Descriptor, ShinyHuntCustomPath>());
+
     if (PreloadSettings::instance().DEVELOPER_MODE){
+        ret.emplace_back("---- Untested/Beta/WIP ----");
         ret.emplace_back(make_single_switch_program<AutoMultiSpawn_Descriptor, AutoMultiSpawn>());
     }
-
     if (PreloadSettings::instance().DEVELOPER_MODE){
         ret.emplace_back("---- Developer Tools ----");
         ret.emplace_back(make_single_switch_program<MountDetectionTest_Descriptor, MountDetectionTest>());
diff --git a/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp b/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp
index 3ab8c4ca0..d3eaae476 100644
--- a/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp
+++ b/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp
@@ -78,10 +78,8 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
 //    ret.emplace_back("---- Trading ----");
     ret.emplace_back(make_multi_switch_program<SelfBoxTrade_Descriptor, SelfBoxTrade>());
 
-//    if (PreloadSettings::instance().DEVELOPER_MODE) {
-//        ret.emplace_back("---- Sandwiches ----");
-        ret.emplace_back(make_single_switch_program<SandwichMaker_Descriptor, SandwichMaker>());
-//    }
+//    ret.emplace_back("---- Sandwiches ----");
+    ret.emplace_back(make_single_switch_program<SandwichMaker_Descriptor, SandwichMaker>());
 
     ret.emplace_back("---- Farming ----");
     ret.emplace_back(make_single_switch_program<LPFarmer_Descriptor, LPFarmer>());
@@ -109,14 +107,15 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
 
     ret.emplace_back("---- Shiny Hunting ----");
     ret.emplace_back(make_single_switch_program<ShinyHuntAreaZeroPlatform_Descriptor, ShinyHuntAreaZeroPlatform>());
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back(make_single_switch_program<ShinyHuntScatterbug_Descriptor, ShinyHuntScatterbug>());
-    }
 
     ret.emplace_back("---- Glitches ----");
     ret.emplace_back(make_single_switch_program<RideCloner101_Descriptor, RideCloner101>());
     ret.emplace_back(make_single_switch_program<CloneItems101_Descriptor, CloneItems101>());
 
+    if (PreloadSettings::instance().DEVELOPER_MODE){
+        ret.emplace_back("---- Untested/Beta/WIP ----");
+        ret.emplace_back(make_single_switch_program<ShinyHuntScatterbug_Descriptor, ShinyHuntScatterbug>());
+    }
     if (PreloadSettings::instance().DEVELOPER_MODE){
         ret.emplace_back("---- Developer Tools ----");
         ret.emplace_back(make_single_switch_program<SoundListener_Descriptor, SoundListener>());
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
index bc3833c41..11dc2205e 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
+++ b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
@@ -117,6 +117,7 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
         USE_FIRST_MOVE_IF_CANNOT_THROW_BALL,
         [&]{
             stats.m_balls++;
+            env.update_stats();
         }
     );
     env.update_stats();
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp
index 9fa53be61..26ae23d07 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp
+++ b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp
@@ -4,6 +4,7 @@
  *
  */
 
+#include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonFramework/ImageTools/ImageFilter.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
@@ -140,7 +141,9 @@ TournamentFarmer::TournamentFarmer()
     })
     , m_stop_after_current(false)
 {
-    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    if (PreloadSettings::instance().DEVELOPER_MODE){
+        PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    }
     PA_ADD_OPTION(NUM_ROUNDS);
     PA_ADD_OPTION(TRY_TO_TERASTILLIZE);
     PA_ADD_OPTION(SAVE_NUM_ROUNDS);
diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp
index c9a5c2d24..bfad9db69 100644
--- a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp
+++ b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp
@@ -121,9 +121,7 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     ret.emplace_back("---- Date-Spam Farmers ----");
     ret.emplace_back(make_single_switch_program<WattFarmer_Descriptor, WattFarmer>());
     ret.emplace_back(make_single_switch_program<BerryFarmer_Descriptor, BerryFarmer>());
-//    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back(make_single_switch_program<BerryFarmer2_Descriptor, BerryFarmer2>());
-//    }
+    ret.emplace_back(make_single_switch_program<BerryFarmer2_Descriptor, BerryFarmer2>());
     ret.emplace_back(make_single_switch_program<LotoFarmer_Descriptor, LotoFarmer>());
     ret.emplace_back(make_single_switch_program<StowOnSideFarmer_Descriptor, StowOnSideFarmer>());
     ret.emplace_back(make_single_switch_program<DailyHighlightFarmer_Descriptor, DailyHighlightFarmer>());
@@ -175,19 +173,15 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     ret.emplace_back(make_single_switch_program<EggHatcher_Descriptor, EggHatcher>());
     ret.emplace_back(make_single_switch_program<EggCombined2_Descriptor, EggCombined2>());
     ret.emplace_back(make_single_switch_program<EggSuperCombined2_Descriptor, EggSuperCombined2>());
-//    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back(make_single_switch_program<EggAutonomous_Descriptor, EggAutonomous>());
-//    }
+    ret.emplace_back(make_single_switch_program<EggAutonomous_Descriptor, EggAutonomous>());
     ret.emplace_back(make_single_switch_program<GodEggItemDupe_Descriptor, GodEggItemDupe>());
     if (PreloadSettings::instance().NAUGHTY_MODE){
         ret.emplace_back(make_single_switch_program<GodEggDuplication_Descriptor, GodEggDuplication>());
     }
 
-//    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back("---- RNG ----");
-        ret.emplace_back(make_single_switch_program<SeedFinder_Descriptor, SeedFinder>());
-        ret.emplace_back(make_single_switch_program<CramomaticRNG_Descriptor, CramomaticRNG>());
-//    }
+    ret.emplace_back("---- RNG ----");
+    ret.emplace_back(make_single_switch_program<SeedFinder_Descriptor, SeedFinder>());
+    ret.emplace_back(make_single_switch_program<CramomaticRNG_Descriptor, CramomaticRNG>());
 
     ret.emplace_back("---- Multi-Switch Programs ----");
     ret.emplace_back(make_multi_switch_program<SynchronizedSpinning_Descriptor, SynchronizedSpinning>());
@@ -198,6 +192,9 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     ret.emplace_back(make_multi_switch_program<MaxLairStrongBoss_Descriptor, MaxLairStrongBoss>());
     ret.emplace_back(make_multi_switch_program<MaxLairBossFinder_Descriptor, MaxLairBossFinder>());
 
+    if (PreloadSettings::instance().DEVELOPER_MODE){
+//        ret.emplace_back("---- Untested/Beta/WIP ----");
+    }
     if (PreloadSettings::instance().DEVELOPER_MODE){
         ret.emplace_back("---- Developer Tools ----");
         ret.emplace_back(make_single_switch_program<ShinyEncounterTester_Descriptor, ShinyEncounterTester>());