Update to 10.2.0

Author: Tga123

Callings/CallingsBoard.lua

@@ -64,9 +64,13 @@ function WQT_CallingsBoardMixin:OnLoad()
 	self.lastUpdate = 0;
 	self:UpdateCovenant();
 
-	hooksecurefunc(WorldMapFrame, "OnMapChanged", function()
-			self:OnMapChanged(WorldMapFrame:GetMapID());
-		end)
+	-- hooksecurefunc(WorldMapFrame, "OnMapChanged", function()
+			-- self:OnMapChanged(WorldMapFrame:GetMapID());
+		-- end)
+	EventRegistry:RegisterCallback("MapCanvas.MapSet", function(_,mapID) 
+			-- Now we do it modern way.
+			self:OnMapChanged(mapID);
+		end);
 
 	self:RequestUpdate();
 end

Data.lua

@@ -156,6 +156,7 @@ local WQT_DRAGONFLIGHT = {
 	[2025] =  {["x"] = 0.63, ["y"] = 0.50}, -- Thaldraszus
 	[2085] =  {["x"] = 0.66, ["y"] = 0.57}, -- Primalist Future
 	[2133] =  {["x"] = 0.86, ["y"] = 0.83}, -- Zaralek Cavern
+	[2200] =  {["x"] = 0.31, ["y"] = 0.55}, -- Emerald Dream
 }
 local WQT_SHADOWLANDS = {
 	[1543] =  {["x"] = 0.23, ["y"] = 0.13}, -- The Maw
@@ -309,6 +310,7 @@ local ZonesByExpansion = {
 		2025, -- Thaldraszus
 		2085, -- Primalist Future
 		2133, -- Zaralek Cavern
+		2200, -- Emerald Dream
 	}
 	,[LE_EXPANSION_SHADOWLANDS] = {
 		1550, -- The Shadowlands
@@ -785,15 +787,13 @@ _V["SETTING_LIST"] = {
 			end
 			,["getValueFunc"] = function() return WQT.settings.list.includeDaily end
 			}
-	
 	,{["template"] = "WQT_SettingCheckboxTemplate", ["categoryID"] = "GENERAL_DRAGONFLIGHT", ["label"] = _L["GOLD_PURSES"], ["tooltip"] = _L["GOLD_PURSES_TT"], ["isNew"] = true
 			, ["valueChangedFunc"] = function(value)
 				WQT.settings.general.df_goldPurses = value;
 				WQT_WorldQuestFrame.dataProvider:ReloadQuestRewards();
 			end
 			,["getValueFunc"] = function() return WQT.settings.general.df_goldPurses end
 			}
-
 	,{["template"] = "WQT_SettingCheckboxTemplate", ["categoryID"] = "GENERAL_SHADOWLANDS", ["label"] = _L["CALLINGS_BOARD"], ["tooltip"] = _L["CALLINGS_BOARD_TT"]
 			, ["valueChangedFunc"] = function(value) 
 				WQT.settings.general.sl_callingsBoard = value;
@@ -1271,26 +1271,39 @@ _V["FILTER_FUNCTIONS"] = {
 -- /dump WorldMapFrame:GetMapID()
 -- /dump FlightMapFrame:GetMapID()
 _V["WQT_CONTINENT_GROUPS"] = {
-		[875]	= {876} 
-		,[1011]	= {876}  -- Zandalar flightmap
-		,[876]	= {875}
-		,[1014]	= {875} -- Kul Tiras flightmap
+		[2200] = {1978,2133} -- Emerald Dream 
+		,[2241] = {1978,2133} -- Emerald Dream flightmap
+		,[2133] = {1978,2200} -- Zaralek Cavern 
+		,[2175] = {1978,2200} -- Zaralek Cavern flightmap
+		,[1978] = {2133,2200} -- Dragonflight
+		,[2057] = {2133,2200} -- Dragonflight flightmap
+		,[875]	= {876, 1355} -- Zandalar
+		,[1011]	= {876, 1355} -- Zandalar flightmap
+		,[876]	= {875, 1355} -- Kul Tiras
+		,[1014]	= {875, 1355} -- Kul Tiras flightmap
+		,[1355]	= {875, 876} -- Nazjatar
 		,[1504]	= {875, 876} -- Nazjatar flightmap
 		,[619]	= {905} -- Legion
 		,[905]	= {619} -- Argus
 
 	}
 
 _V["ZONE_SUBZONES"] = {
-	[2025] = {2112, 2085, 2133}; -- Thaldraszus, Valdrakken, Primalist Future, Zaralek Cavern
+	[2025] = {2112, 2085}; -- Thaldraszus, Valdrakken, Primalist Future
 	[1565] = {1701, 1702, 1703}; -- Ardenweald covenant
 	[1533] = {1707, 1708}; -- Bastion Covenant
 	[1525] = {1699, 1700}; -- Revendreth Covenant
 	[1536] = {1698}; -- Maldraxxus Covenant
 }
 
 _V["WQT_ZONE_MAPCOORDS"] = {
-		[2057] = WQT_DRAGONFLIGHT -- Dragonflight flightmap
+		[2241]	= { -- Emerald Dream flightmap
+			[2200] = {["x"] = 0, ["y"] = 0} -- Emerald Dream
+		}
+		,[2175]	= { -- Zaralek Cavern flightmap
+			[2133] = {["x"] = 0, ["y"] = 0} -- Zaralek Cavern
+		}
+		,[2057] = WQT_DRAGONFLIGHT -- Dragonflight flightmap
 		,[1978] = WQT_DRAGONFLIGHT -- Dragonflight
 		,[1647] = WQT_SHADOWLANDS -- Shadowlands flightmap
 		,[1550]	= WQT_SHADOWLANDS -- Shadowlands
@@ -1332,7 +1345,7 @@ _V["WQT_ZONE_MAPCOORDS"] = {
 		}
 	}
 
-_V["WQT_NO_FACTION_DATA"] = { ["expansion"] = 0 ,["playerFaction"] = nil ,["texture"] = 134400, ["name"]=_L["NO_FACTION"] } -- No faction
+_V["WQT_NO_FACTION_DATA"] = { ["expansion"] = 0 ,["playerFaction"] = nil ,["texture"] = 1103069, ["name"]=_L["NO_FACTION"] } -- No faction
 _V["WQT_FACTION_DATA"] = {
 	[67] = 		{ ["expansion"] = LE_EXPANSION_CLASSIC ,["playerFaction"] = nil ,["texture"] = 2203914 } -- Horde
 	,[469] = 	{ ["expansion"] = LE_EXPANSION_CLASSIC ,["playerFaction"] = nil ,["texture"] = 2203912 } -- Alliance
@@ -1392,6 +1405,7 @@ _V["WQT_FACTION_DATA"] = {
 	,[2526] =	{ ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 4901295 } -- Winterpelt Furbolg
 	,[2564] =	{ ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 5140835 } -- Loamm Niffen
 	,[2553] =	{ ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 609811 } -- Soridormi
+	,[2574] =	{ ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 5244643 } -- Dream Wardens
 }
 -- Add localized faction names
 for k, v in pairs(_V["WQT_FACTION_DATA"]) do
@@ -1456,7 +1470,6 @@ _V["WQT_DEFAULTS"] = {
 			bountyReward = false;
 			bountySelectedOnly = true;
 			showDisliked = true;
-			
 			df_goldPurses = false;
 			sl_callingsBoard = true;
 			sl_genericAnimaIcons = false;
@@ -1530,6 +1543,16 @@ end
 
 -- This is just easier to maintain than changing the entire string every time
 _V["PATCH_NOTES"] = {
+		{["version"] = "10.2.0.0",
+			["intro"] = { "Update for 10.2.0." },
+			["new"] ={
+				"Added new Dragonflight zones and factions.",
+			},
+			["fixes"] = {
+				"Updated embedded libraries.",
+				"Minor fixes.",
+			},
+		},
 		{["version"] = "10.1.7.0",
 			["intro"] = { "Update for 10.1.7." },
 			["new"] ={

Dataprovider.lua

@@ -240,7 +240,7 @@ function QuestInfoMixin:LoadRewards(force)
 					elseif (typeID == 0 and subTypeID == 8 and price == 0 and ilvl > 100) then 
 						-- Item converting into equipment
 						self:AddReward(WQT_REWARDTYPE.equipment, ilvl, texture, quality, WQT_Utils:GetColor(_V["COLOR_IDS"].rewardArmor), rewardId);
-					elseif (rewardId == 199192 or rewardId == 204359 or rewardId == 205226) and WQT.settings.general.df_goldPurses then
+					elseif (rewardId == 199192 or rewardId == 204359 or rewardId == 205226 or rewardId == 210549) and WQT.settings.general.df_goldPurses then
 						--Treat dragon racer's purse rewards as gold.
 						self:AddReward(WQT_REWARDTYPE.gold, 525*100*100, 133784, 1, WQT_Utils:GetColor(_V["COLOR_IDS"].rewardGold));
 					else
@@ -491,12 +491,15 @@ function WQT_DataProvider:Init()
 	self.waitingRoomRewards = {};
 
 	self.bufferedZones = {};
-	hooksecurefunc(WorldMapFrame, "OnMapChanged", function() 
-			-- If we change map, reset the CD, we want new quest info
-			self:LoadQuestsInZone(WorldMapFrame.mapID);
+	-- hooksecurefunc(WorldMapFrame, "OnMapChanged", function() 
+			-- -- If we change map, reset the CD, we want new quest info
+			-- self:LoadQuestsInZone(WorldMapFrame.mapID);
+		-- end);
+	EventRegistry:RegisterCallback("MapCanvas.MapSet", function(_,mapID) 
+			-- Now we do it modern way.
+			self:LoadQuestsInZone(mapID);
 		end);
-
-	UpdateAzerothZones(); 
+	UpdateAzerothZones();
 
 	self.updateCD = 0;
 end
@@ -512,7 +515,7 @@ function WQT_DataProvider:OnEvent(event, ...)
 
 	elseif (event == "PLAYER_LEVEL_UP") then
 		local level = ...;
-		UpdateAzerothZones(level); 
+		UpdateAzerothZones(level);
 	end
 end
 
@@ -615,7 +618,7 @@ function WQT_DataProvider:LoadQuestsInZone(zoneID)
 	self.latestZoneId = zoneID
 	-- If the flight map is open, we want all quests no matter what
 	if ((FlightMapFrame and FlightMapFrame:IsShown()) ) then 
-		local taxiId = GetTaxiMapID()
+		local taxiId = FlightMapFrame and FlightMapFrame:GetMapID() or GetTaxiMapID()
 		zoneID = (taxiId and taxiId > 0) and taxiId or zoneID;
 		-- World Flight Map add-on overwrite
 		if (_WFMLoaded) then
@@ -698,7 +701,7 @@ function WQT_DataProvider:AddQuest(qInfo)
 	-- Dragonflight devs forgot to flagged some tech quests with "MapUtil.ShouldShowTask", and past it in Vol'dun location.
 	-- It make Vol'dun's map messy. This should fix it.
 	if (qInfo.questId > 60000) and (qInfo.mapID == 864) then alwaysHide = true; end
-	
+
 	local posX, posY = WQT_Utils:GetQuestMapLocation(qInfo.questId, qInfo.mapID);
 	local haveRewardData = questInfo:Init(qInfo.questId, qInfo.isDaily, qInfo.isCombatAllyQuest, alwaysHide, posX, posY);
 

MapPinProvider.lua

@@ -122,7 +122,12 @@ function WQT_PinDataProvider:Init()
 		end, addonName);
 
 	-- Fix pings and fades when switching map
-	hooksecurefunc(WorldMapFrame, "OnMapChanged", function() 
+	-- hooksecurefunc(WorldMapFrame, "OnMapChanged", function() 
+			-- wipe(self.pingedQuests);
+			-- self:UpdateQuestPings();
+		-- end);
+	EventRegistry:RegisterCallback("MapCanvas.MapSet", function() 
+			-- Now we do it modern way.
 			wipe(self.pingedQuests);
 			self:UpdateQuestPings();
 		end);

Templates.lua

@@ -344,8 +344,8 @@ function WQT_Utils:GetFactionDataInternal(id)
 
 	if (not factionData[id]) then
 		-- Add new faction in case it's not in our data yet
-		factionData[id] = { ["expansion"] = 0 ,["faction"] = nil ,["texture"] = 1103069, ["unknown"] = true } 
-		factionData[id].name = GetFactionInfoByID(id) or "Unknown Faction";
+		factionData[id] = { ["expansion"] = 0 ,["faction"] = nil ,["texture"] = 134400, ["unknown"] = true } 
+		factionData[id].name = GetFactionInfoByID(id) or UNKNOWN;
 		WQT:debugPrint("Added new faction", id,factionData[id].name);
 	end
 

WorldQuestTab.lua

@@ -1694,7 +1694,7 @@ end
 function WQT_ScrollListMixin:DisplayQuestList()
 	local mapId = WorldMapFrame.mapID;
 	if (((FlightMapFrame and FlightMapFrame:IsShown()) or TaxiRouteMap:IsShown()) and not _WFMLoaded) then 
-		local taxiId = GetTaxiMapID()
+		local taxiId = FlightMapFrame and FlightMapFrame:GetMapID() or GetTaxiMapID()
 		mapId = (taxiId and taxiId > 0) and taxiId or mapId;
 	end
 	local mapInfo = WQT_Utils:GetCachedMapInfo(mapId or 0);	
@@ -2155,11 +2155,17 @@ function WQT_CoreMixin:OnLoad()
 
 	-- World map
 	-- If we were reading details when we switch maps, change back to normal quests
-	hooksecurefunc(WorldMapFrame, "OnMapChanged", function()
+	-- hooksecurefunc(WorldMapFrame, "OnMapChanged", function()
+			-- if (self.selectedTab == WQT_TabDetails) then
+				-- self:SelectTab(WQT_TabNormal); 
+			-- end
+		-- end)
+	EventRegistry:RegisterCallback("MapCanvas.MapSet", function() 
+			-- Now we do it modern way.
 			if (self.selectedTab == WQT_TabDetails) then
 				self:SelectTab(WQT_TabNormal); 
 			end
-		end)
+		end);
 
 	-- Update when opening the map
 	WorldMapFrame:HookScript("OnShow", function() 
@@ -2637,7 +2643,7 @@ function WQT_CoreMixin:TAXIMAP_OPENED(system)
 	end
 
 	WQT_WorldQuestFrame:ChangeAnchorLocation(anchor);
-	self.dataProvider:LoadQuestsInZone(GetTaxiMapID());
+	self.dataProvider:LoadQuestsInZone(FlightMapFrame and FlightMapFrame:GetMapID() or GetTaxiMapID());
 end
 
 -- Reset official map filters

WorldQuestTab.toc

@@ -1,8 +1,8 @@
-## Interface: 100107
+## Interface: 100200
 ## Title: World Quest Tab
 ## Notes: Creates a new quest tab to keep track of world quests.
 ## Author: LanceDH
-## Version: 10.1.7.0
+## Version: 10.2.0.0
 ## SavedVariables: BWQDB
 ## X-Website: https://www.curseforge.com/wow/addons/worldquesttab
 ## X-Curse-Project-ID: 102243