diff --git a/Include/Core/Classes/Character.hpp b/Include/Core/Classes/Character.hpp index 406eb26..0677132 100644 --- a/Include/Core/Classes/Character.hpp +++ b/Include/Core/Classes/Character.hpp @@ -34,6 +34,8 @@ namespace Internal std::int32_t GetSubPoseAnimationID() const; std::int32_t GetX() const; std::int32_t GetY() const; + std::int32_t GetIntField1() const; + bool GetBoolField1() const; }; } diff --git a/Include/Core/Classes/ChatLineBuffer.hpp b/Include/Core/Classes/ChatLineBuffer.hpp index 60f0435..306ee79 100644 --- a/Include/Core/Classes/ChatLineBuffer.hpp +++ b/Include/Core/Classes/ChatLineBuffer.hpp @@ -19,6 +19,7 @@ namespace Internal std::int32_t GetLength() const; std::vector GetLines() const; + MessageNode GetLines(std::int32_t I) const; }; } diff --git a/Include/Core/Classes/Frames.hpp b/Include/Core/Classes/Frames.hpp index 8bcd286..6141ffe 100644 --- a/Include/Core/Classes/Frames.hpp +++ b/Include/Core/Classes/Frames.hpp @@ -17,6 +17,7 @@ namespace Internal static Class GetClass(); std::vector GetSkeletons() const; + Frame GetSkeletons(std::int32_t I) const; }; } diff --git a/Include/Core/Classes/HashTable.hpp b/Include/Core/Classes/HashTable.hpp index 1dd874f..9815f81 100644 --- a/Include/Core/Classes/HashTable.hpp +++ b/Include/Core/Classes/HashTable.hpp @@ -18,6 +18,7 @@ namespace Internal static Class GetClass(); std::vector GetBuckets() const; + Node GetBuckets(std::int32_t I) const; std::int32_t GetIndex() const; std::int32_t GetSize() const; diff --git a/Include/Core/Classes/IndexableData.hpp b/Include/Core/Classes/IndexableData.hpp index 9a41c60..8851ec0 100644 --- a/Include/Core/Classes/IndexableData.hpp +++ b/Include/Core/Classes/IndexableData.hpp @@ -4,6 +4,7 @@ #include "../JavaClass/Object.hpp" #include "../JavaClass/Class.hpp" #include +#include namespace Internal { @@ -16,7 +17,8 @@ namespace Internal static Class GetClass(); std::vector> GetChildren() const; - + std::vector GetChildren(std::int32_t I) const; + Object GetChildren(std::int32_t I, std::int32_t II) const; }; } diff --git a/Include/Core/Classes/NameableContainer.hpp b/Include/Core/Classes/NameableContainer.hpp index 9db5727..7737ad6 100644 --- a/Include/Core/Classes/NameableContainer.hpp +++ b/Include/Core/Classes/NameableContainer.hpp @@ -17,6 +17,7 @@ namespace Internal static Class GetClass(); std::vector GetNameables() const; + Nameable GetNameables(std::int32_t I) const; std::int32_t GetSize() const; }; diff --git a/Include/Core/Classes/Region.hpp b/Include/Core/Classes/Region.hpp index 040fbe4..455fe16 100644 --- a/Include/Core/Classes/Region.hpp +++ b/Include/Core/Classes/Region.hpp @@ -18,7 +18,10 @@ namespace Internal static Class GetClass(); std::vector GetGameObjects() const; + GameObject GetGameObjects(std::int32_t I) const; std::vector>> GetSceneTiles() const; + std::vector> GetSceneTiles(std::int32_t Plane) const; + SceneTile GetSceneTiles(std::int32_t X, std::int32_t Y, std::int32_t Plane) const; }; } diff --git a/Include/Core/Classes/SceneTile.hpp b/Include/Core/Classes/SceneTile.hpp index 52f8adc..b64d041 100644 --- a/Include/Core/Classes/SceneTile.hpp +++ b/Include/Core/Classes/SceneTile.hpp @@ -22,6 +22,7 @@ namespace Internal DecorativeObject GetDecorativeObject() const; std::vector GetGameObjects() const; + GameObject GetGameObjects(std::int32_t I) const; GroundObject GetGroundObject() const; std::int32_t GetPlane() const; WallObject GetWallObject() const; diff --git a/Include/Core/Classes/Widget.hpp b/Include/Core/Classes/Widget.hpp index c9a5032..77507e7 100644 --- a/Include/Core/Classes/Widget.hpp +++ b/Include/Core/Classes/Widget.hpp @@ -21,6 +21,7 @@ namespace Internal std::int32_t GetBorderThickness() const; std::int32_t GetBoxIndex() const; std::vector GetChildren() const; + Widget GetChildren(std::int32_t I) const; std::int32_t GetHeight() const; bool GetHidden() const; std::int32_t GetID() const; diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 8577d05..b1d8f1f 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -187,7 +187,6 @@ namespace Internal bool LoadWorlds(); void SetWorld(const World& W); - Node GetHashTableNode(const HashTable& Table, std::int32_t Index); ItemInfo GetItemInfo(std::int32_t ID); NPCInfo GetNPCInfo(std::int32_t ID); ObjectInfo GetObjectInfo(std::int32_t ID); diff --git a/Include/Game/Interfaces/Login.hpp b/Include/Game/Interfaces/Login.hpp index b351ddf..7f8e223 100644 --- a/Include/Game/Interfaces/Login.hpp +++ b/Include/Game/Interfaces/Login.hpp @@ -17,6 +17,7 @@ class Login typedef enum LOGIN_SCREEN_STATE { WELCOME_SCREEN, + PVP_WORLD, ENTER_CREDENTIALS, INVALID_CREDENTIALS, FORGOTTEN_PASSWORD, diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 73e54bc..c4d4720 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ