update utility functions for autostory (#483)

PokemonAutomation · Sep 13, 2024 · 7b5123d · 7b5123d
1 parent 787eda4
commit 7b5123d
Show file tree

Hide file tree

Showing 2 changed files with 136 additions and 3 deletions.
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.cpp
@@ -860,7 +860,7 @@ void mash_button_till_overworld(
 }
 
 
-bool fly_to_overlapping_pokecenter(
+bool attempt_fly_to_overlapping_flypoint(
     const ProgramInfo& info, 
     ConsoleHandle& console, 
     BotBaseContext& context
@@ -872,6 +872,25 @@ bool fly_to_overlapping_pokecenter(
     return fly_to_overworld_from_map(info, console, context, true);
 }
 
+void fly_to_overlapping_flypoint(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
+    if (!attempt_fly_to_overlapping_flypoint(info, console, context)){
+        throw OperationFailedException(
+            ErrorReport::SEND_ERROR_REPORT, console,
+            "Failed to reset to overlapping Pokecenter.",
+            true
+        );
+    }
+}
+
+void confirm_no_overlapping_flypoint(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
+    if (attempt_fly_to_overlapping_flypoint(info, console, context)){
+        throw OperationFailedException(
+            ErrorReport::SEND_ERROR_REPORT, console,
+            "Overlapping fly detected, when it wasn't expected.",
+            true
+        );
+    }
+}
 
 void enter_menu_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
     int menu_index,
@@ -921,6 +940,9 @@ void enter_menu_from_overworld(const ProgramInfo& info, ConsoleHandle& console,
             continue;
         case 1:
             console.log("Detected main menu.");
+            if (menu_index == -1){
+                return;
+            }
             success = main_menu.move_cursor(info, console, context, side, menu_index, fast_mode);
             if (success == false){
                 throw OperationFailedException(
@@ -941,6 +963,82 @@ void enter_menu_from_overworld(const ProgramInfo& info, ConsoleHandle& console,
     }
 }
 
+void press_button_until_gradient_arrow(
+    const ProgramInfo& info, 
+    ConsoleHandle& console, 
+    BotBaseContext& context,
+    ImageFloatBox box_area_to_check,
+    uint16_t button,
+    GradientArrowType arrow_type
+){
+    GradientArrowWatcher arrow(COLOR_RED, arrow_type, box_area_to_check);
+    int ret = run_until(
+        console, context,
+        [button](BotBaseContext& context){
+            pbf_wait(context, 3 * TICKS_PER_SECOND); // avoid pressing button if arrow already detected
+            for (size_t c = 0; c < 10; c++){
+                pbf_press_button(context, button, 20, 3 * TICKS_PER_SECOND);
+            }
+        },
+        {arrow}
+    );
+    if (ret == 0){
+        console.log("Gradient arrow detected.");
+    }else{
+        throw OperationFailedException(
+            ErrorReport::SEND_ERROR_REPORT, console,
+            "Failed to detect gradient arrow.",
+            true
+        );
+    }     
+}
+
+void basic_menu_navigation(
+    const ProgramInfo& info, 
+    ConsoleHandle& console, 
+    BotBaseContext& context,
+    ImageFloatBox arrow_box_start,
+    ImageFloatBox arrow_box_end,
+    uint8_t dpad_button,
+    uint16_t num_button_presses
+){
+    GradientArrowWatcher arrow_start(COLOR_RED, GradientArrowType::RIGHT, arrow_box_start);
+
+    int ret = wait_until(console, context, Milliseconds(5000), { arrow_start });
+    if (ret < 0){
+        throw OperationFailedException(
+            ErrorReport::SEND_ERROR_REPORT, console,
+            "basic_menu_navigation: Failed to detect gradient arrow at expected start position.",
+            true
+        );        
+    }
+
+    for (uint16_t i = 0; i < num_button_presses; i++){
+        pbf_press_dpad(context, dpad_button, 20, 105);
+    }
+
+    GradientArrowWatcher arrow_end(COLOR_RED, GradientArrowType::RIGHT, arrow_box_end);
+    ret = run_until(
+        console,
+        context,
+        [dpad_button](BotBaseContext& context){
+            for (int i = 0; i < 3; i++){
+                pbf_press_dpad(context, dpad_button, 20, 500);
+            }
+        },
+        { arrow_end }        
+    );
+
+    if (ret == 0){
+        console.log("basic_menu_navigation: Desired item selected.");
+    }else{
+        throw OperationFailedException(
+            ErrorReport::SEND_ERROR_REPORT, console,
+            "basic_menu_navigation: Failed to detect gradient arrow at expected end position.",
+            true
+        );        
+    }
+}
 
 
 void heal_at_pokecenter(
@@ -950,7 +1048,7 @@ void heal_at_pokecenter(
 ){
     context.wait_for_all_requests();
 
-    if (!fly_to_overlapping_pokecenter(info, console, context)){
+    if (!attempt_fly_to_overlapping_flypoint(info, console, context)){
         throw OperationFailedException(
             ErrorReport::SEND_ERROR_REPORT, console,
             "Failed to fly to pokecenter.",

diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.h b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.h
@@ -108,11 +108,13 @@ void realign_player(const ProgramInfo& info, ConsoleHandle& console, BotBaseCont
 
 enum class NavigationStopCondition{
     STOP_DIALOG,
+    STOP_MARKER,
 };
 
 enum class NavigationMovementMode{
     DIRECTIONAL_ONLY,
     DIRECTIONAL_SPAM_A,
+    CLEAR_WITH_LETS_GO,
 };
 
 
@@ -149,19 +151,52 @@ void mash_button_till_overworld(
 
 // fly to the pokecenter that overlaps with the player on the map, and return true.
 // if no overlapping pokecenter, return false.
-bool fly_to_overlapping_pokecenter(
+bool attempt_fly_to_overlapping_flypoint(
     const ProgramInfo& info, 
     ConsoleHandle& console, 
     BotBaseContext& context
 );
 
+// fly to the pokecenter that overlaps with the player on the map
+// throw exception if unsuccessful
+void fly_to_overlapping_flypoint(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
+
+// throw exception if there is a fly point/pokecenter that overlaps with the player on the map
+void confirm_no_overlapping_flypoint(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
+
 // enter menu and move the cursor the given side, and index. then press the A button
+// if menu_index is -1, return once the menu is detected.
 void enter_menu_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
     int menu_index,
     MenuSide side = MenuSide::RIGHT,
     bool has_minimap = true
 );
 
+// press given button until gradient arrow appears in given box_area_to_check.
+void press_button_until_gradient_arrow(
+    const ProgramInfo& info, 
+    ConsoleHandle& console, 
+    BotBaseContext& context,
+    ImageFloatBox box_area_to_check,
+    uint16_t button = BUTTON_A,
+    GradientArrowType arrow_type = GradientArrowType::RIGHT
+);
+
+// navigate menus using only gradient arrow detection, without OCR
+// first, wait for the gradient arrow to appear within `arrow_box_start`.
+// then, press `dpad_button` a certain number of times, as per `num_button_presses`.
+// then, watch for the gradient arrow within `arrow_box_end`. 
+// If arrow not seen, press `dpad_button` a maximum of 3 times, while still watching for the gradient arrow
+// If arrow still not seen, throw exception.
+void basic_menu_navigation(
+    const ProgramInfo& info, 
+    ConsoleHandle& console, 
+    BotBaseContext& context,
+    ImageFloatBox arrow_box_start,
+    ImageFloatBox arrow_box_end,
+    uint8_t dpad_button,
+    uint16_t num_button_presses
+);
 
 // heal at the pokecenter, that your character is currently at.
 // if not currently at the pokecenter, throws error.