diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 39069ac..8a9e4d3 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -241,6 +241,7 @@ namespace Internal std::string GetItemName(std::int32_t ID); std::vector GetBlockingWidgetBoxes(); std::int32_t GetHealthPercentage(const Internal::Character& C); + std::vector GetWidgets(std::int32_t Container); } #endif // INTERNAL_HPP_INCLUDED diff --git a/Include/Game/Interactable/NPC.hpp b/Include/Game/Interactable/NPC.hpp index e7677d3..c61f6f1 100644 --- a/Include/Game/Interactable/NPC.hpp +++ b/Include/Game/Interactable/NPC.hpp @@ -26,6 +26,8 @@ namespace Interactable bool Interacting() const; bool Interacting(const Internal::Character& C) const; + bool Interact(const std::string& Option) const; + operator Internal::NPC() const; }; } diff --git a/Include/Game/Interfaces/Bank.hpp b/Include/Game/Interfaces/Bank.hpp index a6a2603..80a2f65 100644 --- a/Include/Game/Interfaces/Bank.hpp +++ b/Include/Game/Interfaces/Bank.hpp @@ -14,6 +14,19 @@ class Bank { public: + + typedef enum WITHDRAW_MODE + { + ITEM, + NOTED + } WITHDRAW_MODE; + + typedef enum REARRANGE_MODE + { + SWAP, + INSERT + } REARRANGE_MODE; + /** * @brief Returns true if the Bank is currently Open * @return True if the Bank is currently Open @@ -279,6 +292,9 @@ class Bank static bool DepositAllExcept(const std::vector IDs); static bool DepositAll(); static bool DepositEquipment(); + + static WITHDRAW_MODE GetWithdrawMode(); + }; /** @} */ diff --git a/Include/Game/Tools/Widgets.hpp b/Include/Game/Tools/Widgets.hpp index 6dec661..22d0fb9 100644 --- a/Include/Game/Tools/Widgets.hpp +++ b/Include/Game/Tools/Widgets.hpp @@ -53,14 +53,14 @@ class Widgets /** * @brief Returns a vector of All Loaded Widgets - * @code std::vector Widgets = Widgets::GetAll(); @endcode + * @code std::vector> Widgets = Widgets::GetAll(); @endcode */ - static std::vector GetAll(); + static std::vector> GetAll(); /** * @brief Returns the specified Widget by Parent ID - * @code Widget BankParent = Widgets::Get(15); @endcode + * @code std::vector BankParent = Widgets::Get(15); @endcode */ - static Internal::Widget Get(std::int32_t Parent); + static std::vector Get(std::int32_t Parent); /** * @brief Returns the specified Widget by Parent, and Child ID * @code Widget BankInventory = Widgets::Get(15, 3); @endcode diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index e9040f9..3c7e082 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ