Add continue option to auto fossil (#879)

Author: pifopi

.gitignore

@@ -61,4 +61,6 @@ __pycache__
 # Jupyter Notebooks
 *.ipynb
 
+vcpkg/
+
 CLAUDE.md

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp

@@ -115,6 +115,51 @@ void overworld_to_box_system(ConsoleHandle& console, ProControllerContext& conte
     );
 }
 
+void box_system_to_overworld(ConsoleHandle& console, ProControllerContext& context){
+    WallClock deadline = current_time() + std::chrono::seconds(120);
+    while (current_time() < deadline){
+        OverworldPartySelectionWatcher overworld(COLOR_RED, &console.overlay());
+        MainMenuWatcher main_menu(COLOR_GREEN, &console.overlay());
+        BoxWatcher box(COLOR_BLUE, &console.overlay());
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                box,
+            }
+            );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            console.log("Detected Overworld...");
+            return;
+        case 1:
+            console.log("Detected Main Menu...");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+        case 2:
+            console.log("Detected Box System...");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+        default:
+            OperationFailedException::fire(
+                ErrorReport::SEND_ERROR_REPORT,
+                "overworld_to_box_system(): No state detected after 30 seconds.",
+                console
+            );
+        }
+    }
+
+    OperationFailedException::fire(
+        ErrorReport::SEND_ERROR_REPORT,
+        "overworld_to_box_system(): Failed to exit box system after 2 minutes.",
+        console
+    );
+}
+
 
 }
 }

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h

@@ -29,6 +29,12 @@ void overworld_to_box_system(
     ConsoleHandle& console, ProControllerContext& context
 );
 
+// From box system, press B until overworld is reached
+void box_system_to_overworld(
+    ConsoleHandle& console, ProControllerContext& context
+);
+
+
 
 }
 }

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp

@@ -18,6 +18,7 @@
 #include "PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
 #include "PokemonLZA/Programs/PokemonLZA_GameEntry.h"
 #include "PokemonLZA/Programs/PokemonLZA_MenuNavigation.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
@@ -96,6 +97,12 @@ AutoFossil::AutoFossil()
         LockMode::LOCK_WHILE_RUNNING,
         0
     )
+    , CONTINUE_AFTER_FIND(
+        "<b>Continue after finding a match:</b><br>"
+        "After finding a match, the program will go to the next box, save and continue hunting. Beware, it will use a lot of fossils so start the program with a lot of them and enough empty boxes.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
     , TAKE_VIDEO(
         "Take a video When Found:",
         LockMode::UNLOCK_WHILE_RUNNING,
@@ -121,6 +128,7 @@ AutoFossil::AutoFossil()
     PA_ADD_OPTION(NUM_FOSSILS);
     PA_ADD_OPTION(WHICH_FOSSIL);
     PA_ADD_OPTION(STOP_ON);
+    PA_ADD_OPTION(CONTINUE_AFTER_FIND);
     PA_ADD_OPTION(TAKE_VIDEO);
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(NOTIFICATIONS);
@@ -148,22 +156,28 @@ void AutoFossil::program(SingleSwitchProgramEnvironment& env, ProControllerConte
         }
 
         overworld_to_box_system(env.console, context);
+        bool found_match = false;
         for(uint8_t i = 0; i < num_boxes; i++){
             size_t num_fossils_in_box = (i == num_boxes - 1 ? num_fossils_to_revive - i*30 : 30);
-            bool found_match = check_fossils_in_one_box(env, context, i*30, num_fossils_in_box);
-            if (found_match){
+            found_match = check_fossils_in_one_box(env, context, i*30, num_fossils_in_box);
+            if (found_match && !CONTINUE_AFTER_FIND){
                 send_program_finished_notification(env, NOTIFICATION_STATUS);
                 return;
             }
-            if (i != num_boxes - 1){
-                // go to next page
-                pbf_press_button(context, BUTTON_R, 200ms, 200ms);
-            }
+            // go to next page
+            pbf_press_button(context, BUTTON_R, 200ms, 200ms);
         }
-        // checked all boxes, no match
-        go_home(env.console, context);
-        reset_game_from_home(env, env.console, context);
-        
+        if (found_match){
+            // We didn't return early so we must be continuing after finding a match
+            box_system_to_overworld(env.console, context);
+            save_game_to_menu(env.console, context);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+        }else{
+            // checked all boxes, no match
+            go_home(env.console, context);
+            reset_game_from_home(env, env.console, context);
+        }
+
         send_program_status_notification(env, NOTIFICATION_STATUS);
     }
 }
@@ -259,6 +273,7 @@ bool AutoFossil::check_fossils_in_one_box(
 
     uint8_t box_row = 1, box_col = 0;
     bool next_cell_right = true;
+    bool found_match = false;
     BoxDetector box_detector(COLOR_RED, &env.console.overlay());
     BoxPageInfoWatcher info_watcher(&env.console.overlay());
     for(size_t i = 0; i < num_fossils_in_box; i++){
@@ -318,11 +333,14 @@ bool AutoFossil::check_fossils_in_one_box(
                 pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
                 context.wait_for_all_requests();
             }
-            GO_HOME_WHEN_DONE.run_end_of_program(context);
-            return true;
+            if (CONTINUE_AFTER_FIND){
+                found_match = true;
+            }else{
+                GO_HOME_WHEN_DONE.run_end_of_program(context);
+                return true;
+            }
         }
 
-        
         if (next_cell_right){
             if (box_col == 5){
                 box_row++;
@@ -347,7 +365,7 @@ bool AutoFossil::check_fossils_in_one_box(
             }
         }
     }
-    return false;
+    return found_match;
 }
 
 }

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.h

@@ -50,6 +50,7 @@ class AutoFossil : public SingleSwitchProgramInstance{
     SimpleIntegerOption<uint32_t> NUM_FOSSILS;
     IntegerEnumDropdownOption WHICH_FOSSIL;
     PokemonLA::StopOnOption STOP_ON;
+    BooleanCheckBoxOption CONTINUE_AFTER_FIND;
 
     BooleanCheckBoxOption TAKE_VIDEO;
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;