Merge pull request #633 from jw098/autostory

Autostory fixes

Author: jw098

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp

@@ -187,7 +187,7 @@ AutoStory::AutoStory()
     , STARTPOINT_TUTORIAL(
         "<b>Start Point:</b><br>Program will start with this segment.",
         TUTORIAL_SEGMENTS_SELECT_DATABASE(),
-        LockMode::UNLOCK_WHILE_RUNNING,
+        LockMode::LOCK_WHILE_RUNNING,
         "0"
     )
     , ENDPOINT_TUTORIAL(
@@ -679,26 +679,39 @@ std::string AutoStory::end_segment_description(){
     return ALL_AUTO_STORY_SEGMENT_LIST()[segment_index]->end_text();
 }
 
+size_t AutoStory::get_start_segment_index(){
+    size_t start = 0;
 
-void AutoStory::run_autostory(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
-    AutoStoryOptions options{
-        LANGUAGE,
-        STARTERCHOICE,
-        NOTIFICATION_STATUS_UPDATE
-    };    
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        start = STARTPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        start = (INDEX_OF_LAST_TUTORIAL_SEGMENT + 1) + STARTPOINT_MAINSTORY.index();
+    }
+    
+    return start;
+}
 
-    size_t start = STARTPOINT_TUTORIAL.index();
-    size_t end = ENDPOINT_TUTORIAL.index();
+size_t AutoStory::get_end_segment_index(){
+    size_t end = 0;
 
     if (STORY_SECTION == StorySection::TUTORIAL){
-        start = STARTPOINT_TUTORIAL.index();
         end = ENDPOINT_TUTORIAL.index();
     }else if (STORY_SECTION == StorySection::MAIN_STORY){
-        start = (INDEX_OF_LAST_TUTORIAL_SEGMENT + 1) + STARTPOINT_MAINSTORY.index();
         end = (INDEX_OF_LAST_TUTORIAL_SEGMENT + 1) + ENDPOINT_MAINSTORY.index();     
     }
+    
+    return end;
+}
+
+
+void AutoStory::run_autostory(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AutoStoryOptions options{
+        LANGUAGE,
+        STARTERCHOICE,
+        NOTIFICATION_STATUS_UPDATE
+    };    
 
-    for (size_t segment_index = start; segment_index <= end; segment_index++){
+    for (size_t segment_index = get_start_segment_index(); segment_index <= get_end_segment_index(); segment_index++){
         ALL_AUTO_STORY_SEGMENT_LIST()[segment_index]->run_segment(env, context, options);
     }
 }
@@ -777,7 +790,7 @@ void AutoStory::program(SingleSwitchProgramEnvironment& env, ProControllerContex
 
     // Set settings. to ensure autosave is off.
     if (CHANGE_SETTINGS){
-        change_settings_prior_to_autostory(env, context, STARTPOINT_TUTORIAL.index(), LANGUAGE);
+        change_settings_prior_to_autostory(env, context, get_start_segment_index(), LANGUAGE);
     }
 
     run_autostory(env, context);

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h

@@ -50,6 +50,9 @@ class AutoStory : public SingleSwitchProgramInstance, public ConfigOption::Liste
         int loop, int start_loop, int end_loop
     );
 
+    size_t get_start_segment_index();
+    size_t get_end_segment_index();
+
     void run_autostory(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
 private:

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp

@@ -583,29 +583,65 @@ void change_settings_prior_to_autostory(
     size_t current_segment_num,
     Language language
 ){
-    if (current_segment_num == 0){  // can't change settings in the intro cutscene
-        return;
-    }
 
     // get index of `Options` in the Main Menu, which depends on where you are in Autostory
     int8_t options_index;  
     switch(current_segment_num){
         case 0:
+            return; // can't change settings in the intro cutscene
+        case 1:
+        // after Intro cutscene done, in room
+            // Menu
+            // - Options
+            // - Save        
             options_index = 0;
             break;
-        case 1:
+        case 2:
+            // Menu
+            // - Bag  --> unlocked after picked up bag/hat in room. Segment 01, checkpoint 02
+            // - Options
+            // - Save
             options_index = 1;
             break;
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+            // Menu
+            // - Bag
+            // - Boxes --> unlocked after battling Nemona and receiving Pokedex app. Segment 02, checkpoint 04
+            // - Options
+            // - Save        
+            options_index = 2;
+            break;
+        case 7:
+        case 8:
+        case 9:
+            // Menu
+            // - Bag
+            // - Boxes
+            // - Poke Portal --> unlocked after arriving at Los Platos and talking to Nemona. Segment 06, checkpoint 11
+            // - Options
+            // - Save  
+            options_index = 3;
+            break;                    
         default:
-            options_index = 2;        
+            // Menu
+            // - Bag
+            // - Boxes
+            // - Picnic --> unlocked after finishing tutorial. Segment 09, checkpoint 20
+            // - Poke Portal
+            // - Options
+            // - Save          
+            options_index = 4;        
             break;
     }
 
-    bool has_minimap = current_segment_num > 1;  // the minimap only shows up in segment 2 and beyond
+    bool has_minimap = current_segment_num >= 2;  // the minimap only shows up in segment 2 and beyond
 
     enter_menu_from_overworld(env.program_info(), env.console, context, options_index, MenuSide::RIGHT, has_minimap);
     change_settings(env, context, language);
-    if(has_minimap){
+    if(!has_minimap){
         pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
     }else{
         press_Bs_to_back_to_overworld(env.program_info(), env.console, context);    

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp

@@ -43,13 +43,11 @@ void AutoStory_Segment_00::run_segment(
 
     context.wait_for_all_requests();
     env.console.log("Start Segment 00: Intro Cutscene", COLOR_ORANGE);
-    env.console.overlay().add_log("Start Segment 00: Intro Cutscene", COLOR_ORANGE);
 
     checkpoint_00(env, context);
 
     context.wait_for_all_requests();
     env.console.log("End Segment 00: Intro Cutscene", COLOR_GREEN);
-    env.console.overlay().add_log("End Segment 00: Intro Cutscene", COLOR_GREEN);
     stats.m_segment++;
     env.update_stats();
 }

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp

@@ -55,15 +55,13 @@ void AutoStory_Segment_01::run_segment(
 
     context.wait_for_all_requests();
     env.console.log("Start Segment 01: Pick Starter", COLOR_ORANGE);
-    env.console.overlay().add_log("Start Segment 01: Pick Starter", COLOR_ORANGE);
 
     checkpoint_01(env, context, options.notif_status_update, options.language);
     checkpoint_02(env, context, options.notif_status_update);
     checkpoint_03(env, context, options.notif_status_update, options.language, options.starter_choice);
 
     context.wait_for_all_requests();
-    env.console.log("End Segment 02: Pick Starter", COLOR_GREEN);
-    env.console.overlay().add_log("End Segment 02: Pick Starter", COLOR_GREEN);
+    env.console.log("End Segment 01: Pick Starter", COLOR_GREEN);
     stats.m_segment++;
     env.update_stats();    
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp

@@ -50,13 +50,11 @@ void AutoStory_Segment_02::run_segment(
 
     context.wait_for_all_requests();
     env.console.log("Start Segment 02: First Nemona Battle", COLOR_ORANGE);
-    env.console.overlay().add_log("Start Segment 02: First Nemona Battle", COLOR_ORANGE);
 
     checkpoint_04(env, context, options.notif_status_update);
 
     context.wait_for_all_requests();
     env.console.log("End Segment 02: First Nemona Battle", COLOR_GREEN);
-    env.console.overlay().add_log("End Segment 02: First Nemona Battle", COLOR_GREEN);
     stats.m_segment++;
     env.update_stats(); 
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp

@@ -45,15 +45,13 @@ void AutoStory_Segment_03::run_segment(SingleSwitchProgramEnvironment& env, ProC
 
     context.wait_for_all_requests();
     env.console.log("Start Segment 03: Catch Tutorial", COLOR_ORANGE);
-    env.console.overlay().add_log("Start Segment 03: Catch Tutorial", COLOR_ORANGE);
 
     checkpoint_05(env, context, options.notif_status_update);
     checkpoint_06(env, context, options.notif_status_update);
     checkpoint_07(env, context, options.notif_status_update);
 
     context.wait_for_all_requests();
     env.console.log("End Segment 03: Catch Tutorial", COLOR_GREEN);
-    env.console.overlay().add_log("End Segment 03: Catch Tutorial", COLOR_GREEN);
     stats.m_segment++;
     env.update_stats();
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp

@@ -51,13 +51,11 @@ void AutoStory_Segment_04::run_segment(
 
     context.wait_for_all_requests();
     env.console.log("Start Segment 04: Rescue Legendary", COLOR_ORANGE);
-    env.console.overlay().add_log("Start Segment 04: Rescue Legendary", COLOR_ORANGE);
 
     checkpoint_08(env, context, options.notif_status_update);
 
     context.wait_for_all_requests();
     env.console.log("End Segment 04: Rescue Legendary", COLOR_GREEN);
-    env.console.overlay().add_log("End Segment 04: Rescue Legendary", COLOR_GREEN);
     stats.m_segment++;
     env.update_stats();
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp

@@ -49,14 +49,12 @@ void AutoStory_Segment_05::run_segment(
 
     context.wait_for_all_requests();
     env.console.log("Start Segment 05: First Arven Battle", COLOR_ORANGE);
-    env.console.overlay().add_log("Start Segment 05: First Arven Battle", COLOR_ORANGE);
 
     checkpoint_09(env, context, options.notif_status_update);
     checkpoint_10(env, context, options.notif_status_update);
 
     context.wait_for_all_requests();
     env.console.log("End Segment 05: First Arven Battle", COLOR_GREEN);
-    env.console.overlay().add_log("End Segment 05: First Arven Battle", COLOR_GREEN);
     stats.m_segment++;
     env.update_stats();
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp

@@ -48,13 +48,11 @@ void AutoStory_Segment_06::run_segment(
 
     context.wait_for_all_requests();
     env.console.log("Start Segment 06: Go to Los Platos", COLOR_ORANGE);
-    env.console.overlay().add_log("Start Segment 06: Go to Los Platos", COLOR_ORANGE);
 
     checkpoint_11(env, context, options.notif_status_update);
 
     context.wait_for_all_requests();
     env.console.log("End Segment 06: Go to Los Platos", COLOR_GREEN);
-    env.console.overlay().add_log("End Segment 06: Go to Los Platos", COLOR_GREEN);
     stats.m_segment++;
     env.update_stats();