diff --git a/Include/Core/JavaClass/Object.hpp b/Include/Core/JavaClass/Object.hpp index 6121517..05a324d 100644 --- a/Include/Core/JavaClass/Object.hpp +++ b/Include/Core/JavaClass/Object.hpp @@ -7,11 +7,9 @@ class Object { public: void* Obj; - Object(); Object(const void* Obj); Object(const Object& O); - void* Get() const; Object& operator=(const Object& O); bool operator==(const Object& O) const; bool operator!=(const Object& O) const; diff --git a/Include/Game/Interfaces/Bank.hpp b/Include/Game/Interfaces/Bank.hpp index 0e795e0..0598aec 100644 --- a/Include/Game/Interfaces/Bank.hpp +++ b/Include/Game/Interfaces/Bank.hpp @@ -15,7 +15,7 @@ class Bank { public: /** - * @brief Returns True if the Bank is currently Open + * @brief Returns true if the Bank is currently Open * @return True if the Bank is currently Open * @par Example * @code @@ -26,7 +26,7 @@ class Bank static bool IsOpen(); /** - * @brief Attempts to Close the Bank if it's Currently Open, returns True if the Bank is currently Closed + * @brief Attempts to Close the Bank if it's Currently Open, returns true if the Bank is currently Closed * @return Returns True if the is successfully Closed, or the Bank is already Closed * @par Example * @code @@ -117,7 +117,7 @@ class Bank /** - * @brief Returns True if the Bank contains the specified Item matching the passed ID + * @brief Returns true if the Bank contains the specified Item matching the passed ID * @return True if the Bank contains the specified Item matching the passed ID * @par Example * @code @@ -126,9 +126,8 @@ class Bank * @endcode */ static bool Contains(std::int32_t ID); - /** - * @brief Returns True if the Bank contains the specified Item matching the passed Name + * @brief Returns true if the Bank contains the specified Item matching the passed Name * @return True if the Bank contains the specified Item matching the passed Name * @par Example * @code @@ -137,29 +136,49 @@ class Bank * @endcode */ static bool Contains(const std::string& Name); - /** - * @brief Returns True if the Bank contains any of the specified Item matching the passed IDs - * @return True if the Bank contains any of the specified Item matching the passed IDs - * @par Example - * @code - * if (!Bank::Contains(std::vector { 995, 207, 584 })) - * return false; - * @endcode + * @brief Returns true if the Bank contains all passed Item IDs, at least once + * @return True if the Bank contains all passed Item IDs, at least once */ static bool Contains(const std::vector& IDs); - /** - * @brief Returns True if the Bank contains any of the specified Item matching the passed Names - * @return True if the Bank contains any of the specified Item matching the passed Names - * @par Example - * @code - * if (!Bank::Contains(std::vector { "Coins", "Oak Logs", "Air Runes" })) - * return false; - * @endcode + * @brief Returns true if the Bank contains all passed Item Names, at least once + * @return True if the Bank contains all passed Item Item Names, at least once */ static bool Contains(const std::vector& Names); + /** + * @brief Returns true if the Bank contains any of the passed IDs, at least once + * @return True if the Bank contains any of the passed Item IDs, at least once + */ + static bool ContainsAny(const std::vector& IDs); + /** + * @brief Returns true if the Bank contains any of the passed Item Names, at least once + * @return True if the Bank contains any of the passed Item Names, at least once + */ + static bool ContainsAny(const std::vector& Names); + + /** + * @brief Returns true if the Bank only contains the passed Item ID + * @return True if the Bank only contains the passed Item ID + */ + static bool ContainsOnly(std::int32_t ID); + /** + * @brief Returns true if the Bank only contains the passed Item Name + * @return True if the Bank only contains the passed Item Name + */ + static bool ContainsOnly(const std::string& Name); + /** + * @brief Returns true if the Bank only contains the passed Item IDs + * @return True if the Bank only contains the passed Item IDs + */ + static bool ContainsOnly(const std::vector& IDs); + /** + * @brief Returns true if the Bank only contains the passed Item Names + * @return True if the Bank only contains the passed Item Names + */ + static bool ContainsOnly(const std::vector& Names); + /** * @brief Returns the currently active Bank Tab * @return The currently active Bank Tab @@ -210,7 +229,7 @@ class Bank /** * @brief Attempts to Scroll to the specified Item matching the passed ID * @return True if it successfully scrolls to the specified Item matching the passed ID - * @note Returns True if the Item is already in view + * @note Returns true if the Item is already in view * @par Example * @code * if (Bank::Contains(995)) @@ -222,7 +241,7 @@ class Bank /** * @brief Attempts to Scroll to the specified Item matching the passed Name * @return True if it successfully scrolls to the specified Item matching the passed Name - * @note Returns True if the Item is already in view + * @note Returns true if the Item is already in view * @par Example * @code * if (Bank::Contains("Coins")) @@ -233,7 +252,7 @@ class Bank /** * @brief Attempts to Scroll to the specified Item matching the passed Name, and optionally Opens the Tab * @return True if it successfully scrolls to the specified Item matching the passed Name - * @note Returns True if the Item is already in view + * @note Returns true if the Item is already in view * @par Example * @code * if (Bank::Contains("Coins")) diff --git a/Include/Game/Interfaces/GameTabs/Equipment.hpp b/Include/Game/Interfaces/GameTabs/Equipment.hpp index c1b21cc..90dd8eb 100644 --- a/Include/Game/Interfaces/GameTabs/Equipment.hpp +++ b/Include/Game/Interfaces/GameTabs/Equipment.hpp @@ -48,6 +48,9 @@ class Equipment static bool Contains(const std::vector& IDs); static bool Contains(const std::vector& Names); + static bool ContainsAny(const std::vector& IDs); + static bool ContainsAny(const std::vector& Names); + static bool ContainsOnly(std::int32_t ID); static bool ContainsOnly(const std::string& Name); static bool ContainsOnly(const std::vector& IDs); diff --git a/Include/Game/Interfaces/GameTabs/Inventory.hpp b/Include/Game/Interfaces/GameTabs/Inventory.hpp index 6a17eb9..2a3804a 100644 --- a/Include/Game/Interfaces/GameTabs/Inventory.hpp +++ b/Include/Game/Interfaces/GameTabs/Inventory.hpp @@ -61,8 +61,8 @@ class Inventory static bool Contains(std::int32_t ID); static bool Contains(const std::string& Name); - static bool Contains(const std::vector& IDs); - static bool Contains(const std::vector& Names); + static bool Contains(const std::vector& IDs); // true if all items are found at least once + static bool Contains(const std::vector& Names); // true if all items are found at least once static bool ContainsAny(const std::vector& IDs); static bool ContainsAny(const std::vector& Names); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 2233047..8e96ace 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ