Reduce chance of false positive detection of rewards menu.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -1577,6 +1577,8 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h
     Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp
     Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h
+    Source/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.cpp
+    Source/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.h
     Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp
     Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h
     Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp

SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.cpp

@@ -0,0 +1,43 @@
+/*  Tera Rewards Menu
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_TeraRewardsMenu.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+TeraRewardsMenuDetector::TeraRewardsMenuDetector(Color color)
+    : m_color(color)
+    , m_next_button(
+        COLOR_CYAN,
+        WhiteButton::ButtonA,
+        {0.8, 0.93, 0.2, 0.07}
+    )
+    , m_arrow(color, GradientArrowType::RIGHT, {0, 0, 1, 1})
+{}
+void TeraRewardsMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    m_next_button.make_overlays(items);
+    m_arrow.make_overlays(items);
+}
+bool TeraRewardsMenuDetector::detect(const ImageViewRGB32& screen){
+    if (!m_next_button.detect(screen)){
+        return false;
+    }
+    if (m_arrow.detect(screen)){
+        return false;
+    }
+    return true;
+}
+
+
+
+
+}
+}
+}

SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.h

@@ -0,0 +1,43 @@
+/*  Tera Rewards Menu
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraRewardsMenu_H
+#define PokemonAutomation_PokemonSV_TeraRewardsMenu_H
+
+#include "CommonTools/VisualDetector.h"
+#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class TeraRewardsMenuDetector : public StaticScreenDetector{
+public:
+    TeraRewardsMenuDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+protected:
+    Color m_color;
+    WhiteButtonDetector m_next_button;
+    GradientArrowDetector m_arrow;
+};
+class TeraRewardsMenuWatcher : public DetectorToFinder<TeraRewardsMenuDetector>{
+public:
+    TeraRewardsMenuWatcher(Color color, std::chrono::milliseconds duration)
+         : DetectorToFinder("TeraRewardsMenuWatcher", duration, color)
+    {}
+};
+
+
+
+}
+}
+}
+#endif

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp

@@ -11,6 +11,7 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
 #include "PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.h"
 #include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
 #include "PokemonSV_TeraBattler.h"
 
@@ -213,6 +214,16 @@ bool run_tera_battle(
         CheerSelectWatcher cheer_select_menu(COLOR_YELLOW);
         MoveSelectWatcher move_select_menu(COLOR_YELLOW);
         TargetSelectWatcher target_select_menu(COLOR_CYAN);
+        TeraRewardsMenuWatcher rewards_menu(
+            COLOR_BLUE,
+            //  This can false positive against the back (B) button while in the
+            //  lobby. So don't trigger this unless we see the battle menu first.
+            //  At the same time, there's a possibility that we miss the battle
+            //  menu if the raid is won before it even loads. And this can only
+            //  happen if the raid was uncatchable to begin with.
+            std::chrono::seconds(battle_menu_seen ? 5 : 180)
+        );
+#if 0
         WhiteButtonWatcher next_button(
             COLOR_CYAN,
             WhiteButton::ButtonA,
@@ -225,6 +236,7 @@ bool run_tera_battle(
             //  happen if the raid was uncatchable to begin with.
             std::chrono::seconds(battle_menu_seen ? 5 : 180)
         );
+#endif
         TeraCatchWatcher catch_menu(COLOR_BLUE);
         OverworldWatcher overworld(stream.logger(), COLOR_GREEN);
         context.wait_for_all_requests();
@@ -241,7 +253,8 @@ bool run_tera_battle(
                 cheer_select_menu,
                 move_select_menu,
                 target_select_menu,
-                next_button,
+//                next_button,
+                rewards_menu,
                 catch_menu,
                 overworld,
             }