diff --git a/Include/Core/Classes/Cache.hpp b/Include/Core/Classes/Cache.hpp index a3393bd..3c95499 100644 --- a/Include/Core/Classes/Cache.hpp +++ b/Include/Core/Classes/Cache.hpp @@ -3,8 +3,8 @@ #include "../JavaClass/Object.hpp" #include "../JavaClass/Class.hpp" -#include "HashTable.hpp" -#include "Queue.hpp" +#include "IterableHashTable.hpp" +#include "IterableQueue.hpp" namespace Internal { @@ -21,8 +21,8 @@ namespace Internal static Class GetClass(); - HashTable GetHashTable() const; - Queue GetQueue() const; + IterableHashTable GetIterableHashTable() const; + IterableQueue GetIterableQueue() const; }; } diff --git a/Include/Core/Classes/DynamicObject.hpp b/Include/Core/Classes/DynamicObject.hpp index 3499e32..d9ce0e3 100644 --- a/Include/Core/Classes/DynamicObject.hpp +++ b/Include/Core/Classes/DynamicObject.hpp @@ -3,6 +3,7 @@ #include "Renderable.hpp" #include "../JavaClass/Class.hpp" +#include "Animation.hpp" #include namespace Internal @@ -20,9 +21,15 @@ namespace Internal static Class GetClass(); + Animation GetAnimation() const; + std::int32_t GetAnimationFrame() const; std::int32_t GetID() const; std::int32_t GetOrientation() const; + std::int32_t GetPlane() const; std::int32_t GetType() const; + std::int32_t GetX() const; + std::int32_t GetY() const; + }; } diff --git a/Include/Core/Classes/IterableQueue.hpp b/Include/Core/Classes/IterableQueue.hpp new file mode 100644 index 0000000..e0e6e2e --- /dev/null +++ b/Include/Core/Classes/IterableQueue.hpp @@ -0,0 +1,28 @@ +#ifndef ITERABLEQUEUE_HPP_INCLUDED +#define ITERABLEQUEUE_HPP_INCLUDED + +#include "../JavaClass/Object.hpp" +#include "../JavaClass/Class.hpp" +#include "CacheableNode.hpp" + +namespace Internal +{ + class IterableQueue : public Object + { + public: + IterableQueue(const void* Obj); + + IterableQueue() = default; + IterableQueue(IterableQueue&& Obj) = default; + IterableQueue(const IterableQueue& Obj) = default; + IterableQueue& operator=(IterableQueue&& Obj) = default; + IterableQueue& operator=(const IterableQueue& Obj) = default; + + static Class GetClass(); + + CacheableNode GetHead() const; + + }; +} + +#endif // ITERABLEQUEUE_HPP_INCLUDED diff --git a/Include/Core/Globals.hpp b/Include/Core/Globals.hpp index 0adb2f2..c6edfa6 100644 --- a/Include/Core/Globals.hpp +++ b/Include/Core/Globals.hpp @@ -140,6 +140,7 @@ namespace Globals const WidgetDef MINIMAP_CURE = { 160, 4 }; const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 14 }; const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 22 }; + const WidgetDef MINIMAP_SPECIAL_ATTACK = { 160, 28 }; //************ Trade.cpp ************// const WidgetDef TRADE_SCREEN = { 335, 3 }; diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 0ae06aa..2eac329 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -73,6 +73,7 @@ #include "Classes/ItemContainer.hpp" #include "Classes/ItemInfo.hpp" #include "Classes/IterableHashTable.hpp" +#include "Classes/IterableQueue.hpp" #include "Classes/LinkedList.hpp" #include "Classes/MessageNode.hpp" #include "Classes/Model.hpp" @@ -260,7 +261,6 @@ namespace Internal Model GetItemModel(std::int32_t ID, std::int32_t Amount); SpotAnimation GetSpotAnimation(std::int32_t ID); Model GetSpotAnimationModel(std::int32_t ID); - Model GetGameObjectModel(const GameObject& O); Model GetWallObjectModel(const WallObject& O); Model GetDecorativeObjectModel(const DecorativeObject& O); Model GetGroundObjectModel(const GroundObject& O); @@ -270,6 +270,7 @@ namespace Internal Deque GetGroundItems(std::int32_t X, std::int32_t Y, std::int32_t Plane); std::vector GetPlayerModel(const Player& P); std::vector GetNPCModel(const NPC& N); + std::vector GetGameObjectModel(const GameObject& O); std::vector GetGraphicsObjectModel(const GraphicsObject& O); std::vector GetProjectileModel(const Internal::Projectile& P); SceneTile GetSceneTile(std::int32_t X, std::int32_t Y, std::int32_t Plane); diff --git a/Include/Game/Interfaces/Minimap.hpp b/Include/Game/Interfaces/Minimap.hpp index 5c31d09..555d2af 100644 --- a/Include/Game/Interfaces/Minimap.hpp +++ b/Include/Game/Interfaces/Minimap.hpp @@ -77,6 +77,7 @@ namespace Minimap * @return true if the function succesfully clicked the orb */ bool ClickToggleRun(); + bool ClickSpecial(); bool ClickTile(const Tile& T, std::int32_t Random = 5); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index ab720a5..928a7d8 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ