Fix AutoDA path detection.

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 = 54;
-const int PROGRAM_VERSION_PATCH = 30;
+const int PROGRAM_VERSION_PATCH = 31;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/Pokemon/Pokemon_Types.h

@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_Pokemon_Types_H
 #define PokemonAutomation_Pokemon_Types_H
 
-#include <string>
+//#include <string>
 #include "Common/Cpp/EnumStringMap.h"
 
 namespace PokemonAutomation{

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.cpp

@@ -81,8 +81,14 @@ std::pair<double, PokemonType> match_type_symbol(const ImageViewRGB32& image){
 //        }
 
         double expected_aspect_ratio = item.second.aspect_ratio();
-//        cout << item.second.slug() << " : " << expected_aspect_ratio << endl;
-        if (std::abs(aspect_ratio - expected_aspect_ratio) > 0.05){
+        double ratio = aspect_ratio / expected_aspect_ratio;
+#if 0
+        cout << item.second.slug()
+             << " : expected = " << expected_aspect_ratio
+             << ", actual = " << aspect_ratio
+             << ", ratio = " << ratio << endl;
+#endif
+        if (std::abs(ratio - 1) > 0.2){
             continue;
         }
 

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

@@ -13,6 +13,10 @@
 //#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
 #include "PokemonSwSh_MaxLair_Detect_PathMap.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
@@ -33,6 +37,14 @@ bool read_type_array(
     }
 
     std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_type_symbols(screen, image, 0.20);
+//    cout << candidates.size() << endl;
+
+#if 0
+    for (auto& item : candidates){
+        cout << item.first << " : " << POKEMON_TYPE_SLUGS().get_string(item.second.first) << endl;
+    }
+#endif
+
     if (candidates.size() < count){
 //        dump_image(console, screen, "ReadPath");
         return false;