Update outbreak finder notification

Author: Gin

SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp

@@ -674,15 +674,7 @@ std::set<std::string> OutbreakFinder::enter_region_and_read_MMO(
 }
 
 
-// Run one iteration of the outbreak finder loop and return true when one desired outbreak is found.
-// The iteration includes:
-// 1. Starting at Jubilife Village gate, go to check the map for outbreaks.
-// 2. If found desired outbreaks, stop.
-// 3. If need to check MMOs, save in front of gate, then go to each region with MMO and talk to Mai to
-//    reveal MMO pokemon. Reset if no desired MMO to conserve Aguav Berries. 
-// 4. If found desired MMO pokemon, stop.
-// 5. No desired outbreak in this iteration, go to an arbitrary region and return to village to refresh outbreaks.
-bool OutbreakFinder::run_iteration(
+std::vector<std::string> OutbreakFinder::run_iteration(
     SingleSwitchProgramEnvironment& env, ProControllerContext& context,
     const std::set<std::string>& desired_hisui_map_events,
     const std::set<std::string>& desired_outbreaks,
@@ -720,14 +712,14 @@ bool OutbreakFinder::run_iteration(
                 os << "Found following desired outbreak" << (desired_outbreaks_found.size() > 1 ? "s: " : ": ");
                 for(const auto& outbreak: desired_outbreaks_found){
                     os << outbreak << ", ";
-                    env.console.overlay().add_log("Found " + outbreak);
+                    env.console.overlay().add_log("Found " + outbreak, COLOR_GREEN);
                 }
-                env.log(os.str());
+                env.log(os.str(), COLOR_GREEN);
 
-                return true;
-            }else{
-                env.log("No desired outbreak.");
+                return desired_outbreaks_found;
             }
+            
+            env.log("No desired outbreak.");
         }
 
         // What we found is MMO symbols for MMO pokemon.
@@ -750,10 +742,10 @@ bool OutbreakFinder::run_iteration(
                 os << "Found desired MMO pokemon (including desired MMO pokemon with star symbols): ";
                 for (const auto& pokemon : found_pokemon){
                     os << pokemon << ", ";
-                    env.console.overlay().add_log("Found " + pokemon);
+                    env.console.overlay().add_log("Found " + pokemon, COLOR_GREEN);
                 }
-                env.log(os.str());
-                return true;
+                env.log(os.str(), COLOR_GREEN);
+                return std::vector<std::string>(found_pokemon.begin(), found_pokemon.end());
             }
 
             env.log("No target MMO sprite found. Reset game...");
@@ -769,7 +761,7 @@ bool OutbreakFinder::run_iteration(
     //  Go to an arbitrary region and return to refresh outbreaks.
     goto_region_and_return(env, context, inside_travel_map);
 
-    return false;
+    return std::vector<std::string>();
 }
 
 
@@ -849,21 +841,30 @@ void OutbreakFinder::program(SingleSwitchProgramEnvironment& env, ProControllerC
         desired_hisui_map_events.insert(p.first);
     }
 
+    std::vector<std::string> found_outbreaks;
     while (true){
-        if (run_iteration(env, context, desired_hisui_map_events, desired_outbreaks, desired_MMO_pokemon, 
-            desired_star_MMO_pokemon))
+        found_outbreaks = run_iteration(
+            env, context, desired_hisui_map_events, desired_outbreaks, desired_MMO_pokemon, 
+            desired_star_MMO_pokemon);
+        if (found_outbreaks.size() > 0)
         {
             break;
         }
     }
 
     env.update_stats();
 
-    send_program_notification(
+    os.str("");  // clear ostringstream
+    os << "Found ";
+    for (size_t i = 0; i < found_outbreaks.size(); i++){
+        os << found_outbreaks[i];
+        if (i + 1 != found_outbreaks.size()){
+            os << ", ";
+        }
+    }
+    send_program_finished_notification(
         env, NOTIFICATION_MATCHED,
-        COLOR_GREEN,
-        "Found Outbreak",
-        {}, "",
+        os.str(),
         env.console.video().snapshot()
     );
 

SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h

@@ -34,7 +34,15 @@ class OutbreakFinder : public SingleSwitchProgramInstance{
 
 
 private:
-    // One iteration in the main program loop
+    // Run one iteration of the outbreak finder loop and return any found outbreaks.
+    // The iteration includes:
+    // 1. Starting at Jubilife Village gate, go to check the map for outbreaks.
+    // 2. If found desired outbreaks, stop.
+    // 3. If need to check MMOs, save in front of gate, then go to each region with MMO and talk to Mai to
+    //    reveal MMO pokemon. Reset if no desired MMO to conserve Aguav Berries. 
+    // 4. If found desired MMO pokemon, stop.
+    // 5. No desired outbreak in this iteration, go to an arbitrary region and return to village to refresh outbreaks.
+    //
     // - desired_hisui_map_events: desired events happening on the travel map of Hisui when leaving Jubilife Village.
     //   It contains desired pokemon outbreak names and MMO outbreak names (e.g. "fieldlands-mmo"). If there are
     //   desired MMO pokemon (including those with star symbols), the MMO outbreaks that may spawn them are also
@@ -46,7 +54,7 @@ class OutbreakFinder : public SingleSwitchProgramInstance{
     // - desired_MMO_pokemon: user desired MMO pokemon selected by `DESIRED_MMO_SLUGS`.
     //   User selected MMO pokemon with star symbols, `DESIRED_STAR_MMO_SLUGS` do not affect `desired_MMO_pokemon`. 
     // - desired_star_MMO_pokemon: user desired MMO pokemon with star symbols.
-    bool run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    std::vector<std::string> run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context,
         const std::set<std::string>& desired_hisui_map_events,
         const std::set<std::string>& desired_outbreaks,
         const std::set<std::string>& desired_MMO_pokemon,