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

@@ -4,19 +4,10 @@
  *
  */
 
-#include "CommonTools/Images/SolidColorTest.h"
-#include "CommonTools/Images/ImageFilter.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "PokemonRSE_DialogDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
-
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonRSE{
@@ -38,11 +29,11 @@ bool DialogDetector::detect(const ImageViewRGB32& screen) const{
     }
     return false;
 }
-*/
+
 
 BattleDialogDetector::BattleDialogDetector(Color color)
-    : m_left_box(0.158, 0.725, 0.011, 0.176)
-    , m_right_box(0.827, 0.722, 0.013, 0.178)
+    : 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);
@@ -51,15 +42,15 @@ void BattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
 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.335, 0.331, 0.332 }) && is_solid(right_image, { 0.335, 0.331, 0.332 })){
+    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.439, 0.717, 0.021, 0.192)
+    : 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{
@@ -76,48 +67,6 @@ bool BattleMenuDetector::detect(const ImageViewRGB32& screen) const{
 }
 
 
-AdvanceBattleDialogDetector::AdvanceBattleDialogDetector(Color color)
-    : m_dialog_box(0.156, 0.715, 0.686, 0.193)
-    , m_left_box(0.156, 0.724, 0.010, 0.176)
-    , m_right_box(0.836, 0.717, 0.008, 0.189)
-{}
-void AdvanceBattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_dialog_box);
-    items.add(COLOR_RED, m_left_box);
-    items.add(COLOR_RED, m_right_box);
-}
-bool AdvanceBattleDialogDetector::detect(const ImageViewRGB32& screen) const{
-    const bool replace_color_within_range = false;
-
-    //Filter out background
-    ImageRGB32 filtered_region = filter_rgb32_range(
-        extract_box_reference(screen, m_dialog_box),
-        combine_rgb(185, 0, 1), combine_rgb(255, 32, 33), 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;
-    */
-
-    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 })
-        && (stats.average.r > stats.average.b + 200)
-        && (stats.average.r > stats.average.g + 200)
-        )
-    {
-        return true;
-    }
-    return false;
-}
-
-
 
 }
 }

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

@@ -9,11 +9,12 @@
 
 #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 "CommonTools/VisualDetector.h"
-#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonFramework/Inference/VisualDetector.h"
 
 namespace PokemonAutomation{
     class CancellableScope;
@@ -22,7 +23,7 @@ namespace NintendoSwitch{
 namespace PokemonRSE{
 
 /*
-// TODO: Detect that a dialog box is on screen by looking for the white of the box
+// Detect that a dialog box is on screen by looking for the white of the box
 class DialogDetector : public StaticScreenDetector{
 public:
     DialogDetector(Color color);
@@ -40,7 +41,8 @@ class DialogWatcher : public DetectorToFinder<DialogDetector>{
         : DetectorToFinder("DialogWatcher", std::chrono::milliseconds(250), color)
     {}
 };
-*/
+
+
 
 // Battle dialog boxes are teal
 class BattleDialogDetector : public StaticScreenDetector{
@@ -60,10 +62,10 @@ class BattleDialogWatcher : public DetectorToFinder<BattleDialogDetector>{
         : DetectorToFinder("BattleDialogWatcher", std::chrono::milliseconds(250), color)
     {}
 };
+*/
 
 
-// Battle menu is up when it is white on the right and teal on the left
-// For emerald the text is more flush to the left, so we target the right of the battle menu box
+// Battle menu is up when it is white on the left and teal on the right
 class BattleMenuDetector : public StaticScreenDetector{
 public:
     BattleMenuDetector(Color color);
@@ -84,30 +86,10 @@ class BattleMenuWatcher : public DetectorToFinder<BattleMenuDetector>{
 
 
 
-// Detect the red advancement arrow by filtering for red.
-// This works for now, I don't think there's colored text?
-// TODO: Change this to detect that the dialog arrow is in the dialog box by filtering for the red arrow
-class AdvanceBattleDialogDetector : public StaticScreenDetector{
-public:
-    AdvanceBattleDialogDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+// advancedialogdetector Detect that the dialog arrow is in the dialog box by filtering for the red arrow
 
-private:
-    ImageFloatBox m_dialog_box;
-    ImageFloatBox m_left_box;
-    ImageFloatBox m_right_box;
-};
-class AdvanceBattleDialogWatcher : public DetectorToFinder<AdvanceBattleDialogDetector>{
-public:
-    AdvanceBattleDialogWatcher(Color color)
-        : DetectorToFinder("AdvanceBattleDialogWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
+// when given a choice popup, there is no advance arrow
 
-// Future note: when given a choice popup, there is no advance arrow.
-// FRLG doesn't have an advance arrow, that's a future issue.
 
 
 }

SerialPrograms/Source/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp

@@ -6,27 +6,25 @@
 
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageStats.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 "CommonTools/Images/ImageFilter.h"
 #include "PokemonRSE_ShinyNumberDetector.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+#include <iostream>
+using std::cout;
+using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonRSE{
 
-ShinyNumberDetector::ShinyNumberDetector(Color color)
+ShinyNumberDetector::ShinyNumberDetector()
     : m_box_number(0.136, 0.156, 0.123, 0.072)
 {}
-void ShinyNumberDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_box_number);
-}
+
 bool ShinyNumberDetector::read(Logger& logger, const ImageViewRGB32& frame){
     const bool replace_color_within_range = true;
 

SerialPrograms/Source/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h

@@ -16,12 +16,11 @@ 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 the background is scan lines.
+// Number is easier to check as background as scan lines.
 class ShinyNumberDetector{
 public:
-    ShinyNumberDetector(Color color);
+    ShinyNumberDetector();
 
-    virtual void make_overlays(VideoOverlaySet& items) const;
     bool read(Logger& logger, const ImageViewRGB32& frame);
 
 private:

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){