AlpacaBot
/
AlpacaLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Release 0.45

master
Kasi 2018-05-13 22:59:12 +01:00
parent a959448a94
commit 1659c0768b
14 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/Game/Interactable/DecorativeObject.hpp
View File

@ -32,7 +32,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const; bool Interact(const std::vector<std::string>& Options, bool RequireAllOptions = false) const;
operator Internal::DecorativeObject() const; operator Internal::DecorativeObject() const;
}; };

2
Include/Game/Interactable/GameObject.hpp
View File

@ -32,7 +32,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const; bool Interact(const std::vector<std::string>& Options, bool RequireAllOptions = false) const;
operator Internal::GameObject() const; operator Internal::GameObject() const;
}; };

2
Include/Game/Interactable/GroundItem.hpp
View File

@ -34,7 +34,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const; bool Interact(const std::vector<std::string>& Options, bool RequireAllOptions = false) const;
operator Internal::GroundItem() const; operator Internal::GroundItem() const;
}; };

2
Include/Game/Interactable/GroundObject.hpp
View File

@ -32,7 +32,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const; bool Interact(const std::vector<std::string>& Options, bool RequireAllOptions = false) const;
operator Internal::GroundObject() const; operator Internal::GroundObject() const;

2
Include/Game/Interactable/NPC.hpp
View File

@ -36,7 +36,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const; bool Interact(const std::vector<std::string>& Options, bool RequireAllOptions = false) const;
operator Internal::NPC() const; operator Internal::NPC() const;
}; };

2
Include/Game/Interactable/Player.hpp
View File

@ -35,7 +35,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const; bool Interact(const std::vector<std::string>& Options, bool RequireAllOptions = false) const;
operator Internal::Player() const; operator Internal::Player() const;
}; };

2
Include/Game/Interactable/WallObject.hpp
View File

@ -32,7 +32,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const; bool Interact(const std::vector<std::string>& Options, bool RequireAllOptions = false) const;
operator Internal::WallObject() const; operator Internal::WallObject() const;
}; };

2
Include/Game/Interactable/Widget.hpp
View File

@ -27,7 +27,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const; bool Interact(const std::vector<std::string>& Options, bool RequireAllOptions = false) const;
operator Internal::Widget() const; operator Internal::Widget() const;
}; };

6
Include/Game/Interfaces/GameTabs/Inventory.hpp
View File

@ -75,11 +75,11 @@ class Inventory
static bool ContainsOnly(const std::vector<std::string>& Names); static bool ContainsOnly(const std::vector<std::string>& Names);
static bool InteractItemByIndex(std::int32_t Index, const std::string& Option); static bool InteractItemByIndex(std::int32_t Index, const std::string& Option);
static bool InteractItemByIndex(std::int32_t Index, const std::vector<std::string>& Options); static bool InteractItemByIndex(std::int32_t Index, const std::vector<std::string>& Options, bool RequireAllOptions = false);
static bool InteractItem(std::int32_t ID, const std::string& Option); 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::string& Name, const std::string& Option);
static bool InteractItem(const std::vector<std::int32_t>& IDs, const std::vector<std::string>& Options); //Interacts with first found ID static bool InteractItem(const std::vector<std::int32_t>& IDs, const std::vector<std::string>& Options, bool RequireAllOptions = false); //Interacts with first found ID
static bool InteractItem(const std::vector<std::string>& Names, const std::vector<std::string>& Options); //Interacts with first found Name static bool InteractItem(const std::vector<std::string>& Names, const std::vector<std::string>& Options, bool RequireAllOptions = false); //Interacts with first found Name
static bool DropItemByIndex(std::int32_t Index, bool AllowShiftClick = true); static bool DropItemByIndex(std::int32_t Index, bool AllowShiftClick = true);
static bool DropItem(std::int32_t ID, bool AllowShiftClick = true); static bool DropItem(std::int32_t ID, bool AllowShiftClick = true);

9
Include/Game/Interfaces/Login.hpp
View File

@ -36,17 +36,16 @@ class Login
static LOGIN_SCREEN_STATE GetLoginScreenState(); static LOGIN_SCREEN_STATE GetLoginScreenState();
static bool IsWorldSelectOpen();
static bool CloseWorldSelect();
static bool LoginPlayer(); static bool LoginPlayer();
static bool EnterCredentials(); static bool EnterCredentials();
static bool IsWorldSelectOpen();
static bool OpenWorldSelect();
static bool CloseWorldSelect();
static bool SelectWorld(); static bool SelectWorld();
static bool SelectWorld(Internal::World World); static bool SelectWorld(Internal::World World);
static bool SelectWorld(std::int32_t WorldID); static bool SelectWorld(std::int32_t WorldID);
static bool OpenWorldSelect();
static bool OpenWorldSelect(bool Close);
/** /**
* @return X of where the login screen starts * @return X of where the login screen starts

8
Include/Game/Interfaces/Menu.hpp
View File

@ -159,14 +159,14 @@ class Menu
/** /**
* @brief Looks for a menu option containing the passed Option, and returns information about the found option * @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<bool, std::string, std::string> * @return std::tuple<bool, std::string, std::string>
* std::int32_t [0] = Index of the option that was found (-1 if the option wasn't found) * 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 [1] = Action that was found
* std::string [2] = Target that was found * std::string [2] = Target that was found
* @see Menu::IndexOf(const std::string& Option) * @see Menu::IndexOf(const std::string& Option)
*/ */
static std::tuple<std::int32_t, std::string, std::string> FindOption(const std::vector<std::string>& Options, bool RequireAll = true); static std::tuple<std::int32_t, std::string, std::string> FindOption(const std::vector<std::string>& Options, bool RequireAllOptions = false);
/** /**
* @brief Looks for a menu option containing the passed Option, and returns information of all options that were found * @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 * @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::tuple<std::int32_t, std::string, std::string>> * @return std::vector<std::tuple<std::int32_t, std::string, std::string>>
* std::int32_t [0] = Index of the option that was found (-1 if the option wasn't found) * 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 [1] = Action that was found
* std::string [2] = Target that was found * std::string [2] = Target that was found
* @see Menu::IndexOf(const std::string& Option) * @see Menu::IndexOf(const std::string& Option)
*/ */
static std::vector<std::tuple<std::int32_t, std::string, std::string>> FindOptions(const std::vector<std::string>& Options, bool RequireAll = true); static std::vector<std::tuple<std::int32_t, std::string, std::string>> FindOptions(const std::vector<std::string>& Options, bool RequireAllOptions = true);
/** /**

6
Include/Game/Tools/Interact.hpp
View File

@ -20,15 +20,15 @@ class Interact
static bool Click(const Point& P, const Button& B = BUTTON_LEFT); 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::string& Option);
static bool Click(const Point& P, const std::vector<std::string>& Options); static bool Click(const Point& P, const std::vector<std::string>& Options, bool RequireAllOptions = false);
static bool Click(const Box& B, const Button& Button = BUTTON_LEFT); 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::string& Option);
static bool Click(const Box& B, const std::vector<std::string>& Options); static bool Click(const Box& B, const std::vector<std::string>& Options, bool RequireAllOptions = false);
static bool Click(const Convex& C, const Button& B = BUTTON_LEFT); 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::string& Option);
static bool Click(const Convex& C, const std::vector<std::string>& Options); static bool Click(const Convex& C, const std::vector<std::string>& Options, bool RequireAllOptions = false);
static bool Scroll(const ScrollDirection& Direction); static bool Scroll(const ScrollDirection& Direction);
static bool ScrollUntil(const ScrollDirection& Direction, std::int32_t Duration, const std::function<bool()>& Func); static bool ScrollUntil(const ScrollDirection& Direction, std::int32_t Duration, const std::function<bool()>& Func);

1
Include/Game/Tools/Worlds.hpp
View File

@ -13,7 +13,6 @@ class Worlds
{ {
public: public:
static bool Refresh(); static bool Refresh();
static bool Refresh(bool ExitWorldSelection);
static bool SwitchWorld(Internal::World World); static bool SwitchWorld(Internal::World World);
static bool SwitchWorld(std::int32_t WorldID); static bool SwitchWorld(std::int32_t WorldID);

BIN
Library/libAlpacaLibrary.a
View File

Binary file not shown.