Revert "cleanup again"

This reverts commit 11cfbf4.

At Zone 4, NPC outside gate that can talk to. So we cannot mash A again to ensure we are outside zone

Author: Gin

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp

@@ -424,25 +424,20 @@ double get_angle_between_facing_directions(double dir1, double dir2){
     return angle;
 }
 
-void leave_zone_gate(ConsoleHandle& console, ProControllerContext& context){
+bool leave_zone_gate(ConsoleHandle& console, ProControllerContext& context){
     console.log("Leaving zone gate");
 
-    auto mash_A_to_leave = [&](int seconds) -> int{
-        OverworldPartySelectionWatcher overworld_watcher(COLOR_WHITE, &console.overlay());
-        pbf_mash_button(context, BUTTON_A, 1s);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(seconds),
-            {overworld_watcher}
-        );
-        pbf_wait(context, 100ms); // after leaving the gate, the game needs this long time to give back control
-        context.wait_for_all_requests();
-        return ret;
-    };
-
     WallClock start_time = current_time();
-    mash_A_to_leave(40);  // // wait 40 sec in case day/night change happens
+    OverworldPartySelectionWatcher overworld_watcher(COLOR_WHITE, &console.overlay());
+    pbf_mash_button(context, BUTTON_A, 1s);
+    context.wait_for_all_requests();
+    wait_until(
+        console, context,
+        std::chrono::seconds(40), // wait this long in case day/night change happens
+        {overworld_watcher}
+    );
+    pbf_wait(context, 100ms); // after leaving the gate, the game needs this long time to give back control
+    context.wait_for_all_requests();
     WallClock end_time = current_time();
 
     const auto duration = end_time - start_time;
@@ -457,19 +452,11 @@ void leave_zone_gate(ConsoleHandle& console, ProControllerContext& context){
         // In this case, there is no day/night change. We are sure we are outside the wild zone
         // (unless some angry Garchomp or Drilbur used Dig and escaped wild zone containment... We don't
         // consider this case for now)
-        return;
+        return true;
     }
 
     console.log("Leaving zone function took " + std::to_string(second_count) + " sec. Day/night change happened");
-    int ret = mash_A_to_leave(15);
-    if (ret != 0){
-        OperationFailedException::fire(
-            ErrorReport::SEND_ERROR_REPORT,
-            "leave_zone_gate(): Unable to leave zone gate after day/night change",
-            console
-        );
-    }
-    return;
+    return false;
 }
 
 

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h

@@ -97,8 +97,15 @@ double get_facing_direction(ConsoleHandle& console, ProControllerContext& contex
 double get_angle_between_facing_directions(double dir1, double dir2);
 
 // While at the gate in the zone, mash A to leave the zone. If day/night changes while
-// leaving, it will wait until the change is done to leave the zone again.
-void leave_zone_gate(ConsoleHandle& console, ProControllerContext& context);
+// leaving, it will wait until the change is done.
+// Return true if there is no day/night change.
+// Return false if day/night change happens. In this case, we don't know if the player
+// character is still inside the zone or not.
+// Note:
+// We don't want to mash A after a day/night change to ensure we leave the zone because
+// at Wild Zone 4 there are talkable npcs outside the gate. Button A appears on them.
+// If the program mashes A after leaving the zone, it will stuck talking to the npcs.
+bool leave_zone_gate(ConsoleHandle& console, ProControllerContext& context);
 
 // Run towards a wild zone until either button A is detected at specified box region,
 // or day/night change happens. If day/night changes, it will wait until the transition

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp

@@ -220,7 +220,11 @@ void do_one_cafe_trip(
 
     // Found button A, so we are at the entrance.
     // Mash A to leave Zone.
-    leave_zone_gate(env.console, context);
+    if (!leave_zone_gate(env.console, context)){
+        // day/night change happens while leaving
+        // Try leave again
+        leave_zone_gate(env.console, context);
+    }
     shiny_sound_handler.process_pending(context);
 
     // do a fast travel back to cafe

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp

@@ -362,10 +362,45 @@ void leave_zone_and_reset_spawns(
 
     std::string extra_eror_msg = " This is after leaving zone.";
 
-    leave_zone_gate(env.console, context);
+    // Due to day/night change may eating the mashing button A sequence, we may still be inside the zone!
+    // We need to check if we can fast travel 
+    if (leave_zone_gate(env.console, context)){
+        shiny_sound_handler.process_pending(context);
+        // Do a fast travel outside the gate to reset spawns
+        fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map, std::move(extra_eror_msg));
+        return;
+    }
 
+    // there is a day/night change while leaving the zone. We don't know if we are still inside the zone.
+    //
+    // We can't call leave_zone_gate() again because at Wild Zone 4 there are npcs outside the gate that can
+    // press A to talk to. If the program can get stuck into talking to the npc.
+
+    FastTravelState travel_status = open_map_and_fly_in_place(env.console, context, to_max_zoom_level_on_map);
+    if (travel_status == FastTravelState::SUCCESS){
+        // We can fast travel and we fast traveled. This means we were inside the gate but now safe.
+        env.log("We fast traveled. We were inside the gate but now safe for next trip");
+        return;
+    }else if(travel_status == FastTravelState::NOT_AT_FLY_SPOT){
+        env.log("We cannot fast travel in place. We left zone successfully");
+        // we cannot fast travel at current location. So we have left the zone!
+        // Fast travel to the zone gate to reset spawn
+        const bool map_already_opened = true;
+        fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map,
+            std::move(extra_eror_msg), map_already_opened);
+        return;
+    }
+    // We cannot fast travel: we are still being chased by wild pokemon
+    env.log("We cannot fast travel. Still chased by pokemon");
+    
+    // Mash B to close map and return to overworld
+    map_to_overworld(env.console, context);
+    // Mash A to leave zone gate
+    env.log("Mashing A again to leave zone");
+    leave_zone_gate(env.console, context);
     shiny_sound_handler.process_pending(context);
     // Do a fast travel outside the gate to reset spawns
+    env.log("Finally, we should have left the zone");
     fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map, std::move(extra_eror_msg));
 }