diff --git a/Include/Core/Classes/Widget.hpp b/Include/Core/Classes/Widget.hpp index 5655675..fe80154 100644 --- a/Include/Core/Classes/Widget.hpp +++ b/Include/Core/Classes/Widget.hpp @@ -34,6 +34,7 @@ namespace Internal std::vector GetItemAmounts() const; std::int32_t GetItemID() const; std::vector GetItemIDs() const; + std::int32_t GetModelID() const; std::string GetName() const; bool GetNoClickThrough() const; Widget GetParent() const; diff --git a/Include/Core/Globals.hpp b/Include/Core/Globals.hpp index 1da797e..30f5842 100644 --- a/Include/Core/Globals.hpp +++ b/Include/Core/Globals.hpp @@ -40,6 +40,21 @@ namespace Globals const SettingsDef SETTING_SHIFT_CLICK_DROP = { 1055, 17 }; const SettingsDef SETTING_SCROLL_WHEEL_TO_ZOOM = { 1055, 29 }; + const SettingsDef SETTING_COMBAT_TAB_HOTKEY = { 1224, 0 }; + const SettingsDef SETTING_STATS_TAB_HOTKEY = { 1224, 5 }; + const SettingsDef SETTING_QUESTS_TAB_HOTKEY = { 1224, 10 }; + const SettingsDef SETTING_INVENTORY_TAB_HOTKEY = { 1224, 15 }; + const SettingsDef SETTING_EQUIPMENT_TAB_HOTKEY = { 1224, 20 }; + const SettingsDef SETTING_PRAYER_TAB_HOTKEY = { 1224, 25 }; + const SettingsDef SETTING_MAGIC_TAB_HOTKEY = { 1225, 0 }; + const SettingsDef SETTING_CLAN_TAB_HOTKEY = { 1225, 5 }; + const SettingsDef SETTING_FRIENDS_TAB_HOTKEY = { 1225, 10 }; + const SettingsDef SETTING_ACCOUNT_TAB_HOTKEY = { 1225, 15 }; + const SettingsDef SETTING_OPTIONS_TAB_HOTKEY = { 1225, 20 }; + const SettingsDef SETTING_EMOTE_TAB_HOTKEY = { 1225, 25 }; + const SettingsDef SETTING_MUSIC_TAB_HOTKEY = { 1226, 0 }; + const SettingsDef SETTING_LOGOUT_TAB_HOTKEY = { 1226, 5 }; + const std::int32_t WIDGET_ROOT_LOBBY = 165; const std::int32_t WIDGET_ROOT_FIXED = 548; const std::int32_t WIDGET_ROOT_RESIZABLE = 161; @@ -219,7 +234,7 @@ namespace Globals const WidgetDef INVENTORY_ITEM_CONTAINER_WIDGET = { 149, 0 }; const WidgetDef INVENTORY_TRADE_CONTAINER_WIDGET = { 336, 0 }; // Used for GetSlotBoxes() const WidgetDef INVENTORY_EXCHANGE_CONTAINER_WIDGET = { 467, 0 }; // Used for GetSlotBoxes() - const std::int32_t INVENTORY_CONTAINER_ID = 93; + const std::int32_t INVENTORY_CONTAINER_ID = 93; //************ Logout.cpp ************// const std::int32_t LOGOUT_BUTTONS_PARENT = 182; @@ -435,6 +450,7 @@ namespace Globals //************ Prayer.cpp ************// const std::int32_t PRAYER_PRAYERS_PARENT = 541; // To be used with PrayerDefs + typedef struct PrayerDef { std::string Name; diff --git a/Include/Core/Types/Wireframe.hpp b/Include/Core/Types/Wireframe.hpp index 728d094..a89e127 100644 --- a/Include/Core/Types/Wireframe.hpp +++ b/Include/Core/Types/Wireframe.hpp @@ -17,7 +17,7 @@ class Wireframe Point GetHybridRandomPoint(double ProbabilityX, double ProbabilityY, double StandardDeviationX, double StandardDeviationY, double PointGenAccuracy) const; Point GetProfileHybridRandomPoint() const; Point GetProfileHybridRandomPoint(double PointGenAccuracy) const; - Point GetHighPrecisionPoint() const; + Point GetHighPrecisionPoint(double Deviation = 0.50) const; Box GetBox() const; Convex GetConvex() const; bool Contains(const Point& P) const; diff --git a/Include/Game/Interfaces/GameTabs/AccountManagement.hpp b/Include/Game/Interfaces/GameTabs/AccountManagement.hpp index 1c9c45f..3189f1b 100644 --- a/Include/Game/Interfaces/GameTabs/AccountManagement.hpp +++ b/Include/Game/Interfaces/GameTabs/AccountManagement.hpp @@ -1,12 +1,15 @@ #ifndef ACCOUNTMANAGEMENT_HPP_INCLUDED #define ACCOUNTMANAGEMENT_HPP_INCLUDED +#include + /** @addtogroup GameTabs * @{ */ namespace AccountManagement { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); } /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Clan.hpp b/Include/Game/Interfaces/GameTabs/Clan.hpp index 5d71b73..b490c74 100644 --- a/Include/Game/Interfaces/GameTabs/Clan.hpp +++ b/Include/Game/Interfaces/GameTabs/Clan.hpp @@ -11,6 +11,7 @@ namespace Clan { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); std::vector GetAll(); std::vector GetAll(const std::function& Filter); } diff --git a/Include/Game/Interfaces/GameTabs/Combat.hpp b/Include/Game/Interfaces/GameTabs/Combat.hpp index 97b8680..0ba4357 100644 --- a/Include/Game/Interfaces/GameTabs/Combat.hpp +++ b/Include/Game/Interfaces/GameTabs/Combat.hpp @@ -10,9 +10,11 @@ namespace Combat { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); std::int32_t GetHealth(); std::int32_t GetMaxHealth(); + double GetHealthPercentage(); std::int32_t GetSpecialAttack(); bool IsSpecialAttacking(); diff --git a/Include/Game/Interfaces/GameTabs/Emotes.hpp b/Include/Game/Interfaces/GameTabs/Emotes.hpp index 363fa73..8d4563e 100644 --- a/Include/Game/Interfaces/GameTabs/Emotes.hpp +++ b/Include/Game/Interfaces/GameTabs/Emotes.hpp @@ -1,12 +1,15 @@ #ifndef EMOTES_HPP_INCLUDED #define EMOTES_HPP_INCLUDED +#include + /** @addtogroup GameTabs * @{ */ namespace Emotes { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); } /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Equipment.hpp b/Include/Game/Interfaces/GameTabs/Equipment.hpp index ed66cc2..d6832b0 100644 --- a/Include/Game/Interfaces/GameTabs/Equipment.hpp +++ b/Include/Game/Interfaces/GameTabs/Equipment.hpp @@ -29,6 +29,7 @@ namespace Equipment bool IsOpen(); bool Open(); bool IsEmpty(); + std::int32_t GetTabHotkey(); std::vector GetItemIDs(); std::vector GetItemNames(); diff --git a/Include/Game/Interfaces/GameTabs/Friends.hpp b/Include/Game/Interfaces/GameTabs/Friends.hpp index d67fff7..0e6d160 100644 --- a/Include/Game/Interfaces/GameTabs/Friends.hpp +++ b/Include/Game/Interfaces/GameTabs/Friends.hpp @@ -11,6 +11,7 @@ namespace Friends { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); std::vector GetAll(); std::vector GetAll(const std::function& Filter); } diff --git a/Include/Game/Interfaces/GameTabs/Ignores.hpp b/Include/Game/Interfaces/GameTabs/Ignores.hpp index 41f2902..a7315b9 100644 --- a/Include/Game/Interfaces/GameTabs/Ignores.hpp +++ b/Include/Game/Interfaces/GameTabs/Ignores.hpp @@ -11,6 +11,7 @@ namespace Ignores { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); std::vector GetAll(); std::vector GetAll(const std::function& Filter); } diff --git a/Include/Game/Interfaces/GameTabs/Inventory.hpp b/Include/Game/Interfaces/GameTabs/Inventory.hpp index e9a270e..f118e6e 100644 --- a/Include/Game/Interfaces/GameTabs/Inventory.hpp +++ b/Include/Game/Interfaces/GameTabs/Inventory.hpp @@ -15,6 +15,7 @@ namespace Inventory { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); std::vector GetItemIDs(); std::vector GetItemNames(); diff --git a/Include/Game/Interfaces/GameTabs/Logout.hpp b/Include/Game/Interfaces/GameTabs/Logout.hpp index 0d9b31e..80e006d 100644 --- a/Include/Game/Interfaces/GameTabs/Logout.hpp +++ b/Include/Game/Interfaces/GameTabs/Logout.hpp @@ -13,6 +13,7 @@ namespace Logout { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); bool LogoutPlayer(); bool IsWorldSwitcherOpen(bool WaitToLoadWorlds = true); diff --git a/Include/Game/Interfaces/GameTabs/Magic.hpp b/Include/Game/Interfaces/GameTabs/Magic.hpp index f966f34..89dfe7d 100644 --- a/Include/Game/Interfaces/GameTabs/Magic.hpp +++ b/Include/Game/Interfaces/GameTabs/Magic.hpp @@ -196,6 +196,7 @@ namespace Magic bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); bool HasLevel(const SPELL& Spell); diff --git a/Include/Game/Interfaces/GameTabs/Music.hpp b/Include/Game/Interfaces/GameTabs/Music.hpp index f444099..01535d6 100644 --- a/Include/Game/Interfaces/GameTabs/Music.hpp +++ b/Include/Game/Interfaces/GameTabs/Music.hpp @@ -1,12 +1,15 @@ #ifndef MUSIC_HPP_INCLUDED #define MUSIC_HPP_INCLUDED +#include + /** @addtogroup GameTabs * @{ */ namespace Music { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); } /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Options.hpp b/Include/Game/Interfaces/GameTabs/Options.hpp index d26d0eb..ff8aa7f 100644 --- a/Include/Game/Interfaces/GameTabs/Options.hpp +++ b/Include/Game/Interfaces/GameTabs/Options.hpp @@ -1,12 +1,15 @@ #ifndef OPTIONS_HPP_INCLUDED #define OPTIONS_HPP_INCLUDED +#include + /** @addtogroup GameTabs * @{ */ namespace Options { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); bool GetAcceptAid(); bool ToggleAcceptAid(bool Toggle); diff --git a/Include/Game/Interfaces/GameTabs/Prayer.hpp b/Include/Game/Interfaces/GameTabs/Prayer.hpp index 8a77d0b..c0965ff 100644 --- a/Include/Game/Interfaces/GameTabs/Prayer.hpp +++ b/Include/Game/Interfaces/GameTabs/Prayer.hpp @@ -43,6 +43,7 @@ namespace Prayer bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); std::int32_t GetPoints(); bool HasLevel(PRAYERS Prayer); bool IsActive(PRAYERS Prayer); diff --git a/Include/Game/Interfaces/GameTabs/Quests.hpp b/Include/Game/Interfaces/GameTabs/Quests.hpp index bc229a0..3f920d0 100644 --- a/Include/Game/Interfaces/GameTabs/Quests.hpp +++ b/Include/Game/Interfaces/GameTabs/Quests.hpp @@ -1,12 +1,15 @@ #ifndef QUESTS_HPP_INCLUDED #define QUESTS_HPP_INCLUDED +#include + /** @addtogroup GameTabs * @{ */ namespace Quests { bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); } /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Stats.hpp b/Include/Game/Interfaces/GameTabs/Stats.hpp index a23fad7..49f1cc6 100644 --- a/Include/Game/Interfaces/GameTabs/Stats.hpp +++ b/Include/Game/Interfaces/GameTabs/Stats.hpp @@ -37,6 +37,7 @@ namespace Stats bool IsOpen(); bool Open(); + std::int32_t GetTabHotkey(); std::int32_t GetWeight(); std::int32_t GetRunEnergy(); std::int32_t GetCurrentLevel(SKILLS Skill); diff --git a/Include/Game/Tools/Settings.hpp b/Include/Game/Tools/Settings.hpp index 35fab36..2fd4dbc 100644 --- a/Include/Game/Tools/Settings.hpp +++ b/Include/Game/Tools/Settings.hpp @@ -16,6 +16,27 @@ namespace Settings std::int32_t GetScreenType(); + + typedef enum GAMETAB + { + TAB_ACCOUNT, + TAB_CLAN, + TAB_COMBAT, + TAB_EMOTES, + TAB_EQUIPMENT, + TAB_FRIENDS, + TAB_IGNORES, + TAB_INVENTORY, + TAB_LOGOUT, + TAB_MAGIC, + TAB_MUSIC, + TAB_OPTIONS, + TAB_PRAYER, + TAB_QUESTS, + TAB_STATS + } GAMETAB; + std::int32_t GetGametabHotkey(GAMETAB Tab); + bool IsEscToCloseInterfacesOn(); bool IsShiftClickToDropOn(); bool IsScrollToZoomOn(); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index de9b353..2406569 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ