finish auto fossil

Gin · Gin · commit 35013229efca · 2025-10-29T22:40:48.000-07:00
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h
@@ -16,7 +16,9 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
+// Press Home button to go from game to Switch Home screen
 void go_home(ConsoleHandle& console, ProControllerContext& context);
+// Press Home button to go from game to Switch Home screen
 void go_home(ConsoleHandle& console, JoyconContext& context);
 void ensure_at_home(ConsoleHandle& console, ProControllerContext& context);
 void ensure_at_home(ConsoleHandle& console, JoyconContext& context);
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_AutoFossil.cpp b/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_AutoFossil.cpp
@@ -7,14 +7,19 @@
 #include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "CommonTools/Async/InferenceRoutines.h"
 #include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "PokemonLZA/Programs/PokemonLZA_GameEntry.h"
 #include "PokemonLZA/Programs/PokemonLZA_MenuNavigation.h"
-#include "PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
-#include "PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "PokemonLZA_AutoFossil.h"
 
 #include <sstream>
@@ -54,13 +59,19 @@ class AutoFossil_Descriptor::Stats : public StatsTracker{
 public:
     Stats()
         : fossils(m_stats["Fossils"])
+        , alphas(m_stats["Alphas"])
+        , shinies(m_stats["Shinies"])
         , errors(m_stats["Errors"])
     {
         m_display_order.emplace_back("Fossils");
+        m_display_order.emplace_back("Alphas");
+        m_display_order.emplace_back("Shinies");
         m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
     }
 
     std::atomic<uint64_t>& fossils;
+    std::atomic<uint64_t>& alphas;
+    std::atomic<uint64_t>& shinies;
     std::atomic<uint64_t>& errors;
 };
 
@@ -69,26 +80,60 @@ std::unique_ptr<StatsTracker> AutoFossil_Descriptor::make_stats() const{
 }
 
 
-AutoFossil::AutoFossil(){}
+AutoFossil::AutoFossil()
+    : NUM_BOXES("<b>Boxes of Fossils to Revive:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 32
+    )
+    , FOUND_SHINY_OR_ALPHA(
+        "Found Shiny or Alpha",
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &FOUND_SHINY_OR_ALPHA,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_ON);
+    PA_ADD_OPTION(NUM_BOXES);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
 
 
 void AutoFossil::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
-    check_fossils_in_box(env, context, 1);
-    return;
-
-    // AutoFossil_Descriptor::Stats& stats = env.current_stats<AutoFossil_Descriptor::Stats>();
-    overworld_to_box_system(env.console, context);
-    return;
+    while(true){
+        size_t num_fossils_to_revive = size_t(NUM_BOXES) * 30;
+        for(size_t i = 0; i < num_fossils_to_revive; i++){
+            revive_one_fossil(env, context);
+            std::ostringstream os;
+            os << "Got Fossil " << i + 1 << "/" << num_fossils_to_revive;
+            std::string log_str = os.str();
+            env.log(log_str);
+            env.console.overlay().add_log(log_str);
+        }
 
-    // Example loop structure
-    size_t num_fossils_to_revive = 3;
-    for(size_t i = 0; i < num_fossils_to_revive; i++){
-        revive_one_fossil(env, context);
-        std::ostringstream os;
-        os << "Got Fossil " << i + 1 << "/" << num_fossils_to_revive;
-        std::string log_str = os.str();
-        env.log(log_str);
-        env.console.overlay().add_log(log_str);
+        overworld_to_box_system(env.console, context);
+        for(uint8_t i = 0; i < NUM_BOXES; i++){
+            bool found_match = check_fossils_in_one_box(env, context);
+            if (found_match){
+                return;
+            }
+            if (i != NUM_BOXES - 1){
+                // 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);
+        
+        send_program_status_notification(env, NOTIFICATION_STATUS);
     }
 }
 
@@ -168,20 +213,59 @@ void AutoFossil::revive_one_fossil(SingleSwitchProgramEnvironment& env, ProContr
 }
 
 // start at box system, check fossils one by one
-void AutoFossil::check_fossils_in_box(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t num_boxes){
+bool AutoFossil::check_fossils_in_one_box(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AutoFossil_Descriptor::Stats& stats = env.current_stats<AutoFossil_Descriptor::Stats>();
+    
     uint8_t box_row = 1, box_col = 0;
     bool next_cell_right = true;
     BoxDetector box_detector(COLOR_RED, &env.console.overlay());
     BoxPageInfoWatcher info_watcher(&env.console.overlay());
     for(size_t i = 0; i < 30; i++){
+        env.console.overlay().add_log("To cell: (" + std::to_string(box_row) + ", " + std::to_string(box_col) + ")");
+        box_detector.move_cursor(env.program_info(), env.console, context, box_row, box_col);
+
         info_watcher.reset_state();
         wait_until(env.console, context, WallClock::max(), {info_watcher});
         
         std::ostringstream os;
-        os << i + 1 << "/" << (num_boxes*30) << ": " << info_watcher.info_str();
+        os << i + 1 << "/" << int(NUM_BOXES)*30 << ": " << info_watcher.info_str();
         std::string log_str = os.str();
         env.log(log_str);
         env.console.overlay().add_log(log_str);
+        if (info_watcher.is_alpha()){
+            stats.alphas++;
+            env.update_stats();
+        }
+        if (info_watcher.is_shiny()){
+            stats.shinies++;
+            env.update_stats();
+        }
+
+        bool is_match = false;
+        switch (STOP_ON){
+        case PokemonLA::StopOn::Shiny:
+            is_match = info_watcher.is_shiny();
+            break;
+        case PokemonLA::StopOn::Alpha:
+            is_match = info_watcher.is_alpha();
+            break;
+        case PokemonLA::StopOn::ShinyOrAlpha:
+            is_match = info_watcher.is_shiny() || info_watcher.is_alpha();
+            break;
+        case PokemonLA::StopOn::ShinyAndAlpha:
+            is_match = info_watcher.is_shiny() && info_watcher.is_alpha();
+            break;
+        }
+        if (is_match){
+            send_program_notification(
+                env, FOUND_SHINY_OR_ALPHA,
+                Pokemon::COLOR_STAR_SHINY,
+                "Found " + info_watcher.info_str() + "!",
+                {}, "",
+                env.console.video().snapshot(), true
+            );
+            return true;
+        }
 
         if (next_cell_right){
             if (box_col == 5){
@@ -198,11 +282,8 @@ void AutoFossil::check_fossils_in_box(SingleSwitchProgramEnvironment& env, ProCo
                 box_col--;
             }
         }
-        if (i != 29){
-            env.console.overlay().add_log("Next cell: (" + std::to_string(box_row) + ", " + std::to_string(box_col) + ")");
-            box_detector.move_cursor(env.program_info(), env.console, context, box_row, box_col);
-        }
     }
+    return false;
 }
 
 }
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_AutoFossil.h b/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_AutoFossil.h
@@ -9,7 +9,11 @@
 #define PokemonAutomation_PokemonLZA_AutoFossil_H
 
 #include "Common/Cpp/Options/ButtonOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "PokemonLA/Options/PokemonLA_MiscOptions.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -34,7 +38,16 @@ class AutoFossil : public SingleSwitchProgramInstance{
 private:
     void revive_one_fossil(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
-    void check_fossils_in_box(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t num_boxes);
+    // return true if found a match
+    bool check_fossils_in_one_box(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    PokemonLA::StopOnOption STOP_ON;
+
+    SimpleIntegerOption<uint8_t> NUM_BOXES;
+
+    EventNotificationOption FOUND_SHINY_OR_ALPHA;
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
 };
 
 
