Skip to content

Commit

Permalink
Fixups.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mysticial
Mysticial committed Sep 11, 2023
1 parent 5801710 commit 297854d
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 21 deletions.
5 changes: 4 additions & 1 deletion SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----");
Expand All @@ -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>());
Expand Down
3 changes: 2 additions & 1 deletion SerialPrograms/Source/PokemonLA/PokemonLA_Panels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>());
Expand Down
13 changes: 6 additions & 7 deletions SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>());
Expand Down Expand Up @@ -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>());
Expand Down
1 change: 1 addition & 0 deletions SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 4 additions & 1 deletion SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
*/

#include "CommonFramework/GlobalSettingsPanel.h"
#include "CommonFramework/Exceptions/OperationFailedException.h"
#include "CommonFramework/ImageTools/ImageFilter.h"
#include "CommonFramework/Notifications/ProgramNotifications.h"
Expand Down Expand Up @@ -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);
Expand Down
19 changes: 8 additions & 11 deletions SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>());
Expand Down Expand Up @@ -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>());
Expand All @@ -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>());
Expand Down

0 comments on commit 297854d

Please sign in to comment.