Improve reliability of AutoDA boss reading.

Author: Mysticial

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

@@ -254,69 +254,115 @@ std::set<std::string> BattleMenuReader::read_opponent(
     return result;
 }
 std::set<std::string> BattleMenuReader::read_opponent_in_summary(Logger& logger, const ImageViewRGB32& screen) const{
-    ImageViewRGB32 name = extract_box_reference(screen, m_summary_opponent_name);
-
-    //  We can use a weaker threshold here since we are cross-checking with the type.
-    std::set<std::string> slugs = read_pokemon_name(logger, m_language, name, -1.0);
-
-    ImageViewRGB32 types = extract_box_reference(screen, m_summary_opponent_types);
-    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_symbols(types, 0.2);
+    //  Start by reading the types.
+    PokemonType type0, type1;
+    {
+        ImageViewRGB32 types = extract_box_reference(screen, m_summary_opponent_types);
+        std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_symbols(types, 0.2);
 
-    std::string type_str = "Type Read Result:\n";
-    for (const auto& item : candidates){
-        type_str += "    " + get_type_slug(item.second.first) + " : " + tostr_default(item.first ) + "\n";
+        std::string type_str = "Type Read Result:\n";
+        for (const auto& item : candidates){
+            type_str += "    " + get_type_slug(item.second.first) + " : " + tostr_default(item.first ) + "\n";
+        }
+        logger.log(type_str);
+
+        type0 = PokemonType::NONE;
+        type1 = PokemonType::NONE;
+        {
+            auto iter = candidates.begin();
+            if (iter != candidates.end()){
+                type0 = iter->second.first;
+                ++iter;
+            }
+            if (iter != candidates.end()){
+                type1 = iter->second.first;
+                ++iter;
+            }
+        }
     }
-    logger.log(type_str);
 
-    PokemonType type0 = PokemonType::NONE;
-    PokemonType type1 = PokemonType::NONE;
-    {
-        auto iter = candidates.begin();
-        if (iter != candidates.end()){
-            type0 = iter->second.first;
-            ++iter;
+    //  Compile a list of all possible mons that match the type.
+    std::set<std::string> allowed_slugs;
+    for (const auto& item : maxlair_slugs()){
+        const MaxLairMon& mon = get_maxlair_mon(item.first);
+        if ((type0 == mon.type[0] && type1 == mon.type[1]) ||
+            (type0 == mon.type[1] && type1 == mon.type[0])
+        ){
+            allowed_slugs.insert(item.first);
         }
-        if (iter != candidates.end()){
-            type1 = iter->second.first;
-            ++iter;
+    }
+
+    //  Special case for stunfisk-galar which changes types.
+    if (type1 == PokemonType::NONE){
+        switch (type0){
+        case PokemonType::ELECTRIC:
+        case PokemonType::GRASS:
+        case PokemonType::FAIRY:
+        case PokemonType::PSYCHIC:
+            allowed_slugs.insert("stunfisk-galar");
+            break;
+        default:;
         }
     }
 
-//    cout << get_type_slug(type0) << endl;
-//    cout << get_type_slug(type1) << endl;
+    if (allowed_slugs.size() == 1){
+        return allowed_slugs;
+    }
+
+
+    //  Now we read the name.
+    std::set<std::string> name_slugs;
+    {
+        ImageViewRGB32 name = extract_box_reference(screen, m_summary_opponent_name);
 
-    for (auto iter = slugs.begin(); iter != slugs.end();){
-        const MaxLairMon& mon = get_maxlair_mon(*iter);
-//        cout << mon.species << endl;
-//        cout << get_type_slug(mon.type[0]) << endl;
-//        cout << get_type_slug(mon.type[1]) << endl;
-        if ((type0 == mon.type[0] && type1 == mon.type[1]) || (type0 == mon.type[1] && type1 == mon.type[0])){
-            ++iter;
-        }else{
-            iter = slugs.erase(iter);
+        //  We can use a weaker threshold here since we are cross-checking with the type.
+        name_slugs = read_pokemon_name(logger, m_language, name, -1.0);
+    }
+
+    //  See if there's anything in common between the slugs that match the type
+    //  and the slugs that match the OCR'ed name.
+    std::set<std::string> common_slugs;
+    for (const std::string& slug : name_slugs){
+        if (allowed_slugs.find(slug) != allowed_slugs.end()){
+            common_slugs.insert(slug);
         }
     }
 
-    if (slugs.size() == 1){
-        logger.log("Disambiguation succeeded: " + *slugs.begin(), COLOR_BLUE);
-        return slugs;
+//    for (const auto& slug : allowed_slugs){
+//        cout << "allowed_slugs = " << slug << endl;
+//    }
+//    for (const auto& slug : name_slugs){
+//        cout << "name_slugs = " << slug << endl;
+//    }
+
+    if (common_slugs.size() == 1){
+        logger.log("Disambiguation succeeded: " + *common_slugs.begin(), COLOR_BLUE);
+        return common_slugs;
     }
 
-    if (slugs.empty()){
-        logger.log("Disambiguation failed. No results.", COLOR_RED);
-    }else{
-        logger.log("Disambiguation failed. Still have multiple results: " + set_to_str(slugs), COLOR_RED);
+
+    //  Special case: Korean Clefairy
+    //  Reason: Korean OCR cannot read the character: 삐
+    if (m_language == Language::Korean &&
+        name_slugs.empty() &&
+        type0 == PokemonType::FAIRY &&
+        type1 == PokemonType::NONE
+    ){
+        logger.log("Known case that cannot be read: Korean Clefairy", COLOR_RED);
+        return {"clefairy"};
     }
 
+
+
     static std::set<std::string> KNOWN_BAD_SLUGS{
         "basculin-blue-striped",
         "basculin-red-striped",
         "lycanroc-midday",
         "lycanroc-midnight",
-        "stunfisk-galar",   //  After using terrain pulse.
+//        "stunfisk-galar",   //  After using terrain pulse.
     };
     bool error = true;
-    for (const std::string& slug : slugs){
+    for (const std::string& slug : common_slugs){
         auto iter = KNOWN_BAD_SLUGS.find(slug);
         if (iter != KNOWN_BAD_SLUGS.end()){
             error = false;
@@ -325,23 +371,12 @@ std::set<std::string> BattleMenuReader::read_opponent_in_summary(Logger& logger,
         }
     }
 
-    //  Special case: Korean Clefairy.
-    //  Reason: Korean OCR cannot read the character: 삐
-    if (m_language == Language::Korean &&
-        slugs.empty() &&
-        type0 == PokemonType::FAIRY &&
-        type1 == PokemonType::NONE
-    ){
-        logger.log("Known case that cannot be read: Korean Clefairy", COLOR_RED);
-        return {"clefairy"};
-    }
-
     //  At this point we're out of options.
     if (error){
         dump_image(logger, MODULE_NAME, "DisambiguateBoss", screen);
     }
 
-    return slugs;
+    return common_slugs;
 }
 std::string BattleMenuReader::read_own_mon(Logger& logger, const ImageViewRGB32& screen) const{
     return read_pokemon_name_sprite(