More aggressive OCR checking for AutoDA.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Language.cpp

@@ -86,7 +86,7 @@ Language language_code_to_enum(const std::string& language){
 
 std::string language_warning(Language language){
     return "Please ensure that you have set the correct Game Language in the program settings.\n"
-            "Current language set: " + language_data(language).name;
+            "Current Language Set: " + language_data(language).name;
 
 }
 

SerialPrograms/Source/CommonTools/FailureWatchdog.h

@@ -10,6 +10,7 @@
 #include "Common/Cpp/AbstractLogger.h"
 #include "Common/Cpp/Time.h"
 #include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Language.h"
 
 namespace PokemonAutomation{
 
@@ -21,13 +22,15 @@ class FailureWatchdog{
 public:
     FailureWatchdog(
         Logger& logger,
-        std::string failure_message,
+        Language language,
+//        std::string failure_message,
         uint64_t min_count = 5,
         double min_success_rate = 0.5,
         std::chrono::seconds time_limit = std::chrono::seconds(120)
     )
         : m_logger(logger)
-        , m_failure_message(std::move(failure_message))
+        , m_language(language)
+//        , m_failure_message(std::move(failure_message))
         , m_min_count(min_count)
         , m_min_success_rate(min_success_rate)
         , m_time_limit(time_limit)
@@ -63,13 +66,18 @@ class FailureWatchdog{
         }
 
 
-        throw UserSetupError(m_logger, m_failure_message);
+        throw UserSetupError(
+            m_logger,
+            "Too many text recognition errors. Did you set the correct language?\n"
+            "Current Language: " + language_data(m_language).name
+        );
     }
 
 
 private:
     Logger& m_logger;
-    std::string m_failure_message;
+    Language m_language;
+//    std::string m_failure_message;
     uint64_t m_min_count;
     double m_min_success_rate;
     WallDuration m_time_limit;
@@ -88,14 +96,16 @@ class OcrFailureWatchdog : public FailureWatchdog{
 public:
     OcrFailureWatchdog(
         Logger& logger,
-        std::string failure_message = "Too many text recognition errors. Did you set the correct language?",
+        Language language,
+//        std::string failure_message = "Too many text recognition errors. Did you set the correct language?",
         uint64_t min_count = 5,
         double min_success_rate = 0.5,
         std::chrono::seconds time_limit = std::chrono::seconds(120)
     )
         : FailureWatchdog(
             logger,
-            std::move(failure_message),
+            language,
+//            std::move(failure_message),
             min_count,
             min_success_rate,
             time_limit

SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp

@@ -61,7 +61,7 @@ AdventureRuntime::AdventureRuntime(
     , session_stats(p_session_stats)
 {
     for (size_t c = 0; c < p_console_settings.active_consoles(); c++){
-        ocr_watchdog.emplace_back(consoles[c].logger());
+        ocr_watchdog.emplace_back(consoles[c].logger(), console_settings.PLAYERS[c]->language);
     }
 }
 

SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp

@@ -354,6 +354,7 @@ std::string read_pokemon_name_sprite(
     if (!ocr_hit){
         std::string ret = sprite_hit ? std::move(iter->second) : "";
         logger.log("Failed to read name. Using sprite result: " + ret, COLOR_RED);
+        ocr_watchdog.push_result(false);
 //        dump_image(logger, screen, "MaxLair-read_name_sprite");
         return ret;
     }
@@ -375,6 +376,7 @@ std::string read_pokemon_name_sprite(
     //  If there is only one sprite match, use it.
     if (result.results.size() == 1){
         logger.log("Sprite and OCR disagree. Attempt to arbitrate... Picking: " + result.results.begin()->second, COLOR_RED);
+        ocr_watchdog.push_result(false);
         return std::move(result.results.begin()->second);
     }
 
@@ -386,6 +388,7 @@ std::string read_pokemon_name_sprite(
 
     //  At this point, both OCR and sprites have multiple items in completely disjoint sets.
     logger.log("Sprite and OCR disagree so badly that no arbitration will be attempted.", COLOR_RED);
+    ocr_watchdog.push_result(false);
 
     dump_image(logger, MODULE_NAME, "MaxLair-read_name_sprite", screen);