diff --git a/Include/Core/Globals.hpp b/Include/Core/Globals.hpp index 63edaba..f7975bc 100644 --- a/Include/Core/Globals.hpp +++ b/Include/Core/Globals.hpp @@ -61,27 +61,37 @@ namespace Globals const std::int32_t WIDGET_ROOT_RESIZABLE_SIDE_PANELS = 164; //************ Bank.cpp ************// - const std::int32_t BANK_ITEM_CONTAINER_ID = 95; - const std::int32_t BANK_SPRITE_ID_CURRENT_TAB = 1079; - 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, 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, 32, 35 }; // 1, 5, 10, x, all, uses BANK_PARENT + const std::int32_t BANK_ITEM_CONTAINER_ID = 95; + const std::int32_t BANK_SPRITE_ID_CURRENT_TAB = 1079; + 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_TABS_CONTAINER = { BANK_PARENT, 10 }; // Has all Tab children + const WidgetDef BANK_ITEM_CONTAINER_WIDGET = { BANK_PARENT, 12 }; // Used for scrolling, contains all items, middle of the bank interface + + const WidgetDef BANK_REARRANGE_MODE_SWAP = { BANK_PARENT, 16 }; + const WidgetDef BANK_REARRANGE_MODE_INSERT = { BANK_PARENT, 18 }; + const WidgetDef BANK_WITHDRAW_MODE_ITEM = { BANK_PARENT, 21 }; + const WidgetDef BANK_WITHDRAW_MODE_NOTED = { BANK_PARENT, 23 }; + const std::int32_t BANK_WITHDRAW_QUANTITY_CHILDREN[5] = { 27, 29, 31, 33, 35 }; // 1, 5, 10, x, all, uses BANK_PARENT + const WidgetDef BANK_SET_PLACEHOLDERS = { BANK_PARENT, 38 }; + const WidgetDef BANK_SEARCH = { BANK_PARENT, 40 }; + const WidgetDef BANK_DEPOSIT_ALL = { BANK_PARENT, 42 }; + const WidgetDef BANK_DEPOSIT_EQUIPMENT = { BANK_PARENT, 44 }; + + 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_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 const std::int32_t BANK_ENTER_PIN_BUTTON_CHILDREN[10] = { 16, 18, 20, 22, 24, 26, 28, 30, 32, 34 }; // Buttons themselves, uses BANK_ENTER_PIN_PARENT, + // grandchild 0 = proper widget bounds, grandchild 1 = text //************ Chat.cpp ************// const WidgetDef CHAT_DIALOGUE_NEST_PARENT = { 162, 37 }; + const WidgetDef CHAT_DIALOGUE_IDLE = { 162, 57 }; //************ CollectionBox.cpp ************// const std::int32_t COLLECTION_BOX_PARENT = 402; @@ -483,8 +493,8 @@ namespace Globals { "Retribution", 15, 20, 131, 46 }, { "Redemption", 16, 21, 130, 49 }, { "Smite", 17, 22, 132, 52 }, - { "Preserve", 29, 33, 947, 55 }, - { "Chivalry", 25, 28, 945, 60 }, + { "Preserve", 28, 33, 947, 55 }, + { "Chivalry", 25, 29, 945, 60 }, { "Piety", 26, 30, 946, 70 }, { "Rigour", 24, 31, 1420, 74 }, { "Augury", 27, 32, 1421, 77 } diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 1858f6e..2e5ba6d 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -112,6 +112,7 @@ namespace Internal Cache GetAnimationCache(); AbstractBufferProvider GetBufferProvider(); + bool GetCameraLocked(); std::int32_t GetCameraPitch(); std::int32_t GetCameraX(); std::int32_t GetCameraY(); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 4599c7c..360e75d 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ