diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp index b4f217420c..a113f78b23 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp @@ -387,8 +387,25 @@ void quest_catch_navi( BBQuests current_quest ){ switch (current_quest){ - case BBQuests::catch_any: case BBQuests::catch_normal: case BBQuests::catch_fire: - console.log("Catch: Any/Normal/Fire"); + case BBQuests::catch_any: + console.log("Catch: Any"); + + //Chargestone battle court, where Auto Battle goes: a safe zone with many + //spawns. Any wild Pokemon counts, so send out the lead at whatever is in front. + central_to_chargestone(info, console, context); + pbf_wait(context, 3000ms); + context.wait_for_all_requests(); + + pbf_press_button(context, BUTTON_L, 160ms, 400ms); + pbf_move_left_joystick(context, {0, +1}, 2000ms, 400ms); + pbf_move_left_joystick(context, {+1, 0}, 1440ms, 400ms); + pbf_press_button(context, BUTTON_L, 160ms, 400ms); + + send_out_and_look_around(console, context, std::chrono::seconds(6), "a wild Pokemon"); + break; + + case BBQuests::catch_normal: case BBQuests::catch_fire: + console.log("Catch: Normal/Fire"); //Savanna Plaza - Pride Rock central_to_savanna_plaza(info, console, context); @@ -514,37 +531,21 @@ void quest_catch_navi( case BBQuests::catch_flying: console.log("Catch: Flying"); - //Vullaby/Mandibuzz - central_to_savanna_plaza(info, console, context); - - pbf_move_left_joystick(context, {+1, +0.688}, 80ms, 160ms); - pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms); + //Canyon grassland at Black Augurite, where the Tera-self quest glides: Scyther, + //Altaria, Swablu and Fletchling spawn around the fixed Kleavor. The Savanna + //route waited for one Vullaby/Mandibuzz spawn and was marked not possible. + central_to_canyon_plaza(info, console, context); - pbf_move_left_joystick(context, {0, +1}, 4000ms, 160ms); + pbf_move_left_joystick(context, {+0.606, +0.5}, 160ms, 840ms); pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms); - pbf_move_left_joystick(context, {+1, +1}, 80ms, 160ms); - pbf_press_button(context, BUTTON_L, 160ms, 400ms); - - if (console.state().console_type() == ConsoleType::Switch1){ - pbf_move_left_joystick(context, {0, +1}, 1600ms, 160ms); - }else{ - pbf_move_left_joystick(context, {0, +1}, 1360ms, 160ms); - } - - pbf_press_button(context, BUTTON_L, 160ms, 400ms); - - pbf_move_left_joystick(context, {-1, +1}, 80ms, 160ms); - pbf_press_button(context, BUTTON_L, 160ms, 400ms); - if (console.state().console_type() == ConsoleType::Switch1){ - pbf_move_left_joystick(context, {0, +1}, 800ms, 160ms); - }else{ - pbf_move_left_joystick(context, {0, +1}, 960ms, 160ms); + jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 13200ms, 2400ms); + }else{ //All switch 2s + jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 12800ms, 2400ms); } - pbf_wait(context, 3200ms); - context.wait_for_all_requests(); + send_out_and_look_around(console, context, std::chrono::seconds(6), "a flying Pokemon"); break; case BBQuests::catch_rock: case BBQuests::catch_electric: console.log("Catch: Rock/Electric"); diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp index 504befe9b1..1164eca08c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp @@ -799,22 +799,9 @@ void quest_sneak_up( pbf_press_button(context, BUTTON_L, 160ms, 400ms); } - ssf_press_button(context, BUTTON_ZR, 0ms, 1600ms); - ssf_press_button(context, BUTTON_ZL, 800ms, 400ms); - ssf_press_button(context, BUTTON_ZL, 1200ms, 400ms); - - pbf_wait(context, 2400ms); - context.wait_for_all_requests(); - - NormalBattleMenuWatcher battle_menu(COLOR_YELLOW); - int ret2 = wait_until( - console, context, - std::chrono::seconds(15), - { battle_menu } - ); - if (ret2 != 0){ - console.log("Did not enter battle. Did target spawn?"); - } + //Pride Rock's target is often missing or facing us; anything that hasn't + //noticed us counts, so look around if the first throw starts nothing. + send_out_and_look_around(console, context, std::chrono::seconds(15), "the target"); }, { static_cast(encounter_watcher), diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h index a6b36e982c..76657b886d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h @@ -51,7 +51,7 @@ const std::set gold_quests = { //Quests that are not currently supported. Gold quests currently excluded as this is singleplayer only right now. const std::set not_possible_quests = { - BBQuests::UnableToDetect, BBQuests::pickup_10, BBQuests::photo_flying, BBQuests::catch_flying + BBQuests::UnableToDetect, BBQuests::pickup_10, BBQuests::photo_flying };