Pull 4.1.0 Release (#36)

* Pause flight recording while the player is in a loading screen, to avoid incomplete recording in the transition between ghostlands and the rest of Eastern Kingdom * Replace the recording timer without averaging if there is more than 30 seconds of discrepancy to override any already recorded time on flight paths that going through portals before the previous commit * Add support for cata and first round of flight times. Alliance is mostly done, Horde needs work. * no +x * For real this time... * Update Changelog * Fix Exodar/Blood Watch World Locations * more updates * alphabatize horde data & add more times * Dark Portal FPs renamed by Blizzard * Add ~all Horde flight times. Boy, are my arms tired! Update TOC numbers --------- Co-authored-by: javier himura <[email protected]>
illiath · May 18, 2024 · 6e4fcb0 · 6e4fcb0
1 parent 3aef937
commit 6e4fcb0
Show file tree

Hide file tree

Showing 11 changed files with 2,191 additions and 1,326 deletions.
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.1-TBC-Classic
+## Version: 4.1.0-Classic/Cata
 ## Notes: Adds enhancements to the flight system!
 ## DefaultState: Enabled
 ## LoadOnDemand: 0

diff --git a/EnhancedFlightMap-Cata.toc b/EnhancedFlightMap-Cata.toc
@@ -1,11 +1,11 @@
 ## Interface: 40400
 ## Title: Enhanced Flight Map
 ## Author: Lysidia of Feathermoon/Myrzael & Thengel of Mankrik/Westfall (Classic)
-## Version: 3.3.1-Wrath-Classic
+## Version: 4.1.0-Classic/Cata
 ## Notes: Adds enhancements to the flight system!
 ## DefaultState: Enabled
 ## LoadOnDemand: 0
-## X-Expansion-Level: 3
+## X-Expansion-Level: 4
 ## X-Curse-Project-ID: 489980
 ## SavedVariables: EFM_Data,EFM_WaterNodes,EFM_ImportData
 ## SavedVariablesPerCharacter: EFM_MyConf,EFM_KnownNodes,EFM_ReachableNodes
@@ -21,4 +21,4 @@ localization-ruRU.lua
 EnhancedFlightMap.xml
 
 FlightMapData-Cata.lua
-FlightStatus.xml
+FlightStatus.xml
diff --git a/EnhancedFlightMap-WOTLKC.toc b/EnhancedFlightMap-WOTLKC.toc
@@ -1,7 +1,7 @@
-## Interface: 30400
+## Interface: 30403
 ## Title: Enhanced Flight Map
 ## Author: Lysidia of Feathermoon/Myrzael & Thengel of Mankrik/Westfall (Classic)
-## Version: 3.3.1-Wrath-Classic
+## Version: 4.1.0-Classic/Cata
 ## Notes: Adds enhancements to the flight system!
 ## DefaultState: Enabled
 ## LoadOnDemand: 0

diff --git a/EnhancedFlightMap.lua b/EnhancedFlightMap.lua
@@ -51,6 +51,8 @@ function EnhancedFlightMap_OnEvent( frame, event, ... )
 		-- Register the events we want to listen for
 		frame:RegisterEvent("PLAYER_ENTERING_WORLD");
 		frame:RegisterEvent("PLAYER_LEAVING_WORLD");
+		frame:RegisterEvent("LOADING_SCREEN_DISABLED");
+		frame:RegisterEvent("LOADING_SCREEN_ENABLED");
 
 		-- Register new config screen
 		EnhancedFlightMap_RegConfig(); -- Register New Config
@@ -65,6 +67,15 @@ function EnhancedFlightMap_OnEvent( frame, event, ... )
 		return;
 
 	elseif (event == "PLAYER_ENTERING_WORLD") then
+        local isLogin = select(1, ...);
+        local isReload = select(2, ...);
+        if isLogin then
+            EFM_Shared_DebugMessage("Player entered world for the first time", Lys_Debug);
+        elseif isReload then
+            EFM_Shared_DebugMessage("Player entered world reloaded the UI", Lys_Debug);
+        else
+            EFM_Shared_DebugMessage("Player entered world zoned between map instances", Lys_Debug);
+        end
 		frame:RegisterEvent("TAXIMAP_OPENED");
 		--EFM_Data_NodeFixup();
 		return;
@@ -76,6 +87,15 @@ function EnhancedFlightMap_OnEvent( frame, event, ... )
 	elseif (event == "TAXIMAP_OPENED") then
 		EFM_FM_TaxiMapOpenEvent();
 		return;
+	elseif (event == "LOADING_SCREEN_ENABLED") then
+		-- Loading screen starts, if it happens due to a portal/teleport while in a flight path the recording won't stop but must be paused until the loading screen ends
+        EFM_Shared_DebugMessage("Player loading screen enabled", Lys_Debug);
+        EFM_Timer_PauseTimer();
+        return;
+	elseif (event == "LOADING_SCREEN_DISABLED") then
+        EFM_Shared_DebugMessage("Player loading screen disabled", Lys_Debug);
+        EFM_Timer_ResumeTimer();
+        return;
 	end
 end
 

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