Merge branch 'PokemonAutomation:main' into main

Author: ZacharyPL

.azure-pipelines/azure-pipelines.yml

@@ -10,13 +10,11 @@ resources:
       type: github
       name: PokemonAutomation/Arduino-Source-Internal
       endpoint: PokemonAutomation
-      ref: refs/heads/master
 
     - repository: Arduino-Source
       type: github
       name: PokemonAutomation/Arduino-Source
       endpoint: PokemonAutomation
-      ref: refs/heads/main
 
 variables:
   - group: apple-signing
@@ -452,6 +450,28 @@ stages:
 #    poolName: AlarmClock
 #    condition: always()
 
+##########################################
+#          ARTIFACT VALIDATION           #
+##########################################
+
+- stage: Manual_Validation
+  displayName: 'Manual Validation'
+  dependsOn:
+    - Upload_Debug_Symbols
+  condition: and(succeeded(), eq('${{ parameters.targetOS }}', 'All'), ne('${{ parameters.buildType }}', 'Commit'))
+  jobs:
+    - job: ManualValidation
+      displayName: 'Manual Validation'
+      pool: server
+      timeoutInMinutes: 1440
+      steps:
+        - task: ManualValidation@0
+          timeoutInMinutes: 1440
+          inputs:
+            notifyUsers: '$(Build.RequestedForEmail)'
+            instructions: 'Please validate the build artifacts for each platform. Approve to proceed or reject to fail the pipeline.'
+            onTimeout: 'reject'
+
 ##########################################
 #         UPDATE TELEMETRY JSON          #
 ##########################################
@@ -461,7 +481,7 @@ stages:
     stageName: Update_GitHub_Telemetry_JSON
     displayName: 'Update GitHub Telemetry JSON'
     dependsOn:
-      - Upload_Debug_Symbols
+      - Manual_Validation
     buildType: ${{ parameters.buildType }}
     versionMajor: ${{ parameters.versionMajor }}
     versionMinor: ${{ parameters.versionMinor }}
@@ -506,4 +526,9 @@ stages:
     versionMinor: ${{ parameters.versionMinor }}
     versionPatch: ${{ parameters.versionPatch }}
     versionRepo: PokemonAutomation/ComputerControl
-    condition: and(succeeded(), eq('${{ parameters.targetOS }}', 'All'), ne('${{ parameters.buildType }}', 'Commit'))
+    condition: |
+      and(
+        in(dependencies.Publish_GitHub_Release.result, 'Succeeded', 'Skipped'),
+        eq('${{ parameters.targetOS }}', 'All'),
+        ne('${{ parameters.buildType }}', 'Commit')
+      )

SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp

@@ -253,14 +253,8 @@ GlobalSettings::GlobalSettings()
     PA_ADD_OPTION(LOG_WINDOW_STARTUP);
 
     PA_ADD_OPTION(KEYBOARD_CONTROLS_LAYOUT);
+    PA_ADD_OPTION(STREAM_HISTORY);
 
-#if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8)
-    if (IS_BETA_VERSION || PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(STREAM_HISTORY);
-    }
-#else
-    STREAM_HISTORY->set_enabled(false);
-#endif
 #ifdef PA_ENABLE_SLEEP_SUPPRESS
     PA_ADD_OPTION(SLEEP_SUPPRESS);
 #endif

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -36,7 +36,7 @@ namespace PokemonAutomation{
 #endif
 
 #ifndef PA_VERSION_PATCH
-#define PA_VERSION_PATCH 4
+#define PA_VERSION_PATCH 5
 #endif
 
 const bool IS_BETA_VERSION = PA_IS_BETA;

SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp

@@ -161,21 +161,17 @@ CommandRow::CommandRow(
         this, [this](bool){ emit screenshot_requested(); }
     );
 
-#if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8)
-    if (IS_BETA_VERSION || PreloadSettings::instance().DEVELOPER_MODE){
-        m_video_button = new QPushButton("Video Capture", this);
-        layout1->addWidget(m_video_button, 2);
-        if (GlobalSettings::instance().STREAM_HISTORY->enabled()){
-            connect(
-                m_video_button, &QPushButton::clicked,
-                this, [this](bool){ emit video_requested(); }
-            );
-        }else{
-            m_video_button->setEnabled(false);
-            m_video_button->setToolTip("Please turn on Stream History to enable video capture.");
-        }
+    m_video_button = new QPushButton("Video Capture", this);
+    layout1->addWidget(m_video_button, 2);
+    if (GlobalSettings::instance().STREAM_HISTORY->enabled()){
+        connect(
+            m_video_button, &QPushButton::clicked,
+            this, [this](bool){ emit video_requested(); }
+        );
+    }else{
+        m_video_button->setEnabled(false);
+        m_video_button->setToolTip("Please turn on Stream History to enable video capture.");
     }
-#endif
 
     m_session.add_listener(*this);
     m_controller.add_listener(*this);

SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp

@@ -26,46 +26,52 @@ namespace NintendoSwitch{
 namespace PokemonFRLG{
 
 WhiteDialogDetector::WhiteDialogDetector(Color color)
-    : m_right_box(0.844, 0.725, 0.005, 0.197)
-    , m_top_box(0.151, 0.719, 0.698, 0.006)
-    , m_bottom_box(0.152, 0.913, 0.692, 0.009)
+    : m_right_box(0.923385, 0.748077, 0.00615385, 0.204577)
+    , m_top_box(0.0704615, 0.741846, 0.859077, 0.00623077)
+    , m_bottom_box(0.0716923, 0.943308, 0.851692, 0.00934615)
 {}
 void WhiteDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_right_box);
-    items.add(COLOR_RED, m_top_box);
-    items.add(COLOR_RED, m_bottom_box);
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
 }
 bool WhiteDialogDetector::detect(const ImageViewRGB32& screen){
-    ImageViewRGB32 right_image = extract_box_reference(screen, m_right_box);
-    ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
-    ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
     if (is_white(right_image)
         && is_white(top_image)
         && is_white(bottom_image)
-        ){
+    ){
         return true;
     }
     return false;
 }
 
 AdvanceWhiteDialogDetector::AdvanceWhiteDialogDetector(Color color)
-    : m_dialog_box(0.145, 0.727, 0.707, 0.193)
-    , m_right_box(0.844, 0.725, 0.005, 0.197)
-    , m_top_box(0.151, 0.719, 0.698, 0.006)
-    , m_bottom_box(0.152, 0.913, 0.692, 0.009)
+    : m_dialog_box(0.0630769, 0.750154, 0.870154, 0.200423)
+    , m_right_box(0.923385, 0.748077, 0.00615385, 0.204577)
+    , m_top_box(0.0704615, 0.741846, 0.859077, 0.00623077)
+    , m_bottom_box(0.0716923, 0.943308, 0.851692, 0.00934615)
 {}
 void AdvanceWhiteDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_dialog_box);
-    items.add(COLOR_RED, m_right_box);
-    items.add(COLOR_RED, m_top_box);
-    items.add(COLOR_RED, m_bottom_box);
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
 }
 bool AdvanceWhiteDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
     const bool replace_color_within_range = false;
 
     //Filter out background
     ImageRGB32 filtered_region = filter_rgb32_range(
-        extract_box_reference(screen, m_dialog_box),
+        extract_box_reference(game_screen, m_dialog_box),
         combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
     );
     ImageStats stats = image_stats(filtered_region);
@@ -77,118 +83,129 @@ bool AdvanceWhiteDialogDetector::detect(const ImageViewRGB32& screen){
     cout << stats.average.b << endl;
     */
 
-    ImageViewRGB32 right_image = extract_box_reference(screen, m_right_box);
-    ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
-    ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
 
     if (is_white(right_image)
         && is_white(top_image)
         && is_white(bottom_image)
         && (stats.average.r > stats.average.b + 180)
         && (stats.average.r > stats.average.g + 180)
-        )
-    {
+    ){
         return true;
     }
     return false;
 }
 
 SelectionDialogDetector::SelectionDialogDetector(Color color)
-    : m_right_box(0.844, 0.725, 0.005, 0.197)
-    , m_top_box(00.151, 0.719, 0.698, 0.006)
-    , m_bottom_box(0.152, 0.913, 0.692, 0.009)
-    , m_selection_box(0.813, 0.436, 0.013, 0.195)
+    : m_right_box(0.923385, 0.748077, 0.00615385, 0.204577)
+    , m_top_box(0.0704615, 0.741846, 0.859077, 0.00623077)
+    , m_bottom_box(0.0716923, 0.943308, 0.851692, 0.00934615)
+    , m_selection_box(0.885231, 0.447962, 0.016, 0.2025)
 {}
 void SelectionDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_right_box);
-    items.add(COLOR_RED, m_top_box);
-    items.add(COLOR_RED, m_bottom_box);
-    items.add(COLOR_RED, m_selection_box);
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_selection_box));
 }
 bool SelectionDialogDetector::detect(const ImageViewRGB32& screen){
-    ImageViewRGB32 right_image = extract_box_reference(screen, m_right_box);
-    ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
-    ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
-    ImageViewRGB32 selection_image = extract_box_reference(screen, m_selection_box);
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
+    ImageViewRGB32 selection_image = extract_box_reference(game_screen, m_selection_box);
     if (is_white(right_image)
         && is_white(top_image)
         && is_white(bottom_image)
         && is_white(selection_image)
-        ){
+    ){
         return true;
     }
     return false;
 }
 
 BattleDialogDetector::BattleDialogDetector(Color color)
-    : m_dialog_top_box(0.124, 0.727, 0.752, 0.009)
-    , m_dialog_right_box(0.871, 0.736, 0.005, 0.179)
+    : m_dialog_top_box(0.0372308, 0.750154, 0.925538, 0.00934615)
+    , m_dialog_right_box(0.956615, 0.7595, 0.00615385, 0.185885)
 {}
 void BattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_dialog_top_box);
-    items.add(COLOR_RED, m_dialog_right_box);
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
 }
 bool BattleDialogDetector::detect(const ImageViewRGB32& screen){
-    ImageViewRGB32 dialog_top_image = extract_box_reference(screen, m_dialog_top_box);
-    ImageViewRGB32 dialog_right_image = extract_box_reference(screen, m_dialog_right_box);
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
 
     if (is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
         && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
-        ){
+    ){
         return true;
     }
     return false;
 }
 
 
 BattleMenuDetector::BattleMenuDetector(Color color)
-    : m_menu_top_box(0.523, 0.720, 0.357, 0.008) //top of the white dialog box
-    , m_menu_right_box(0.875, 0.729, 0.005, 0.193)
-    , m_dialog_top_box(0.123, 0.726, 0.373, 0.013)
-    , m_dialog_right_box(0.492, 0.739, 0.005, 0.172) //right side, closest to the menu
+    : m_menu_top_box(0.528308, 0.742885, 0.439385, 0.00830769) //top of the white dialog box
+    , m_menu_right_box(0.961538, 0.752231, 0.00615385, 0.200423)
+    , m_dialog_top_box(0.036, 0.749115, 0.459077, 0.0135)
+    , m_dialog_right_box(0.490154, 0.762615, 0.00615385, 0.178615) //right side, closest to the menu
 {}
 void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_menu_top_box);
-    items.add(COLOR_RED, m_menu_right_box);
-    items.add(COLOR_RED, m_dialog_top_box);
-    items.add(COLOR_RED, m_dialog_right_box);
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
 }
 bool BattleMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
     //Menu is white
-    ImageViewRGB32 menu_top_image = extract_box_reference(screen, m_menu_top_box);
-    ImageViewRGB32 menu_right_image = extract_box_reference(screen, m_menu_right_box);
+    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
+    ImageViewRGB32 menu_right_image = extract_box_reference(game_screen, m_menu_right_box);
 
     //Background dialog is teal
-    ImageViewRGB32 dialog_top_image = extract_box_reference(screen, m_dialog_top_box);
-    ImageViewRGB32 dialog_right_image = extract_box_reference(screen, m_dialog_right_box);
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
 
     if (is_white(menu_top_image)
         && is_white(menu_right_image)
         && is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20) //40, 81, 106 teal
         && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
-        ){
+    ){
         return true;
     }
     return false;
 }
 
 
 AdvanceBattleDialogDetector::AdvanceBattleDialogDetector(Color color)
-    : m_dialog_box(0.123, 0.725, 0.753, 0.197)
-    , m_dialog_top_box(0.124, 0.727, 0.752, 0.009)
-    , m_dialog_right_box(0.871, 0.736, 0.005, 0.179)
+    : m_dialog_box(0.036, 0.748077, 0.926769, 0.204577)
+    , m_dialog_top_box(0.0372308, 0.750154, 0.925538, 0.00934615)
+    , m_dialog_right_box(0.956615, 0.7595, 0.00615385, 0.185885)
 {}
 void AdvanceBattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_dialog_box);
-    items.add(COLOR_RED, m_dialog_top_box);
-    items.add(COLOR_RED, m_dialog_right_box);
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
 }
 bool AdvanceBattleDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
     const bool replace_color_within_range = false;
 
     //Filter out background
     ImageRGB32 filtered_region = filter_rgb32_range(
-        extract_box_reference(screen, m_dialog_box),
+        extract_box_reference(game_screen, m_dialog_box),
         combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
     );
     ImageStats stats = image_stats(filtered_region);
@@ -200,15 +217,14 @@ bool AdvanceBattleDialogDetector::detect(const ImageViewRGB32& screen){
     cout << stats.average.b << endl;
     */
 
-    ImageViewRGB32 dialog_top_image = extract_box_reference(screen, m_dialog_top_box);
-    ImageViewRGB32 dialog_right_image = extract_box_reference(screen, m_dialog_right_box);
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
 
     if (is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
         && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
         && (stats.average.r > stats.average.b + 180)
         && (stats.average.r > stats.average.g + 180)
-        )
-    {
+    ){
         return true;
     }
     return false;