Merge branch 'PokemonAutomation:main' into main

Author: ZacharyPL

SerialPrograms/Source/CommonTools/Random.cpp

@@ -0,0 +1,53 @@
+/*  Randomization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include "Common/CRC32/pabb_CRC32.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Random.h"
+
+namespace PokemonAutomation{
+
+
+
+uint32_t random_u32(){
+    uint64_t seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+    uint32_t crc = 0;
+    pabb_crc32_buffer(&crc, &seed, sizeof(seed));
+    return crc;
+}
+uint32_t random_u32(uint32_t min, uint32_t max){
+    if (min > max){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid random_u32() range.");
+    }
+
+    max++;
+    uint32_t diff = max - min;
+
+    //  Full range
+    if (diff == 0){
+        return random_u32();
+    }
+
+    //  Power-of-two
+    if ((diff & (diff - 1)) == 0){
+        return (random_u32() & (diff - 1)) + min;
+    }
+
+    uint32_t quo = 0xffffffff / diff;
+    uint32_t retry_threshold = quo + diff;
+
+    while (true){
+        uint32_t u32 = random_u32();
+        if (u32 < retry_threshold){
+            return u32 % diff + min;
+        }
+    }
+}
+
+
+
+}

SerialPrograms/Source/CommonTools/Random.h

@@ -0,0 +1,22 @@
+/*  Randomization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Randomization_H
+#define PokemonAutomation_Randomization_H
+
+#include <stdint.h>
+
+namespace PokemonAutomation{
+
+
+
+uint32_t random_u32();
+uint32_t random_u32(uint32_t min, uint32_t max);
+
+
+
+}
+#endif

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

@@ -144,6 +144,7 @@
 #include "Common/Cpp/StreamConnections/ReliableStreamConnection.h"
 #include "Common/PABotBase2/PABotbase2_ReliableStreamConnection.h"
 #include "Common/Cpp/StreamConnections/MockDevice.h"
+#include "CommonTools/Random.h"
 
 
 //#include <opencv2/core.hpp>
@@ -358,8 +359,13 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
 
     [[maybe_unused]] Logger& logger = env.logger();
 
+//    cout << random_u32(100, 115) << endl;
+
+
     stress_test(logger, scope);
 
+
+
 #if 0
     {
         MockDevice device(GlobalThreadPools::unlimited_normal());

SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Navigation.cpp

@@ -7,13 +7,13 @@
  */
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonTools/Random.h"
 #include "CommonTools/Async/InferenceRoutines.h"
 #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
 #include "PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
 #include "PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h"
 #include "PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h"
@@ -34,7 +34,7 @@ void soft_reset(ConsoleHandle& console, ProControllerContext& context){
 
     //Random wait before pressing start/A
     console.log("Randomly waiting...");
-    Milliseconds rng_wait = std::chrono::milliseconds(PokemonSwSh::MaxLairInternal::random(0, 5000));
+    Milliseconds rng_wait = std::chrono::milliseconds(random_u32(0, 5000));
     pbf_wait(context, rng_wait);
     context.wait_for_all_requests();
 
@@ -92,7 +92,7 @@ void soft_reset(ConsoleHandle& console, ProControllerContext& context){
 
     //Random wait no.2
     console.log("Randomly waiting...");
-    Milliseconds rng_wait2 = std::chrono::milliseconds(PokemonSwSh::MaxLairInternal::random(0, 5000));
+    Milliseconds rng_wait2 = std::chrono::milliseconds(random_u32(0, 5000));
     pbf_wait(context, rng_wait2);
     context.wait_for_all_requests();
 

SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp

@@ -6,6 +6,7 @@
 
 #include "Common/CRC32/pabb_CRC32.h"
 //#include "CommonFramework/Environment/Environment.h"
+#include "CommonTools/Random.h"
 #include "PokemonSwSh_MaxLair_AI.h"
 
 namespace PokemonAutomation{
@@ -15,12 +16,7 @@ namespace MaxLairInternal{
 
 
 int random(int min, int max){
-//    uint64_t seed = x86_rdtsc();
-    uint64_t seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
-    uint32_t crc = 0;
-    pabb_crc32_buffer(&crc, &seed, sizeof(seed));
-    seed = crc % (max - min + 1);
-    return (int)seed + min;
+    return random_u32(min, max);
 }
 
 

SerialPrograms/cmake/SourceFiles.cmake

@@ -658,6 +658,8 @@ file(GLOB LIBRARY_SOURCES
     Source/CommonTools/Options/StringSelectOption.h
     Source/CommonTools/Options/StringSelectTableOption.h
     Source/CommonTools/Options/TrainOCRModeOption.h
+    Source/CommonTools/Random.cpp
+    Source/CommonTools/Random.h
     Source/CommonTools/Resources/SpriteDatabase.cpp
     Source/CommonTools/Resources/SpriteDatabase.h
     Source/CommonTools/StartupChecks/StartProgramChecks.cpp