update webpage

U17 might have caused some journal bugs so don't fail immediately on one wrong entry, instead keep them in an Errors collection for later processing

EDPlayerJournal/BGS/Parsers/CarrierJumpParser.cs

@@ -0,0 +1,30 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS.Parsers;
+
+internal class CarrierJumpParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        CarrierJump? jump = entry as CarrierJump;
+
+        if (jump == null) {
+            return;
+        }
+
+        if (!jump.Docked) {
+            return;
+        }
+
+        context.CurrentSystem = jump.StarSystem;
+        context.CurrentSystemAddress = jump.SystemAddress;
+
+        context.SystemsByID.TryAdd(jump.SystemAddress, jump.StarSystem);
+
+        if (!string.IsNullOrEmpty(jump.SystemFaction)) {
+            context.ControllingFaction = jump.SystemFaction;
+        }
+
+        if (jump.SystemFactions != null && jump.SystemFactions.Count > 0) {
+            context.SystemFactions[jump.StarSystem] = jump.SystemFactions;
+        }
+    }
+}

EDPlayerJournal/BGS/Parsers/MusicParser.cs

@@ -0,0 +1,17 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS.Parsers;
+
+internal class MusicParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        MusicEntry? entryMusic = (MusicEntry)entry;
+
+        if (entryMusic == null) {
+            return;
+        }
+
+        if (string.Compare(entryMusic.MusicTrack, "Combat_CapitalShip") == 0) {
+            context.HaveSeenCapShip = true;
+        }
+    }
+}

EDPlayerJournal/BGS/TransactionParser.cs

@@ -665,6 +665,7 @@ public class TransactionParser {
     {
         { Events.ApproachSettlement, new ApproachSettlementParser() },
         { Events.CapShipBond, new CapShipBondParser() },
+        { Events.CarrierJump, new CarrierJumpParser() },
         { Events.Commander, new CommanderParser() },
         { Events.CommitCrime, new CommitCrimeParser() },
         { Events.Died, new DiedParser() },
@@ -683,6 +684,7 @@ public class TransactionParser {
         { Events.MissionFailed, new MissionFailedParser() },
         { Events.Missions, new MissionsParser() },
         { Events.MultiSellExplorationData, new MultiSellExplorationDataParser() },
+        { Events.Music, new MusicParser() },
         { Events.ReceiveText, new ReceiveTextParser() },
         { Events.RedeemVoucher, new RedeemVoucherParser() },
         { Events.SearchAndRescue, new SearchAndRescueParser() },

EDPlayerJournal/Entries/CarrierJump.cs

@@ -0,0 +1,44 @@
+using Newtonsoft.Json.Linq;
+
+namespace EDPlayerJournal.Entries;
+
+public class CarrierJump : Entry {
+    public bool Docked { get; set; } = false;
+
+    public string? StationName { get; set; } = null;
+
+    public string? StationType { get; set; } = null;
+
+    public string? StarSystem { get; set; } = null;
+
+    public ulong SystemAddress { get; set; } = 0;
+
+    public string? SystemFaction { get; set; } = null;
+
+    public List<Faction> SystemFactions { get; set; } = new List<Faction>();
+
+    protected override void Initialise() {
+        Docked = JSON.Value<bool?>("Docked") ?? false;
+
+        StarSystem = JSON.Value<string>("StarSystem");
+        SystemAddress = JSON.Value<ulong?>("SystemAddress") ?? 0;
+
+        StationName = JSON.Value<string?>("StationName");
+        StationType = JSON.Value<string?>("StationType");
+
+        var faction = JSON.Value<JObject>("SystemFaction");
+        if (faction != null) {
+            SystemFaction = faction.Value<string>("Name");
+        }
+
+        var factions = JSON.Value<JArray>("Factions");
+        if (factions != null) {
+            foreach (JObject system_faction in factions) {
+                Faction? f = Faction.FromJSON(system_faction);
+                if (f != null) {
+                    SystemFactions.Add(f);
+                }
+            }
+        }
+    }
+}

EDPlayerJournal/Entries/Entry.cs

@@ -15,6 +15,7 @@ public class Entry {
         { Events.ApproachSettlement, typeof(ApproachSettlementEntry) },
         { Events.Bounty, typeof(BountyEntry) },
         { Events.CapShipBond, typeof(CapShipBondEntry) },
+        { Events.CarrierJump, typeof(CarrierJump) },
         { Events.Commander, typeof(CommanderEntry) },
         { Events.CommitCrime, typeof(CommitCrimeEntry) },
         { Events.Died, typeof(DiedEntry) },
@@ -37,6 +38,7 @@ public class Entry {
         { Events.MissionRedirected, typeof(MissionRedirectedEntry) },
         { Events.Missions, typeof(MissionsEntry) },
         { Events.MultiSellExplorationData, typeof(MultiSellExplorationDataEntry) },
+        { Events.Music, typeof(MusicEntry) },
         { Events.ReceiveText, typeof(ReceiveTextEntry) },
         { Events.RedeemVoucher, typeof(RedeemVoucherEntry) },
         { Events.SearchAndRescue, typeof(SearchAndRescueEntry) },
@@ -64,7 +66,15 @@ public class Entry {
     public static Entry? Parse(string journalline) {
         using (JsonReader reader = new JsonTextReader(new StringReader(journalline))) {
             reader.DateParseHandling = DateParseHandling.None;
-            var json = JObject.Load(reader);
+            JObject? json = null;
+            try {
+                json = JObject.Load(reader);
+            } catch (Exception e) {
+                throw new InvalidJournalEntryException(
+                    "invalid JSON journal entry: " + journalline,
+                    e
+                    );
+            }
             if (json == null) {
                 return null;
             }

EDPlayerJournal/Entries/Events.cs

@@ -4,6 +4,7 @@ public class Events {
     public static readonly string ApproachSettlement = "ApproachSettlement";
     public static readonly string Bounty = "Bounty";
     public static readonly string CapShipBond = "CapShipBond";
+    public static readonly string CarrierJump = "CarrierJump";
     public static readonly string Commander = "Commander";
     public static readonly string CommitCrime = "CommitCrime";
     public static readonly string Died = "Died";
@@ -27,6 +28,7 @@ public class Events {
     public static readonly string MissionRedirected = "MissionRedirected";
     public static readonly string Missions = "Missions";
     public static readonly string MultiSellExplorationData = "MultiSellExplorationData";
+    public static readonly string Music = "Music";
     public static readonly string ReceiveText = "ReceiveText";
     public static readonly string RedeemVoucher = "RedeemVoucher";
     public static readonly string SearchAndRescue = "SearchAndRescue";

EDPlayerJournal/Entries/MusicEntry.cs

@@ -0,0 +1,9 @@
+namespace EDPlayerJournal.Entries;
+
+public class MusicEntry : Entry {
+    public string? MusicTrack { get; set; } = null;
+
+    protected override void Initialise() {
+        MusicTrack = JSON.Value<string?>("MusicTrack");
+    }
+}

EDPlayerJournal/JournalException.cs

@@ -6,6 +6,7 @@
 public class InvalidJournalEntryException : Exception {
     public InvalidJournalEntryException() { }
     public InvalidJournalEntryException(string message) : base(message) { }
+    public InvalidJournalEntryException(string message, Exception inner) : base(message, inner) { }
 }
 
 /// <summary>

EDPlayerJournal/JournalFile.cs

@@ -17,6 +17,11 @@ public class JournalFile : IComparable<JournalFile>
     private static Regex update11regex = new Regex("Journal\\.([^\\.]+)\\.(\\d+).log");
     private static string iso8601 = "yyyyMMddTHHmmss";
 
+    /// <summary>
+    /// A public list of errors encountered while parsing the journal files
+    /// </summary>
+    public List<Exception> Errors { get; private set; } = new List<Exception>();
+
     public static bool VerifyFile(string path) {
         string filename = Path.GetFileName(path);
 
@@ -125,15 +130,20 @@ public class JournalFile : IComparable<JournalFile>
         }
 
         entries.Clear();
-        foreach(var line in lines) {
+        Errors.Clear();
+        foreach (var line in lines) {
             // Skip empty lines
             if (line.Trim().Length == 0) {
                 continue;
             }
+            try {
                 Entry? entry = Entry.Parse(line);
                 if (entry != null) {
                     entries.Add(entry);
                 }
+            } catch (Exception ex) {
+                Errors.Add(ex);
+            }
         }
     }
 }

EDPlayerJournal/PlayerJournal.cs

@@ -22,6 +22,12 @@ public class PlayerJournal {
         ScanFiles();
     }
 
+    public List<Exception> AllErrors {
+        get {
+            return Files.SelectMany(x => x.Errors).ToList();
+        }
+    }
+
     public List<JournalFile> Files {
         get { return journalfiles; }
     }

EDPlayerJournal/Thargoid.cs

@@ -14,6 +14,10 @@ public enum ThargoidVessel {
     /// Thargoid drone
     /// </summary>
     Revenant = 8,
+    /// <summary>
+    /// New thargoid drone in U17
+    /// </summary>
+    Banshee = 9,
 }
 
 public class Thargoid {
@@ -24,6 +28,8 @@ public class Thargoid {
         {    25000, ThargoidVessel.Revenant },
         {    65000, ThargoidVessel.Scout },
         {    75000, ThargoidVessel.Scout },
+        // New in Update 17
+        {   100000, ThargoidVessel.Banshee },
         // New in Update 15
         {  4500000, ThargoidVessel.Hunter },
         {  6500000, ThargoidVessel.Cyclops },
@@ -47,7 +53,7 @@ public class Thargoid {
     };
 
     public static Dictionary<ThargoidVessel, string?> VesselNames { get; } = new() {
-        { ThargoidVessel.Unknown, null },
+        { ThargoidVessel.Unknown, "(Unknown)" },
         { ThargoidVessel.Revenant, "Revenant" },
         { ThargoidVessel.Scout, "Scout" },
         { ThargoidVessel.Orthrus, "Orthrus" },
@@ -56,6 +62,7 @@ public class Thargoid {
         { ThargoidVessel.Medusa, "Medusa" },
         { ThargoidVessel.Hydra, "Hydra" },
         { ThargoidVessel.Hunter, "Hunter" },
+        { ThargoidVessel.Banshee, "Banshee" },
     };
 
     public static ThargoidVessel GetVesselByPayout(ulong payout) {

EliteBGS/EliteBGS.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <Version>0.3.5</Version>
+    <Version>0.3.7</Version>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>

EliteBGS/MainWindow.xaml.cs

@@ -233,6 +233,12 @@ public partial class MainWindow : MetroWindow {
 
             HandleEntries(entries, start, end);
             GenerateLog();
+
+            var errors = journal.AllErrors;
+            foreach (var error in errors) {
+                Log("An error has occured in the Journal file, please send this to CMDR Hekateh:");
+                Log(error.ToString());
+            }
         } catch (Exception exception) {
             Log("Something went terribly wrong while parsing the E:D player journal.");
             Log("Please send this to CMDR Hekateh:");

EliteBGS/Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -51,5 +49,5 @@ using System.Windows;
 // 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("0.3.5.0")]
-[assembly: AssemblyFileVersion("0.3.5.0")]
+[assembly: AssemblyVersion("0.3.7.0")]
+[assembly: AssemblyFileVersion("0.3.7.0")]

EliteBGS/docs/CHANGELOG.md

@@ -1,5 +1,18 @@
 # EliteBGS changelog
 
+# 0.3.7 on 29.01.2024
+
+* Fix wrong locations of BGS action if you remain on your carrier while its
+  jumping to a new system.
+* Identify a capital ship in a high CZ by its music.
+
+# 0.3.6 on 25.10.2023
+
+* U17 introduced invalid JSON into the player journal. EliteBGS can now skip over
+  those and keep processing. This way players won't have to delete lines in their
+  journals anymore to keep using the tool.
+* Banshee has been added.
+
 ## 0.3.5 on 11.09.2023
 
 * Small bounty voucher formats are no longer suppressed.

EliteBGS/docs/index.md

@@ -20,13 +20,13 @@ command line:
 winget install Microsoft.DotNet.DesktopRuntime.7
 ```
 
-You can download the **latest** version **0.3.5** at CodeBerg:
+You can download the **latest** version **0.3.7** at CodeBerg:
 
 * [https://codeberg.org/nola/EDBGS/releases](https://codeberg.org/nola/EDBGS/releases)
 
 Or alternatively from my server:
 
-* [https://bgs.n0la.org/elitebgs-0.3.5.zip](https://bgs.n0la.org/elitebgs-0.3.5.zip)
+* [https://bgs.n0la.org/elitebgs-0.3.6.zip](https://bgs.n0la.org/elitebgs-0.3.7.zip)
 
 ## Old Versions