Release 1.98
							parent
							
								
									ebec7b7776
								
							
						
					
					
						commit
						570f3299eb
					
				| 
						 | 
					@ -266,76 +266,78 @@ 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,
 | 
					            // Normal,
 | 
				
			||||||
            { "Lumbridge Home Teleport", 6, 356, 0 },
 | 
					            { "Lumbridge Home Teleport", 7, 356, 0 },
 | 
				
			||||||
            { "Wind Strike", 7, 65, 1 },
 | 
					            { "Wind Strike", 8, 65, 1 },
 | 
				
			||||||
            { "Confuse", 8, 66, 3 },
 | 
					            { "Confuse", 9, 66, 3 },
 | 
				
			||||||
            { "Enchant Crossbow Bolt", 9, 358, 0 },
 | 
					            { "Enchant Crossbow Bolt", 10, 358, 0 },
 | 
				
			||||||
            { "Water Strike", 10, 67, 5 },
 | 
					            { "Water Strike", 11, 67, 5 },
 | 
				
			||||||
            { "Lvl-1 Enchant", 11, 68, 7 },
 | 
					            { "Jewellery Enchantments", 12, 416, 7 },
 | 
				
			||||||
            { "Earth Strike", 12, 69, 9 },
 | 
					            { "Lvl-1 Enchant", 13, 1845, 7 },
 | 
				
			||||||
            { "Weaken", 13, 70, 11 },
 | 
					            { "Earth Strike", 14, 69, 9 },
 | 
				
			||||||
            { "Fire Strike", 14, 71, 13 },
 | 
					            { "Weaken", 15, 70, 11 },
 | 
				
			||||||
            { "Bones to Bananas", 15, 72, 15 },
 | 
					            { "Fire Strike", 16, 71, 13 },
 | 
				
			||||||
            { "Wind Bolt", 16, 73, 17 },
 | 
					            { "Bones to Bananas", 17, 72, 15 },
 | 
				
			||||||
            { "Curse", 17, 74, 19 },
 | 
					            { "Wind Bolt", 18, 73, 17 },
 | 
				
			||||||
            { "Bind", 18, 369, 20 },
 | 
					            { "Curse", 19, 74, 19 },
 | 
				
			||||||
            { "Low Level Alchemy", 19, 75, 21 },
 | 
					            { "Bind", 20, 369, 20 },
 | 
				
			||||||
            { "Water Bolt", 20, 76, 23 },
 | 
					            { "Low Level Alchemy", 21, 75, 21 },
 | 
				
			||||||
            { "Varrock Teleport", 21, 77, 25 },
 | 
					            { "Water Bolt", 22, 76, 23 },
 | 
				
			||||||
            { "Lvl-2 Enchant", 22, 78, 27 },
 | 
					            { "Varrock Teleport", 23, 77, 25 },
 | 
				
			||||||
            { "Earth Bolt", 23, 79, 29 },
 | 
					            { "Lvl-2 Enchant", 24, 1846, 27 },
 | 
				
			||||||
            { "Lumbridge Teleport", 24, 80, 31 },
 | 
					            { "Earth Bolt", 25, 79, 29 },
 | 
				
			||||||
            { "Telekinetic Grab", 25, 81, 33 },
 | 
					            { "Lumbridge Teleport", 26, 80, 31 },
 | 
				
			||||||
            { "Fire Bolt", 26, 82, 35 },
 | 
					            { "Telekinetic Grab", 27, 81, 33 },
 | 
				
			||||||
            { "Falador Teleport", 27, 83, 37 },
 | 
					            { "Fire Bolt", 28, 82, 35 },
 | 
				
			||||||
            { "Crumble Undead", 28, 84, 39 },
 | 
					            { "Falador Teleport", 29, 83, 37 },
 | 
				
			||||||
            { "Teleport to House", 29, 405, 40 },
 | 
					            { "Crumble Undead", 30, 84, 39 },
 | 
				
			||||||
            { "Wind Blast", 30, 85, 41 },
 | 
					            { "Teleport to House", 31, 405, 40 },
 | 
				
			||||||
            { "Superheat Item", 31, 86, 43 },
 | 
					            { "Wind Blast", 32, 85, 41 },
 | 
				
			||||||
            { "Camelot Teleport", 32, 87, 45 },
 | 
					            { "Superheat Item", 33, 86, 43 },
 | 
				
			||||||
            { "Water Blast", 33, 88, 47 },
 | 
					            { "Camelot Teleport", 34, 87, 45 },
 | 
				
			||||||
            { "Lvl-3 Enchant", 34, 89, 49 },
 | 
					            { "Water Blast", 35, 88, 47 },
 | 
				
			||||||
            { "Iban Blast", 35, 103, 50 },
 | 
					            { "Kourend Castle Teleport", 36, 410, 48 },
 | 
				
			||||||
            { "Snare", 36, 370, 50 },
 | 
					            { "Lvl-3 Enchant", 37, 1847, 49 },
 | 
				
			||||||
            { "Magic Dart", 37, 374, 50 },
 | 
					            { "Iban Blast", 38, 103, 50 },
 | 
				
			||||||
            { "Ardougne Teleport", 38, 104, 51 },
 | 
					            { "Snare", 39, 370, 50 },
 | 
				
			||||||
            { "Earth Blast", 39, 90, 53 },
 | 
					            { "Magic Dart", 40, 374, 50 },
 | 
				
			||||||
            { "High Level Alchemy", 40, 91, 55 },
 | 
					            { "Ardougne Teleport", 41, 104, 51 },
 | 
				
			||||||
            { "Charge Water Orb", 41, 92, 56 },
 | 
					            { "Earth Blast", 42, 90, 53 },
 | 
				
			||||||
            { "Lvl-4 Enchant", 42, 93, 57 },
 | 
					            { "Civitas illa Fortis Teleport", 43, 417, 54 },
 | 
				
			||||||
            { "Watchtower Teleport", 43, 105, 58 },
 | 
					            { "High Level Alchemy", 44, 91, 55 },
 | 
				
			||||||
            { "Fire Blast", 44, 94, 59 },
 | 
					            { "Charge Water Orb", 45, 92, 56 },
 | 
				
			||||||
            { "Charge Earth Orb", 45, 95, 60 },
 | 
					            { "Lvl-4 Enchant", 46, 1848, 57 },
 | 
				
			||||||
            { "Bones to Peaches", 46, 404, 60 },
 | 
					            { "Watchtower Teleport", 47, 105, 58 },
 | 
				
			||||||
            { "Saradomin strike", 47, 111, 60 },
 | 
					            { "Fire Blast", 48, 94, 59 },
 | 
				
			||||||
            { "Claws of Guthix", 48, 110, 60 },
 | 
					            { "Charge Earth Orb", 49, 95, 60 },
 | 
				
			||||||
            { "Flames of Zamorak", 49, 109, 60 },
 | 
					            { "Bones to Peaches", 50, 404, 60 },
 | 
				
			||||||
            { "Trollheim Teleport", 50, 373, 61 },
 | 
					            { "Saradomin strike", 51, 111, 60 },
 | 
				
			||||||
            { "Wind Wave", 51, 96, 62 },
 | 
					            { "Claws of Guthix", 52, 110, 60 },
 | 
				
			||||||
            { "Charge Fire Orb", 52, 97, 63 },
 | 
					            { "Flames of Zamorak", 53, 109, 60 },
 | 
				
			||||||
            { "Teleport to Ape Atoll", 53, 407, 64 },
 | 
					            { "Trollheim Teleport", 54, 373, 61 },
 | 
				
			||||||
            { "Water Wave", 54, 98, 65 },
 | 
					            { "Wind Wave", 55, 96, 62 },
 | 
				
			||||||
            { "Charge Air Orb", 55, 99, 66 },
 | 
					            { "Charge Fire Orb", 56, 97, 63 },
 | 
				
			||||||
            { "Vulnerability", 56, 106, 66 },
 | 
					            { "Teleport to Ape Atoll", 57, 407, 64 },
 | 
				
			||||||
            { "Lvl-5 Enchant", 57, 100, 68 },
 | 
					            { "Water Wave", 58, 98, 65 },
 | 
				
			||||||
            { "Teleport to Kourend", 58, 410, 69 },
 | 
					            { "Charge Air Orb", 59, 99, 66 },
 | 
				
			||||||
            { "Earth Wave", 59, 101, 70 },
 | 
					            { "Vulnerability", 60, 106, 66 },
 | 
				
			||||||
            { "Enfeeble", 60, 107, 73 },
 | 
					            { "Lvl-5 Enchant", 61, 1849, 68 },
 | 
				
			||||||
            { "Teleother Lumbridge", 61, 399, 74 },
 | 
					            { "Earth Wave", 62, 101, 70 },
 | 
				
			||||||
            { "Fire Wave", 62, 102, 75 },
 | 
					            { "Enfeeble", 63, 107, 73 },
 | 
				
			||||||
            { "Entangle", 63, 371, 79 },
 | 
					            { "Teleother Lumbridge", 64, 399, 74 },
 | 
				
			||||||
            { "Stun", 64, 108, 80 },
 | 
					            { "Fire Wave", 65, 102, 75 },
 | 
				
			||||||
            { "Charge", 65, 372, 80 },
 | 
					            { "Entangle", 66, 371, 79 },
 | 
				
			||||||
            { "Wind Surge", 66, 412, 81 },
 | 
					            { "Stun", 67, 108, 80 },
 | 
				
			||||||
            { "Teleother Falador", 67, 400, 82 },
 | 
					            { "Charge", 68, 372, 80 },
 | 
				
			||||||
            { "Water Surge", 68, 413, 85 },
 | 
					            { "Wind Surge", 69, 412, 81 },
 | 
				
			||||||
            { "Tele Block", 69, 402, 85 },
 | 
					            { "Teleother Falador", 70, 400, 82 },
 | 
				
			||||||
            { "Teleport to Bounty Target", 70, 409, 85 },
 | 
					            { "Water Surge", 71, 413, 85 },
 | 
				
			||||||
            { "Lvl-6 Enchant", 71, 403, 87 },
 | 
					            { "Tele Block", 72, 402, 85 },
 | 
				
			||||||
            { "Teleother Camelot", 72, 401, 90 },
 | 
					            { "Teleport to Bounty Target", 73, 409, 85 },
 | 
				
			||||||
            { "Earth Surge", 73, 414, 90 },
 | 
					            { "Lvl-6 Enchant", 74, 1850, 87 },
 | 
				
			||||||
            { "Lvl-7 Enchant", 74, 411, 93 },
 | 
					            { "Teleother Camelot", 75, 401, 90 },
 | 
				
			||||||
            { "Fire Surge", 75, 415, 95 },
 | 
					            { "Earth Surge", 76, 414, 90 },
 | 
				
			||||||
 | 
					            { "Lvl-7 Enchant", 77, 1851, 93 },
 | 
				
			||||||
 | 
					            { "Fire Surge", 78, 415, 95 },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            //Lunar 70-114
 | 
					            //Lunar 70-114
 | 
				
			||||||
            { "Lunar Home Teleport", 101, 356, 0 },
 | 
					            { "Lunar Home Teleport", 101, 356, 0 },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,6 +13,7 @@ namespace Magic
 | 
				
			||||||
        NORMAL_CONFUSE,
 | 
					        NORMAL_CONFUSE,
 | 
				
			||||||
        NORMAL_ENCHANT_CROSSBOW_BOLT,
 | 
					        NORMAL_ENCHANT_CROSSBOW_BOLT,
 | 
				
			||||||
        NORMAL_WATER_STRIKE,
 | 
					        NORMAL_WATER_STRIKE,
 | 
				
			||||||
 | 
					        NORMAL_JEWELLERY_ENCHANTS,
 | 
				
			||||||
        NORMAL_LVL1_ENCHANT,
 | 
					        NORMAL_LVL1_ENCHANT,
 | 
				
			||||||
        NORMAL_EARTH_STRIKE,
 | 
					        NORMAL_EARTH_STRIKE,
 | 
				
			||||||
        NORMAL_WEAKEN,
 | 
					        NORMAL_WEAKEN,
 | 
				
			||||||
| 
						 | 
					@ -36,12 +37,14 @@ namespace Magic
 | 
				
			||||||
        NORMAL_SUPERHEAT_ITEM,
 | 
					        NORMAL_SUPERHEAT_ITEM,
 | 
				
			||||||
        NORMAL_CAMELOT_TELEPORT,
 | 
					        NORMAL_CAMELOT_TELEPORT,
 | 
				
			||||||
        NORMAL_WATER_BLAST,
 | 
					        NORMAL_WATER_BLAST,
 | 
				
			||||||
 | 
					        NORMAL_TELEPORT_TO_KOUREND,
 | 
				
			||||||
        NORMAL_LVL3_ENCHANT,
 | 
					        NORMAL_LVL3_ENCHANT,
 | 
				
			||||||
        NORMAL_IBAN_BLAST,
 | 
					        NORMAL_IBAN_BLAST,
 | 
				
			||||||
        NORMAL_SNARE,
 | 
					        NORMAL_SNARE,
 | 
				
			||||||
        NORMAL_MAGIC_DART,
 | 
					        NORMAL_MAGIC_DART,
 | 
				
			||||||
        NORMAL_ARDOUGNE_TELEPORT,
 | 
					        NORMAL_ARDOUGNE_TELEPORT,
 | 
				
			||||||
        NORMAL_EARTH_BLAST,
 | 
					        NORMAL_EARTH_BLAST,
 | 
				
			||||||
 | 
					        NORMAL_TELEPORT_TO_CIVITAS,
 | 
				
			||||||
        NORMAL_HIGH_LEVEL_ALCHEMY,
 | 
					        NORMAL_HIGH_LEVEL_ALCHEMY,
 | 
				
			||||||
        NORMAL_CHARGE_WATER_ORB,
 | 
					        NORMAL_CHARGE_WATER_ORB,
 | 
				
			||||||
        NORMAL_LVL4_ENCHANT,
 | 
					        NORMAL_LVL4_ENCHANT,
 | 
				
			||||||
| 
						 | 
					@ -60,7 +63,6 @@ namespace Magic
 | 
				
			||||||
        NORMAL_CHARGE_AIR_ORB,
 | 
					        NORMAL_CHARGE_AIR_ORB,
 | 
				
			||||||
        NORMAL_VULNERABILITY,
 | 
					        NORMAL_VULNERABILITY,
 | 
				
			||||||
        NORMAL_LVL5_ENCHANT,
 | 
					        NORMAL_LVL5_ENCHANT,
 | 
				
			||||||
        NORMAL_TELEPORT_TO_KOUREND,
 | 
					 | 
				
			||||||
        NORMAL_EARTH_WAVE,
 | 
					        NORMAL_EARTH_WAVE,
 | 
				
			||||||
        NORMAL_ENFEEBLE,
 | 
					        NORMAL_ENFEEBLE,
 | 
				
			||||||
        NORMAL_TELEOTHER_LUMBRIDGE,
 | 
					        NORMAL_TELEOTHER_LUMBRIDGE,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
		Reference in New Issue