diff --git a/QuestHelper/libs/AstrolabeQH/Astrolabe.lua b/QuestHelper/libs/AstrolabeQH/Astrolabe.lua index 5d6bfac..9de5234 100644 --- a/QuestHelper/libs/AstrolabeQH/Astrolabe.lua +++ b/QuestHelper/libs/AstrolabeQH/Astrolabe.lua @@ -194,7 +194,6 @@ function Astrolabe:GetMapVirtualZones(zone) return {[1] = k} end end - local curMapID = GetCurrentMapAreaID() local zones = {GetMapZones(zone)} @@ -1947,65 +1946,65 @@ VContinent(-118, "PitofSaron", 1022.3) VirtualContinentIndexes = { -- Don't change values here, since programs might want to store them ["ScarletEnclave"] = -77, - ["GilneasCity"] = -78, - ["GilneasZone"] = -79, +-- ["GilneasCity"] = -78, +-- ["GilneasZone"] = -79, - ["UtgardeKeep1"] = -80, - ["UtgardeKeep2"] = -81, - ["UtgardeKeep3"] = -82, +-- ["UtgardeKeep1"] = -80, +-- ["UtgardeKeep2"] = -81, +-- ["UtgardeKeep3"] = -82, - ["TheNexus"] = -83, +-- ["TheNexus"] = -83, - ["AzjolNerub1"] = -84, - ["AzjolNerub2"] = -85, - ["AzjolNerub3"] = -86, +-- ["AzjolNerub1"] = -84, +-- ["AzjolNerub2"] = -85, +-- ["AzjolNerub3"] = -86, - ["Ahnkahet"] = -87, +-- ["Ahnkahet"] = -87, - ["DrakTharonKeep1"] = -88, - ["DrakTharonKeep2"] = -89, +-- ["DrakTharonKeep1"] = -88, +-- ["DrakTharonKeep2"] = -89, - ["VioletHold"] = -90, +-- ["VioletHold"] = -90, - ["Gundrak"] = -91, +-- ["Gundrak"] = -91, - ["Ulduar77"] = -92, -- Halls of Stone +-- ["Ulduar77"] = -92, -- Halls of Stone - ["HallsofLightning1"] = -93, - ["HallsofLightning2"] = -94, +-- ["HallsofLightning1"] = -93, +-- ["HallsofLightning2"] = -94, - ["Nexus801"] = -95, -- Oculus - ["Nexus802"] = -96, - ["Nexus803"] = -97, - ["Nexus804"] = -98, +-- ["Nexus801"] = -95, -- Oculus +-- ["Nexus802"] = -96, +-- ["Nexus803"] = -97, +-- ["Nexus804"] = -98, - ["CoTStratholme1"] = -99, - ["CoTStratholme2"] = -100, +-- ["CoTStratholme1"] = -99, +-- ["CoTStratholme2"] = -100, - ["UtgardePinnacle1"] = -101, -- hey they spelled it right - ["UtgardePinnacle2"] = -102, +-- ["UtgardePinnacle1"] = -101, -- hey they spelled it right +-- ["UtgardePinnacle2"] = -102, - ["VaultofArchavon"] = -103, -- Weirdly, Emalon is actually within the "Vault of Archavon" +-- ["VaultofArchavon"] = -103, -- Weirdly, Emalon is actually within the "Vault of Archavon" - ["Naxxramas1"] = -104, - ["Naxxramas2"] = -105, - ["Naxxramas3"] = -106, - ["Naxxramas4"] = -107, - ["Naxxramas5"] = -108, - ["Naxxramas6"] = -109, +-- ["Naxxramas1"] = -104, +-- ["Naxxramas2"] = -105, +-- ["Naxxramas3"] = -106, +-- ["Naxxramas4"] = -107, +-- ["Naxxramas5"] = -108, +-- ["Naxxramas6"] = -109, - ["TheObsidianSanctum"] = -110, +-- ["TheObsidianSanctum"] = -110, - ["TheEyeOfEternity"] = -111, +-- ["TheEyeOfEternity"] = -111, - ["Ulduar"] = -112, - ["Ulduar1"] = -113, - ["Ulduar2"] = -114, - ["Ulduar3"] = -115, - ["Ulduar4"] = -116, +-- ["Ulduar"] = -112, +-- ["Ulduar1"] = -113, +-- ["Ulduar2"] = -114, +-- ["Ulduar3"] = -115, +-- ["Ulduar4"] = -116, - ["TheForgeofSouls"] = -117, - ["PitofSaron"] = -118 +-- ["TheForgeofSouls"] = -117, +-- ["PitofSaron"] = -118 --[[ ["AbyssalMaw"] = -120, ["ThroneOfTheTides"] = -130, diff --git a/QuestHelper/pathfinding.lua b/QuestHelper/pathfinding.lua index d3df184..bd9604d 100644 --- a/QuestHelper/pathfinding.lua +++ b/QuestHelper/pathfinding.lua @@ -209,7 +209,7 @@ local static_shared_routes = {{29, 0.318, 0.503}, {28, 0.347, 0.84}, 130}, -- Burning Steppes <--> Searing Gorge -- Route to new zone. Not valid, exists only to keep routing from exploding if you don't have the flight routes there. - {{462, 0.5, 0.5}, {64, 0.484, 0.251}, 7200}, -- Eversong Woods <--> Sunwell + {{462, 0.5, 0.5}, {499, 0.484, 0.251}, 7200}, -- Eversong Woods <--> Sunwell {{23, 0.817, 0.461}, {502, 0.492, 0.312}, 86400}, -- EPL Ebon Hold <--> Scarlet Enclave Ebon Hold. Exists solely to fix some pathing crashes. 24-hour boat ride :D -- Nate's Cataclysm content @@ -296,7 +296,7 @@ local static_shared_routes = } -- Darkportal is handled specially, depending on whether or not you're level 58+ or not. -local dark_portal_route = {{33, 0.550, 0.541}, {56, 0.898, 0.502}, 60} +local dark_portal_route = {{19, 0.550, 0.541}, {465, 0.898, 0.502}, 60} -- Waygate local ridingLevel = (select(4,GetAchievementInfo(892)) and 300) or (select(4,GetAchievementInfo(890)) and 225) or (select(4,GetAchievementInfo(889)) and 150) or (select(4,GetAchievementInfo(891)) and 75) or 0 -- this is thanks to Maldivia, who is a fucking genius @@ -326,14 +326,14 @@ local static_zone_transitions = --Outland --Northrend - {65, 72, 0.527, 0.322}, -- Borean Tundra <--> Scholazar Basin + {486, 493, 0.527, 0.322}, -- Borean Tundra <--> Scholazar Basin --Cataclysm zones -- Work {4, 321, 0.117, 0.936}, -- Durotar <--> Orgrimmar (Front) {4, 321, 0.366, 0.253}, -- Durotar <--> Orgrimmar (Side) - {15, 321, 0.792, 0.017}, -- Azshara <--> Orgrimmar (Back) + {181, 321, 0.792, 0.017}, -- Azshara <--> Orgrimmar (Back) {772, 261, 0.687, 0.2}, -- Ahn'Qiraj <--> Silithus {37, 673, 0.50, 0.61}, -- Northern Stranglethorn <--> Cape of Stranglethorn diff --git a/QuestHelper/upgrade.lua b/QuestHelper/upgrade.lua index 8721ef2..89cf65b 100644 --- a/QuestHelper/upgrade.lua +++ b/QuestHelper/upgrade.lua @@ -109,6 +109,7 @@ QuestHelper_Zones = [3]="The Lost Isles", [4]="The Maelstrom" }, + [-77]={[0]="ScarletEnclave_Continent", [1]="ScarletEnclave"}, } @@ -178,7 +179,7 @@ QuestHelper_IndexLookup = ["Kalimdor"] = {13, 1, 0}, ["Azeroth"] = {-1, 2, 0}, ["Expansion01"] = {466, 3, 0}, - ["Sunwell"] = {789, 2, 15}, + ["Sunwell"] = {499, 2, 15}, ["BoreanTundra"] = {486, 4, 1}, ["CrystalsongForest"] = {510, 4, 2}, ["Dalaran"] = {504, 4, 3}, @@ -219,6 +220,7 @@ QuestHelper_IndexLookup = ["TheMaelstromContinent"] = {751, 5, 0}, ["TwilightHighlands"] = {700, 2, 34}, ["Hyjal_terrain1"] = {606, 1, 14}, + ["ScarletEnclave_Continent"] = {-502, -77, 0}, ["ScarletEnclave"]={502,-77,1}, } QuestHelper_RestrictedZones = { -- Everything defaults to "nil" diff --git a/QuestHelper/utility.lua b/QuestHelper/utility.lua index c4f3d3a..6dc943b 100644 --- a/QuestHelper/utility.lua +++ b/QuestHelper/utility.lua @@ -131,7 +131,7 @@ function QuestHelper:TextOut(text) local theme = self:GetColourTheme() DEFAULT_CHAT_FRAME:AddMessage(string.format("|cff%2x%2x%2xQuestHelper: |r%s", theme.message_prefix[1]*255, theme.message_prefix[2]*255, - theme.message_prefix[3]*255, text), + theme.message_prefix[3]*255, tostring(text)), theme.message[1], theme.message[2], theme.message[3])