diff --git a/Include/Core/Classes/Character.hpp b/Include/Core/Classes/Character.hpp index 77b0aa4..5a040b2 100644 --- a/Include/Core/Classes/Character.hpp +++ b/Include/Core/Classes/Character.hpp @@ -29,7 +29,7 @@ class Character : public Renderable std::vector GetPathY() const; std::int32_t GetPoseAnimationFrame() const; std::int32_t GetPoseAnimationID() const; - std::int32_t GetSubPoseAnimation() const; + std::int32_t GetSubPoseAnimationID() const; std::int32_t GetX() const; std::int32_t GetY() const; diff --git a/Include/Core/Time.hpp b/Include/Core/Time.hpp index 113d904..5a3361d 100644 --- a/Include/Core/Time.hpp +++ b/Include/Core/Time.hpp @@ -12,6 +12,8 @@ std::uint64_t CurrentTimeMillis(); std::uint64_t CurrentTimeNanos(); bool WaitFunc(std::uint32_t Duration, std::uint32_t Step, std::function Func); bool WaitFunc(std::uint32_t Duration, std::uint32_t Step, std::function Func, bool Result); +std::string MillisToHumanShort(std::int64_t Millseconds); // HH:MM:SS +std::string MillisToHumanLong(std::int64_t Millseconds); // Hours, Minutes, Seconds /** @} */ diff --git a/Include/Game/Interfaces/Minimap.hpp b/Include/Game/Interfaces/Minimap.hpp index 7d82482..4ce1285 100644 --- a/Include/Game/Interfaces/Minimap.hpp +++ b/Include/Game/Interfaces/Minimap.hpp @@ -13,13 +13,12 @@ class Minimap public: static Point GetMiddle(); static Tile GetPosition(); - static Tile GetDestination(); static std::int32_t GetPlane(); static std::int32_t GetPositionX(); static std::int32_t GetPositionY(); - + static Tile GetDestination(); static std::int32_t GetDestinationX(); static std::int32_t GetDestinationY(); diff --git a/Include/Game/Models/SceneObjects.hpp b/Include/Game/Models/SceneObjects.hpp index c735cd9..f5e2870 100644 --- a/Include/Game/Models/SceneObjects.hpp +++ b/Include/Game/Models/SceneObjects.hpp @@ -5,6 +5,7 @@ #include "../../Core/Classes/DecorativeObject.hpp" #include "../../Core/Classes/GroundObject.hpp" #include "../../Core/Classes/WallObject.hpp" +#include "../../Core/Classes/ObjectInfo.hpp" #include "../../Core/Types/Tile.hpp" #include "../../Core/Types/Convex.hpp" #include @@ -21,10 +22,10 @@ class SceneObjects typedef enum OBJECT_TYPE { - GAME_OBJECT = (1 << 1), - DECORATIVE_OBJECT = (1 << 2), - GROUND_OBJECT = (1 << 3), - WALL_OBJECT = (1 << 4), + GAME_OBJECT = (1 << 1), + DECORATIVE_OBJECT = (1 << 2), + GROUND_OBJECT = (1 << 3), + WALL_OBJECT = (1 << 4), ALL = (GAME_OBJECT | DECORATIVE_OBJECT | GROUND_OBJECT | WALL_OBJECT) } OBJECT_TYPE; @@ -51,6 +52,12 @@ class SceneObjects static GroundObject Get(const std::function& Filter); static WallObject Get(const std::function& Filter); + static ObjectInfo GetInfoOf(const Object& O); + static ObjectInfo GetInfoOf(const GameObject& G); + static ObjectInfo GetInfoOf(const DecorativeObject& D); + static ObjectInfo GetInfoOf(const GroundObject& G); + static ObjectInfo GetInfoOf(const WallObject& W); + static Tile GetTileOf(const GameObject& G); static Tile GetTileOf(const DecorativeObject& D); static Tile GetTileOf(const GroundObject& G); diff --git a/Include/Game/Tools/Widgets.hpp b/Include/Game/Tools/Widgets.hpp index b6f4b2d..375c693 100644 --- a/Include/Game/Tools/Widgets.hpp +++ b/Include/Game/Tools/Widgets.hpp @@ -19,7 +19,7 @@ class Widgets * bool InventoryHidden = Widgets::IsHidden(Inventory); * @endcode */ - static bool IsHidden(Widget W); + static bool IsHidden(const Widget& W); /** * @brief Returns the Box of the passed Widget * @code @@ -27,7 +27,7 @@ class Widgets * Box BankInventoryBox = Widgets::GetBox(BankInventory); * @endcode */ - static Box GetBox(Widget W); + static Box GetBox(const Widget& W); /** * @brief Returns the absolute X of the passed Widget * @code @@ -35,7 +35,7 @@ class Widgets * std::int32_t BankInventoryX = Widgets::GetX(BankInventory); * @endcode */ - static std::int32_t GetX(Widget W); + static std::int32_t GetX(const Widget& W); /** * @brief Returns the absolute Y of the passed Widget * @code @@ -43,7 +43,13 @@ class Widgets * std::int32_t BankInventoryY = Widgets::GetX(BankInventory); * @endcode */ - static std::int32_t GetY(Widget W); + static std::int32_t GetY(const Widget& W); + + /** + * @brief (Temp) Returns the ItemIDs of the passed Widget + * @note Temporary function, this should be used over Widget.GetItemIDs() + */ + static std::vector GetItemIDs(const Widget& W); /** * @brief Returns a vector of All Loaded Widgets diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 29a3d40..51e9342 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ