add autostory to panels

PokemonAutomation · Sep 19, 2024 · 6b34cb7 · 6b34cb7
1 parent 6d8026a
commit 6b34cb7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -1426,6 +1426,8 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSV/PokemonSV_Panels.h
     Source/PokemonSV/PokemonSV_Settings.cpp
     Source/PokemonSV/PokemonSV_Settings.h
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h
     Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp

diff --git a/SerialPrograms/SerialPrograms.pro b/SerialPrograms/SerialPrograms.pro
@@ -712,6 +712,7 @@ SOURCES += \
     Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp \
     Source/PokemonSV/PokemonSV_Panels.cpp \
     Source/PokemonSV/PokemonSV_Settings.cpp \
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.cpp \
@@ -1797,6 +1798,7 @@ HEADERS += \
     Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h \
     Source/PokemonSV/PokemonSV_Panels.h \
     Source/PokemonSV/PokemonSV_Settings.h \
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.h \

diff --git a/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp b/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp
@@ -54,6 +54,8 @@
 #include "Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h"
 #include "Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.h"
 
+#include "Programs/AutoStory/PokemonSV_AutoStory.h"
+
 #include "Programs/Glitches/PokemonSV_RideCloner-1.0.1.h"
 #include "Programs/Glitches/PokemonSV_CloneItems-1.0.1.h"
 
@@ -144,6 +146,8 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
         // || IS_BETA_VERSION
     ){
         ret.emplace_back("---- Untested/Beta/WIP ----");
+        ret.emplace_back("---- Story Automation ----");
+        ret.emplace_back(make_single_switch_program<AutoStory_Descriptor, AutoStory>());
     }
     if (IS_BETA_VERSION){
     }

diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
@@ -378,9 +378,9 @@ void AutoStory::test_checkpoints(
     int start, int end, 
     int loop, int start_loop, int end_loop
 ){
-    EventNotificationOption& notif_status_update = NOTIFICATION_STATUS_UPDATE;
-    Language language = LANGUAGE;
-    StarterChoice starter_choice = STARTERCHOICE;
+    // EventNotificationOption& notif_status_update = NOTIFICATION_STATUS_UPDATE;
+    // Language language = LANGUAGE;
+    // StarterChoice starter_choice = STARTERCHOICE;
     std::vector<std::function<void()>> checkpoint_list;
     // checkpoint_list.push_back([&](){checkpoint_00(env, context);});
     // checkpoint_list.push_back([&](){checkpoint_01(env, context, notif_status_update, language);});
@@ -446,8 +446,8 @@ void AutoStory::test_checkpoints(
 
 
 void AutoStory::run_autostory(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
-    switch (STARTPOINT){
+    // AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
+    // switch (STARTPOINT){
     // case StartPoint::INTRO_CUTSCENE:
     //     context.wait_for_all_requests();
     //     env.console.log("Start Segment 00: Intro Cutscene", COLOR_ORANGE);
@@ -584,10 +584,10 @@ void AutoStory::run_autostory(SingleSwitchProgramEnvironment& env, BotBaseContex
     //     if (ENDPOINT == EndPoint::MESAGOZA_SOUTH){
     //         break;
     //     }
-    default:
-        break;
+    // default:
+    //     break;
 
-    }
+    // }
 }
 
 void AutoStory::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){