Another fix to Flying Trial Farmer.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -313,11 +313,20 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 //    std::terminate();
 
+    ImageRGB32 image("20250323-011605651979.png");
+
+    DialogBoxDetector detector;
+    detector.make_overlays(overlays);
+    cout << detector.detect(image) << endl;
+
+
+
+#if 0
     auto image = feed.snapshot();
 
     ItemPrinterMenuDetector detector(COLOR_GREEN);
     cout << detector.detect(image) << endl;
-
+#endif
 
 
 #if 0

SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp

@@ -67,7 +67,7 @@ bool DialogBoxDetector::detect(const ImageViewRGB32& screen) const{
 
     ImageStats stats_border_top = image_stats(extract_box_reference(screen, m_border_top));
 //    cout << stats_border_top.average << stats_border_top.stddev << endl;
-    if (stats_border_top.stddev.sum() < 75){
+    if (stats_border_top.stddev.sum() < 50){
         return !m_true_if_detected;
     }
 
@@ -83,8 +83,8 @@ bool DialogBoxDetector::detect(const ImageViewRGB32& screen) const{
 
 
 
-AdvanceDialogDetector::AdvanceDialogDetector(Color color)
-    : m_box(color)
+AdvanceDialogDetector::AdvanceDialogDetector(Color color, DialogType type)
+    : m_box(color, true, type)
     , m_arrow(0.710, 0.850, 0.030, 0.042)
 {}
 void AdvanceDialogDetector::make_overlays(VideoOverlaySet& items) const{

SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h

@@ -61,7 +61,7 @@ class DialogBoxWatcher : public DetectorToFinder<DialogBoxDetector>{
 //  It should be able to detect both the white background dialog and black background dialog.
 class AdvanceDialogDetector : public StaticScreenDetector{
 public:
-    AdvanceDialogDetector(Color color = COLOR_RED);
+    AdvanceDialogDetector(Color color = COLOR_RED, DialogType type = DialogType::DIALOG_ALL);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool detect(const ImageViewRGB32& screen) const override;
@@ -72,8 +72,8 @@ class AdvanceDialogDetector : public StaticScreenDetector{
 };
 class AdvanceDialogWatcher : public DetectorToFinder<AdvanceDialogDetector>{
 public:
-    AdvanceDialogWatcher(Color color, std::chrono::milliseconds duration = std::chrono::milliseconds(250))
-         : DetectorToFinder("AdvanceDialogWatcher", duration, color)
+    AdvanceDialogWatcher(Color color, DialogType type = DialogType::DIALOG_ALL, std::chrono::milliseconds duration = std::chrono::milliseconds(250))
+         : DetectorToFinder("AdvanceDialogWatcher", duration, color, type)
     {}
 };
 
@@ -102,14 +102,14 @@ class PromptDialogWatcher : public DetectorToFinder<PromptDialogDetector>{
         Color color,
         std::chrono::milliseconds duration = std::chrono::milliseconds(250)
     )
-         : DetectorToFinder("PromptDialogWatcher", std::chrono::milliseconds(250), color)
+         : DetectorToFinder("PromptDialogWatcher", duration, color)
     {}
     PromptDialogWatcher(
         Color color,
         const ImageFloatBox& arrow_box,
         std::chrono::milliseconds duration = std::chrono::milliseconds(250)
     )
-         : DetectorToFinder("PromptDialogWatcher", std::chrono::milliseconds(250), color, arrow_box)
+         : DetectorToFinder("PromptDialogWatcher", duration, color, arrow_box)
     {}
 };
 

SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp

@@ -43,7 +43,7 @@ void attach_item_from_bag(
         GradientArrowWatcher bag_neutral(COLOR_RED, GradientArrowType::RIGHT, {0.10, 0.15, 0.05, 0.77}, std::chrono::milliseconds(1000));
         GradientArrowWatcher selected(COLOR_RED, GradientArrowType::RIGHT, {0.20, 0.20, 0.30, 0.60});
         PromptDialogWatcher prompt(COLOR_CYAN, std::chrono::milliseconds(100));
-        AdvanceDialogWatcher advance_dialog(COLOR_YELLOW, std::chrono::milliseconds(100));
+        AdvanceDialogWatcher advance_dialog(COLOR_YELLOW, DialogType::DIALOG_ALL, std::chrono::milliseconds(100));
 
         context.wait_for_all_requests();
         int ret = wait_until(

SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp

@@ -45,7 +45,7 @@ void release_one_pokemon(
         BoxWatcher box_detector(COLOR_RED);
         BoxSelectWatcher selected(COLOR_YELLOW, std::chrono::milliseconds(100));
         PromptDialogWatcher confirm(COLOR_CYAN, std::chrono::milliseconds(100));
-        AdvanceDialogWatcher advance_dialog(COLOR_GREEN, std::chrono::milliseconds(250));
+        AdvanceDialogWatcher advance_dialog(COLOR_GREEN, DialogType::DIALOG_ALL, std::chrono::milliseconds(250));
 
         context.wait_for_all_requests();
         int ret = wait_until(

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp

@@ -157,7 +157,7 @@ void order_compote_du_fils(
     while(eating == false){
         context.wait_for_all_requests();
 
-        AdvanceDialogWatcher dialog_watcher(COLOR_RED, std::chrono::milliseconds(100));
+        AdvanceDialogWatcher dialog_watcher(COLOR_RED, DialogType::DIALOG_ALL, std::chrono::milliseconds(100));
         GradientArrowWatcher menu_item_0_watcher(COLOR_BLUE, GradientArrowType::RIGHT, {0.037, 0.224, 0.074, 0.104});
         GradientArrowWatcher menu_item_1_watcher(COLOR_BLUE, GradientArrowType::RIGHT, {0.037, 0.339, 0.074, 0.104});
         PromptDialogWatcher prompt_watcher(COLOR_RED, {0.535, 0.450, 0.367, 0.124});
@@ -205,7 +205,7 @@ void order_compote_du_fils(
     } // end state machine for restaurant menu
 
     { // Now wait for eating animation to finish.
-        AdvanceDialogWatcher dialog_watcher(COLOR_RED, std::chrono::milliseconds(100));
+        AdvanceDialogWatcher dialog_watcher(COLOR_RED, DialogType::DIALOG_ALL, std::chrono::milliseconds(100));
         int ret = run_until<ProControllerContext>(
             stream, context,
             [](ProControllerContext& context){
@@ -229,7 +229,7 @@ void order_compote_du_fils(
     while(true){
         context.wait_for_all_requests();
 
-        AdvanceDialogWatcher dialog_watcher(COLOR_RED, std::chrono::milliseconds(100));
+        AdvanceDialogWatcher dialog_watcher(COLOR_RED, DialogType::DIALOG_ALL, std::chrono::milliseconds(100));
         OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
         int ret = wait_until(
             stream, context,

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.cpp

@@ -116,7 +116,7 @@ FlyingTrialFarmer::FlyingTrialFarmer()
 bool FlyingTrialFarmer::run_rewards(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     //  Wait until a dialog shows up.
     {
-        DialogBoxWatcher dialog(COLOR_GREEN, true);
+        AdvanceDialogWatcher dialog(COLOR_RED);
         int ret = wait_until(
             env.console, context,
             std::chrono::seconds(180),
@@ -135,8 +135,8 @@ bool FlyingTrialFarmer::run_rewards(SingleSwitchProgramEnvironment& env, ProCont
     bool trial_passed = false;
     while (true){
         OverworldWatcher overworld(env.console, COLOR_CYAN);
-        DialogBoxWatcher dialog_white(COLOR_GREEN, true, std::chrono::milliseconds(250), DialogType::DIALOG_WHITE);
-        DialogBoxWatcher dialog_black(COLOR_GREEN, true, std::chrono::milliseconds(250), DialogType::DIALOG_BLACK);
+        AdvanceDialogWatcher dialog_white(COLOR_RED, DialogType::DIALOG_WHITE);
+        AdvanceDialogWatcher dialog_black(COLOR_RED, DialogType::DIALOG_BLACK);
         context.wait_for_all_requests();
 
         int ret_finish = wait_until(

SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp

@@ -150,7 +150,7 @@ void trade_current_pokemon(
     TradeDoneHold trade_done(stream.overlay());
 
     while (true){
-        AdvanceDialogWatcher dialog(COLOR_YELLOW, std::chrono::seconds(2));
+        AdvanceDialogWatcher dialog(COLOR_YELLOW, DialogType::DIALOG_ALL, std::chrono::seconds(2));
         PromptDialogWatcher learn_move(COLOR_BLUE);
 
         int ret = wait_until(