deoxys start position option

Author: kichithewolf

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryHunt-Emerald.cpp

@@ -58,7 +58,7 @@ LegendaryHuntEmerald::LegendaryHuntEmerald()
             {Target::lugia, "lugia", "Lugia"},
         },
         LockMode::LOCK_WHILE_RUNNING,
-        Target::hooh
+        Target::regis
     )
     , NOTIFICATION_SHINY(
         "Shiny Found",
@@ -269,19 +269,19 @@ void LegendaryHuntEmerald::program(SingleSwitchProgramEnvironment& env, SwitchCo
 
     /*
     * Text speed fast, battle animations off
-    * smoke ball or fast pokemon req.
+    * smoke ball or fast pokemon req. no entry effects.
     * 
     * Don't need to worry about PokeNav or random encounters for any of these targets.
     * 
     * Stand in front of Regis/Ho-Oh/Lugia. Save the game.
     */
 
     while (true) {
-        //Start battle.
         if (TARGET == Target::hooh) {
             //Step forward to start the encounter.
             pbf_press_dpad(context, DPAD_UP, 10, 50);
         }
+        //handle_encounter presses A already for everything else
 
         bool legendary_shiny = handle_encounter(env.console, context, true);
         if (legendary_shiny) {

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp

@@ -50,10 +50,21 @@ std::unique_ptr<StatsTracker> ShinyHuntDeoxys_Descriptor::make_stats() const{
 }
 
 ShinyHuntDeoxys::ShinyHuntDeoxys()
-    : WALK_UP_DOWN_TIME0(
+    : STARTPOS(
+        "<b>Starting Position:</b><br>",
+        {
+            {StartPos::boat, "boat", "Boat/Walk up"},
+            {StartPos::rock_unsolved, "rock_unsolved", "Triangle rock, puzzle is unsolved"},
+            {StartPos::rock_solved, "rock_solved", "Triangle rock, puzzle is already solved"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        StartPos::rock_unsolved
+    )
+    , WALK_UP_DOWN_TIME(
         "<b>Walk up/down time</b><br>Spend this long to run up to the triangle rock.",
         LockMode::LOCK_WHILE_RUNNING,
-        "3520 ms"
+        TICKS_PER_SECOND,
+        "440"
     )
     , NOTIFICATION_SHINY(
         "Shiny Found",
@@ -67,11 +78,12 @@ ShinyHuntDeoxys::ShinyHuntDeoxys()
         &NOTIFICATION_PROGRAM_FINISH,
         })
 {
-    PA_ADD_OPTION(WALK_UP_DOWN_TIME0);
+    PA_ADD_OPTION(STARTPOS);
+    PA_ADD_OPTION(WALK_UP_DOWN_TIME);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
-void ShinyHuntDeoxys::solve_puzzle(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
+void ShinyHuntDeoxys::solve_puzzle(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) {
     env.log("Step 1: Press A from below.");
     pbf_press_button(context, BUTTON_A, 20, 40);
 
@@ -175,7 +187,7 @@ void ShinyHuntDeoxys::solve_puzzle(SingleSwitchProgramEnvironment& env, ProContr
     context.wait_for_all_requests();
 }
 
-void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context){
     ShinyHuntDeoxys_Descriptor::Stats& stats = env.current_stats<ShinyHuntDeoxys_Descriptor::Stats>();
 
     /*
@@ -195,18 +207,36 @@ void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, ProController
     * Would have to handle both PokeNav and random encounters for ray/others? Why is PokeNav a thing???
     */
 
-    while (true) {
-        env.log("Walking up to Deoxys.");
-        //Walk up to the triangle rock from the ship. No bike allowed.
-        ssf_press_button(context, BUTTON_B, 0ms, WALK_UP_DOWN_TIME0);
-        pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME0, 160ms);
-        context.wait_for_all_requests();
-
-        solve_puzzle(env, context);
+    bool first_run = true;
 
-        //Start battle.
-        pbf_press_button(context, BUTTON_A, 20, 40);
+    while (true) {
+        if (first_run) {
+            switch (STARTPOS) {
+            case StartPos::rock_solved:
+                env.log("StartPos: Already in position.");
+                break;
+            case StartPos::boat:
+                env.log("StartPos: Walking up to Deoxys.");
+                //Walk up to the triangle rock from the ship. No bike allowed.
+                ssf_press_button(context, BUTTON_B, 0, WALK_UP_DOWN_TIME);
+                pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME, 20);
+                context.wait_for_all_requests();
+            case StartPos::rock_unsolved:
+                env.log("StartPos: Solving puzzle.");
+                solve_puzzle(env, context);
+                break;
+            default:
+                OperationFailedException::fire(
+                    ErrorReport::SEND_ERROR_REPORT,
+                    "Invalid starting position selected.",
+                    env.console
+                );
+                break;
+            }
+            first_run = false;
+        }
 
+        //Start battle
         bool legendary_shiny = handle_encounter(env.console, context, true);
         if (legendary_shiny) {
             stats.shinies++;
@@ -222,10 +252,20 @@ void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, ProController
         context.wait_for_all_requests();
 
         //Walk down from the triangle rock to the ship.
-        ssf_press_button(context, BUTTON_B, 0ms, WALK_UP_DOWN_TIME0);
-        pbf_press_dpad(context, DPAD_DOWN, WALK_UP_DOWN_TIME0, 160ms);
+        env.log("Walking down to ship.");
+        ssf_press_button(context, BUTTON_B, 0, WALK_UP_DOWN_TIME);
+        pbf_press_dpad(context, DPAD_DOWN, WALK_UP_DOWN_TIME, 20);
+        context.wait_for_all_requests();
+
+        env.log("Walking up to Deoxys rock.");
+        //Walk up to the triangle rock from the ship. Bike is not allowed on Birth Island.
+        ssf_press_button(context, BUTTON_B, 0, WALK_UP_DOWN_TIME);
+        pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME, 20);
         context.wait_for_all_requests();
 
+        env.log("Solving puzzle.");
+        solve_puzzle(env, context);
+
         stats.resets++;
         env.update_stats();
     }

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.h

@@ -7,7 +7,8 @@
 #ifndef PokemonAutomation_PokemonRSE_ShinyHuntDeoxys_H
 #define PokemonAutomation_PokemonRSE_ShinyHuntDeoxys_H
 
-#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeExpressionOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
@@ -25,16 +26,23 @@ class ShinyHuntDeoxys_Descriptor : public SingleSwitchProgramDescriptor{
 class ShinyHuntDeoxys : public SingleSwitchProgramInstance{
 public:
     ShinyHuntDeoxys();
-    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) override;
 
 private:
-    MillisecondsOption WALK_UP_DOWN_TIME0;
+    enum class StartPos{
+        boat,
+        rock_unsolved,
+        rock_solved,
+    };
+    EnumDropdownOption<StartPos> STARTPOS;
+
+    TimeExpressionOption<uint16_t> WALK_UP_DOWN_TIME;
 
     EventNotificationOption NOTIFICATION_SHINY;
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;
 
-    void solve_puzzle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void solve_puzzle(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context);
 };
 
 }