Stall buyer example (#788)

Author: pifopi

SerialPrograms/Source/PokemonLZA/PokemonLZA_Panels.cpp

@@ -12,7 +12,7 @@
 
 //  General
 #include "Programs/PokemonLZA_ClothingBuyer.h"
-#include "Programs/PokemonLZA_BerryBuyer.h"
+#include "Programs/PokemonLZA_StallBuyer.h"
 
 //  Trading
 #include "Programs/Trading/PokemonLZA_SelfBoxTrade.h"
@@ -52,7 +52,7 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
 
     ret.emplace_back("---- General ----");
     ret.emplace_back(make_single_switch_program<ClothingBuyer_Descriptor, ClothingBuyer>());
-    ret.emplace_back(make_single_switch_program<BerryBuyer_Descriptor, BerryBuyer>());
+    ret.emplace_back(make_single_switch_program<StallBuyer_Descriptor, StallBuyer>());
     if (IS_BETA_VERSION){
         ret.emplace_back(make_multi_switch_program<SelfBoxTrade_Descriptor, SelfBoxTrade>());
     }

…onLZA/Programs/PokemonLZA_BerryBuyer.cpp …onLZA/Programs/PokemonLZA_StallBuyer.cppSerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BerryBuyer.cpp renamed to SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_StallBuyer.cpp SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BerryBuyer.cpp renamed to SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_StallBuyer.cpp

@@ -1,4 +1,4 @@
-/*  Berry Buyer
+/*  Stall Buyer
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -14,27 +14,27 @@
 #include "PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
-#include "PokemonLZA_BerryBuyer.h"
+#include "PokemonLZA_StallBuyer.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonLZA{
 
 using namespace Pokemon;
 
-BerryBuyer_Descriptor::BerryBuyer_Descriptor()
+StallBuyer_Descriptor::StallBuyer_Descriptor()
     : SingleSwitchProgramDescriptor(
-        "PokemonLZA:BerryBuyer",
-        STRING_POKEMON + " LZA", "Berry Buyer",
-        "Programs/PokemonLZA/BerryBuyer.html",
-        "Buy EV reducing berries from stall.",
+        "PokemonLZA:StallBuyer",
+        STRING_POKEMON + " LZA", "Stall Buyer",
+        "Programs/PokemonLZA/StallBuyer.html",
+        "Buy berries or mints from stall.",
         ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
-class BerryBuyer_Descriptor::Stats : public StatsTracker{
+class StallBuyer_Descriptor::Stats : public StatsTracker{
 public:
     Stats()
         : purchases(m_stats["Purchases"])
@@ -47,27 +47,33 @@ class BerryBuyer_Descriptor::Stats : public StatsTracker{
     std::atomic<uint64_t>& purchases;
     std::atomic<uint64_t>& errors;
 };
-std::unique_ptr<StatsTracker> BerryBuyer_Descriptor::make_stats() const{
+std::unique_ptr<StatsTracker> StallBuyer_Descriptor::make_stats() const{
     return std::unique_ptr<StatsTracker>(new Stats());
 }
 
 
-BerryBuyer::BerryBuyer()
-    : BERRY_TYPE(
-        "<b>Berry to Purchase:</b>",
+StallBuyer::StallBuyer()
+    : ITEM_POSITION(
+        "<b>Item Position to Purchase:</b>",
         {
-            {BerryType::POMEG,  "pomeg",  "Pomeg (HP)"},
-            {BerryType::KELPSY, "kelpsy", "Kelpsy (Attack)"},
-            {BerryType::QUALOT, "qualot", "Qualot (Defence)"},
-            {BerryType::HONDEW, "hondew", "Hondew (Special Attack)"},
-            {BerryType::GREPA,  "grepa",  "Grepa (Special Defence)"},
-            {BerryType::TAMATO, "tamato", "Tamato (Speed)"},
+            {ItemPosition::FirstItem,   "FirstItem",    "First Item"    },
+            {ItemPosition::SecondItem,  "SecondItem",   "Second Item"   },
+            {ItemPosition::ThirdItem,   "ThirdItem",    "Third Item"    },
+            {ItemPosition::FourthItem,  "FourthItem",   "Fourth Item"   },
+            {ItemPosition::FifthItem,   "FifthItem",    "Fifth Item"    },
+            {ItemPosition::SixthItem,   "SixthItem",    "Sixth Item"    },
+            {ItemPosition::SeventhItem, "SeventhItem",  "Seventh Item"  },
         },
         LockMode::LOCK_WHILE_RUNNING,
-        BerryType::POMEG
+        ItemPosition::FirstItem
+    )
+    , NUM_ITEM(
+        "<b>Number of available items in the stall:</b><br>Number of available items in the stall.",
+        LockMode::LOCK_WHILE_RUNNING,
+        6, 2, 7
     )
     , NUM_PURCHASE(
-        "<b>Number to Purchase:</b><br>The number of berries you want to purchase.",
+        "<b>Number to Purchase:</b><br>The number of items you want to purchase.",
         LockMode::LOCK_WHILE_RUNNING,
         100, 1, 999
     )
@@ -79,15 +85,35 @@ BerryBuyer::BerryBuyer()
         &NOTIFICATION_ERROR_FATAL,
     })
 {
-    PA_ADD_OPTION(BERRY_TYPE);
+    PA_ADD_OPTION(ITEM_POSITION);
+    PA_ADD_OPTION(NUM_ITEM);
     PA_ADD_OPTION(NUM_PURCHASE);
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
-void BerryBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
-    BerryBuyer_Descriptor::Stats& stats = env.current_stats<BerryBuyer_Descriptor::Stats>();
+std::pair<DpadPosition, int> compute_needed_inputs(int item_position, int num_item){
+    int down_presses = item_position;
+    int up_presses = num_item - item_position + 1;
+
+    if (down_presses <= up_presses){
+        return { DPAD_DOWN, down_presses };
+    }else{
+        return { DPAD_UP, up_presses };
+    }
+}
+
+void StallBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StallBuyer_Descriptor::Stats& stats = env.current_stats<StallBuyer_Descriptor::Stats>();
     assert_16_9_720p_min(env.logger(), env.console);
+    int item_position = static_cast<int>(ITEM_POSITION.get());
+    if (item_position >= NUM_ITEM){
+        throw UserSetupError(
+            env.logger(),
+            "Item position to purchase must be less than or equal to number of available items in the stall."
+        );
+    }
+
     while (true) {
         context.wait_for_all_requests();
 
@@ -100,12 +126,12 @@ void BerryBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerConte
         SelectionArrowWatcher select(
             COLOR_YELLOW, &env.console.overlay(),
             SelectionArrowType::RIGHT,
-            {0.715, 0.235, 0.045, 0.080}
+            {0.715, 0.165, 0.045, 0.440}
         );
         SelectionArrowWatcher confirm(
             COLOR_YELLOW, &env.console.overlay(),
             SelectionArrowType::RIGHT,
-            {0.715, 0.600, 0.045, 0.080}
+            {0.665, 0.600, 0.145, 0.080}
         );
         FlatWhiteDialogWatcher dialog(COLOR_RED, &env.console.overlay());
 
@@ -121,29 +147,17 @@ void BerryBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerConte
             );
         context.wait_for(100ms);
 
+        auto [direction, presses] = compute_needed_inputs(item_position, NUM_ITEM);
         switch (ret){
             case 0:
                 env.log("Detected A button.");
                 pbf_press_button(context, BUTTON_A, 160ms, 80ms);
                 continue;
 
             case 1:
-                env.log("Detected berry selection screen.");
-                switch(BERRY_TYPE){
-                    case BerryType::HONDEW:
-                        pbf_press_dpad(context, DPAD_DOWN, 160ms, 80ms);
-                    case BerryType::QUALOT:
-                        pbf_press_dpad(context, DPAD_DOWN, 160ms, 80ms);
-                    case BerryType::KELPSY:
-                        pbf_press_dpad(context, DPAD_DOWN, 160ms, 80ms);
-                    case BerryType::POMEG:
-                        break;
-                    case BerryType::GREPA:
-                        pbf_press_dpad(context, DPAD_UP,   160ms, 80ms);
-                    case BerryType::TAMATO:
-                        pbf_press_dpad(context, DPAD_UP,   160ms, 80ms);
-                        pbf_press_dpad(context, DPAD_UP,   160ms, 80ms);
-                        break;
+                env.log("Detected item selection screen.");
+                for (int i = 0; i < presses; i++){
+                    pbf_press_dpad(context, direction, 160ms, 80ms);
                 }
                 pbf_press_button(context, BUTTON_A, 160ms, 80ms);
                 continue;

…emonLZA/Programs/PokemonLZA_BerryBuyer.h …emonLZA/Programs/PokemonLZA_StallBuyer.hSerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BerryBuyer.h renamed to SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_StallBuyer.h SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BerryBuyer.h renamed to SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_StallBuyer.h

@@ -1,11 +1,11 @@
-/*  Berry Buyer
+/*  Stall Buyer
  *
  *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_PokemonLZA_BerryBuyer_H
-#define PokemonAutomation_PokemonLZA_BerryBuyer_H
+#ifndef PokemonAutomation_PokemonLZA_StallBuyer_H
+#define PokemonAutomation_PokemonLZA_StallBuyer_H
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
@@ -18,32 +18,34 @@ namespace PokemonLZA{
 
 
 
-class BerryBuyer_Descriptor : public SingleSwitchProgramDescriptor{
+class StallBuyer_Descriptor : public SingleSwitchProgramDescriptor{
 public:
-    BerryBuyer_Descriptor();
+    StallBuyer_Descriptor();
 
     class Stats;
     virtual std::unique_ptr<StatsTracker> make_stats() const override;
 };
 
 
 
-class BerryBuyer : public SingleSwitchProgramInstance{
+class StallBuyer : public SingleSwitchProgramInstance{
 public:
-    BerryBuyer();
+    StallBuyer();
 
     virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
-    enum class BerryType{
-        POMEG,
-        KELPSY,
-        QUALOT,
-        HONDEW,
-        GREPA,
-        TAMATO,
+    enum class ItemPosition{
+        FirstItem,
+        SecondItem,
+        ThirdItem,
+        FourthItem,
+        FifthItem,
+        SixthItem,
+        SeventhItem
     };
-    EnumDropdownOption<BerryType> BERRY_TYPE;
+    EnumDropdownOption<ItemPosition> ITEM_POSITION;
+    SimpleIntegerOption<uint8_t> NUM_ITEM;
     SimpleIntegerOption<uint16_t> NUM_PURCHASE;
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;

SerialPrograms/SourceFiles.cmake

@@ -1575,8 +1575,6 @@ file(GLOB LIBRARY_SOURCES
     Source/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.h
     Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp
     Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h
-    Source/PokemonLZA/Programs/PokemonLZA_BerryBuyer.cpp
-    Source/PokemonLZA/Programs/PokemonLZA_BerryBuyer.h
     Source/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.cpp
     Source/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.h
     Source/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp
@@ -1585,6 +1583,8 @@ file(GLOB LIBRARY_SOURCES
     Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.h
     Source/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp
     Source/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h
+    Source/PokemonLZA/Programs/PokemonLZA_StallBuyer.cpp
+    Source/PokemonLZA/Programs/PokemonLZA_StallBuyer.h
     Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp
     Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h
     Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp