diff --git a/Include/Game/Interactable/DecorativeObject.hpp b/Include/Game/Interactable/DecorativeObject.hpp index 71087fc..9c55a34 100644 --- a/Include/Game/Interactable/DecorativeObject.hpp +++ b/Include/Game/Interactable/DecorativeObject.hpp @@ -32,7 +32,7 @@ namespace Interactable bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const std::string& Option) const; - bool Interact(const std::vector& Options, bool RequireAll = true) const; + bool Interact(const std::vector& Options, bool RequireAllOptions = false) const; operator Internal::DecorativeObject() const; }; diff --git a/Include/Game/Interactable/GameObject.hpp b/Include/Game/Interactable/GameObject.hpp index 990da59..92adf16 100644 --- a/Include/Game/Interactable/GameObject.hpp +++ b/Include/Game/Interactable/GameObject.hpp @@ -32,7 +32,7 @@ namespace Interactable bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const std::string& Option) const; - bool Interact(const std::vector& Options, bool RequireAll = true) const; + bool Interact(const std::vector& Options, bool RequireAllOptions = false) const; operator Internal::GameObject() const; }; diff --git a/Include/Game/Interactable/GroundItem.hpp b/Include/Game/Interactable/GroundItem.hpp index 7e0724c..38d7053 100644 --- a/Include/Game/Interactable/GroundItem.hpp +++ b/Include/Game/Interactable/GroundItem.hpp @@ -34,7 +34,7 @@ namespace Interactable bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const std::string& Option) const; - bool Interact(const std::vector& Options, bool RequireAll = true) const; + bool Interact(const std::vector& Options, bool RequireAllOptions = false) const; operator Internal::GroundItem() const; }; diff --git a/Include/Game/Interactable/GroundObject.hpp b/Include/Game/Interactable/GroundObject.hpp index 892fe24..93b6527 100644 --- a/Include/Game/Interactable/GroundObject.hpp +++ b/Include/Game/Interactable/GroundObject.hpp @@ -32,7 +32,7 @@ namespace Interactable bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const std::string& Option) const; - bool Interact(const std::vector& Options, bool RequireAll = true) const; + bool Interact(const std::vector& Options, bool RequireAllOptions = false) const; operator Internal::GroundObject() const; diff --git a/Include/Game/Interactable/NPC.hpp b/Include/Game/Interactable/NPC.hpp index f1f07e9..54996df 100644 --- a/Include/Game/Interactable/NPC.hpp +++ b/Include/Game/Interactable/NPC.hpp @@ -36,7 +36,7 @@ namespace Interactable bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const std::string& Option) const; - bool Interact(const std::vector& Options, bool RequireAll = true) const; + bool Interact(const std::vector& Options, bool RequireAllOptions = false) const; operator Internal::NPC() const; }; diff --git a/Include/Game/Interactable/Player.hpp b/Include/Game/Interactable/Player.hpp index d261dbc..c07a121 100644 --- a/Include/Game/Interactable/Player.hpp +++ b/Include/Game/Interactable/Player.hpp @@ -35,7 +35,7 @@ namespace Interactable bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const std::string& Option) const; - bool Interact(const std::vector& Options, bool RequireAll = true) const; + bool Interact(const std::vector& Options, bool RequireAllOptions = false) const; operator Internal::Player() const; }; diff --git a/Include/Game/Interactable/WallObject.hpp b/Include/Game/Interactable/WallObject.hpp index 36038d2..8b1d731 100644 --- a/Include/Game/Interactable/WallObject.hpp +++ b/Include/Game/Interactable/WallObject.hpp @@ -32,7 +32,7 @@ namespace Interactable bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const std::string& Option) const; - bool Interact(const std::vector& Options, bool RequireAll = true) const; + bool Interact(const std::vector& Options, bool RequireAllOptions = false) const; operator Internal::WallObject() const; }; diff --git a/Include/Game/Interactable/Widget.hpp b/Include/Game/Interactable/Widget.hpp index 0216d61..043afae 100644 --- a/Include/Game/Interactable/Widget.hpp +++ b/Include/Game/Interactable/Widget.hpp @@ -27,7 +27,7 @@ namespace Interactable bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const std::string& Option) const; - bool Interact(const std::vector& Options, bool RequireAll = true) const; + bool Interact(const std::vector& Options, bool RequireAllOptions = false) const; operator Internal::Widget() const; }; diff --git a/Include/Game/Interfaces/GameTabs/Inventory.hpp b/Include/Game/Interfaces/GameTabs/Inventory.hpp index 31b8601..448d6c7 100644 --- a/Include/Game/Interfaces/GameTabs/Inventory.hpp +++ b/Include/Game/Interfaces/GameTabs/Inventory.hpp @@ -75,11 +75,11 @@ class Inventory static bool ContainsOnly(const std::vector& Names); static bool InteractItemByIndex(std::int32_t Index, const std::string& Option); - static bool InteractItemByIndex(std::int32_t Index, const std::vector& Options); + static bool InteractItemByIndex(std::int32_t Index, const std::vector& Options, bool RequireAllOptions = false); static bool InteractItem(std::int32_t ID, const std::string& Option); static bool InteractItem(const std::string& Name, const std::string& Option); - static bool InteractItem(const std::vector& IDs, const std::vector& Options); //Interacts with first found ID - static bool InteractItem(const std::vector& Names, const std::vector& Options); //Interacts with first found Name + static bool InteractItem(const std::vector& IDs, const std::vector& Options, bool RequireAllOptions = false); //Interacts with first found ID + static bool InteractItem(const std::vector& Names, const std::vector& Options, bool RequireAllOptions = false); //Interacts with first found Name static bool DropItemByIndex(std::int32_t Index, bool AllowShiftClick = true); static bool DropItem(std::int32_t ID, bool AllowShiftClick = true); diff --git a/Include/Game/Interfaces/Login.hpp b/Include/Game/Interfaces/Login.hpp index 426c089..1db7417 100644 --- a/Include/Game/Interfaces/Login.hpp +++ b/Include/Game/Interfaces/Login.hpp @@ -36,17 +36,16 @@ class Login static LOGIN_SCREEN_STATE GetLoginScreenState(); - static bool IsWorldSelectOpen(); - static bool CloseWorldSelect(); - static bool LoginPlayer(); static bool EnterCredentials(); + static bool IsWorldSelectOpen(); + static bool OpenWorldSelect(); + static bool CloseWorldSelect(); + static bool SelectWorld(); static bool SelectWorld(Internal::World World); static bool SelectWorld(std::int32_t WorldID); - static bool OpenWorldSelect(); - static bool OpenWorldSelect(bool Close); /** * @return X of where the login screen starts diff --git a/Include/Game/Interfaces/Menu.hpp b/Include/Game/Interfaces/Menu.hpp index 5297106..fb18007 100644 --- a/Include/Game/Interfaces/Menu.hpp +++ b/Include/Game/Interfaces/Menu.hpp @@ -159,14 +159,14 @@ class Menu /** * @brief Looks for a menu option containing the passed Option, and returns information about the found option * - * @param Options Menu options to look for, returns on first option found, the more specific, the more accurate the result will be + * @param Options Menu options to look for, returns on first option found, if using RequireAllOptions, returns only if all options are found. The more specific, the more accurate the result will be * @return std::tuple * std::int32_t [0] = Index of the option that was found (-1 if the option wasn't found) * std::string [1] = Action that was found * std::string [2] = Target that was found * @see Menu::IndexOf(const std::string& Option) */ - static std::tuple FindOption(const std::vector& Options, bool RequireAll = true); + static std::tuple FindOption(const std::vector& Options, bool RequireAllOptions = false); /** * @brief Looks for a menu option containing the passed Option, and returns information of all options that were found @@ -183,14 +183,14 @@ class Menu /** * @brief Looks for a menu option containing the passed Option, and returns information of all options that were found * - * @param Options Menu options to look for, returns on first option found, the more specific, the more accurate the result will be + * @param Options Menu options to look for, returns on first option found, if using RequireAllOptions, returns only if all options are found. The more specific, the more accurate the result will be * @return std::vector> * std::int32_t [0] = Index of the option that was found (-1 if the option wasn't found) * std::string [1] = Action that was found * std::string [2] = Target that was found * @see Menu::IndexOf(const std::string& Option) */ - static std::vector> FindOptions(const std::vector& Options, bool RequireAll = true); + static std::vector> FindOptions(const std::vector& Options, bool RequireAllOptions = true); /** diff --git a/Include/Game/Tools/Interact.hpp b/Include/Game/Tools/Interact.hpp index 4b9f068..26afa92 100644 --- a/Include/Game/Tools/Interact.hpp +++ b/Include/Game/Tools/Interact.hpp @@ -20,15 +20,15 @@ class Interact static bool Click(const Point& P, const Button& B = BUTTON_LEFT); static bool Click(const Point& P, const std::string& Option); - static bool Click(const Point& P, const std::vector& Options); + static bool Click(const Point& P, const std::vector& Options, bool RequireAllOptions = false); static bool Click(const Box& B, const Button& Button = BUTTON_LEFT); static bool Click(const Box& B, const std::string& Option); - static bool Click(const Box& B, const std::vector& Options); + static bool Click(const Box& B, const std::vector& Options, bool RequireAllOptions = false); static bool Click(const Convex& C, const Button& B = BUTTON_LEFT); static bool Click(const Convex& C, const std::string& Option); - static bool Click(const Convex& C, const std::vector& Options); + static bool Click(const Convex& C, const std::vector& Options, bool RequireAllOptions = false); static bool Scroll(const ScrollDirection& Direction); static bool ScrollUntil(const ScrollDirection& Direction, std::int32_t Duration, const std::function& Func); diff --git a/Include/Game/Tools/Worlds.hpp b/Include/Game/Tools/Worlds.hpp index f95e45e..0f48f5e 100644 --- a/Include/Game/Tools/Worlds.hpp +++ b/Include/Game/Tools/Worlds.hpp @@ -13,7 +13,6 @@ class Worlds { public: static bool Refresh(); - static bool Refresh(bool ExitWorldSelection); static bool SwitchWorld(Internal::World World); static bool SwitchWorld(std::int32_t WorldID); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 07594e7..af0e8ce 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ