diff --git a/Include/Core/Classes/Projectile.hpp b/Include/Core/Classes/Projectile.hpp index 5ef60bc..2076d80 100644 --- a/Include/Core/Classes/Projectile.hpp +++ b/Include/Core/Classes/Projectile.hpp @@ -25,6 +25,8 @@ namespace Internal std::int32_t GetRotationX() const; std::int32_t GetRotationY() const; std::int32_t GetStartTick() const; + double GetVelocityY() const; + double GetVelocityX() const; double GetX() const; double GetY() const; }; diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index d913f8d..ade72e5 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -267,7 +267,7 @@ namespace Internal bool IsItemPlaceholder(std::int32_t ID); bool IsItemStackable(std::int32_t ID); std::vector GetBlockingWidgetBoxes(); - std::int32_t GetHealthPercentage(const Internal::Character& C); + double GetHealthPercentage(const Internal::Character& C); std::vector GetWidgets(std::int32_t Container); } diff --git a/Include/Core/JavaClass/Object.hpp b/Include/Core/JavaClass/Object.hpp index 916728c..550f3c6 100644 --- a/Include/Core/JavaClass/Object.hpp +++ b/Include/Core/JavaClass/Object.hpp @@ -6,12 +6,13 @@ class Class; class Object { public: - void* Obj; + void* Obj = nullptr; Object(); Object(const void* Obj); Object(const Object& O); Object(Object&& O); Object& operator=(const Object& O); + Object& operator=(Object&& O); bool operator==(const Object& O) const; bool operator!=(const Object& O) const; bool Equals(Object O) const; diff --git a/Include/Game/Interactable/Projectile.hpp b/Include/Game/Interactable/Projectile.hpp index 5adff0c..eb71853 100644 --- a/Include/Game/Interactable/Projectile.hpp +++ b/Include/Game/Interactable/Projectile.hpp @@ -17,6 +17,7 @@ namespace Interactable std::vector GetModel() const; Tile GetTile() const; + Tile GetTargetTile() const; Internal::Character GetInteracting() const; bool Interacting() const; bool Interacting(const Internal::Character& C) const; diff --git a/Include/Game/Interfaces/GameTabs/Magic.hpp b/Include/Game/Interfaces/GameTabs/Magic.hpp index 352138f..677a56e 100644 --- a/Include/Game/Interfaces/GameTabs/Magic.hpp +++ b/Include/Game/Interfaces/GameTabs/Magic.hpp @@ -3,6 +3,7 @@ #include #include +#include /** @addtogroup GameTabs * @{ */ @@ -154,7 +155,9 @@ class Magic ANCIENT_ANNAKARL_TELEPORT, ANCIENT_GHORROCK_TELEPORT, ANCIENT_TELEPORT_TO_BOUNTY_TARGET, - ANCIENT_EDGEVILLE_HOME_TELEPORT + ANCIENT_EDGEVILLE_HOME_TELEPORT, + + NONE } SPELL; @@ -167,6 +170,7 @@ class Magic static bool IsSpellSelected(const SPELL& Spell); static bool IsSpellSelected(const std::string& Name); static std::string GetSelectedSpellName(); + static const SPELL GetSelectedSpell(); static bool CastSpell(const SPELL& Spell); static bool SelectSpell(const SPELL& Spell); diff --git a/Include/Game/Interfaces/Minimap.hpp b/Include/Game/Interfaces/Minimap.hpp index cd2e89a..137f4ea 100644 --- a/Include/Game/Interfaces/Minimap.hpp +++ b/Include/Game/Interfaces/Minimap.hpp @@ -53,6 +53,13 @@ class Minimap */ static bool IsTileOn(const Tile& T); + /** + * @brief When poisoned, clicks on the health orb to cure + * + * @return true if poisoned and if the function successfully clicks the "Cure" option on the orb + */ + static bool ClickCure(); + /** * @brief Clicks on the minimap compass to quickly face North * diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index b0c170b..c93fa86 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ