diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index b4f8983..603aac2 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -169,6 +169,7 @@ namespace Internal AttackOption GetNPCAttackOption(); IndexableData GetNPCIndexableData(); std::vector GetNPCIndices(); + Cache GetNPCInfoCache(); Cache GetNPCModelCache(); std::vector GetNPCs(); IndexableData GetObjectIndexableData(); @@ -229,7 +230,7 @@ namespace Internal std::vector ProjectModel(const Model& M, std::int32_t LocalX, std::int32_t LocalY, std::int32_t LocalZ, std::int32_t Angle); Model GetPlayerModel(std::int64_t ID); - Model GetNPCModel(std::int32_t ID); + Model GetNPCModel(std::int64_t ID); Varbit GetVarbit(std::int32_t ID); Animation GetAnimation(std::int32_t ID); Frames GetFrames(std::int32_t ID); diff --git a/Include/Game/Interfaces/Chat.hpp b/Include/Game/Interfaces/Chat.hpp index 342ba83..a2f45a1 100644 --- a/Include/Game/Interfaces/Chat.hpp +++ b/Include/Game/Interfaces/Chat.hpp @@ -51,8 +51,8 @@ class Chat UNKNOWN = -1 } CHAT_TYPE; - static std::vector GetMessages(CHAT_TYPE Type); - static std::vector GetMessages(CHAT_TYPE Type, bool Sort); + static std::vector GetMessages(CHAT_TYPE Type, bool Sort = true); + static std::vector GetMessages(const std::vector& Type, bool Sort = true); static Internal::MessageNode GetLastMessage(CHAT_TYPE Type); static DIALOGUE_STATE GetDialogueState(); diff --git a/Include/Game/Interfaces/Mainscreen.hpp b/Include/Game/Interfaces/Mainscreen.hpp index e6ccb13..a6f9c09 100644 --- a/Include/Game/Interfaces/Mainscreen.hpp +++ b/Include/Game/Interfaces/Mainscreen.hpp @@ -35,6 +35,7 @@ class Mainscreen static bool IsLoggedIn(); static bool IsMoving(); + static bool IsAnimating(); static std::string GetUpText(); static bool UpTextContains(const std::string& UpText); diff --git a/Include/Game/Interfaces/Minimap.hpp b/Include/Game/Interfaces/Minimap.hpp index 3ef9465..cd2e89a 100644 --- a/Include/Game/Interfaces/Minimap.hpp +++ b/Include/Game/Interfaces/Minimap.hpp @@ -5,6 +5,7 @@ #include "../../Core/Types/Point.hpp" #include "../../Core/Classes/Region.hpp" #include +#include /** @addtogroup Interfaces * @{ */ @@ -76,6 +77,7 @@ class Minimap static bool ClickTile(const Tile& T, std::int32_t Random = 5); static bool WalkPath(const std::vector& Path, std::int32_t Distance, std::int32_t Random); + static bool WalkPath(const std::vector& Path, std::int32_t Distance, std::int32_t Random, std::function Func); static bool IsReachable(const Tile& T); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 90eaa0a..f7bdecb 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ