Log the move effectiveness results.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -314,7 +314,15 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
-    close_game_from_home(console, context);
+    std::string move_results = "Move Effectiveness:";
+    move_results += "\n- Top: " + std::string("asdf");
+    move_results += "\n- Left: " + std::string("asdf");
+    move_results += "\n- Right: " + std::string("asdf");
+    move_results += "\n- Bottom: " + std::string("asdf");
+    console.log(move_results);
+
+
+//    close_game_from_home(console, context);
 
 
 #if 0

SerialPrograms/Source/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp

@@ -35,6 +35,24 @@ const char* template_path(MoveEffectivenessSymbol symbol){
 }
 
 
+const char* to_string(MoveEffectivenessSymbol symbol){
+    switch (symbol){
+    case MoveEffectivenessSymbol::NoEffect:
+        return "No Effect";
+    case MoveEffectivenessSymbol::NotVeryEffective:
+        return "Not Very Effective";
+    case MoveEffectivenessSymbol::Normal:
+        return "Effective";
+    case MoveEffectivenessSymbol::SuperEffective:
+        return "Super Effective";
+    default:
+        return nullptr;
+    }
+}
+
+
+
+
 MoveEffectivenessSymbolMatcher::MoveEffectivenessSymbolMatcher(MoveEffectivenessSymbol symbol)
     : WaterfillTemplateMatcher(
         template_path(symbol),

SerialPrograms/Source/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h

@@ -28,6 +28,7 @@ enum class MoveEffectivenessSymbol{
     Normal,
     SuperEffective,
 };
+const char* to_string(MoveEffectivenessSymbol symbol);
 
 
 

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp

@@ -14,6 +14,10 @@
 #include "PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h"
 #include "PokemonLZA_TrainerBattle.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonLZA{
@@ -25,6 +29,13 @@ TrainerBattleState::TrainerBattleState(BattleAIOption& settings)
 {}
 
 
+std::string move_effectiveness_detection(MoveEffectivenessSymbol symbol){
+    const char* str = to_string(symbol);
+    if (str){
+        return str;
+    }
+    return "(Unable to Detect)";
+}
 
 
 bool TrainerBattleState::attempt_one_attack(
@@ -34,7 +45,7 @@ bool TrainerBattleState::attempt_one_attack(
 ){
     AsyncCommandSession<ProController> command(
         context,
-        env.logger(),
+        console.logger(),
         env.realtime_dispatcher(),
         context
     );
@@ -44,7 +55,7 @@ bool TrainerBattleState::attempt_one_attack(
         pbf_press_button(context, BUTTON_ZL, 5000ms, 0ms);
     });
 
-    env.log("Begin looking for type symbols.");
+    console.log("Begin looking for type symbols.");
 
     int ret = wait_until(
         console, context, 1000ms,
@@ -61,6 +72,13 @@ bool TrainerBattleState::attempt_one_attack(
         return false;
     }
 
+    std::string move_results = "Move Effectiveness:";
+    move_results += "\n- Top: " + move_effectiveness_detection(move_watcher[0]);
+    move_results += "\n- Left: " + move_effectiveness_detection(move_watcher[1]);
+    move_results += "\n- Right: " + move_effectiveness_detection(move_watcher[2]);
+    move_results += "\n- Bottom: " + move_effectiveness_detection(move_watcher[3]);
+    console.log(move_results);
+
     static const Button BUTTON_INDEX[] = {
         BUTTON_X,
         BUTTON_Y,
@@ -90,7 +108,7 @@ bool TrainerBattleState::attempt_one_attack(
         }
     }
 
-    env.log(STRING_INDEX[best_index], COLOR_BLUE);
+    console.log(STRING_INDEX[best_index], COLOR_BLUE);
     console.overlay().add_log(STRING_INDEX[best_index]);
 
     command.dispatch([&](ProControllerContext& context){