shiny reset, battle menu+shiny number detect

Author: kichithewolf

SerialPrograms/CMakeLists.txt

@@ -1291,10 +1291,16 @@ file(GLOB MAIN_SOURCES
     Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
+    Source/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp
+    Source/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h
     Source/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp
     Source/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h
+    Source/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp
+    Source/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h
     Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp
     Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h
+    Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp
+    Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h
     Source/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.cpp
     Source/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.h
     Source/PokemonRSE/PokemonRSE_Navigation.cpp

SerialPrograms/Source/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp

@@ -0,0 +1,73 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "CommonFramework/ImageTools/SolidColorTest.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "PokemonRSE_DialogDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+/*
+DialogDetector::DialogDetector(Color color)
+    : m_left_box(0.155, 0.727, 0.015, 0.168)
+    , m_right_box(0.837, 0.729, 0.008, 0.161)
+{}
+void DialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_left_box);
+    items.add(COLOR_RED, m_right_box);
+}
+bool DialogDetector::detect(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 left_image = extract_box_reference(screen, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(screen, m_right_box);
+    if (is_solid(left_image, { 0.335, 0.331, 0.332 }) && is_solid(right_image, { 0.335, 0.331, 0.332 })){
+        return true;
+    }
+    return false;
+}
+
+
+BattleDialogDetector::BattleDialogDetector(Color color)
+    : m_left_box(0.155, 0.727, 0.015, 0.168)
+    , m_right_box(0.837, 0.729, 0.008, 0.161)
+{}
+void BattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_left_box);
+    items.add(COLOR_RED, m_right_box);
+}
+bool BattleDialogDetector::detect(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 left_image = extract_box_reference(screen, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(screen, m_right_box);
+    if (is_solid(left_image, { 0.25, 0.38, 0.369 }) && is_solid(right_image, { 0.25, 0.38, 0.369 })){
+        return true;
+    }
+    return false;
+}
+*/
+
+BattleMenuDetector::BattleMenuDetector(Color color)
+    : m_left_box(0.155, 0.727, 0.015, 0.168)
+    , m_right_box(0.821, 0.725, 0.030, 0.181)
+{}
+void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_left_box);
+    items.add(COLOR_RED, m_right_box);
+}
+bool BattleMenuDetector::detect(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 left_image = extract_box_reference(screen, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(screen, m_right_box);
+    if (is_solid(left_image, { 0.335, 0.331, 0.332 }) && is_solid(right_image, { 0.25, 0.38, 0.369 })){
+        return true;
+    }
+    return false;
+}
+
+
+
+}
+}
+}

SerialPrograms/Source/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h

@@ -0,0 +1,99 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_DialogDetector_H
+#define PokemonAutomation_PokemonRSE_DialogDetector_H
+
+#include <chrono>
+#include <atomic>
+//#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonFramework/Inference/VisualDetector.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+/*
+// Detect that a dialog box is on screen by looking for the white of the box
+class DialogDetector : public StaticScreenDetector{
+public:
+    DialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) const override;
+
+private:
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+};
+class DialogWatcher : public DetectorToFinder<DialogDetector>{
+public:
+    DialogWatcher(Color color)
+        : DetectorToFinder("DialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+// Battle dialog boxes are teal
+class BattleDialogDetector : public StaticScreenDetector{
+public:
+    BattleDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) const override;
+
+private:
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+};
+class BattleDialogWatcher : public DetectorToFinder<BattleDialogDetector>{
+public:
+    BattleDialogWatcher(Color color)
+        : DetectorToFinder("BattleDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+*/
+
+
+// Battle menu is up when it is white on the left and teal on the right
+class BattleMenuDetector : public StaticScreenDetector{
+public:
+    BattleMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) const override;
+
+private:
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+};
+class BattleMenuWatcher : public DetectorToFinder<BattleMenuDetector>{
+public:
+    BattleMenuWatcher(Color color)
+        : DetectorToFinder("BattleMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+// advancedialogdetector Detect that the dialog arrow is in the dialog box by filtering for the red arrow
+
+// when given a choice popup, there is no advance arrow
+
+
+
+}
+}
+}
+
+#endif

SerialPrograms/Source/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp

@@ -0,0 +1,62 @@
+/*  Shiny Number Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageFilter.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "PokemonRSE_ShinyNumberDetector.h"
+
+#include <iostream>
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+ShinyNumberDetector::ShinyNumberDetector()
+    : m_box_number(0.136, 0.156, 0.123, 0.072)
+{}
+
+bool ShinyNumberDetector::read(Logger& logger, const ImageViewRGB32& frame){
+    const bool replace_color_within_range = true;
+
+    //Filter out background
+    ImageRGB32 filtered_region = filter_rgb32_range(
+        extract_box_reference(frame, m_box_number),
+        combine_rgb(138, 97, 221), combine_rgb(200, 181, 239), Color(0), replace_color_within_range
+    );
+    ImageStats stats = image_stats(filtered_region);
+
+    /*
+    filtered_region.save("./filtered_only.png");
+    cout << stats.average.r << endl;
+    cout << stats.average.g << endl;
+    cout << stats.average.b << endl;
+    */
+
+    /*
+    Shiny:
+    R: 196.632, G: 196.771, B: 145.863
+    Not shiny:
+    R: 181.862, G: 180.686, B: 193.999
+    */
+
+    if (stats.average.b + 20 < stats.average.r){
+        return true;
+    }
+    return false;
+}
+
+
+}
+}
+}
+

SerialPrograms/Source/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h

@@ -0,0 +1,35 @@
+/*  Shiny Number Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_ShinyNumberDetector_H
+#define PokemonAutomation_PokemonRSE_ShinyNumberDetector_H
+
+#include "Common/Cpp/AbstractLogger.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+// In the summary screen, the dex number will be yellow if a shiny, white if not.
+// Additionally, the background behind the sprite will be white if shiny, grey if not.
+// Number is easier to check as background as scan lines.
+class ShinyNumberDetector{
+public:
+    ShinyNumberDetector();
+
+    bool read(Logger& logger, const ImageViewRGB32& frame);
+
+private:
+    ImageFloatBox m_box_number;
+};
+
+
+
+}
+}
+}
+#endif

SerialPrograms/Source/PokemonRSE/PokemonRSE_Panels.cpp

@@ -11,6 +11,7 @@
 #include "PokemonRSE_Settings.h"
 
 #include "Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h"
+#include "Programs/ShinyHunting/PokemonRSE_StarterReset.h"
 #include "Programs/TestPrograms/PokemonRSE_SoundListener.h"
 
 namespace PokemonAutomation{
@@ -31,7 +32,8 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
 
     //ret.emplace_back("---- General ----");
 
-    //ret.emplace_back("---- Shiny Hunting ----");
+    ret.emplace_back("---- Shiny Hunting ----");
+    ret.emplace_back(make_single_switch_program<StarterReset_Descriptor, StarterReset>());
 
 
     if (PreloadSettings::instance().DEVELOPER_MODE){