Merge branch 'master' into master

illiath · Sep 17, 2022 · 3d198f8 · 3d198f8
2 parents 29006ba + 2088110
commit 3d198f8
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/EnhancedFlightMap-BCC.toc b/EnhancedFlightMap-BCC.toc
@@ -1,7 +1,7 @@
 ## Interface: 20504
 ## Title: Enhanced Flight Map
 ## Author: Lysidia of Feathermoon/Myrzael & Thengel of Mankrik/Westfall (Classic)
-## Version: 3.3.0-TBC-Classic
+## Version: 3.3.1-TBC-Classic
 ## Notes: Adds enhancements to the flight system!
 ## DefaultState: Enabled
 ## LoadOnDemand: 0

diff --git a/EnhancedFlightMap-WOTLKC.toc b/EnhancedFlightMap-WOTLKC.toc
@@ -1,7 +1,7 @@
 ## Interface: 30400
 ## Title: Enhanced Flight Map
 ## Author: Lysidia of Feathermoon/Myrzael & Thengel of Mankrik/Westfall (Classic)
-## Version: 3.3.0-Wrath-Classic
+## Version: 3.3.1-Wrath-Classic
 ## Notes: Adds enhancements to the flight system!
 ## DefaultState: Enabled
 ## LoadOnDemand: 0

diff --git a/EnhancedFlightMap.toc b/EnhancedFlightMap.toc
@@ -1,7 +1,7 @@
 ## Interface: 11403
 ## Title: Enhanced Flight Map
 ## Author: Lysidia of Feathermoon/Myrzael & Thengel of Mankrik/Westfall (Classic)
-## Version: 3.3.0-Classic
+## Version: 3.3.1-Classic
 ## Notes: Adds enhancements to the flight system!
 ## DefaultState: Enabled
 ## LoadOnDemand: 0

diff --git a/FlightMapData-WOTLKC.lua b/FlightMapData-WOTLKC.lua
@@ -1130,6 +1130,27 @@ Default_EFM_FlightData = {
 					},
 				},
 				["Moonglade"] = {
+					["Nighthaven, Moonglade"] = {
+						["routes"] = {
+							"Rut'theran Village, Teldrassil", -- [1]
+						},
+						["wmLoc"] = {
+							["y"] = "0.2",
+							["x"] = "0.52",
+						},
+						["name"] = "Nighthaven, Moonglade",
+						["zmLoc"] = {
+							["y"] = "45",
+							["x"] = "44",
+						},
+						["worldMapLoc"] = {
+							["y"] = "0.33",
+							["x"] = "0.22",
+						},
+						["timers"] = {
+							["Rut'theran Village, Teldrassil"] = 153,
+						},
+					},
 					["Moonglade"] = {
 						["fmLoc"] = {
 							["y"] = "0.2",
@@ -2237,6 +2258,35 @@ Default_EFM_FlightData = {
 							["Ulduar, The Storm Peaks"] = 44,
 						},
 					},
+					["Dun Nifflelem, The Storm Peaks"] = {
+						["fmLoc"] = {
+							["y"] = "0.28",
+							["x"] = "0.72",
+						},
+						["wmLoc"] = {
+							["y"] = "0.27",
+							["x"] = "0.66",
+						},
+						["name"] = "Dun Nifflelem, The Storm Peaks",
+						["zmLoc"] = {
+							["y"] = "60",
+							["x"] = "62",
+						},
+						["worldMapLoc"] = {
+							["y"] = "0.11",
+							["x"] = "0.58",
+						},
+						["routes"] = {
+							"K3, The Storm Peaks", -- [1]
+							"Ulduar, The Storm Peaks", -- [2]
+							"Zim'Torga, Zul'Drak", -- [3]
+						},
+						["timers"] = {
+							["K3, The Storm Peaks"] = 88,
+							["Ulduar, The Storm Peaks"] = 84,
+							["Zim'Torga, Zul'Drak"] = 89,
+						},
+					},
 					["Frosthold, The Storm Peaks"] = {
 						["fmLoc"] = {
 							["y"] = "0.32",
@@ -5359,6 +5409,35 @@ Default_EFM_FlightData = {
 							["Ulduar, The Storm Peaks"] = 44,
 						},
 					},
+					["Dun Nifflelem, The Storm Peaks"] = {
+						["fmLoc"] = {
+							["y"] = "0.28",
+							["x"] = "0.72",
+						},
+						["wmLoc"] = {
+							["y"] = "0.27",
+							["x"] = "0.66",
+						},
+						["name"] = "Dun Nifflelem, The Storm Peaks",
+						["zmLoc"] = {
+							["y"] = "60",
+							["x"] = "62",
+						},
+						["worldMapLoc"] = {
+							["y"] = "0.11",
+							["x"] = "0.58",
+						},
+						["routes"] = {
+							"K3, The Storm Peaks", -- [1]
+							"Ulduar, The Storm Peaks", -- [2]
+							"Zim'Torga, Zul'Drak", -- [3]
+						},
+						["timers"] = {
+							["K3, The Storm Peaks"] = 88,
+							["Ulduar, The Storm Peaks"] = 84,
+							["Zim'Torga, Zul'Drak"] = 89,
+						},
+					},
 					["Camp Tunka'lo, The Storm Peaks"] = {
 						["fmLoc"] = {
 							["y"] = "0.25",

diff --git a/Map.lua b/Map.lua
@@ -146,7 +146,6 @@ function EFM_Map_DisplayEFMPOIs(locName, locLevel)
 
 	-- World Map
 	if (locLevel == 1) then
-	local myDebug = true
 		for index, myContinent in pairs(EFM_GetContinentList() or {}) do
 			for myZone in pairs(EFM_Data[EFM_Global_Faction][myContinent] or {}) do
 				for myNode in pairs(EFM_Data[EFM_Global_Faction][myContinent][myZone] or {}) do

diff --git a/Timer.lua b/Timer.lua
@@ -69,6 +69,22 @@ function EFM_Timer_EventFrame_OnUpdate()
 	end
 end
 
+	-- Cancel recording times if we make an emergency landing
+	hooksecurefunc("TaxiRequestEarlyLanding", function()
+		EFM_Timer_Recording = false;
+		EFM_Shared_DebugMessage("Player requested early stop.", Lys_Debug);
+	end)
+
+	hooksecurefunc("AcceptBattlefieldPort", function(index, accept)
+		EFM_Timer_Recording = false;
+		EFM_Shared_DebugMessage("Player entered BG.", Lys_Debug);
+	end)
+
+	hooksecurefunc(C_SummonInfo, "ConfirmSummon", function()
+		EFM_Timer_Recording = false;
+		EFM_Shared_DebugMessage("Player took a summon.", Lys_Debug);
+	end)
+
 -- Function: Determine remote location from taxi node
 function EFM_Timer_TakeTaxiNode(nodeID)
 	EFM_TaxiDestination	= TaxiNodeName(nodeID);
@@ -161,6 +177,7 @@ function EFM_GossipTitleButton_OnClick(this, button)
 	local myDebug = false;
 
 	local gossipText = this:GetText();
+--	local gossipText = C_GossipInfo.GetText();
 
 	if (gossipText ~= "") then
 		if (string.find(gossipText, EFM_DRUID_GOSSIPFIND) ~= nil) then