Fix double-battle shiny detection when your lead is shiny. Clear out some BDSP programs for SBB

Author: Mysticial

SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp

@@ -17,6 +17,10 @@
 #include "PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h"
 #include "PokemonBDSP_ShinyEncounterDetector.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
@@ -48,6 +52,8 @@ ShinyEncounterTracker::ShinyEncounterTracker(
 //    , m_overlay(overlay)
     , m_battle_menu(battle_type)
     , m_dialog_tracker(logger, m_dialog_detector)
+    , m_wild_animation_end_timestamp(WallClock::min())
+    , m_your_animation_start_timestamp(WallClock::min())
     , m_box_wild_left(0.40, 0.02, 0.20, 0.48)
     , m_box_wild_right(0.70, 0.02, 0.20, 0.48)
     , m_sparkle_tracker_wild(logger, overlay, m_sparkles_wild, {0.4, 0.02, 0.60, 0.93})
@@ -94,7 +100,7 @@ bool ShinyEncounterTracker::process_frame(const VideoSnapshot& frame){
     case EncounterState::BEFORE_ANYTHING:
         break;
     case EncounterState::WILD_ANIMATION:{
-        // Update the timestamp that records the end of wild animation
+        //  Update the timestamp that records the end of wild animation
         m_wild_animation_end_timestamp = frame.timestamp;
 
         m_sparkle_tracker_wild.process_frame(frame);
@@ -120,8 +126,10 @@ bool ShinyEncounterTracker::process_frame(const VideoSnapshot& frame){
         break;
     }
     case EncounterState::YOUR_ANIMATION:
-        // Update the timestamp that records the end of player pokemon animation
-        m_your_animation_end_timestamp = frame.timestamp;
+        //  Update the timestamp that records the start of player pokemon animation
+        if (m_your_animation_start_timestamp == WallClock::min()){
+            m_your_animation_start_timestamp = frame.timestamp;
+        }
 
         m_sparkle_tracker_wild.clear_boxes();
         m_sparkle_tracker_own.process_frame(frame);
@@ -167,28 +175,27 @@ void determine_shiny_status(
             alpha_wild_overall += DIALOG_ALPHA;
         }
     }
+
+#if 0
+    cout << "Wild End: " << std::chrono::duration_cast<Milliseconds>(tracker.wild_animation_end_timestmap() - tracker.m_start_time) << endl; //  REMOVE
+    cout << "Your Start: " << std::chrono::duration_cast<Milliseconds>(tracker.your_animation_start_timestamp() - tracker.m_start_time) << endl; //  REMOVE
+    for (WallClock time : shiny_sound_timestamps){
+        cout << "Shiny Sound: " << std::chrono::duration_cast<Milliseconds>(time - tracker.m_start_time) << endl; //  REMOVE
+    }
+#endif
 
     bool wild_shiny_sound_detected = false;
     bool own_shiny_sound_detected = false;
-    for(const WallClock& timestamp: shiny_sound_timestamps){
-        const WallClock& wild_end = tracker.wild_animtion_end_timestmap();
-        const WallClock& own_end = tracker.your_animation_end_timestamp();
-
-        auto get_timestamp_distance = [](const WallClock& t0, const WallClock& t1) -> std::chrono::milliseconds{
-            if (t0 > t1){
-                return std::chrono::duration_cast<std::chrono::milliseconds>(t0 - t1);
-            }else{
-                return std::chrono::duration_cast<std::chrono::milliseconds>(t1 - t0);
-            }
-        };
-
-        const auto dist_to_wild = get_timestamp_distance(timestamp, wild_end);
-        const auto dist_to_own = get_timestamp_distance(timestamp, own_end);
-        if (dist_to_wild < dist_to_own){
-            wild_shiny_sound_detected = true;
-        }else if (dist_to_own < dist_to_wild){
-            own_shiny_sound_detected = true;
-        }else{
+    for (const WallClock& timestamp: shiny_sound_timestamps){
+        const WallClock& wild_end = tracker.wild_animation_end_timestmap();
+        const WallClock& own_start = tracker.your_animation_start_timestamp();
+
+        bool wild_shiny = timestamp < wild_end + Milliseconds(500);
+        bool own_shiny = timestamp >= own_start;
+
+        wild_shiny_sound_detected |= wild_shiny;
+        own_shiny_sound_detected |= own_shiny;
+        if (!wild_shiny && !own_shiny){
             throw_and_log<OperationFailedException>(
                 env.logger(), ErrorReport::SEND_ERROR_REPORT,
                 "Wrong shiny sound timing found."

SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h

@@ -61,8 +61,8 @@ class ShinyEncounterTracker : public VisualInferenceCallback{
     const ShinySparkleAggregator& sparkles_wild_right() const{ return m_best_wild_right; }
     const ShinySparkleAggregator& sparkles_own() const{ return m_best_own; }
 
-    const WallClock& wild_animtion_end_timestmap() const { return m_wild_animation_end_timestamp; }
-    const WallClock& your_animation_end_timestamp() const { return m_your_animation_end_timestamp; }
+    const WallClock& wild_animation_end_timestmap() const { return m_wild_animation_end_timestamp; }
+    const WallClock& your_animation_start_timestamp() const { return m_your_animation_start_timestamp; }
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool process_frame(const VideoSnapshot& frame) override;
@@ -79,7 +79,7 @@ class ShinyEncounterTracker : public VisualInferenceCallback{
     BattleDialogDetector m_dialog_detector;
     EncounterDialogTracker m_dialog_tracker;
     WallClock m_wild_animation_end_timestamp;
-    WallClock m_your_animation_end_timestamp;
+    WallClock m_your_animation_start_timestamp;
 
     ImageFloatBox m_box_wild_left;
     ImageFloatBox m_box_wild_right;

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp

@@ -30,7 +30,8 @@ DoublesLeveling_Descriptor::DoublesLeveling_Descriptor()
         "Level up your party by spamming spread moves in a double battle with a partner that heals you forever.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 struct DoublesLeveling_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp

@@ -21,7 +21,8 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
+
+using namespace Pokemon;
 
 
 MoneyFarmerRoute210_Descriptor::MoneyFarmerRoute210_Descriptor()
@@ -32,7 +33,10 @@ MoneyFarmerRoute210_Descriptor::MoneyFarmerRoute210_Descriptor()
         "Farm money by using VS Seeker to rebattle the Ace Trainer couple on Route 210.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {
+            ControllerFeature::TickPrecise,
+            ControllerFeature::NintendoSwitch_ProController,
+        }
     )
 {}
 struct MoneyFarmerRoute210_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp

@@ -33,7 +33,10 @@ MoneyFarmerRoute212_Descriptor::MoneyFarmerRoute212_Descriptor()
         "Farm money by using VS Seeker to rebattle the rich couple on Route 212.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {
+            ControllerFeature::TickPrecise,
+            ControllerFeature::NintendoSwitch_ProController,
+        }
     )
 {}
 struct MoneyFarmerRoute212_Descriptor::Stats : public StatsTracker{
@@ -224,7 +227,7 @@ void MoneyFarmerRoute212::heal_at_center_and_return(VideoStream& stream, ProCont
     pbf_move_left_joystick(context, 255, 128, 380, 0);
     pbf_move_left_joystick(context, 128, 255, 300, 0);
     pbf_move_left_joystick(context,   0, 128, 600, 0);
-    pbf_move_left_joystick(context, 255, 128,  70, 0);
+    pbf_move_left_joystick(context, 255, 128,  75, 0);
     pbf_move_left_joystick(context, 128, 255, 1375, 0);
     pbf_move_left_joystick(context, 255, 128, 125, 0);
     pbf_move_left_joystick(context, 128, 255, 200, 0);

SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp

@@ -26,7 +26,8 @@ MassRelease_Descriptor::MassRelease_Descriptor()
         "Mass release boxes of " + STRING_POKEMON + ".",
         FeedbackType::NONE,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 struct MassRelease_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp

@@ -30,7 +30,8 @@ LegendaryReset_Descriptor::LegendaryReset_Descriptor()
         "Shiny hunt a standing legendary " + STRING_POKEMON + ".",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 std::unique_ptr<StatsTracker> LegendaryReset_Descriptor::make_stats() const{

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp

@@ -28,7 +28,8 @@ ShinyHuntOverworld_Descriptor::ShinyHuntOverworld_Descriptor()
         "Shiny hunt overworld " + STRING_POKEMON + ".",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 struct ShinyHuntOverworld_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp

@@ -34,7 +34,8 @@ StarterReset_Descriptor::StarterReset_Descriptor()
         "Shiny hunt your starter " + STRING_POKEMON + ".",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 struct StarterReset_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{