Release 1.71

master
Kasi 2021-12-24 13:32:33 +00:00
parent 9e44b117e3
commit 07b80226c8
5 changed files with 83 additions and 60 deletions

View File

@ -413,42 +413,50 @@ namespace Globals
{ "Edgeville Home Teleport", 99, 356, 0 },
// Arceuus 141-177
{ "Arceuus Home Teleport", 144, 356, 0 },
{ "Reanimate Goblin", 145, 1247, 3 },
{ "Lumbridge Graveyard Teleport", 146, 1294, 6 },
{ "Reanimate Monkey", 147, 1264, 7 },
{ "Reanimate Imp", 148, 1258, 12 },
{ "Reanimate Minotaur", 149, 1259, 16 },
{ "Draynor Manor Teleport", 150, 1295, 17 },
{ "Reanimate Scorpion", 151, 1257, 19 },
{ "Reanimate Bear", 152, 1256, 21 },
{ "Reanimate Unicorn", 153, 1260, 22 },
{ "Reanimate Dog", 154, 1268, 26 },
{ "Mind Altar Teleport", 155, 1296, 28 },
{ "Reanimate Chaos Druid", 156, 1251, 30 },
{ "Respawn Teleport", 157, 1319, 34 },
{ "Reanimate Giant", 158, 1255, 37 },
{ "Salve Graveyard Teleport", 159, 1320, 40 },
{ "Reanimate Ogre", 160, 1254, 40 },
{ "Reanimate Elf", 161, 1250, 43 },
{ "Reanimate Troll", 162, 1252, 46 },
{ "Fenkenstrain's Castle Teleport", 163, 1321, 48 },
{ "Reanimate Horror", 164, 1266, 52 },
{ "Reanimate Kalphite", 165, 1261, 57 },
{ "West Ardougne Teleport", 166, 1322, 61 },
{ "Reanimate Dagannoth", 167, 1253, 62 },
{ "Reanimate Bloodveld", 168, 1292, 65 },
{ "Harmony Island Teleport", 169, 1323, 65 },
{ "Reanimate TzHaar", 170, 1287, 69 },
{ "Cemetery Teleport", 171, 1324, 71 },
{ "Reanimate Demon", 172, 1273, 72 },
{ "Reanimate Aviansie", 173, 1288, 78 },
{ "Resurrect Crops", 174, 1327, 78 },
{ "Barrows Teleport", 175, 1325, 83 },
{ "Reanimate Abyssal Creature", 176, 1290, 85 },
{ "Ape Atoll Teleport", 177, 1326, 90 },
{ "Reanimate Dragon", 178, 1274, 93 },
{ "Battlefront Teleport", 179, 1325, 23 },
{ "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 },
};
//************ Options.cpp ************//

View File

@ -153,41 +153,49 @@ namespace Magic
ANCIENT_EDGEVILLE_HOME_TELEPORT,
ARCEUUS_ARCEUUS_HOME_TELEPORT,
ARCEUUS_REANIMATE_GOBLIN,
ARCEUUS_LUMBRIDGE_GRAVEYARD_TELEPORT,
ARCEUUS_REANIMATE_MONKEY,
ARCEUUS_REANIMATE_IMP,
ARCEUUS_REANIMATE_MINOTAUR,
ARCEUUS_BASIC_REANIMATION,
ARCEUUS_ARCEUUS_LIBRARY_TELEPORT,
ARCEUUS_ADEPT_REANIMATION,
ARCEUUS_EXPERT_REANIMATION,
ARCEUUS_MASTER_REANIMATION,
ARCEUUS_DRAYNOR_MANOR_TELEPORT,
ARCEUUS_REANIMATE_SCORPION,
ARCEUUS_REANIMATE_BEAR,
ARCEUUS_REANIMATE_UNICORN,
ARCEUUS_REANIMATE_DOG,
ARCEUUS_MIND_ALTAR_TELEPORT,
ARCEUUS_REANIMATE_CHAOS_DRUID,
ARCEUUS_RESPAWN_TELEPORT,
ARCEUUS_REANIMATE_GIANT,
ARCEUUS_SALVE_GRAVEYARD_TELEPORT,
ARCEUUS_REANIMATE_OGRE,
ARCEUUS_REANIMATE_ELF,
ARCEUUS_REANIMATE_TROLL,
ARCEUUS_FENKENSTRAINS_CASTLE_TELEPORT,
ARCEUUS_REANIMATE_HORROR,
ARCEUUS_REANIMATE_KALPHITE,
ARCEUUS_WEST_ARDOUGNE_TELEPORT,
ARCEUUS_REANIMATE_DAGANNOTH,
ARCEUUS_REANIMATE_BLOODVELD,
ARCEUUS_HARMONY_ISLAND_TELEPORT,
ARCEUUS_REANIMATE_TZHAAR,
ARCEUUS_CEMETERY_TELEPORT,
ARCEUUS_REANIMATE_DEMON,
ARCEUUS_REANIMATE_AVIANSIE,
ARCEUUS_RESURRECT_CROPS,
ARCEUUS_BARROWS_TELEPORT,
ARCEUUS_REANIMATE_ABYSSAL_CREATURE,
ARCEUUS_APE_ATOLL_TELEPORT,
ARCEUUS_REANIMATE_DRAGON,
ARCEUUS_BATTLEFRONT_TELEPORT,
ARCEUUS_INFERIOR_DEMONBANE,
ARCEUUS_SUPERIOR_DEMONBANE,
ARCEUUS_DARK_DEMONBANE,
ARCEUUS_MARK_OF_DARKNESS,
ARCEUUS_GHOSTLY_GRASP,
ARCEUUS_SKELETAL_GRASP,
ARCEUUS_UNDEAD_GRASP,
ARCEUUS_WARD_OF_ARCEUUS,
ARCEUUS_LESSER_CORRUPTION,
ARCEUUS_GREATER_CORRUPTION,
ARCEUUS_DEMONIC_OFFERING,
ARCEUUS_SINISTER_OFFERING,
ARCEUUS_DEGRIME,
ARCEUUS_SHADOW_VEIL,
ARCEUUS_VILE_VIGOUR,
ARCEUUS_DARK_LURE,
ARCEUUS_DEATH_CHARGE,
ARCEUUS_RESURRECT_LESSER_GHOST,
ARCEUUS_RESURRECT_LESSER_SKELETON,
ARCEUUS_RESURRECT_LESSER_ZOMBIE,
ARCEUUS_RESURRECT_SUPERIOR_GHOST,
ARCEUUS_RESURRECT_SUPERIOR_SKELETON,
ARCEUUS_RESURRECT_SUPERIOR_ZOMBIE,
ARCEUUS_RESURRECT_GREATER_GHOST,
ARCEUUS_RESURRECT_GREATER_SKELETON,
ARCEUUS_RESURRECT_GREATER_ZOMBIE,
NONE
} SPELL;

View File

@ -38,6 +38,13 @@ namespace Minimap
*/
Tile GetInstancePosition();
/**
* @brief Converts World position to global tile
*
* @return ..
*/
Tile WorldToGlobal(std::int32_t X, std::int32_t Y);
/**
* @brief Returns the tile of the local players destination
*

View File

@ -20,7 +20,7 @@ namespace Projectiles
Interactable::Projectile Get(const Tile& T);
Interactable::Projectile Get(std::int32_t ID, std::int32_t Distance = -1);
Interactable::Projectile Get(const std::vector<std::int32_t>& IDs, std::int32_t Distance = -1);
Interactable::Projectile Get(const std::function<bool (Interactable::Projectile&)>& Filter, std::int32_t Distance = -1);
Interactable::Projectile Get(const std::function<bool (const Interactable::Projectile&)>& Filter, std::int32_t Distance = -1);
}

Binary file not shown.