Add a proper ambiguous silhouette path.

Author: Mysticial

SerialPrograms/Source/CommonTools/ImageMatch/ImageCropper.cpp

@@ -53,11 +53,16 @@ ImagePixelBox enclosing_rectangle_with_pixel_filter(const ImageViewRGB32& image,
     size_t cs = 0;
     size_t ce = image.width();
 
+//    cout << "Before: rs = " << rs << ", re = " << re << ", cs = " << cs << ", ce = " << ce << endl;
+
     // If we cannot find a foreground (aka, alpha != 0) pixel on one row or column, we trim it, until hitting a foreground pixel.
     while (rs < re && is_background_row(image, rs    , is_foreground)) rs++;
     while (re > rs && is_background_row(image, re - 1, is_foreground)) re--;
     while (cs < ce && is_background_col(image, cs    , is_foreground)) cs++;
     while (ce > cs && is_background_col(image, ce - 1, is_foreground)) ce--;
+
+//    cout << "After:  rs = " << rs << ", re = " << re << ", cs = " << cs << ", ce = " << ce << endl;
+
     return ImagePixelBox(cs, rs, ce, re);
 }
 

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -375,14 +375,16 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
 
-//    ImageRGB32 image("20250115-110356822901.png");
+    ImageRGB32 image("20250218-003554940153.png");
 //    ImageRGB32 image("raidecho1.jpg");
 //    auto image = feed.snapshot();
 
 //    MaxLairInternal::BattleMenuReader reader(overlay, Language::English);
 //    reader.read_opponent_in_summary(logger, image);
 
-//    TeraCardReader reader;
+    TeraCardReader reader;
+    cout << reader.detect(image) << endl;
+    reader.pokemon_slug(logger, env.program_info(), image);
 //    cout << (int)reader.stars(logger, env.program_info(), image) << endl;
 
 

SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp

@@ -218,22 +218,28 @@ std::string TeraCardReader::tera_type(
 
     return best_type;
 }
-std::string TeraCardReader::pokemon_slug(
+std::set<std::string> TeraCardReader::pokemon_slug(
     Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
 ) const{
     ImageMatch::ImageMatchResult silhouette = m_silhouette.read(screen);
-    silhouette.log(logger, 100);
-    std::string best_silhouette;
-    if (!silhouette.results.empty()){
-        best_silhouette = silhouette.results.begin()->second;
-    }
+    silhouette.log(logger, 110);
+//    std::string best_silhouette;
+//    if (!silhouette.results.empty()){
+//        best_silhouette = silhouette.results.begin()->second;
+//    }
     if (silhouette.results.empty()){
         dump_image(logger, info, "ReadSilhouetteFailed", screen);
-    }else if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        dump_debug_image(logger, "PokemonSV/TeraRoller/" + best_silhouette, "", screen);
+    }
+//    else if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
+//        dump_debug_image(logger, "PokemonSV/TeraRoller/" + best_silhouette, "", screen);
+//    }
+
+    std::set<std::string> results;
+    for (const auto& item : silhouette.results){
+        results.insert(std::move(item.second));
     }
 
-    return best_silhouette;
+    return results;
 }
 
 

SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h

@@ -40,7 +40,7 @@ class TeraCardReader : public StaticScreenDetector{
     std::string tera_type(
         Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
     ) const;
-    std::string pokemon_slug(
+    std::set<std::string> pokemon_slug(
         Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
     ) const;
 

SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp

@@ -60,11 +60,13 @@ ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& sc
         225,
     };
 
+//    static int c = 0;
+    ImageMatch::ImageMatchResult slugs;
     for (uint32_t threshold : BRIGHTNESS_THRESHOLDS){
 //        cout << "check0" << endl;
         //  Get a loose crop of the silhouette icon
         ImageViewRGB32 cropped_image = extract_box_reference(screen, m_box);
-//        cropped_image.save("tera_cropped_image.png");
+//        cropped_image.save("tera_cropped_image-" + std::to_string(c++) + ".png");
 
 //        cout << "check1" << endl;
         ImageRGB32 preprocessed_image(cropped_image.width(), cropped_image.height());
@@ -88,14 +90,14 @@ ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& sc
 
 //        cout << "check3" << endl;
         ImageRGB32 processed_image = extract_box_reference(preprocessed_image, tight_box).copy();
-//        processed_image.save("tera_processed_image.png");
+//        processed_image.save("tera_processed_image-" + std::to_string(c++) + ".png");
 
 //        cout << "check4" << endl;
         ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, 0xff000000, 0xff5f5f5f, true);
 //        filtered_image.save("tera_filtered_image.png");
 
 //        cout << "check5" << endl;
-        ImageMatch::ImageMatchResult slugs = TERA_RAID_SILHOUETTE_MATCHER().match(filtered_image, ALPHA_SPREAD);
+        slugs = TERA_RAID_SILHOUETTE_MATCHER().match(filtered_image, ALPHA_SPREAD);
         slugs.clear_beyond_alpha(MAX_ALPHA);
 
 //        slugs.log(global_logger_tagged(), MAX_ALPHA);
@@ -105,7 +107,7 @@ ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& sc
         }
     }
 
-    return ImageMatch::ImageMatchResult();
+    return slugs;
 }
 
 

SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp

@@ -4,10 +4,9 @@
  *
  */
 
-//#include "Common/Cpp/Exceptions.h"
+#include <algorithm>
+#include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-//#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-//#include "CommonFramework/Tools/DebugDumper.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
@@ -172,9 +171,15 @@ void TeraRollFilter::read_card(
     std::string tera_type = data.tera_type.empty()
         ? "? tera"
         : data.tera_type;
-    std::string pokemon = data.species.empty()
-        ? "? " + Pokemon::STRING_POKEMON
-        : data.species;
+
+    std::string pokemon;
+    if (data.species.empty()){
+        pokemon = "unknown " + Pokemon::STRING_POKEMON;
+    }else if (data.species.size() == 1){
+        pokemon = *data.species.begin();
+    }else{
+        pokemon = set_to_str(data.species);
+    }
 
     stream.overlay().add_log(
         stars + "* " + tera_type + " " + pokemon,
@@ -183,7 +188,7 @@ void TeraRollFilter::read_card(
     std::string log = "Detected a " + stars + "* " + tera_type + " " + pokemon;
     stream.log(log);
 }
-bool TeraRollFilter::check_herba(const std::string& pokemon_slug) const{
+bool TeraRollFilter::check_herba(const std::set<std::string>& pokemon_slugs) const{
     if (!SKIP_NON_HERBA){
         return true;
     }
@@ -197,10 +202,23 @@ bool TeraRollFilter::check_herba(const std::string& pokemon_slug) const{
         "poliwrath", "snorlax", "basculegion"
     };
 
-    if (fivestar.find(pokemon_slug) != fivestar.end()){
+    std::set<std::string> fivestar_compatible;
+    std::set_intersection(
+        fivestar_compatible.begin(), fivestar_compatible.end(),
+        pokemon_slugs.begin(), pokemon_slugs.end(),
+        std::inserter(fivestar_compatible, fivestar_compatible.begin())
+    );
+    if (!fivestar_compatible.empty()){
         return true;
     }
-    if (sixstar.find(pokemon_slug) != sixstar.end()){
+
+    std::set<std::string> sixstar_compatible;
+    std::set_intersection(
+        sixstar_compatible.begin(), sixstar_compatible.end(),
+        pokemon_slugs.begin(), pokemon_slugs.end(),
+        std::inserter(sixstar_compatible, sixstar_compatible.begin())
+    );
+    if (!sixstar_compatible.empty()){
         return true;
     }
 

SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraRollFilter.h

@@ -7,6 +7,7 @@
 #ifndef PokemonAutomation_PokemonSV_TeraRollFilter_H
 #define PokemonAutomation_PokemonSV_TeraRollFilter_H
 
+#include <set>
 #include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
@@ -37,7 +38,7 @@ struct TeraRaidData{
 
     uint8_t stars = 0;
     std::string tera_type;
-    std::string species;
+    std::set<std::string> species;
 };
 
 
@@ -65,7 +66,7 @@ class TeraRollFilter : public GroupOption{
         const ProgramInfo& info, VideoStream& stream, const ImageViewRGB32& screen,
         TeraCardReader& reader, TeraRaidData& data
     ) const;
-    bool check_herba(const std::string& pokemon_slug) const;
+    bool check_herba(const std::set<std::string>& pokemon_slugs) const;
 
 public:
     enum class EventCheckMode{

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp

@@ -6,6 +6,7 @@
 
 #include <sstream>
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
@@ -308,9 +309,15 @@ void TeraSelfFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerC
             std::string tera_type = raid_data.tera_type.empty()
                 ? "unknown tera type"
                 : raid_data.tera_type;
-            std::string pokemon = raid_data.species.empty()
-                ? "unknown " + Pokemon::STRING_POKEMON
-                : raid_data.species;
+
+            std::string pokemon;
+            if (raid_data.species.empty()){
+                pokemon = "unknown " + Pokemon::STRING_POKEMON;
+            }else if (raid_data.species.size() == 1){
+                pokemon = *raid_data.species.begin();
+            }else{
+                pokemon = set_to_str(raid_data.species);
+            }
 
             ss << " a " << stars << "* " << tera_type << " " << pokemon << " raid";
             env.log(ss.str());