try to automatically get offline raid map

Author: Razzmatazzz

TarkovMonitor/GameWatcher.cs

@@ -105,8 +105,8 @@ public int AccountId
         public event EventHandler<LogContentEventArgs<GroupMatchRaidReadyLogContent>>? GroupMemberReady;
         public event EventHandler? GroupDisbanded;
         public event EventHandler<LogContentEventArgs<GroupMatchUserLeaveLogContent>>? GroupUserLeave;
-        public event EventHandler? MapLoading;
-        public event EventHandler<RaidInfoEventArgs>? MatchingStarted;
+        public event EventHandler<RaidInfoEventArgs>? MapLoading;
+        //public event EventHandler<RaidInfoEventArgs>? MatchingStarted;
         public event EventHandler<RaidInfoEventArgs>? MatchFound; // only fires on initial load into a raid
         public event EventHandler<RaidInfoEventArgs>? MapLoaded; // fires on initial and subsequent loads into a raid
         public event EventHandler<RaidInfoEventArgs>? MatchingAborted;
@@ -131,6 +131,22 @@ public static string GetDefaultLogsFolder()
             return Path.Combine(key.GetValue("InstallLocation")?.ToString() ?? throw new Exception("InstallLocation registry value not found"), "Logs");
         }
 
+        public static Dictionary<string, string> MapBundles = new() {
+            { "city_preset", "TarkovStreets" },
+            { "customs_preset", "bigmap" },
+            { "factory_day_preset", "factory4_day" },
+            { "factory_night_preset", "factory4_night" },
+            { "laboratory_preset", "laboratory" },
+            { "labyrinth_preset", "Labyrinth" },
+            { "lighthouse_preset", "Lighthouse" },
+            { "rezerv_base_preset", "ReservBase" },
+            { "sandbox_preset", "Sandbox" },
+            { "sandbox_high_preset", "Sandbox_high" },
+            { "shopping_mall", "Interchange" },
+            { "shoreline_preset", "Shoreline" },
+            { "woods_preset", "Woods" },
+        };
+
         public GameWatcher()
 		{
 			Monitors = new();
@@ -391,19 +407,33 @@ internal void GameWatcher_NewLogData(object? sender, NewLogDataEventArgs e)
                         // Occurs for each other member of the group when ready
                         GroupMemberReady?.Invoke(this, new LogContentEventArgs<GroupMatchRaidReadyLogContent>() { LogContent = jsonNode?.AsObject().Deserialize<GroupMatchRaidReadyLogContent>() ?? throw new Exception("Error parsing GroupMatchRaidReadyEventArgs"), Profile = CurrentProfile });
                     }
-                    if (eventLine.Contains("application|Matching with group id"))
+                    /*if (eventLine.Contains("application|Matching with group id"))
                     {
                         MapLoading?.Invoke(this, new());
+                    }*/
+                    if (eventLine.Contains("application|scene preset path:"))
+                    {
+                        raidInfo = new()
+                        {
+                            ProfileType = CurrentProfile.Type,
+                        };
+                        var bundleMatch = Regex.Match(eventLine, @"scene preset path:maps\/(?<mapBundleName>[a-zA-Z0-9_]+)\.bundle");
+                        if (bundleMatch.Success)
+                        {
+                            var mapBundle = bundleMatch.Groups["mapBundleName"].Value;
+                            if (MapBundles.ContainsKey(mapBundle))
+                            {
+                                string mapId = MapBundles[mapBundle];
+                                raidInfo.Map = mapId;
+                                MapLoading?.Invoke(this, new(raidInfo, CurrentProfile));
+                            }
+                        }
                     }
                     if (eventLine.Contains("application|LocationLoaded"))
                     {
-						// The map has been loaded and the game is searching for a match
-						raidInfo = new()
-						{
-							MapLoadTime = float.Parse(Regex.Match(eventLine, @"LocationLoaded:[0-9.,]+ real:(?<loadTime>[0-9.,]+)").Groups["loadTime"].Value.Replace(",", "."), CultureInfo.InvariantCulture),
-                            ProfileType = CurrentProfile.Type,
-						};
-						MatchingStarted?.Invoke(this, new(raidInfo, CurrentProfile));
+                        // The map has been loaded and the game is searching for a match
+                        raidInfo.MapLoadTime = float.Parse(Regex.Match(eventLine, @"LocationLoaded:[0-9.,]+ real:(?<loadTime>[0-9.,]+)").Groups["loadTime"].Value.Replace(",", "."), CultureInfo.InvariantCulture);
+						//MatchingStarted?.Invoke(this, new(raidInfo, CurrentProfile));
 					}
 					if (eventLine.Contains("application|MatchingCompleted"))
 					{
@@ -418,6 +448,7 @@ internal void GameWatcher_NewLogData(object? sender, NewLogDataEventArgs e)
                     {
                         // Immediately after matching is complete
                         // Sufficient information is available to raise the MatchFound event
+                        var mapUnknown = raidInfo.Map == "" || raidInfo.Map == null;
                         raidInfo.Map = Regex.Match(eventLine, "Location: (?<map>[^,]+)").Groups["map"].Value;
                         raidInfo.Online = eventLine.Contains("RaidMode: Online");
                         raidInfo.RaidId = Regex.Match(eventLine, @"shortId: (?<raidId>[A-Z0-9]{6})").Groups["raidId"].Value;
@@ -434,6 +465,10 @@ internal void GameWatcher_NewLogData(object? sender, NewLogDataEventArgs e)
                             // Raise the MatchFound event only if we queued; not if we are re-loading back into a raid
                             MatchFound?.Invoke(this, new(raidInfo, CurrentProfile));
                         }
+                        if (mapUnknown)
+                        {
+                            MapLoading?.Invoke(this, new(raidInfo, CurrentProfile));
+                        }
                         MapLoaded?.Invoke(this, new(raidInfo, CurrentProfile));
                     }
                     if (eventLine.Contains("application|GameStarting"))

TarkovMonitor/MainBlazorUI.cs

@@ -67,8 +67,8 @@ public MainBlazorUI()
             eft.MatchingAborted += Eft_GroupStaleEvent;
             eft.GameStarted += Eft_GroupStaleEvent;
             eft.MapLoading += Eft_MapLoading;
+            eft.MapLoading += Eft_MapLoading_NavigateToMap;
             eft.MatchFound += Eft_MatchFound;
-            eft.MapLoaded += Eft_MapLoaded;
             eft.PlayerPosition += Eft_PlayerPosition;
             eft.ProfileChanged += Eft_ProfileChanged;
 
@@ -280,20 +280,6 @@ protected override void OnShown(EventArgs e)
             }
         }
 
-        private void Eft_MapLoaded(object? sender, RaidInfoEventArgs e)
-        {
-            if (!Properties.Settings.Default.autoNavigateMap)
-            {
-                return;
-            }
-            var map = TarkovDev.Maps.Find(m => m.nameId == e.RaidInfo.Map);
-            if (map == null)
-            {
-                return;
-            }
-            SocketClient.NavigateToMap(map);
-        }
-
         private async void Eft_PlayerPosition(object? sender, PlayerPositionEventArgs e)
         {
             var map = TarkovDev.Maps.Find(m => m.nameId == e.RaidInfo.Map);
@@ -373,6 +359,20 @@ private async void Eft_MapLoading(object? sender, EventArgs e)
             }
         }
 
+        private void Eft_MapLoading_NavigateToMap(object? sender, RaidInfoEventArgs e)
+        {
+            if (!Properties.Settings.Default.autoNavigateMap)
+            {
+                return;
+            }
+            var map = TarkovDev.Maps.Find(m => m.nameId == e.RaidInfo.Map);
+            if (map == null)
+            {
+                return;
+            }
+            SocketClient.NavigateToMap(map);
+        }
+
         private void Eft_GroupUserLeave(object? sender, LogContentEventArgs<GroupMatchUserLeaveLogContent> e)
         {
             if (e.LogContent.Nickname != "You")