rearrange Autostory Segments - end each (main story) segment in a Pokecenter.

Author: jw098

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

@@ -83,7 +83,7 @@ std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_19>());
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_20>());
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_21>());
-    segment_list.emplace_back(std::make_unique<AutoStory_Segment_22>());
+    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_22>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_23>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_24>());
 

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

@@ -37,7 +37,7 @@ std::string AutoStory_Segment_17::start_text() const{
 }
 
 std::string AutoStory_Segment_17::end_text() const{
-    return "End: Defeated Cascarrafa Gym (Water). Inside Cascarrafa Gym building.";
+    return "End: Defeated Cascarrafa Gym (Water). At Porto Marinada Pokecenter.";
 }
 
 void AutoStory_Segment_17::run_segment(
@@ -177,6 +177,16 @@ void checkpoint_38(
         env.console.log("Battle Water Gym.");
         run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
         mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+        
+        // Gym now defeated. now in Cascaraffa gym building
+        context.wait_for_all_requests();
+        pbf_move_left_joystick(context, 128, 255, 500, 100);
+        pbf_wait(context, 3 * TICKS_PER_SECOND);
+        // wait for overworld after leaving Gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        // fly to Porto Marinada pokecenter
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 80, 150});        
 
         break;
     }catch(OperationFailedException&){

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

@@ -37,7 +37,7 @@ void checkpoint_37(
 );
 
 // start: Won auction at Porto Marinada, passed Gym challenge.
-// end: Defeat Cascarrafa Gym
+// end: Defeat Cascarrafa Gym. At Porto Marinada Pokecenter.
 void checkpoint_38(
     SingleSwitchProgramEnvironment& env,
     ProControllerContext& context,

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

@@ -34,7 +34,7 @@ std::string AutoStory_Segment_18::name() const{
 }
 
 std::string AutoStory_Segment_18::start_text() const{
-    return "Start: Defeated Cascarrafa Gym (Water). Inside Cascarrafa Gym building.";
+    return "Start: Defeated Cascarrafa Gym (Water). At Porto Marinada Pokecenter.";
 }
 
 std::string AutoStory_Segment_18::end_text() const{
@@ -79,14 +79,6 @@ void checkpoint_39(
         }         
         context.wait_for_all_requests();
 
-        pbf_move_left_joystick(context, 128, 255, 500, 100);
-        pbf_wait(context, 3 * TICKS_PER_SECOND);
-        // wait for overworld after leaving Gym
-        wait_for_overworld(env.program_info(), env.console, context, 30);
-
-        // fly to Porto Marinada pokecenter
-        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 80, 150});
-
         DirectionDetector direction;
 
         // section 1

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

@@ -27,7 +27,7 @@ class AutoStory_Segment_18 : public AutoStory_Segment{
 };
 
 
-// start: Defeated Cascarrafa Gym (Water). At Cascarrafa Gym.
+// start: Defeated Cascarrafa Gym (Water). At Porto Marinada Pokecenter.
 // end: Defeated Great Tusk/Iron Treads. 
 void checkpoint_39(
     SingleSwitchProgramEnvironment& env,

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

@@ -39,7 +39,7 @@ std::string AutoStory_Segment_20::start_text() const{
 }
 
 std::string AutoStory_Segment_20::end_text() const{
-    return "End: Defeated Artazon Gym (Grass). Inside gym building.";
+    return "End: Defeated Artazon Gym (Grass). At East Province (Area One) Pokecenter.";
 }
 
 void AutoStory_Segment_20::run_segment(
@@ -58,6 +58,7 @@ void AutoStory_Segment_20::run_segment(
     checkpoint_43(env, context, options.notif_status_update, stats);
     checkpoint_44(env, context, options.notif_status_update, stats);
     checkpoint_45(env, context, options.notif_status_update, stats);
+    checkpoint_46(env, context, options.notif_status_update, stats);
 
     context.wait_for_all_requests();
     env.console.log("End Segment " + name(), COLOR_GREEN);
@@ -559,6 +560,71 @@ void checkpoint_45(
 
 
 
+void checkpoint_46(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    EventNotificationOption& notif_status_update,
+    AutoStoryStats& stats
+){
+    
+    bool first_attempt = true;
+    while (true){
+    try{
+        if (first_attempt){
+            checkpoint_save(env, context, notif_status_update, stats);
+            first_attempt = false;
+        }else{
+            enter_menu_from_overworld(env.program_info(), env.console, context, -1);
+            // we wait 10 seconds then save, so that the initial conditions are slightly different on each reset.
+            env.log("Wait 10 seconds.");
+            context.wait_for(Milliseconds(10 * 1000));
+            save_game_from_overworld(env.program_info(), env.console, context);
+        }
+        
+        context.wait_for_all_requests();
+
+        pbf_move_left_joystick(context, 128, 255, 500, 100);
+        pbf_wait(context, 3 * TICKS_PER_SECOND);
+        // wait for overworld after leaving Gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        // fly to Porto Marinada pokecenter
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, 255, 128, 50});
+
+        // section 1. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 255, 0, 50},
+            {ZoomChange::ZOOM_IN, 0, 0, 0}
+        );        
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            128, 0, 80, 20, false);  
+
+        // section 2. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 180, 0, 30);
+        });      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            128, 15, 12, 12, false);             
+       
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+
+        break;
+    }catch(OperationFailedException&){
+        context.wait_for_all_requests();
+        env.console.log("Resetting from checkpoint.");
+        reset_game(env.program_info(), env.console, context);
+        stats.m_reset++;
+        env.update_stats();
+    }         
+    }
+
+
+
+}
 
 }
 }

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

@@ -53,6 +53,14 @@ void checkpoint_45(
     AutoStoryStats& stats
 );
 
+// start: Defeated Artazon Gym (Grass). Inside gym building.
+// end: At East Province (Area One) Pokecenter.
+void checkpoint_46(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    AutoStoryStats& stats
+);
 
 
 }