diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index adb737d..98aa7ea 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -152,12 +152,12 @@ namespace Globals //************ Minimap.cpp ************// // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - const WidgetDef MINIMAP_MIDDLE[3] = { { WIDGET_ROOT_FIXED, 8 }, { WIDGET_ROOT_RESIZABLE, 34 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 34 } }; - const WidgetDef MINIMAP_COMPASS[3] = { { WIDGET_ROOT_FIXED, 7 }, { WIDGET_ROOT_RESIZABLE, 33 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 33 } }; - const WidgetDef MINIMAP_CURE = { 160, 12 }; - const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 20 }; - const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 28 }; - const WidgetDef MINIMAP_SPECIAL_ATTACK = { 160, 37 }; + const WidgetDef MINIMAP_MIDDLE[3] = { { WIDGET_ROOT_FIXED, 21 }, { WIDGET_ROOT_RESIZABLE, 29 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 29 } }; + const WidgetDef MINIMAP_COMPASS[3] = { { WIDGET_ROOT_FIXED, 23 }, { WIDGET_ROOT_RESIZABLE, 28 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 28 } }; + const WidgetDef MINIMAP_CURE = { 160, 4 }; + const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 15 }; + const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 23 }; + const WidgetDef MINIMAP_SPECIAL_ATTACK = { 160, 31 }; //************ Trade.cpp ************// const WidgetDef TRADE_SCREEN = { 335, 3 }; @@ -204,34 +204,32 @@ namespace Globals namespace GameTabs { //************************************ Tabs ************************************// - // These are the "Sprite" widgets, these widgets' sprite IDs change when opened or closed + // These are the "Sprite" widgets, these widgets' sprite IDs change when opened or closed (usually the lower number) // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels + const WidgetDef TAB_CLAN[3] = { { WIDGET_ROOT_FIXED, 46 }, { WIDGET_ROOT_RESIZABLE, 42 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 37 } }; + const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { WIDGET_ROOT_FIXED, 47 }, { WIDGET_ROOT_RESIZABLE, 43 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 38 } }; + const WidgetDef TAB_IGNORES[3] = { { WIDGET_ROOT_FIXED, 48 }, { WIDGET_ROOT_RESIZABLE, 44 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 39 } }; + const WidgetDef TAB_FRIENDS[3] = { { WIDGET_ROOT_FIXED, 48 }, { WIDGET_ROOT_RESIZABLE, 44 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 39 } }; + const WidgetDef TAB_LOGOUT[3] = { { WIDGET_ROOT_FIXED, 49 }, { WIDGET_ROOT_RESIZABLE, 45 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 33 } }; + const WidgetDef TAB_OPTIONS[3] = { { WIDGET_ROOT_FIXED, 50 }, { WIDGET_ROOT_RESIZABLE, 46 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 40 } }; + const WidgetDef TAB_EMOTES[3] = { { WIDGET_ROOT_FIXED, 51 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 41 } }; + const WidgetDef TAB_MUSIC[3] = { { WIDGET_ROOT_FIXED, 52 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 42 } }; - const WidgetDef TAB_CLAN[3] = { { WIDGET_ROOT_FIXED, 39 }, { WIDGET_ROOT_RESIZABLE, 46 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 44 } }; - const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { WIDGET_ROOT_FIXED, 40 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 45 } }; - const WidgetDef TAB_IGNORES[3] = { { WIDGET_ROOT_FIXED, 41 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 46 } }; - const WidgetDef TAB_FRIENDS[3] = { { WIDGET_ROOT_FIXED, 41 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 46 } }; - const WidgetDef TAB_LOGOUT[3] = { { WIDGET_ROOT_FIXED, 42 }, { WIDGET_ROOT_RESIZABLE, 49 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 38 } }; - const WidgetDef TAB_OPTIONS[3] = { { WIDGET_ROOT_FIXED, 43 }, { WIDGET_ROOT_RESIZABLE, 50 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 47 } }; - const WidgetDef TAB_EMOTES[3] = { { WIDGET_ROOT_FIXED, 44 }, { WIDGET_ROOT_RESIZABLE, 51 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 48 } }; - const WidgetDef TAB_MUSIC[3] = { { WIDGET_ROOT_FIXED, 45 }, { WIDGET_ROOT_RESIZABLE, 52 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 49 } }; - - - const WidgetDef TAB_COMBAT[3] = { { WIDGET_ROOT_FIXED, 56 }, { WIDGET_ROOT_RESIZABLE, 62 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 59 } }; - const WidgetDef TAB_STATS[3] = { { WIDGET_ROOT_FIXED, 57 }, { WIDGET_ROOT_RESIZABLE, 63 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 60 } }; - const WidgetDef TAB_QUESTS[3] = { { WIDGET_ROOT_FIXED, 58 }, { WIDGET_ROOT_RESIZABLE, 64 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 61 } }; - const WidgetDef TAB_INVENTORY[3] = { { WIDGET_ROOT_FIXED, 59 }, { WIDGET_ROOT_RESIZABLE, 65 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 62 } }; - const WidgetDef TAB_EQUIPMENT[3] = { { WIDGET_ROOT_FIXED, 60 }, { WIDGET_ROOT_RESIZABLE, 66 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 63 } }; - const WidgetDef TAB_PRAYER[3] = { { WIDGET_ROOT_FIXED, 61 }, { WIDGET_ROOT_RESIZABLE, 67 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 64 } }; - const WidgetDef TAB_MAGIC[3] = { { WIDGET_ROOT_FIXED, 62 }, { WIDGET_ROOT_RESIZABLE, 68 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 65 } }; + const WidgetDef TAB_COMBAT[3] = { { WIDGET_ROOT_FIXED, 62 }, { WIDGET_ROOT_RESIZABLE, 58 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 51 } }; + const WidgetDef TAB_STATS[3] = { { WIDGET_ROOT_FIXED, 63 }, { WIDGET_ROOT_RESIZABLE, 59 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 52 } }; + const WidgetDef TAB_QUESTS[3] = { { WIDGET_ROOT_FIXED, 64 }, { WIDGET_ROOT_RESIZABLE, 60 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 53 } }; + const WidgetDef TAB_INVENTORY[3] = { { WIDGET_ROOT_FIXED, 65 }, { WIDGET_ROOT_RESIZABLE, 61 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 54 } }; + const WidgetDef TAB_EQUIPMENT[3] = { { WIDGET_ROOT_FIXED, 66 }, { WIDGET_ROOT_RESIZABLE, 62 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 55 } }; + const WidgetDef TAB_PRAYER[3] = { { WIDGET_ROOT_FIXED, 67 }, { WIDGET_ROOT_RESIZABLE, 63 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 56 } }; + const WidgetDef TAB_MAGIC[3] = { { WIDGET_ROOT_FIXED, 68 }, { WIDGET_ROOT_RESIZABLE, 64 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 57 } }; //************ Combat.cpp ************// const std::int32_t COMBAT_PARENT = 593; - const WidgetDef COMBAT_AUTORETALIATE = { COMBAT_PARENT, 30 }; - const WidgetDef COMBAT_SPECIAL = { COMBAT_PARENT, 36 }; - const std::int32_t COMBAT_STYLE_CHILDREN[4] = { 4, 8, 12, 16 }; // Uses COMBAT_PARENT as Parent + const WidgetDef COMBAT_AUTORETALIATE = { COMBAT_PARENT, 34 }; + const WidgetDef COMBAT_SPECIAL = { COMBAT_PARENT, 40 }; + const std::int32_t COMBAT_STYLE_CHILDREN[4] = { 4, 8, 12, 16 }; // Uses COMBAT_PARENT as Parent BROKEN //************ Equipment.cpp ************// const std::int32_t EQUIPMENT_CONTAINER_ID = 94; @@ -244,13 +242,13 @@ namespace Globals //************ Logout.cpp ************// const std::int32_t LOGOUT_BUTTONS_PARENT = 182; - const WidgetDef LOGOUT_LOGOUT_BUTTON = { LOGOUT_BUTTONS_PARENT, 8 }; - const WidgetDef LOGOUT_WORLD_SWITCHER_BUTTON = { LOGOUT_BUTTONS_PARENT, 3 }; + const WidgetDef LOGOUT_LOGOUT_BUTTON = { LOGOUT_BUTTONS_PARENT, 12 }; + const WidgetDef LOGOUT_WORLD_SWITCHER_BUTTON = { LOGOUT_BUTTONS_PARENT, 7 }; const std::int32_t LOGOUT_WORLD_SWITCHER_PARENT = 69; const WidgetDef LOGOUT_WORLD_SWITCHER_TITLE = { LOGOUT_WORLD_SWITCHER_PARENT, 2 }; // "Current World:" or "Loading" when loading const WidgetDef LOGOUT_WORLD_SWITCHER_LOGOUT = { LOGOUT_WORLD_SWITCHER_PARENT, 23 }; // Logout button inside the World Switch interface - const WidgetDef LOGOUT_WORLD_SWITCHER_WORLDS_CONTAINER = { LOGOUT_WORLD_SWITCHER_PARENT, 16 }; // 69, 15, 301 (world id) Widget has the proper switch/favorite options - const WidgetDef LOGOUT_WORLD_SWITCHER_WORLDS_BOX = { LOGOUT_WORLD_SWITCHER_PARENT, 5 }; // Bounds/Box containing the entire list + const WidgetDef LOGOUT_WORLD_SWITCHER_WORLDS_CONTAINER = { LOGOUT_WORLD_SWITCHER_PARENT, 17 }; // 69, 15, 301 (world id) Widget has the proper switch/favorite options + const WidgetDef LOGOUT_WORLD_SWITCHER_WORLDS_BOX = { LOGOUT_WORLD_SWITCHER_PARENT, 8 }; // Bounds/Box containing the entire list //************ Magic.cpp ************// const std::int32_t MAGIC_SPELLS_PARENT = 218; // Used with Magic spell defs @@ -454,9 +452,9 @@ namespace Globals }; //************ Options.cpp ************// - const std::int32_t OPTIONS_PARENT = 261; - const WidgetDef OPTIONS_ACCEPT_AID = { OPTIONS_PARENT, 100 }; - const WidgetDef OPTIONS_RUN_MODE = { OPTIONS_PARENT, 103 }; + const std::int32_t OPTIONS_PARENT = 116; + const WidgetDef OPTIONS_ACCEPT_AID = { OPTIONS_PARENT, 70 }; + const WidgetDef OPTIONS_RUN_MODE = { OPTIONS_PARENT, 71 }; //************ Prayer.cpp ************// const std::int32_t PRAYER_PRAYERS_PARENT = 541; // To be used with PrayerDefs diff --git a/Include/Game/Interfaces/Minimap.hpp b/Include/Game/Interfaces/Minimap.hpp index b748079..50b12ce 100644 --- a/Include/Game/Interfaces/Minimap.hpp +++ b/Include/Game/Interfaces/Minimap.hpp @@ -21,6 +21,9 @@ namespace Minimap * @return the plane the local player is on */ std::int32_t GetPlane(); + + std::int32_t GetRegionID(); + /** * @brief Returns the tile the local player is on * diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index ff2b5c3..c1e5c66 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ