diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index c6e2f2b..511e408 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -127,6 +127,7 @@ namespace Internal std::int32_t GetGameTick(); Deque GetGraphicsObjects(); std::vector>> GetGroundItems(); + bool GetIsMember(); HashTable GetItemContainers(); IndexableData GetItemIndexableData(); Cache GetItemInfoCache(); diff --git a/Include/Game/Interfaces/Exchange.hpp b/Include/Game/Interfaces/Exchange.hpp index 9b330ee..c0b9e9b 100644 --- a/Include/Game/Interfaces/Exchange.hpp +++ b/Include/Game/Interfaces/Exchange.hpp @@ -13,7 +13,7 @@ class Exchange typedef enum SLOT_STATE { - EMPTY = 0, + STATE_EMPTY = 0, STARTING_BUY_OFFER = 1, BUY_OFFER_INCOMPLETE = 2, BUY_OFFER_UPDATING = 3, @@ -24,31 +24,40 @@ class Exchange SELL_OFFER_UPDATING = 11, SELL_OFFER_CANCELING = 12, SELL_OFFER_COMPLETE = 13, - STATE_UNDEFINED = 14 + STATE_DISABLED = 14, + STATE_UNDEFINED = 15 } SLOT_STATE; typedef enum SLOT_MODE { BUY = 0, SELL = 1, - MODE_UNDEFINED = 2 + MODE_DISABLED = 2, + MODE_UNDEFINED = 3 } SLOT_MODE; static bool IsOpen(); + static bool Open(); static bool Close(); static SLOT_STATE GetSlotState(const std::uint32_t Slot); static bool SlotOccupied(const std::uint32_t Slot); static std::vector GetAllSlotStates(); static bool AllSlotsOccupied(); - static std::int32_t GetCurrentSlotIndex(); - static SLOT_MODE GetCurrentSlotMode(); - static std::int32_t GetCurrentSlotItemID(); - static std::string GetCurrentSlotItemName(); - static std::int32_t GetCurrentSlotAmount(); - static std::int32_t GetCurrentSlotPrice(); + static std::int32_t GetOfferIndex(); + static SLOT_MODE GetOfferMode(); + static std::int32_t GetOfferItemID(); + static std::string GetOfferItemName(); + static std::int32_t GetOfferAmount(); + static std::int32_t GetOfferPrice(); static bool OfferOpen(); static bool CloseOffer(); + static bool OffersOpen(); + static bool SlotUseble(const std::uint32_t Slot); + static bool CanCollect(); + static bool Collect(const bool Inventory = true); + static bool OpenBuyOffer(); + static bool OpenSellOffer(); }; /** @} */ diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index d4b9696..9e1c41b 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ