diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index 8e59ea4..7d9242d 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -263,200 +263,202 @@ namespace Globals const std::vector SpellDefs = // To be used with Magic:: SPELL enum { - // Normal, 0-69 - { "Lumbridge Home Teleport", 5, 356, 0 }, - { "Wind Strike", 6, 65, 1 }, - { "Confuse", 7, 66, 3 }, - { "Enchant Crossbow Bolt", 8, 408, 0 }, - { "Water Strike", 9, 67, 5 }, - { "Lvl-1 Enchant", 10, 68, 7 }, - { "Earth Strike", 11, 69, 9 }, - { "Weaken", 12, 70, 11 }, - { "Fire Strike", 13, 71, 13 }, - { "Bones to Bananas", 14, 72, 15 }, - { "Wind Bolt", 15, 73, 17 }, - { "Curse", 16, 74, 19 }, - { "Bind", 17, 369, 20 }, - { "Low Level Alchemy", 18, 75, 21 }, - { "Water Bolt", 19, 76, 23 }, - { "Varrock Teleport", 20, 77, 25 }, - { "Lvl-2 Enchant", 21, 78, 27 }, - { "Earth Bolt", 22, 79, 29 }, - { "Lumbridge Teleport", 23, 80, 31 }, - { "Telekinetic Grab", 24, 81, 33 }, - { "Fire Bolt", 25, 82, 35 }, - { "Falador Teleport", 26, 83, 37 }, - { "Crumble Undead", 27, 84, 39 }, - { "Teleport to House", 28, 405, 40 }, - { "Wind Blast", 29, 85, 41 }, - { "Superheat Item", 30, 86, 43 }, - { "Camelot Teleport", 31, 87, 45 }, - { "Water Blast", 32, 88, 47 }, - { "Lvl-3 Enchant", 33, 89, 49 }, - { "Iban Blast", 34, 103, 50 }, - { "Snare", 35, 370, 50 }, - { "Magic Dart", 36, 374, 50 }, - { "Ardougne Teleport", 37, 104, 51 }, - { "Earth Blast", 38, 90, 53 }, - { "High Level Alchemy", 39, 91, 55 }, - { "Charge Water Orb", 40, 92, 56 }, - { "Lvl-4 Enchant", 41, 93, 57 }, - { "Watchtower Teleport", 42, 105, 58 }, - { "Fire Blast", 43, 94, 59 }, - { "Charge Earth Orb", 44, 95, 60 }, - { "Bones to Peaches", 45, 404, 60 }, - { "Saradomin strike", 46, 111, 60 }, - { "Claws of Guthix", 47, 110, 60 }, - { "Flames of Zamorak", 48, 109, 60 }, - { "Trollheim Teleport", 49, 373, 61 }, - { "Wind Wave", 50, 96, 62 }, - { "Charge Fire Orb", 51, 97, 63 }, - { "Teleport to Ape Atoll", 52, 407, 64 }, - { "Water Wave", 53, 98, 65 }, - { "Charge Air Orb", 54, 99, 66 }, - { "Vulnerability", 55, 106, 66 }, - { "Lvl-5 Enchant", 56, 100, 68 }, - { "Teleport to Kourend", 57, 410, 69 }, - { "Earth Wave", 58, 101, 70 }, - { "Enfeeble", 59, 107, 73 }, - { "Teleother Lumbridge", 60, 399, 74 }, - { "Fire Wave", 61, 102, 75 }, - { "Entangle", 62, 371, 79 }, - { "Stun", 63, 108, 80 }, - { "Charge", 64, 372, 80 }, - { "Wind Surge", 65, 412, 81 }, - { "Teleother Falador", 66, 400, 82 }, - { "Water Surge", 67, 413, 85 }, - { "Tele Block", 68, 402, 85 }, - { "Teleport to Bounty Target", 69, 409, 85 }, - { "Lvl-6 Enchant", 70, 403, 87 }, - { "Teleother Camelot", 71, 401, 90 }, - { "Earth Surge", 72, 414, 90 }, - { "Lvl-7 Enchant", 73, 411, 93 }, - { "Fire Surge", 74, 415, 95 }, + // Normal, + { "Lumbridge Home Teleport", 6, 356, 0 }, + { "Wind Strike", 7, 65, 1 }, + { "Confuse", 8, 66, 3 }, + { "Enchant Crossbow Bolt", 9, 358, 0 }, + { "Water Strike", 10, 67, 5 }, + { "Lvl-1 Enchant", 11, 68, 7 }, + { "Earth Strike", 12, 69, 9 }, + { "Weaken", 13, 70, 11 }, + { "Fire Strike", 14, 71, 13 }, + { "Bones to Bananas", 15, 72, 15 }, + { "Wind Bolt", 16, 73, 17 }, + { "Curse", 17, 74, 19 }, + { "Bind", 18, 369, 20 }, + { "Low Level Alchemy", 19, 75, 21 }, + { "Water Bolt", 20, 76, 23 }, + { "Varrock Teleport", 21, 77, 25 }, + { "Lvl-2 Enchant", 22, 78, 27 }, + { "Earth Bolt", 23, 79, 29 }, + { "Lumbridge Teleport", 24, 80, 31 }, + { "Telekinetic Grab", 25, 81, 33 }, + { "Fire Bolt", 26, 82, 35 }, + { "Falador Teleport", 27, 83, 37 }, + { "Crumble Undead", 28, 84, 39 }, + { "Teleport to House", 29, 405, 40 }, + { "Wind Blast", 30, 85, 41 }, + { "Superheat Item", 31, 86, 43 }, + { "Camelot Teleport", 32, 87, 45 }, + { "Water Blast", 33, 88, 47 }, + { "Lvl-3 Enchant", 34, 89, 49 }, + { "Iban Blast", 35, 103, 50 }, + { "Snare", 36, 370, 50 }, + { "Magic Dart", 37, 374, 50 }, + { "Ardougne Teleport", 38, 104, 51 }, + { "Earth Blast", 39, 90, 53 }, + { "High Level Alchemy", 40, 91, 55 }, + { "Charge Water Orb", 41, 92, 56 }, + { "Lvl-4 Enchant", 42, 93, 57 }, + { "Watchtower Teleport", 43, 105, 58 }, + { "Fire Blast", 44, 94, 59 }, + { "Charge Earth Orb", 45, 95, 60 }, + { "Bones to Peaches", 46, 404, 60 }, + { "Saradomin strike", 47, 111, 60 }, + { "Claws of Guthix", 48, 110, 60 }, + { "Flames of Zamorak", 49, 109, 60 }, + { "Trollheim Teleport", 50, 373, 61 }, + { "Wind Wave", 51, 96, 62 }, + { "Charge Fire Orb", 52, 97, 63 }, + { "Teleport to Ape Atoll", 53, 407, 64 }, + { "Water Wave", 54, 98, 65 }, + { "Charge Air Orb", 55, 99, 66 }, + { "Vulnerability", 56, 106, 66 }, + { "Lvl-5 Enchant", 57, 100, 68 }, + { "Teleport to Kourend", 58, 410, 69 }, + { "Earth Wave", 59, 101, 70 }, + { "Enfeeble", 60, 107, 73 }, + { "Teleother Lumbridge", 61, 399, 74 }, + { "Fire Wave", 62, 102, 75 }, + { "Entangle", 63, 371, 79 }, + { "Stun", 64, 108, 80 }, + { "Charge", 65, 372, 80 }, + { "Wind Surge", 66, 412, 81 }, + { "Teleother Falador", 67, 400, 82 }, + { "Water Surge", 68, 413, 85 }, + { "Tele Block", 69, 402, 85 }, + { "Teleport to Bounty Target", 70, 409, 85 }, + { "Lvl-6 Enchant", 71, 403, 87 }, + { "Teleother Camelot", 72, 401, 90 }, + { "Earth Surge", 73, 414, 90 }, + { "Lvl-7 Enchant", 74, 411, 93 }, + { "Fire Surge", 75, 415, 95 }, + //Lunar 70-114 - { "Lunar Home Teleport", 100, 356, 0 }, - { "Bake Pie", 101, 593, 65 }, - { "Geomancy", 141, 613, 65 }, - { "Cure Plant", 102, 617, 66 }, - { "Monster Examine", 103, 627, 66 }, - { "NPC Contact", 104, 618, 67 }, - { "Cure Other", 105, 609, 68 }, - { "Humidify", 106, 628, 69 }, - { "Moonclan Teleport", 107, 594, 69 }, - { "Tele Group Moonclan", 108, 619, 70 }, - { "Cure Me", 109, 612, 71 }, - { "Ourania Teleport", 143, 636, 71 }, - { "Hunter Kit", 110, 629, 71 }, - { "Waterbirth Teleport", 111, 595, 72 }, - { "Tele Group Waterbirth", 112, 620, 73 }, - { "Cure Group", 113, 615, 74 }, - { "Stat Spy", 114, 626, 75 }, - { "Barbarian Teleport", 115, 597, 75 }, - { "Tele Group Barbarian", 116, 621, 76 }, - { "Spin Flax", 142, 635, 76 }, - { "Superglass Make", 117, 598, 77 }, - { "Tan Leather", 118, 633, 78 }, - { "Khazard Teleport", 119, 599, 78 }, - { "Tele Group Khazard", 120, 622, 79 }, - { "Dream", 121, 630, 79 }, - { "String Jewellery", 122, 600, 80 }, - { "Stat Restore Pot Share", 123, 604, 81 }, - { "Magic Imbue", 124, 602, 82 }, - { "Fertile Soil", 125, 603, 83 }, - { "Boost Potion Share", 126, 601, 84 }, - { "Fishing Guild Teleport", 127, 605, 85 }, - { "Teleport to Bounty Target", 69, 409, 85 }, - { "Tele Group Fishing Guild", 128, 623, 86 }, - { "Plank Make", 129, 631, 86 }, - { "Catherby Teleport", 130, 606, 87 }, - { "Tele Group Catherby", 131, 624, 88 }, - { "Recharge Dragonstone", 132, 634, 89 }, - { "Ice Plateau Teleport", 133, 607, 89 }, - { "Tele Group Ice Plateau", 134, 625, 90 }, - { "Energy Transfer", 135, 608, 91 }, - { "Heal Other", 136, 610, 92 }, - { "Vengeance Other", 137, 611, 93 }, - { "Vengeance", 138, 614, 94 }, - { "Heal Group", 139, 616, 95 }, - { "Spellbook Swap", 40, 632, 96 }, + { "Lunar Home Teleport", 101, 356, 0 }, + { "Bake Pie", 102, 543, 65 }, + { "Geomancy", 142, 613, 65 }, + { "Cure Plant", 103, 617, 66 }, + { "Monster Examine", 104, 627, 66 }, + { "NPC Contact", 105, 618, 67 }, + { "Cure Other", 106, 609, 68 }, + { "Humidify", 107, 578, 69 }, + { "Moonclan Teleport", 108, 594, 69 }, + { "Tele Group Moonclan", 109, 619, 70 }, + { "Cure Me", 110, 612, 71 }, + { "Ourania Teleport", 144, 636, 71 }, + { "Hunter Kit", 111, 629, 71 }, + { "Waterbirth Teleport", 112, 595, 72 }, + { "Tele Group Waterbirth", 113, 620, 73 }, + { "Cure Group", 114, 615, 74 }, + { "Stat Spy", 115, 626, 75 }, + { "Barbarian Teleport", 116, 597, 75 }, + { "Tele Group Barbarian", 117, 621, 76 }, + { "Spin Flax", 143, 635, 76 }, + { "Superglass Make", 118, 598, 77 }, + { "Tan Leather", 119, 633, 78 }, + { "Khazard Teleport", 120, 599, 78 }, + { "Tele Group Khazard", 121, 622, 79 }, + { "Dream", 122, 630, 79 }, + { "String Jewellery", 123, 600, 80 }, + { "Stat Restore Pot Share", 124, 604, 81 }, + { "Magic Imbue", 125, 602, 82 }, + { "Fertile Soil", 126, 603, 83 }, + { "Boost Potion Share", 127, 601, 84 }, + { "Fishing Guild Teleport", 128, 605, 85 }, + { "Teleport to Bounty Target", 70, 409, 85 }, + { "Tele Group Fishing Guild", 129, 623, 86 }, + { "Plank Make", 130, 631, 86 }, + { "Catherby Teleport", 131, 606, 87 }, + { "Tele Group Catherby", 132, 624, 88 }, + { "Recharge Dragonstone", 133, 634, 89 }, + { "Ice Plateau Teleport", 134, 607, 89 }, + { "Tele Group Ice Plateau", 135, 625, 90 }, + { "Energy Transfer", 136, 608, 91 }, + { "Heal Other", 137, 610, 92 }, + { "Vengeance Other", 138, 611, 93 }, + { "Vengeance", 139, 614, 94 }, + { "Heal Group", 140, 616, 95 }, + { "Spellbook Swap", 141, 632, 96 }, + //Ancients 115-140 - { "Ice Rush", 75, 375, 58 }, //75 - { "Ice Blitz", 76, 377, 84 }, - { "Ice Burst", 77, 376, 70 }, - { "Ice Barrage", 78, 378, 94 }, + { "Ice Rush", 76, 375, 58 }, + { "Ice Blitz", 77, 377, 84 }, + { "Ice Burst", 78, 376, 70 }, + { "Ice Barrage", 79, 378, 94 }, - { "Blood Rush", 79, 383, 56 }, - { "Blood Blitz", 80, 385, 80 }, - { "Blood Burst", 81, 384, 68 }, - { "Blood Barrage", 82, 386, 92 }, + { "Blood Rush", 80, 383, 56 }, + { "Blood Blitz", 81, 385, 80 }, + { "Blood Burst", 82, 384, 68 }, + { "Blood Barrage", 83, 386, 92 }, - { "Smoke Rush", 83, 379, 50 }, - { "Smoke Blitz", 84, 381, 74 }, - { "Smoke Burst", 85, 380, 62 }, - { "Smoke Barrage", 86, 382, 86 }, + { "Smoke Rush", 84, 379, 50 }, + { "Smoke Blitz", 85, 381, 74 }, + { "Smoke Burst", 86, 380, 62 }, + { "Smoke Barrage", 87, 382, 86 }, - { "Shadow Rush", 87, 387, 52 }, - { "Shadow Blitz", 88, 389, 76 }, - { "Shadow Burst", 89, 388, 64 }, - { "Shadow Barrage", 90, 390, 88 }, + { "Shadow Rush", 88, 387, 52 }, + { "Shadow Blitz", 89, 389, 76 }, + { "Shadow Burst", 90, 388, 64 }, + { "Shadow Barrage", 91, 390, 88 }, - { "Paddewwa Teleport", 91, 391, 54 }, - { "Senntisten Teleport", 92, 392, 60 }, - { "Kharyrll Teleport", 93, 393, 66 }, - { "Lassar Teleport", 94, 394, 72 }, - { "Dareeyak Teleport", 95, 395, 78 }, - { "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 }, + { "Paddewwa Teleport", 92, 391, 54 }, + { "Senntisten Teleport", 93, 392, 60 }, + { "Kharyrll Teleport", 94, 393, 66 }, + { "Lassar Teleport", 95, 394, 72 }, + { "Dareeyak Teleport", 96, 395, 78 }, + { "Carrallangar Teleport", 97, 396, 84 }, + { "Annakarl Teleport", 98, 397, 90 }, + { "Ghorrock Teleport", 99, 398, 96 }, + { "Teleport to Target", 70, 409, 85 }, + { "Edgeville Home Teleport", 100, 356, 0 }, // Arceuus 141-177 - { "Arceuus Home Teleport", 144, 1251, 0 }, - { "Basic Reanimation", 145, 1272, 16 }, - { "Arceuus Library Teleport", 146, 1277, 6 }, - { "Adept Reanimation", 147, 1273, 41 }, - { "Expert Reanimation", 148, 1274, 72 }, - { "Master Reanimation", 149, 1275, 90 }, - { "Draynor Manor Teleport", 150, 1278, 17 }, - { "Mind Altar Teleport", 152, 1281, 28 }, - { "Respawn Teleport", 153, 1282, 34 }, - { "Salve Graveyard Teleport", 154, 1283, 40 }, - { "Fenkenstrain's Castle Teleport", 155, 1284, 48 }, - { "West Ardougne Teleport", 156, 1285, 61 }, - { "Harmony Island Teleport", 157, 1286, 65 }, - { "Cemetery Teleport", 158, 1289, 71 }, - { "Resurrect Crops", 159, 1291, 78 }, - { "Barrows Teleport", 160, 1287, 83 }, - { "Ape Atoll Teleport", 161, 1288, 90 }, - { "Battlefront Teleport", 162, 1280, 23 }, - { "Inferior Demonbane", 163, 1321, 44 }, - { "Superior Demonbane", 164, 1322, 62 }, - { "Dark Demonbane", 165, 1323, 82 }, - { "Mark of Darkness", 166, 1324, 59 }, - { "Ghostly Grasp", 167, 1292, 35 }, - { "Skeletal Grasp", 168, 1293, 56 }, - { "Undead Grasp", 169, 1294, 79 }, - { "Ward of Arceuus", 170, 1325, 73 }, - { "Lesser Corruption", 171, 1326, 64 }, - { "Greater Corruption", 172, 1327, 85 }, - { "Demonic Offering", 173, 1330, 84 }, - { "Sinister Offering", 174, 1331, 92 }, - { "Degrime", 175, 1337, 70 }, - { "Shadow Veil", 176, 1334, 47 }, - { "Vile Vigour", 177, 1336, 66 }, - { "Dark Lure", 178, 1335, 50 }, - { "Death Charge", 179, 1329, 80 }, - { "Resurrect Lesser Ghost", 180, 1295, 38 }, - { "Resurrect Lesser Skeleton", 181, 1296, 38 }, - { "Resurrect Lesser Zombie", 182, 1319, 38 }, - { "Resurrect Superior Ghost", 183, 2985, 57 }, - { "Resurrect Superior Skeleton", 184, 2987, 57 }, - { "Resurrect Superior Zombie", 185, 2989, 57 }, - { "Resurrect Greater Ghost", 186, 2986, 76 }, - { "Resurrect Greater Skeleton", 187, 2988, 76 }, - { "Resurrect Greater Zombie", 188, 2990, 76 }, + { "Arceuus Home Teleport", 145, 1251, 0 }, + { "Basic Reanimation", 146, 1272, 16 }, + { "Arceuus Library Teleport", 147, 1277, 6 }, + { "Adept Reanimation", 148, 1273, 41 }, + { "Expert Reanimation", 149, 1274, 72 }, + { "Master Reanimation", 150, 1275, 90 }, + { "Draynor Manor Teleport", 151, 1278, 17 }, + { "Mind Altar Teleport", 153, 1281, 28 }, + { "Respawn Teleport", 154, 1282, 34 }, + { "Salve Graveyard Teleport", 155, 1283, 40 }, + { "Fenkenstrain's Castle Teleport", 156, 1284, 48 }, + { "West Ardougne Teleport", 157, 1285, 61 }, + { "Harmony Island Teleport", 158, 1286, 65 }, + { "Cemetery Teleport", 159, 1289, 71 }, + { "Resurrect Crops", 160, 1291, 78 }, + { "Barrows Teleport", 161, 1287, 83 }, + { "Ape Atoll Teleport", 162, 1288, 90 }, + { "Battlefront Teleport", 163, 1280, 23 }, + { "Inferior Demonbane", 164, 1321, 44 }, + { "Superior Demonbane", 165, 1322, 62 }, + { "Dark Demonbane", 166, 1323, 82 }, + { "Mark of Darkness", 167, 1324, 59 }, + { "Ghostly Grasp", 168, 1292, 35 }, + { "Skeletal Grasp", 169, 1293, 56 }, + { "Undead Grasp", 170, 1294, 79 }, + { "Ward of Arceuus", 171, 1325, 73 }, + { "Lesser Corruption", 172, 1326, 64 }, + { "Greater Corruption", 173, 1327, 85 }, + { "Demonic Offering", 174, 1330, 84 }, + { "Sinister Offering", 175, 1331, 92 }, + { "Degrime", 176, 1337, 70 }, + { "Shadow Veil", 177, 1334, 47 }, + { "Vile Vigour", 178, 1336, 66 }, + { "Dark Lure", 179, 1335, 50 }, + { "Death Charge", 180, 1329, 80 }, + { "Resurrect Lesser Ghost", 181, 1295, 38 }, + { "Resurrect Lesser Skeleton", 182, 1296, 38 }, + { "Resurrect Lesser Zombie", 183, 1319, 38 }, + { "Resurrect Superior Ghost", 184, 2985, 57 }, + { "Resurrect Superior Skeleton", 185, 2987, 57 }, + { "Resurrect Superior Zombie", 186, 2989, 57 }, + { "Resurrect Greater Ghost", 187, 2986, 76 }, + { "Resurrect Greater Skeleton", 188, 2988, 76 }, + { "Resurrect Greater Zombie", 189, 2990, 76 } }; //************ Options.cpp ************// diff --git a/Include/Game/Interfaces/GameTabs/Inventory.hpp b/Include/Game/Interfaces/GameTabs/Inventory.hpp index 7689e6a..53a7834 100644 --- a/Include/Game/Interfaces/GameTabs/Inventory.hpp +++ b/Include/Game/Interfaces/GameTabs/Inventory.hpp @@ -12,7 +12,7 @@ namespace Inventory { bool IsOpen(); - bool Open(bool UseHotkey = false); + bool Open(bool UseHotkey = true); std::int32_t GetTabHotkey(); std::vector GetItemIDs(); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 38174c1..ed0cfd4 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ