diff --git a/Include/Game/Interfaces/Chat.hpp b/Include/Game/Interfaces/Chat.hpp index 7079cee..342ba83 100644 --- a/Include/Game/Interfaces/Chat.hpp +++ b/Include/Game/Interfaces/Chat.hpp @@ -25,29 +25,32 @@ class Chat typedef enum CHAT_TYPE { - SYSTEM = 200, - PUBLIC_CHAT = 201, - PRIVATE_CHAT = 202, - CLAN_CHAT = 203, - - _SYSTEM = 0, - _PUBLIC_CHAT = 2, - _PRIVATE_CHAT_INCOMING = 3, - _PRIVATE_CHAT_SYSTEM = 5, - _PRIVATE_CHAT_OUTGOING = 6, - _CLAN_CHAT = 9, - _CLAN_CHAT_SYSTEM = 11, - _BROADCAST_SYSTEM = 14, - _EXAMINE_ITEM = 27, - _EXAMINE_NPC = 28, - _EXAMINE_GAMEOBJECT = 29, - _PRIVATE_CHAT_SYSTEM2 = 30, - _AUTO_CHAT = 90, - _TRADE_INCOMING = 101, - _TRADE = 102 + SERVER = 0, + PUBLIC_MOD = 1, + PUBLIC = 2, + PRIVATE_MESSAGE_RECEIVED = 3, + TRADE_RECEIVED = 4, + PRIVATE_MESSAGE_INFO = 5, + PRIVATE_MESSAGE_SENT = 6, + PRIVATE_MESSAGE_RECEIVED_MOD = 7, + CLANCHAT = 9, + CLANCHAT_INFO = 11, + TRADE_SENT = 12, + ABUSE_REPORT = 26, + EXAMINE_ITEM = 27, + EXAMINE_NPC = 28, + EXAMINE_OBJECT = 29, + FRIENDS_LIST_ADD = 30, + IGNORE_LIST_ADD = 31, + AUTOCHAT = 90, + GAME = 99, + TRADE = 101, + DUEL = 103, + FILTERED = 105, + ACTION = 109, + UNKNOWN = -1 } CHAT_TYPE; - static std::vector GetMessages(CHAT_TYPE Type); static std::vector GetMessages(CHAT_TYPE Type, bool Sort); static Internal::MessageNode GetLastMessage(CHAT_TYPE Type); diff --git a/Include/Game/Interfaces/Mainscreen.hpp b/Include/Game/Interfaces/Mainscreen.hpp index 9415763..e6ccb13 100644 --- a/Include/Game/Interfaces/Mainscreen.hpp +++ b/Include/Game/Interfaces/Mainscreen.hpp @@ -2,6 +2,7 @@ #define MAINSCREEN_HPP_INCLUDED #include "../../Core/Types/Box.hpp" +#include "../../Core/Types/Tile.hpp" #include "../../Core/Classes/Character.hpp" #include #include @@ -33,6 +34,7 @@ class Mainscreen static Mainscreen::CROSSHAIR_STATE GetCrosshairState(); static bool IsLoggedIn(); + static bool IsMoving(); static std::string GetUpText(); static bool UpTextContains(const std::string& UpText); @@ -42,7 +44,7 @@ class Mainscreen static bool WaitIsUpText(std::uint32_t Duration, std::uint32_t Step, const std::string& UpText); static bool WaitUpTextContains(std::uint32_t Duration, std::uint32_t Step, const std::string& UpText); static bool WaitUpTextContains(std::uint32_t Duration, std::uint32_t Step, const std::vector& UpTexts); - + static bool ClickTile(const Tile& T); }; /** @} */ diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index cef608d..c648aff 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ