diff --git a/Include/Core/Globals.hpp b/Include/Core/Globals.hpp index a50548f..63edaba 100644 --- a/Include/Core/Globals.hpp +++ b/Include/Core/Globals.hpp @@ -142,9 +142,9 @@ namespace Globals //************ Minimap.cpp ************// // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - const WidgetDef MINIMAP_MIDDLE[3] = { { 548, 8 }, { 161, 26 }, { 164, 26 } }; - const WidgetDef MINIMAP_COMPASS[3] = { { 548, 7 }, { 161, 25 }, { 164, 25 } }; - const WidgetDef MINIMAP_CURE = { 160, 4 }; + const WidgetDef MINIMAP_MIDDLE[3] = { { 548, 8 }, { 161, 27 }, { 164, 27 } }; + const WidgetDef MINIMAP_COMPASS[3] = { { 548, 7 }, { 161, 26 }, { 164, 26 } }; + const WidgetDef MINIMAP_CURE = { 160, 6 }; const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 14 }; const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 22 }; const WidgetDef MINIMAP_SPECIAL_ATTACK = { 160, 28 }; @@ -197,27 +197,25 @@ namespace Globals // These are the "Sprite" widgets, these widgets' sprite IDs change when opened or closed // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels + const WidgetDef TAB_COMBAT[3] = { { 548, 50 }, { 161, 53 }, { 164, 52 } }; + const WidgetDef TAB_STATS[3] = { { 548, 51 }, { 161, 54 }, { 164, 53 } }; + const WidgetDef TAB_QUESTS[3] = { { 548, 52 }, { 161, 55 }, { 164, 54 } }; + const WidgetDef TAB_INVENTORY[3] = { { 548, 53 }, { 161, 56 }, { 164, 55 } }; + const WidgetDef TAB_EQUIPMENT[3] = { { 548, 54 }, { 161, 57 }, { 164, 56 } }; + const WidgetDef TAB_PRAYER[3] = { { 548, 55 }, { 161, 58 }, { 164, 57 } }; + const WidgetDef TAB_MAGIC[3] = { { 548, 56 }, { 161, 59 }, { 164, 58 } }; - - const WidgetDef TAB_COMBAT[3] = { { 548, 49 }, { 161, 52 }, { 164, 51 } }; - const WidgetDef TAB_STATS[3] = { { 548, 50 }, { 161, 53 }, { 164, 52 } }; - const WidgetDef TAB_QUESTS[3] = { { 548, 51 }, { 161, 54 }, { 164, 53 } }; - const WidgetDef TAB_INVENTORY[3] = { { 548, 52 }, { 161, 55 }, { 164, 54 } }; - const WidgetDef TAB_EQUIPMENT[3] = { { 548, 53 }, { 161, 56 }, { 164, 55 } }; - const WidgetDef TAB_PRAYER[3] = { { 548, 54 }, { 161, 57 }, { 164, 56 } }; - const WidgetDef TAB_MAGIC[3] = { { 548, 55 }, { 161, 58 }, { 164, 57 } }; - - const WidgetDef TAB_CLAN[3] = { { 548, 32 }, { 161, 36 }, { 164, 36 } }; - const WidgetDef TAB_FRIENDS[3] = { { 548, 34 }, { 161, 38 }, { 164, 38 } }; - const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { 548, 33 }, { 161, 37 }, { 164, 37 } }; - const WidgetDef TAB_LOGOUT[3] = { { 548, 35 }, { 161, 39 }, { 164, 30 } }; - const WidgetDef TAB_OPTIONS[3] = { { 548, 36 }, { 161, 40 }, { 164, 39 } }; - const WidgetDef TAB_EMOTES[3] = { { 548, 37 }, { 161, 41 }, { 164, 40 } }; - const WidgetDef TAB_MUSIC[3] = { { 548, 38 }, { 161, 42 }, { 164, 41 } }; + const WidgetDef TAB_CLAN[3] = { { 548, 33 }, { 161, 37 }, { 164, 37 } }; + const WidgetDef TAB_FRIENDS[3] = { { 548, 35 }, { 161, 39 }, { 164, 39 } }; + const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { 548, 34 }, { 161, 38 }, { 164, 38 } }; + const WidgetDef TAB_LOGOUT[3] = { { 548, 36 }, { 161, 40 }, { 164, 31 } }; + const WidgetDef TAB_OPTIONS[3] = { { 548, 37 }, { 161, 41 }, { 164, 40 } }; + const WidgetDef TAB_EMOTES[3] = { { 548, 38 }, { 161, 42 }, { 164, 41 } }; + const WidgetDef TAB_MUSIC[3] = { { 548, 39 }, { 161, 43 }, { 164, 42 } }; //************ Combat.cpp ************// - const std::int32_t COMBAT_PARENT = 593 ; + 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 diff --git a/Include/Game/Interfaces/GameTabs/Combat.hpp b/Include/Game/Interfaces/GameTabs/Combat.hpp index 8499cde..c5d059d 100644 --- a/Include/Game/Interfaces/GameTabs/Combat.hpp +++ b/Include/Game/Interfaces/GameTabs/Combat.hpp @@ -21,6 +21,8 @@ namespace Combat bool IsPoisoned(); bool HasPoisonImmunity(); + bool IsEnvenomed(); + bool IsAutoRetaliating(); bool ToggleAutoRetaliate(bool Toggle); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 75dc04e..32c2a33 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ