Lots of fixes for Tera Multi-Farmer.

Mysticial · Mysticial · commit 4aeccaa6b401 · 2025-07-24T00:31:36.000-07:00
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp
@@ -195,8 +195,7 @@ TestProgram::TestProgram()
     )
     , IMAGE_PATH(false, "Path to image for testing", LockMode::UNLOCK_WHILE_RUNNING, "default.png", "default.png")
     , STATIC_TEXT("Test text...")
-    , BOX("Test box", LockMode::UNLOCK_WHILE_RUNNING, 0.0, 0.0, 0.0, 0.0)
-//    , PLAYER_LIST("Test Table", LockMode::UNLOCK_WHILE_RUNNING, "Notes")
+    , BOX("Box", LockMode::UNLOCK_WHILE_RUNNING, 0, 0, 1, 1)
     , NOTIFICATION_TEST("Test", true, true, ImageAttachmentMode::JPG)
     , NOTIFICATIONS({
         &NOTIFICATION_TEST,
@@ -210,7 +209,7 @@ TestProgram::TestProgram()
 //    PA_ADD_OPTION(CONSOLE_MODEL);
     PA_ADD_OPTION(IMAGE_PATH);
     PA_ADD_OPTION(STATIC_TEXT);
-//    PA_ADD_OPTION(PLAYER_LIST);
+    PA_ADD_OPTION(BOX);
 //    PA_ADD_OPTION(battle_AI);
     PA_ADD_OPTION(NOTIFICATIONS);
     BUTTON0.add_listener(*this);
@@ -255,10 +254,31 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     ProControllerContext context(scope, console.pro_controller());
     VideoOverlaySet overlays(overlay);
 
+
     auto screenshot = feed.snapshot();
 
-    PokemonSwSh::MaxLairInternal::PathSelectDetector detector;
-    detector.detect(screenshot);
+
+    DateReader reader(console);
+    reader.make_overlays(overlays);
+    reader.read_date(logger, screenshot);
+
+
+#if 0
+    BinarySliderDetector detector(COLOR_BLUE, {0.836431, 0.097521, 0.069703, 0.796694});
+    auto result = detector.detect(screenshot);
+
+    for (auto& item : result){
+        cout << item.first << " : " << item.second.center_y() << endl;
+    }
+#endif
+
+//    LetsGoKillWatcher menu(logger, COLOR_RED, true, {0.23, 0.23, 0.04, 0.20});
+//    cout << menu.detect(screenshot) << endl;
+
+
+
+//    PokemonSwSh::MaxLairInternal::PathSelectDetector detector;
+//    detector.detect(screenshot);
 
 //    int ret = PokemonSwSh::MaxLairInternal::read_side(screenshot);
 //    cout << "ret = " << ret << endl;
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.cpp
@@ -24,7 +24,7 @@ namespace DateReaderTools{
 
 ImageRGB32 filter_image(const ImageViewRGB32& image){
     double brightness = image_stats(image).average.sum();
-    bool white_theme = brightness > 600;
+    bool white_theme = brightness > 500;
 
     ImageRGB32 filtered = to_blackwhite_rgb32_range(
         image,
@@ -39,8 +39,12 @@ int read_box(
     const ImageViewRGB32& screen, const ImageFloatBox& box
 ){
     ImageViewRGB32 cropped = extract_box_reference(screen, box);
+
+//    static int c = 0;
+//    cropped.save("image-" + std::to_string(c++) + ".png");
+
     double brightness = image_stats(cropped).average.sum();
-    bool white_theme = brightness > 600;
+    bool white_theme = brightness > 500;
 
     int value;
     if (white_theme){
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp
@@ -5,6 +5,7 @@
  */
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
@@ -38,6 +39,20 @@ DateTime DateReader_24h::read_date(Logger& logger, std::shared_ptr<const ImageRG
     date.hour = (int8_t)DateReaderTools::read_box(logger, 0, 23, *screen, m_hour);
     date.minute = (int8_t)DateReaderTools::read_box(logger, 0, 59, *screen, m_minute);
 
+    if (date.day < 0 ||
+        date.month < 0 ||
+        date.year < 0 ||
+        date.hour < 0 ||
+        date.minute < 0
+    ){
+        report_error(
+            &logger, ProgramInfo(),
+            "Failed to read date.",
+            {},
+            *screen
+        );
+    }
+
     return date;
 }
 
@@ -71,19 +86,39 @@ void DateReader_EU::set_date(
         }
 
         move_horizontal(context, cursor_position, 0);
-        adjust_no_wrap(context, current.day, date.day);
+        if (current.day < 0){
+            stream.log("Failed to read day. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_no_wrap(context, current.day, date.day);
+        }
 
         move_horizontal(context, cursor_position, 1);
-        adjust_wrap(context, 1, 12, current.month, date.month);
+        if (current.month < 0){
+            stream.log("Failed to read month. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 1, 12, current.month, date.month);
+        }
 
         move_horizontal(context, cursor_position, 2);
-        adjust_no_wrap(context, current.year, date.year);
+        if (current.year < 0){
+            stream.log("Failed to read year. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_no_wrap(context, current.year, date.year);
+        }
 
         move_horizontal(context, cursor_position, 3);
-        adjust_wrap(context, 0, 23, current.hour, date.hour);
+        if (current.hour < 0){
+            stream.log("Failed to read hour. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 0, 23, current.hour, date.hour);
+        }
 
         move_horizontal(context, cursor_position, 4);
-        adjust_wrap(context, 0, 59, current.minute, date.minute);
+        if (current.minute < 0){
+            stream.log("Failed to read minutes. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 0, 59, current.minute, date.minute);
+        }
 
         move_horizontal(context, cursor_position, 5);
     }
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp
@@ -6,6 +6,7 @@
 
 #include "Common/Qt/StringToolsQt.h"
 #include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
@@ -77,6 +78,20 @@ DateTime DateReader_US::read_date(Logger& logger, std::shared_ptr<const ImageRGB
         date.hour = (int8_t)hour;
     }
 
+    if (date.day < 0 ||
+        date.month < 0 ||
+        date.year < 0 ||
+        date.hour < 0 ||
+        date.minute < 0
+    ){
+        report_error(
+            &logger, ProgramInfo(),
+            "Failed to read date.",
+            {},
+            *screen
+        );
+    }
+
     return date;
 }
 void DateReader_US::set_date(
@@ -104,16 +119,30 @@ void DateReader_US::set_date(
         }
 
         move_horizontal(context, cursor_position, 0);
-        adjust_wrap(context, 1, 12, current.month, date.month);
+        if (current.month < 0){
+            stream.log("Failed to read month. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 1, 12, current.month, date.month);
+        }
 
         move_horizontal(context, cursor_position, 1);
-        adjust_no_wrap(context, current.day, date.day);
+        if (current.day < 0){
+            stream.log("Failed to read day. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_no_wrap(context, current.day, date.day);
+        }
 
         move_horizontal(context, cursor_position, 2);
-        adjust_no_wrap(context, current.year, date.year);
+        if (current.year < 0){
+            stream.log("Failed to read year. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_no_wrap(context, current.year, date.year);
+        }
 
         move_horizontal(context, cursor_position, 3);
-        {
+        if (current.hour < 0){
+            stream.log("Failed to read hour. Will not adjust.", COLOR_RED);
+        }else{
             int8_t c = current.hour;
             int8_t t = date.hour;
             if (c >= 12) c -= 12;
@@ -122,7 +151,11 @@ void DateReader_US::set_date(
         }
 
         move_horizontal(context, cursor_position, 4);
-        adjust_wrap(context, 0, 59, current.minute, date.minute);
+        if (current.minute < 0){
+            stream.log("Failed to read minutes. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 0, 59, current.minute, date.minute);
+        }
 
         move_horizontal(context, cursor_position, 5);
         if ((date.hour < 12) != (current.hour < 12)){
