Fix Item Printer incorrect material selection menu detection.

Author: Mysticial

SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.cpp

@@ -0,0 +1,40 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonSV_ItemPrinterMenuDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+ItemPrinterMenuDetector::ItemPrinterMenuDetector(Color color)
+    : m_color(color)
+    , m_bottom(0.05, 0.945, 0.50, 0.04)
+    , m_buttons(color, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06})
+{}
+
+void ItemPrinterMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom);
+    m_buttons.make_overlays(items);
+}
+bool ItemPrinterMenuDetector::detect(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 bottom = extract_box_reference(screen, m_bottom);
+    ImageStats bottom_stats = image_stats(bottom);
+    if (!is_solid(bottom_stats, {0, 0.318898, 0.681102})){
+        return false;
+    }
+    if (!m_buttons.detect(screen)){
+        return false;
+    }
+    return true;
+}
+
+
+}
+}
+}

SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h

@@ -0,0 +1,45 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterMenuDetector_H
+#define PokemonAutomation_PokemonSV_ItemPrinterMenuDetector_H
+
+#include "CommonTools/VisualDetector.h"
+#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class ItemPrinterMenuDetector : public StaticScreenDetector{
+public:
+    ItemPrinterMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) const override;
+
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom;
+    WhiteButtonWatcher m_buttons;
+};
+class ItemPrinterMenuWatcher : public DetectorToFinder<ItemPrinterMenuDetector>{
+public:
+    ItemPrinterMenuWatcher(Color color)
+         : DetectorToFinder("ItemPrinterMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+}
+}
+}
+#endif

SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp

@@ -25,6 +25,7 @@
 #include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
 #include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
 #include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h"
 #include "PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h"
 #include "PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h"
 #include "PokemonSV/Programs/PokemonSV_Navigation.h"
@@ -953,7 +954,7 @@ uint32_t ItemPrinterRNG::check_num_happiny_dust(
         AdvanceDialogWatcher dialog(COLOR_RED);
         PromptDialogWatcher prompt(COLOR_GREEN);
         DateChangeWatcher date_reader;
-        WhiteButtonWatcher material(COLOR_GREEN, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06});
+        ItemPrinterMenuWatcher material(COLOR_GREEN);
         int ret = wait_until(
             env.console, context, std::chrono::seconds(120),
             {