more autostory refactoring

Author: jw098

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

@@ -1225,24 +1225,17 @@ void checkpoint_reattempt_loop(
     ProControllerContext& context, 
     EventNotificationOption& notif_status_update,
     AutoStoryStats& stats,
-    std::function<void()>&& action
+    std::function<void(size_t attempt_number)>&& action
 ){
     size_t max_attempts = 100;
-    bool first_attempt = true;
     for (size_t i = 0;;i++){
     try{
-        if (first_attempt){
+        if (i==0){
             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);
         }
 
-        action();
+        context.wait_for_all_requests();
+        action(i);
 
         break;
     }catch(OperationFailedException&){
@@ -1265,6 +1258,37 @@ void checkpoint_reattempt_loop(
 
 }
 
+void checkpoint_reattempt_loop_tutorial(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    EventNotificationOption& notif_status_update,
+    AutoStoryStats& stats,
+    std::function<void(size_t attempt_number)>&& action
+){
+
+    for (size_t i = 0;;i++){
+    try{
+        if(i==0){
+            save_game_tutorial(env.program_info(), env.console, context);
+            stats.m_checkpoint++;
+            env.update_stats();
+            send_program_status_notification(env, notif_status_update, "Saved at checkpoint.");     
+        }
+        
+        context.wait_for_all_requests();
+        action(i);
+
+        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_AutoStoryTools.h

@@ -337,12 +337,23 @@ void move_cursor_towards_flypoint_and_go_there(
 
 void check_num_sunflora_found(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int expected_number);
 
+// run given action, with max_attempts number of attempts
+// save prior to first attempt
+// throw exception if we try to exceed max_attempts.
 void checkpoint_reattempt_loop(
     SingleSwitchProgramEnvironment& env, 
     ProControllerContext& context, 
     EventNotificationOption& notif_status_update,
     AutoStoryStats& stats,
-    std::function<void()>&& action
+    std::function<void(size_t attempt_number)>&& action
+);
+
+void checkpoint_reattempt_loop_tutorial(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    EventNotificationOption& notif_status_update,
+    AutoStoryStats& stats,
+    std::function<void(size_t attempt_number)>&& action
 );
 
 

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

@@ -75,34 +75,17 @@ void checkpoint_01(
     AutoStoryStats& stats, 
     Language language
 ){
-    bool first_attempt = true;
-    while (true){
-    try{
-        if(first_attempt){
-            save_game_tutorial(env.program_info(), env.console, context);
-            stats.m_checkpoint++;
-            env.update_stats();
-            send_program_status_notification(env, notif_status_update, "Saved at checkpoint.");     
-        }
+    checkpoint_reattempt_loop_tutorial(env, context, notif_status_update, stats,
+    [&](size_t attempt_number){
 
         context.wait_for_all_requests();
         // set settings
         enter_menu_from_overworld(env.program_info(), env.console, context, 0, MenuSide::RIGHT, false);
-        change_settings(env, context, language, first_attempt);
+        change_settings(env, context, language, attempt_number==0);
         pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
         context.wait_for_all_requests();
 
-        break;  
-    }catch(OperationFailedException&){
-        // (void)e;
-        first_attempt = false;
-        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();
-    }
-    }
+    });
 }
 
 void checkpoint_02(
@@ -111,16 +94,8 @@ void checkpoint_02(
     EventNotificationOption& notif_status_update,
     AutoStoryStats& stats
 ){
-    bool first_attempt = true;
-    while (true){
-    try{
-        if(first_attempt){
-            save_game_tutorial(env.program_info(), env.console, context);
-            stats.m_checkpoint++;
-            env.update_stats();
-            send_program_status_notification(env, notif_status_update, "Saved at checkpoint.");     
-            first_attempt = false;
-        }
+    checkpoint_reattempt_loop_tutorial(env, context, notif_status_update, stats,
+    [&](size_t attempt_number){
 
         context.wait_for_all_requests();
         env.console.log("Go downstairs, get stopped by Skwovet");
@@ -184,15 +159,7 @@ void checkpoint_02(
         open_map_from_overworld(env.program_info(), env.console, context, true);
         leave_phone_to_overworld(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();
-    }
-    }
+    });
 }
 
 void checkpoint_03(
@@ -204,7 +171,7 @@ void checkpoint_03(
     StarterChoice starter_choice
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){
+    [&](size_t attempt_number){
 
         context.wait_for_all_requests();
         DirectionDetector direction;

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

@@ -68,7 +68,7 @@ void checkpoint_04(
     AutoStoryStats& stats
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){        
+    [&](size_t attempt_number){        
         context.wait_for_all_requests();
 
         DirectionDetector direction;

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

@@ -65,7 +65,7 @@ void checkpoint_05(
     AutoStoryStats& stats
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){         
+    [&](size_t attempt_number){         
         context.wait_for_all_requests();
 
         DirectionDetector direction;
@@ -89,7 +89,7 @@ void checkpoint_06(
     AutoStoryStats& stats
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){        
+    [&](size_t attempt_number){        
 
         context.wait_for_all_requests();
 
@@ -127,7 +127,7 @@ void checkpoint_07(
     AutoStoryStats& stats
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){         
+    [&](size_t attempt_number){         
 
         context.wait_for_all_requests();
         env.console.log("Move to cliff");

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

@@ -68,7 +68,7 @@ void checkpoint_08(
     AutoStoryStats& stats
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){
+    [&](size_t attempt_number){
 
         context.wait_for_all_requests();
 

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

@@ -69,7 +69,7 @@ void checkpoint_09(
     AutoStoryStats& stats
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){
+    [&](size_t attempt_number){
 
         context.wait_for_all_requests();
 
@@ -108,7 +108,7 @@ void checkpoint_10(
     AutoStoryStats& stats
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){
+    [&](size_t attempt_number){
 
         context.wait_for_all_requests();
         env.console.log("Lighthouse view");

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

@@ -68,7 +68,7 @@ void checkpoint_11(
     AutoStoryStats& stats
 ){
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){ 
+    [&](size_t attempt_number){ 
 
         context.wait_for_all_requests();
         do_action_and_monitor_for_battles(env.program_info(), env.console, context,

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

@@ -71,7 +71,7 @@ void checkpoint_12(
     // or when lead pokemon not strong enough to clear them with Let's go
 
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){
+    [&](size_t attempt_number){
 
         fly_to_overlapping_flypoint(env.program_info(), env.console, context);
         context.wait_for_all_requests();

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

@@ -71,7 +71,7 @@ void checkpoint_13(
     // reset rate: 0%. 0 resets out of 70.
 
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){
+    [&](size_t attempt_number){
         do_action_and_monitor_for_battles(env.program_info(), env.console, context,
         [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){                  
 
@@ -108,7 +108,7 @@ void checkpoint_14(
 ){
 
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){
+    [&](size_t attempt_number){
 
         context.wait_for_all_requests();
         // realign diagonally to the left
@@ -155,7 +155,7 @@ void checkpoint_15(
 ){
 
     checkpoint_reattempt_loop(env, context, notif_status_update, stats,
-    [&](){
+    [&](size_t attempt_number){
 
         context.wait_for_all_requests();
         // realign diagonally to the right