Add hyperspace wildzone reset route to fly spot reset

Gin · Gin · commit 65b5e93c2fe3 · 2025-12-11T19:02:05.000-08:00
diff --git a/SerialPrograms/Scripts/check_detector_regions.py b/SerialPrograms/Scripts/check_detector_regions.py
@@ -32,12 +32,17 @@
 
 raw_image = image.copy()
 
+# ==================================================================
+# LZA Map detector
+add_infer_box_to_image(raw_image, 0.760730, 0.937023, 0.241416, 0.064885, image)
+add_infer_box_to_image(raw_image, 0.005000, 0.150000, 0.025000, 0.110000, image)
+add_infer_box_to_image(raw_image, 0.005000, 0.210000, 0.025000, 0.110000, image)
 
 
 # ==================================================================
 # LZA alert eye detector
-add_infer_box_to_image(raw_image, 0.485, 0.088, 0.029, 0.034, image)
-add_infer_box_to_image(raw_image, 0.464, 0.142, 0.071, 0.074, image)
+# add_infer_box_to_image(raw_image, 0.485, 0.088, 0.029, 0.034, image)
+# add_infer_box_to_image(raw_image, 0.464, 0.142, 0.071, 0.074, image)
 
 
 # ==================================================================
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp b/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp
@@ -165,6 +165,46 @@ bool open_map(ConsoleHandle& console, ProControllerContext& context, bool zoom_t
     );
 }
 
+void open_hyperspace_map(ConsoleHandle& console, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_PLUS, 240ms, 40ms);
+    context.wait_for_all_requests();
+    console.log("Opening Hyperspace Map...");
+    console.overlay().add_log("Open Hyperspace Map");
+    
+    WallClock deadline = current_time() + 30s;
+
+    MapWatcher map_detector(COLOR_RED, &console.overlay());
+
+    do{
+        map_detector.reset_state();
+
+        int ret = wait_until(
+            console, context,
+            5000ms,
+            {map_detector}
+        );
+        switch (ret){
+        case 0:
+            console.log("Detected map!", COLOR_BLUE);
+            console.overlay().add_log("Map Detected");
+            return;
+        default:
+            console.log("Map not found. Press + again", COLOR_ORANGE);
+            pbf_press_button(context, BUTTON_PLUS, 240ms, 80ms);
+            console.overlay().add_log("Map not Found. Press + Again");
+            context.wait_for_all_requests();
+        }
+
+    }while (current_time() < deadline);
+
+    console.overlay().add_log("Failed to Open Hyperspace Map After 30 sec", COLOR_RED);
+    OperationFailedException::fire(
+        ErrorReport::SEND_ERROR_REPORT,
+        "open_map(): Unable to find map after 30 seconds.",
+        console
+    );
+}
+
 
 FastTravelState fly_from_map(ConsoleHandle& console, ProControllerContext& context){
     console.log("Flying from map...");
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h b/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h
@@ -40,7 +40,7 @@ enum class FastTravelState{
     // that state if we need
 };
 
-// Press button + to open the map.
+// Press button + to open the normal Lumiose map.
 // Will repeatedly pressing button + to ensure the map is opened.
 // Robust against day/night changes: if there is a day/night chane before opening the map,
 // it will keep trying to open the map until day/night change finishes.
@@ -49,6 +49,12 @@ enum class FastTravelState{
 // Note the function uses flyable fast travel icons on map to detect if you are being chased. This
 // means for most reliable detection, set zoom_to_max to True.
 bool open_map(ConsoleHandle& console, ProControllerContext& context, bool zoom_to_max = false);
+
+// Press button + to open Hyperspace Lumiose map.
+// Will repeatedly pressing button + to ensure the map is opened.
+// It does not detect whether the player can fast travel or not.
+void open_hyperspace_map(ConsoleHandle& console, ProControllerContext& context);
+
 // Starting at map view, press A to fast travel to the current selected fast travel location
 // Return FastTravelState:
 // - SUCCESS: fast travel successful. After the function returns, the player character is on the overworld
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp b/SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp
@@ -62,7 +62,8 @@ ShinyHunt_FlySpotReset::ShinyHunt_FlySpotReset()
     : SHINY_DETECTED("Shiny Detected", "", "2000 ms", ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY)
     , ROUTE("<b>Hunt Route:</b>",
         {
-            {Route::NO_MOVEMENT,  "no_movement",  "No Movement"},
+            {Route::NO_MOVEMENT,  "no_movement",  "No Movement in Lumiose"},
+            {Route::HYPERSPACE_WILD_ZONE, "hyperspace_wild_zone", "Hyperspace Wild Zone"},
             {Route::WILD_ZONE_19, "wild_zone_19", "Wild Zone 19"},
             {Route::ALPHA_PIDGEY, "alpha_pidgey", "Alpha Pidgey (Wild Zone 1)"},
             // {Route::ALPHA_PIKACHU, "alpha_pikachu", "Alpha Pikachu (Wild Zone 6)"},
@@ -102,7 +103,7 @@ void route_default(
         env.update_stats();
         OperationFailedException::fire(
             ErrorReport::SEND_ERROR_REPORT,
-            "FlySpotReset: Cannot open map for fast travel.",
+            "route_default(): Cannot open map for fast travel.",
             env.console
         );
     }
@@ -117,7 +118,27 @@ void route_default(
         env.update_stats();
         OperationFailedException::fire(
             ErrorReport::SEND_ERROR_REPORT,
-            "FlySpotReset: Cannot fast travel after moving map cursor.",
+            "route_default(): Cannot fast travel after moving map cursor.",
+            env.console
+        );
+    }
+}
+
+void route_hyperspace_wild_zone(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_FlySpotReset_Descriptor::Stats& stats,
+    bool to_zoom_to_max){
+    open_hyperspace_map(env.console, context);
+    
+    // Fly from map to reset spawns
+    FastTravelState travel_status = fly_from_map(env.console, context);
+    if (travel_status != FastTravelState::SUCCESS){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedException::fire(
+            ErrorReport::SEND_ERROR_REPORT,
+            "route_hyperspace_wild_zone(): Cannot fast travel after moving map cursor.",
             env.console
         );
     }
@@ -207,6 +228,9 @@ void ShinyHunt_FlySpotReset::program(SingleSwitchProgramEnvironment& env, ProCon
     case Route::NO_MOVEMENT:
         route = route_default;
         break;
+    case Route::HYPERSPACE_WILD_ZONE:
+        route = route_hyperspace_wild_zone;
+        break;
     case Route::WILD_ZONE_19:
         route = route_wild_zone_19;
         break;
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h b/SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h
@@ -36,6 +36,7 @@ class ShinyHunt_FlySpotReset : public SingleSwitchProgramInstance{
 
     enum class Route{
         NO_MOVEMENT,
+        HYPERSPACE_WILD_ZONE,
         WILD_ZONE_19,
         ALPHA_PIDGEY,
         ALPHA_PIKACHU,
diff --git a/SerialPrograms/Source/Tests/PokemonLZA_Tests.cpp b/SerialPrograms/Source/Tests/PokemonLZA_Tests.cpp
@@ -15,6 +15,7 @@
 #include "PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
 #include "PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h"
 #include "PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h"
+#include "PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h"
 #include "PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
@@ -518,5 +519,13 @@ int test_pokemonLZA_DirectionArrowDetector(const ImageViewRGB32& image, int targ
     return 0;
 }
 
+int test_pokemonLZA_MapDetector(const ImageViewRGB32& image, bool target){
+    auto overlay = DummyVideoOverlay();
+    MapDetector detector(COLOR_RED, &overlay);
+    bool result = detector.detect(image);
+    TEST_RESULT_EQUAL(result, target);
+    return 0;
+}
+
 
 }
diff --git a/SerialPrograms/Source/Tests/PokemonLZA_Tests.h b/SerialPrograms/Source/Tests/PokemonLZA_Tests.h
@@ -43,6 +43,8 @@
 
  int test_pokemonLZA_DirectionArrowDetector(const ImageViewRGB32& image, int target_angle);
 
+int test_pokemonLZA_MapDetector(const ImageViewRGB32& image, bool target);
+
  }
 
  #endif
diff --git a/SerialPrograms/Source/Tests/TestMap.cpp b/SerialPrograms/Source/Tests/TestMap.cpp
@@ -300,6 +300,7 @@ const std::map<std::string, TestFunction> TEST_MAP = {
     {"PokemonLZA_MapIconDetector", test_pokemonLZA_MapIconDetector},
     {"PokemonLZA_OverworldPartySelectionDetector", std::bind(image_words_detector_helper, test_pokemonLZA_OverworldPartySelectionDetector, _1)},
     {"PokemonLZA_DirectionArrowDetector", std::bind(image_int_detector_helper, test_pokemonLZA_DirectionArrowDetector, _1)},
+    {"PokemonLZA_MapDetector", std::bind(image_bool_detector_helper, test_pokemonLZA_MapDetector, _1)},
 };
 
 TestFunction find_test_function(const std::string& test_space, const std::string& test_name){

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@`
`43`	`43`
`44`	`44`	`int test_pokemonLZA_DirectionArrowDetector(const ImageViewRGB32& image, int target_angle);`
`45`	`45`
	`46`	`+int test_pokemonLZA_MapDetector(const ImageViewRGB32& image, bool target);`
	`47`	`+`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`#endif`