Fix let's go kill.

Author: Mysticial

SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.h

@@ -66,7 +66,7 @@ class AudioPerSpectrumDetectorBase : public AudioInferenceCallback{
         DetectedCallback detected_callback = nullptr
     );
 
-    void set_detected_callback(DetectedCallback detected_callback);
+    virtual void set_detected_callback(DetectedCallback detected_callback);
 
     WallClock last_detection() const{
         return m_last_timestamp;

SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp

@@ -218,13 +218,17 @@ LetsGoKillSoundDetector::LetsGoKillSoundDetector(Logger& logger, DetectedCallbac
         "LetsGoKillSoundDetector",
         "Let's Go Kill Sound",
         COLOR_RED,
-        [this, callback = std::move(detected_callback)](float error_coefficient){
+        [this](float error_coefficient){
             m_last_detected = current_time();
-            return callback != nullptr ? callback(error_coefficient) : false;
+            return m_detected_callback != nullptr ? m_detected_callback(error_coefficient) : false;
         }
     )
+    , m_detected_callback(std::move(detected_callback))
     , m_last_detected(WallClock::min())
 {}
+void LetsGoKillSoundDetector::set_detected_callback(DetectedCallback detected_callback){
+    m_detected_callback = std::move(detected_callback);
+}
 float LetsGoKillSoundDetector::get_score_threshold() const{
     return (float)GameSettings::instance().LETS_GO_KILL_SOUND_THRESHOLD;
 }

SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h

@@ -64,6 +64,8 @@ class LetsGoKillSoundDetector : public AudioPerSpectrumDetectorBase{
 public:
     LetsGoKillSoundDetector(Logger& logger, DetectedCallback detected_callback = nullptr);
 
+    virtual void set_detected_callback(DetectedCallback detected_callback) override;
+
     virtual float get_score_threshold() const override;
 
     WallClock last_kill() const{
@@ -74,6 +76,7 @@ class LetsGoKillSoundDetector : public AudioPerSpectrumDetectorBase{
     virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
 
 private:
+    DetectedCallback m_detected_callback;
     std::atomic<WallClock> m_last_detected;
 };
 

SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp

@@ -5,18 +5,19 @@
  */
 
 #include <algorithm>
+#include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+//#include "CommonFramework/Exceptions/FatalProgramException.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
 #include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSV/Options/PokemonSV_EncounterBotCommon.h"
+//#include "Pokemon/Pokemon_Notification.h"
+//#include "PokemonSV/Options/PokemonSV_EncounterBotCommon.h"
 #include "PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h"
 #include "PokemonSV/Programs/Battles/PokemonSV_Battles.h"
-#include "PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
+//#include "PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
 #include "PokemonSV_LetsGoTools.h"
 
 //#include <iostream>
@@ -195,34 +196,49 @@ bool use_lets_go_to_clear_in_front(
     if (ret == 0){
         if (throw_ball_if_bubble){
             stream.log("Detected sweat bubble. Throwing ball...");
-            pbf_mash_button(context, BUTTON_ZR, 5 * TICKS_PER_SECOND);
+            pbf_mash_button(context, BUTTON_ZR, 5000ms);
         }else{
             stream.log("Detected sweat bubble. Will not throw ball.");
         }
     }else{
         stream.log("Did not detect sweat bubble.");
     }
 
-    WallClock last_kill = tracker.last_kill();
     context.wait_for_all_requests();
     std::chrono::seconds timeout(6);
     while (true){
+//        cout << "last kill: " << last_kill << endl;
         if (command){
 //            cout << "running command..." << endl;
             command(context);
             context.wait_for_all_requests();
             command = nullptr;
         }else{
 //            cout << "Waiting out... " << timeout.count() << " seconds" << endl;
-            context.wait_until(last_kill + timeout);
+            context.wait_until(tracker.last_kill() + timeout);
         }
 //        timeout = std::chrono::seconds(3);
-        if (last_kill == tracker.last_kill()){
+
+        WallClock now = current_time();
+        WallClock last_kill_time = tracker.last_kill();
+        WallDuration last_kill;
+        if (last_kill_time == WallClock::min()){
+            stream.log("Last Kill: Never");
+            last_kill = WallDuration::max();
+        }else{
+            last_kill = now - last_kill_time;
+            stream.log(
+                "Last Kill: " +
+                tostr_fixed(std::chrono::duration_cast<Milliseconds>(last_kill).count() / 1000., 3) +
+                " seconds ago"
+            );
+        }
+
+        if (last_kill > timeout){
 //            cout << "no kill" << endl;
             break;
         }
 //        cout << "found kill" << endl;
-        last_kill = tracker.last_kill();
     }
     stream.log("Nothing left to clear...");
     tracker.throw_if_no_sound();