Allow 2 sliders to count as Switch 2 international. News page can be black at the bottom.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 55;
-const int PROGRAM_VERSION_PATCH = 2;
+const int PROGRAM_VERSION_PATCH = 3;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -141,6 +141,8 @@
 #include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h"
 #include "PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h"
 #include "PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
+#include "CommonTools/Images/SolidColorTest.h"
+
 
 #include <QPixmap>
 #include <QVideoFrame>
@@ -262,10 +264,17 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
     auto screenshot = feed.snapshot();
 
+#if 0
+    NewsDetector detector;
+    detector.make_overlays(overlays);
+    cout << detector.detect(screenshot) << endl;
+#endif
+
+#if 0
     PokemonSwSh::BlackDialogBoxDetector detector(true);
     detector.make_overlays(overlays);
     cout << detector.process_frame(screenshot, current_time()) << endl;
-
+#endif
 
 
 //    PokemonSV::BoxShinyDetector detector;

SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp

@@ -50,6 +50,7 @@ ConsoleType settings_detect_console_type(
     size_t sliders = detector.detect(snapshot).size();
     switch (sliders){
     case 1:
+    case 2:
         console.state().set_console_type(console, ConsoleType::Switch2_FW20_International);
         break;
     case 3:

SerialPrograms/Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp

@@ -34,21 +34,21 @@ class NewsDetector : public StaticScreenDetector{
 
 private:
     Color m_color;
-    ImageFloatBox m_bottom_white;
+    ImageFloatBox m_bottom_solid;
     ImageFloatBox m_bottom_buttons;
 };
 NewsDetector::NewsDetector(Color color)
     : m_color(color)
-    , m_bottom_white(0.15, 0.92, 0.20, 0.06)
+    , m_bottom_solid(0.15, 0.92, 0.20, 0.06)
     , m_bottom_buttons(0.40, 0.92, 0.58, 0.06)
 {}
 void NewsDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_bottom_white);
+    items.add(m_color, m_bottom_solid);
     items.add(m_color, m_bottom_buttons);
 }
 bool NewsDetector::detect(const ImageViewRGB32& screen){
-    ImageStats bottom_white = image_stats(extract_box_reference(screen, m_bottom_white));
-    if (!is_white(bottom_white)){
+    ImageStats bottom_solid = image_stats(extract_box_reference(screen, m_bottom_solid));
+    if (!is_white(bottom_solid) && !is_black(bottom_solid)){
         return false;
     }
 
@@ -161,7 +161,14 @@ void connect_to_internet_from_overworld(const ProgramInfo& info, VideoStream& st
         int ret = wait_until(
             stream, context,
             std::chrono::seconds(60),
-            {overworld, main_menu, dialog, prompt, news, battle_menu}
+            {
+                overworld,
+                main_menu,
+                dialog,
+                prompt,
+                news,
+                battle_menu,
+            }
         );
         context.wait_for(std::chrono::milliseconds(100));
         switch (ret){