Release 1.38

master
Kasi 2019-11-20 02:17:31 +00:00
parent 7b3a303b20
commit 62edd81180
11 changed files with 255 additions and 198 deletions

View File

@ -39,6 +39,10 @@ namespace Debug
void Clear(); void Clear();
void Screenshot(const std::string& Path); void Screenshot(const std::string& Path);
void SetSleepMultiplier(std::int32_t Multiplier); void SetSleepMultiplier(std::int32_t Multiplier);
void EnableBlit();
void DisableBlit();
} }

View File

@ -83,6 +83,13 @@ namespace Globals
//************ Chat.cpp ************// //************ Chat.cpp ************//
const WidgetDef CHAT_DIALOGUE_NEST_PARENT = { 162, 37 }; const WidgetDef CHAT_DIALOGUE_NEST_PARENT = { 162, 37 };
//************ CollectionBox.cpp ************//
const std::int32_t COLLECTION_BOX_PARENT = 402;
const WidgetDef COLLECTION_BOX_MAIN = {COLLECTION_BOX_PARENT, 2, 0};
const WidgetDef COLLECTION_BOX_CLOSE = {COLLECTION_BOX_PARENT, 2, 11};
const WidgetDef COLLECTION_BOX_COLLECT_TO_BANK = {COLLECTION_BOX_PARENT, 4, 1};
const WidgetDef COLLECTION_BOX_COLLECT_TO_INV = {COLLECTION_BOX_PARENT, 3, 1};
//************ DepositBox.cpp ************// //************ DepositBox.cpp ************//
const std::int32_t DEPOSIT_BOX_PARENT = 192; const std::int32_t DEPOSIT_BOX_PARENT = 192;
const WidgetDef DEPOSIT_BOX_CLOSE = { DEPOSIT_BOX_PARENT, 1, 11 }; const WidgetDef DEPOSIT_BOX_CLOSE = { DEPOSIT_BOX_PARENT, 1, 11 };
@ -135,8 +142,8 @@ namespace Globals
//************ Minimap.cpp ************// //************ Minimap.cpp ************//
// 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels
const WidgetDef MINIMAP_MIDDLE[3] = { { 548, 8 }, { 161, 25 }, { 164, 25 } }; const WidgetDef MINIMAP_MIDDLE[3] = { { 548, 8 }, { 161, 26 }, { 164, 26 } };
const WidgetDef MINIMAP_COMPASS[3] = { { 548, 7 }, { 161, 24 }, { 164, 24 } }; const WidgetDef MINIMAP_COMPASS[3] = { { 548, 7 }, { 161, 25 }, { 164, 25 } };
const WidgetDef MINIMAP_CURE = { 160, 4 }; const WidgetDef MINIMAP_CURE = { 160, 4 };
const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 14 }; const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 14 };
const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 22 }; const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 22 };
@ -189,20 +196,25 @@ namespace Globals
//************************************ Tabs ************************************// //************************************ 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
// 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels
const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { 548, 32 }, { 161, 36 }, { 164, 36 } };
const WidgetDef TAB_CLAN[3] = { { 548, 31 }, { 161, 35 }, { 164, 35 } };
const WidgetDef TAB_COMBAT[3] = { { 548, 48 }, { 161, 51 }, { 164, 50 } };
const WidgetDef TAB_EMOTES[3] = { { 548, 36 }, { 161, 40 }, { 164, 39 } }; const WidgetDef TAB_COMBAT[3] = { { 548, 49 }, { 161, 52 }, { 164, 51 } };
const WidgetDef TAB_EQUIPMENT[3] = { { 548, 52 }, { 161, 55 }, { 164, 54 } }; const WidgetDef TAB_STATS[3] = { { 548, 50 }, { 161, 53 }, { 164, 52 } };
const WidgetDef TAB_FRIENDS[3] = { { 548, 33 }, { 161, 37 }, { 164, 37 } }; const WidgetDef TAB_QUESTS[3] = { { 548, 51 }, { 161, 54 }, { 164, 53 } };
const WidgetDef TAB_INVENTORY[3] = { { 548, 51 }, { 161, 54 }, { 164, 53 } }; const WidgetDef TAB_INVENTORY[3] = { { 548, 52 }, { 161, 55 }, { 164, 54 } };
const WidgetDef TAB_LOGOUT[3] = { { 548, 34 }, { 161, 38 }, { 164, 29 } }; const WidgetDef TAB_EQUIPMENT[3] = { { 548, 53 }, { 161, 56 }, { 164, 55 } };
const WidgetDef TAB_MAGIC[3] = { { 548, 54 }, { 161, 57 }, { 164, 56 } }; const WidgetDef TAB_PRAYER[3] = { { 548, 54 }, { 161, 57 }, { 164, 56 } };
const WidgetDef TAB_MUSIC[3] = { { 548, 37 }, { 161, 41 }, { 164, 40 } }; const WidgetDef TAB_MAGIC[3] = { { 548, 55 }, { 161, 58 }, { 164, 57 } };
const WidgetDef TAB_OPTIONS[3] = { { 548, 35 }, { 161, 39 }, { 164, 38 } };
const WidgetDef TAB_PRAYER[3] = { { 548, 53 }, { 161, 56 }, { 164, 55 } }; const WidgetDef TAB_CLAN[3] = { { 548, 32 }, { 161, 36 }, { 164, 36 } };
const WidgetDef TAB_QUESTS[3] = { { 548, 50 }, { 161, 53 }, { 164, 52 } }; const WidgetDef TAB_FRIENDS[3] = { { 548, 34 }, { 161, 38 }, { 164, 38 } };
const WidgetDef TAB_STATS[3] = { { 548, 49 }, { 161, 52 }, { 164, 51 } }; 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 } };
//************ Combat.cpp ************// //************ Combat.cpp ************//
const std::int32_t COMBAT_PARENT = 593 ; const std::int32_t COMBAT_PARENT = 593 ;
@ -243,193 +255,197 @@ namespace Globals
const std::vector<SpellDef> SpellDefs = // To be used with Magic:: SPELL enum const std::vector<SpellDef> SpellDefs = // To be used with Magic:: SPELL enum
{ {
// Normal, 0-69 // Normal, 0-69
{ "Lumbridge Home Teleport", 4, 356, 0 }, { "Lumbridge Home Teleport", 5, 356, 0 },
{ "Wind Strike", 5, 65, 1 }, { "Wind Strike", 6, 65, 1 },
{ "Confuse", 6, 66, 3 }, { "Confuse", 7, 66, 3 },
{ "Enchant Crossbow Bolt", 7, 408, 0 }, { "Enchant Crossbow Bolt", 8, 408, 0 },
{ "Water Strike", 8, 67, 5 }, { "Water Strike", 9, 67, 5 },
{ "Lvl-1 Enchant", 9, 68, 7 }, { "Lvl-1 Enchant", 10, 68, 7 },
{ "Earth Strike", 10, 69, 9 }, { "Earth Strike", 11, 69, 9 },
{ "Weaken", 11, 70, 11 }, { "Weaken", 12, 70, 11 },
{ "Fire Strike", 12, 71, 13 }, { "Fire Strike", 13, 71, 13 },
{ "Bones to Bananas", 13, 72, 15 }, { "Bones to Bananas", 14, 72, 15 },
{ "Wind Bolt", 14, 73, 17 }, { "Wind Bolt", 15, 73, 17 },
{ "Curse", 15, 74, 19 }, { "Curse", 16, 74, 19 },
{ "Bind", 16, 369, 20 }, { "Bind", 17, 369, 20 },
{ "Low Level Alchemy", 17, 75, 21 }, { "Low Level Alchemy", 18, 75, 21 },
{ "Water Bolt", 18, 76, 23 }, { "Water Bolt", 19, 76, 23 },
{ "Varrock Teleport", 19, 77, 25 }, { "Varrock Teleport", 20, 77, 25 },
{ "Lvl-2 Enchant", 20, 78, 27 }, { "Lvl-2 Enchant", 21, 78, 27 },
{ "Earth Bolt", 21, 79, 29 }, { "Earth Bolt", 22, 79, 29 },
{ "Lumbridge Teleport", 22, 80, 31 }, { "Lumbridge Teleport", 23, 80, 31 },
{ "Telekinetic Grab", 23, 81, 33 }, { "Telekinetic Grab", 24, 81, 33 },
{ "Fire Bolt", 24, 82, 35 }, { "Fire Bolt", 25, 82, 35 },
{ "Falador Teleport", 25, 83, 37 }, { "Falador Teleport", 26, 83, 37 },
{ "Crumble Undead", 26, 84, 39 }, { "Crumble Undead", 27, 84, 39 },
{ "Teleport to House", 27, 405, 40 }, { "Teleport to House", 28, 405, 40 },
{ "Wind Blast", 28, 85, 41 }, { "Wind Blast", 29, 85, 41 },
{ "Superheat Item", 29, 86, 43 }, { "Superheat Item", 30, 86, 43 },
{ "Camelot Teleport", 30, 87, 45 }, { "Camelot Teleport", 31, 87, 45 },
{ "Water Blast", 31, 88, 47 }, { "Water Blast", 32, 88, 47 },
{ "Lvl-3 Enchant", 32, 89, 49 }, { "Lvl-3 Enchant", 33, 89, 49 },
{ "Iban Blast", 33, 103, 50 }, { "Iban Blast", 34, 103, 50 },
{ "Snare", 34, 370, 50 }, { "Snare", 35, 370, 50 },
{ "Magic Dart", 35, 374, 50 }, { "Magic Dart", 36, 374, 50 },
{ "Ardougne Teleport", 36, 104, 51 }, { "Ardougne Teleport", 37, 104, 51 },
{ "Earth Blast", 37, 90, 53 }, { "Earth Blast", 38, 90, 53 },
{ "High Level Alchemy", 38, 91, 55 }, { "High Level Alchemy", 39, 91, 55 },
{ "Charge Water Orb", 39, 92, 56 }, { "Charge Water Orb", 40, 92, 56 },
{ "Lvl-4 Enchant", 40, 93, 57 }, { "Lvl-4 Enchant", 41, 93, 57 },
{ "Watchtower Teleport", 41, 105, 58 }, { "Watchtower Teleport", 42, 105, 58 },
{ "Fire Blast", 42, 94, 59 }, { "Fire Blast", 43, 94, 59 },
{ "Charge Earth Orb", 43, 95, 60 }, { "Charge Earth Orb", 44, 95, 60 },
{ "Bones to Peaches", 44, 404, 60 }, { "Bones to Peaches", 45, 404, 60 },
{ "Saradomin strike", 45, 111, 60 }, { "Saradomin strike", 46, 111, 60 },
{ "Claws of Guthix", 46, 110, 60 }, { "Claws of Guthix", 47, 110, 60 },
{ "Flames of Zamorak", 47, 109, 60 }, { "Flames of Zamorak", 48, 109, 60 },
{ "Trollheim Teleport", 48, 373, 61 }, { "Trollheim Teleport", 49, 373, 61 },
{ "Wind Wave", 49, 96, 62 }, { "Wind Wave", 50, 96, 62 },
{ "Charge Fire Orb", 50, 97, 63 }, { "Charge Fire Orb", 51, 97, 63 },
{ "Teleport to Ape Atoll", 51, 407, 64 }, { "Teleport to Ape Atoll", 52, 407, 64 },
{ "Water Wave", 52, 98, 65 }, { "Water Wave", 53, 98, 65 },
{ "Charge Air Orb", 53, 99, 66 }, { "Charge Air Orb", 54, 99, 66 },
{ "Vulnerability", 54, 106, 66 }, { "Vulnerability", 55, 106, 66 },
{ "Lvl-5 Enchant", 55, 100, 68 }, { "Lvl-5 Enchant", 56, 100, 68 },
{ "Teleport to Kourend", 56, 410, 69 }, { "Teleport to Kourend", 57, 410, 69 },
{ "Earth Wave", 57, 101, 70 }, { "Earth Wave", 58, 101, 70 },
{ "Enfeeble", 58, 107, 73 }, { "Enfeeble", 59, 107, 73 },
{ "Teleother Lumbridge", 59, 399, 74 }, { "Teleother Lumbridge", 60, 399, 74 },
{ "Fire Wave", 60, 102, 75 }, { "Fire Wave", 61, 102, 75 },
{ "Entangle", 61, 371, 79 }, { "Entangle", 62, 371, 79 },
{ "Stun", 62, 108, 80 }, { "Stun", 63, 108, 80 },
{ "Charge", 63, 372, 80 }, { "Charge", 64, 372, 80 },
{ "Wind Surge", 64, 412, 81 }, { "Wind Surge", 65, 412, 81 },
{ "Teleother Falador", 65, 400, 82 }, { "Teleother Falador", 66, 400, 82 },
{ "Water Surge", 66, 413, 85 }, { "Water Surge", 67, 413, 85 },
{ "Tele Block", 67, 402, 85 }, { "Tele Block", 68, 402, 85 },
{ "Teleport to Bounty Target", 68, 409, 85 }, { "Teleport to Bounty Target", 69, 409, 85 },
{ "Lvl-6 Enchant", 69, 403, 87 }, { "Lvl-6 Enchant", 70, 403, 87 },
{ "Teleother Camelot", 70, 401, 90 }, { "Teleother Camelot", 71, 401, 90 },
{ "Earth Surge", 71, 414, 90 }, { "Earth Surge", 72, 414, 90 },
{ "Lvl-7 Enchant", 72, 411, 93 }, { "Lvl-7 Enchant", 73, 411, 93 },
{ "Fire Surge", 73, 415, 95 }, { "Fire Surge", 74, 415, 95 },
//Lunar 70-114 //Lunar 70-114
{ "Lunar Home Teleport", 99, 356, 0 }, { "Lunar Home Teleport", 100, 356, 0 },
{ "Bake Pie", 100, 593, 65 }, { "Bake Pie", 101, 593, 65 },
{ "Geomancy", 140, 613, 65 }, { "Geomancy", 141, 613, 65 },
{ "Cure Plant", 101, 617, 66 }, { "Cure Plant", 102, 617, 66 },
{ "Monster Examine", 102, 627, 66 }, { "Monster Examine", 103, 627, 66 },
{ "NPC Contact", 103, 618, 67 }, { "NPC Contact", 104, 618, 67 },
{ "Cure Other", 104, 609, 68 }, { "Cure Other", 105, 609, 68 },
{ "Humidify", 105, 628, 69 }, { "Humidify", 106, 628, 69 },
{ "Moonclan Teleport", 106, 594, 69 }, { "Moonclan Teleport", 107, 594, 69 },
{ "Tele Group Moonclan", 107, 619, 70 }, { "Tele Group Moonclan", 108, 619, 70 },
{ "Cure Me", 108, 612, 71 }, { "Cure Me", 109, 612, 71 },
{ "Ourania Teleport", 142, 636, 71 }, { "Ourania Teleport", 143, 636, 71 },
{ "Hunter Kit", 109, 629, 71 }, { "Hunter Kit", 110, 629, 71 },
{ "Waterbirth Teleport", 110, 595, 72 }, { "Waterbirth Teleport", 111, 595, 72 },
{ "Tele Group Waterbirth", 111, 620, 73 }, { "Tele Group Waterbirth", 112, 620, 73 },
{ "Cure Group", 112, 615, 74 }, { "Cure Group", 113, 615, 74 },
{ "Stat Spy", 113, 626, 75 }, { "Stat Spy", 114, 626, 75 },
{ "Barbarian Teleport", 114, 597, 75 }, { "Barbarian Teleport", 115, 597, 75 },
{ "Tele Group Barbarian", 115, 621, 76 }, { "Tele Group Barbarian", 116, 621, 76 },
{ "Spin Flax", 141, 635, 76 }, { "Spin Flax", 142, 635, 76 },
{ "Superglass Make", 116, 598, 77 }, { "Superglass Make", 117, 598, 77 },
{ "Tan Leather", 117, 633, 78 }, { "Tan Leather", 118, 633, 78 },
{ "Khazard Teleport", 118, 599, 78 }, { "Khazard Teleport", 119, 599, 78 },
{ "Tele Group Khazard", 119, 622, 79 }, { "Tele Group Khazard", 120, 622, 79 },
{ "Dream", 120, 630, 79 }, { "Dream", 121, 630, 79 },
{ "String Jewellery", 121, 600, 80 }, { "String Jewellery", 122, 600, 80 },
{ "Stat Restore Pot Share", 122, 604, 81 }, { "Stat Restore Pot Share", 123, 604, 81 },
{ "Magic Imbue", 123, 602, 82 }, { "Magic Imbue", 124, 602, 82 },
{ "Fertile Soil", 124, 603, 83 }, { "Fertile Soil", 125, 603, 83 },
{ "Boost Potion Share", 125, 601, 84 }, { "Boost Potion Share", 126, 601, 84 },
{ "Fishing Guild Teleport", 126, 605, 85 }, { "Fishing Guild Teleport", 127, 605, 85 },
{ "Teleport to Bounty Target", 68, 409, 85 }, { "Teleport to Bounty Target", 69, 409, 85 },
{ "Tele Group Fishing Guild", 127, 623, 86 }, { "Tele Group Fishing Guild", 128, 623, 86 },
{ "Plank Make", 128, 631, 86 }, { "Plank Make", 129, 631, 86 },
{ "Catherby Teleport", 129, 606, 87 }, { "Catherby Teleport", 130, 606, 87 },
{ "Tele Group Catherby", 130, 624, 88 }, { "Tele Group Catherby", 131, 624, 88 },
{ "Recharge Dragonstone", 131, 634, 89 }, { "Recharge Dragonstone", 132, 634, 89 },
{ "Ice Plateau Teleport", 132, 607, 89 }, { "Ice Plateau Teleport", 133, 607, 89 },
{ "Tele Group Ice Plateau", 133, 625, 90 }, { "Tele Group Ice Plateau", 134, 625, 90 },
{ "Energy Transfer", 134, 608, 91 }, { "Energy Transfer", 135, 608, 91 },
{ "Heal Other", 135, 610, 92 }, { "Heal Other", 136, 610, 92 },
{ "Vengeance Other", 136, 611, 93 }, { "Vengeance Other", 137, 611, 93 },
{ "Vengeance", 137, 614, 94 }, { "Vengeance", 138, 614, 94 },
{ "Heal Group", 138, 616, 95 }, { "Heal Group", 139, 616, 95 },
{ "Spellbook Swap", 139, 632, 96 }, { "Spellbook Swap", 40, 632, 96 },
//Ancients 115-140 //Ancients 115-140
{ "Ice Rush", 68, 375, 58 }, { "Ice Rush", 75, 375, 58 }, //75
{ "Ice Blitz", 69, 377, 84 }, { "Ice Blitz", 76, 377, 84 },
{ "Ice Burst", 70, 376, 70 }, { "Ice Burst", 77, 376, 70 },
{ "Ice Barrage", 71, 378, 94 }, { "Ice Barrage", 78, 378, 94 },
{ "Blood Rush", 72, 383, 56 },
{ "Blood Blitz", 73, 385, 80 }, { "Blood Rush", 79, 383, 56 },
{ "Blood Burst", 74, 384, 68 }, { "Blood Blitz", 80, 385, 80 },
{ "Blood Barrage", 75, 386, 92 }, { "Blood Burst", 81, 384, 68 },
{ "Smoke Rush", 76, 379, 50 }, { "Blood Barrage", 82, 386, 92 },
{ "Smoke Blitz", 77, 381, 74 },
{ "Smoke Burst", 78, 380, 62 }, { "Smoke Rush", 83, 379, 50 },
{ "Smoke Barrage", 79, 382, 86 }, { "Smoke Blitz", 84, 381, 74 },
{ "Shadow Rush", 80, 387, 52 }, { "Smoke Burst", 85, 380, 62 },
{ "Shadow Blitz", 81, 389, 76 }, { "Smoke Barrage", 86, 382, 86 },
{ "Shadow Burst", 82, 388, 64 },
{ "Shadow Barrage", 83, 390, 88 }, { "Shadow Rush", 87, 387, 52 },
{ "Paddewwa Teleport", 84, 391, 54 }, { "Shadow Blitz", 88, 389, 76 },
{ "Senntisten Teleport", 85, 392, 60 }, { "Shadow Burst", 89, 388, 64 },
{ "Kharyrll Teleport", 86, 393, 66 }, { "Shadow Barrage", 90, 390, 88 },
{ "Lassar Teleport", 87, 394, 72 },
{ "Dareeyak Teleport", 88, 395, 78 }, { "Paddewwa Teleport", 91, 391, 54 },
{ "Carrallangar Teleport", 89, 396, 84 }, { "Senntisten Teleport", 92, 392, 60 },
{ "Annakarl Teleport", 90, 397, 90 }, { "Kharyrll Teleport", 93, 393, 66 },
{ "Ghorrock Teleport", 91, 398, 96 }, { "Lassar Teleport", 94, 394, 72 },
{ "Teleport to Bounty Target", 92, 409, 85 }, { "Dareeyak Teleport", 95, 395, 78 },
{ "Edgeville Home Teleport", 93, 356, 0 }, { "Carrallangar Teleport", 96, 396, 84 },
{ "Annakarl Teleport", 97, 397, 90 },
{ "Ghorrock Teleport", 98, 398, 96 },
{ "Teleport to Bounty Target", 69, 409, 85 },
{ "Edgeville Home Teleport", 99, 356, 0 },
// Arceuus 141-177 // Arceuus 141-177
{ "Arceuus Home Teleport", 143, 356, 0 }, { "Arceuus Home Teleport", 144, 356, 0 },
{ "Reanimate Goblin", 144, 1247, 3 }, { "Reanimate Goblin", 145, 1247, 3 },
{ "Lumbridge Graveyard Teleport", 145, 1294, 6 }, { "Lumbridge Graveyard Teleport", 146, 1294, 6 },
{ "Reanimate Monkey", 146, 1264, 7 }, { "Reanimate Monkey", 147, 1264, 7 },
{ "Reanimate Imp", 147, 1258, 12 }, { "Reanimate Imp", 148, 1258, 12 },
{ "Reanimate Minotaur", 148, 1259, 16 }, { "Reanimate Minotaur", 149, 1259, 16 },
{ "Draynor Manor Teleport", 149, 1295, 17 }, { "Draynor Manor Teleport", 150, 1295, 17 },
{ "Reanimate Scorpion", 150, 1257, 19 }, { "Reanimate Scorpion", 151, 1257, 19 },
{ "Reanimate Bear", 151, 1256, 21 }, { "Reanimate Bear", 152, 1256, 21 },
{ "Reanimate Unicorn", 152, 1260, 22 }, { "Reanimate Unicorn", 153, 1260, 22 },
{ "Reanimate Dog", 153, 1268, 26 }, { "Reanimate Dog", 154, 1268, 26 },
{ "Mind Altar Teleport", 154, 1296, 28 }, { "Mind Altar Teleport", 155, 1296, 28 },
{ "Reanimate Chaos Druid", 155, 1251, 30 }, { "Reanimate Chaos Druid", 156, 1251, 30 },
{ "Respawn Teleport", 156, 1319, 34 }, { "Respawn Teleport", 157, 1319, 34 },
{ "Reanimate Giant", 157, 1255, 37 }, { "Reanimate Giant", 158, 1255, 37 },
{ "Salve Graveyard Teleport", 158, 1320, 40 }, { "Salve Graveyard Teleport", 159, 1320, 40 },
{ "Reanimate Ogre", 159, 1254, 40 }, { "Reanimate Ogre", 160, 1254, 40 },
{ "Reanimate Elf", 160, 1250, 43 }, { "Reanimate Elf", 161, 1250, 43 },
{ "Reanimate Troll", 161, 1252, 46 }, { "Reanimate Troll", 162, 1252, 46 },
{ "Fenkenstrain's Castle Teleport", 162, 1321, 48 }, { "Fenkenstrain's Castle Teleport", 163, 1321, 48 },
{ "Reanimate Horror", 163, 1266, 52 }, { "Reanimate Horror", 164, 1266, 52 },
{ "Reanimate Kalphite", 164, 1261, 57 }, { "Reanimate Kalphite", 165, 1261, 57 },
{ "West Ardougne Teleport", 165, 1322, 61 }, { "West Ardougne Teleport", 166, 1322, 61 },
{ "Reanimate Dagannoth", 166, 1253, 62 }, { "Reanimate Dagannoth", 167, 1253, 62 },
{ "Reanimate Bloodveld", 167, 1292, 65 }, { "Reanimate Bloodveld", 168, 1292, 65 },
{ "Harmony Island Teleport", 168, 1323, 65 }, { "Harmony Island Teleport", 169, 1323, 65 },
{ "Reanimate TzHaar", 169, 1287, 69 }, { "Reanimate TzHaar", 170, 1287, 69 },
{ "Cemetery Teleport", 170, 1324, 71 }, { "Cemetery Teleport", 171, 1324, 71 },
{ "Reanimate Demon", 171, 1273, 72 }, { "Reanimate Demon", 172, 1273, 72 },
{ "Reanimate Aviansie", 172, 1288, 78 }, { "Reanimate Aviansie", 173, 1288, 78 },
{ "Resurrect Crops", 173, 1327, 78 }, { "Resurrect Crops", 174, 1327, 78 },
{ "Barrows Teleport", 174, 1325, 83 }, { "Barrows Teleport", 175, 1325, 83 },
{ "Reanimate Abyssal Creature", 175, 1290, 85 }, { "Reanimate Abyssal Creature", 176, 1290, 85 },
{ "Ape Atoll Teleport", 176, 1326, 90 }, { "Ape Atoll Teleport", 177, 1326, 90 },
{ "Reanimate Dragon", 177, 1274, 93 }, { "Reanimate Dragon", 178, 1274, 93 },
{ "Battlefront Teleport", 178, 1325, 23 }, { "Battlefront Teleport", 179, 1325, 23 },
}; };
//************ Options.cpp ************// //************ Options.cpp ************//
const std::int32_t OPTIONS_PARENT = 261; const std::int32_t OPTIONS_PARENT = 261;
const WidgetDef OPTIONS_ACCEPT_AID = { OPTIONS_PARENT, 92 }; const WidgetDef OPTIONS_ACCEPT_AID = { OPTIONS_PARENT, 100 };
const WidgetDef OPTIONS_RUN_MODE = { OPTIONS_PARENT, 95 }; const WidgetDef OPTIONS_RUN_MODE = { OPTIONS_PARENT, 103 };
//************ Prayer.cpp ************// //************ Prayer.cpp ************//
const std::int32_t PRAYER_PRAYERS_PARENT = 541; // To be used with PrayerDefs const std::int32_t PRAYER_PRAYERS_PARENT = 541; // To be used with PrayerDefs

View File

@ -52,6 +52,8 @@ void SetupInput();
void GainFocus(); void GainFocus();
void LoseFocus(); void LoseFocus();
bool IsKeyDown(std::int32_t K); bool IsKeyDown(std::int32_t K);
void MouseEnter(std::int32_t X, std::int32_t Y);
void MouseExit(std::int32_t X, std::int32_t Y);
void ScrollUp(); void ScrollUp();
void ScrollDown(); void ScrollDown();
void MouseDown(std::int32_t B); void MouseDown(std::int32_t B);

View File

@ -288,6 +288,7 @@ namespace Internal
bool IsItemStackable(std::int32_t ID); bool IsItemStackable(std::int32_t ID);
double GetHealthPercentage(const Internal::Character& C); double GetHealthPercentage(const Internal::Character& C);
std::vector<Widget> GetWidgets(std::int32_t Container); std::vector<Widget> GetWidgets(std::int32_t Container);
CollisionData GetCollisionMap(std::int32_t Plane);
} }
#endif // INTERNAL_HPP_INCLUDED #endif // INTERNAL_HPP_INCLUDED

View File

@ -3,6 +3,7 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include <random>
#include "Types/Point.hpp" #include "Types/Point.hpp"
std::int32_t BinomialRandom(std::int32_t Min, std::int32_t Max, double Probability); std::int32_t BinomialRandom(std::int32_t Min, std::int32_t Max, double Probability);
@ -10,6 +11,7 @@ std::int32_t UniformRandom(std::int32_t Min, std::int32_t Max);
double UniformRandom(); double UniformRandom();
std::int32_t NormalRandom(std::int32_t Mean, double StandardDeviation); std::int32_t NormalRandom(std::int32_t Mean, double StandardDeviation);
std::int32_t NormalRandom(std::int32_t Low, std::int32_t High, double PercentageDeviation); std::int32_t NormalRandom(std::int32_t Low, std::int32_t High, double PercentageDeviation);
std::int32_t NormalRandom(std::int32_t Min, std::int32_t Max, std::int32_t Mean, double StandardDeviation);
void GetLine(Point A, Point B, std::vector<Point>* Res); void GetLine(Point A, Point B, std::vector<Point>* Res);
std::vector<Point> ConvexHull(std::vector<Point> Points); std::vector<Point> ConvexHull(std::vector<Point> Points);

View File

@ -30,7 +30,6 @@ typedef struct
std::string Username; std::string Username;
std::string Password; std::string Password;
bool Member; bool Member;
bool HasPin;
std::string BankPin; std::string BankPin;
std::string World; std::string World;
bool UseProxy; bool UseProxy;
@ -69,6 +68,16 @@ typedef struct
float WidgetProbabilityX; float WidgetProbabilityX;
float WidgetProbabilityY; float WidgetProbabilityY;
float PointGenAccuracy; float PointGenAccuracy;
float AccelerationMean;
float AccelerationDeviation;
float DecelerationMean;
float DecelerationDeviation;
float PivotMean;
float PivotDeviation;
float SplineMean;
float SplineDeviation;
float AngleMean;
float AngleDeviation;
float FatigueGain; float FatigueGain;
float FatigueLoss; float FatigueLoss;
float FatigueMax; float FatigueMax;

View File

@ -17,6 +17,7 @@
#include "Interfaces/Bank.hpp" #include "Interfaces/Bank.hpp"
#include "Interfaces/Chat.hpp" #include "Interfaces/Chat.hpp"
#include "Interfaces/DepositBox.hpp" #include "Interfaces/DepositBox.hpp"
#include "Interfaces/CollectionBox.hpp"
#include "Interfaces/Exchange.hpp" #include "Interfaces/Exchange.hpp"
#include "Interfaces/Login.hpp" #include "Interfaces/Login.hpp"
#include "Interfaces/Mainscreen.hpp" #include "Interfaces/Mainscreen.hpp"

View File

@ -0,0 +1,12 @@
#ifndef COLLECTIONBOX_HPP_INCLUDED
#define COLLECTIONBOX_HPP_INCLUDED
namespace CollectionBox
{
bool IsOpen();
bool Close(bool AllowEsc = true);
bool CollectToBank();
bool CollectToInventory();
}
#endif // COLLECTIONBOX_HPP_INCLUDED

View File

@ -16,7 +16,7 @@ namespace Combat
std::int32_t GetSpecialAttack(); std::int32_t GetSpecialAttack();
bool IsSpecialAttacking(); bool IsSpecialAttacking();
bool ToggleSpecialAttack(bool Toggle); bool ToggleSpecialAttack(bool Toggle); // Note: Have the combat tab open to force-use the special attack bar
bool IsPoisoned(); bool IsPoisoned();
bool HasPoisonImmunity(); bool HasPoisonImmunity();

View File

@ -14,7 +14,6 @@ namespace Profile
void SetWorld(std::int32_t World); void SetWorld(std::int32_t World);
bool GetIsMember(); bool GetIsMember();
bool GetHasPin();
std::int32_t GetInteractableMean(); std::int32_t GetInteractableMean();
double GetInteractableDeviation(); double GetInteractableDeviation();
@ -61,6 +60,17 @@ namespace Profile
double GetPointGenAccuracy(); double GetPointGenAccuracy();
double GetAccelerationMean();
double GetAccelerationDeviation();
double GetDecelerationMean();
double GetDecelerationDeviation();
double GetPivotMean();
double GetPivotDeviation();
double GetSplineMean();
double GetSplineDeviation();
double GetAngleMean();
double GetAngleDeviation();
double GetFatigue(); double GetFatigue();
double GetFatigueGain(); double GetFatigueGain();
double GetFatigueLoss(); double GetFatigueLoss();

Binary file not shown.