diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index 7d9242d..b294201 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -416,49 +416,49 @@ namespace Globals // Arceuus 141-177 { "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 }, + { "Basic Reanimation", 146, 1247, 16 }, + { "Arceuus Library Teleport", 147, 1252, 6 }, + { "Adept Reanimation", 148, 1248, 41 }, + { "Master Reanimation", 149, 1249, 72 }, + { "Expert Reanimation", 150, 1250, 90 }, + { "Draynor Manor Teleport", 151, 1253, 17 }, + { "Battlefront Teleport", 163, 1255, 23 }, + { "Mind Altar Teleport", 153, 1256, 28 }, + { "Respawn Teleport", 154, 1257, 34 }, + { "Salve Graveyard Teleport", 155, 1258, 40 }, + { "Fenkenstrain's Castle Teleport", 156, 1259, 48 }, + { "West Ardougne Teleport", 157, 1260, 61 }, + { "Harmony Island Teleport", 158, 1261, 65 }, + { "Cemetery Teleport", 159, 1264, 71 }, + { "Resurrect Crops", 160, 1266, 78 }, + { "Barrows Teleport", 161, 1262, 83 }, + { "Ape Atoll Teleport", 162, 1263, 90 }, + { "Inferior Demonbane", 164, 1302, 44 }, + { "Superior Demonbane", 165, 1303, 62 }, + { "Dark Demonbane", 166, 1304, 82 }, + { "Mark of Darkness", 167, 1305, 59 }, + { "Ghostly Grasp", 168, 1267, 35 }, + { "Skeletal Grasp", 169, 1268, 56 }, + { "Undead Grasp", 170, 1269, 79 }, + { "Ward of Arceuus", 171, 1306, 73 }, + { "Lesser Corruption", 172, 1307, 64 }, + { "Greater Corruption", 173, 1308, 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 } + { "Degrime", 176, 1318, 70 }, + { "Shadow Veil", 177, 1315, 47 }, + { "Vile Vigour", 178, 1317, 66 }, + { "Dark Lure", 179, 1316, 50 }, + { "Death Charge", 180, 1310, 80 }, + { "Resurrect Lesser Ghost", 181, 1270, 38 }, + { "Resurrect Lesser Skeleton", 182, 1271, 38 }, + { "Resurrect Lesser Zombie", 183, 1300, 38 }, + { "Resurrect Superior Ghost", 184, 2979, 57 }, + { "Resurrect Superior Skeleton", 185, 2981, 57 }, + { "Resurrect Superior Zombie", 186, 2983, 57 }, + { "Resurrect Greater Ghost", 187, 2980, 76 }, + { "Resurrect Greater Skeleton", 188, 2982, 76 }, + { "Resurrect Greater Zombie", 189, 2984, 76 } }; //************ Options.cpp ************// diff --git a/Include/Game/Interfaces/GameTabs/Magic.hpp b/Include/Game/Interfaces/GameTabs/Magic.hpp index c45dbab..978c089 100644 --- a/Include/Game/Interfaces/GameTabs/Magic.hpp +++ b/Include/Game/Interfaces/GameTabs/Magic.hpp @@ -200,10 +200,19 @@ namespace Magic NONE } SPELL; + typedef enum SPELLBOOK { + NORMAL = 0, + ANCIENT, + LUNAR, + ARCEUUS + } SPELLBOOK; + bool IsOpen(); bool Open(bool UseHotkey = false); std::int32_t GetTabHotkey(); + SPELLBOOK GetActiveSpellbook(); + bool HasLevel(const SPELL& Spell); bool IsSpellSelected(); diff --git a/Include/Game/Tools/Worlds.hpp b/Include/Game/Tools/Worlds.hpp index 1c2ce6f..d604e3a 100644 --- a/Include/Game/Tools/Worlds.hpp +++ b/Include/Game/Tools/Worlds.hpp @@ -11,23 +11,23 @@ namespace Worlds { bool Refresh(); - bool SwitchWorld(Internal::World World); + bool SwitchWorld(const Internal::World& World); bool SwitchWorld(std::int32_t WorldID); std::int32_t GetCurrent(); std::vector GetAll(); - std::int32_t GetIndexOf(Internal::World World); + std::int32_t GetIndexOf(const Internal::World& World); std::int32_t GetIndexOf(std::int32_t WorldID); std::vector GetF2P(); std::vector GetP2P(); - bool IsP2P(Internal::World World); + bool IsP2P(const Internal::World& World); bool IsP2P(std::int32_t WorldID); Internal::World GetBy(std::int32_t WorldID); - std::vector GetBy(const std::function& Filter); + std::vector GetBy(const std::function& Filter); } #endif // WORLDS_HPP_INCLUDED diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 1ce2bf8..04c4b5f 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ