BattleMenu->Arrow

Author: kichithewolf

SerialPrograms/CMakeLists.txt

@@ -1375,8 +1375,8 @@ file(GLOB MAIN_SOURCES
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
     Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp
     Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h
-    Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleMenuDetector.cpp
-    Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleMenuDetector.h
+    Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp
+    Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h
     Source/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp
     Source/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h
     Source/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp

SerialPrograms/SerialPrograms.pro

@@ -674,7 +674,7 @@ SOURCES += \
     Source/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp \
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp \
     Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp \
-    Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleMenuDetector.cpp \
+    Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp \
     Source/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp \
     Source/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp \
     Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp \
@@ -1873,7 +1873,7 @@ HEADERS += \
     Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h \
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h \
     Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h \
-    Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleMenuDetector.h \
+    Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h \
     Source/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h \
     Source/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h \
     Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h \

SerialPrograms/Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp

@@ -0,0 +1,69 @@
+/*  Battle Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "PokemonLGPE_BattleArrowDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+const ImageMatch::ExactImageMatcher& BATTLE_ARROW(){
+    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonLGPE/BattleArrow.png");
+    return matcher;
+}
+
+BattleArrowDetector::BattleArrowDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+void BattleArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool BattleArrowDetector::detect(const ImageViewRGB32& screen) const{
+    using namespace Kernels::Waterfill;
+
+    ImageViewRGB32 region = extract_box_reference(screen, m_box);
+
+    const ImageMatch::ExactImageMatcher& matcher = BATTLE_ARROW();
+
+    auto matrix = compress_rgb32_to_binary_range(region, 0xffc0c0c0, 0xffffffff);
+    auto session = make_WaterfillSession(matrix);
+    auto iter = session->make_iterator(100);
+    WaterfillObject object;
+
+    //static int c = 0;
+    while (iter->find_next(object, false)){
+        double aspect_ratio = object.aspect_ratio();
+        if (aspect_ratio < 1.0 || aspect_ratio > 1.3){
+            continue;
+        }
+        ImageViewRGB32 cropped = extract_box_reference(region, object);
+        //cropped.save("test-object-" + std::to_string(c++) + ".png");
+        double rmsd = matcher.rmsd(cropped);
+        //cout << rmsd << endl;
+        if (rmsd < 110){
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+
+}
+}
+}

SerialPrograms/Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h

@@ -0,0 +1,53 @@
+/*  Battle Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_BattleArrowDetector_H
+#define PokemonAutomation_PokemonLGPE_BattleArrowDetector_H
+
+#include <chrono>
+#include <atomic>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+class BattleArrowDetector : public StaticScreenDetector{
+public:
+    /*
+    |Fight|Pokemon|Bag|Run| for wild battle
+    |---|Fight|Pokemon|Bag| for trainer battle
+    (align right)
+    Don't know what changes for a double battle.
+    */
+    //Arrow bounces back and forth.
+    BattleArrowDetector(Color color, const ImageFloatBox& box = {0.546, 0.863, 0.045, 0.068}); //Wild battle.
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) const override;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class BattleArrowWatcher : public DetectorToFinder<BattleArrowDetector>{
+public:
+    BattleArrowWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("BattleArrowWatcher", std::chrono::milliseconds(100), color)
+    {}
+};
+
+
+
+}
+}
+}
+
+#endif

SerialPrograms/Source/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleMenuDetector.cpp

@@ -15,7 +15,7 @@
 #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
-#include "PokemonLGPE/Inference/Battles/PokemonLGPE_BattleMenuDetector.h"
+#include "PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h"
 #include "PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h"
 #include "PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
 #include "PokemonLGPE_LegendaryReset.h"
@@ -87,7 +87,7 @@ bool LegendaryReset::run_battle(SingleSwitchProgramEnvironment& env, JoyconConte
         shiny_coefficient = error_coefficient;
         return true;
     });
-    BattleMenuWatcher battle_started(COLOR_YELLOW);
+    BattleArrowWatcher battle_started(COLOR_YELLOW);
 
     env.log("Starting battle.");
     switch (TARGET) {
@@ -98,7 +98,7 @@ bool LegendaryReset::run_battle(SingleSwitchProgramEnvironment& env, JoyconConte
         pbf_mash_button(context, BUTTON_A, 15000ms);
         break;
     case Target::snorlax2:
-        pbf_mash_button(context, BUTTON_A, 25000ms); //can't test
+        pbf_mash_button(context, BUTTON_A, 25000ms); //can't test, not really worth it
         break;
     }
     context.wait_for_all_requests();
@@ -120,7 +120,6 @@ bool LegendaryReset::run_battle(SingleSwitchProgramEnvironment& env, JoyconConte
                     env.console
                 );
             }
-            pbf_wait(context, 1000ms);
             context.wait_for_all_requests();
         },
         {{shiny_detector}}