Add faster-if-tick-precise enum for UI purposes. Fix the Item Printer RNG for SBB.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -900,6 +900,8 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h
     Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp
     Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.h
     Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp
     Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h
     Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp

SerialPrograms/SerialPrograms.pro

@@ -445,6 +445,7 @@ SOURCES += \
     Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp \
     Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp \
     Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp \
+    Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.cpp \
     Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp \
     Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp \
     Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp \
@@ -1604,6 +1605,7 @@ HEADERS += \
     Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h \
     Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h \
     Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h \
+    Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.h \
     Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h \
     Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.h \
     Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.h \

SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp

@@ -100,7 +100,8 @@ CollapsibleGroupBox* make_panel_header(
     const std::string& display_name,
     const std::string& doc_link,
     const std::string& description,
-    const ControllerRequirements& requirements
+    const ControllerRequirements& requirements,
+    FasterIfTickPrecise faster_if_tick_precise
 ){
     CollapsibleGroupBox* header = make_panel_header(parent, display_name, doc_link, description);
     QLayout* layout = header->widget()->layout();
@@ -116,7 +117,26 @@ CollapsibleGroupBox* make_panel_header(
             break;
         }
 
-        text = html_color_text("(This program does not have any special requirements.)", COLOR_BLUE);
+        switch (faster_if_tick_precise){
+        case PokemonAutomation::FasterIfTickPrecise::MUCH_FASTER:
+            text = html_color_text(
+                "(This program does not have any special controller requirements. "
+                "However, it is strongly recommended to use a controller that is tick-precise since the program will run much faster.)",
+                COLOR_DARKGREEN
+            );
+            break;
+        case PokemonAutomation::FasterIfTickPrecise::FASTER:
+            text = html_color_text(
+                "(This program does not have any special controller requirements. "
+                "However, it runs faster if the controller is tick-precise.)",
+                COLOR_DARKGREEN
+            );
+            break;
+        case PokemonAutomation::FasterIfTickPrecise::NOT_FASTER:
+            text = html_color_text("(This program does not have any special controller requirements.)", COLOR_BLUE);
+            break;
+        }
+
     }while (false);
 
     QLabel* label = new QLabel(QString::fromStdString(text), header);

SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h

@@ -11,12 +11,12 @@
 #include <QLabel>
 #include "Common/Qt/CollapsibleGroupBox.h"
 #include "CommonFramework/Globals.h"
+#include "Controllers/ControllerCapability.h"
 
 class QPushButton;
 
 namespace PokemonAutomation{
 
-class ControllerRequirements;
 
 
 
@@ -40,7 +40,8 @@ CollapsibleGroupBox* make_panel_header(
     const std::string& display_name,
     const std::string& doc_link,
     const std::string& description,
-    const ControllerRequirements& requirements
+    const ControllerRequirements& requirements,
+    FasterIfTickPrecise faster_if_tick_precise
 );
 
 

SerialPrograms/Source/Controllers/ControllerCapability.h

@@ -31,6 +31,13 @@
 namespace PokemonAutomation{
 
 
+enum class FasterIfTickPrecise{
+    NOT_FASTER,
+    FASTER,
+    MUCH_FASTER,
+};
+
+
 
 enum class ControllerInterface{
     None,

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp

@@ -24,6 +24,16 @@ void ssf_do_nothing(ProControllerContext& context, Milliseconds duration){
 }
 
 
+void ssf_press_button(ProControllerContext& context, Button button){
+    Milliseconds delay = 3 * 8ms;
+    Milliseconds hold = 5 * 8ms;
+    Milliseconds cool = 3 * 8ms;
+    Milliseconds timing_variation = context->timing_variation();
+    delay += 2 * timing_variation;
+    hold += timing_variation;
+    cool += timing_variation;
+    ssf_press_button(context, button, delay, hold, cool);
+}
 void ssf_press_button(
     ProControllerContext& context,
     Button button,
@@ -132,6 +142,16 @@ void ssf_issue_scroll(
 ){
     context->issue_system_scroll(&context, direction, delay, hold, cool);
 }
+void ssf_issue_scroll(ProControllerContext& context, DpadPosition direction){
+    Milliseconds delay = 3 * 8ms;
+    Milliseconds hold = 5 * 8ms;
+    Milliseconds cool = 3 * 8ms;
+    Milliseconds timing_variation = context->timing_variation();
+    delay += 2 * timing_variation;
+    hold += timing_variation;
+    cool += timing_variation;
+    ssf_issue_scroll(context, direction, delay, hold, cool);
+}
 
 
 

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h

@@ -31,6 +31,7 @@ void ssf_do_nothing     (ProControllerContext& context, Milliseconds duration);
 
 
 
+void ssf_press_button(ProControllerContext& context, Button button);
 void ssf_press_button(
     ProControllerContext& context,
     Button button,
@@ -92,6 +93,7 @@ void ssf_mash_AZs       (ProControllerContext& context, Milliseconds duration);
 #define SSF_SCROLL_RIGHT        DPAD_RIGHT
 #define SSF_SCROLL_DOWN         DPAD_DOWN
 #define SSF_SCROLL_LEFT         DPAD_LEFT
+void ssf_issue_scroll(ProControllerContext& context, DpadPosition direction);
 void ssf_issue_scroll(
     ProControllerContext& context,
     DpadPosition direction,

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -115,6 +115,8 @@
 #include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
+#include "PokemonSV/Programs/PokemonSV_Navigation.h"
+#include "PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h"
 
 
 #include <QPixmap>
@@ -169,6 +171,7 @@ TestProgram_Descriptor::TestProgram_Descriptor()
         FeedbackType::OPTIONAL_,
         AllowCommandsWhenRunning::ENABLE_COMMANDS,
         {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS},
+        FasterIfTickPrecise::NOT_FASTER,
         1, 4, 1
     )
 {}
@@ -267,7 +270,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     using namespace PokemonSwSh;
 //    using namespace PokemonBDSP;
 //    using namespace PokemonLA;
-//    using namespace PokemonSV;
+    using namespace PokemonSV;
 
     [[maybe_unused]] Logger& logger = env.logger();
     [[maybe_unused]] ConsoleHandle& console = env.consoles[0];
@@ -278,6 +281,11 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+    fly_from_paldea_to_blueberry_entrance(env.program_info(), console, context);
+
+
+
+#if 0
     ssf_press_button(context, BUTTON_A, 0);
     ssf_do_nothing(context, 4);
     ssf_press_button(context, BUTTON_A, 0);
@@ -286,7 +294,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     ssf_do_nothing(context, 4);
     ssf_press_button(context, BUTTON_A, 0);
     ssf_do_nothing(context, 4);
-
+#endif
 
 
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp

@@ -30,13 +30,24 @@ Color pick_color(FeedbackType feedback){
     return Color();
 }
 #endif
-Color pick_color(const ControllerRequirements& requirements){
+Color pick_color(
+    const ControllerRequirements& requirements,
+    FasterIfTickPrecise faster_if_tick_precise
+){
     if (requirements.contains(ControllerFeature::NintendoSwitch_DateSkip)){
         return COLOR_RED;
     }
     if (requirements.contains(ControllerFeature::TickPrecise)){
         return COLOR_PURPLE;
     }
+    switch (faster_if_tick_precise){
+    case FasterIfTickPrecise::MUCH_FASTER:
+    case FasterIfTickPrecise::FASTER:
+        return COLOR_DARKGREEN;
+    case FasterIfTickPrecise::NOT_FASTER:
+        return COLOR_BLUE;
+    }
+
     return COLOR_BLUE;
 }
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h

@@ -29,7 +29,10 @@ namespace NintendoSwitch{
 
 
 //Color pick_color(FeedbackType feedback);
-Color pick_color(const ControllerRequirements& requirements);
+Color pick_color(
+    const ControllerRequirements& requirements,
+    FasterIfTickPrecise faster_if_tick_precise
+);
 
 
 class SwitchSystemOption{