diff --git a/Include/Core/Globals.hpp b/Include/Core/Globals.hpp index b12ba34..a50548f 100644 --- a/Include/Core/Globals.hpp +++ b/Include/Core/Globals.hpp @@ -66,14 +66,14 @@ namespace Globals const std::int32_t BANK_PARENT = 12; const WidgetDef BANK_MAIN = { BANK_PARENT, 2 }; const WidgetDef BANK_CLOSE = { BANK_PARENT, 2, 11 }; - const WidgetDef BANK_DEPOSIT_ALL = { BANK_PARENT, 41 }; - const WidgetDef BANK_DEPOSIT_EQUIPMENT = { BANK_PARENT, 43 }; + const WidgetDef BANK_DEPOSIT_ALL = { BANK_PARENT, 40 }; + const WidgetDef BANK_DEPOSIT_EQUIPMENT = { BANK_PARENT, 42 }; const WidgetDef BANK_WITHDRAW_MODE_NOTED = { BANK_PARENT, 23 }; const WidgetDef BANK_WITHDRAW_MODE_ITEM = { BANK_PARENT, 21 }; const WidgetDef BANK_ITEM_CONTAINER_WIDGET = { BANK_PARENT, 11 }; // Used for scrolling, contains all items, middle of the bank interface const WidgetDef BANK_TABS_CONTAINER = { BANK_PARENT, 9 }; // Has all Tab children const WidgetDef BANK_INVENTORY = { 15, 3 }; // When the bank is open, the Inventory has it's own widgets for items - const std::int32_t BANK_WITHDRAW_QUANTITY_CHILDREN[5] = { 27, 29, 31, 33, 35 }; // 1, 5, 10, x, all, uses BANK_PARENT + const std::int32_t BANK_WITHDRAW_QUANTITY_CHILDREN[5] = { 27, 29, 31, 32, 35 }; // 1, 5, 10, x, all, uses BANK_PARENT const std::int32_t BANK_ENTER_PIN_PARENT = 213; const WidgetDef BANK_ENTER_PIN_STATUS = { BANK_ENTER_PIN_PARENT, 10 }; // Text widget, has FIRST, SECOND, THIRD, FOURTH, Submitting in it diff --git a/Include/Game/Interfaces/Mainscreen.hpp b/Include/Game/Interfaces/Mainscreen.hpp index d00a203..7e08b80 100644 --- a/Include/Game/Interfaces/Mainscreen.hpp +++ b/Include/Game/Interfaces/Mainscreen.hpp @@ -7,6 +7,7 @@ #include #include #include +#include /** * @brief A namespace containing various functions related to the Mainscreen @@ -135,6 +136,8 @@ namespace Mainscreen */ bool WaitUpTextContains(std::uint32_t Duration, std::uint32_t Step, const std::vector& UpTexts); + bool IsTileOn(const Tile& T); + /** * @brief Clicks on a tile on the %mainscreen * @return True if the tile was clicked @@ -142,6 +145,10 @@ namespace Mainscreen */ bool ClickTile(const Tile& T); + bool WalkPath(const std::vector& Path, std::int32_t Distance, std::function Func); + + bool WalkPath(const std::vector& Path, std::int32_t Distance); + std::vector GetBlockingWidgetBoxes(); } diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index fd0dd78..75dc04e 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ