diff --git a/Include/Core/Paint.hpp b/Include/Core/Paint.hpp index d10afb8..dbbc0a5 100644 --- a/Include/Core/Paint.hpp +++ b/Include/Core/Paint.hpp @@ -10,6 +10,7 @@ class Paint { public: + static std::uint32_t* GetPixels(); static void Clear(); static void DrawPoint(const Point& P, std::uint8_t Red, std::uint8_t Green, std::uint8_t Blue, std::uint8_t Alpha); static void DrawPoints(const std::vector& Points, std::uint8_t Red, std::uint8_t Green, std::uint8_t Blue, std::uint8_t Alpha); diff --git a/Include/Core/Script.hpp b/Include/Core/Script.hpp index 2d032b1..8c43ea0 100644 --- a/Include/Core/Script.hpp +++ b/Include/Core/Script.hpp @@ -33,20 +33,24 @@ typedef struct std::string ProxyPort; std::string ProxyUsername; std::string ProxyPassword; - std::int32_t ActionDelayMean; - float ActionDelayDeviation; - std::int32_t MoveDelayMean; - float MoveDelayDeviation; - std::int32_t MouseDownDelayMean; - float MouseDownDelayDeviation; - std::int32_t MouseUpDelayMean; - float MouseUpDelayDeviation; - std::int32_t KeyDownDelayMean; - float KeyDownDelayDeviation; - std::int32_t KeyUpDelayMean; - float KeyUpDelayDeviation; - std::int32_t ScrollDelayMean; - float ScrollDelayDeviation; + std::int32_t InteractableMean; + float InteractableDeviation; + std::int32_t MoveMean; + float MoveDeviation; + std::int32_t MouseDownMean; + float MouseDownDeviation; + std::int32_t MouseUpMean; + float MouseUpDeviation; + std::int32_t KeyDownMean; + float KeyDownDeviation; + std::int32_t KeyUpMean; + float KeyUpDeviation; + std::int32_t ScrollAmount; + float ScrollAmountDeviation; + std::int32_t ScrollGapMean; + float ScrollGapDeviation; + std::int32_t ScrollMean; + float ScrollDeviation; float StandardDeviationX; float StandardDeviationY; float BoxProbabilityX; @@ -59,10 +63,15 @@ typedef struct float MenuProbabilityY; float WidgetProbabilityX; float WidgetProbabilityY; - float MissFollowUp; + float PointGenAccuracy; float FatigueGain; float FatigueLoss; float FatigueMax; + bool MiniBreakEnabled; + float MiniBreakEvery; + float MiniBreakEveryDeviation; + float MiniBreakFor; + float MiniBreakForDeviation; bool ShortBreakEnabled; float ShortBreakEvery; float ShortBreakEveryDeviation; diff --git a/Include/Core/Types/Area.hpp b/Include/Core/Types/Area.hpp index 8045d17..943cb7b 100644 --- a/Include/Core/Types/Area.hpp +++ b/Include/Core/Types/Area.hpp @@ -72,7 +72,7 @@ class Area : public Convex * @see @ref HybridRandomDocs * @see @ref MissChanceFollowupDocs */ - Tile GetHybridRandomTile(double ProbabilityX, double ProbabilityY, double StandardDeviationX, double StandardDeviationY, bool CheckMissFollowupChance = true) const; + Tile GetHybridRandomTile(double ProbabilityX, double ProbabilityY, double StandardDeviationX, double StandardDeviationY, bool CheckPointGenAccuracyChance = true) const; friend std::ostream& operator<<(std::ostream& OS, const Area& A); diff --git a/Include/Core/Types/Box.hpp b/Include/Core/Types/Box.hpp index 181bc6c..a24511b 100644 --- a/Include/Core/Types/Box.hpp +++ b/Include/Core/Types/Box.hpp @@ -84,7 +84,7 @@ class Box * @see @ref HybridRandomDocs * @see @ref MissChanceFollowupDocs */ - Point GetHybridRandomPoint(double ProbabilityX, double ProbabilityY, double StandardDeviationX, double StandardDeviationY, bool CheckMissFollowupChance = true) const; + Point GetHybridRandomPoint(double ProbabilityX, double ProbabilityY, double StandardDeviationX, double StandardDeviationY, bool CheckPointGenAccuracyChance = true) const; /** * @brief Returns True if the Box contains a Point diff --git a/Include/Core/Types/Convex.hpp b/Include/Core/Types/Convex.hpp index 52e011c..c4ceba7 100644 --- a/Include/Core/Types/Convex.hpp +++ b/Include/Core/Types/Convex.hpp @@ -51,7 +51,7 @@ class Convex * @see @ref HybridRandomDocs * @see @ref MissChanceFollowupDocs */ - Point GetHybridRandomPoint(double ProbabilityX, double ProbabilityY, double StandardDeviationX, double StandardDeviationY, bool CheckMissFollowupChance = true) const; + Point GetHybridRandomPoint(double ProbabilityX, double ProbabilityY, double StandardDeviationX, double StandardDeviationY, bool CheckPointGenAccuracyChance = true) const; Convex operator+(const Point& P) const; Convex operator-(const Point& P) const; diff --git a/Include/Game/Tools/Profile.hpp b/Include/Game/Tools/Profile.hpp index e13c738..d3edc31 100644 --- a/Include/Game/Tools/Profile.hpp +++ b/Include/Game/Tools/Profile.hpp @@ -10,6 +10,8 @@ class Profile { public: + + static std::string GetUsername(); static std::string GetPassword(); static std::string GetBankPin(); @@ -18,26 +20,30 @@ class Profile static bool GetIsMember(); static bool GetHasPin(); - static std::int32_t GetActionDelayMean(); - static double GetActionDelayDeviation(); + static std::int32_t GetInteractableMean(); + static double GetInteractableDeviation(); - static std::int32_t GetMoveDelayMean(); - static double GetMoveDelayDeviation(); + static std::int32_t GetMoveMean(); + static double GetMoveDeviation(); - static std::int32_t GetMouseDownDelayMean(); - static double GetMouseDownDelayDeviation(); + static std::int32_t GetMouseDownMean(); + static double GetMouseDownDeviation(); - static std::int32_t GetMouseUpDelayMean(); - static double GetMouseUpDelayDeviation(); + static std::int32_t GetMouseUpMean(); + static double GetMouseUpDeviation(); - static std::int32_t GetKeyDownDelayMean(); - static double GetKeyDownDelayDeviation(); + static std::int32_t GetKeyDownMean(); + static double GetKeyDownDeviation(); - static std::int32_t GetKeyUpDelayMean(); - static double GetKeyUpDelayDeviation(); + static std::int32_t GetKeyUpMean(); + static double GetKeyUpDeviation(); - static std::int32_t GetScrollDelayMean(); - static double GetScrollDelayDeviation(); + static std::int32_t GetScrollAmount(); + static double GetScrollAmountDeviation(); + static std::int32_t GetScrollGapMean(); + static double GetScrollGapDeviation(); + static std::int32_t GetScrollMean(); + static double GetScrollDeviation(); static double GetStandardDeviationX(); static double GetStandardDeviationY(); @@ -57,13 +63,19 @@ class Profile static double GetWidgetProbabilityX(); static double GetWidgetProbabilityY(); - static double GetMissFollowUp(); + static double GetPointGenAccuracy(); static double GetFatigue(); static double GetFatigueGain(); static double GetFatigueLoss(); static double GetFatigueMax(); + static bool GetMiniBreakEnabled(); + static double GetMiniBreakEvery(); + static double GetMiniBreakEveryDeviation(); + static double GetMiniBreakFor(); + static double GetMiniBreakForDeviation(); + static bool GetShortBreakEnabled(); static double GetShortBreakEvery(); static double GetShortBreakEveryDeviation(); @@ -81,6 +93,7 @@ class Profile static std::string GetProxyPort(); static std::string GetProxyUsername(); static std::string GetProxyPassword(); + }; /** @} */ diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 4c91084..c869143 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ