in the latest ED update, the format of journal files was changed from…

… Journal.220315171428.01.log to Journal.2022-03-15T172546.01.log
mhwlng · Mar 19, 2022 · 3b4cb25 · 3b4cb25
1 parent 15a087e
commit 3b4cb25
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 17 deletions.
diff --git a/Elite/Data.cs b/Elite/Data.cs
@@ -435,6 +435,8 @@ public class Status
             public bool OnFootSocialSpace { get; set; }
             public bool OnFootExterior { get; set; }
             public bool BreathableAtmosphere { get; set; }
+            public bool TelepresenceMulticrew { get; set; }
+            public bool PhysicalMulticrew { get; set; }
         }
 
 
@@ -523,6 +525,9 @@ public static void HandleStatusEvents(object sender, StatusFileEvent evt)
             StatusData.OnFootExterior = (evt.Flags2 & MoreStatusFlags.OnFootExterior) != 0;
             StatusData.BreathableAtmosphere = (evt.Flags2 & MoreStatusFlags.BreathableAtmosphere) != 0;
 
+            StatusData.TelepresenceMulticrew = (evt.Flags2 & MoreStatusFlags.TelepresenceMulticrew) != 0;
+            StatusData.PhysicalMulticrew = (evt.Flags2 & MoreStatusFlags.PhysicalMulticrew) != 0;
+
             var shipData = Ships.GetCurrentShip();
             if (shipData != null)
             {

diff --git a/Elite/Properties/AssemblyInfo.cs b/Elite/Properties/AssemblyInfo.cs
@@ -31,7 +31,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.1.0")]
-[assembly: AssemblyFileVersion("1.9.1.0")]
+[assembly: AssemblyVersion("1.9.3.0")]
+[assembly: AssemblyFileVersion("1.9.3.0")]
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
diff --git a/EliteJournalReader/Events/ChangeCrewRoleEvent.cs b/EliteJournalReader/Events/ChangeCrewRoleEvent.cs
@@ -9,14 +9,16 @@ namespace EliteJournalReader.Events
 {
     //When written: If you should ever reset your game
     //Parameters:
-    //•	Name: commander name
+    //Name: commander name
+    //Telepresence: (bool) (only from Odyssey build)
     public class ChangeCrewRoleEvent : JournalEvent<ChangeCrewRoleEvent.ChangeCrewRoleEventArgs>
     {
         public ChangeCrewRoleEvent() : base("ChangeCrewRole") { }
 
         public class ChangeCrewRoleEventArgs : JournalEventArgs
         {
             public RoleType Role { get; set; }
+            public bool Telepresence { get; set; }
         }
 
         public enum RoleType

diff --git a/EliteJournalReader/Events/CrewLaunchFighterEvent.cs b/EliteJournalReader/Events/CrewLaunchFighterEvent.cs
@@ -9,7 +9,8 @@ namespace EliteJournalReader.Events
 {
     //When written: when in multicrew, in Helm player's log, when a crew member launches a fighter
     //Parameters:
-    //�	Crew: name of crew member launching in fighter
+    //Crew: name of crew member launching in fighter
+    //Telepresence: (bool) (only from Odyssey build)
     public class CrewLaunchFighterEvent : JournalEvent<CrewLaunchFighterEvent.CrewLaunchFighterEventArgs>
     {
         public CrewLaunchFighterEvent() : base("CrewLaunchFighter") { }
@@ -19,6 +20,7 @@ public class CrewLaunchFighterEventArgs : JournalEventArgs
             public string Crew { get; set; }
             public long CrewID { get; set; }
             public long ID { get; set; }
+            public bool Telepresence { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/CrewMemberJoinsEvent.cs b/EliteJournalReader/Events/CrewMemberJoinsEvent.cs
@@ -9,7 +9,8 @@ namespace EliteJournalReader.Events
 {
     //When written: When another player joins your ship's crew
     //Parameters:
-    //�	Crew: player's commander name
+    //Crew: player's commander name
+    //Telepresence: (bool) (only from Odyssey build)
     public class CrewMemberJoinsEvent : JournalEvent<CrewMemberJoinsEvent.CrewMemberJoinsEventArgs>
     {
         public CrewMemberJoinsEvent() : base("CrewMemberJoins") { }
@@ -18,6 +19,7 @@ public class CrewMemberJoinsEventArgs : JournalEventArgs
         {
             public string Crew { get; set; }
             public long CrewID { get; set; }
+            public bool Telepresence { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/CrewMemberQuitsEvent.cs b/EliteJournalReader/Events/CrewMemberQuitsEvent.cs
@@ -9,7 +9,8 @@ namespace EliteJournalReader.Events
 {
     //When written: When another player leaves your ship's crew
     //Parameters:
-    //�	Crew: player's commander name
+    //Crew: player's commander name
+    //Telepresence: (bool) (only from Odyssey build)
     public class CrewMemberQuitsEvent : JournalEvent<CrewMemberQuitsEvent.CrewMemberQuitsEventArgs>
     {
         public CrewMemberQuitsEvent() : base("CrewMemberQuits") { }
@@ -18,6 +19,7 @@ public class CrewMemberQuitsEventArgs : JournalEventArgs
         {
             public string Crew { get; set; }
             public long CrewID { get; set; }
+            public bool Telepresence { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/CrewMemberRoleChangeEvent.cs b/EliteJournalReader/Events/CrewMemberRoleChangeEvent.cs
@@ -9,8 +9,9 @@ namespace EliteJournalReader.Events
 {
     //When written: When another player joins your ship's crew
     //Parameters:
-    //�	Crew: player's commander name
-    //�	Role: selected role
+    //Crew: player's commander name
+    //Role: selected role
+    //Telepresence: (bool) (only from Odyssey build)
     public class CrewMemberRoleChangeEvent : JournalEvent<CrewMemberRoleChangeEvent.CrewMemberRoleChangeEventArgs>
     {
         public CrewMemberRoleChangeEvent() : base("CrewMemberRoleChange") { }
@@ -20,6 +21,7 @@ public class CrewMemberRoleChangeEventArgs : JournalEventArgs
             public string Crew { get; set; }
             public long CrewID { get; set; }
             public string Role { get; set; }
+            public bool Telepresence { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/DockSRVEvent.cs b/EliteJournalReader/Events/DockSRVEvent.cs
@@ -16,6 +16,7 @@ public DockSRVEvent() : base("DockSRV") { }
         public class DockSRVEventArgs : JournalEventArgs
         {
             public long ID { get; set; }
+            public string SRVType { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/EndCrewSessionEvent.cs b/EliteJournalReader/Events/EndCrewSessionEvent.cs
@@ -9,14 +9,16 @@ namespace EliteJournalReader.Events
 {
     //When written: When another player leaves your ship's crew
     //Parameters:
-    //•	Crew: player's commander name
+    //Crew: player's commander name
+    //Telepresence: (bool) (only from Odyssey build)
     public class EndCrewSessionEvent : JournalEvent<EndCrewSessionEvent.EndCrewSessionEventArgs>
     {
         public EndCrewSessionEvent() : base("EndCrewSession") { }
 
         public class EndCrewSessionEventArgs : JournalEventArgs
         {
             public bool OnCrime { get; set; }
+            public bool Telepresence { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/JoinACrewEvent.cs b/EliteJournalReader/Events/JoinACrewEvent.cs
@@ -9,14 +9,16 @@ namespace EliteJournalReader.Events
 {
     //When written: When you join another player ship's crew
     //Parameters:
-    //•	Captain: Helm player's commander name
+    //Captain: Helm player's commander name
+    //Telepresence: (bool) (only from Odyssey build)
     public class JoinACrewEvent : JournalEvent<JoinACrewEvent.JoinACrewEventArgs>
     {
         public JoinACrewEvent() : base("JoinACrew") { }
 
         public class JoinACrewEventArgs : JournalEventArgs
         {
             public string Captain { get; set; }
+            public bool Telepresence { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/KickCrewMemberEvent.cs b/EliteJournalReader/Events/KickCrewMemberEvent.cs
@@ -9,8 +9,9 @@ namespace EliteJournalReader.Events
 {
     //When written: When you force another player to leave your ship's crew
     //Parameters:
-    //•	Crew: player's commander name
-    //•	OnCrime: (bool) true if player is automatically kicked for committing a crime in a lawful session
+    //Crew: player's commander name
+    //OnCrime: (bool) true if player is automatically kicked for committing a crime in a lawful session
+    //Telepresence: (bool) (only from Odyssey build)
     public class KickCrewMemberEvent : JournalEvent<KickCrewMemberEvent.KickCrewMemberEventArgs>
     {
         public KickCrewMemberEvent() : base("KickCrewMember") { }
@@ -19,6 +20,7 @@ public class KickCrewMemberEventArgs : JournalEventArgs
         {
             public string Crew { get; set; }
             public bool OnCrime { get; set; }
+            public bool Telepresence { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/LaunchSRVEvent.cs b/EliteJournalReader/Events/LaunchSRVEvent.cs
@@ -18,6 +18,7 @@ public class LaunchSRVEventArgs : JournalEventArgs
         {
             public string Loadout { get; set; }
             public long ID { get; set; }
+            public string SRVType { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/QuitACrewEvent.cs b/EliteJournalReader/Events/QuitACrewEvent.cs
@@ -9,14 +9,16 @@ namespace EliteJournalReader.Events
 {
     //When written: When you leave another player ship's crew
     //Parameters:
-    //•	Captain: Helm player's commander name
+    //Captain: Helm player's commander name
+    //Telepresence: (bool) (only from Odyssey build)
     public class QuitACrewEvent : JournalEvent<QuitACrewEvent.QuitACrewEventArgs>
     {
         public QuitACrewEvent() : base("QuitACrew") { }
 
         public class QuitACrewEventArgs : JournalEventArgs
         {
             public string Captain { get; set; }
+            public bool Telepresence { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/SRVDestroyedEvent.cs b/EliteJournalReader/Events/SRVDestroyedEvent.cs
@@ -16,6 +16,7 @@ public SRVDestroyedEvent() : base("SRVDestroyed") { }
         public class SRVDestroyedEventArgs : JournalEventArgs
         {
             public long ID { get; set; }
+            public string SRVType { get; set; }
         }
     }
 }
diff --git a/EliteJournalReader/Events/StatusFileEvent.cs b/EliteJournalReader/Events/StatusFileEvent.cs
@@ -160,7 +160,9 @@ public enum MoreStatusFlags : long
         OnFootInHangar  = 0x00002000,
         OnFootSocialSpace  = 0x00004000,
         OnFootExterior  = 0x00008000,
-        BreathableAtmosphere = 0x00010001
+        BreathableAtmosphere = 0x00010001,
+        TelepresenceMulticrew = 0x00020000,      
+        PhysicalMulticrew = 0x00040000       
     }
 
     public enum StatusGuiFocus

diff --git a/EliteJournalReader/JournalWatcher.cs b/EliteJournalReader/JournalWatcher.cs
@@ -170,7 +170,7 @@ protected JournalWatcher()
             // to be used for unit tests when we're not actually checking file systems
         }
 
-        private readonly Regex journalFileRegex = new Regex(@"^(?<path>.*)\\Journal(Beta)?\.(?<timestamp>\d+)\.(?<part>\d+)\.log$", RegexOptions.Compiled);
+        private readonly Regex journalFileRegex = new Regex(@"^(?<path>.*)\\Journal(Beta)?\.(?<timestamp>[-0-9T]+)\.(?<part>\d+)\.log$", RegexOptions.Compiled);
 
         /// <summary>
         /// This will look into the journal folder and check the latest journal.

diff --git a/ImportData/Properties/AssemblyInfo.cs b/ImportData/Properties/AssemblyInfo.cs
@@ -31,7 +31,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.1.0")]
-[assembly: AssemblyFileVersion("1.9.1.0")]
+[assembly: AssemblyVersion("1.9.3.0")]
+[assembly: AssemblyFileVersion("1.9.3.0")]
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]