diff --git a/Include/Core/Classes/ItemInfo.hpp b/Include/Core/Classes/ItemInfo.hpp index b34405b..409cb3e 100644 --- a/Include/Core/Classes/ItemInfo.hpp +++ b/Include/Core/Classes/ItemInfo.hpp @@ -24,6 +24,7 @@ namespace Internal std::string GetName() const; std::int32_t GetNoteID() const; std::int32_t GetPrice() const; + std::int32_t GetShiftClickIndex() const; std::int32_t GetSpriteID() const; std::vector GetStackAmounts() const; std::vector GetStackModelIDs() const; diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 34672ac..37aa0e2 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -108,6 +108,7 @@ namespace Internal std::int32_t GetCameraZ(); Map GetChatLineCache(); Map GetClientFonts(); + std::vector GetClientKeyCodes(); std::int32_t GetClientPlane(); Preferences GetClientPreferences(); std::int32_t GetClientX(); @@ -133,11 +134,13 @@ namespace Internal std::int32_t GetItemSelected(); std::int32_t GetItemSelectedIndex(); Cache GetItemSpriteCache(); + std::vector GetKeysPressed(); std::vector GetLevels(); ClanMemberList GetLocalClanMemberList(); std::int32_t GetLocalDestinationX(); std::int32_t GetLocalDestinationY(); Player GetLocalPlayer(); + std::int32_t GetLocalPlayerIndex(); PlayerManager GetLocalPlayerManager(); Region GetLocalRegion(); std::int32_t GetLoginCaret(); diff --git a/Include/Game/Models/DecorativeObjects.hpp b/Include/Game/Models/DecorativeObjects.hpp index 9c9a847..273b72c 100644 --- a/Include/Game/Models/DecorativeObjects.hpp +++ b/Include/Game/Models/DecorativeObjects.hpp @@ -20,7 +20,6 @@ class DecorativeObjects static std::vector GetAll(const std::vector& Names); static std::vector GetAll(const std::function& Filter); - static Interactable::DecorativeObject Get(); static Interactable::DecorativeObject Get(const Tile& T); static Interactable::DecorativeObject Get(std::int32_t ID); static Interactable::DecorativeObject Get(const std::string& Name); diff --git a/Include/Game/Models/GameObjects.hpp b/Include/Game/Models/GameObjects.hpp index 359e969..69a84ba 100644 --- a/Include/Game/Models/GameObjects.hpp +++ b/Include/Game/Models/GameObjects.hpp @@ -21,7 +21,6 @@ class GameObjects static std::vector GetAll(const std::vector& Names); static std::vector GetAll(const std::function& Filter); - static Interactable::GameObject Get(); static Interactable::GameObject Get(const Tile& T); static Interactable::GameObject Get(std::int32_t ID); static Interactable::GameObject Get(const std::string& Name); diff --git a/Include/Game/Models/GroundItems.hpp b/Include/Game/Models/GroundItems.hpp index 82fabbb..1d2fe8c 100644 --- a/Include/Game/Models/GroundItems.hpp +++ b/Include/Game/Models/GroundItems.hpp @@ -21,7 +21,6 @@ class GroundItems static std::vector GetAll(const std::vector& Names); static std::vector GetAll(const std::function& Filter); - static Interactable::GroundItem Get(); static Interactable::GroundItem Get(const Tile& T); static Interactable::GroundItem Get(std::int32_t ID); static Interactable::GroundItem Get(const std::string& Name); diff --git a/Include/Game/Models/GroundObjects.hpp b/Include/Game/Models/GroundObjects.hpp index d16edac..5321d2f 100644 --- a/Include/Game/Models/GroundObjects.hpp +++ b/Include/Game/Models/GroundObjects.hpp @@ -20,7 +20,6 @@ class GroundObjects static std::vector GetAll(const std::vector& Names); static std::vector GetAll(const std::function& Filter); - static Interactable::GroundObject Get(); static Interactable::GroundObject Get(const Tile& T); static Interactable::GroundObject Get(std::int32_t ID); static Interactable::GroundObject Get(const std::string& Name); diff --git a/Include/Game/Models/NPCs.hpp b/Include/Game/Models/NPCs.hpp index 45e536a..f293f75 100644 --- a/Include/Game/Models/NPCs.hpp +++ b/Include/Game/Models/NPCs.hpp @@ -22,7 +22,6 @@ class NPCs static std::vector GetAll(const std::vector& Names); static std::vector GetAll(const std::function& Filter); - static Interactable::NPC Get(); static Interactable::NPC Get(const Tile& Tile); static Interactable::NPC Get(std::int32_t ID); static Interactable::NPC Get(const std::string& Name); diff --git a/Include/Game/Models/Players.hpp b/Include/Game/Models/Players.hpp index 18b926a..2b68453 100644 --- a/Include/Game/Models/Players.hpp +++ b/Include/Game/Models/Players.hpp @@ -12,7 +12,7 @@ class Players { public: - + static Interactable::Player GetLocal(); static std::vector GetAll(); static std::vector GetAll(const Tile& Tile); @@ -20,11 +20,10 @@ class Players static std::vector GetAll(const std::vector& Names); static std::vector GetAll(const std::function& Filter); - static Interactable::Player Get(); static Interactable::Player Get(const Tile& Tile); static Interactable::Player Get(const std::string& Name); static Interactable::Player Get(const std::vector& Names); - static Interactable::Player Get(const std::function& Filter); + static Interactable::Player Get(const std::function& Filter); }; /** @} */ diff --git a/Include/Game/Models/WallObjects.hpp b/Include/Game/Models/WallObjects.hpp index 33cbead..98b35ae 100644 --- a/Include/Game/Models/WallObjects.hpp +++ b/Include/Game/Models/WallObjects.hpp @@ -20,7 +20,6 @@ class WallObjects static std::vector GetAll(const std::vector& Names); static std::vector GetAll(const std::function& Filter); - static Interactable::WallObject Get(); static Interactable::WallObject Get(const Tile& T); static Interactable::WallObject Get(std::int32_t ID); static Interactable::WallObject Get(const std::string& Name); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 3871e10..e3d4fa4 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ